diff options
| -rw-r--r-- | bfd/ChangeLog | 7 | ||||
| -rw-r--r-- | bfd/elf64-ppc.c | 9 |
2 files changed, 11 insertions, 5 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 78aa794..a5fcadf 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,7 +1,12 @@ +2014-01-24 Alan Modra <amodra@gmail.com> + + * elf64-ppc.c (ppc_build_one_stub): Correct reloc count passed + to get_relocs for ELFv2. + 2014-01-23 H.J. Lu <hongjiu.lu@intel.com> PR ld/16498 - * elf.c (_bfd_elf_map_sections_to_segments): Issue a linker error + * elf.c (_bfd_elf_map_sections_to_segments): Issue a linker error if TLS sections are not adjacent. 2014-01-22 Alan Modra <amodra@gmail.com> diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c index bb3326d..c97a39e 100644 --- a/bfd/elf64-ppc.c +++ b/bfd/elf64-ppc.c @@ -10750,10 +10750,11 @@ ppc_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg) if (info->emitrelocations) { r = get_relocs (stub_entry->stub_sec, - (2 - + (PPC_HA (off) != 0) - + (htab->plt_static_chain - && PPC_HA (off + 16) == PPC_HA (off)))); + ((PPC_HA (off) != 0) + + (htab->opd_abi + ? 2 + (htab->plt_static_chain + && PPC_HA (off + 16) == PPC_HA (off)) + : 1))); if (r == NULL) return FALSE; r[0].r_offset = loc - stub_entry->stub_sec->contents; |