* gas/mips/ld.d: Rename to...

	* gas/mips/mips1@ld.d: ... this.
	* gas/mips/ld-ilocks.d: Rename to...
	* gas/mips/ld.d: ... this.
	* gas/mips/r3000@ld.d: New test, R3000 version.
	* gas/mips/ecoff@ld.d: Likewise, ECOFF version.
	* gas/mips/r3900@ecoff@ld.d: Likewise, R3900/ECOFF version.
	* gas/mips/mips2@ecoff@ld.d: Likewise, MIPS II/ECOFF version.
	* gas/mips/mips32@ecoff@ld.d: Likewise, MIPS32/ECOFF version.
	* gas/mips/mips32r2@ecoff@ld.d: Likewise, MIPS32r2/ECOFF version.
	* gas/mips/mips.exp: Remove "ld-ilocks" and run "ld" over all
	architectures matching "mips1".

10 files changed, 439 insertions, 15 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 286fce9..ee189b6 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,4 +1,19 @@
 2010-10-24  Maciej W. Rozycki  <macro@linux-mips.org>
+
+	* gas/mips/ld.d: Rename to...
+	* gas/mips/mips1@ld.d: ... this.
+	* gas/mips/ld-ilocks.d: Rename to...
+	* gas/mips/ld.d: ... this.
+	* gas/mips/r3000@ld.d: New test, R3000 version.
+	* gas/mips/ecoff@ld.d: Likewise, ECOFF version.
+	* gas/mips/r3900@ecoff@ld.d: Likewise, R3900/ECOFF version.
+	* gas/mips/mips2@ecoff@ld.d: Likewise, MIPS II/ECOFF version.
+	* gas/mips/mips32@ecoff@ld.d: Likewise, MIPS32/ECOFF version.
+	* gas/mips/mips32r2@ecoff@ld.d: Likewise, MIPS32r2/ECOFF version.
+	* gas/mips/mips.exp: Remove "ld-ilocks" and run "ld" over all
+	architectures matching "mips1".
+
+2010-10-24  Maciej W. Rozycki  <macro@linux-mips.org>
             Richard Sandiford  <rdsandiford@googlemail.com>
 
 	* gas/mips/mips.exp (run_dump_test_arch): Check for the presence
