* gas/mips/ld.s: Remove MIPS III bits.

	* gas/mips/ld.d: Adjust accordingly.
	* gas/mips/ld-ilocks.d: Likewise.
	* gas/mips/ld-ilocks-addr32.d: Remove file.
	* gas/mips/mips.exp: Adjust accordingly.

6 files changed, 9 insertions, 662 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index b40b1d5..f2f3b0f 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,5 +1,13 @@
 2010-10-24  Maciej W. Rozycki  <macro@linux-mips.org>
 
+	* gas/mips/ld.s: Remove MIPS III bits.
+	* gas/mips/ld.d: Adjust accordingly.
+	* gas/mips/ld-ilocks.d: Likewise.
+	* gas/mips/ld-ilocks-addr32.d: Remove file.
+	* gas/mips/mips.exp: Adjust accordingly.
+
+2010-10-24  Maciej W. Rozycki  <macro@linux-mips.org>
+
 	* gas/mips/ld.d: Spell out reloc names.
 	* gas/mips/ld-ilocks.d: Likewise.
 	* gas/mips/ld-ilocks-addr32.d: Likewise.
diff --git a/gas/testsuite/gas/mips/ld-ilocks-addr32.d b/gas/testsuite/gas/mips/ld-ilocks-addr32.d
deleted file mode 100644
index a68ea99f..0000000
--- a/gas/testsuite/gas/mips/ld-ilocks-addr32.d
+++ /dev/null
@@ -1,632 +0,0 @@
-#objdump: -dr --prefix-addresses -mmips:4000
-#as: -mips3 -mtune=r4000 -march=r4000
-#name: MIPS ld-ilocks
-#source: ld.s
-#not-target: mipstx39-*-*
-
-# Test the ld macro.
-
-.*: +file format .*mips.*
-
-Disassembly of section \.text:
-[0-9a-f]+ <[^>]*> lw	a0,0\(zero\)
-[0-9a-f]+ <[^>]*> lw	a1,4\(zero\)
-[0-9a-f]+ <[^>]*> lw	a0,1\(zero\)
-[0-9a-f]+ <[^>]*> lw	a1,5\(zero\)
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[0-9a-f]+ <[^>]*> lw	a0,-32768\(at\)
-[0-9a-f]+ <[^>]*> lw	a1,-32764\(at\)
-[0-9a-f]+ <[^>]*> lw	a0,-32768\(zero\)
-[0-9a-f]+ <[^>]*> lw	a1,-32764\(zero\)
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[0-9a-f]+ <[^>]*> lw	a0,0\(at\)
-[0-9a-f]+ <[^>]*> lw	a1,4\(at\)
-[0-9a-f]+ <[^>]*> lui	at,0x2
-[0-9a-f]+ <[^>]*> lw	a0,-23131\(at\)
-[0-9a-f]+ <[^>]*> lw	a1,-23127\(at\)
-[0-9a-f]+ <[^>]*> lw	a0,0\(a1\)
-[0-9a-f]+ <[^>]*> lw	a1,4\(a1\)
-[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]+ <[^>]*> lw	a0,-32768\(a1\)
-[0-9a-f]+ <[^>]*> lw	a1,-32764\(a1\)
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[0-9a-f]+ <[^>]*> addu	at,a1,at
-[0-9a-f]+ <[^>]*> lw	a0,0\(at\)
-[0-9a-f]+ <[^>]*> lw	a1,4\(at\)
-[0-9a-f]+ <[^>]*> lui	at,0x2
-[0-9a-f]+ <[^>]*> addu	at,a1,at
-[0-9a-f]+ <[^>]*> lw	a0,-23131\(at\)
-[0-9a-f]+ <[^>]*> lw	a1,-23127\(at\)
-[0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	\.data(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> lw	a0,(0|4096)\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.data(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> lw	a1,(4|4100)\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.data(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	big_external_data_label
-[0-9a-f]+ <[^>]*> lw	a0,0\(at\)
-[ 	]*[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]+ <[^>]*> lw	a0,0\(gp\)
-[ 	]*[0-9a-f]+: (R_MIPS_GPREL16|GPREL)	small_external_data_label
-[0-9a-f]+ <[^>]*> lw	a1,4\(gp\)
-[ 	]*[0-9a-f]+: (R_MIPS_GPREL16|GPREL)	small_external_data_label
-[0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	big_external_common
-[0-9a-f]+ <[^>]*> lw	a0,0\(at\)
-[ 	]*[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]+ <[^>]*> lw	a0,0\(gp\)
-[ 	]*[0-9a-f]+: (R_MIPS_GPREL16|GPREL)	small_external_common
-[0-9a-f]+ <[^>]*> lw	a1,4\(gp\)
-[ 	]*[0-9a-f]+: (R_MIPS_GPREL16|GPREL)	small_external_common
-[0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	\.bss(\+0xffffe000)?
-[0-9a-f]+ <[^>]*> lw	a0,(0|8192)\(at\)
-[ 	]*[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]+ <[^>]*> lw	a0,(0|-16384)\(gp\)
-[ 	]*[0-9a-f]+: (R_MIPS_GPREL16|GPREL)	\.sbss(\+0x4000)?
-[0-9a-f]+ <[^>]*> lw	a1,(4|-16380)\(gp\)
-[ 	]*[0-9a-f]+: (R_MIPS_GPREL16|GPREL)	\.sbss(\+0x4000)?
-[0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	\.data(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> lw	a0,(1|4097)\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.data(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> lw	a1,(5|4101)\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.data(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	big_external_data_label
-[0-9a-f]+ <[^>]*> lw	a0,1\(at\)
-[ 	]*[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]+ <[^>]*> lw	a0,1\(gp\)
-[ 	]*[0-9a-f]+: (R_MIPS_GPREL16|GPREL)	small_external_data_label
-[0-9a-f]+ <[^>]*> lw	a1,5\(gp\)
-[ 	]*[0-9a-f]+: (R_MIPS_GPREL16|GPREL)	small_external_data_label
-[0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	big_external_common
-[0-9a-f]+ <[^>]*> lw	a0,1\(at\)
-[ 	]*[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]+ <[^>]*> lw	a0,1\(gp\)
-[ 	]*[0-9a-f]+: (R_MIPS_GPREL16|GPREL)	small_external_common
-[0-9a-f]+ <[^>]*> lw	a1,5\(gp\)
-[ 	]*[0-9a-f]+: (R_MIPS_GPREL16|GPREL)	small_external_common
-[0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	\.bss(\+0xffffe000)?
-[0-9a-f]+ <[^>]*> lw	a0,(1|8193)\(at\)
-[ 	]*[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]+ <[^>]*> lw	a0,(1|-16383)\(gp\)
-[ 	]*[0-9a-f]+: (R_MIPS_GPREL16|GPREL)	\.sbss(\+0x4000)?
-[0-9a-f]+ <[^>]*> lw	a1,(5|-16379)\(gp\)
-[ 	]*[0-9a-f]+: (R_MIPS_GPREL16|GPREL)	\.sbss(\+0x4000)?
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	\.data(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> lw	a0,-(32768|28672)\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.data(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> lw	a1,-(32764|28668)\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.data(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	big_external_data_label
-[0-9a-f]+ <[^>]*> lw	a0,-32768\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	big_external_data_label
-[0-9a-f]+ <[^>]*> lw	a1,-32764\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	big_external_data_label
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	small_external_data_label
-[0-9a-f]+ <[^>]*> lw	a0,-32768\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	small_external_data_label
-[0-9a-f]+ <[^>]*> lw	a1,-32764\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	small_external_data_label
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	big_external_common
-[0-9a-f]+ <[^>]*> lw	a0,-32768\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	big_external_common
-[0-9a-f]+ <[^>]*> lw	a1,-32764\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	big_external_common
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	small_external_common
-[0-9a-f]+ <[^>]*> lw	a0,-32768\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	small_external_common
-[0-9a-f]+ <[^>]*> lw	a1,-32764\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	small_external_common
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	\.bss(\+0xffffe000)?
-[0-9a-f]+ <[^>]*> lw	a0,-(32768|24576)\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.bss(\+0xffffe000)?
-[0-9a-f]+ <[^>]*> lw	a1,-(32764|24572)\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.bss(\+0xffffe000)?
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	\.sbss(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> lw	a0,-(32768|28672)\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.sbss(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> lw	a1,-(32764|28668)\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.sbss(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	\.data(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> lw	a0,-(32768|28672)\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.data(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> lw	a1,-(32764|28668)\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.data(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	big_external_data_label
-[0-9a-f]+ <[^>]*> lw	a0,-32768\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	big_external_data_label
-[0-9a-f]+ <[^>]*> lw	a1,-32764\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	big_external_data_label
-[0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	small_external_data_label
-[0-9a-f]+ <[^>]*> lw	a0,-32768\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	small_external_data_label
-[0-9a-f]+ <[^>]*> lw	a1,-32764\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	small_external_data_label
-[0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	big_external_common
-[0-9a-f]+ <[^>]*> lw	a0,-32768\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	big_external_common
-[0-9a-f]+ <[^>]*> lw	a1,-32764\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	big_external_common
-[0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	small_external_common
-[0-9a-f]+ <[^>]*> lw	a0,-32768\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	small_external_common
-[0-9a-f]+ <[^>]*> lw	a1,-32764\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	small_external_common
-[0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	\.bss(\+0xffffe000)?
-[0-9a-f]+ <[^>]*> lw	a0,-(32768|24576)\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.bss(\+0xffffe000)?
-[0-9a-f]+ <[^>]*> lw	a1,-(32764|24572)\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.bss(\+0xffffe000)?
-[0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	\.sbss(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> lw	a0,-(32768|28672)\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.sbss(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> lw	a1,-(32764|28668)\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.sbss(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	\.data(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> lw	a0,(0|4096)\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.data(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> lw	a1,(4|4100)\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.data(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	big_external_data_label
-[0-9a-f]+ <[^>]*> lw	a0,0\(at\)
-[ 	]*[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]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	small_external_data_label
-[0-9a-f]+ <[^>]*> lw	a0,0\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	small_external_data_label
-[0-9a-f]+ <[^>]*> lw	a1,4\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	small_external_data_label
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	big_external_common
-[0-9a-f]+ <[^>]*> lw	a0,0\(at\)
-[ 	]*[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]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	small_external_common
-[0-9a-f]+ <[^>]*> lw	a0,0\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	small_external_common
-[0-9a-f]+ <[^>]*> lw	a1,4\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	small_external_common
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	\.bss(\+0xffffe000)?
-[0-9a-f]+ <[^>]*> lw	a0,(0|8192)\(at\)
-[ 	]*[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]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	\.sbss(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> lw	a0,(0|4096)\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.sbss(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> lw	a1,(4|4100)\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.sbss(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> lui	at,0x2
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	\.data(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> lw	a0,-(23131|19035)\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.data(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> lw	a1,-(23127|19031)\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.data(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> lui	at,0x2
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	big_external_data_label
-[0-9a-f]+ <[^>]*> lw	a0,-23131\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	big_external_data_label
-[0-9a-f]+ <[^>]*> lw	a1,-23127\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	big_external_data_label
-[0-9a-f]+ <[^>]*> lui	at,0x2
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	small_external_data_label
-[0-9a-f]+ <[^>]*> lw	a0,-23131\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	small_external_data_label
-[0-9a-f]+ <[^>]*> lw	a1,-23127\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	small_external_data_label
-[0-9a-f]+ <[^>]*> lui	at,0x2
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	big_external_common
-[0-9a-f]+ <[^>]*> lw	a0,-23131\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	big_external_common
-[0-9a-f]+ <[^>]*> lw	a1,-23127\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	big_external_common
-[0-9a-f]+ <[^>]*> lui	at,0x2
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	small_external_common
-[0-9a-f]+ <[^>]*> lw	a0,-23131\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	small_external_common
-[0-9a-f]+ <[^>]*> lw	a1,-23127\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	small_external_common
-[0-9a-f]+ <[^>]*> lui	at,0x2
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	\.bss(\+0xffffe000)?
-[0-9a-f]+ <[^>]*> lw	a0,-(23131|14939)\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.bss(\+0xffffe000)?
-[0-9a-f]+ <[^>]*> lw	a1,-(23127|14935)\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.bss(\+0xffffe000)?
-[0-9a-f]+ <[^>]*> lui	at,0x2
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	\.sbss(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> lw	a0,-(23131|19035)\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.sbss(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> lw	a1,-(23127|19031)\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.sbss(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	\.data(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> addu	at,a1,at
-[0-9a-f]+ <[^>]*> lw	a0,(0|4096)\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.data(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> lw	a1,(4|4100)\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.data(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	big_external_data_label
-[0-9a-f]+ <[^>]*> addu	at,a1,at
-[0-9a-f]+ <[^>]*> lw	a0,0\(at\)
-[ 	]*[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]+ <[^>]*> addu	at,a1,gp
-[0-9a-f]+ <[^>]*> lw	a0,0\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_GPREL16|GPREL)	small_external_data_label
-[0-9a-f]+ <[^>]*> lw	a1,4\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_GPREL16|GPREL)	small_external_data_label
-[0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	big_external_common
-[0-9a-f]+ <[^>]*> addu	at,a1,at
-[0-9a-f]+ <[^>]*> lw	a0,0\(at\)
-[ 	]*[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]+ <[^>]*> addu	at,a1,gp
-[0-9a-f]+ <[^>]*> lw	a0,0\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_GPREL16|GPREL)	small_external_common
-[0-9a-f]+ <[^>]*> lw	a1,4\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_GPREL16|GPREL)	small_external_common
-[0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	\.bss(\+0xffffe000)?
-[0-9a-f]+ <[^>]*> addu	at,a1,at
-[0-9a-f]+ <[^>]*> lw	a0,(0|8192)\(at\)
-[ 	]*[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]+ <[^>]*> addu	at,a1,gp
-[0-9a-f]+ <[^>]*> lw	a0,(0|-16384)\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_GPREL16|GPREL)	\.sbss(\+0x4000)?
-[0-9a-f]+ <[^>]*> lw	a1,(4|-16380)\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_GPREL16|GPREL)	\.sbss(\+0x4000)?
-[0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	\.data(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> addu	at,a1,at
-[0-9a-f]+ <[^>]*> lw	a0,(1|4097)\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.data(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> lw	a1,(5|4101)\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.data(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	big_external_data_label
-[0-9a-f]+ <[^>]*> addu	at,a1,at
-[0-9a-f]+ <[^>]*> lw	a0,1\(at\)
-[ 	]*[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]+ <[^>]*> addu	at,a1,gp
-[0-9a-f]+ <[^>]*> lw	a0,1\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_GPREL16|GPREL)	small_external_data_label
-[0-9a-f]+ <[^>]*> lw	a1,5\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_GPREL16|GPREL)	small_external_data_label
-[0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	big_external_common
-[0-9a-f]+ <[^>]*> addu	at,a1,at
-[0-9a-f]+ <[^>]*> lw	a0,1\(at\)
-[ 	]*[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]+ <[^>]*> addu	at,a1,gp
-[0-9a-f]+ <[^>]*> lw	a0,1\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_GPREL16|GPREL)	small_external_common
-[0-9a-f]+ <[^>]*> lw	a1,5\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_GPREL16|GPREL)	small_external_common
-[0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	\.bss(\+0xffffe000)?
-[0-9a-f]+ <[^>]*> addu	at,a1,at
-[0-9a-f]+ <[^>]*> lw	a0,(1|8193)\(at\)
-[ 	]*[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]+ <[^>]*> addu	at,a1,gp
-[0-9a-f]+ <[^>]*> lw	a0,(1|-16383)\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_GPREL16|GPREL)	\.sbss(\+0x4000)?
-[0-9a-f]+ <[^>]*> lw	a1,(5|-16379)\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_GPREL16|GPREL)	\.sbss(\+0x4000)?
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	\.data(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> addu	at,a1,at
-[0-9a-f]+ <[^>]*> lw	a0,-(32768|28672)\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.data(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> lw	a1,-(32764|28668)\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.data(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	big_external_data_label
-[0-9a-f]+ <[^>]*> addu	at,a1,at
-[0-9a-f]+ <[^>]*> lw	a0,-32768\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	big_external_data_label
-[0-9a-f]+ <[^>]*> lw	a1,-32764\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	big_external_data_label
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	small_external_data_label
-[0-9a-f]+ <[^>]*> addu	at,a1,at
-[0-9a-f]+ <[^>]*> lw	a0,-32768\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	small_external_data_label
-[0-9a-f]+ <[^>]*> lw	a1,-32764\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	small_external_data_label
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	big_external_common
-[0-9a-f]+ <[^>]*> addu	at,a1,at
-[0-9a-f]+ <[^>]*> lw	a0,-32768\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	big_external_common
-[0-9a-f]+ <[^>]*> lw	a1,-32764\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	big_external_common
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	small_external_common
-[0-9a-f]+ <[^>]*> addu	at,a1,at
-[0-9a-f]+ <[^>]*> lw	a0,-32768\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	small_external_common
-[0-9a-f]+ <[^>]*> lw	a1,-32764\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	small_external_common
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	\.bss(\+0xffffe000)?
-[0-9a-f]+ <[^>]*> addu	at,a1,at
-[0-9a-f]+ <[^>]*> lw	a0,-(32768|24576)\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.bss(\+0xffffe000)?
-[0-9a-f]+ <[^>]*> lw	a1,-(32764|24572)\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.bss(\+0xffffe000)?
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	\.sbss(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> addu	at,a1,at
-[0-9a-f]+ <[^>]*> lw	a0,-(32768|28672)\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.sbss(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> lw	a1,-(32764|28668)\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.sbss(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	\.data(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> addu	at,a1,at
-[0-9a-f]+ <[^>]*> lw	a0,-(32768|28672)\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.data(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> lw	a1,-(32764|28668)\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.data(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	big_external_data_label
-[0-9a-f]+ <[^>]*> addu	at,a1,at
-[0-9a-f]+ <[^>]*> lw	a0,-32768\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	big_external_data_label
-[0-9a-f]+ <[^>]*> lw	a1,-32764\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	big_external_data_label
-[0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	small_external_data_label
-[0-9a-f]+ <[^>]*> addu	at,a1,at
-[0-9a-f]+ <[^>]*> lw	a0,-32768\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	small_external_data_label
-[0-9a-f]+ <[^>]*> lw	a1,-32764\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	small_external_data_label
-[0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	big_external_common
-[0-9a-f]+ <[^>]*> addu	at,a1,at
-[0-9a-f]+ <[^>]*> lw	a0,-32768\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	big_external_common
-[0-9a-f]+ <[^>]*> lw	a1,-32764\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	big_external_common
-[0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	small_external_common
-[0-9a-f]+ <[^>]*> addu	at,a1,at
-[0-9a-f]+ <[^>]*> lw	a0,-32768\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	small_external_common
-[0-9a-f]+ <[^>]*> lw	a1,-32764\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	small_external_common
-[0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	\.bss(\+0xffffe000)?
-[0-9a-f]+ <[^>]*> addu	at,a1,at
-[0-9a-f]+ <[^>]*> lw	a0,-(32768|24576)\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.bss(\+0xffffe000)?
-[0-9a-f]+ <[^>]*> lw	a1,-(32764|24572)\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.bss(\+0xffffe000)?
-[0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	\.sbss(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> addu	at,a1,at
-[0-9a-f]+ <[^>]*> lw	a0,-(32768|28672)\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.sbss(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> lw	a1,-(32764|28668)\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.sbss(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	\.data(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> addu	at,a1,at
-[0-9a-f]+ <[^>]*> lw	a0,(0|4096)\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.data(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> lw	a1,(4|4100)\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.data(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	big_external_data_label
-[0-9a-f]+ <[^>]*> addu	at,a1,at
-[0-9a-f]+ <[^>]*> lw	a0,0\(at\)
-[ 	]*[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]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	small_external_data_label
-[0-9a-f]+ <[^>]*> addu	at,a1,at
-[0-9a-f]+ <[^>]*> lw	a0,0\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	small_external_data_label
-[0-9a-f]+ <[^>]*> lw	a1,4\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	small_external_data_label
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	big_external_common
-[0-9a-f]+ <[^>]*> addu	at,a1,at
-[0-9a-f]+ <[^>]*> lw	a0,0\(at\)
-[ 	]*[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]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	small_external_common
-[0-9a-f]+ <[^>]*> addu	at,a1,at
-[0-9a-f]+ <[^>]*> lw	a0,0\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	small_external_common
-[0-9a-f]+ <[^>]*> lw	a1,4\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	small_external_common
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	\.bss(\+0xffffe000)?
-[0-9a-f]+ <[^>]*> addu	at,a1,at
-[0-9a-f]+ <[^>]*> lw	a0,(0|8192)\(at\)
-[ 	]*[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]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	\.sbss(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> addu	at,a1,at
-[0-9a-f]+ <[^>]*> lw	a0,(0|4096)\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.sbss(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> lw	a1,(4|4100)\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.sbss(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> lui	at,0x2
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	\.data(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> addu	at,a1,at
-[0-9a-f]+ <[^>]*> lw	a0,-(23131|19035)\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.data(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> lw	a1,-(23127|19031)\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.data(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> lui	at,0x2
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	big_external_data_label
-[0-9a-f]+ <[^>]*> addu	at,a1,at
-[0-9a-f]+ <[^>]*> lw	a0,-23131\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	big_external_data_label
-[0-9a-f]+ <[^>]*> lw	a1,-23127\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	big_external_data_label
-[0-9a-f]+ <[^>]*> lui	at,0x2
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	small_external_data_label
-[0-9a-f]+ <[^>]*> addu	at,a1,at
-[0-9a-f]+ <[^>]*> lw	a0,-23131\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	small_external_data_label
-[0-9a-f]+ <[^>]*> lw	a1,-23127\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	small_external_data_label
-[0-9a-f]+ <[^>]*> lui	at,0x2
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	big_external_common
-[0-9a-f]+ <[^>]*> addu	at,a1,at
-[0-9a-f]+ <[^>]*> lw	a0,-23131\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	big_external_common
-[0-9a-f]+ <[^>]*> lw	a1,-23127\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	big_external_common
-[0-9a-f]+ <[^>]*> lui	at,0x2
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	small_external_common
-[0-9a-f]+ <[^>]*> addu	at,a1,at
-[0-9a-f]+ <[^>]*> lw	a0,-23131\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	small_external_common
-[0-9a-f]+ <[^>]*> lw	a1,-23127\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	small_external_common
-[0-9a-f]+ <[^>]*> lui	at,0x2
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	\.bss(\+0xffffe000)?
-[0-9a-f]+ <[^>]*> addu	at,a1,at
-[0-9a-f]+ <[^>]*> lw	a0,-(23131|14939)\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.bss(\+0xffffe000)?
-[0-9a-f]+ <[^>]*> lw	a1,-(23127|14935)\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.bss(\+0xffffe000)?
-[0-9a-f]+ <[^>]*> lui	at,0x2
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	\.sbss(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> addu	at,a1,at
-[0-9a-f]+ <[^>]*> lw	a0,-(23131|19035)\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.sbss(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> lw	a1,-(23127|19031)\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.sbss(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> lwc1	\$f[45],0\(zero\)
-[0-9a-f]+ <[^>]*> lwc1	\$f[45],4\(zero\)
-[0-9a-f]+ <[^>]*> lwc1	\$f[45],1\(zero\)
-[0-9a-f]+ <[^>]*> lwc1	\$f[45],5\(zero\)
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[0-9a-f]+ <[^>]*> lwc1	\$f[45],-32768\(at\)
-[0-9a-f]+ <[^>]*> lwc1	\$f[45],-32764\(at\)
-[0-9a-f]+ <[^>]*> lwc1	\$f[45],-32768\(zero\)
-[0-9a-f]+ <[^>]*> lwc1	\$f[45],-32764\(zero\)
-[0-9a-f]+ <[^>]*> lwc1	\$f[45],0\(a1\)
-[0-9a-f]+ <[^>]*> lwc1	\$f[45],4\(a1\)
-[0-9a-f]+ <[^>]*> lwc1	\$f[45],1\(a1\)
-[0-9a-f]+ <[^>]*> lwc1	\$f[45],5\(a1\)
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[0-9a-f]+ <[^>]*> addu	at,a1,at
-[0-9a-f]+ <[^>]*> lwc1	\$f[45],-32768\(at\)
-[0-9a-f]+ <[^>]*> lwc1	\$f[45],-32764\(at\)
-[0-9a-f]+ <[^>]*> lwc1	\$f[45],-32768\(a1\)
-[0-9a-f]+ <[^>]*> lwc1	\$f[45],-32764\(a1\)
-[0-9a-f]+ <[^>]*> lui	at,0x2
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	small_external_common
-[0-9a-f]+ <[^>]*> addu	at,a1,at
-[0-9a-f]+ <[^>]*> lwc1	\$f[45],-23131\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	small_external_common
-[0-9a-f]+ <[^>]*> lwc1	\$f[45],-23127\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	small_external_common
-[0-9a-f]+ <[^>]*> nop
-[0-9a-f]+ <[^>]*> swc1	\$f[45],0\(zero\)
-[0-9a-f]+ <[^>]*> swc1	\$f[45],4\(zero\)
-[0-9a-f]+ <[^>]*> swc1	\$f[45],1\(zero\)
-[0-9a-f]+ <[^>]*> swc1	\$f[45],5\(zero\)
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[0-9a-f]+ <[^>]*> swc1	\$f[45],-32768\(at\)
-[0-9a-f]+ <[^>]*> swc1	\$f[45],-32764\(at\)
-[0-9a-f]+ <[^>]*> swc1	\$f[45],-32768\(zero\)
-[0-9a-f]+ <[^>]*> swc1	\$f[45],-32764\(zero\)
-[0-9a-f]+ <[^>]*> swc1	\$f[45],0\(a1\)
-[0-9a-f]+ <[^>]*> swc1	\$f[45],4\(a1\)
-[0-9a-f]+ <[^>]*> swc1	\$f[45],1\(a1\)
-[0-9a-f]+ <[^>]*> swc1	\$f[45],5\(a1\)
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[0-9a-f]+ <[^>]*> addu	at,a1,at
-[0-9a-f]+ <[^>]*> swc1	\$f[45],-32768\(at\)
-[0-9a-f]+ <[^>]*> swc1	\$f[45],-32764\(at\)
-[0-9a-f]+ <[^>]*> swc1	\$f[45],-32768\(a1\)
-[0-9a-f]+ <[^>]*> swc1	\$f[45],-32764\(a1\)
-[0-9a-f]+ <[^>]*> lui	at,0x2
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	big_external_common
-[0-9a-f]+ <[^>]*> addu	at,a1,at
-[0-9a-f]+ <[^>]*> swc1	\$f[45],-23131\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	big_external_common
-[0-9a-f]+ <[^>]*> swc1	\$f[45],-23127\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	big_external_common
-[0-9a-f]+ <[^>]*> sw	a0,0\(zero\)
-[0-9a-f]+ <[^>]*> sw	a1,4\(zero\)
-[0-9a-f]+ <[^>]*> lui	a0,0x2
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	\.bss(\+0xffffe000)?
-[0-9a-f]+ <[^>]*> addu	a0,a0,a1
-[0-9a-f]+ <[^>]*> ld	a0,-(23131|14939)\(a0\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.bss(\+0xffffe000)?
-[0-9a-f]+ <[^>]*> lui	at,0x2
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	\.sbss(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> addu	at,at,a1
-[0-9a-f]+ <[^>]*> sd	a0,-(23131|19035)\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.sbss(\+0xfffff000)?
-	\.\.\.
diff --git a/gas/testsuite/gas/mips/ld-ilocks.d b/gas/testsuite/gas/mips/ld-ilocks.d
index 5afc553..d7c7ec4 100644
--- a/gas/testsuite/gas/mips/ld-ilocks.d
+++ b/gas/testsuite/gas/mips/ld-ilocks.d
@@ -618,14 +618,4 @@ Disassembly of section \.text:
 [ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	big_external_common
 [0-9a-f]+ <[^>]*> sw	a0,0\(zero\)
 [0-9a-f]+ <[^>]*> sw	a1,4\(zero\)
-[0-9a-f]+ <[^>]*> lui	a0,0x2
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	\.bss(\+0xffffe000)?
-[0-9a-f]+ <[^>]*> (d|)addu	a0,a0,a1
-[0-9a-f]+ <[^>]*> ld	a0,-(23131|14939)\(a0\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.bss(\+0xffffe000)?
-[0-9a-f]+ <[^>]*> lui	at,0x2
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	\.sbss(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> (d|)addu	at,at,a1
-[0-9a-f]+ <[^>]*> sd	a0,-(23131|19035)\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.sbss(\+0xfffff000)?
 	\.\.\.
diff --git a/gas/testsuite/gas/mips/ld.d b/gas/testsuite/gas/mips/ld.d
index f409223..4caebb6 100644
--- a/gas/testsuite/gas/mips/ld.d
+++ b/gas/testsuite/gas/mips/ld.d
@@ -626,14 +626,4 @@ Disassembly of section \.text:
 [ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	big_external_common
 [0-9a-f]+ <[^>]*> sw	a0,0\(zero\)
 [0-9a-f]+ <[^>]*> sw	a1,4\(zero\)
-[0-9a-f]+ <[^>]*> lui	a0,0x2
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	\.bss(\+0xffffe000)?
-[0-9a-f]+ <[^>]*> addu	a0,a0,a1
-[0-9a-f]+ <[^>]*> ld	a0,-(23131|14939)\(a0\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.bss(\+0xffffe000)?
-[0-9a-f]+ <[^>]*> lui	at,0x2
-[ 	]*[0-9a-f]+: (R_MIPS_HI16|REFHI)	\.sbss(\+0xfffff000)?
-[0-9a-f]+ <[^>]*> addu	at,at,a1
-[0-9a-f]+ <[^>]*> sd	a0,-(23131|19035)\(at\)
-[ 	]*[0-9a-f]+: (R_MIPS_LO16|REFLO)	\.sbss(\+0xfffff000)?
 	\.\.\.
diff --git a/gas/testsuite/gas/mips/ld.s b/gas/testsuite/gas/mips/ld.s
index 970ffe55..a30f61f 100644
--- a/gas/testsuite/gas/mips/ld.s
+++ b/gas/testsuite/gas/mips/ld.s
@@ -141,11 +141,6 @@ data_label:
 # sd is handled like ld.  Sanity check it.
 	sd	$4,0
 
-# Sanity check the -mips3 versions
-	.set	mips3
-	ld	$4,big_local_common+0x1a5a5($5)
-	sd	$4,small_local_common+0x1a5a5($5)
-
 # Force at least 8 (non-delay-slot) zero bytes, to make 'objdump' print ...
 	.align	2
 	.space	8
diff --git a/gas/testsuite/gas/mips/mips.exp b/gas/testsuite/gas/mips/mips.exp
index bbbc0bb..51e0baf 100644
--- a/gas/testsuite/gas/mips/mips.exp
+++ b/gas/testsuite/gas/mips/mips.exp
@@ -500,11 +500,7 @@ if { [istarget mips*-*-vxworks*] } {
         if !$gpr_ilocks {
             run_dump_test "ld"
         } else { 
-            if !$addr32 {
-                run_dump_test "ld-ilocks"
-            } else {
-                run_dump_test "ld-ilocks-addr32"
-            }
+	    run_dump_test "ld-ilocks"
         }
     }
     if $elf { run_dump_test "ld-svr4pic" }