* emulparams/elf64ppc.sh (GOT): Don't merge .toc into .got for ld -r.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index e1937bd7bb703676394e3e9dcd0b41c61b4f9022..2d007ca333768aa2f03b110ccbaa91630876f6a0 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,7 @@
+2003-07-28  Alan Modra  <amodra@bigpond.net.au>
+
+       * emulparams/elf64ppc.sh (GOT): Don't merge .toc into .got for ld -r.
+
 2003-07-27  Alan Modra  <amodra@bigpond.net.au>
 
        * ld.texinfo: Typo fixes.  Document SUBALIGN.

diff --git a/ld/emulparams/elf64ppc.sh b/ld/emulparams/elf64ppc.sh
index e1d9e1d32f1baac98bbc193854be66f30c9c8f06..fe58c74258a8cb19f8c57eafe82bdda25147acb4 100644 (file)
--- a/ld/emulparams/elf64ppc.sh
+++ b/ld/emulparams/elf64ppc.sh
@@ -19,7 +19,8 @@ OTHER_BSS_SYMBOLS="
 OTHER_PLT_RELOC_SECTIONS="
   .rela.tocbss ${RELOCATING-0} : { *(.rela.tocbss) }"
 GOT="
-  .got         ${RELOCATING-0}${RELOCATING+ALIGN(8)} : { *(.got .toc) }"
+  .got         ${RELOCATING-0}${RELOCATING+ALIGN(8)} : { *(.got${RELOCATING+ .toc}) }
+  ${RELOCATING-.toc            0 : { *(.toc) }}"
 OTHER_GOT_RELOC_SECTIONS="
   .rela.toc    ${RELOCATING-0} : { *(.rela.toc) }"
 OTHER_READWRITE_SECTIONS="