From 5427f821ae3f03e66f93914e805284a08dbc0df1 Mon Sep 17 00:00:00 2001 From: Richard Sandiford Date: Fri, 20 Oct 2006 07:55:37 +0000 Subject: [PATCH] ld/ * emulparams/elf32bmip.sh (OTHER_GOT_RELOC_SECTIONS): Define. * emulparams/elf32bmipn32-defs.sh (OTHER_GOT_RELOC_SECTIONS): Likewise. ld/testsuite/ * ld-mips-elf/rel32-o32.d: Bump the section number of .text by 1 to account for the fact that .rel.dyn is now before .text in the section table. * ld-mips-elf/rel32-n32.d: Likewise. * ld-mips-elf/rel64.d: Likewise. --- ld/ChangeLog | 5 +++++ ld/emulparams/elf32bmip.sh | 7 +++++++ ld/emulparams/elf32bmipn32-defs.sh | 7 +++++++ ld/testsuite/ChangeLog | 8 ++++++++ ld/testsuite/ld-mips-elf/rel32-n32.d | 2 +- ld/testsuite/ld-mips-elf/rel32-o32.d | 2 +- ld/testsuite/ld-mips-elf/rel64.d | 2 +- 7 files changed, 30 insertions(+), 3 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index 99b33401a63..e4e9a74f652 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,8 @@ +2006-10-20 Richard Sandiford + + * emulparams/elf32bmip.sh (OTHER_GOT_RELOC_SECTIONS): Define. + * emulparams/elf32bmipn32-defs.sh (OTHER_GOT_RELOC_SECTIONS): Likewise. + 2006-10-19 Alan Modra * emultempl/armelf.em (arm_elf_before_allocation): Run diff --git a/ld/emulparams/elf32bmip.sh b/ld/emulparams/elf32bmip.sh index 8fda60bf797..e1d6d3442dc 100644 --- a/ld/emulparams/elf32bmip.sh +++ b/ld/emulparams/elf32bmip.sh @@ -20,6 +20,13 @@ INITIAL_READONLY_SECTIONS="${INITIAL_READONLY_SECTIONS} .reginfo ${RELOCATING-0} : { *(.reginfo) } " OTHER_TEXT_SECTIONS='*(.mips16.fn.*) *(.mips16.call.*)' +# Unlike most targets, the MIPS backend puts all dynamic relocations +# in a single dynobj section, which it also calls ".rel.dyn". It does +# this so that it can easily sort all dynamic relocations before the +# output section has been populated. +OTHER_GOT_RELOC_SECTIONS=" + .rel.dyn ${RELOCATING-0} : { *(.rel.dyn) } +" # If the output has a GOT section, there must be exactly 0x7ff0 bytes # between .got and _gp. The ". = ." below stops the orphan code from # inserting other sections between the assignment to _gp and the start diff --git a/ld/emulparams/elf32bmipn32-defs.sh b/ld/emulparams/elf32bmipn32-defs.sh index 4091ff4f15e..49d2f8545da 100644 --- a/ld/emulparams/elf32bmipn32-defs.sh +++ b/ld/emulparams/elf32bmipn32-defs.sh @@ -37,6 +37,13 @@ TEXT_START_ADDR=0x10000000 MAXPAGESIZE="CONSTANT (MAXPAGESIZE)" ENTRY=__start +# Unlike most targets, the MIPS backend puts all dynamic relocations +# in a single dynobj section, which it also calls ".rel.dyn". It does +# this so that it can easily sort all dynamic relocations before the +# output section has been populated. +OTHER_GOT_RELOC_SECTIONS=" + .rel.dyn ${RELOCATING-0} : { *(.rel.dyn) } +" # GOT-related settings. # If the output has a GOT section, there must be exactly 0x7ff0 bytes # between .got and _gp. The ". = ." below stops the orphan code from diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index 3f72a2fc5a0..9584b47167d 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2006-10-20 Richard Sandiford + + * ld-mips-elf/rel32-o32.d: Bump the section number of .text by 1 + to account for the fact that .rel.dyn is now before .text in the + section table. + * ld-mips-elf/rel32-n32.d: Likewise. + * ld-mips-elf/rel64.d: Likewise. + 2006-10-19 Richard Sandiford * ld-mips-elf/tlslib-o32-hidden.got: Sort relocations against the diff --git a/ld/testsuite/ld-mips-elf/rel32-n32.d b/ld/testsuite/ld-mips-elf/rel32-n32.d index 3764f40b49a..7adf822e4d7 100644 --- a/ld/testsuite/ld-mips-elf/rel32-n32.d +++ b/ld/testsuite/ld-mips-elf/rel32-n32.d @@ -1,7 +1,7 @@ #name: MIPS rel32 n32 #source: rel32.s #as: -KPIC -EB -n32 -#readelf: -x 6 -r +#readelf: -x .text -r #ld: -shared -melf32btsmipn32 Relocation section '.rel.dyn' at offset .* contains 2 entries: diff --git a/ld/testsuite/ld-mips-elf/rel32-o32.d b/ld/testsuite/ld-mips-elf/rel32-o32.d index d2d932e5a70..ac82459519a 100644 --- a/ld/testsuite/ld-mips-elf/rel32-o32.d +++ b/ld/testsuite/ld-mips-elf/rel32-o32.d @@ -1,7 +1,7 @@ #name: MIPS rel32 o32 #source: rel32.s #as: -KPIC -EB -32 -#readelf: -x 6 -r +#readelf: -x .text -r #ld: -shared -melf32btsmip Relocation section '.rel.dyn' at offset .* contains 2 entries: diff --git a/ld/testsuite/ld-mips-elf/rel64.d b/ld/testsuite/ld-mips-elf/rel64.d index c3e0913c941..37f95ae54f7 100644 --- a/ld/testsuite/ld-mips-elf/rel64.d +++ b/ld/testsuite/ld-mips-elf/rel64.d @@ -1,7 +1,7 @@ #name: MIPS rel64 n64 #source: rel64.s #as: -KPIC -EB -64 -#readelf: -x 6 -r +#readelf: -x .text -r #ld: -shared -melf64btsmip Relocation section '.rel.dyn' at offset .* contains 2 entries: -- 2.30.2