* elf64-ppc.c (adjust_opd_syms): Fix merge error.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index a2bf677acbc3cda7fba971284cbf38d99a072e43..bd2d32ed948be37ff239058af03ba2d122877a9a 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,7 @@
 2004-08-09  Alan Modra  <amodra@bigpond.net.au>
 
+       * elf64-ppc.c (adjust_opd_syms): Fix merge error.
+
        * elf64-ppc.c (struct ppc_link_hash_table): Remove have_undefweak.
        (func_desc_adjust): Don't set have_undefweak.
        (ppc64_elf_func_desc_adjust): Don't add an extr nop to sfpr.

diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c
index c32eba4a32d7ef8711be17875e170d1fdd703890..b8fbb711f1a209f6087339066232ffae5f21a576 100644 (file)
--- a/bfd/elf64-ppc.c
+++ b/bfd/elf64-ppc.c
@@ -4936,7 +4936,6 @@ adjust_opd_syms (struct elf_link_hash_entry *h, void *inf ATTRIBUTE_UNUSED)
   opd_adjust = get_opd_info (sym_sec);
   if (opd_adjust != NULL)
     {
-      eh->elf.root.u.def.value += opd_adjust[eh->elf.root.u.def.value / 24];
       long adjust = opd_adjust[eh->elf.root.u.def.value / 24];
       if (adjust == -1)
        {