diff options
| author | Alan Modra <amodra@gmail.com> | 2004-08-09 02:59:15 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2004-08-09 02:59:15 +0000 |
| commit | 4f800a42beda5803d9226868a04bed549e9e064d (patch) | |
| tree | f43aa579e66130b20c673b43165229ff579cd2e1 /bfd | |
| parent | 06da1e8e7be268d13cbc16c0ddeb2aead4fd4cc0 (diff) | |
| download | binutils-4f800a42beda5803d9226868a04bed549e9e064d.zip binutils-4f800a42beda5803d9226868a04bed549e9e064d.tar.gz binutils-4f800a42beda5803d9226868a04bed549e9e064d.tar.bz2 | |
* elf64-ppc.c (adjust_opd_syms): Fix merge error.
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 2 | ||||
| -rw-r--r-- | bfd/elf64-ppc.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index a2bf677..bd2d32e 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 c32eba4..b8fbb71 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) { |