diff --git a/gas/testsuite/gas/mips/ecoff@ld.d b/gas/testsuite/gas/mips/ecoff@ld.d
new file mode 100644
index 0000000..57d8dbb
--- /dev/null
+++ b/gas/testsuite/gas/mips/ecoff@ld.d
@@ -0,0 +1,386 @@
+#objdump: -dr --prefix-addresses
+#as: -32
+#name: MIPS ld
+#source: ld.s
+
+# Test the ld macro (ECOFF).
+
+.*: +file format .*mips.*
+
+Disassembly of section \.text:
+[0-9a-f]+ <[^>]*> ld	a0,0\(zero\)
+[0-9a-f]+ <[^>]*> ld	a0,1\(zero\)
+[0-9a-f]+ <[^>]*> lui	a0,0x1
+[0-9a-f]+ <[^>]*> ld	a0,-32768\(a0\)
+[0-9a-f]+ <[^>]*> ld	a0,-32768\(zero\)
+[0-9a-f]+ <[^>]*> lui	a0,0x1
+[0-9a-f]+ <[^>]*> ld	a0,0\(a0\)
+[0-9a-f]+ <[^>]*> lui	a0,0x2
+[0-9a-f]+ <[^>]*> ld	a0,-23131\(a0\)
+[0-9a-f]+ <[^>]*> ld	a0,0\(a1\)
+[0-9a-f]+ <[^>]*> ld	a0,1\(a1\)
+[0-9a-f]+ <[^>]*> lui	a0,0x1
+[0-9a-f]+ <[^>]*> addu	a0,a0,a1
+[0-9a-f]+ <[^>]*> ld	a0,-32768\(a0\)
+[0-9a-f]+ <[^>]*> ld	a0,-32768\(a1\)
+[0-9a-f]+ <[^>]*> lui	a0,0x1
+[0-9a-f]+ <[^>]*> addu	a0,a0,a1
+[0-9a-f]+ <[^>]*> ld	a0,0\(a0\)
+[0-9a-f]+ <[^>]*> lui	a0,0x2
+[0-9a-f]+ <[^>]*> addu	a0,a0,a1
+[0-9a-f]+ <[^>]*> ld	a0,-23131\(a0\)
+[0-9a-f]+ <[^>]*> lui	a0,0x0
+[ 	]*[0-9a-f]+: REFHI	\.data\+0xfffff000
+[0-9a-f]+ <[^>]*> ld	a0,4096\(a0\)
+[ 	]*[0-9a-f]+: REFLO	\.data\+0xfffff000
+[0-9a-f]+ <[^>]*> lui	a0,0x0
+[ 	]*[0-9a-f]+: REFHI	big_external_data_label
+[0-9a-f]+ <[^>]*> ld	a0,0\(a0\)
+[ 	]*[0-9a-f]+: REFLO	big_external_data_label
+[0-9a-f]+ <[^>]*> ld	a0,0\(gp\)
+[ 	]*[0-9a-f]+: GPREL	small_external_data_label
+[0-9a-f]+ <[^>]*> lui	a0,0x0
+[ 	]*[0-9a-f]+: REFHI	big_external_common
+[0-9a-f]+ <[^>]*> ld	a0,0\(a0\)
+[ 	]*[0-9a-f]+: REFLO	big_external_common
+[0-9a-f]+ <[^>]*> ld	a0,0\(gp\)
+[ 	]*[0-9a-f]+: GPREL	small_external_common
+[0-9a-f]+ <[^>]*> lui	a0,0x0
+[ 	]*[0-9a-f]+: REFHI	\.bss\+0xffffe000
+[0-9a-f]+ <[^>]*> ld	a0,8192\(a0\)
+[ 	]*[0-9a-f]+: REFLO	\.bss\+0xffffe000
+[0-9a-f]+ <[^>]*> ld	a0,-16384\(gp\)
+[ 	]*[0-9a-f]+: GPREL	\.sbss\+0x4000
+[0-9a-f]+ <[^>]*> lui	a0,0x0
+[ 	]*[0-9a-f]+: REFHI	\.data\+0xfffff000
+[0-9a-f]+ <[^>]*> ld	a0,4097\(a0\)
+[ 	]*[0-9a-f]+: REFLO	\.data\+0xfffff000
+[0-9a-f]+ <[^>]*> lui	a0,0x0
+[ 	]*[0-9a-f]+: REFHI	big_external_data_label
+[0-9a-f]+ <[^>]*> ld	a0,1\(a0\)
+[ 	]*[0-9a-f]+: REFLO	big_external_data_label
+[0-9a-f]+ <[^>]*> ld	a0,1\(gp\)
+[ 	]*[0-9a-f]+: GPREL	small_external_data_label
+[0-9a-f]+ <[^>]*> lui	a0,0x0
+[ 	]*[0-9a-f]+: REFHI	big_external_common
+[0-9a-f]+ <[^>]*> ld	a0,1\(a0\)
+[ 	]*[0-9a-f]+: REFLO	big_external_common
+[0-9a-f]+ <[^>]*> ld	a0,1\(gp\)
+[ 	]*[0-9a-f]+: GPREL	small_external_common
+[0-9a-f]+ <[^>]*> lui	a0,0x0
+[ 	]*[0-9a-f]+: REFHI	\.bss\+0xffffe000
+[0-9a-f]+ <[^>]*> ld	a0,8193\(a0\)
+[ 	]*[0-9a-f]+: REFLO	\.bss\+0xffffe000
+[0-9a-f]+ <[^>]*> ld	a0,-16383\(gp\)
+[ 	]*[0-9a-f]+: GPREL	\.sbss\+0x4000
+[0-9a-f]+ <[^>]*> lui	a0,0x1
+[ 	]*[0-9a-f]+: REFHI	\.data\+0xfffff000
+[0-9a-f]+ <[^>]*> ld	a0,-28672\(a0\)
+[ 	]*[0-9a-f]+: REFLO	\.data\+0xfffff000
+[0-9a-f]+ <[^>]*> lui	a0,0x1
+[ 	]*[0-9a-f]+: REFHI	big_external_data_label
+[0-9a-f]+ <[^>]*> ld	a0,-32768\(a0\)
+[ 	]*[0-9a-f]+: REFLO	big_external_data_label
+[0-9a-f]+ <[^>]*> lui	a0,0x1
+[ 	]*[0-9a-f]+: REFHI	small_external_data_label
+[0-9a-f]+ <[^>]*> ld	a0,-32768\(a0\)
+[ 	]*[0-9a-f]+: REFLO	small_external_data_label
+[0-9a-f]+ <[^>]*> lui	a0,0x1
+[ 	]*[0-9a-f]+: REFHI	big_external_common
+[0-9a-f]+ <[^>]*> ld	a0,-32768\(a0\)
+[ 	]*[0-9a-f]+: REFLO	big_external_common
+[0-9a-f]+ <[^>]*> lui	a0,0x1
+[ 	]*[0-9a-f]+: REFHI	small_external_common
+[0-9a-f]+ <[^>]*> ld	a0,-32768\(a0\)
+[ 	]*[0-9a-f]+: REFLO	small_external_common
+[0-9a-f]+ <[^>]*> lui	a0,0x1
+[ 	]*[0-9a-f]+: REFHI	\.bss\+0xffffe000
+[0-9a-f]+ <[^>]*> ld	a0,-24576\(a0\)
+[ 	]*[0-9a-f]+: REFLO	\.bss\+0xffffe000
+[0-9a-f]+ <[^>]*> lui	a0,0x1
+[ 	]*[0-9a-f]+: REFHI	\.sbss\+0xfffff000
+[0-9a-f]+ <[^>]*> ld	a0,-28672\(a0\)
+[ 	]*[0-9a-f]+: REFLO	\.sbss\+0xfffff000
+[0-9a-f]+ <[^>]*> lui	a0,0x0
+[ 	]*[0-9a-f]+: REFHI	\.data\+0xfffff000
+[0-9a-f]+ <[^>]*> ld	a0,-28672\(a0\)
+[ 	]*[0-9a-f]+: REFLO	\.data\+0xfffff000
+[0-9a-f]+ <[^>]*> lui	a0,0x0
+[ 	]*[0-9a-f]+: REFHI	big_external_data_label
+[0-9a-f]+ <[^>]*> ld	a0,-32768\(a0\)
+[ 	]*[0-9a-f]+: REFLO	big_external_data_label
+[0-9a-f]+ <[^>]*> lui	a0,0x0
+[ 	]*[0-9a-f]+: REFHI	small_external_data_label
+[0-9a-f]+ <[^>]*> ld	a0,-32768\(a0\)
+[ 	]*[0-9a-f]+: REFLO	small_external_data_label
+[0-9a-f]+ <[^>]*> lui	a0,0x0
+[ 	]*[0-9a-f]+: REFHI	big_external_common
+[0-9a-f]+ <[^>]*> ld	a0,-32768\(a0\)
+[ 	]*[0-9a-f]+: REFLO	big_external_common
+[0-9a-f]+ <[^>]*> lui	a0,0x0
+[ 	]*[0-9a-f]+: REFHI	small_external_common
+[0-9a-f]+ <[^>]*> ld	a0,-32768\(a0\)
+[ 	]*[0-9a-f]+: REFLO	small_external_common
+[0-9a-f]+ <[^>]*> lui	a0,0x0
+[ 	]*[0-9a-f]+: REFHI	\.bss\+0xffffe000
+[0-9a-f]+ <[^>]*> ld	a0,-24576\(a0\)
+[ 	]*[0-9a-f]+: REFLO	\.bss\+0xffffe000
+[0-9a-f]+ <[^>]*> lui	a0,0x0
+[ 	]*[0-9a-f]+: REFHI	\.sbss\+0xfffff000
+[0-9a-f]+ <[^>]*> ld	a0,-28672\(a0\)
+[ 	]*[0-9a-f]+: REFLO	\.sbss\+0xfffff000
+[0-9a-f]+ <[^>]*> lui	a0,0x1
+[ 	]*[0-9a-f]+: REFHI	\.data\+0xfffff000
+[0-9a-f]+ <[^>]*> ld	a0,4096\(a0\)
+[ 	]*[0-9a-f]+: REFLO	\.data\+0xfffff000
+[0-9a-f]+ <[^>]*> lui	a0,0x1
+[ 	]*[0-9a-f]+: REFHI	big_external_data_label
+[0-9a-f]+ <[^>]*> ld	a0,0\(a0\)
+[ 	]*[0-9a-f]+: REFLO	big_external_data_label
+[0-9a-f]+ <[^>]*> lui	a0,0x1
+[ 	]*[0-9a-f]+: REFHI	small_external_data_label
+[0-9a-f]+ <[^>]*> ld	a0,0\(a0\)
+[ 	]*[0-9a-f]+: REFLO	small_external_data_label
+[0-9a-f]+ <[^>]*> lui	a0,0x1
+[ 	]*[0-9a-f]+: REFHI	big_external_common
+[0-9a-f]+ <[^>]*> ld	a0,0\(a0\)
+[ 	]*[0-9a-f]+: REFLO	big_external_common
+[0-9a-f]+ <[^>]*> lui	a0,0x1
+[ 	]*[0-9a-f]+: REFHI	small_external_common
+[0-9a-f]+ <[^>]*> ld	a0,0\(a0\)
+[ 	]*[0-9a-f]+: REFLO	small_external_common
+[0-9a-f]+ <[^>]*> lui	a0,0x1
+[ 	]*[0-9a-f]+: REFHI	\.bss\+0xffffe000
+[0-9a-f]+ <[^>]*> ld	a0,8192\(a0\)
+[ 	]*[0-9a-f]+: REFLO	\.bss\+0xffffe000
+[0-9a-f]+ <[^>]*> lui	a0,0x1
+[ 	]*[0-9a-f]+: REFHI	\.sbss\+0xfffff000
+[0-9a-f]+ <[^>]*> ld	a0,4096\(a0\)
+[ 	]*[0-9a-f]+: REFLO	\.sbss\+0xfffff000
+[0-9a-f]+ <[^>]*> lui	a0,0x2
+[ 	]*[0-9a-f]+: REFHI	\.data\+0xfffff000
+[0-9a-f]+ <[^>]*> ld	a0,-19035\(a0\)
+[ 	]*[0-9a-f]+: REFLO	\.data\+0xfffff000
+[0-9a-f]+ <[^>]*> lui	a0,0x2
+[ 	]*[0-9a-f]+: REFHI	big_external_data_label
+[0-9a-f]+ <[^>]*> ld	a0,-23131\(a0\)
+[ 	]*[0-9a-f]+: REFLO	big_external_data_label
+[0-9a-f]+ <[^>]*> lui	a0,0x2
+[ 	]*[0-9a-f]+: REFHI	small_external_data_label
+[0-9a-f]+ <[^>]*> ld	a0,-23131\(a0\)
+[ 	]*[0-9a-f]+: REFLO	small_external_data_label
+[0-9a-f]+ <[^>]*> lui	a0,0x2
+[ 	]*[0-9a-f]+: REFHI	big_external_common
+[0-9a-f]+ <[^>]*> ld	a0,-23131\(a0\)
+[ 	]*[0-9a-f]+: REFLO	big_external_common
+[0-9a-f]+ <[^>]*> lui	a0,0x2
+[ 	]*[0-9a-f]+: REFHI	small_external_common
+[0-9a-f]+ <[^>]*> ld	a0,-23131\(a0\)
+[ 	]*[0-9a-f]+: REFLO	small_external_common
+[0-9a-f]+ <[^>]*> lui	a0,0x2
+[ 	]*[0-9a-f]+: REFHI	\.bss\+0xffffe000
+[0-9a-f]+ <[^>]*> ld	a0,-14939\(a0\)
+[ 	]*[0-9a-f]+: REFLO	\.bss\+0xffffe000
+[0-9a-f]+ <[^>]*> lui	a0,0x2
+[ 	]*[0-9a-f]+: REFHI	\.sbss\+0xfffff000
+[0-9a-f]+ <[^>]*> ld	a0,-19035\(a0\)
+[ 	]*[0-9a-f]+: REFLO	\.sbss\+0xfffff000
+[0-9a-f]+ <[^>]*> lui	a0,0x0
+[ 	]*[0-9a-f]+: REFHI	\.data\+0xfffff000
+[0-9a-f]+ <[^>]*> addu	a0,a0,a1
+[0-9a-f]+ <[^>]*> ld	a0,4096\(a0\)
+[ 	]*[0-9a-f]+: REFLO	\.data\+0xfffff000
+[0-9a-f]+ <[^>]*> lui	a0,0x0
+[ 	]*[0-9a-f]+: REFHI	big_external_data_label
+[0-9a-f]+ <[^>]*> addu	a0,a0,a1
+[0-9a-f]+ <[^>]*> ld	a0,0\(a0\)
+[ 	]*[0-9a-f]+: REFLO	big_external_data_label
+[0-9a-f]+ <[^>]*> addu	a0,a1,gp
+[0-9a-f]+ <[^>]*> ld	a0,0\(a0\)
+[ 	]*[0-9a-f]+: GPREL	small_external_data_label
+[0-9a-f]+ <[^>]*> lui	a0,0x0
+[ 	]*[0-9a-f]+: REFHI	big_external_common
+[0-9a-f]+ <[^>]*> addu	a0,a0,a1
+[0-9a-f]+ <[^>]*> ld	a0,0\(a0\)
+[ 	]*[0-9a-f]+: REFLO	big_external_common
+[0-9a-f]+ <[^>]*> addu	a0,a1,gp
+[0-9a-f]+ <[^>]*> ld	a0,0\(a0\)
+[ 	]*[0-9a-f]+: GPREL	small_external_common
+[0-9a-f]+ <[^>]*> lui	a0,0x0
+[ 	]*[0-9a-f]+: REFHI	\.bss\+0xffffe000
+[0-9a-f]+ <[^>]*> addu	a0,a0,a1
+[0-9a-f]+ <[^>]*> ld	a0,8192\(a0\)
+[ 	]*[0-9a-f]+: REFLO	\.bss\+0xffffe000
+[0-9a-f]+ <[^>]*> addu	a0,a1,gp
+[0-9a-f]+ <[^>]*> ld	a0,-16384\(a0\)
+[ 	]*[0-9a-f]+: GPREL	\.sbss\+0x4000
+[0-9a-f]+ <[^>]*> lui	a0,0x0
+[ 	]*[0-9a-f]+: REFHI	\.data\+0xfffff000
+[0-9a-f]+ <[^>]*> addu	a0,a0,a1
+[0-9a-f]+ <[^>]*> ld	a0,4097\(a0\)
+[ 	]*[0-9a-f]+: REFLO	\.data\+0xfffff000
+[0-9a-f]+ <[^>]*> lui	a0,0x0
+[ 	]*[0-9a-f]+: REFHI	big_external_data_label
+[0-9a-f]+ <[^>]*> addu	a0,a0,a1
+[0-9a-f]+ <[^>]*> ld	a0,1\(a0\)
+[ 	]*[0-9a-f]+: REFLO	big_external_data_label
+[0-9a-f]+ <[^>]*> addu	a0,a1,gp
+[0-9a-f]+ <[^>]*> ld	a0,1\(a0\)
+[ 	]*[0-9a-f]+: GPREL	small_external_data_label
+[0-9a-f]+ <[^>]*> lui	a0,0x0
+[ 	]*[0-9a-f]+: REFHI	big_external_common
+[0-9a-f]+ <[^>]*> addu	a0,a0,a1
+[0-9a-f]+ <[^>]*> ld	a0,1\(a0\)
+[ 	]*[0-9a-f]+: REFLO	big_external_common
+[0-9a-f]+ <[^>]*> addu	a0,a1,gp
+[0-9a-f]+ <[^>]*> ld	a0,1\(a0\)
+[ 	]*[0-9a-f]+: GPREL	small_external_common
+[0-9a-f]+ <[^>]*> lui	a0,0x0
+[ 	]*[0-9a-f]+: REFHI	\.bss\+0xffffe000
+[0-9a-f]+ <[^>]*> addu	a0,a0,a1
+[0-9a-f]+ <[^>]*> ld	a0,8193\(a0\)
+[ 	]*[0-9a-f]+: REFLO	\.bss\+0xffffe000
+[0-9a-f]+ <[^>]*> addu	a0,a1,gp
+[0-9a-f]+ <[^>]*> ld	a0,-16383\(a0\)
+[ 	]*[0-9a-f]+: GPREL	\.sbss\+0x4000
+[0-9a-f]+ <[^>]*> lui	a0,0x1
+[ 	]*[0-9a-f]+: REFHI	\.data\+0xfffff000
+[0-9a-f]+ <[^>]*> addu	a0,a0,a1
+[0-9a-f]+ <[^>]*> ld	a0,-28672\(a0\)
+[ 	]*[0-9a-f]+: REFLO	\.data\+0xfffff000
+[0-9a-f]+ <[^>]*> lui	a0,0x1
+[ 	]*[0-9a-f]+: REFHI	big_external_data_label
+[0-9a-f]+ <[^>]*> addu	a0,a0,a1
+[0-9a-f]+ <[^>]*> ld	a0,-32768\(a0\)
+[ 	]*[0-9a-f]+: REFLO	big_external_data_label
+[0-9a-f]+ <[^>]*> lui	a0,0x1
+[ 	]*[0-9a-f]+: REFHI	small_external_data_label
+[0-9a-f]+ <[^>]*> addu	a0,a0,a1
+[0-9a-f]+ <[^>]*> ld	a0,-32768\(a0\)
+[ 	]*[0-9a-f]+: REFLO	small_external_data_label
+[0-9a-f]+ <[^>]*> lui	a0,0x1
+[ 	]*[0-9a-f]+: REFHI	big_external_common
+[0-9a-f]+ <[^>]*> addu	a0,a0,a1
+[0-9a-f]+ <[^>]*> ld	a0,-32768\(a0\)
+[ 	]*[0-9a-f]+: REFLO	big_external_common
+[0-9a-f]+ <[^>]*> lui	a0,0x1
+[ 	]*[0-9a-f]+: REFHI	small_external_common
+[0-9a-f]+ <[^>]*> addu	a0,a0,a1
+[0-9a-f]+ <[^>]*> ld	a0,-32768\(a0\)
+[ 	]*[0-9a-f]+: REFLO	small_external_common
+[0-9a-f]+ <[^>]*> lui	a0,0x1
+[ 	]*[0-9a-f]+: REFHI	\.bss\+0xffffe000
+[0-9a-f]+ <[^>]*> addu	a0,a0,a1
+[0-9a-f]+ <[^>]*> ld	a0,-24576\(a0\)
+[ 	]*[0-9a-f]+: REFLO	\.bss\+0xffffe000
+[0-9a-f]+ <[^>]*> lui	a0,0x1
+[ 	]*[0-9a-f]+: REFHI	\.sbss\+0xfffff000
+[0-9a-f]+ <[^>]*> addu	a0,a0,a1
+[0-9a-f]+ <[^>]*> ld	a0,-28672\(a0\)
+[ 	]*[0-9a-f]+: REFLO	\.sbss\+0xfffff000
+[0-9a-f]+ <[^>]*> lui	a0,0x0
+[ 	]*[0-9a-f]+: REFHI	\.data\+0xfffff000
+[0-9a-f]+ <[^>]*> addu	a0,a0,a1
+[0-9a-f]+ <[^>]*> ld	a0,-28672\(a0\)
+[ 	]*[0-9a-f]+: REFLO	\.data\+0xfffff000
+[0-9a-f]+ <[^>]*> lui	a0,0x0
+[ 	]*[0-9a-f]+: REFHI	big_external_data_label
+[0-9a-f]+ <[^>]*> addu	a0,a0,a1
+[0-9a-f]+ <[^>]*> ld	a0,-32768\(a0\)
+[ 	]*[0-9a-f]+: REFLO	big_external_data_label
+[0-9a-f]+ <[^>]*> lui	a0,0x0
+[ 	]*[0-9a-f]+: REFHI	small_external_data_label
+[0-9a-f]+ <[^>]*> addu	a0,a0,a1
+[0-9a-f]+ <[^>]*> ld	a0,-32768\(a0\)
+[ 	]*[0-9a-f]+: REFLO	small_external_data_label
+[0-9a-f]+ <[^>]*> lui	a0,0x0
+[ 	]*[0-9a-f]+: REFHI	big_external_common
+[0-9a-f]+ <[^>]*> addu	a0,a0,a1
+[0-9a-f]+ <[^>]*> ld	a0,-32768\(a0\)
+[ 	]*[0-9a-f]+: REFLO	big_external_common
+[0-9a-f]+ <[^>]*> lui	a0,0x0
+[ 	]*[0-9a-f]+: REFHI	small_external_common
+[0-9a-f]+ <[^>]*> addu	a0,a0,a1
+[0-9a-f]+ <[^>]*> ld	a0,-32768\(a0\)
+[ 	]*[0-9a-f]+: REFLO	small_external_common
+[0-9a-f]+ <[^>]*> lui	a0,0x0
+[ 	]*[0-9a-f]+: REFHI	\.bss\+0xffffe000
+[0-9a-f]+ <[^>]*> addu	a0,a0,a1
+[0-9a-f]+ <[^>]*> ld	a0,-24576\(a0\)
+[ 	]*[0-9a-f]+: REFLO	\.bss\+0xffffe000
+[0-9a-f]+ <[^>]*> lui	a0,0x0
+[ 	]*[0-9a-f]+: REFHI	\.sbss\+0xfffff000
+[0-9a-f]+ <[^>]*> addu	a0,a0,a1
+[0-9a-f]+ <[^>]*> ld	a0,-28672\(a0\)
+[ 	]*[0-9a-f]+: REFLO	\.sbss\+0xfffff000
+[0-9a-f]+ <[^>]*> lui	a0,0x1
+[ 	]*[0-9a-f]+: REFHI	\.data\+0xfffff000
+[0-9a-f]+ <[^>]*> addu	a0,a0,a1
+[0-9a-f]+ <[^>]*> ld	a0,4096\(a0\)
+[ 	]*[0-9a-f]+: REFLO	\.data\+0xfffff000
+[0-9a-f]+ <[^>]*> lui	a0,0x1
+[ 	]*[0-9a-f]+: REFHI	big_external_data_label
+[0-9a-f]+ <[^>]*> addu	a0,a0,a1
+[0-9a-f]+ <[^>]*> ld	a0,0\(a0\)
+[ 	]*[0-9a-f]+: REFLO	big_external_data_label
+[0-9a-f]+ <[^>]*> lui	a0,0x1
+[ 	]*[0-9a-f]+: REFHI	small_external_data_label
+[0-9a-f]+ <[^>]*> addu	a0,a0,a1
+[0-9a-f]+ <[^>]*> ld	a0,0\(a0\)
+[ 	]*[0-9a-f]+: REFLO	small_external_data_label
+[0-9a-f]+ <[^>]*> lui	a0,0x1
+[ 	]*[0-9a-f]+: REFHI	big_external_common
+[0-9a-f]+ <[^>]*> addu	a0,a0,a1
+[0-9a-f]+ <[^>]*> ld	a0,0\(a0\)
+[ 	]*[0-9a-f]+: REFLO	big_external_common
+[0-9a-f]+ <[^>]*> lui	a0,0x1
+[ 	]*[0-9a-f]+: REFHI	small_external_common
+[0-9a-f]+ <[^>]*> addu	a0,a0,a1
+[0-9a-f]+ <[^>]*> ld	a0,0\(a0\)
+[ 	]*[0-9a-f]+: REFLO	small_external_common
+[0-9a-f]+ <[^>]*> lui	a0,0x1
+[ 	]*[0-9a-f]+: REFHI	\.bss\+0xffffe000
+[0-9a-f]+ <[^>]*> addu	a0,a0,a1
+[0-9a-f]+ <[^>]*> ld	a0,8192\(a0\)
+[ 	]*[0-9a-f]+: REFLO	\.bss\+0xffffe000
+[0-9a-f]+ <[^>]*> lui	a0,0x1
+[ 	]*[0-9a-f]+: REFHI	\.sbss\+0xfffff000
+[0-9a-f]+ <[^>]*> addu	a0,a0,a1
+[0-9a-f]+ <[^>]*> ld	a0,4096\(a0\)
+[ 	]*[0-9a-f]+: REFLO	\.sbss\+0xfffff000
+[0-9a-f]+ <[^>]*> lui	a0,0x2
+[ 	]*[0-9a-f]+: REFHI	\.data\+0xfffff000
+[0-9a-f]+ <[^>]*> addu	a0,a0,a1
+[0-9a-f]+ <[^>]*> ld	a0,-19035\(a0\)
+[ 	]*[0-9a-f]+: REFLO	\.data\+0xfffff000
+[0-9a-f]+ <[^>]*> lui	a0,0x2
+[ 	]*[0-9a-f]+: REFHI	big_external_data_label
+[0-9a-f]+ <[^>]*> addu	a0,a0,a1
+[0-9a-f]+ <[^>]*> ld	a0,-23131\(a0\)
+[ 	]*[0-9a-f]+: REFLO	big_external_data_label
+[0-9a-f]+ <[^>]*> lui	a0,0x2
+[ 	]*[0-9a-f]+: REFHI	small_external_data_label
+[0-9a-f]+ <[^>]*> addu	a0,a0,a1
+[0-9a-f]+ <[^>]*> ld	a0,-23131\(a0\)
+[ 	]*[0-9a-f]+: REFLO	small_external_data_label
+[0-9a-f]+ <[^>]*> lui	a0,0x2
+[ 	]*[0-9a-f]+: REFHI	big_external_common
+[0-9a-f]+ <[^>]*> addu	a0,a0,a1
+[0-9a-f]+ <[^>]*> ld	a0,-23131\(a0\)
+[ 	]*[0-9a-f]+: REFLO	big_external_common
+[0-9a-f]+ <[^>]*> lui	a0,0x2
+[ 	]*[0-9a-f]+: REFHI	small_external_common
+[0-9a-f]+ <[^>]*> addu	a0,a0,a1
+[0-9a-f]+ <[^>]*> ld	a0,-23131\(a0\)
+[ 	]*[0-9a-f]+: REFLO	small_external_common
+[0-9a-f]+ <[^>]*> lui	a0,0x2
+[ 	]*[0-9a-f]+: REFHI	\.bss\+0xffffe000
+[0-9a-f]+ <[^>]*> addu	a0,a0,a1
+[0-9a-f]+ <[^>]*> ld	a0,-14939\(a0\)
+[ 	]*[0-9a-f]+: REFLO	\.bss\+0xffffe000
+[0-9a-f]+ <[^>]*> lui	a0,0x2
+[ 	]*[0-9a-f]+: REFHI	\.sbss\+0xfffff000
+[0-9a-f]+ <[^>]*> addu	a0,a0,a1
+[0-9a-f]+ <[^>]*> ld	a0,-19035\(a0\)
+[ 	]*[0-9a-f]+: REFLO	\.sbss\+0xfffff000
+	\.\.\.
diff --git a/gas/testsuite/gas/mips/ld.d b/gas/testsuite/gas/mips/ld.d
index 6a2b534..4d6dc12 100644
--- a/gas/testsuite/gas/mips/ld.d
+++ b/gas/testsuite/gas/mips/ld.d
@@ -1,6 +1,7 @@
 #objdump: -dr --prefix-addresses
 #as: -32
 #name: MIPS ld
