From: Alan Modra <amodra@gmail.com>
Date: Mon, 9 Aug 2004 02:59:15 +0000 (+0000)
Subject: 	* elf64-ppc.c (adjust_opd_syms): Fix merge error.
X-Git-Tag: csl-arm-2004-q3~567
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4f800a42beda5803d9226868a04bed549e9e064d;p=thirdparty%2Fbinutils-gdb.git

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

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index a2bf677acbc..bd2d32ed948 100644
--- 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 c32eba4a32d..b8fbb711f1a 100644
--- 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)
 	{