Merge from mainline.

	2002-11-07  Alan Modra  <amodra@bigpond.net.au>
	* elf64-ppc.c: Comment typo fixes.
	(ppc64_elf_merge_private_bfd_data): Allow BFD_ENDIAN_UNKNOWN input.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 160ce2e4d6341bb5ec9b4071a47d30c95eb03000..c263c9df6a594eb517150de19f3e454c36a9720a 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,10 @@
+2002-11-13  Alan Modra  <amodra@bigpond.net.au>
+
+       Merge from mainline.
+       2002-11-07  Alan Modra  <amodra@bigpond.net.au>
+       * elf64-ppc.c: Comment typo fixes.
+       (ppc64_elf_merge_private_bfd_data): Allow BFD_ENDIAN_UNKNOWN input.
+
 2002-11-11  Nick Clifton  <nickc@redhat.com>
        
        Import this patch from mainline:

diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c
index dadebae717426a2502e68c8bfae0658e6c288118..c51263692853a080f69778bcd090b20954a079e1 100644 (file)
--- 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
 */