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

22 years ago · 4f800a42be
2 changed files with 2 additions and 1 deletions
--- 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.
--- 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)
 	{