ld/

	* Makefile.am (eelf64bmip.c): Depend on emulparams/elf64bmip-defs.sh.
	(eelf64btsmip.c, eelf64ltsmip.c): Likewise.
	* Makefile.in: Regenerate.
	* emulparams/elf32bmipn32-defs.sh (INITIAL_READONLY_SECTIONS): Include
	.reginfo rather than .MIPS.options.
	* emulparams/elf64bmip-defs.sh: New file.
	* emulparams/elf64bmip.sh: Include it.
	(COMMONPAGESIZE): Delete.
	* emulparams/elf64btsmip.sh: As for elf64bmip.sh.

ld/testsuite/
	* ld-mips-elf/branch-misc-1.d: Set the start address to 0x20000000.
	* ld-mips-elf/jalbal.d: Likewise 0x200000a0.
	* ld-mips-elf/jaloverflow-2.d: Likewise 0x20000000.
	* ld-mips-elf/reloc-3-n32.d: Likewise.
	* ld-mips-elf/reloc-3.d: Likewise.
	* ld-mips-elf/textrel-1.d: Don't require a specific file offset for
	.dynamic.

7 files changed, 43 insertions, 33 deletions

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 63770f0..72ac66e 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,13 @@
+2006-10-16  Richard Sandiford  <richard@codesourcery.com>
+
+	* ld-mips-elf/branch-misc-1.d: Set the start address to 0x20000000.
+	* ld-mips-elf/jalbal.d: Likewise 0x200000a0.
+	* ld-mips-elf/jaloverflow-2.d: Likewise 0x20000000.
+	* ld-mips-elf/reloc-3-n32.d: Likewise.
+	* ld-mips-elf/reloc-3.d: Likewise.
+	* ld-mips-elf/textrel-1.d: Don't require a specific file offset for
+	.dynamic.
+
 2006-10-03  Jakub Jelinek  <jakub@redhat.com>
 
 	* ld-elf/eh4.d: New test.
diff --git a/ld/testsuite/ld-mips-elf/branch-misc-1.d b/ld/testsuite/ld-mips-elf/branch-misc-1.d
index 36bceb7..0cd3701 100644
--- a/ld/testsuite/ld-mips-elf/branch-misc-1.d
+++ b/ld/testsuite/ld-mips-elf/branch-misc-1.d
@@ -1,7 +1,7 @@
 #name: MIPS branch-misc-1
 #source: ../../../gas/testsuite/gas/mips/branch-misc-1.s
 #objdump: --prefix-addresses -tdr --show-raw-insn
-#ld: -Ttext 0x500000 -e 0x500000 -N
+#ld: -Ttext 0x20000000 -e 0x20000000 -N
 
 .*:     file format elf.*mips.*
 
@@ -11,18 +11,18 @@ Disassembly of section \.text:
 	\.\.\.
 	\.\.\.
 	\.\.\.
-0+50003c <[^>]*> 0411fff0 	bal	0+500000 <[^>]*>
-0+500040 <[^>]*> 00000000 	nop
-0+500044 <[^>]*> 0411fff3 	bal	0+500014 <[^>]*>
-0+500048 <[^>]*> 00000000 	nop
-0+50004c <[^>]*> 0411fff6 	bal	0+500028 <[^>]*>
-0+500050 <[^>]*> 00000000 	nop
-0+500054 <[^>]*> 0411000a 	bal	0+500080 <[^>]*>
-0+500058 <[^>]*> 00000000 	nop
-0+50005c <[^>]*> 0411000d 	bal	0+500094 <[^>]*>
-0+500060 <[^>]*> 00000000 	nop
-0+500064 <[^>]*> 04110010 	bal	0+5000a8 <[^>]*>
-0+500068 <[^>]*> 00000000 	nop
+0*2000003c <[^>]*> 0411fff0 	bal	0*20000000 <[^>]*>
+0*20000040 <[^>]*> 00000000 	nop
+0*20000044 <[^>]*> 0411fff3 	bal	0*20000014 <[^>]*>
+0*20000048 <[^>]*> 00000000 	nop
+0*2000004c <[^>]*> 0411fff6 	bal	0*20000028 <[^>]*>
+0*20000050 <[^>]*> 00000000 	nop
+0*20000054 <[^>]*> 0411000a 	bal	0*20000080 <[^>]*>
+0*20000058 <[^>]*> 00000000 	nop
+0*2000005c <[^>]*> 0411000d 	bal	0*20000094 <[^>]*>
+0*20000060 <[^>]*> 00000000 	nop
+0*20000064 <[^>]*> 04110010 	bal	0*200000a8 <[^>]*>
+0*20000068 <[^>]*> 00000000 	nop
 	\.\.\.
 	\.\.\.
 	\.\.\.
diff --git a/ld/testsuite/ld-mips-elf/jalbal.d b/ld/testsuite/ld-mips-elf/jalbal.d
index bc9a512..49cda75 100644
--- a/ld/testsuite/ld-mips-elf/jalbal.d
+++ b/ld/testsuite/ld-mips-elf/jalbal.d
@@ -1,7 +1,7 @@
 #name: jal to bal
 #source: jalbal.s
 #as: -EB -n32 -march=rm9000
-#ld: -EB -e s1 -Ttext 0x100000a0
+#ld: -EB -e s1 -Ttext 0x200000a0
 #objdump: -d
 
 .*file format elf.*mips.*
@@ -9,16 +9,16 @@
 Disassembly of section \.text:
 
 .* <s1>:
-.*	0c00802a 	jal	.*100200a8 <s3>
+.*	0c00802a 	jal	.*200200a8 <s3>
 .*	00000000 	nop
-.*	04117fff 	bal	.*100200a8 <s3>
+.*	04117fff 	bal	.*200200a8 <s3>
 
 .* <s2>:
 .*	\.\.\.
 
 .* <s3>:
-.*	04118000 	bal	.*100000ac <s2>
+.*	04118000 	bal	.*200000ac <s2>
 .*	00000000 	nop
-.*	0c00002b 	jal	.*100000ac <s2>
+.*	0c00002b 	jal	.*200000ac <s2>
 .*	00000000 	nop
 .*	\.\.\.
diff --git a/ld/testsuite/ld-mips-elf/jaloverflow-2.d b/ld/testsuite/ld-mips-elf/jaloverflow-2.d
index b28b4ed..b40f428 100644
--- a/ld/testsuite/ld-mips-elf/jaloverflow-2.d
+++ b/ld/testsuite/ld-mips-elf/jaloverflow-2.d
@@ -1,8 +1,8 @@
 #name: JAL overflow 2
 #source: jaloverflow-2.s
 #as:
-#ld: -Ttext=0x10000000 -e start
+#ld: -Ttext=0x20000000 -e start
 #objdump: -dr
 #...
-0*10000000:	0c000000.*
+0*20000000:	0c000000.*
 #pass
diff --git a/ld/testsuite/ld-mips-elf/reloc-3-n32.d b/ld/testsuite/ld-mips-elf/reloc-3-n32.d
index 61cb276..e90180b 100644
--- a/ld/testsuite/ld-mips-elf/reloc-3-n32.d
+++ b/ld/testsuite/ld-mips-elf/reloc-3-n32.d
@@ -2,7 +2,7 @@
 #source: ../../../gas/testsuite/gas/mips/elf-rel6.s
 #as: -march=mips64 -mabi=n32 -EB
 #objdump: --prefix-addresses -tdr --show-raw-insn
-#ld: -Ttext 0x500000 -e 0x500000 -N -melf32btsmipn32
+#ld: -Ttext 0x20000000 -e 0x20000000 -N -melf32btsmipn32
 
 
 .*:     file format elf.*mips.*
@@ -10,9 +10,9 @@
 #...
 
 Disassembly of section \.text:
-0+500000 <[^>]*> f010 8352 	lb	v0,-32750\(v1\)
-0+500004 <[^>]*> f010 8353 	lb	v0,-32749\(v1\)
-0+500008 <[^>]*> f252 8346 	lb	v0,-28090\(v1\)
-0+50000c <[^>]*> 6500      	nop
-0+50000e <[^>]*> 6500      	nop
+0*20000000 <[^>]*> f010 8352 	lb	v0,-32750\(v1\)
+0*20000004 <[^>]*> f010 8353 	lb	v0,-32749\(v1\)
+0*20000008 <[^>]*> f252 8346 	lb	v0,-28090\(v1\)
+0*2000000c <[^>]*> 6500      	nop
+0*2000000e <[^>]*> 6500      	nop
 #pass
diff --git a/ld/testsuite/ld-mips-elf/reloc-3.d b/ld/testsuite/ld-mips-elf/reloc-3.d
index 632d999..1ec51c5 100644
--- a/ld/testsuite/ld-mips-elf/reloc-3.d
+++ b/ld/testsuite/ld-mips-elf/reloc-3.d
@@ -1,16 +1,16 @@
 #name: R_MIPS16_GPREL reloc
 #source: ../../../gas/testsuite/gas/mips/elf-rel6.s
 #objdump: --prefix-addresses -tdr --show-raw-insn
-#ld: -Ttext 0x500000 -e 0x500000 -N
+#ld: -Ttext 0x20000000 -e 0x20000000 -N
 
 .*:     file format elf.*mips.*
 
 #...
 
 Disassembly of section \.text:
-0+500000 <[^>]*> f010 8352 	lb	v0,-32750\(v1\)
-0+500004 <[^>]*> f010 8353 	lb	v0,-32749\(v1\)
-0+500008 <[^>]*> f252 8346 	lb	v0,-28090\(v1\)
-0+50000c <[^>]*> 6500      	nop
-0+50000e <[^>]*> 6500      	nop
+0*20000000 <[^>]*> f010 8352 	lb	v0,-32750\(v1\)
+0*20000004 <[^>]*> f010 8353 	lb	v0,-32749\(v1\)
+0*20000008 <[^>]*> f252 8346 	lb	v0,-28090\(v1\)
+0*2000000c <[^>]*> 6500      	nop
+0*2000000e <[^>]*> 6500      	nop
 #pass
diff --git a/ld/testsuite/ld-mips-elf/textrel-1.d b/ld/testsuite/ld-mips-elf/textrel-1.d
index 7172bb7..945c863 100644
--- a/ld/testsuite/ld-mips-elf/textrel-1.d
+++ b/ld/testsuite/ld-mips-elf/textrel-1.d
@@ -4,7 +4,7 @@
 #ld: -shared -melf32btsmipn32
 #readelf: -d
 
-Dynamic section at offset 0xb4 contains 18 entries:
+Dynamic section at offset .* contains 18 entries:
   Tag        Type                         Name/Value
  0x00000004 \(HASH\)                       0x[0-9a-f]*
  0x00000005 \(STRTAB\)                     0x[0-9a-f]*