[src/netbsd-1-6]: src/gnu/dist/toolchain/bfd Pull up revision 1.10 (requested...

[lukem <lukem%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ddf493e882c7
branches:  netbsd-1-6
changeset: 528457:ddf493e882c7
user:      lukem <lukem%NetBSD.org@localhost>
date:      Fri Jul 19 01:50:02 2002 +0000

description:
Pull up revision 1.10 (requested by mycroft in ticket #522):
If there is no PLT, do not output a DT_PLTGOT entry, as this causes the
dynamic linker to blast other things (like the second GOT entry).

diffstat:

 gnu/dist/toolchain/bfd/elf64-alpha.c |  6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diffs (18 lines):

diff -r 3ccf1be57e0b -r ddf493e882c7 gnu/dist/toolchain/bfd/elf64-alpha.c
--- a/gnu/dist/toolchain/bfd/elf64-alpha.c      Fri Jul 19 01:41:09 2002 +0000
+++ b/gnu/dist/toolchain/bfd/elf64-alpha.c      Fri Jul 19 01:50:02 2002 +0000
@@ -3347,12 +3347,10 @@
            return false;
        }
 
-      if (! bfd_elf64_add_dynamic_entry (info, DT_PLTGOT, 0))
-       return false;
-
       if (relplt)
        {
-         if (! bfd_elf64_add_dynamic_entry (info, DT_PLTRELSZ, 0)
+         if (! bfd_elf64_add_dynamic_entry (info, DT_PLTGOT, 0)
+             || ! bfd_elf64_add_dynamic_entry (info, DT_PLTRELSZ, 0)
              || ! bfd_elf64_add_dynamic_entry (info, DT_PLTREL, DT_RELA)
              || ! bfd_elf64_add_dynamic_entry (info, DT_JMPREL, 0))
            return false;