From c3cee6d5abbe54fb62787190ce8fd37b0d796b7a Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Wed, 13 Nov 2002 02:57:06 +0000 Subject: [PATCH] Merge from mainline. 2002-11-07 Alan Modra * elf64-ppc.c: Comment typo fixes. (ppc64_elf_merge_private_bfd_data): Allow BFD_ENDIAN_UNKNOWN input. --- bfd/ChangeLog | 7 +++++++ bfd/elf64-ppc.c | 13 +++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 160ce2e4d63..c263c9df6a5 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,10 @@ +2002-11-13 Alan Modra + + Merge from mainline. + 2002-11-07 Alan Modra + * elf64-ppc.c: Comment typo fixes. + (ppc64_elf_merge_private_bfd_data): Allow BFD_ENDIAN_UNKNOWN input. + 2002-11-11 Nick Clifton Import this patch from mainline: diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c index dadebae7174..c5126369285 100644 --- a/bfd/elf64-ppc.c +++ b/bfd/elf64-ppc.c @@ -1661,6 +1661,7 @@ ppc64_elf_merge_private_bfd_data (ibfd, obfd) { /* Check if we have the same endianess. */ if (ibfd->xvec->byteorder != obfd->xvec->byteorder + && ibfd->xvec->byteorder != BFD_ENDIAN_UNKNOWN && obfd->xvec->byteorder != BFD_ENDIAN_UNKNOWN) { const char *msg; @@ -1788,19 +1789,19 @@ struct ppc_dyn_relocs ppc_stub_plt_branch: Similar to the above, but a 24 bit branch in the stub section won't reach its destination. - . addis %r12,%r2,xxx@ha - . ld %r11,xxx@l(%r12) + . addis %r12,%r2,xxx@toc@ha + . ld %r11,xxx@toc@l(%r12) . mtctr %r11 . bctr ppc_stub_plt_call: Used to call a function in a shared library. - . addis %r12,%r2,xxx@ha + . addis %r12,%r2,xxx@toc@ha . std %r2,40(%r1) - . ld %r11,xxx+0@l(%r12) - . ld %r2,xxx+8@l(%r12) + . ld %r11,xxx+0@toc@l(%r12) + . ld %r2,xxx+8@toc@l(%r12) . mtctr %r11 - . ld %r11,xxx+16@l(%r12) + . ld %r11,xxx+16@toc@l(%r12) . bctr */ -- 2.47.2