+#source: ld.s
 
 # Test the ld macro.
 
@@ -22,17 +23,14 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> lui	at,0x2
 [0-9a-f]+ <[^>]*> lw	a0,-23131\(at\)
 [0-9a-f]+ <[^>]*> lw	a1,-23127\(at\)
-[0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> lw	a0,0\(a1\)
 [0-9a-f]+ <[^>]*> lw	a1,4\(a1\)
-[0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> lw	a0,1\(a1\)
 [0-9a-f]+ <[^>]*> lw	a1,5\(a1\)
 [0-9a-f]+ <[^>]*> lui	at,0x1
 [0-9a-f]+ <[^>]*> addu	at,a1,at
 [0-9a-f]+ <[^>]*> lw	a0,-32768\(at\)
 [0-9a-f]+ <[^>]*> lw	a1,-32764\(at\)
-[0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> lw	a0,-32768\(a1\)
 [0-9a-f]+ <[^>]*> lw	a1,-32764\(a1\)
 [0-9a-f]+ <[^>]*> lui	at,0x1
@@ -297,7 +295,6 @@ Disassembly of section \.text:
 [ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	big_external_data_label
 [0-9a-f]+ <[^>]*> lw	a1,4\(at\)
 [ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	big_external_data_label
-[0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> addu	at,a1,gp
 [0-9a-f]+ <[^>]*> lw	a0,0\(at\)
 [ 	]*[0-9a-f]+: (R_MIPS_GPREL16|GPREL)	small_external_data_label
@@ -310,7 +307,6 @@ Disassembly of section \.text:
 [ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	big_external_common
 [0-9a-f]+ <[^>]*> lw	a1,4\(at\)
 [ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	big_external_common
-[0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> addu	at,a1,gp
 [0-9a-f]+ <[^>]*> lw	a0,0\(at\)
 [ 	]*[0-9a-f]+: (R_MIPS_GPREL16|GPREL)	small_external_common
@@ -323,7 +319,6 @@ Disassembly of section \.text:
 [ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.bss(\+0xffffe000)?
 [0-9a-f]+ <[^>]*> lw	a1,(4|8196)\(at\)
 [ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.bss(\+0xffffe000)?
-[0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> addu	at,a1,gp
 [0-9a-f]+ <[^>]*> lw	a0,(0|-16384)\(at\)
 [ 	]*[0-9a-f]+: (R_MIPS_GPREL16|GPREL)	\.sbss(\+0x4000)?
@@ -343,7 +338,6 @@ Disassembly of section \.text:
 [ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	big_external_data_label
 [0-9a-f]+ <[^>]*> lw	a1,5\(at\)
 [ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	big_external_data_label
-[0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> addu	at,a1,gp
 [0-9a-f]+ <[^>]*> lw	a0,1\(at\)
 [ 	]*[0-9a-f]+: (R_MIPS_GPREL16|GPREL)	small_external_data_label
@@ -356,7 +350,6 @@ Disassembly of section \.text:
 [ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	big_external_common
 [0-9a-f]+ <[^>]*> lw	a1,5\(at\)
 [ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	big_external_common
-[0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> addu	at,a1,gp
 [0-9a-f]+ <[^>]*> lw	a0,1\(at\)
 [ 	]*[0-9a-f]+: (R_MIPS_GPREL16|GPREL)	small_external_common
@@ -369,7 +362,6 @@ Disassembly of section \.text:
 [ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.bss(\+0xffffe000)?
 [0-9a-f]+ <[^>]*> lw	a1,(5|8197)\(at\)
 [ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.bss(\+0xffffe000)?
-[0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> addu	at,a1,gp
 [0-9a-f]+ <[^>]*> lw	a0,(1|-16383)\(at\)
 [ 	]*[0-9a-f]+: (R_MIPS_GPREL16|GPREL)	\.sbss(\+0x4000)?
diff --git a/gas/testsuite/gas/mips/mips.exp b/gas/testsuite/gas/mips/mips.exp
index 8c04254..00e50ef 100644
--- a/gas/testsuite/gas/mips/mips.exp
+++ b/gas/testsuite/gas/mips/mips.exp
@@ -514,10 +514,7 @@ if { [istarget mips*-*-vxworks*] } {
 	run_dump_test "lb-xgot-ilocks"
     }
     if !$aout {
-	run_dump_test_arches "ld" \
-				[mips_arch_list_matching mips1 !gpr_ilocks]
-	run_dump_test_arches "ld-ilocks" \
-				[mips_arch_list_matching gpr_ilocks !mips2]
+	run_dump_test_arches "ld"	[mips_arch_list_matching mips1]
     }
     if $elf { run_dump_test "ld-svr4pic" }
     if $elf { run_dump_test "ld-xgot" }
diff --git a/gas/testsuite/gas/mips/ld-ilocks.d b/gas/testsuite/gas/mips/mips1@ld.d
index dd9aaf6..7d25147 100644
--- a/gas/testsuite/gas/mips/ld-ilocks.d
+++ b/gas/testsuite/gas/mips/mips1@ld.d
@@ -1,9 +1,9 @@
 #objdump: -dr --prefix-addresses
 #as: -32
-#name: MIPS ld-ilocks
+#name: MIPS ld
 #source: ld.s
 
-# Test the ld macro.
+# Test the ld macro (MIPS1).
 
 .*: +file format .*mips.*
 
@@ -23,14 +23,17 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> lui	at,0x2
 [0-9a-f]+ <[^>]*> lw	a0,-23131\(at\)
 [0-9a-f]+ <[^>]*> lw	a1,-23127\(at\)
+[0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> lw	a0,0\(a1\)
 [0-9a-f]+ <[^>]*> lw	a1,4\(a1\)
+[0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> lw	a0,1\(a1\)
 [0-9a-f]+ <[^>]*> lw	a1,5\(a1\)
 [0-9a-f]+ <[^>]*> lui	at,0x1
 [0-9a-f]+ <[^>]*> addu	at,a1,at
 [0-9a-f]+ <[^>]*> lw	a0,-32768\(at\)
 [0-9a-f]+ <[^>]*> lw	a1,-32764\(at\)
+[0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> lw	a0,-32768\(a1\)
 [0-9a-f]+ <[^>]*> lw	a1,-32764\(a1\)
 [0-9a-f]+ <[^>]*> lui	at,0x1
@@ -295,6 +298,7 @@ Disassembly of section \.text:
 [ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	big_external_data_label
 [0-9a-f]+ <[^>]*> lw	a1,4\(at\)
 [ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	big_external_data_label
+[0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> addu	at,a1,gp
 [0-9a-f]+ <[^>]*> lw	a0,0\(at\)
 [ 	]*[0-9a-f]+: (R_MIPS_GPREL16|GPREL)	small_external_data_label
@@ -307,6 +311,7 @@ Disassembly of section \.text:
 [ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	big_external_common
 [0-9a-f]+ <[^>]*> lw	a1,4\(at\)
 [ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	big_external_common
+[0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> addu	at,a1,gp
 [0-9a-f]+ <[^>]*> lw	a0,0\(at\)
 [ 	]*[0-9a-f]+: (R_MIPS_GPREL16|GPREL)	small_external_common
@@ -319,6 +324,7 @@ Disassembly of section \.text:
 [ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.bss(\+0xffffe000)?
 [0-9a-f]+ <[^>]*> lw	a1,(4|8196)\(at\)
 [ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.bss(\+0xffffe000)?
+[0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> addu	at,a1,gp
 [0-9a-f]+ <[^>]*> lw	a0,(0|-16384)\(at\)
 [ 	]*[0-9a-f]+: (R_MIPS_GPREL16|GPREL)	\.sbss(\+0x4000)?
@@ -338,6 +344,7 @@ Disassembly of section \.text:
 [ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	big_external_data_label
 [0-9a-f]+ <[^>]*> lw	a1,5\(at\)
 [ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	big_external_data_label
+[0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> addu	at,a1,gp
 [0-9a-f]+ <[^>]*> lw	a0,1\(at\)
 [ 	]*[0-9a-f]+: (R_MIPS_GPREL16|GPREL)	small_external_data_label
@@ -350,6 +357,7 @@ Disassembly of section \.text:
 [ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	big_external_common
 [0-9a-f]+ <[^>]*> lw	a1,5\(at\)
 [ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	big_external_common
+[0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> addu	at,a1,gp
 [0-9a-f]+ <[^>]*> lw	a0,1\(at\)
 [ 	]*[0-9a-f]+: (R_MIPS_GPREL16|GPREL)	small_external_common
@@ -362,6 +370,7 @@ Disassembly of section \.text:
 [ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.bss(\+0xffffe000)?
 [0-9a-f]+ <[^>]*> lw	a1,(5|8197)\(at\)
 [ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.bss(\+0xffffe000)?
+[0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> addu	at,a1,gp
 [0-9a-f]+ <[^>]*> lw	a0,(1|-16383)\(at\)
 [ 	]*[0-9a-f]+: (R_MIPS_GPREL16|GPREL)	\.sbss(\+0x4000)?
diff --git a/gas/testsuite/gas/mips/mips2@ecoff@ld.d b/gas/testsuite/gas/mips/mips2@ecoff@ld.d
new file mode 100644
index 0000000..9dc6aa4
--- /dev/null
+++ b/gas/testsuite/gas/mips/mips2@ecoff@ld.d
@@ -0,0 +1,5 @@
+#objdump: -dr --prefix-addresses
+#as: -32
+#name: MIPS ld
+#source: ld.s
+#dump: ld.d
diff --git a/gas/testsuite/gas/mips/mips32@ecoff@ld.d b/gas/testsuite/gas/mips/mips32@ecoff@ld.d
new file mode 100644
index 0000000..9dc6aa4
--- /dev/null
+++ b/gas/testsuite/gas/mips/mips32@ecoff@ld.d
@@ -0,0 +1,5 @@
+#objdump: -dr --prefix-addresses
+#as: -32
+#name: MIPS ld
+#source: ld.s
+#dump: ld.d
diff --git a/gas/testsuite/gas/mips/mips32r2@ecoff@ld.d b/gas/testsuite/gas/mips/mips32r2@ecoff@ld.d
new file mode 100644
index 0000000..9dc6aa4
--- /dev/null
+++ b/gas/testsuite/gas/mips/mips32r2@ecoff@ld.d
@@ -0,0 +1,5 @@
+#objdump: -dr --prefix-addresses
+#as: -32
+#name: MIPS ld
+#source: ld.s
+#dump: ld.d
diff --git a/gas/testsuite/gas/mips/r3000@ld.d b/gas/testsuite/gas/mips/r3000@ld.d
new file mode 100644
index 0000000..3ce1019
--- /dev/null
+++ b/gas/testsuite/gas/mips/r3000@ld.d
@@ -0,0 +1,5 @@
+#objdump: -dr --prefix-addresses
+#as: -32
+#name: MIPS ld
+#source: ld.s
+#dump: mips1@ld.d
diff --git a/gas/testsuite/gas/mips/r3900@ecoff@ld.d b/gas/testsuite/gas/mips/r3900@ecoff@ld.d
new file mode 100644
index 0000000..9dc6aa4
--- /dev/null
+++ b/gas/testsuite/gas/mips/r3900@ecoff@ld.d
@@ -0,0 +1,5 @@
+#objdump: -dr --prefix-addresses
+#as: -32
+#name: MIPS ld
+#source: ld.s
+#dump: ld.d