MIPS/GAS/testsuite: Remove remnants of a.out/ECOFF support

Complement: commit 16e5e222b6eae6f110ea72bf627585c095a453a8 Author: Richard Sandiford <rdsandiford@googlemail.com> Date: Sat Jun 22 16:57:42 2013 +0000 <https://sourceware.org/ml/binutils/2013-06/msg00195.html>, ("Make gas/mips/mips.exp ELF-only"), and remove the remaining stale ECOFF test dumps and pieces of a.out/ECOFF support in relocation match patterns. gas/ * testsuite/gas/mips/ecoff@ld.d: Remove test. * testsuite/gas/mips/ecoff@ld-forward.d: Remove test. * testsuite/gas/mips/ecoff@ld-zero-3.d: Remove test. * testsuite/gas/mips/ecoff@sd.d: Remove test. * testsuite/gas/mips/ecoff@sd-forward.d: Remove test. * testsuite/gas/mips/beq.d: Remove a.out and ECOFF support from reloc patterns. * testsuite/gas/mips/mipsr6@beq.d: Likewise. * testsuite/gas/mips/bge.d: Likewise. * testsuite/gas/mips/mipsr6@bge.d: Likewise. * testsuite/gas/mips/bgeu.d: Likewise. * testsuite/gas/mips/mipsr6@bgeu.d: Likewise. * testsuite/gas/mips/blt.d: Likewise. * testsuite/gas/mips/mipsr6@blt.d: Likewise. * testsuite/gas/mips/bltu.d: Likewise. * testsuite/gas/mips/mipsr6@bltu.d: Likewise. * testsuite/gas/mips/branch-likely.d: Likewise. * testsuite/gas/mips/la.d: Likewise. * testsuite/gas/mips/lb.d: Likewise. * testsuite/gas/mips/lifloat.d: Likewise. * testsuite/gas/mips/sb.d: Likewise. * testsuite/gas/mips/uld.d: Likewise. * testsuite/gas/mips/ulh.d: Likewise. * testsuite/gas/mips/ulw.d: Likewise. * testsuite/gas/mips/usd.d: Likewise. * testsuite/gas/mips/ush.d: Likewise. * testsuite/gas/mips/usw.d: Likewise.
author: Maciej W. Rozycki <macro@imgtec.com> 2016-07-02 23:39:18 +0100
committer: Maciej W. Rozycki <macro@imgtec.com> 2016-07-02 23:41:31 +0100
commit: fcedb9f3ca87f43165a8c88fae251344bf6687d0 (patch)
tree: 05ec111bac1d4176d3b0753b82253dc83f014985 /gas
parent: 6f50d611582fab3ca8cf70ec3acf79e19c8706c4 (diff)
download: binutils-fcedb9f3ca87f43165a8c88fae251344bf6687d0.zip
binutils-fcedb9f3ca87f43165a8c88fae251344bf6687d0.tar.gz
binutils-fcedb9f3ca87f43165a8c88fae251344bf6687d0.tar.bz2
27 files changed, 1066 insertions, 1822 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 2561c50..9e24bcd 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,35 @@
 2016-07-02  Maciej W. Rozycki  <macro@imgtec.com>
 
+	* testsuite/gas/mips/ecoff@ld.d: Remove test.
+	* testsuite/gas/mips/ecoff@ld-forward.d: Remove test.
+	* testsuite/gas/mips/ecoff@ld-zero-3.d: Remove test.
+	* testsuite/gas/mips/ecoff@sd.d: Remove test.
+	* testsuite/gas/mips/ecoff@sd-forward.d: Remove test.
+	* testsuite/gas/mips/beq.d: Remove a.out and ECOFF support from
+	reloc patterns.
+	* testsuite/gas/mips/mipsr6@beq.d: Likewise.
+	* testsuite/gas/mips/bge.d: Likewise.
+	* testsuite/gas/mips/mipsr6@bge.d: Likewise.
+	* testsuite/gas/mips/bgeu.d: Likewise.
+	* testsuite/gas/mips/mipsr6@bgeu.d: Likewise.
+	* testsuite/gas/mips/blt.d: Likewise.
+	* testsuite/gas/mips/mipsr6@blt.d: Likewise.
+	* testsuite/gas/mips/bltu.d: Likewise.
+	* testsuite/gas/mips/mipsr6@bltu.d: Likewise.
+	* testsuite/gas/mips/branch-likely.d: Likewise.
+	* testsuite/gas/mips/la.d: Likewise.
+	* testsuite/gas/mips/lb.d: Likewise.
+	* testsuite/gas/mips/lifloat.d: Likewise.
+	* testsuite/gas/mips/sb.d: Likewise.
+	* testsuite/gas/mips/uld.d: Likewise.
+	* testsuite/gas/mips/ulh.d: Likewise.
+	* testsuite/gas/mips/ulw.d: Likewise.
+	* testsuite/gas/mips/usd.d: Likewise.
+	* testsuite/gas/mips/ush.d: Likewise.
+	* testsuite/gas/mips/usw.d: Likewise.
+
+2016-07-02  Maciej W. Rozycki  <macro@imgtec.com>
+
 	* testsuite/gas/mips/branch-misc-2.s: Move non
 	locally-defined-global symbol tests...
 	* testsuite/gas/mips/branch-misc-5.s: ... to this new test.
diff --git a/gas/testsuite/gas/mips/beq.d b/gas/testsuite/gas/mips/beq.d
index 17c1ab1..9786102 100644
--- a/gas/testsuite/gas/mips/beq.d
+++ b/gas/testsuite/gas/mips/beq.d
@@ -31,15 +31,15 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> nop
 	\.\.\.
 [0-9a-f]+ <[^>]*> j	0+0000 <.*>
-[ 	]*20058: (MIPS_JMP|JMPADDR|R_MIPS_26)	\.text
+[ 	]*20058: R_MIPS_26	\.text
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> jal	0+0000 <.*>
-[ 	]*20060: (MIPS_JMP|JMPADDR|R_MIPS_26)	\.text
+[ 	]*20060: R_MIPS_26	\.text
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> b	0+20068 <.*\+0x20068>
-[ 	]*20068: .*16	external_label
+[ 	]*20068: R_MIPS_PC16	external_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> bal	0+20070 <.*\+0x20070>
-[ 	]*20070: .*16	external_label
+[ 	]*20070: R_MIPS_PC16	external_label
 [0-9a-f]+ <[^>]*> nop
 	\.\.\.
diff --git a/gas/testsuite/gas/mips/bge.d b/gas/testsuite/gas/mips/bge.d
index a1d04fd..e35570e 100644
--- a/gas/testsuite/gas/mips/bge.d
+++ b/gas/testsuite/gas/mips/bge.d
@@ -48,10 +48,10 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> slt	at,a0,a1
 [0-9a-f]+ <[^>]*> beqz	at,0+00a0 <.*\+0xa0>
-[ 	]*a0: .*16	external_label
+[ 	]*a0: R_MIPS_PC16	external_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> slt	at,a1,a0
 [0-9a-f]+ <[^>]*> bnez	at,0+00ac <.*\+0xac>
-[ 	]*ac: .*16	external_label
+[ 	]*ac: R_MIPS_PC16	external_label
 [0-9a-f]+ <[^>]*> nop
 	\.\.\.
diff --git a/gas/testsuite/gas/mips/bgeu.d b/gas/testsuite/gas/mips/bgeu.d
index 8b14fe8..fc96190 100644
--- a/gas/testsuite/gas/mips/bgeu.d
+++ b/gas/testsuite/gas/mips/bgeu.d
@@ -42,10 +42,10 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> sltu	at,a0,a1
 [0-9a-f]+ <[^>]*> beqz	at,0+0088 <.*\+0x88>
-[ 	]*88: .*16	external_label
+[ 	]*88: R_MIPS_PC16	external_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> sltu	at,a1,a0
 [0-9a-f]+ <[^>]*> bnez	at,0+0094 <.*\+0x94>
-[ 	]*94: .*16	external_label
+[ 	]*94: R_MIPS_PC16	external_label
 [0-9a-f]+ <[^>]*> nop
 	\.\.\.
diff --git a/gas/testsuite/gas/mips/blt.d b/gas/testsuite/gas/mips/blt.d
index b0158f4..5aea7f9 100644
--- a/gas/testsuite/gas/mips/blt.d
+++ b/gas/testsuite/gas/mips/blt.d
@@ -48,10 +48,10 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> slt	at,a0,a1
 [0-9a-f]+ <[^>]*> bnez	at,0+00a0 <.*\+0xa0>
-[ 	]*a0: .*16	external_label
+[ 	]*a0: R_MIPS_PC16	external_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> slt	at,a1,a0
 [0-9a-f]+ <[^>]*> beqz	at,0+00ac <.*\+0xac>
-[ 	]*ac: .*16	external_label
+[ 	]*ac: R_MIPS_PC16	external_label
 [0-9a-f]+ <[^>]*> nop
 	\.\.\.
diff --git a/gas/testsuite/gas/mips/bltu.d b/gas/testsuite/gas/mips/bltu.d
index bf6f19c..150ba05 100644
--- a/gas/testsuite/gas/mips/bltu.d
+++ b/gas/testsuite/gas/mips/bltu.d
@@ -42,10 +42,10 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> sltu	at,a0,a1
 [0-9a-f]+ <[^>]*> bnez	at,0+0088 <.*\+0x88>
-[ 	]*88: .*16	external_label
+[ 	]*88: R_MIPS_PC16	external_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> sltu	at,a1,a0
 [0-9a-f]+ <[^>]*> beqz	at,0+0094 <.*\+0x94>
-[ 	]*94: .*16	external_label
+[ 	]*94: R_MIPS_PC16	external_label
 [0-9a-f]+ <[^>]*> nop
 	\.\.\.
diff --git a/gas/testsuite/gas/mips/branch-likely.d b/gas/testsuite/gas/mips/branch-likely.d
index b391ad9..13a93e2 100644
--- a/gas/testsuite/gas/mips/branch-likely.d
+++ b/gas/testsuite/gas/mips/branch-likely.d
@@ -12,10 +12,10 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> bnezl	a0,0+0000 <.*>
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> beqzl	a0,0+0010 <.*\+0x10>
-[ 	]*10: .*16	external_label
+[ 	]*10: R_MIPS_PC16	external_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> bnezl	a0,0+0018 <.*\+0x18>
-[ 	]*18: .*16	external_label
+[ 	]*18: R_MIPS_PC16	external_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> slt	at,a0,a1
 [0-9a-f]+ <[^>]*> beqzl	at,0+0000 <.*>
@@ -25,11 +25,11 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> slt	at,a0,a1
 [0-9a-f]+ <[^>]*> beqzl	at,0+003c <.*\+0x3c>
-[ 	]*3c: .*16	external_label
+[ 	]*3c: R_MIPS_PC16	external_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> slt	at,a1,a0
 [0-9a-f]+ <[^>]*> bnezl	at,0+0048 <.*\+0x48>
-[ 	]*48: .*16	external_label
+[ 	]*48: R_MIPS_PC16	external_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> sltu	at,a0,a1
 [0-9a-f]+ <[^>]*> beqzl	at,0+0000 <.*>
@@ -39,11 +39,11 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> sltu	at,a0,a1
 [0-9a-f]+ <[^>]*> beqzl	at,0+006c <.*\+0x6c>
-[ 	]*6c: .*16	external_label
+[ 	]*6c: R_MIPS_PC16	external_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> sltu	at,a1,a0
 [0-9a-f]+ <[^>]*> bnezl	at,0+0078 <.*\+0x78>
-[ 	]*78: .*16	external_label
+[ 	]*78: R_MIPS_PC16	external_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> slt	at,a0,a1
 [0-9a-f]+ <[^>]*> bnezl	at,0+0000 <.*>
@@ -53,11 +53,11 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> slt	at,a0,a1
 [0-9a-f]+ <[^>]*> bnezl	at,0+009c <.*\+0x9c>
-[ 	]*9c: .*16	external_label
+[ 	]*9c: R_MIPS_PC16	external_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> slt	at,a1,a0
 [0-9a-f]+ <[^>]*> beqzl	at,0+00a8 <.*\+0xa8>
-[ 	]*a8: .*16	external_label
+[ 	]*a8: R_MIPS_PC16	external_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> sltu	at,a0,a1
 [0-9a-f]+ <[^>]*> bnezl	at,0+0000 <.*>
@@ -67,10 +67,10 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> sltu	at,a0,a1
 [0-9a-f]+ <[^>]*> bnezl	at,0+00cc <.*\+0xcc>
-[ 	]*cc: .*16	external_label
+[ 	]*cc: R_MIPS_PC16	external_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> sltu	at,a1,a0
 [0-9a-f]+ <[^>]*> beqzl	at,0+00d8 <.*\+0xd8>
-[ 	]*d8: .*16	external_label
+[ 	]*d8: R_MIPS_PC16	external_label
 [0-9a-f]+ <[^>]*> nop
 	\.\.\.
diff --git a/gas/testsuite/gas/mips/ecoff@ld-forward.d b/gas/testsuite/gas/mips/ecoff@ld-forward.d
deleted file mode 100644
index f0bfd9d..0000000
--- a/gas/testsuite/gas/mips/ecoff@ld-forward.d
+++ /dev/null
@@ -1,5 +0,0 @@
-#objdump: -dr --prefix-addresses
-#as: -32 --defsym forward=1
-#name: MIPS ld forward
-#source: ld.s
-#dump: ecoff@ld.d
diff --git a/gas/testsuite/gas/mips/ecoff@ld-zero-3.d b/gas/testsuite/gas/mips/ecoff@ld-zero-3.d
deleted file mode 100644
index 4f682b1..0000000
--- a/gas/testsuite/gas/mips/ecoff@ld-zero-3.d
+++ /dev/null
@@ -1,4 +0,0 @@
-#objdump: -dr --prefix-addresses
-#name: MIPS III load $zero
-#source: ld-zero-3.s
-#dump: ld-zero-3.d
diff --git a/gas/testsuite/gas/mips/ecoff@ld.d b/gas/testsuite/gas/mips/ecoff@ld.d
deleted file mode 100644
index 0e0fbe8..0000000
--- a/gas/testsuite/gas/mips/ecoff@ld.d
+++ /dev/null
@@ -1,386 +0,0 @@
-#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-0x1000
-[0-9a-f]+ <[^>]*> ld	a0,4096\(a0\)
-[ 	]*[0-9a-f]+: REFLO	\.data-0x1000
-[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-0x2000
-[0-9a-f]+ <[^>]*> ld	a0,8192\(a0\)
-[ 	]*[0-9a-f]+: REFLO	\.bss-0x2000
-[0-9a-f]+ <[^>]*> ld	a0,-16384\(gp\)
-[ 	]*[0-9a-f]+: GPREL	\.sbss\+0x4000
-[0-9a-f]+ <[^>]*> lui	a0,0x0
-[ 	]*[0-9a-f]+: REFHI	\.data-0x1000
-[0-9a-f]+ <[^>]*> ld	a0,4097\(a0\)
-[ 	]*[0-9a-f]+: REFLO	\.data-0x1000
-[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-0x2000
-[0-9a-f]+ <[^>]*> ld	a0,8193\(a0\)
-[ 	]*[0-9a-f]+: REFLO	\.bss-0x2000
-[0-9a-f]+ <[^>]*> ld	a0,-16383\(gp\)
-[ 	]*[0-9a-f]+: GPREL	\.sbss\+0x4000
-[0-9a-f]+ <[^>]*> lui	a0,0x1
-[ 	]*[0-9a-f]+: REFHI	\.data-0x1000
-[0-9a-f]+ <[^>]*> ld	a0,-28672\(a0\)
-[ 	]*[0-9a-f]+: REFLO	\.data-0x1000
-[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-0x2000
-[0-9a-f]+ <[^>]*> ld	a0,-24576\(a0\)
-[ 	]*[0-9a-f]+: REFLO	\.bss-0x2000
-[0-9a-f]+ <[^>]*> lui	a0,0x1
-[ 	]*[0-9a-f]+: REFHI	\.sbss-0x1000
-[0-9a-f]+ <[^>]*> ld	a0,-28672\(a0\)
-[ 	]*[0-9a-f]+: REFLO	\.sbss-0x1000
-[0-9a-f]+ <[^>]*> lui	a0,0x0
-[ 	]*[0-9a-f]+: REFHI	\.data-0x1000
-[0-9a-f]+ <[^>]*> ld	a0,-28672\(a0\)
-[ 	]*[0-9a-f]+: REFLO	\.data-0x1000
-[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-0x2000
-[0-9a-f]+ <[^>]*> ld	a0,-24576\(a0\)
-[ 	]*[0-9a-f]+: REFLO	\.bss-0x2000
-[0-9a-f]+ <[^>]*> lui	a0,0x0
-[ 	]*[0-9a-f]+: REFHI	\.sbss-0x1000
-[0-9a-f]+ <[^>]*> ld	a0,-28672\(a0\)
-[ 	]*[0-9a-f]+: REFLO	\.sbss-0x1000
-[0-9a-f]+ <[^>]*> lui	a0,0x1
-[ 	]*[0-9a-f]+: REFHI	\.data-0x1000
-[0-9a-f]+ <[^>]*> ld	a0,4096\(a0\)
-[ 	]*[0-9a-f]+: REFLO	\.data-0x1000
-[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-0x2000
-[0-9a-f]+ <[^>]*> ld	a0,8192\(a0\)
-[ 	]*[0-9a-f]+: REFLO	\.bss-0x2000
-[0-9a-f]+ <[^>]*> lui	a0,0x1
-[ 	]*[0-9a-f]+: REFHI	\.sbss-0x1000
-[0-9a-f]+ <[^>]*> ld	a0,4096\(a0\)
-[ 	]*[0-9a-f]+: REFLO	\.sbss-0x1000
-[0-9a-f]+ <[^>]*> lui	a0,0x2
-[ 	]*[0-9a-f]+: REFHI	\.data-0x1000
-[0-9a-f]+ <[^>]*> ld	a0,-19035\(a0\)
-[ 	]*[0-9a-f]+: REFLO	\.data-0x1000
-[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-0x2000
-[0-9a-f]+ <[^>]*> ld	a0,-14939\(a0\)
-[ 	]*[0-9a-f]+: REFLO	\.bss-0x2000
-[0-9a-f]+ <[^>]*> lui	a0,0x2
-[ 	]*[0-9a-f]+: REFHI	\.sbss-0x1000
-[0-9a-f]+ <[^>]*> ld	a0,-19035\(a0\)
-[ 	]*[0-9a-f]+: REFLO	\.sbss-0x1000
-[0-9a-f]+ <[^>]*> lui	a0,0x0
-[ 	]*[0-9a-f]+: REFHI	\.data-0x1000
-[0-9a-f]+ <[^>]*> addu	a0,a0,a1
-[0-9a-f]+ <[^>]*> ld	a0,4096\(a0\)
-[ 	]*[0-9a-f]+: REFLO	\.data-0x1000
-[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-0x2000
-[0-9a-f]+ <[^>]*> addu	a0,a0,a1
-[0-9a-f]+ <[^>]*> ld	a0,8192\(a0\)
-[ 	]*[0-9a-f]+: REFLO	\.bss-0x2000
-[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-0x1000
-[0-9a-f]+ <[^>]*> addu	a0,a0,a1
-[0-9a-f]+ <[^>]*> ld	a0,4097\(a0\)
-[ 	]*[0-9a-f]+: REFLO	\.data-0x1000
-[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-0x2000
-[0-9a-f]+ <[^>]*> addu	a0,a0,a1
-[0-9a-f]+ <[^>]*> ld	a0,8193\(a0\)
-[ 	]*[0-9a-f]+: REFLO	\.bss-0x2000
-[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-0x1000
-[0-9a-f]+ <[^>]*> addu	a0,a0,a1
-[0-9a-f]+ <[^>]*> ld	a0,-28672\(a0\)
-[ 	]*[0-9a-f]+: REFLO	\.data-0x1000
-[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-0x2000
-[0-9a-f]+ <[^>]*> addu	a0,a0,a1
-[0-9a-f]+ <[^>]*> ld	a0,-24576\(a0\)
-[ 	]*[0-9a-f]+: REFLO	\.bss-0x2000
-[0-9a-f]+ <[^>]*> lui	a0,0x1
-[ 	]*[0-9a-f]+: REFHI	\.sbss-0x1000
-[0-9a-f]+ <[^>]*> addu	a0,a0,a1
-[0-9a-f]+ <[^>]*> ld	a0,-28672\(a0\)
-[ 	]*[0-9a-f]+: REFLO	\.sbss-0x1000
-[0-9a-f]+ <[^>]*> lui	a0,0x0
-[ 	]*[0-9a-f]+: REFHI	\.data-0x1000
-[0-9a-f]+ <[^>]*> addu	a0,a0,a1
-[0-9a-f]+ <[^>]*> ld	a0,-28672\(a0\)
-[ 	]*[0-9a-f]+: REFLO	\.data-0x1000
-[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-0x2000
-[0-9a-f]+ <[^>]*> addu	a0,a0,a1
-[0-9a-f]+ <[^>]*> ld	a0,-24576\(a0\)
-[ 	]*[0-9a-f]+: REFLO	\.bss-0x2000
-[0-9a-f]+ <[^>]*> lui	a0,0x0
-[ 	]*[0-9a-f]+: REFHI	\.sbss-0x1000
-[0-9a-f]+ <[^>]*> addu	a0,a0,a1
-[0-9a-f]+ <[^>]*> ld	a0,-28672\(a0\)
-[ 	]*[0-9a-f]+: REFLO	\.sbss-0x1000
-[0-9a-f]+ <[^>]*> lui	a0,0x1
-[ 	]*[0-9a-f]+: REFHI	\.data-0x1000
-[0-9a-f]+ <[^>]*> addu	a0,a0,a1
-[0-9a-f]+ <[^>]*> ld	a0,4096\(a0\)
-[ 	]*[0-9a-f]+: REFLO	\.data-0x1000
-[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-0x2000
-[0-9a-f]+ <[^>]*> addu	a0,a0,a1
-[0-9a-f]+ <[^>]*> ld	a0,8192\(a0\)
-[ 	]*[0-9a-f]+: REFLO	\.bss-0x2000
-[0-9a-f]+ <[^>]*> lui	a0,0x1
-[ 	]*[0-9a-f]+: REFHI	\.sbss-0x1000
-[0-9a-f]+ <[^>]*> addu	a0,a0,a1
-[0-9a-f]+ <[^>]*> ld	a0,4096\(a0\)
-[ 	]*[0-9a-f]+: REFLO	\.sbss-0x1000
-[0-9a-f]+ <[^>]*> lui	a0,0x2
-[ 	]*[0-9a-f]+: REFHI	\.data-0x1000
-[0-9a-f]+ <[^>]*> addu	a0,a0,a1
-[0-9a-f]+ <[^>]*> ld	a0,-19035\(a0\)
-[ 	]*[0-9a-f]+: REFLO	\.data-0x1000
-[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-0x2000
-[0-9a-f]+ <[^>]*> addu	a0,a0,a1
-[0-9a-f]+ <[^>]*> ld	a0,-14939\(a0\)
-[ 	]*[0-9a-f]+: REFLO	\.bss-0x2000
-[0-9a-f]+ <[^>]*> lui	a0,0x2
-[ 	]*[0-9a-f]+: REFHI	\.sbss-0x1000
-[0-9a-f]+ <[^>]*> addu	a0,a0,a1
-[0-9a-f]+ <[^>]*> ld	a0,-19035\(a0\)
-[ 	]*[0-9a-f]+: REFLO	\.sbss-0x1000
-	\.\.\.
diff --git a/gas/testsuite/gas/mips/ecoff@sd-forward.d b/gas/testsuite/gas/mips/ecoff@sd-forward.d
deleted file mode 100644
index 388ef25..0000000
--- a/gas/testsuite/gas/mips/ecoff@sd-forward.d
+++ /dev/null
@@ -1,5 +0,0 @@
-#objdump: -dr --prefix-addresses
-#as: -32 --defsym tsd=1 --defsym forward=1
-#name: MIPS sd forward
-#source: ld.s
-#dump: ecoff@sd.d
diff --git a/gas/testsuite/gas/mips/ecoff@sd.d b/gas/testsuite/gas/mips/ecoff@sd.d
deleted file mode 100644
index 88d1bf6..0000000
--- a/gas/testsuite/gas/mips/ecoff@sd.d
+++ /dev/null
@@ -1,386 +0,0 @@
-#objdump: -dr --prefix-addresses
-#as: -32 --defsym tsd=1
-#name: MIPS sd
-#source: ld.s
-
-# Test the sd macro (ECOFF).
-
-.*: +file format .*mips.*
-
-Disassembly of section \.text:
-[0-9a-f]+ <[^>]*> sd	a0,0\(zero\)
-[0-9a-f]+ <[^>]*> sd	a0,1\(zero\)
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[0-9a-f]+ <[^>]*> sd	a0,-32768\(at\)
-[0-9a-f]+ <[^>]*> sd	a0,-32768\(zero\)
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[0-9a-f]+ <[^>]*> sd	a0,0\(at\)
-[0-9a-f]+ <[^>]*> lui	at,0x2
-[0-9a-f]+ <[^>]*> sd	a0,-23131\(at\)
-[0-9a-f]+ <[^>]*> sd	a0,0\(a1\)
-[0-9a-f]+ <[^>]*> sd	a0,1\(a1\)
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[0-9a-f]+ <[^>]*> addu	at,at,a1
-[0-9a-f]+ <[^>]*> sd	a0,-32768\(at\)
-[0-9a-f]+ <[^>]*> sd	a0,-32768\(a1\)
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[0-9a-f]+ <[^>]*> addu	at,at,a1
-[0-9a-f]+ <[^>]*> sd	a0,0\(at\)
-[0-9a-f]+ <[^>]*> lui	at,0x2
-[0-9a-f]+ <[^>]*> addu	at,at,a1
-[0-9a-f]+ <[^>]*> sd	a0,-23131\(at\)
-[0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: REFHI	\.data-0x1000
-[0-9a-f]+ <[^>]*> sd	a0,4096\(at\)
-[ 	]*[0-9a-f]+: REFLO	\.data-0x1000
-[0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: REFHI	big_external_data_label
-[0-9a-f]+ <[^>]*> sd	a0,0\(at\)
-[ 	]*[0-9a-f]+: REFLO	big_external_data_label
-[0-9a-f]+ <[^>]*> sd	a0,0\(gp\)
-[ 	]*[0-9a-f]+: GPREL	small_external_data_label
-[0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: REFHI	big_external_common
-[0-9a-f]+ <[^>]*> sd	a0,0\(at\)
-[ 	]*[0-9a-f]+: REFLO	big_external_common
-[0-9a-f]+ <[^>]*> sd	a0,0\(gp\)
-[ 	]*[0-9a-f]+: GPREL	small_external_common
-[0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: REFHI	\.bss-0x2000
-[0-9a-f]+ <[^>]*> sd	a0,8192\(at\)
-[ 	]*[0-9a-f]+: REFLO	\.bss-0x2000
-[0-9a-f]+ <[^>]*> sd	a0,-16384\(gp\)
-[ 	]*[0-9a-f]+: GPREL	\.sbss\+0x4000
-[0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: REFHI	\.data-0x1000
-[0-9a-f]+ <[^>]*> sd	a0,4097\(at\)
-[ 	]*[0-9a-f]+: REFLO	\.data-0x1000
-[0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: REFHI	big_external_data_label
-[0-9a-f]+ <[^>]*> sd	a0,1\(at\)
-[ 	]*[0-9a-f]+: REFLO	big_external_data_label
-[0-9a-f]+ <[^>]*> sd	a0,1\(gp\)
-[ 	]*[0-9a-f]+: GPREL	small_external_data_label
-[0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: REFHI	big_external_common
-[0-9a-f]+ <[^>]*> sd	a0,1\(at\)
-[ 	]*[0-9a-f]+: REFLO	big_external_common
-[0-9a-f]+ <[^>]*> sd	a0,1\(gp\)
-[ 	]*[0-9a-f]+: GPREL	small_external_common
-[0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: REFHI	\.bss-0x2000
-[0-9a-f]+ <[^>]*> sd	a0,8193\(at\)
-[ 	]*[0-9a-f]+: REFLO	\.bss-0x2000
-[0-9a-f]+ <[^>]*> sd	a0,-16383\(gp\)
-[ 	]*[0-9a-f]+: GPREL	\.sbss\+0x4000
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: REFHI	\.data-0x1000
-[0-9a-f]+ <[^>]*> sd	a0,-28672\(at\)
-[ 	]*[0-9a-f]+: REFLO	\.data-0x1000
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: REFHI	big_external_data_label
-[0-9a-f]+ <[^>]*> sd	a0,-32768\(at\)
-[ 	]*[0-9a-f]+: REFLO	big_external_data_label
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: REFHI	small_external_data_label
-[0-9a-f]+ <[^>]*> sd	a0,-32768\(at\)
-[ 	]*[0-9a-f]+: REFLO	small_external_data_label
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: REFHI	big_external_common
-[0-9a-f]+ <[^>]*> sd	a0,-32768\(at\)
-[ 	]*[0-9a-f]+: REFLO	big_external_common
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: REFHI	small_external_common
-[0-9a-f]+ <[^>]*> sd	a0,-32768\(at\)
-[ 	]*[0-9a-f]+: REFLO	small_external_common
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: REFHI	\.bss-0x2000
-[0-9a-f]+ <[^>]*> sd	a0,-24576\(at\)
-[ 	]*[0-9a-f]+: REFLO	\.bss-0x2000
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: REFHI	\.sbss-0x1000
-[0-9a-f]+ <[^>]*> sd	a0,-28672\(at\)
-[ 	]*[0-9a-f]+: REFLO	\.sbss-0x1000
-[0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: REFHI	\.data-0x1000
-[0-9a-f]+ <[^>]*> sd	a0,-28672\(at\)
-[ 	]*[0-9a-f]+: REFLO	\.data-0x1000
-[0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: REFHI	big_external_data_label
-[0-9a-f]+ <[^>]*> sd	a0,-32768\(at\)
-[ 	]*[0-9a-f]+: REFLO	big_external_data_label
-[0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: REFHI	small_external_data_label
-[0-9a-f]+ <[^>]*> sd	a0,-32768\(at\)
-[ 	]*[0-9a-f]+: REFLO	small_external_data_label
-[0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: REFHI	big_external_common
-[0-9a-f]+ <[^>]*> sd	a0,-32768\(at\)
-[ 	]*[0-9a-f]+: REFLO	big_external_common
-[0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: REFHI	small_external_common
-[0-9a-f]+ <[^>]*> sd	a0,-32768\(at\)
-[ 	]*[0-9a-f]+: REFLO	small_external_common
-[0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: REFHI	\.bss-0x2000
-[0-9a-f]+ <[^>]*> sd	a0,-24576\(at\)
-[ 	]*[0-9a-f]+: REFLO	\.bss-0x2000
-[0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: REFHI	\.sbss-0x1000
-[0-9a-f]+ <[^>]*> sd	a0,-28672\(at\)
-[ 	]*[0-9a-f]+: REFLO	\.sbss-0x1000
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: REFHI	\.data-0x1000
-[0-9a-f]+ <[^>]*> sd	a0,4096\(at\)
-[ 	]*[0-9a-f]+: REFLO	\.data-0x1000
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: REFHI	big_external_data_label
-[0-9a-f]+ <[^>]*> sd	a0,0\(at\)
-[ 	]*[0-9a-f]+: REFLO	big_external_data_label
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: REFHI	small_external_data_label
-[0-9a-f]+ <[^>]*> sd	a0,0\(at\)
-[ 	]*[0-9a-f]+: REFLO	small_external_data_label
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: REFHI	big_external_common
-[0-9a-f]+ <[^>]*> sd	a0,0\(at\)
-[ 	]*[0-9a-f]+: REFLO	big_external_common
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: REFHI	small_external_common
-[0-9a-f]+ <[^>]*> sd	a0,0\(at\)
-[ 	]*[0-9a-f]+: REFLO	small_external_common
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: REFHI	\.bss-0x2000
-[0-9a-f]+ <[^>]*> sd	a0,8192\(at\)
-[ 	]*[0-9a-f]+: REFLO	\.bss-0x2000
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: REFHI	\.sbss-0x1000
-[0-9a-f]+ <[^>]*> sd	a0,4096\(at\)
-[ 	]*[0-9a-f]+: REFLO	\.sbss-0x1000
-[0-9a-f]+ <[^>]*> lui	at,0x2
-[ 	]*[0-9a-f]+: REFHI	\.data-0x1000
-[0-9a-f]+ <[^>]*> sd	a0,-19035\(at\)
-[ 	]*[0-9a-f]+: REFLO	\.data-0x1000
-[0-9a-f]+ <[^>]*> lui	at,0x2
-[ 	]*[0-9a-f]+: REFHI	big_external_data_label
-[0-9a-f]+ <[^>]*> sd	a0,-23131\(at\)
-[ 	]*[0-9a-f]+: REFLO	big_external_data_label
-[0-9a-f]+ <[^>]*> lui	at,0x2
-[ 	]*[0-9a-f]+: REFHI	small_external_data_label
-[0-9a-f]+ <[^>]*> sd	a0,-23131\(at\)
-[ 	]*[0-9a-f]+: REFLO	small_external_data_label
-[0-9a-f]+ <[^>]*> lui	at,0x2
-[ 	]*[0-9a-f]+: REFHI	big_external_common
-[0-9a-f]+ <[^>]*> sd	a0,-23131\(at\)
-[ 	]*[0-9a-f]+: REFLO	big_external_common
-[0-9a-f]+ <[^>]*> lui	at,0x2
-[ 	]*[0-9a-f]+: REFHI	small_external_common
-[0-9a-f]+ <[^>]*> sd	a0,-23131\(at\)
-[ 	]*[0-9a-f]+: REFLO	small_external_common
-[0-9a-f]+ <[^>]*> lui	at,0x2
-[ 	]*[0-9a-f]+: REFHI	\.bss-0x2000
-[0-9a-f]+ <[^>]*> sd	a0,-14939\(at\)
-[ 	]*[0-9a-f]+: REFLO	\.bss-0x2000
-[0-9a-f]+ <[^>]*> lui	at,0x2
-[ 	]*[0-9a-f]+: REFHI	\.sbss-0x1000
-[0-9a-f]+ <[^>]*> sd	a0,-19035\(at\)
-[ 	]*[0-9a-f]+: REFLO	\.sbss-0x1000
-[0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: REFHI	\.data-0x1000
-[0-9a-f]+ <[^>]*> addu	at,at,a1
-[0-9a-f]+ <[^>]*> sd	a0,4096\(at\)
-[ 	]*[0-9a-f]+: REFLO	\.data-0x1000
-[0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: REFHI	big_external_data_label
-[0-9a-f]+ <[^>]*> addu	at,at,a1
-[0-9a-f]+ <[^>]*> sd	a0,0\(at\)
-[ 	]*[0-9a-f]+: REFLO	big_external_data_label
-[0-9a-f]+ <[^>]*> addu	at,a1,gp
-[0-9a-f]+ <[^>]*> sd	a0,0\(at\)
-[ 	]*[0-9a-f]+: GPREL	small_external_data_label
-[0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: REFHI	big_external_common
-[0-9a-f]+ <[^>]*> addu	at,at,a1
-[0-9a-f]+ <[^>]*> sd	a0,0\(at\)
-[ 	]*[0-9a-f]+: REFLO	big_external_common
-[0-9a-f]+ <[^>]*> addu	at,a1,gp
-[0-9a-f]+ <[^>]*> sd	a0,0\(at\)
-[ 	]*[0-9a-f]+: GPREL	small_external_common
-[0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: REFHI	\.bss-0x2000
-[0-9a-f]+ <[^>]*> addu	at,at,a1
-[0-9a-f]+ <[^>]*> sd	a0,8192\(at\)
-[ 	]*[0-9a-f]+: REFLO	\.bss-0x2000
-[0-9a-f]+ <[^>]*> addu	at,a1,gp
-[0-9a-f]+ <[^>]*> sd	a0,-16384\(at\)
-[ 	]*[0-9a-f]+: GPREL	\.sbss\+0x4000
-[0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: REFHI	\.data-0x1000
-[0-9a-f]+ <[^>]*> addu	at,at,a1
-[0-9a-f]+ <[^>]*> sd	a0,4097\(at\)
-[ 	]*[0-9a-f]+: REFLO	\.data-0x1000
-[0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: REFHI	big_external_data_label
-[0-9a-f]+ <[^>]*> addu	at,at,a1
-[0-9a-f]+ <[^>]*> sd	a0,1\(at\)
-[ 	]*[0-9a-f]+: REFLO	big_external_data_label
-[0-9a-f]+ <[^>]*> addu	at,a1,gp
-[0-9a-f]+ <[^>]*> sd	a0,1\(at\)
-[ 	]*[0-9a-f]+: GPREL	small_external_data_label
-[0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: REFHI	big_external_common
-[0-9a-f]+ <[^>]*> addu	at,at,a1
-[0-9a-f]+ <[^>]*> sd	a0,1\(at\)
-[ 	]*[0-9a-f]+: REFLO	big_external_common
-[0-9a-f]+ <[^>]*> addu	at,a1,gp
-[0-9a-f]+ <[^>]*> sd	a0,1\(at\)
-[ 	]*[0-9a-f]+: GPREL	small_external_common
-[0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: REFHI	\.bss-0x2000
-[0-9a-f]+ <[^>]*> addu	at,at,a1
-[0-9a-f]+ <[^>]*> sd	a0,8193\(at\)
-[ 	]*[0-9a-f]+: REFLO	\.bss-0x2000
-[0-9a-f]+ <[^>]*> addu	at,a1,gp
-[0-9a-f]+ <[^>]*> sd	a0,-16383\(at\)
-[ 	]*[0-9a-f]+: GPREL	\.sbss\+0x4000
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: REFHI	\.data-0x1000
-[0-9a-f]+ <[^>]*> addu	at,at,a1
-[0-9a-f]+ <[^>]*> sd	a0,-28672\(at\)
-[ 	]*[0-9a-f]+: REFLO	\.data-0x1000
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: REFHI	big_external_data_label
-[0-9a-f]+ <[^>]*> addu	at,at,a1
-[0-9a-f]+ <[^>]*> sd	a0,-32768\(at\)
-[ 	]*[0-9a-f]+: REFLO	big_external_data_label
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: REFHI	small_external_data_label
-[0-9a-f]+ <[^>]*> addu	at,at,a1
-[0-9a-f]+ <[^>]*> sd	a0,-32768\(at\)
-[ 	]*[0-9a-f]+: REFLO	small_external_data_label
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: REFHI	big_external_common
-[0-9a-f]+ <[^>]*> addu	at,at,a1
-[0-9a-f]+ <[^>]*> sd	a0,-32768\(at\)
-[ 	]*[0-9a-f]+: REFLO	big_external_common
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: REFHI	small_external_common
-[0-9a-f]+ <[^>]*> addu	at,at,a1
-[0-9a-f]+ <[^>]*> sd	a0,-32768\(at\)
-[ 	]*[0-9a-f]+: REFLO	small_external_common
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: REFHI	\.bss-0x2000
-[0-9a-f]+ <[^>]*> addu	at,at,a1
-[0-9a-f]+ <[^>]*> sd	a0,-24576\(at\)
-[ 	]*[0-9a-f]+: REFLO	\.bss-0x2000
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: REFHI	\.sbss-0x1000
-[0-9a-f]+ <[^>]*> addu	at,at,a1
-[0-9a-f]+ <[^>]*> sd	a0,-28672\(at\)
-[ 	]*[0-9a-f]+: REFLO	\.sbss-0x1000
-[0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: REFHI	\.data-0x1000
-[0-9a-f]+ <[^>]*> addu	at,at,a1
-[0-9a-f]+ <[^>]*> sd	a0,-28672\(at\)
-[ 	]*[0-9a-f]+: REFLO	\.data-0x1000
-[0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: REFHI	big_external_data_label
-[0-9a-f]+ <[^>]*> addu	at,at,a1
-[0-9a-f]+ <[^>]*> sd	a0,-32768\(at\)
-[ 	]*[0-9a-f]+: REFLO	big_external_data_label
-[0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: REFHI	small_external_data_label
-[0-9a-f]+ <[^>]*> addu	at,at,a1
-[0-9a-f]+ <[^>]*> sd	a0,-32768\(at\)
-[ 	]*[0-9a-f]+: REFLO	small_external_data_label
-[0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: REFHI	big_external_common
-[0-9a-f]+ <[^>]*> addu	at,at,a1
-[0-9a-f]+ <[^>]*> sd	a0,-32768\(at\)
-[ 	]*[0-9a-f]+: REFLO	big_external_common
-[0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: REFHI	small_external_common
-[0-9a-f]+ <[^>]*> addu	at,at,a1
-[0-9a-f]+ <[^>]*> sd	a0,-32768\(at\)
-[ 	]*[0-9a-f]+: REFLO	small_external_common
-[0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: REFHI	\.bss-0x2000
-[0-9a-f]+ <[^>]*> addu	at,at,a1
-[0-9a-f]+ <[^>]*> sd	a0,-24576\(at\)
-[ 	]*[0-9a-f]+: REFLO	\.bss-0x2000
-[0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: REFHI	\.sbss-0x1000
-[0-9a-f]+ <[^>]*> addu	at,at,a1
-[0-9a-f]+ <[^>]*> sd	a0,-28672\(at\)
-[ 	]*[0-9a-f]+: REFLO	\.sbss-0x1000
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: REFHI	\.data-0x1000
-[0-9a-f]+ <[^>]*> addu	at,at,a1
-[0-9a-f]+ <[^>]*> sd	a0,4096\(at\)
-[ 	]*[0-9a-f]+: REFLO	\.data-0x1000
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: REFHI	big_external_data_label
-[0-9a-f]+ <[^>]*> addu	at,at,a1
-[0-9a-f]+ <[^>]*> sd	a0,0\(at\)
-[ 	]*[0-9a-f]+: REFLO	big_external_data_label
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: REFHI	small_external_data_label
-[0-9a-f]+ <[^>]*> addu	at,at,a1
-[0-9a-f]+ <[^>]*> sd	a0,0\(at\)
-[ 	]*[0-9a-f]+: REFLO	small_external_data_label
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: REFHI	big_external_common
-[0-9a-f]+ <[^>]*> addu	at,at,a1
-[0-9a-f]+ <[^>]*> sd	a0,0\(at\)
-[ 	]*[0-9a-f]+: REFLO	big_external_common
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: REFHI	small_external_common
-[0-9a-f]+ <[^>]*> addu	at,at,a1
-[0-9a-f]+ <[^>]*> sd	a0,0\(at\)
-[ 	]*[0-9a-f]+: REFLO	small_external_common
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: REFHI	\.bss-0x2000
-[0-9a-f]+ <[^>]*> addu	at,at,a1
-[0-9a-f]+ <[^>]*> sd	a0,8192\(at\)
-[ 	]*[0-9a-f]+: REFLO	\.bss-0x2000
-[0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: REFHI	\.sbss-0x1000
-[0-9a-f]+ <[^>]*> addu	at,at,a1
-[0-9a-f]+ <[^>]*> sd	a0,4096\(at\)
-[ 	]*[0-9a-f]+: REFLO	\.sbss-0x1000
-[0-9a-f]+ <[^>]*> lui	at,0x2
-[ 	]*[0-9a-f]+: REFHI	\.data-0x1000
-[0-9a-f]+ <[^>]*> addu	at,at,a1
-[0-9a-f]+ <[^>]*> sd	a0,-19035\(at\)
-[ 	]*[0-9a-f]+: REFLO	\.data-0x1000
-[0-9a-f]+ <[^>]*> lui	at,0x2
-[ 	]*[0-9a-f]+: REFHI	big_external_data_label
-[0-9a-f]+ <[^>]*> addu	at,at,a1
-[0-9a-f]+ <[^>]*> sd	a0,-23131\(at\)
-[ 	]*[0-9a-f]+: REFLO	big_external_data_label
-[0-9a-f]+ <[^>]*> lui	at,0x2
-[ 	]*[0-9a-f]+: REFHI	small_external_data_label
-[0-9a-f]+ <[^>]*> addu	at,at,a1
-[0-9a-f]+ <[^>]*> sd	a0,-23131\(at\)
-[ 	]*[0-9a-f]+: REFLO	small_external_data_label
-[0-9a-f]+ <[^>]*> lui	at,0x2
-[ 	]*[0-9a-f]+: REFHI	big_external_common
-[0-9a-f]+ <[^>]*> addu	at,at,a1
-[0-9a-f]+ <[^>]*> sd	a0,-23131\(at\)
-[ 	]*[0-9a-f]+: REFLO	big_external_common
-[0-9a-f]+ <[^>]*> lui	at,0x2
-[ 	]*[0-9a-f]+: REFHI	small_external_common
-[0-9a-f]+ <[^>]*> addu	at,at,a1
-[0-9a-f]+ <[^>]*> sd	a0,-23131\(at\)
-[ 	]*[0-9a-f]+: REFLO	small_external_common
-[0-9a-f]+ <[^>]*> lui	at,0x2
-[ 	]*[0-9a-f]+: REFHI	\.bss-0x2000
-[0-9a-f]+ <[^>]*> addu	at,at,a1
-[0-9a-f]+ <[^>]*> sd	a0,-14939\(at\)
-[ 	]*[0-9a-f]+: REFLO	\.bss-0x2000
-[0-9a-f]+ <[^>]*> lui	at,0x2
-[ 	]*[0-9a-f]+: REFHI	\.sbss-0x1000
-[0-9a-f]+ <[^>]*> addu	at,at,a1
-[0-9a-f]+ <[^>]*> sd	a0,-19035\(at\)
-[ 	]*[0-9a-f]+: REFLO	\.sbss-0x1000
-	\.\.\.
diff --git a/gas/testsuite/gas/mips/la.d b/gas/testsuite/gas/mips/la.d
index 7395014..071a12e 100644
--- a/gas/testsuite/gas/mips/la.d
+++ b/gas/testsuite/gas/mips/la.d
@@ -25,358 +25,358 @@ Disassembly of section .text:
 [0-9a-f]+ <[^>]*> ori	a0,a0,0xa5a5
 [0-9a-f]+ <[^>]*> addu	a0,a0,a1
 [0-9a-f]+ <[^>]*> lui	a0,0x0
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*[0-9a-f]+: R_MIPS_HI16	\.data
 [0-9a-f]+ <[^>]*> addiu	a0,a0,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*[0-9a-f]+: R_MIPS_LO16	\.data
 [0-9a-f]+ <[^>]*> lui	a0,0x0
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*[0-9a-f]+: R_MIPS_HI16	big_external_data_label
 [0-9a-f]+ <[^>]*> addiu	a0,a0,0
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*[0-9a-f]+: R_MIPS_LO16	big_external_data_label
 [0-9a-f]+ <[^>]*> addiu	a0,gp,0
-[ 	]*[0-9a-f]+: [A-Z0-9_]*GPREL[A-Z0-9_]*	small_external_data_label
+[ 	]*[0-9a-f]+: R_MIPS_GPREL16	small_external_data_label
 [0-9a-f]+ <[^>]*> lui	a0,0x0
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*[0-9a-f]+: R_MIPS_HI16	big_external_common
 [0-9a-f]+ <[^>]*> addiu	a0,a0,0
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*[0-9a-f]+: R_MIPS_LO16	big_external_common
 [0-9a-f]+ <[^>]*> addiu	a0,gp,0
-[ 	]*[0-9a-f]+: [A-Z0-9_]*GPREL[A-Z0-9_]*	small_external_common
+[ 	]*[0-9a-f]+: R_MIPS_GPREL16	small_external_common
 [0-9a-f]+ <[^>]*> lui	a0,0x0
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*[0-9a-f]+: R_MIPS_HI16	\.bss
 [0-9a-f]+ <[^>]*> addiu	a0,a0,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*[0-9a-f]+: R_MIPS_LO16	\.bss
 [0-9a-f]+ <[^>]*> addiu	a0,gp,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*GPREL[A-Z0-9_]*	.sbss.*
+[ 	]*[0-9a-f]+: R_MIPS_GPREL16	\.sbss
 [0-9a-f]+ <[^>]*> lui	a0,0x0
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*[0-9a-f]+: R_MIPS_HI16	\.data
 [0-9a-f]+ <[^>]*> addiu	a0,a0,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*[0-9a-f]+: R_MIPS_LO16	\.data
 [0-9a-f]+ <[^>]*> lui	a0,0x0
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*[0-9a-f]+: R_MIPS_HI16	big_external_data_label
 [0-9a-f]+ <[^>]*> addiu	a0,a0,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*[0-9a-f]+: R_MIPS_LO16	big_external_data_label
 [0-9a-f]+ <[^>]*> addiu	a0,gp,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*GPREL[A-Z0-9_]*	small_external_data_label
+[ 	]*[0-9a-f]+: R_MIPS_GPREL16	small_external_data_label
 [0-9a-f]+ <[^>]*> lui	a0,0x0
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*[0-9a-f]+: R_MIPS_HI16	big_external_common
 [0-9a-f]+ <[^>]*> addiu	a0,a0,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*[0-9a-f]+: R_MIPS_LO16	big_external_common
 [0-9a-f]+ <[^>]*> addiu	a0,gp,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*GPREL[A-Z0-9_]*	small_external_common
+[ 	]*[0-9a-f]+: R_MIPS_GPREL16	small_external_common
 [0-9a-f]+ <[^>]*> lui	a0,0x0
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*[0-9a-f]+: R_MIPS_HI16	\.bss
 [0-9a-f]+ <[^>]*> addiu	a0,a0,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*[0-9a-f]+: R_MIPS_LO16	\.bss
 [0-9a-f]+ <[^>]*> addiu	a0,gp,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*GPREL[A-Z0-9_]*	.sbss.*
+[ 	]*[0-9a-f]+: R_MIPS_GPREL16	\.sbss
 [0-9a-f]+ <[^>]*> lui	a0,[-0-9x]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*[0-9a-f]+: R_MIPS_HI16	\.data
 [0-9a-f]+ <[^>]*> addiu	a0,a0,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*[0-9a-f]+: R_MIPS_LO16	\.data
 [0-9a-f]+ <[^>]*> lui	a0,[-0-9x]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*[0-9a-f]+: R_MIPS_HI16	big_external_data_label
 [0-9a-f]+ <[^>]*> addiu	a0,a0,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*[0-9a-f]+: R_MIPS_LO16	big_external_data_label
 [0-9a-f]+ <[^>]*> lui	a0,[-0-9x]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_data_label
+[ 	]*[0-9a-f]+: R_MIPS_HI16	small_external_data_label
 [0-9a-f]+ <[^>]*> addiu	a0,a0,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_data_label
+[ 	]*[0-9a-f]+: R_MIPS_LO16	small_external_data_label
 [0-9a-f]+ <[^>]*> lui	a0,[-0-9x]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*[0-9a-f]+: R_MIPS_HI16	big_external_common
 [0-9a-f]+ <[^>]*> addiu	a0,a0,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*[0-9a-f]+: R_MIPS_LO16	big_external_common
 [0-9a-f]+ <[^>]*> lui	a0,[-0-9x]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_common
+[ 	]*[0-9a-f]+: R_MIPS_HI16	small_external_common
 [0-9a-f]+ <[^>]*> addiu	a0,a0,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_common
+[ 	]*[0-9a-f]+: R_MIPS_LO16	small_external_common
 [0-9a-f]+ <[^>]*> lui	a0,[-0-9x]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*[0-9a-f]+: R_MIPS_HI16	\.bss
 [0-9a-f]+ <[^>]*> addiu	a0,a0,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*[0-9a-f]+: R_MIPS_LO16	\.bss
 [0-9a-f]+ <[^>]*> lui	a0,[-0-9x]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	.sbss.*
+[ 	]*[0-9a-f]+: R_MIPS_HI16	\.sbss
 [0-9a-f]+ <[^>]*> addiu	a0,a0,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	.sbss.*
+[ 	]*[0-9a-f]+: R_MIPS_LO16	\.sbss
 [0-9a-f]+ <[^>]*> lui	a0,0x0
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*[0-9a-f]+: R_MIPS_HI16	\.data
 [0-9a-f]+ <[^>]*> addiu	a0,a0,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*[0-9a-f]+: R_MIPS_LO16	\.data
 [0-9a-f]+ <[^>]*> lui	a0,0x0
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*[0-9a-f]+: R_MIPS_HI16	big_external_data_label
 [0-9a-f]+ <[^>]*> addiu	a0,a0,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*[0-9a-f]+: R_MIPS_LO16	big_external_data_label
 [0-9a-f]+ <[^>]*> lui	a0,0x0
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_data_label
+[ 	]*[0-9a-f]+: R_MIPS_HI16	small_external_data_label
 [0-9a-f]+ <[^>]*> addiu	a0,a0,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_data_label
+[ 	]*[0-9a-f]+: R_MIPS_LO16	small_external_data_label
 [0-9a-f]+ <[^>]*> lui	a0,0x0
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*[0-9a-f]+: R_MIPS_HI16	big_external_common
 [0-9a-f]+ <[^>]*> addiu	a0,a0,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*[0-9a-f]+: R_MIPS_LO16	big_external_common
 [0-9a-f]+ <[^>]*> lui	a0,0x0
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_common
+[ 	]*[0-9a-f]+: R_MIPS_HI16	small_external_common
 [0-9a-f]+ <[^>]*> addiu	a0,a0,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_common
+[ 	]*[0-9a-f]+: R_MIPS_LO16	small_external_common
 [0-9a-f]+ <[^>]*> lui	a0,0x0
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*[0-9a-f]+: R_MIPS_HI16	\.bss
 [0-9a-f]+ <[^>]*> addiu	a0,a0,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*[0-9a-f]+: R_MIPS_LO16	\.bss
 [0-9a-f]+ <[^>]*> lui	a0,0x0
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	.sbss.*
+[ 	]*[0-9a-f]+: R_MIPS_HI16	\.sbss
 [0-9a-f]+ <[^>]*> addiu	a0,a0,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	.sbss.*
+[ 	]*[0-9a-f]+: R_MIPS_LO16	\.sbss
 [0-9a-f]+ <[^>]*> lui	a0,[-0-9x]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*[0-9a-f]+: R_MIPS_HI16	\.data
 [0-9a-f]+ <[^>]*> addiu	a0,a0,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*[0-9a-f]+: R_MIPS_LO16	\.data
 [0-9a-f]+ <[^>]*> lui	a0,[-0-9x]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*[0-9a-f]+: R_MIPS_HI16	big_external_data_label
 [0-9a-f]+ <[^>]*> addiu	a0,a0,0
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*[0-9a-f]+: R_MIPS_LO16	big_external_data_label
 [0-9a-f]+ <[^>]*> lui	a0,[-0-9x]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_data_label
+[ 	]*[0-9a-f]+: R_MIPS_HI16	small_external_data_label
 [0-9a-f]+ <[^>]*> addiu	a0,a0,0
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_data_label
+[ 	]*[0-9a-f]+: R_MIPS_LO16	small_external_data_label
 [0-9a-f]+ <[^>]*> lui	a0,[-0-9x]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*[0-9a-f]+: R_MIPS_HI16	big_external_common
 [0-9a-f]+ <[^>]*> addiu	a0,a0,0
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*[0-9a-f]+: R_MIPS_LO16	big_external_common
 [0-9a-f]+ <[^>]*> lui	a0,[-0-9x]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_common
+[ 	]*[0-9a-f]+: R_MIPS_HI16	small_external_common
 [0-9a-f]+ <[^>]*> addiu	a0,a0,0
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_common
+[ 	]*[0-9a-f]+: R_MIPS_LO16	small_external_common
 [0-9a-f]+ <[^>]*> lui	a0,[-0-9x]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*[0-9a-f]+: R_MIPS_HI16	\.bss
 [0-9a-f]+ <[^>]*> addiu	a0,a0,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*[0-9a-f]+: R_MIPS_LO16	\.bss
 [0-9a-f]+ <[^>]*> lui	a0,[-0-9x]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	.sbss.*
+[ 	]*[0-9a-f]+: R_MIPS_HI16	\.sbss
 [0-9a-f]+ <[^>]*> addiu	a0,a0,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	.sbss.*
+[ 	]*[0-9a-f]+: R_MIPS_LO16	\.sbss
 [0-9a-f]+ <[^>]*> lui	a0,[-0-9x]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*[0-9a-f]+: R_MIPS_HI16	\.data
 [0-9a-f]+ <[^>]*> addiu	a0,a0,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*[0-9a-f]+: R_MIPS_LO16	\.data
 [0-9a-f]+ <[^>]*> lui	a0,[-0-9x]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*[0-9a-f]+: R_MIPS_HI16	big_external_data_label
 [0-9a-f]+ <[^>]*> addiu	a0,a0,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*[0-9a-f]+: R_MIPS_LO16	big_external_data_label
 [0-9a-f]+ <[^>]*> lui	a0,[-0-9x]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_data_label
+[ 	]*[0-9a-f]+: R_MIPS_HI16	small_external_data_label
 [0-9a-f]+ <[^>]*> addiu	a0,a0,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_data_label
+[ 	]*[0-9a-f]+: R_MIPS_LO16	small_external_data_label
 [0-9a-f]+ <[^>]*> lui	a0,[-0-9x]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*[0-9a-f]+: R_MIPS_HI16	big_external_common
 [0-9a-f]+ <[^>]*> addiu	a0,a0,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*[0-9a-f]+: R_MIPS_LO16	big_external_common
 [0-9a-f]+ <[^>]*> lui	a0,[-0-9x]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_common
+[ 	]*[0-9a-f]+: R_MIPS_HI16	small_external_common
 [0-9a-f]+ <[^>]*> addiu	a0,a0,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_common
+[ 	]*[0-9a-f]+: R_MIPS_LO16	small_external_common
 [0-9a-f]+ <[^>]*> lui	a0,[-0-9x]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*[0-9a-f]+: R_MIPS_HI16	\.bss
 [0-9a-f]+ <[^>]*> addiu	a0,a0,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*[0-9a-f]+: R_MIPS_LO16	\.bss
 [0-9a-f]+ <[^>]*> lui	a0,[-0-9x]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	.sbss.*
+[ 	]*[0-9a-f]+: R_MIPS_HI16	\.sbss
 [0-9a-f]+ <[^>]*> addiu	a0,a0,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	.sbss.*
+[ 	]*[0-9a-f]+: R_MIPS_LO16	\.sbss
 [0-9a-f]+ <[^>]*> lui	a0,0x0
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*[0-9a-f]+: R_MIPS_HI16	\.data
 [0-9a-f]+ <[^>]*> addiu	a0,a0,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*[0-9a-f]+: R_MIPS_LO16	\.data
 [0-9a-f]+ <[^>]*> addu	a0,a0,a1
 [0-9a-f]+ <[^>]*> lui	a0,0x0
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*[0-9a-f]+: R_MIPS_HI16	big_external_data_label
 [0-9a-f]+ <[^>]*> addiu	a0,a0,0
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*[0-9a-f]+: R_MIPS_LO16	big_external_data_label
 [0-9a-f]+ <[^>]*> addu	a0,a0,a1
 [0-9a-f]+ <[^>]*> addiu	a0,gp,0
-[ 	]*[0-9a-f]+: [A-Z0-9_]*GPREL[A-Z0-9_]*	small_external_data_label
+[ 	]*[0-9a-f]+: R_MIPS_GPREL16	small_external_data_label
 [0-9a-f]+ <[^>]*> addu	a0,a0,a1
 [0-9a-f]+ <[^>]*> lui	a0,0x0
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*[0-9a-f]+: R_MIPS_HI16	big_external_common
 [0-9a-f]+ <[^>]*> addiu	a0,a0,0
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*[0-9a-f]+: R_MIPS_LO16	big_external_common
 [0-9a-f]+ <[^>]*> addu	a0,a0,a1
 [0-9a-f]+ <[^>]*> addiu	a0,gp,0
-[ 	]*[0-9a-f]+: [A-Z0-9_]*GPREL[A-Z0-9_]*	small_external_common
+[ 	]*[0-9a-f]+: R_MIPS_GPREL16	small_external_common
 [0-9a-f]+ <[^>]*> addu	a0,a0,a1
 [0-9a-f]+ <[^>]*> lui	a0,0x0
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*[0-9a-f]+: R_MIPS_HI16	\.bss
 [0-9a-f]+ <[^>]*> addiu	a0,a0,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*[0-9a-f]+: R_MIPS_LO16	\.bss
 [0-9a-f]+ <[^>]*> addu	a0,a0,a1
 [0-9a-f]+ <[^>]*> addiu	a0,gp,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*GPREL[A-Z0-9_]*	.sbss.*
+[ 	]*[0-9a-f]+: R_MIPS_GPREL16	\.sbss
 [0-9a-f]+ <[^>]*> addu	a0,a0,a1
 [0-9a-f]+ <[^>]*> lui	a0,0x0
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*[0-9a-f]+: R_MIPS_HI16	\.data
 [0-9a-f]+ <[^>]*> addiu	a0,a0,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*[0-9a-f]+: R_MIPS_LO16	\.data
 [0-9a-f]+ <[^>]*> addu	a0,a0,a1
 [0-9a-f]+ <[^>]*> lui	a0,0x0
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*[0-9a-f]+: R_MIPS_HI16	big_external_data_label
 [0-9a-f]+ <[^>]*> addiu	a0,a0,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*[0-9a-f]+: R_MIPS_LO16	big_external_data_label
 [0-9a-f]+ <[^>]*> addu	a0,a0,a1
 [0-9a-f]+ <[^>]*> addiu	a0,gp,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*GPREL[A-Z0-9_]*	small_external_data_label
+[ 	]*[0-9a-f]+: R_MIPS_GPREL16	small_external_data_label
 [0-9a-f]+ <[^>]*> addu	a0,a0,a1
 [0-9a-f]+ <[^>]*> lui	a0,0x0
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*[0-9a-f]+: R_MIPS_HI16	big_external_common
 [0-9a-f]+ <[^>]*> addiu	a0,a0,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*[0-9a-f]+: R_MIPS_LO16	big_external_common
 [0-9a-f]+ <[^>]*> addu	a0,a0,a1
 [0-9a-f]+ <[^>]*> addiu	a0,gp,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*GPREL[A-Z0-9_]*	small_external_common
+[ 	]*[0-9a-f]+: R_MIPS_GPREL16	small_external_common
 [0-9a-f]+ <[^>]*> addu	a0,a0,a1
 [0-9a-f]+ <[^>]*> lui	a0,0x0
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*[0-9a-f]+: R_MIPS_HI16	\.bss
 [0-9a-f]+ <[^>]*> addiu	a0,a0,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*[0-9a-f]+: R_MIPS_LO16	\.bss
 [0-9a-f]+ <[^>]*> addu	a0,a0,a1
 [0-9a-f]+ <[^>]*> addiu	a0,gp,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*GPREL[A-Z0-9_]*	.sbss.*
+[ 	]*[0-9a-f]+: R_MIPS_GPREL16	\.sbss
 [0-9a-f]+ <[^>]*> addu	a0,a0,a1
 [0-9a-f]+ <[^>]*> lui	a0,[-0-9x]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*[0-9a-f]+: R_MIPS_HI16	\.data
 [0-9a-f]+ <[^>]*> addiu	a0,a0,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*[0-9a-f]+: R_MIPS_LO16	\.data
 [0-9a-f]+ <[^>]*> addu	a0,a0,a1
 [0-9a-f]+ <[^>]*> lui	a0,[-0-9x]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*[0-9a-f]+: R_MIPS_HI16	big_external_data_label
 [0-9a-f]+ <[^>]*> addiu	a0,a0,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*[0-9a-f]+: R_MIPS_LO16	big_external_data_label
 [0-9a-f]+ <[^>]*> addu	a0,a0,a1
 [0-9a-f]+ <[^>]*> lui	a0,[-0-9x]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_data_label
+[ 	]*[0-9a-f]+: R_MIPS_HI16	small_external_data_label
 [0-9a-f]+ <[^>]*> addiu	a0,a0,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_data_label
+[ 	]*[0-9a-f]+: R_MIPS_LO16	small_external_data_label
 [0-9a-f]+ <[^>]*> addu	a0,a0,a1
 [0-9a-f]+ <[^>]*> lui	a0,[-0-9x]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*[0-9a-f]+: R_MIPS_HI16	big_external_common
 [0-9a-f]+ <[^>]*> addiu	a0,a0,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*[0-9a-f]+: R_MIPS_LO16	big_external_common
 [0-9a-f]+ <[^>]*> addu	a0,a0,a1
 [0-9a-f]+ <[^>]*> lui	a0,[-0-9x]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_common
+[ 	]*[0-9a-f]+: R_MIPS_HI16	small_external_common
 [0-9a-f]+ <[^>]*> addiu	a0,a0,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_common
+[ 	]*[0-9a-f]+: R_MIPS_LO16	small_external_common
 [0-9a-f]+ <[^>]*> addu	a0,a0,a1
 [0-9a-f]+ <[^>]*> lui	a0,[-0-9x]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*[0-9a-f]+: R_MIPS_HI16	\.bss
 [0-9a-f]+ <[^>]*> addiu	a0,a0,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*[0-9a-f]+: R_MIPS_LO16	\.bss
 [0-9a-f]+ <[^>]*> addu	a0,a0,a1
 [0-9a-f]+ <[^>]*> lui	a0,[-0-9x]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	.sbss.*
+[ 	]*[0-9a-f]+: R_MIPS_HI16	\.sbss
 [0-9a-f]+ <[^>]*> addiu	a0,a0,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	.sbss.*
+[ 	]*[0-9a-f]+: R_MIPS_LO16	\.sbss
 [0-9a-f]+ <[^>]*> addu	a0,a0,a1
 [0-9a-f]+ <[^>]*> lui	a0,0x0
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*[0-9a-f]+: R_MIPS_HI16	\.data
 [0-9a-f]+ <[^>]*> addiu	a0,a0,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*[0-9a-f]+: R_MIPS_LO16	\.data
 [0-9a-f]+ <[^>]*> addu	a0,a0,a1
 [0-9a-f]+ <[^>]*> lui	a0,0x0
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*[0-9a-f]+: R_MIPS_HI16	big_external_data_label
 [0-9a-f]+ <[^>]*> addiu	a0,a0,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*[0-9a-f]+: R_MIPS_LO16	big_external_data_label
 [0-9a-f]+ <[^>]*> addu	a0,a0,a1
 [0-9a-f]+ <[^>]*> lui	a0,0x0
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_data_label
+[ 	]*[0-9a-f]+: R_MIPS_HI16	small_external_data_label
 [0-9a-f]+ <[^>]*> addiu	a0,a0,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_data_label
+[ 	]*[0-9a-f]+: R_MIPS_LO16	small_external_data_label
 [0-9a-f]+ <[^>]*> addu	a0,a0,a1
 [0-9a-f]+ <[^>]*> lui	a0,0x0
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*[0-9a-f]+: R_MIPS_HI16	big_external_common
 [0-9a-f]+ <[^>]*> addiu	a0,a0,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*[0-9a-f]+: R_MIPS_LO16	big_external_common
 [0-9a-f]+ <[^>]*> addu	a0,a0,a1
 [0-9a-f]+ <[^>]*> lui	a0,0x0
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_common
+[ 	]*[0-9a-f]+: R_MIPS_HI16	small_external_common
 [0-9a-f]+ <[^>]*> addiu	a0,a0,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_common
+[ 	]*[0-9a-f]+: R_MIPS_LO16	small_external_common
 [0-9a-f]+ <[^>]*> addu	a0,a0,a1
 [0-9a-f]+ <[^>]*> lui	a0,0x0
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*[0-9a-f]+: R_MIPS_HI16	\.bss
 [0-9a-f]+ <[^>]*> addiu	a0,a0,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*[0-9a-f]+: R_MIPS_LO16	\.bss
 [0-9a-f]+ <[^>]*> addu	a0,a0,a1
 [0-9a-f]+ <[^>]*> lui	a0,0x0
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	.sbss.*
+[ 	]*[0-9a-f]+: R_MIPS_HI16	\.sbss
 [0-9a-f]+ <[^>]*> addiu	a0,a0,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	.sbss.*
+[ 	]*[0-9a-f]+: R_MIPS_LO16	\.sbss
 [0-9a-f]+ <[^>]*> addu	a0,a0,a1
 [0-9a-f]+ <[^>]*> lui	a0,[-0-9x]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*[0-9a-f]+: R_MIPS_HI16	\.data
 [0-9a-f]+ <[^>]*> addiu	a0,a0,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*[0-9a-f]+: R_MIPS_LO16	\.data
 [0-9a-f]+ <[^>]*> addu	a0,a0,a1
 [0-9a-f]+ <[^>]*> lui	a0,[-0-9x]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*[0-9a-f]+: R_MIPS_HI16	big_external_data_label
 [0-9a-f]+ <[^>]*> addiu	a0,a0,0
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*[0-9a-f]+: R_MIPS_LO16	big_external_data_label
 [0-9a-f]+ <[^>]*> addu	a0,a0,a1
 [0-9a-f]+ <[^>]*> lui	a0,[-0-9x]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_data_label
+[ 	]*[0-9a-f]+: R_MIPS_HI16	small_external_data_label
 [0-9a-f]+ <[^>]*> addiu	a0,a0,0
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_data_label
+[ 	]*[0-9a-f]+: R_MIPS_LO16	small_external_data_label
 [0-9a-f]+ <[^>]*> addu	a0,a0,a1
 [0-9a-f]+ <[^>]*> lui	a0,[-0-9x]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*[0-9a-f]+: R_MIPS_HI16	big_external_common
 [0-9a-f]+ <[^>]*> addiu	a0,a0,0
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*[0-9a-f]+: R_MIPS_LO16	big_external_common
 [0-9a-f]+ <[^>]*> addu	a0,a0,a1
 [0-9a-f]+ <[^>]*> lui	a0,[-0-9x]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_common
+[ 	]*[0-9a-f]+: R_MIPS_HI16	small_external_common
 [0-9a-f]+ <[^>]*> addiu	a0,a0,0
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_common
+[ 	]*[0-9a-f]+: R_MIPS_LO16	small_external_common
 [0-9a-f]+ <[^>]*> addu	a0,a0,a1
 [0-9a-f]+ <[^>]*> lui	a0,[-0-9x]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*[0-9a-f]+: R_MIPS_HI16	\.bss
 [0-9a-f]+ <[^>]*> addiu	a0,a0,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*[0-9a-f]+: R_MIPS_LO16	\.bss
 [0-9a-f]+ <[^>]*> addu	a0,a0,a1
 [0-9a-f]+ <[^>]*> lui	a0,[-0-9x]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	.sbss.*
+[ 	]*[0-9a-f]+: R_MIPS_HI16	\.sbss
 [0-9a-f]+ <[^>]*> addiu	a0,a0,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	.sbss.*
+[ 	]*[0-9a-f]+: R_MIPS_LO16	\.sbss
 [0-9a-f]+ <[^>]*> addu	a0,a0,a1
 [0-9a-f]+ <[^>]*> lui	a0,[-0-9x]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*[0-9a-f]+: R_MIPS_HI16	\.data
 [0-9a-f]+ <[^>]*> addiu	a0,a0,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*[0-9a-f]+: R_MIPS_LO16	\.data
 [0-9a-f]+ <[^>]*> addu	a0,a0,a1
 [0-9a-f]+ <[^>]*> lui	a0,[-0-9x]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*[0-9a-f]+: R_MIPS_HI16	big_external_data_label
 [0-9a-f]+ <[^>]*> addiu	a0,a0,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*[0-9a-f]+: R_MIPS_LO16	big_external_data_label
 [0-9a-f]+ <[^>]*> addu	a0,a0,a1
 [0-9a-f]+ <[^>]*> lui	a0,[-0-9x]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_data_label
+[ 	]*[0-9a-f]+: R_MIPS_HI16	small_external_data_label
 [0-9a-f]+ <[^>]*> addiu	a0,a0,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_data_label
+[ 	]*[0-9a-f]+: R_MIPS_LO16	small_external_data_label
 [0-9a-f]+ <[^>]*> addu	a0,a0,a1
 [0-9a-f]+ <[^>]*> lui	a0,[-0-9x]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*[0-9a-f]+: R_MIPS_HI16	big_external_common
 [0-9a-f]+ <[^>]*> addiu	a0,a0,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*[0-9a-f]+: R_MIPS_LO16	big_external_common
 [0-9a-f]+ <[^>]*> addu	a0,a0,a1
 [0-9a-f]+ <[^>]*> lui	a0,[-0-9x]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_common
+[ 	]*[0-9a-f]+: R_MIPS_HI16	small_external_common
 [0-9a-f]+ <[^>]*> addiu	a0,a0,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_common
+[ 	]*[0-9a-f]+: R_MIPS_LO16	small_external_common
 [0-9a-f]+ <[^>]*> addu	a0,a0,a1
 [0-9a-f]+ <[^>]*> lui	a0,[-0-9x]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*[0-9a-f]+: R_MIPS_HI16	\.bss
 [0-9a-f]+ <[^>]*> addiu	a0,a0,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*[0-9a-f]+: R_MIPS_LO16	\.bss
 [0-9a-f]+ <[^>]*> addu	a0,a0,a1
 [0-9a-f]+ <[^>]*> lui	a0,[-0-9x]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	.sbss.*
+[ 	]*[0-9a-f]+: R_MIPS_HI16	\.sbss
 [0-9a-f]+ <[^>]*> addiu	a0,a0,[-0-9]+
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	.sbss.*
+[ 	]*[0-9a-f]+: R_MIPS_LO16	\.sbss
 [0-9a-f]+ <[^>]*> addu	a0,a0,a1
 [0-9a-f]+ <[^>]*> addiu	a0,a1,0
 [0-9a-f]+ <[^>]*> lui	a0,0x12
@@ -385,12 +385,12 @@ Disassembly of section .text:
 [0-9a-f]+ <[^>]*> ori	a0,a0,0x3456
 [0-9a-f]+ <[^>]*> addu	a0,a0,a1
 [0-9a-f]+ <[^>]*> lui	a0,0x0
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*[0-9a-f]+: R_MIPS_HI16	big_external_data_label
 [0-9a-f]+ <[^>]*> addiu	a0,a0,0
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*[0-9a-f]+: R_MIPS_LO16	big_external_data_label
 [0-9a-f]+ <[^>]*> lui	a0,0x0
-[ 	]*[0-9a-f]+: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*[0-9a-f]+: R_MIPS_HI16	big_external_data_label
 [0-9a-f]+ <[^>]*> addiu	a0,a0,0
-[ 	]*[0-9a-f]+: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*[0-9a-f]+: R_MIPS_LO16	big_external_data_label
 [0-9a-f]+ <[^>]*> addu	a0,a0,a1
 	...
diff --git a/gas/testsuite/gas/mips/lb.d b/gas/testsuite/gas/mips/lb.d
index 918b842..de77317 100644
--- a/gas/testsuite/gas/mips/lb.d
+++ b/gas/testsuite/gas/mips/lb.d
@@ -29,359 +29,359 @@ Disassembly of section .text:
 0+004c <[^>]*> addu	a0,a0,a1
 0+0050 <[^>]*> lb	a0,-23131\(a0\)
 0+0054 <[^>]*> lui	a0,0x0
-[ 	]*54: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*54: R_MIPS_HI16	\.data
 0+0058 <[^>]*> lb	a0,[0-9]+\(a0\)
-[ 	]*58: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*58: R_MIPS_LO16	\.data
 0+005c <[^>]*> lui	a0,0x0
-[ 	]*5c: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*5c: R_MIPS_HI16	big_external_data_label
 0+0060 <[^>]*> lb	a0,0\(a0\)
-[ 	]*60: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*60: R_MIPS_LO16	big_external_data_label
 0+0064 <[^>]*> lb	a0,0\(gp\)
-[ 	]*64: [A-Z0-9_]*GPREL[A-Z0-9_]*	small_external_data_label
+[ 	]*64: R_MIPS_GPREL16	small_external_data_label
 0+0068 <[^>]*> lui	a0,0x0
-[ 	]*68: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*68: R_MIPS_HI16	big_external_common
 0+006c <[^>]*> lb	a0,0\(a0\)
-[ 	]*6c: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*6c: R_MIPS_LO16	big_external_common
 0+0070 <[^>]*> lb	a0,0\(gp\)
-[ 	]*70: [A-Z0-9_]*GPREL[A-Z0-9_]*	small_external_common
+[ 	]*70: R_MIPS_GPREL16	small_external_common
 0+0074 <[^>]*> lui	a0,0x0
-[ 	]*74: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*74: R_MIPS_HI16	\.bss
 0+0078 <[^>]*> lb	a0,[0-9]+\(a0\)
-[ 	]*78: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*78: R_MIPS_LO16	\.bss
 0+007c <[^>]*> lb	a0,0\(gp\)
-[ 	]*7c: [A-Z0-9_]*GPREL[A-Z0-9_]*	.sbss.*
+[ 	]*7c: R_MIPS_GPREL16	\.sbss
 0+0080 <[^>]*> lui	a0,0x0
-[ 	]*80: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*80: R_MIPS_HI16	\.data
 0+0084 <[^>]*> lb	a0,[0-9]+\(a0\)
-[ 	]*84: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*84: R_MIPS_LO16	\.data
 0+0088 <[^>]*> lui	a0,0x0
-[ 	]*88: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*88: R_MIPS_HI16	big_external_data_label
 0+008c <[^>]*> lb	a0,1\(a0\)
-[ 	]*8c: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*8c: R_MIPS_LO16	big_external_data_label
 0+0090 <[^>]*> lb	a0,1\(gp\)
-[ 	]*90: [A-Z0-9_]*GPREL[A-Z0-9_]*	small_external_data_label
+[ 	]*90: R_MIPS_GPREL16	small_external_data_label
 0+0094 <[^>]*> lui	a0,0x0
-[ 	]*94: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*94: R_MIPS_HI16	big_external_common
 0+0098 <[^>]*> lb	a0,1\(a0\)
-[ 	]*98: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*98: R_MIPS_LO16	big_external_common
 0+009c <[^>]*> lb	a0,1\(gp\)
-[ 	]*9c: [A-Z0-9_]*GPREL[A-Z0-9_]*	small_external_common
+[ 	]*9c: R_MIPS_GPREL16	small_external_common
 0+00a0 <[^>]*> lui	a0,0x0
-[ 	]*a0: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*a0: R_MIPS_HI16	\.bss
 0+00a4 <[^>]*> lb	a0,[0-9]+\(a0\)
-[ 	]*a4: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*a4: R_MIPS_LO16	\.bss
 0+00a8 <[^>]*> lb	a0,[-0-9]+\(gp\)
-[ 	]*a8: [A-Z0-9_]*GPREL[A-Z0-9_]*	.sbss.*
+[ 	]*a8: R_MIPS_GPREL16	\.sbss
 0+00ac <[^>]*> lui	a0,[-0-9x]+
-[ 	]*ac: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*ac: R_MIPS_HI16	\.data
 0+00b0 <[^>]*> lb	a0,[-0-9]+\(a0\)
-[ 	]*b0: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*b0: R_MIPS_LO16	\.data
 0+00b4 <[^>]*> lui	a0,[-0-9x]+
-[ 	]*b4: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*b4: R_MIPS_HI16	big_external_data_label
 0+00b8 <[^>]*> lb	a0,[-0-9]+\(a0\)
-[ 	]*b8: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*b8: R_MIPS_LO16	big_external_data_label
 0+00bc <[^>]*> lui	a0,[-0-9x]+
-[ 	]*bc: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_data_label
+[ 	]*bc: R_MIPS_HI16	small_external_data_label
 0+00c0 <[^>]*> lb	a0,[-0-9]+\(a0\)
-[ 	]*c0: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_data_label
+[ 	]*c0: R_MIPS_LO16	small_external_data_label
 0+00c4 <[^>]*> lui	a0,[-0-9x]+
-[ 	]*c4: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*c4: R_MIPS_HI16	big_external_common
 0+00c8 <[^>]*> lb	a0,[-0-9]+\(a0\)
-[ 	]*c8: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*c8: R_MIPS_LO16	big_external_common
 0+00cc <[^>]*> lui	a0,[-0-9x]+
-[ 	]*cc: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_common
+[ 	]*cc: R_MIPS_HI16	small_external_common
 0+00d0 <[^>]*> lb	a0,[-0-9]+\(a0\)
-[ 	]*d0: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_common
+[ 	]*d0: R_MIPS_LO16	small_external_common
 0+00d4 <[^>]*> lui	a0,[-0-9x]+
-[ 	]*d4: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*d4: R_MIPS_HI16	\.bss
 0+00d8 <[^>]*> lb	a0,[-0-9]+\(a0\)
-[ 	]*d8: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*d8: R_MIPS_LO16	\.bss
 0+00dc <[^>]*> lui	a0,[-0-9x]+
-[ 	]*dc: [A-Z0-9_]*HI[A-Z0-9_]*	.sbss.*
+[ 	]*dc: R_MIPS_HI16	\.sbss
 0+00e0 <[^>]*> lb	a0,[-0-9]+\(a0\)
-[ 	]*e0: [A-Z0-9_]*LO[A-Z0-9_]*	.sbss.*
+[ 	]*e0: R_MIPS_LO16	\.sbss
 0+00e4 <[^>]*> lui	a0,0x0
-[ 	]*e4: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*e4: R_MIPS_HI16	\.data
 0+00e8 <[^>]*> lb	a0,[-0-9]+\(a0\)
-[ 	]*e8: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*e8: R_MIPS_LO16	\.data
 0+00ec <[^>]*> lui	a0,0x0
-[ 	]*ec: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*ec: R_MIPS_HI16	big_external_data_label
 0+00f0 <[^>]*> lb	a0,[-0-9]+\(a0\)
-[ 	]*f0: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*f0: R_MIPS_LO16	big_external_data_label
 0+00f4 <[^>]*> lui	a0,0x0
-[ 	]*f4: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_data_label
+[ 	]*f4: R_MIPS_HI16	small_external_data_label
 0+00f8 <[^>]*> lb	a0,[-0-9]+\(a0\)
-[ 	]*f8: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_data_label
+[ 	]*f8: R_MIPS_LO16	small_external_data_label
 0+00fc <[^>]*> lui	a0,0x0
-[ 	]*fc: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*fc: R_MIPS_HI16	big_external_common
 0+0100 <[^>]*> lb	a0,[-0-9]+\(a0\)
-[ 	]*100: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*100: R_MIPS_LO16	big_external_common
 0+0104 <[^>]*> lui	a0,0x0
-[ 	]*104: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_common
+[ 	]*104: R_MIPS_HI16	small_external_common
 0+0108 <[^>]*> lb	a0,[-0-9]+\(a0\)
-[ 	]*108: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_common
+[ 	]*108: R_MIPS_LO16	small_external_common
 0+010c <[^>]*> lui	a0,0x0
-[ 	]*10c: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*10c: R_MIPS_HI16	\.bss
 0+0110 <[^>]*> lb	a0,[-0-9]+\(a0\)
-[ 	]*110: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*110: R_MIPS_LO16	\.bss
 0+0114 <[^>]*> lui	a0,0x0
-[ 	]*114: [A-Z0-9_]*HI[A-Z0-9_]*	.sbss.*
+[ 	]*114: R_MIPS_HI16	\.sbss
 0+0118 <[^>]*> lb	a0,[-0-9]+\(a0\)
-[ 	]*118: [A-Z0-9_]*LO[A-Z0-9_]*	.sbss.*
+[ 	]*118: R_MIPS_LO16	\.sbss
 0+011c <[^>]*> lui	a0,[-0-9x]+
-[ 	]*11c: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*11c: R_MIPS_HI16	\.data
 0+0120 <[^>]*> lb	a0,[0-9]+\(a0\)
-[ 	]*120: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*120: R_MIPS_LO16	\.data
 0+0124 <[^>]*> lui	a0,[-0-9x]+
-[ 	]*124: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*124: R_MIPS_HI16	big_external_data_label
 0+0128 <[^>]*> lb	a0,0\(a0\)
-[ 	]*128: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*128: R_MIPS_LO16	big_external_data_label
 0+012c <[^>]*> lui	a0,[-0-9x]+
-[ 	]*12c: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_data_label
+[ 	]*12c: R_MIPS_HI16	small_external_data_label
 0+0130 <[^>]*> lb	a0,0\(a0\)
-[ 	]*130: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_data_label
+[ 	]*130: R_MIPS_LO16	small_external_data_label
 0+0134 <[^>]*> lui	a0,[-0-9x]+
-[ 	]*134: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*134: R_MIPS_HI16	big_external_common
 0+0138 <[^>]*> lb	a0,0\(a0\)
-[ 	]*138: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*138: R_MIPS_LO16	big_external_common
 0+013c <[^>]*> lui	a0,[-0-9x]+
-[ 	]*13c: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_common
+[ 	]*13c: R_MIPS_HI16	small_external_common
 0+0140 <[^>]*> lb	a0,0\(a0\)
-[ 	]*140: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_common
+[ 	]*140: R_MIPS_LO16	small_external_common
 0+0144 <[^>]*> lui	a0,[-0-9x]+
-[ 	]*144: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*144: R_MIPS_HI16	\.bss
 0+0148 <[^>]*> lb	a0,[0-9]+\(a0\)
-[ 	]*148: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*148: R_MIPS_LO16	\.bss
 0+014c <[^>]*> lui	a0,[-0-9x]+
-[ 	]*14c: [A-Z0-9_]*HI[A-Z0-9_]*	.sbss.*
+[ 	]*14c: R_MIPS_HI16	\.sbss
 0+0150 <[^>]*> lb	a0,[-0-9]+\(a0\)
-[ 	]*150: [A-Z0-9_]*LO[A-Z0-9_]*	.sbss.*
+[ 	]*150: R_MIPS_LO16	\.sbss
 0+0154 <[^>]*> lui	a0,[-0-9x]+
-[ 	]*154: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*154: R_MIPS_HI16	\.data
 0+0158 <[^>]*> lb	a0,[-0-9]+\(a0\)
-[ 	]*158: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*158: R_MIPS_LO16	\.data
 0+015c <[^>]*> lui	a0,[-0-9x]+
-[ 	]*15c: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*15c: R_MIPS_HI16	big_external_data_label
 0+0160 <[^>]*> lb	a0,[-0-9]+\(a0\)
-[ 	]*160: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*160: R_MIPS_LO16	big_external_data_label
 0+0164 <[^>]*> lui	a0,[-0-9x]+
-[ 	]*164: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_data_label
+[ 	]*164: R_MIPS_HI16	small_external_data_label
 0+0168 <[^>]*> lb	a0,[-0-9]+\(a0\)
-[ 	]*168: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_data_label
+[ 	]*168: R_MIPS_LO16	small_external_data_label
 0+016c <[^>]*> lui	a0,[-0-9x]+
-[ 	]*16c: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*16c: R_MIPS_HI16	big_external_common
 0+0170 <[^>]*> lb	a0,[-0-9]+\(a0\)
-[ 	]*170: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*170: R_MIPS_LO16	big_external_common
 0+0174 <[^>]*> lui	a0,[-0-9x]+
-[ 	]*174: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_common
+[ 	]*174: R_MIPS_HI16	small_external_common
 0+0178 <[^>]*> lb	a0,[-0-9]+\(a0\)
-[ 	]*178: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_common
+[ 	]*178: R_MIPS_LO16	small_external_common
 0+017c <[^>]*> lui	a0,[-0-9x]+
-[ 	]*17c: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*17c: R_MIPS_HI16	\.bss
 0+0180 <[^>]*> lb	a0,[-0-9]+\(a0\)
-[ 	]*180: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*180: R_MIPS_LO16	\.bss
 0+0184 <[^>]*> lui	a0,[-0-9x]+
-[ 	]*184: [A-Z0-9_]*HI[A-Z0-9_]*	.sbss.*
+[ 	]*184: R_MIPS_HI16	\.sbss
 0+0188 <[^>]*> lb	a0,[-0-9]+\(a0\)
-[ 	]*188: [A-Z0-9_]*LO[A-Z0-9_]*	.sbss.*
+[ 	]*188: R_MIPS_LO16	\.sbss
 0+018c <[^>]*> lui	a0,0x0
-[ 	]*18c: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*18c: R_MIPS_HI16	\.data
 0+0190 <[^>]*> addu	a0,a0,a1
 0+0194 <[^>]*> lb	a0,[0-9]+\(a0\)
-[ 	]*194: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*194: R_MIPS_LO16	\.data
 0+0198 <[^>]*> lui	a0,0x0
-[ 	]*198: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*198: R_MIPS_HI16	big_external_data_label
 0+019c <[^>]*> addu	a0,a0,a1
 0+01a0 <[^>]*> lb	a0,0\(a0\)
-[ 	]*1a0: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*1a0: R_MIPS_LO16	big_external_data_label
 0+01a4 <[^>]*> addu	a0,a1,gp
 0+01a8 <[^>]*> lb	a0,0\(a0\)
-[ 	]*1a8: [A-Z0-9_]*GPREL[A-Z0-9_]*	small_external_data_label
+[ 	]*1a8: R_MIPS_GPREL16	small_external_data_label
 0+01ac <[^>]*> lui	a0,0x0
-[ 	]*1ac: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*1ac: R_MIPS_HI16	big_external_common
 0+01b0 <[^>]*> addu	a0,a0,a1
 0+01b4 <[^>]*> lb	a0,0\(a0\)
-[ 	]*1b4: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*1b4: R_MIPS_LO16	big_external_common
 0+01b8 <[^>]*> addu	a0,a1,gp
 0+01bc <[^>]*> lb	a0,0\(a0\)
-[ 	]*1bc: [A-Z0-9_]*GPREL[A-Z0-9_]*	small_external_common
+[ 	]*1bc: R_MIPS_GPREL16	small_external_common
 0+01c0 <[^>]*> lui	a0,0x0
-[ 	]*1c0: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*1c0: R_MIPS_HI16	\.bss
 0+01c4 <[^>]*> addu	a0,a0,a1
 0+01c8 <[^>]*> lb	a0,[0-9]+\(a0\)
-[ 	]*1c8: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*1c8: R_MIPS_LO16	\.bss
 0+01cc <[^>]*> addu	a0,a1,gp
 0+01d0 <[^>]*> lb	a0,[-0-9]+\(a0\)
-[ 	]*1d0: [A-Z0-9_]*GPREL[A-Z0-9_]*	.sbss.*
+[ 	]*1d0: R_MIPS_GPREL16	\.sbss
 0+01d4 <[^>]*> lui	a0,0x0
-[ 	]*1d4: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*1d4: R_MIPS_HI16	\.data
 0+01d8 <[^>]*> addu	a0,a0,a1
 0+01dc <[^>]*> lb	a0,[0-9]+\(a0\)
-[ 	]*1dc: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*1dc: R_MIPS_LO16	\.data
 0+01e0 <[^>]*> lui	a0,0x0
-[ 	]*1e0: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*1e0: R_MIPS_HI16	big_external_data_label
 0+01e4 <[^>]*> addu	a0,a0,a1
 0+01e8 <[^>]*> lb	a0,[-0-9]+\(a0\)
-[ 	]*1e8: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*1e8: R_MIPS_LO16	big_external_data_label
 0+01ec <[^>]*> addu	a0,a1,gp
 0+01f0 <[^>]*> lb	a0,1\(a0\)
-[ 	]*1f0: [A-Z0-9_]*GPREL[A-Z0-9_]*	small_external_data_label
+[ 	]*1f0: R_MIPS_GPREL16	small_external_data_label
 0+01f4 <[^>]*> lui	a0,0x0
-[ 	]*1f4: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*1f4: R_MIPS_HI16	big_external_common
 0+01f8 <[^>]*> addu	a0,a0,a1
 0+01fc <[^>]*> lb	a0,[-0-9]+\(a0\)
-[ 	]*1fc: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*1fc: R_MIPS_LO16	big_external_common
 0+0200 <[^>]*> addu	a0,a1,gp
 0+0204 <[^>]*> lb	a0,1\(a0\)
-[ 	]*204: [A-Z0-9_]*GPREL[A-Z0-9_]*	small_external_common
+[ 	]*204: R_MIPS_GPREL16	small_external_common
 0+0208 <[^>]*> lui	a0,0x0
-[ 	]*208: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*208: R_MIPS_HI16	\.bss
 0+020c <[^>]*> addu	a0,a0,a1
 0+0210 <[^>]*> lb	a0,[0-9]+\(a0\)
-[ 	]*210: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*210: R_MIPS_LO16	\.bss
 0+0214 <[^>]*> addu	a0,a1,gp
 0+0218 <[^>]*> lb	a0,[-0-9]+\(a0\)
-[ 	]*218: [A-Z0-9_]*GPREL[A-Z0-9_]*	.sbss.*
+[ 	]*218: R_MIPS_GPREL16	\.sbss
 0+021c <[^>]*> lui	a0,[-0-9x]+
-[ 	]*21c: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*21c: R_MIPS_HI16	\.data
 0+0220 <[^>]*> addu	a0,a0,a1
 0+0224 <[^>]*> lb	a0,[-0-9]+\(a0\)
-[ 	]*224: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*224: R_MIPS_LO16	\.data
 0+0228 <[^>]*> lui	a0,[-0-9x]+
-[ 	]*228: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*228: R_MIPS_HI16	big_external_data_label
 0+022c <[^>]*> addu	a0,a0,a1
 0+0230 <[^>]*> lb	a0,[-0-9]+\(a0\)
-[ 	]*230: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*230: R_MIPS_LO16	big_external_data_label
 0+0234 <[^>]*> lui	a0,[-0-9x]+
-[ 	]*234: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_data_label
+[ 	]*234: R_MIPS_HI16	small_external_data_label
 0+0238 <[^>]*> addu	a0,a0,a1
 0+023c <[^>]*> lb	a0,[-0-9]+\(a0\)
-[ 	]*23c: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_data_label
+[ 	]*23c: R_MIPS_LO16	small_external_data_label
 0+0240 <[^>]*> lui	a0,[-0-9x]+
-[ 	]*240: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*240: R_MIPS_HI16	big_external_common
 0+0244 <[^>]*> addu	a0,a0,a1
 0+0248 <[^>]*> lb	a0,[-0-9]+\(a0\)
-[ 	]*248: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*248: R_MIPS_LO16	big_external_common
 0+024c <[^>]*> lui	a0,[-0-9x]+
-[ 	]*24c: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_common
+[ 	]*24c: R_MIPS_HI16	small_external_common
 0+0250 <[^>]*> addu	a0,a0,a1
 0+0254 <[^>]*> lb	a0,[-0-9]+\(a0\)
-[ 	]*254: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_common
+[ 	]*254: R_MIPS_LO16	small_external_common
 0+0258 <[^>]*> lui	a0,[-0-9x]+
-[ 	]*258: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*258: R_MIPS_HI16	\.bss
 0+025c <[^>]*> addu	a0,a0,a1
 0+0260 <[^>]*> lb	a0,[-0-9]+\(a0\)
-[ 	]*260: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*260: R_MIPS_LO16	\.bss
 0+0264 <[^>]*> lui	a0,[-0-9x]+
-[ 	]*264: [A-Z0-9_]*HI[A-Z0-9_]*	.sbss.*
+[ 	]*264: R_MIPS_HI16	\.sbss
 0+0268 <[^>]*> addu	a0,a0,a1
 0+026c <[^>]*> lb	a0,[-0-9]+\(a0\)
-[ 	]*26c: [A-Z0-9_]*LO[A-Z0-9_]*	.sbss.*
+[ 	]*26c: R_MIPS_LO16	\.sbss
 0+0270 <[^>]*> lui	a0,0x0
-[ 	]*270: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*270: R_MIPS_HI16	\.data
 0+0274 <[^>]*> addu	a0,a0,a1
 0+0278 <[^>]*> lb	a0,[-0-9]+\(a0\)
-[ 	]*278: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*278: R_MIPS_LO16	\.data
 0+027c <[^>]*> lui	a0,0x0
-[ 	]*27c: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*27c: R_MIPS_HI16	big_external_data_label
 0+0280 <[^>]*> addu	a0,a0,a1
 0+0284 <[^>]*> lb	a0,[-0-9]+\(a0\)
-[ 	]*284: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*284: R_MIPS_LO16	big_external_data_label
 0+0288 <[^>]*> lui	a0,0x0
-[ 	]*288: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_data_label
+[ 	]*288: R_MIPS_HI16	small_external_data_label
 0+028c <[^>]*> addu	a0,a0,a1
 0+0290 <[^>]*> lb	a0,[-0-9]+\(a0\)
-[ 	]*290: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_data_label
+[ 	]*290: R_MIPS_LO16	small_external_data_label
 0+0294 <[^>]*> lui	a0,0x0
-[ 	]*294: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*294: R_MIPS_HI16	big_external_common
 0+0298 <[^>]*> addu	a0,a0,a1
 0+029c <[^>]*> lb	a0,[-0-9]+\(a0\)
-[ 	]*29c: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*29c: R_MIPS_LO16	big_external_common
 0+02a0 <[^>]*> lui	a0,0x0
-[ 	]*2a0: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_common
+[ 	]*2a0: R_MIPS_HI16	small_external_common
 0+02a4 <[^>]*> addu	a0,a0,a1
 0+02a8 <[^>]*> lb	a0,[-0-9]+\(a0\)
-[ 	]*2a8: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_common
+[ 	]*2a8: R_MIPS_LO16	small_external_common
 0+02ac <[^>]*> lui	a0,0x0
-[ 	]*2ac: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*2ac: R_MIPS_HI16	\.bss
 0+02b0 <[^>]*> addu	a0,a0,a1
 0+02b4 <[^>]*> lb	a0,[-0-9]+\(a0\)
-[ 	]*2b4: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*2b4: R_MIPS_LO16	\.bss
 0+02b8 <[^>]*> lui	a0,0x0
-[ 	]*2b8: [A-Z0-9_]*HI[A-Z0-9_]*	.sbss.*
+[ 	]*2b8: R_MIPS_HI16	\.sbss
 0+02bc <[^>]*> addu	a0,a0,a1
 0+02c0 <[^>]*> lb	a0,[-0-9]+\(a0\)
-[ 	]*2c0: [A-Z0-9_]*LO[A-Z0-9_]*	.sbss.*
+[ 	]*2c0: R_MIPS_LO16	\.sbss
 0+02c4 <[^>]*> lui	a0,[-0-9x]+
-[ 	]*2c4: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*2c4: R_MIPS_HI16	\.data
 0+02c8 <[^>]*> addu	a0,a0,a1
 0+02cc <[^>]*> lb	a0,[0-9]+\(a0\)
-[ 	]*2cc: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*2cc: R_MIPS_LO16	\.data
 0+02d0 <[^>]*> lui	a0,[-0-9x]+
-[ 	]*2d0: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*2d0: R_MIPS_HI16	big_external_data_label
 0+02d4 <[^>]*> addu	a0,a0,a1
 0+02d8 <[^>]*> lb	a0,0\(a0\)
-[ 	]*2d8: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*2d8: R_MIPS_LO16	big_external_data_label
 0+02dc <[^>]*> lui	a0,[-0-9x]+
-[ 	]*2dc: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_data_label
+[ 	]*2dc: R_MIPS_HI16	small_external_data_label
 0+02e0 <[^>]*> addu	a0,a0,a1
 0+02e4 <[^>]*> lb	a0,0\(a0\)
-[ 	]*2e4: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_data_label
+[ 	]*2e4: R_MIPS_LO16	small_external_data_label
 0+02e8 <[^>]*> lui	a0,[-0-9x]+
-[ 	]*2e8: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*2e8: R_MIPS_HI16	big_external_common
 0+02ec <[^>]*> addu	a0,a0,a1
 0+02f0 <[^>]*> lb	a0,0\(a0\)
-[ 	]*2f0: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*2f0: R_MIPS_LO16	big_external_common
 0+02f4 <[^>]*> lui	a0,[-0-9x]+
-[ 	]*2f4: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_common
+[ 	]*2f4: R_MIPS_HI16	small_external_common
 0+02f8 <[^>]*> addu	a0,a0,a1
 0+02fc <[^>]*> lb	a0,0\(a0\)
-[ 	]*2fc: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_common
+[ 	]*2fc: R_MIPS_LO16	small_external_common
 0+0300 <[^>]*> lui	a0,[-0-9x]+
-[ 	]*300: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*300: R_MIPS_HI16	\.bss
 0+0304 <[^>]*> addu	a0,a0,a1
 0+0308 <[^>]*> lb	a0,[0-9]+\(a0\)
-[ 	]*308: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*308: R_MIPS_LO16	\.bss
 0+030c <[^>]*> lui	a0,[-0-9x]+
-[ 	]*30c: [A-Z0-9_]*HI[A-Z0-9_]*	.sbss.*
+[ 	]*30c: R_MIPS_HI16	\.sbss
 0+0310 <[^>]*> addu	a0,a0,a1
 0+0314 <[^>]*> lb	a0,[-0-9]+\(a0\)
-[ 	]*314: [A-Z0-9_]*LO[A-Z0-9_]*	.sbss.*
+[ 	]*314: R_MIPS_LO16	\.sbss
 0+0318 <[^>]*> lui	a0,[-0-9x]+
-[ 	]*318: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*318: R_MIPS_HI16	\.data
 0+031c <[^>]*> addu	a0,a0,a1
 0+0320 <[^>]*> lb	a0,[-0-9]+\(a0\)
-[ 	]*320: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*320: R_MIPS_LO16	\.data
 0+0324 <[^>]*> lui	a0,[-0-9x]+
-[ 	]*324: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*324: R_MIPS_HI16	big_external_data_label
 0+0328 <[^>]*> addu	a0,a0,a1
 0+032c <[^>]*> lb	a0,[-0-9]+\(a0\)
-[ 	]*32c: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*32c: R_MIPS_LO16	big_external_data_label
 0+0330 <[^>]*> lui	a0,[-0-9x]+
-[ 	]*330: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_data_label
+[ 	]*330: R_MIPS_HI16	small_external_data_label
 0+0334 <[^>]*> addu	a0,a0,a1
 0+0338 <[^>]*> lb	a0,[-0-9]+\(a0\)
-[ 	]*338: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_data_label
+[ 	]*338: R_MIPS_LO16	small_external_data_label
 0+033c <[^>]*> lui	a0,[-0-9x]+
-[ 	]*33c: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*33c: R_MIPS_HI16	big_external_common
 0+0340 <[^>]*> addu	a0,a0,a1
 0+0344 <[^>]*> lb	a0,[-0-9]+\(a0\)
-[ 	]*344: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*344: R_MIPS_LO16	big_external_common
 0+0348 <[^>]*> lui	a0,[-0-9x]+
-[ 	]*348: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_common
+[ 	]*348: R_MIPS_HI16	small_external_common
 0+034c <[^>]*> addu	a0,a0,a1
 0+0350 <[^>]*> lb	a0,[-0-9]+\(a0\)
-[ 	]*350: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_common
+[ 	]*350: R_MIPS_LO16	small_external_common
 0+0354 <[^>]*> lui	a0,[-0-9x]+
-[ 	]*354: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*354: R_MIPS_HI16	\.bss
 0+0358 <[^>]*> addu	a0,a0,a1
 0+035c <[^>]*> lb	a0,[-0-9]+\(a0\)
-[ 	]*35c: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*35c: R_MIPS_LO16	\.bss
 0+0360 <[^>]*> lui	a0,[-0-9x]+
-[ 	]*360: [A-Z0-9_]*HI[A-Z0-9_]*	.sbss.*
+[ 	]*360: R_MIPS_HI16	\.sbss
 0+0364 <[^>]*> addu	a0,a0,a1
 0+0368 <[^>]*> lb	a0,[-0-9]+\(a0\)
-[ 	]*368: [A-Z0-9_]*LO[A-Z0-9_]*	.sbss.*
+[ 	]*368: R_MIPS_LO16	\.sbss
 0+036c <[^>]*> lbu	a0,0\(zero\)
 0+0370 <[^>]*> lh	a0,0\(zero\)
 0+0374 <[^>]*> lhu	a0,0\(zero\)
diff --git a/gas/testsuite/gas/mips/lifloat.d b/gas/testsuite/gas/mips/lifloat.d
index bd389bf..431398e 100644
--- a/gas/testsuite/gas/mips/lifloat.d
+++ b/gas/testsuite/gas/mips/lifloat.d
@@ -8,18 +8,18 @@
 
 Disassembly of section .text:
 0+0000 <[^>]*> lui	at,0x0
-[ 	]*0: [A-Z0-9_]*HI[A-Z0-9_]*	.ro?data.*
+[ 	]*0: R_MIPS_HI16	\.rodata
 0+0004 <[^>]*> lw	a0,[-0-9]+\(at\)
-[ 	]*4: [A-Z0-9_]*LO[A-Z0-9_]*	.ro?data.*
+[ 	]*4: R_MIPS_LO16	\.rodata
 0+0008 <[^>]*> lw	a1,[-0-9]+\(at\)
-[ 	]*8: [A-Z0-9_]*LO[A-Z0-9_]*	.ro?data.*
+[ 	]*8: R_MIPS_LO16	\.rodata
 0+000c <[^>]*> lwc1	\$f[45],[-0-9]+\(gp\)
-[ 	]*c: [A-Z0-9_]*LITERAL[A-Z0-9_]*	.lit8.*
+[ 	]*c: R_MIPS_LITERAL	\.lit8
 0+0010 <[^>]*> lwc1	\$f[45],[-0-9]+\(gp\)
-[ 	]*10: [A-Z0-9_]*LITERAL[A-Z0-9_]*	.lit8.*
+[ 	]*10: R_MIPS_LITERAL	\.lit8
 0+0014 <[^>]*> lui	a0,0x3f8f
 0+0018 <[^>]*> ori	a0,a0,0xcd36
 0+001c <[^>]*> lwc1	\$f4,[-0-9]+\(gp\)
-[ 	]*1c: [A-Z0-9_]*LITERAL[A-Z0-9_]*	.lit4.*
+[ 	]*1c: R_MIPS_LITERAL	\.lit4
 0+0020 <[^>]*> nop
 #pass
diff --git a/gas/testsuite/gas/mips/mipsr6@beq.d b/gas/testsuite/gas/mips/mipsr6@beq.d
index c334c57..d6fc670 100644
--- a/gas/testsuite/gas/mips/mipsr6@beq.d
+++ b/gas/testsuite/gas/mips/mipsr6@beq.d
@@ -9,39 +9,39 @@
 
 Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> beq	a0,a1,0+0000 <.*>
-[	]*0: .*R_MIPS_PC16	text_label
+[	]*0: R_MIPS_PC16	text_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> beqz	a0,0+0008 <.*>
-[	]*8: .*R_MIPS_PC16	text_label
+[	]*8: R_MIPS_PC16	text_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> li	at,1
 [0-9a-f]+ <[^>]*> beq	a0,at,0+0014 <.*>
-[	]*14: .*R_MIPS_PC16	text_label
+[	]*14: R_MIPS_PC16	text_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> li	at,0x8000
 [0-9a-f]+ <[^>]*> beq	a0,at,0+0020 <.*>
-[	]*20: .*R_MIPS_PC16	text_label
+[	]*20: R_MIPS_PC16	text_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> li	at,-32768
 [0-9a-f]+ <[^>]*> beq	a0,at,0+002c <.*>
-[	]*2c: .*R_MIPS_PC16	text_label
+[	]*2c: R_MIPS_PC16	text_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> lui	at,0x1
 [0-9a-f]+ <[^>]*> beq	a0,at,0+0038 <.*>
-[	]*38: .*R_MIPS_PC16	text_label
+[	]*38: R_MIPS_PC16	text_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> lui	at,0x1
 [0-9a-f]+ <[^>]*> ori	at,at,0xa5a5
 [0-9a-f]+ <[^>]*> beq	a0,at,0+0048 <.*>
-[	]*48: .*R_MIPS_PC16	text_label
+[	]*48: R_MIPS_PC16	text_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> bnez	a0,0+0050 <.*>
-[	]*50: .*R_MIPS_PC16	text_label
+[	]*50: R_MIPS_PC16	text_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> b	0+0058 <.*>
-[ 	]*58: .*R_MIPS_PC16	external_label
+[ 	]*58: R_MIPS_PC16	external_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> bal	0+0060 <.*>
-[ 	]*60: .*R_MIPS_PC16	external_label
+[ 	]*60: R_MIPS_PC16	external_label
 [0-9a-f]+ <[^>]*> nop
 	\.\.\.
diff --git a/gas/testsuite/gas/mips/mipsr6@bge.d b/gas/testsuite/gas/mips/mipsr6@bge.d
index 050bc1b..fa9a112 100644
--- a/gas/testsuite/gas/mips/mipsr6@bge.d
+++ b/gas/testsuite/gas/mips/mipsr6@bge.d
@@ -10,63 +10,63 @@
 Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> slt	at,a0,a1
 [0-9a-f]+ <[^>]*> beqz	at,0+0004 <.*>
-[	]*4: .*R_MIPS_PC16	text_label
+[	]*4: R_MIPS_PC16	text_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> bgez	a0,0+000c <.*>
-[	]*c: .*R_MIPS_PC16	text_label
+[	]*c: R_MIPS_PC16	text_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> blez	a1,0+0014 <.*>
-[	]*14: .*R_MIPS_PC16	text_label
+[	]*14: R_MIPS_PC16	text_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> bgez	a0,0+001c <.*>
-[	]*1c: .*R_MIPS_PC16	text_label
+[	]*1c: R_MIPS_PC16	text_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> bgtz	a0,0+0024 <.*>
-[	]*24: .*R_MIPS_PC16	text_label
+[	]*24: R_MIPS_PC16	text_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> slti	at,a0,2
 [0-9a-f]+ <[^>]*> beqz	at,0+0030 <.*>
-[	]*30: .*R_MIPS_PC16	text_label
+[	]*30: R_MIPS_PC16	text_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> li	at,0x8000
 [0-9a-f]+ <[^>]*> slt	at,a0,at
 [0-9a-f]+ <[^>]*> beqz	at,0+0040 <.*>
-[	]*40: .*R_MIPS_PC16	text_label
+[	]*40: R_MIPS_PC16	text_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> slti	at,a0,-32768
 [0-9a-f]+ <[^>]*> beqz	at,0+004c <.*>
-[	]*4c: .*R_MIPS_PC16	text_label
+[	]*4c: R_MIPS_PC16	text_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> lui	at,0x1
 [0-9a-f]+ <[^>]*> slt	at,a0,at
 [0-9a-f]+ <[^>]*> beqz	at,0+005c <.*>
-[	]*5c: .*R_MIPS_PC16	text_label
+[	]*5c: R_MIPS_PC16	text_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> lui	at,0x1
 [0-9a-f]+ <[^>]*> ori	at,at,0xa5a5
 [0-9a-f]+ <[^>]*> slt	at,a0,at
 [0-9a-f]+ <[^>]*> beqz	at,0+0070 <.*>
-[	]*70: .*R_MIPS_PC16	text_label
+[	]*70: R_MIPS_PC16	text_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> slt	at,a1,a0
 [0-9a-f]+ <[^>]*> bnez	at,0+007c <.*>
-[	]*7c: .*R_MIPS_PC16	text_label
+[	]*7c: R_MIPS_PC16	text_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> bgtz	a0,0+0084 <.*>
-[	]*84: .*R_MIPS_PC16	text_label
+[	]*84: R_MIPS_PC16	text_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> bltz	a1,0+008c <.*>
-[	]*8c: .*R_MIPS_PC16	text_label
+[	]*8c: R_MIPS_PC16	text_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> bgtz	a0,0+0094 <.*>
-[	]*94: .*R_MIPS_PC16	text_label
+[	]*94: R_MIPS_PC16	text_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> slt	at,a0,a1
 [0-9a-f]+ <[^>]*> beqz	at,0+00a0 <.*\+0xa0>
-[ 	]*a0: .*16	external_label
+[ 	]*a0: R_MIPS_PC16	external_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> slt	at,a1,a0
 [0-9a-f]+ <[^>]*> bnez	at,0+00ac <.*\+0xac>
-[ 	]*ac: .*16	external_label
+[ 	]*ac: R_MIPS_PC16	external_label
 [0-9a-f]+ <[^>]*> nop
 	\.\.\.
diff --git a/gas/testsuite/gas/mips/mipsr6@bgeu.d b/gas/testsuite/gas/mips/mipsr6@bgeu.d
index 38bdfb1..e9ddfb1 100644
--- a/gas/testsuite/gas/mips/mipsr6@bgeu.d
+++ b/gas/testsuite/gas/mips/mipsr6@bgeu.d
@@ -10,54 +10,54 @@
 Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> sltu	at,a0,a1
 [0-9a-f]+ <[^>]*> beqz	at,0+0004 <.*>
-[	]*4: .*R_MIPS_PC16	text_label
+[	]*4: R_MIPS_PC16	text_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> beq	zero,a1,0+000c <.*>
-[	]*c: .*R_MIPS_PC16	text_label
+[	]*c: R_MIPS_PC16	text_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> bnez	a0,0+0014 <.*>
-[	]*14: .*R_MIPS_PC16	text_label
+[	]*14: R_MIPS_PC16	text_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> sltiu	at,a0,2
 [0-9a-f]+ <[^>]*> beqz	at,0+0020 <.*>
-[	]*20: .*R_MIPS_PC16	text_label
+[	]*20: R_MIPS_PC16	text_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> li	at,0x8000
 [0-9a-f]+ <[^>]*> sltu	at,a0,at
 [0-9a-f]+ <[^>]*> beqz	at,0+0030 <.*>
-[	]*30: .*R_MIPS_PC16	text_label
+[	]*30: R_MIPS_PC16	text_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> sltiu	at,a0,-32768
 [0-9a-f]+ <[^>]*> beqz	at,0+003c <.*>
-[	]*3c: .*R_MIPS_PC16	text_label
+[	]*3c: R_MIPS_PC16	text_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> lui	at,0x1
 [0-9a-f]+ <[^>]*> sltu	at,a0,at
 [0-9a-f]+ <[^>]*> beqz	at,0+004c <.*>
-[	]*4c: .*R_MIPS_PC16	text_label
+[	]*4c: R_MIPS_PC16	text_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> lui	at,0x1
 [0-9a-f]+ <[^>]*> ori	at,at,0xa5a5
 [0-9a-f]+ <[^>]*> sltu	at,a0,at
 [0-9a-f]+ <[^>]*> beqz	at,0+0060 <.*>
-[	]*60: .*R_MIPS_PC16	text_label
+[	]*60: R_MIPS_PC16	text_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> sltu	at,a1,a0
 [0-9a-f]+ <[^>]*> bnez	at,0+006c <.*>
-[	]*6c: .*R_MIPS_PC16	text_label
+[	]*6c: R_MIPS_PC16	text_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> bnez	a0,0+0074 <.*>
-[	]*74: .*R_MIPS_PC16	text_label
+[	]*74: R_MIPS_PC16	text_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> bnez	a0,0+007c <.*>
-[	]*7c: .*R_MIPS_PC16	text_label
+[	]*7c: R_MIPS_PC16	text_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> sltu	at,a0,a1
 [0-9a-f]+ <[^>]*> beqz	at,0+0088 <.*\+0x88>
-[ 	]*88: .*16	external_label
+[ 	]*88: R_MIPS_PC16	external_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> sltu	at,a1,a0
 [0-9a-f]+ <[^>]*> bnez	at,0+0094 <.*\+0x94>
-[ 	]*94: .*16	external_label
+[ 	]*94: R_MIPS_PC16	external_label
 [0-9a-f]+ <[^>]*> nop
 	\.\.\.
diff --git a/gas/testsuite/gas/mips/mipsr6@blt.d b/gas/testsuite/gas/mips/mipsr6@blt.d
index 0f056f6..7372a37 100644
--- a/gas/testsuite/gas/mips/mipsr6@blt.d
+++ b/gas/testsuite/gas/mips/mipsr6@blt.d
@@ -10,63 +10,63 @@
 Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> slt	at,a0,a1
 [0-9a-f]+ <[^>]*> bnez	at,0+0004 <.*>
-[	]*4: .*R_MIPS_PC16	text_label
+[	]*4: R_MIPS_PC16	text_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> bltz	a0,0+000c <.*>
-[	]*c: .*R_MIPS_PC16	text_label
+[	]*c: R_MIPS_PC16	text_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> bgtz	a1,0+0014 <.*>
-[	]*14: .*R_MIPS_PC16	text_label
+[	]*14: R_MIPS_PC16	text_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> bltz	a0,0+001c <.*>
-[	]*1c: .*R_MIPS_PC16	text_label
+[	]*1c: R_MIPS_PC16	text_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> blez	a0,0+0024 <.*>
-[	]*24: .*R_MIPS_PC16	text_label
+[	]*24: R_MIPS_PC16	text_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> slti	at,a0,2
 [0-9a-f]+ <[^>]*> bnez	at,0+0030 <.*>
-[	]*30: .*R_MIPS_PC16	text_label
+[	]*30: R_MIPS_PC16	text_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> li	at,0x8000
 [0-9a-f]+ <[^>]*> slt	at,a0,at
 [0-9a-f]+ <[^>]*> bnez	at,0+0040 <.*>
-[	]*40: .*R_MIPS_PC16	text_label
+[	]*40: R_MIPS_PC16	text_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> slti	at,a0,-32768
 [0-9a-f]+ <[^>]*> bnez	at,0+004c <.*>
-[	]*4c: .*R_MIPS_PC16	text_label
+[	]*4c: R_MIPS_PC16	text_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> lui	at,0x1
 [0-9a-f]+ <[^>]*> slt	at,a0,at
 [0-9a-f]+ <[^>]*> bnez	at,0+005c <.*>
-[	]*5c: .*R_MIPS_PC16	text_label
+[	]*5c: R_MIPS_PC16	text_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> lui	at,0x1
 [0-9a-f]+ <[^>]*> ori	at,at,0xa5a5
 [0-9a-f]+ <[^>]*> slt	at,a0,at
 [0-9a-f]+ <[^>]*> bnez	at,0+0070 <.*>
-[	]*70: .*R_MIPS_PC16	text_label
+[	]*70: R_MIPS_PC16	text_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> slt	at,a1,a0
 [0-9a-f]+ <[^>]*> beqz	at,0+007c <.*>
-[	]*7c: .*R_MIPS_PC16	text_label
+[	]*7c: R_MIPS_PC16	text_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> blez	a0,0+0084 <.*>
-[	]*84: .*R_MIPS_PC16	text_label
+[	]*84: R_MIPS_PC16	text_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> bgez	a1,0+008c <.*>
-[	]*8c: .*R_MIPS_PC16	text_label
+[	]*8c: R_MIPS_PC16	text_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> blez	a0,0+0094 <.*>
-[	]*94: .*R_MIPS_PC16	text_label
+[	]*94: R_MIPS_PC16	text_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> slt	at,a0,a1
 [0-9a-f]+ <[^>]*> bnez	at,0+00a0 <.*\+0xa0>
-[ 	]*a0: .*16	external_label
+[ 	]*a0: R_MIPS_PC16	external_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> slt	at,a1,a0
 [0-9a-f]+ <[^>]*> beqz	at,0+00ac <.*\+0xac>
-[ 	]*ac: .*16	external_label
+[ 	]*ac: R_MIPS_PC16	external_label
 [0-9a-f]+ <[^>]*> nop
 	\.\.\.
diff --git a/gas/testsuite/gas/mips/mipsr6@bltu.d b/gas/testsuite/gas/mips/mipsr6@bltu.d
index 24ac4e2..f3710bb 100644
--- a/gas/testsuite/gas/mips/mipsr6@bltu.d
+++ b/gas/testsuite/gas/mips/mipsr6@bltu.d
@@ -10,54 +10,54 @@
 Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> sltu	at,a0,a1
 [0-9a-f]+ <[^>]*> bnez	at,0+0004 <.*>
-[	]*4: .*R_MIPS_PC16	text_label
+[	]*4: R_MIPS_PC16	text_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> bne	zero,a1,0+000c <.*>
-[	]*c: .*R_MIPS_PC16	text_label
+[	]*c: R_MIPS_PC16	text_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> beqz	a0,0+0014 <.*>
-[	]*14: .*R_MIPS_PC16	text_label
+[	]*14: R_MIPS_PC16	text_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> sltiu	at,a0,2
 [0-9a-f]+ <[^>]*> bnez	at,0+0020 <.*>
-[	]*20: .*R_MIPS_PC16	text_label
+[	]*20: R_MIPS_PC16	text_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> li	at,0x8000
 [0-9a-f]+ <[^>]*> sltu	at,a0,at
 [0-9a-f]+ <[^>]*> bnez	at,0+0030 <.*>
-[	]*30: .*R_MIPS_PC16	text_label
+[	]*30: R_MIPS_PC16	text_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> sltiu	at,a0,-32768
 [0-9a-f]+ <[^>]*> bnez	at,0+003c <.*>
-[	]*3c: .*R_MIPS_PC16	text_label
+[	]*3c: R_MIPS_PC16	text_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> lui	at,0x1
 [0-9a-f]+ <[^>]*> sltu	at,a0,at
 [0-9a-f]+ <[^>]*> bnez	at,0+004c <.*>
-[	]*4c: .*R_MIPS_PC16	text_label
+[	]*4c: R_MIPS_PC16	text_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> lui	at,0x1
 [0-9a-f]+ <[^>]*> ori	at,at,0xa5a5
 [0-9a-f]+ <[^>]*> sltu	at,a0,at
 [0-9a-f]+ <[^>]*> bnez	at,0+0060 <.*>
-[	]*60: .*R_MIPS_PC16	text_label
+[	]*60: R_MIPS_PC16	text_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> sltu	at,a1,a0
 [0-9a-f]+ <[^>]*> beqz	at,0+006c <.*>
-[	]*6c: .*R_MIPS_PC16	text_label
+[	]*6c: R_MIPS_PC16	text_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> beqz	a0,0+0074 <.*>
-[	]*74: .*R_MIPS_PC16	text_label
+[	]*74: R_MIPS_PC16	text_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> beqz	a0,0+007c <.*>
-[	]*7c: .*R_MIPS_PC16	text_label
+[	]*7c: R_MIPS_PC16	text_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> sltu	at,a0,a1
 [0-9a-f]+ <[^>]*> bnez	at,0+0088 <.*\+0x88>
-[ 	]*88: .*16	external_label
+[ 	]*88: R_MIPS_PC16	external_label
 [0-9a-f]+ <[^>]*> nop
 [0-9a-f]+ <[^>]*> sltu	at,a1,a0
 [0-9a-f]+ <[^>]*> beqz	at,0+0094 <.*\+0x94>
-[ 	]*94: .*16	external_label
+[ 	]*94: R_MIPS_PC16	external_label
 [0-9a-f]+ <[^>]*> nop
 	\.\.\.
diff --git a/gas/testsuite/gas/mips/sb.d b/gas/testsuite/gas/mips/sb.d
index d25c43e..4887605 100644
--- a/gas/testsuite/gas/mips/sb.d
+++ b/gas/testsuite/gas/mips/sb.d
@@ -29,359 +29,359 @@ Disassembly of section .text:
 0+004c <[^>]*> addu	at,at,a1
 0+0050 <[^>]*> sb	a0,-23131\(at\)
 0+0054 <[^>]*> lui	at,0x0
-[ 	]*54: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*54: R_MIPS_HI16	\.data
 0+0058 <[^>]*> sb	a0,[-0-9]+\(at\)
-[ 	]*58: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*58: R_MIPS_LO16	\.data
 0+005c <[^>]*> lui	at,0x0
-[ 	]*5c: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*5c: R_MIPS_HI16	big_external_data_label
 0+0060 <[^>]*> sb	a0,0\(at\)
-[ 	]*60: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*60: R_MIPS_LO16	big_external_data_label
 0+0064 <[^>]*> sb	a0,0\(gp\)
-[ 	]*64: [A-Z0-9_]*GPREL[A-Z0-9_]*	small_external_data_label
+[ 	]*64: R_MIPS_GPREL16	small_external_data_label
 0+0068 <[^>]*> lui	at,0x0
-[ 	]*68: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*68: R_MIPS_HI16	big_external_common
 0+006c <[^>]*> sb	a0,0\(at\)
-[ 	]*6c: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*6c: R_MIPS_LO16	big_external_common
 0+0070 <[^>]*> sb	a0,0\(gp\)
-[ 	]*70: [A-Z0-9_]*GPREL[A-Z0-9_]*	small_external_common
+[ 	]*70: R_MIPS_GPREL16	small_external_common
 0+0074 <[^>]*> lui	at,0x0
-[ 	]*74: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*74: R_MIPS_HI16	\.bss
 0+0078 <[^>]*> sb	a0,[-0-9]+\(at\)
-[ 	]*78: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*78: R_MIPS_LO16	\.bss
 0+007c <[^>]*> sb	a0,[-0-9]+\(gp\)
-[ 	]*7c: [A-Z0-9_]*GPREL[A-Z0-9_]*	.sbss.*
+[ 	]*7c: R_MIPS_GPREL16	\.sbss
 0+0080 <[^>]*> lui	at,0x0
-[ 	]*80: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*80: R_MIPS_HI16	\.data
 0+0084 <[^>]*> sb	a0,[-0-9]+\(at\)
-[ 	]*84: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*84: R_MIPS_LO16	\.data
 0+0088 <[^>]*> lui	at,0x0
-[ 	]*88: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*88: R_MIPS_HI16	big_external_data_label
 0+008c <[^>]*> sb	a0,[-0-9]+\(at\)
-[ 	]*8c: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*8c: R_MIPS_LO16	big_external_data_label
 0+0090 <[^>]*> sb	a0,1\(gp\)
-[ 	]*90: [A-Z0-9_]*GPREL[A-Z0-9_]*	small_external_data_label
+[ 	]*90: R_MIPS_GPREL16	small_external_data_label
 0+0094 <[^>]*> lui	at,0x0
-[ 	]*94: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*94: R_MIPS_HI16	big_external_common
 0+0098 <[^>]*> sb	a0,[-0-9]+\(at\)
-[ 	]*98: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*98: R_MIPS_LO16	big_external_common
 0+009c <[^>]*> sb	a0,1\(gp\)
-[ 	]*9c: [A-Z0-9_]*GPREL[A-Z0-9_]*	small_external_common
+[ 	]*9c: R_MIPS_GPREL16	small_external_common
 0+00a0 <[^>]*> lui	at,0x0
-[ 	]*a0: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*a0: R_MIPS_HI16	\.bss
 0+00a4 <[^>]*> sb	a0,[-0-9]+\(at\)
-[ 	]*a4: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*a4: R_MIPS_LO16	\.bss
 0+00a8 <[^>]*> sb	a0,[-0-9]+\(gp\)
-[ 	]*a8: [A-Z0-9_]*GPREL[A-Z0-9_]*	.sbss.*
+[ 	]*a8: R_MIPS_GPREL16	\.sbss
 0+00ac <[^>]*> lui	at,[-0-9x]+
-[ 	]*ac: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*ac: R_MIPS_HI16	\.data
 0+00b0 <[^>]*> sb	a0,[-0-9]+\(at\)
-[ 	]*b0: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*b0: R_MIPS_LO16	\.data
 0+00b4 <[^>]*> lui	at,[-0-9x]+
-[ 	]*b4: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*b4: R_MIPS_HI16	big_external_data_label
 0+00b8 <[^>]*> sb	a0,[-0-9]+\(at\)
-[ 	]*b8: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*b8: R_MIPS_LO16	big_external_data_label
 0+00bc <[^>]*> lui	at,[-0-9x]+
-[ 	]*bc: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_data_label
+[ 	]*bc: R_MIPS_HI16	small_external_data_label
 0+00c0 <[^>]*> sb	a0,[-0-9]+\(at\)
-[ 	]*c0: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_data_label
+[ 	]*c0: R_MIPS_LO16	small_external_data_label
 0+00c4 <[^>]*> lui	at,[-0-9x]+
-[ 	]*c4: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*c4: R_MIPS_HI16	big_external_common
 0+00c8 <[^>]*> sb	a0,[-0-9]+\(at\)
-[ 	]*c8: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*c8: R_MIPS_LO16	big_external_common
 0+00cc <[^>]*> lui	at,[-0-9x]+
-[ 	]*cc: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_common
+[ 	]*cc: R_MIPS_HI16	small_external_common
 0+00d0 <[^>]*> sb	a0,[-0-9]+\(at\)
-[ 	]*d0: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_common
+[ 	]*d0: R_MIPS_LO16	small_external_common
 0+00d4 <[^>]*> lui	at,[-0-9x]+
-[ 	]*d4: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*d4: R_MIPS_HI16	\.bss
 0+00d8 <[^>]*> sb	a0,[-0-9]+\(at\)
-[ 	]*d8: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*d8: R_MIPS_LO16	\.bss
 0+00dc <[^>]*> lui	at,[-0-9x]+
-[ 	]*dc: [A-Z0-9_]*HI[A-Z0-9_]*	.sbss.*
+[ 	]*dc: R_MIPS_HI16	\.sbss
 0+00e0 <[^>]*> sb	a0,[-0-9]+\(at\)
-[ 	]*e0: [A-Z0-9_]*LO[A-Z0-9_]*	.sbss.*
+[ 	]*e0: R_MIPS_LO16	\.sbss
 0+00e4 <[^>]*> lui	at,0x0
-[ 	]*e4: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*e4: R_MIPS_HI16	\.data
 0+00e8 <[^>]*> sb	a0,[-0-9]+\(at\)
-[ 	]*e8: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*e8: R_MIPS_LO16	\.data
 0+00ec <[^>]*> lui	at,0x0
-[ 	]*ec: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*ec: R_MIPS_HI16	big_external_data_label
 0+00f0 <[^>]*> sb	a0,[-0-9]+\(at\)
-[ 	]*f0: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*f0: R_MIPS_LO16	big_external_data_label
 0+00f4 <[^>]*> lui	at,0x0
-[ 	]*f4: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_data_label
+[ 	]*f4: R_MIPS_HI16	small_external_data_label
 0+00f8 <[^>]*> sb	a0,[-0-9]+\(at\)
-[ 	]*f8: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_data_label
+[ 	]*f8: R_MIPS_LO16	small_external_data_label
 0+00fc <[^>]*> lui	at,0x0
-[ 	]*fc: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*fc: R_MIPS_HI16	big_external_common
 0+0100 <[^>]*> sb	a0,[-0-9]+\(at\)
-[ 	]*100: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*100: R_MIPS_LO16	big_external_common
 0+0104 <[^>]*> lui	at,0x0
-[ 	]*104: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_common
+[ 	]*104: R_MIPS_HI16	small_external_common
 0+0108 <[^>]*> sb	a0,[-0-9]+\(at\)
-[ 	]*108: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_common
+[ 	]*108: R_MIPS_LO16	small_external_common
 0+010c <[^>]*> lui	at,0x0
-[ 	]*10c: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*10c: R_MIPS_HI16	\.bss
 0+0110 <[^>]*> sb	a0,[-0-9]+\(at\)
-[ 	]*110: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*110: R_MIPS_LO16	\.bss
 0+0114 <[^>]*> lui	at,0x0
-[ 	]*114: [A-Z0-9_]*HI[A-Z0-9_]*	.sbss.*
+[ 	]*114: R_MIPS_HI16	\.sbss
 0+0118 <[^>]*> sb	a0,[-0-9]+\(at\)
-[ 	]*118: [A-Z0-9_]*LO[A-Z0-9_]*	.sbss.*
+[ 	]*118: R_MIPS_LO16	\.sbss
 0+011c <[^>]*> lui	at,[-0-9x]+
-[ 	]*11c: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*11c: R_MIPS_HI16	\.data
 0+0120 <[^>]*> sb	a0,[-0-9]+\(at\)
-[ 	]*120: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*120: R_MIPS_LO16	\.data
 0+0124 <[^>]*> lui	at,[-0-9x]+
-[ 	]*124: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*124: R_MIPS_HI16	big_external_data_label
 0+0128 <[^>]*> sb	a0,0\(at\)
-[ 	]*128: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*128: R_MIPS_LO16	big_external_data_label
 0+012c <[^>]*> lui	at,[-0-9x]+
-[ 	]*12c: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_data_label
+[ 	]*12c: R_MIPS_HI16	small_external_data_label
 0+0130 <[^>]*> sb	a0,0\(at\)
-[ 	]*130: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_data_label
+[ 	]*130: R_MIPS_LO16	small_external_data_label
 0+0134 <[^>]*> lui	at,[-0-9x]+
-[ 	]*134: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*134: R_MIPS_HI16	big_external_common
 0+0138 <[^>]*> sb	a0,0\(at\)
-[ 	]*138: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*138: R_MIPS_LO16	big_external_common
 0+013c <[^>]*> lui	at,[-0-9x]+
-[ 	]*13c: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_common
+[ 	]*13c: R_MIPS_HI16	small_external_common
 0+0140 <[^>]*> sb	a0,0\(at\)
-[ 	]*140: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_common
+[ 	]*140: R_MIPS_LO16	small_external_common
 0+0144 <[^>]*> lui	at,[-0-9x]+
-[ 	]*144: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*144: R_MIPS_HI16	\.bss
 0+0148 <[^>]*> sb	a0,[-0-9]+\(at\)
-[ 	]*148: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*148: R_MIPS_LO16	\.bss
 0+014c <[^>]*> lui	at,[-0-9x]+
-[ 	]*14c: [A-Z0-9_]*HI[A-Z0-9_]*	.sbss.*
+[ 	]*14c: R_MIPS_HI16	\.sbss
 0+0150 <[^>]*> sb	a0,[-0-9]+\(at\)
-[ 	]*150: [A-Z0-9_]*LO[A-Z0-9_]*	.sbss.*
+[ 	]*150: R_MIPS_LO16	\.sbss
 0+0154 <[^>]*> lui	at,[-0-9x]+
-[ 	]*154: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*154: R_MIPS_HI16	\.data
 0+0158 <[^>]*> sb	a0,[-0-9]+\(at\)
-[ 	]*158: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*158: R_MIPS_LO16	\.data
 0+015c <[^>]*> lui	at,[-0-9x]+
-[ 	]*15c: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*15c: R_MIPS_HI16	big_external_data_label
 0+0160 <[^>]*> sb	a0,[-0-9]+\(at\)
-[ 	]*160: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*160: R_MIPS_LO16	big_external_data_label
 0+0164 <[^>]*> lui	at,[-0-9x]+
-[ 	]*164: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_data_label
+[ 	]*164: R_MIPS_HI16	small_external_data_label
 0+0168 <[^>]*> sb	a0,[-0-9]+\(at\)
-[ 	]*168: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_data_label
+[ 	]*168: R_MIPS_LO16	small_external_data_label
 0+016c <[^>]*> lui	at,[-0-9x]+
-[ 	]*16c: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*16c: R_MIPS_HI16	big_external_common
 0+0170 <[^>]*> sb	a0,[-0-9]+\(at\)
-[ 	]*170: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*170: R_MIPS_LO16	big_external_common
 0+0174 <[^>]*> lui	at,[-0-9x]+
-[ 	]*174: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_common
+[ 	]*174: R_MIPS_HI16	small_external_common
 0+0178 <[^>]*> sb	a0,[-0-9]+\(at\)
-[ 	]*178: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_common
+[ 	]*178: R_MIPS_LO16	small_external_common
 0+017c <[^>]*> lui	at,[-0-9x]+
-[ 	]*17c: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*17c: R_MIPS_HI16	\.bss
 0+0180 <[^>]*> sb	a0,[-0-9]+\(at\)
-[ 	]*180: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*180: R_MIPS_LO16	\.bss
 0+0184 <[^>]*> lui	at,[-0-9x]+
-[ 	]*184: [A-Z0-9_]*HI[A-Z0-9_]*	.sbss.*
+[ 	]*184: R_MIPS_HI16	\.sbss
 0+0188 <[^>]*> sb	a0,[-0-9]+\(at\)
-[ 	]*188: [A-Z0-9_]*LO[A-Z0-9_]*	.sbss.*
+[ 	]*188: R_MIPS_LO16	\.sbss
 0+018c <[^>]*> lui	at,0x0
-[ 	]*18c: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*18c: R_MIPS_HI16	\.data
 0+0190 <[^>]*> addu	at,at,a1
 0+0194 <[^>]*> sb	a0,[-0-9]+\(at\)
-[ 	]*194: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*194: R_MIPS_LO16	\.data
 0+0198 <[^>]*> lui	at,0x0
-[ 	]*198: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*198: R_MIPS_HI16	big_external_data_label
 0+019c <[^>]*> addu	at,at,a1
 0+01a0 <[^>]*> sb	a0,0\(at\)
-[ 	]*1a0: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*1a0: R_MIPS_LO16	big_external_data_label
 0+01a4 <[^>]*> addu	at,a1,gp
 0+01a8 <[^>]*> sb	a0,0\(at\)
-[ 	]*1a8: [A-Z0-9_]*GPREL[A-Z0-9_]*	small_external_data_label
+[ 	]*1a8: R_MIPS_GPREL16	small_external_data_label
 0+01ac <[^>]*> lui	at,0x0
-[ 	]*1ac: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*1ac: R_MIPS_HI16	big_external_common
 0+01b0 <[^>]*> addu	at,at,a1
 0+01b4 <[^>]*> sb	a0,0\(at\)
-[ 	]*1b4: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*1b4: R_MIPS_LO16	big_external_common
 0+01b8 <[^>]*> addu	at,a1,gp
 0+01bc <[^>]*> sb	a0,0\(at\)
-[ 	]*1bc: [A-Z0-9_]*GPREL[A-Z0-9_]*	small_external_common
+[ 	]*1bc: R_MIPS_GPREL16	small_external_common
 0+01c0 <[^>]*> lui	at,0x0
-[ 	]*1c0: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*1c0: R_MIPS_HI16	\.bss
 0+01c4 <[^>]*> addu	at,at,a1
 0+01c8 <[^>]*> sb	a0,[-0-9]+\(at\)
-[ 	]*1c8: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*1c8: R_MIPS_LO16	\.bss
 0+01cc <[^>]*> addu	at,a1,gp
 0+01d0 <[^>]*> sb	a0,[-0-9]+\(at\)
-[ 	]*1d0: [A-Z0-9_]*GPREL[A-Z0-9_]*	.sbss.*
+[ 	]*1d0: R_MIPS_GPREL16	\.sbss
 0+01d4 <[^>]*> lui	at,0x0
-[ 	]*1d4: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*1d4: R_MIPS_HI16	\.data
 0+01d8 <[^>]*> addu	at,at,a1
 0+01dc <[^>]*> sb	a0,[-0-9]+\(at\)
-[ 	]*1dc: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*1dc: R_MIPS_LO16	\.data
 0+01e0 <[^>]*> lui	at,0x0
-[ 	]*1e0: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*1e0: R_MIPS_HI16	big_external_data_label
 0+01e4 <[^>]*> addu	at,at,a1
 0+01e8 <[^>]*> sb	a0,[-0-9]+\(at\)
-[ 	]*1e8: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*1e8: R_MIPS_LO16	big_external_data_label
 0+01ec <[^>]*> addu	at,a1,gp
 0+01f0 <[^>]*> sb	a0,1\(at\)
-[ 	]*1f0: [A-Z0-9_]*GPREL[A-Z0-9_]*	small_external_data_label
+[ 	]*1f0: R_MIPS_GPREL16	small_external_data_label
 0+01f4 <[^>]*> lui	at,0x0
-[ 	]*1f4: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*1f4: R_MIPS_HI16	big_external_common
 0+01f8 <[^>]*> addu	at,at,a1
 0+01fc <[^>]*> sb	a0,[-0-9]+\(at\)
-[ 	]*1fc: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*1fc: R_MIPS_LO16	big_external_common
 0+0200 <[^>]*> addu	at,a1,gp
 0+0204 <[^>]*> sb	a0,1\(at\)
-[ 	]*204: [A-Z0-9_]*GPREL[A-Z0-9_]*	small_external_common
+[ 	]*204: R_MIPS_GPREL16	small_external_common
 0+0208 <[^>]*> lui	at,0x0
-[ 	]*208: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*208: R_MIPS_HI16	\.bss
 0+020c <[^>]*> addu	at,at,a1
 0+0210 <[^>]*> sb	a0,[-0-9]+\(at\)
-[ 	]*210: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*210: R_MIPS_LO16	\.bss
 0+0214 <[^>]*> addu	at,a1,gp
 0+0218 <[^>]*> sb	a0,[-0-9]+\(at\)
-[ 	]*218: [A-Z0-9_]*GPREL[A-Z0-9_]*	.sbss.*
+[ 	]*218: R_MIPS_GPREL16	\.sbss
 0+021c <[^>]*> lui	at,[-0-9x]+
-[ 	]*21c: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*21c: R_MIPS_HI16	\.data
 0+0220 <[^>]*> addu	at,at,a1
 0+0224 <[^>]*> sb	a0,[-0-9]+\(at\)
-[ 	]*224: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*224: R_MIPS_LO16	\.data
 0+0228 <[^>]*> lui	at,[-0-9x]+
-[ 	]*228: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*228: R_MIPS_HI16	big_external_data_label
 0+022c <[^>]*> addu	at,at,a1
 0+0230 <[^>]*> sb	a0,[-0-9]+\(at\)
-[ 	]*230: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*230: R_MIPS_LO16	big_external_data_label
 0+0234 <[^>]*> lui	at,[-0-9x]+
-[ 	]*234: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_data_label
+[ 	]*234: R_MIPS_HI16	small_external_data_label
 0+0238 <[^>]*> addu	at,at,a1
 0+023c <[^>]*> sb	a0,[-0-9]+\(at\)
-[ 	]*23c: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_data_label
+[ 	]*23c: R_MIPS_LO16	small_external_data_label
 0+0240 <[^>]*> lui	at,[-0-9x]+
-[ 	]*240: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*240: R_MIPS_HI16	big_external_common
 0+0244 <[^>]*> addu	at,at,a1
 0+0248 <[^>]*> sb	a0,[-0-9]+\(at\)
-[ 	]*248: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*248: R_MIPS_LO16	big_external_common
 0+024c <[^>]*> lui	at,[-0-9x]+
-[ 	]*24c: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_common
+[ 	]*24c: R_MIPS_HI16	small_external_common
 0+0250 <[^>]*> addu	at,at,a1
 0+0254 <[^>]*> sb	a0,[-0-9]+\(at\)
-[ 	]*254: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_common
+[ 	]*254: R_MIPS_LO16	small_external_common
 0+0258 <[^>]*> lui	at,[-0-9x]+
-[ 	]*258: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*258: R_MIPS_HI16	\.bss
 0+025c <[^>]*> addu	at,at,a1
 0+0260 <[^>]*> sb	a0,[-0-9]+\(at\)
-[ 	]*260: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*260: R_MIPS_LO16	\.bss
 0+0264 <[^>]*> lui	at,[-0-9x]+
-[ 	]*264: [A-Z0-9_]*HI[A-Z0-9_]*	.sbss.*
+[ 	]*264: R_MIPS_HI16	\.sbss
 0+0268 <[^>]*> addu	at,at,a1
 0+026c <[^>]*> sb	a0,[-0-9]+\(at\)
-[ 	]*26c: [A-Z0-9_]*LO[A-Z0-9_]*	.sbss.*
+[ 	]*26c: R_MIPS_LO16	\.sbss
 0+0270 <[^>]*> lui	at,0x0
-[ 	]*270: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*270: R_MIPS_HI16	\.data
 0+0274 <[^>]*> addu	at,at,a1
 0+0278 <[^>]*> sb	a0,[-0-9]+\(at\)
-[ 	]*278: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*278: R_MIPS_LO16	\.data
 0+027c <[^>]*> lui	at,0x0
-[ 	]*27c: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*27c: R_MIPS_HI16	big_external_data_label
 0+0280 <[^>]*> addu	at,at,a1
 0+0284 <[^>]*> sb	a0,[-0-9]+\(at\)
-[ 	]*284: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*284: R_MIPS_LO16	big_external_data_label
 0+0288 <[^>]*> lui	at,0x0
-[ 	]*288: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_data_label
+[ 	]*288: R_MIPS_HI16	small_external_data_label
 0+028c <[^>]*> addu	at,at,a1
 0+0290 <[^>]*> sb	a0,[-0-9]+\(at\)
-[ 	]*290: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_data_label
+[ 	]*290: R_MIPS_LO16	small_external_data_label
 0+0294 <[^>]*> lui	at,0x0
-[ 	]*294: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*294: R_MIPS_HI16	big_external_common
 0+0298 <[^>]*> addu	at,at,a1
 0+029c <[^>]*> sb	a0,[-0-9]+\(at\)
-[ 	]*29c: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*29c: R_MIPS_LO16	big_external_common
 0+02a0 <[^>]*> lui	at,0x0
-[ 	]*2a0: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_common
+[ 	]*2a0: R_MIPS_HI16	small_external_common
 0+02a4 <[^>]*> addu	at,at,a1
 0+02a8 <[^>]*> sb	a0,[-0-9]+\(at\)
-[ 	]*2a8: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_common
+[ 	]*2a8: R_MIPS_LO16	small_external_common
 0+02ac <[^>]*> lui	at,0x0
-[ 	]*2ac: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*2ac: R_MIPS_HI16	\.bss
 0+02b0 <[^>]*> addu	at,at,a1
 0+02b4 <[^>]*> sb	a0,[-0-9]+\(at\)
-[ 	]*2b4: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*2b4: R_MIPS_LO16	\.bss
 0+02b8 <[^>]*> lui	at,0x0
-[ 	]*2b8: [A-Z0-9_]*HI[A-Z0-9_]*	.sbss.*
+[ 	]*2b8: R_MIPS_HI16	\.sbss
 0+02bc <[^>]*> addu	at,at,a1
 0+02c0 <[^>]*> sb	a0,[-0-9]+\(at\)
-[ 	]*2c0: [A-Z0-9_]*LO[A-Z0-9_]*	.sbss.*
+[ 	]*2c0: R_MIPS_LO16	\.sbss
 0+02c4 <[^>]*> lui	at,[-0-9x]+
-[ 	]*2c4: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*2c4: R_MIPS_HI16	\.data
 0+02c8 <[^>]*> addu	at,at,a1
 0+02cc <[^>]*> sb	a0,[-0-9]+\(at\)
-[ 	]*2cc: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*2cc: R_MIPS_LO16	\.data
 0+02d0 <[^>]*> lui	at,[-0-9x]+
-[ 	]*2d0: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*2d0: R_MIPS_HI16	big_external_data_label
 0+02d4 <[^>]*> addu	at,at,a1
 0+02d8 <[^>]*> sb	a0,0\(at\)
-[ 	]*2d8: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*2d8: R_MIPS_LO16	big_external_data_label
 0+02dc <[^>]*> lui	at,[-0-9x]+
-[ 	]*2dc: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_data_label
+[ 	]*2dc: R_MIPS_HI16	small_external_data_label
 0+02e0 <[^>]*> addu	at,at,a1
 0+02e4 <[^>]*> sb	a0,0\(at\)
-[ 	]*2e4: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_data_label
+[ 	]*2e4: R_MIPS_LO16	small_external_data_label
 0+02e8 <[^>]*> lui	at,[-0-9x]+
-[ 	]*2e8: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*2e8: R_MIPS_HI16	big_external_common
 0+02ec <[^>]*> addu	at,at,a1
 0+02f0 <[^>]*> sb	a0,0\(at\)
-[ 	]*2f0: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*2f0: R_MIPS_LO16	big_external_common
 0+02f4 <[^>]*> lui	at,[-0-9x]+
-[ 	]*2f4: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_common
+[ 	]*2f4: R_MIPS_HI16	small_external_common
 0+02f8 <[^>]*> addu	at,at,a1
 0+02fc <[^>]*> sb	a0,0\(at\)
-[ 	]*2fc: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_common
+[ 	]*2fc: R_MIPS_LO16	small_external_common
 0+0300 <[^>]*> lui	at,[-0-9x]+
-[ 	]*300: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*300: R_MIPS_HI16	\.bss
 0+0304 <[^>]*> addu	at,at,a1
 0+0308 <[^>]*> sb	a0,[-0-9]+\(at\)
-[ 	]*308: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*308: R_MIPS_LO16	\.bss
 0+030c <[^>]*> lui	at,[-0-9x]+
-[ 	]*30c: [A-Z0-9_]*HI[A-Z0-9_]*	.sbss.*
+[ 	]*30c: R_MIPS_HI16	\.sbss
 0+0310 <[^>]*> addu	at,at,a1
 0+0314 <[^>]*> sb	a0,[-0-9]+\(at\)
-[ 	]*314: [A-Z0-9_]*LO[A-Z0-9_]*	.sbss.*
+[ 	]*314: R_MIPS_LO16	\.sbss
 0+0318 <[^>]*> lui	at,[-0-9x]+
-[ 	]*318: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*318: R_MIPS_HI16	\.data
 0+031c <[^>]*> addu	at,at,a1
 0+0320 <[^>]*> sb	a0,[-0-9]+\(at\)
-[ 	]*320: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*320: R_MIPS_LO16	\.data
 0+0324 <[^>]*> lui	at,[-0-9x]+
-[ 	]*324: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*324: R_MIPS_HI16	big_external_data_label
 0+0328 <[^>]*> addu	at,at,a1
 0+032c <[^>]*> sb	a0,[-0-9]+\(at\)
-[ 	]*32c: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*32c: R_MIPS_LO16	big_external_data_label
 0+0330 <[^>]*> lui	at,[-0-9x]+
-[ 	]*330: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_data_label
+[ 	]*330: R_MIPS_HI16	small_external_data_label
 0+0334 <[^>]*> addu	at,at,a1
 0+0338 <[^>]*> sb	a0,[-0-9]+\(at\)
-[ 	]*338: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_data_label
+[ 	]*338: R_MIPS_LO16	small_external_data_label
 0+033c <[^>]*> lui	at,[-0-9x]+
-[ 	]*33c: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*33c: R_MIPS_HI16	big_external_common
 0+0340 <[^>]*> addu	at,at,a1
 0+0344 <[^>]*> sb	a0,[-0-9]+\(at\)
-[ 	]*344: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*344: R_MIPS_LO16	big_external_common
 0+0348 <[^>]*> lui	at,[-0-9x]+
-[ 	]*348: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_common
+[ 	]*348: R_MIPS_HI16	small_external_common
 0+034c <[^>]*> addu	at,at,a1
 0+0350 <[^>]*> sb	a0,[-0-9]+\(at\)
-[ 	]*350: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_common
+[ 	]*350: R_MIPS_LO16	small_external_common
 0+0354 <[^>]*> lui	at,[-0-9x]+
-[ 	]*354: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*354: R_MIPS_HI16	\.bss
 0+0358 <[^>]*> addu	at,at,a1
 0+035c <[^>]*> sb	a0,[-0-9]+\(at\)
-[ 	]*35c: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*35c: R_MIPS_LO16	\.bss
 0+0360 <[^>]*> lui	at,[-0-9x]+
-[ 	]*360: [A-Z0-9_]*HI[A-Z0-9_]*	.sbss.*
+[ 	]*360: R_MIPS_HI16	\.sbss
 0+0364 <[^>]*> addu	at,at,a1
 0+0368 <[^>]*> sb	a0,[-0-9]+\(at\)
-[ 	]*368: [A-Z0-9_]*LO[A-Z0-9_]*	.sbss.*
+[ 	]*368: R_MIPS_LO16	\.sbss
 0+036c <[^>]*> sw	a0,0\(zero\)
 0+0370 <[^>]*> sw	a1,4\(zero\)
 0+0374 <[^>]*> sh	a0,0\(zero\)
diff --git a/gas/testsuite/gas/mips/uld.d b/gas/testsuite/gas/mips/uld.d
index 6d665e4..73d94a3 100644
--- a/gas/testsuite/gas/mips/uld.d
+++ b/gas/testsuite/gas/mips/uld.d
@@ -28,243 +28,243 @@ Disassembly of section .text:
 0+0048 <[^>]*> ldl	a0,[18]\(a1\)
 0+004c <[^>]*> ldr	a0,[-0-9]+\(a1\)
 0+0050 <[^>]*> lui	at,[-0-9x]+
-[ 	]*50: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*50: R_MIPS_HI16	\.data
 0+0054 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*54: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*54: R_MIPS_LO16	\.data
 0+0058 <[^>]*> ldl	a0,[07]\(at\)
 0+005c <[^>]*> ldr	a0,[07]\(at\)
 0+0060 <[^>]*> lui	at,0x0
-[ 	]*60: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*60: R_MIPS_HI16	big_external_data_label
 0+0064 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*64: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*64: R_MIPS_LO16	big_external_data_label
 0+0068 <[^>]*> ldl	a0,[07]\(at\)
 0+006c <[^>]*> ldr	a0,[07]\(at\)
 0+0070 <[^>]*> addiu	at,gp,0
-[ 	]*70: [A-Z0-9_]*GPREL[A-Z0-9_]*	small_external_data_label
+[ 	]*70: R_MIPS_GPREL16	small_external_data_label
 0+0074 <[^>]*> ldl	a0,[07]\(at\)
 0+0078 <[^>]*> ldr	a0,[07]\(at\)
 0+007c <[^>]*> lui	at,0x0
-[ 	]*7c: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*7c: R_MIPS_HI16	big_external_common
 0+0080 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*80: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*80: R_MIPS_LO16	big_external_common
 0+0084 <[^>]*> ldl	a0,[07]\(at\)
 0+0088 <[^>]*> ldr	a0,[07]\(at\)
 0+008c <[^>]*> addiu	at,gp,0
-[ 	]*8c: [A-Z0-9_]*GPREL[A-Z0-9_]*	small_external_common
+[ 	]*8c: R_MIPS_GPREL16	small_external_common
 0+0090 <[^>]*> ldl	a0,[07]\(at\)
 0+0094 <[^>]*> ldr	a0,[07]\(at\)
 0+0098 <[^>]*> lui	at,[-0-9x]+
-[ 	]*98: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*98: R_MIPS_HI16	\.bss
 0+009c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*9c: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*9c: R_MIPS_LO16	\.bss
 0+00a0 <[^>]*> ldl	a0,[07]\(at\)
 0+00a4 <[^>]*> ldr	a0,[07]\(at\)
 0+00a8 <[^>]*> addiu	at,gp,[-0-9]+
-[ 	]*a8: [A-Z0-9_]*GPREL[A-Z0-9_]*	.sbss.*
+[ 	]*a8: R_MIPS_GPREL16	\.sbss
 0+00ac <[^>]*> ldl	a0,[07]\(at\)
 0+00b0 <[^>]*> ldr	a0,[07]\(at\)
 0+00b4 <[^>]*> lui	at,0x0
-[ 	]*b4: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*b4: R_MIPS_HI16	\.data
 0+00b8 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*b8: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*b8: R_MIPS_LO16	\.data
 0+00bc <[^>]*> ldl	a0,[07]\(at\)
 0+00c0 <[^>]*> ldr	a0,[07]\(at\)
 0+00c4 <[^>]*> lui	at,0x0
-[ 	]*c4: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*c4: R_MIPS_HI16	big_external_data_label
 0+00c8 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*c8: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*c8: R_MIPS_LO16	big_external_data_label
 0+00cc <[^>]*> ldl	a0,[07]\(at\)
 0+00d0 <[^>]*> ldr	a0,[07]\(at\)
 0+00d4 <[^>]*> addiu	at,gp,1
-[ 	]*d4: [A-Z0-9_]*GPREL[A-Z0-9_]*	small_external_data_label
+[ 	]*d4: R_MIPS_GPREL16	small_external_data_label
 0+00d8 <[^>]*> ldl	a0,[07]\(at\)
 0+00dc <[^>]*> ldr	a0,[07]\(at\)
 0+00e0 <[^>]*> lui	at,0x0
-[ 	]*e0: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*e0: R_MIPS_HI16	big_external_common
 0+00e4 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*e4: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*e4: R_MIPS_LO16	big_external_common
 0+00e8 <[^>]*> ldl	a0,[07]\(at\)
 0+00ec <[^>]*> ldr	a0,[07]\(at\)
 0+00f0 <[^>]*> addiu	at,gp,1
-[ 	]*f0: [A-Z0-9_]*GPREL[A-Z0-9_]*	small_external_common
+[ 	]*f0: R_MIPS_GPREL16	small_external_common
 0+00f4 <[^>]*> ldl	a0,[07]\(at\)
 0+00f8 <[^>]*> ldr	a0,[07]\(at\)
 0+00fc <[^>]*> lui	at,0x0
-[ 	]*fc: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*fc: R_MIPS_HI16	\.bss
 0+0100 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*100: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*100: R_MIPS_LO16	\.bss
 0+0104 <[^>]*> ldl	a0,[07]\(at\)
 0+0108 <[^>]*> ldr	a0,[07]\(at\)
 0+010c <[^>]*> addiu	at,gp,[-0-9]+
-[ 	]*10c: [A-Z0-9_]*GPREL[A-Z0-9_]*	.sbss.*
+[ 	]*10c: R_MIPS_GPREL16	\.sbss
 0+0110 <[^>]*> ldl	a0,[07]\(at\)
 0+0114 <[^>]*> ldr	a0,[07]\(at\)
 0+0118 <[^>]*> lui	at,[-0-9x]+
-[ 	]*118: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*118: R_MIPS_HI16	\.data
 0+011c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*11c: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*11c: R_MIPS_LO16	\.data
 0+0120 <[^>]*> ldl	a0,[07]\(at\)
 0+0124 <[^>]*> ldr	a0,[07]\(at\)
 0+0128 <[^>]*> lui	at,[-0-9x]+
-[ 	]*128: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*128: R_MIPS_HI16	big_external_data_label
 0+012c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*12c: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*12c: R_MIPS_LO16	big_external_data_label
 0+0130 <[^>]*> ldl	a0,[07]\(at\)
 0+0134 <[^>]*> ldr	a0,[07]\(at\)
 0+0138 <[^>]*> lui	at,[-0-9x]+
-[ 	]*138: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_data_label
+[ 	]*138: R_MIPS_HI16	small_external_data_label
 0+013c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*13c: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_data_label
+[ 	]*13c: R_MIPS_LO16	small_external_data_label
 0+0140 <[^>]*> ldl	a0,[07]\(at\)
 0+0144 <[^>]*> ldr	a0,[07]\(at\)
 0+0148 <[^>]*> lui	at,[-0-9x]+
-[ 	]*148: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*148: R_MIPS_HI16	big_external_common
 0+014c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*14c: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*14c: R_MIPS_LO16	big_external_common
 0+0150 <[^>]*> ldl	a0,[07]\(at\)
 0+0154 <[^>]*> ldr	a0,[07]\(at\)
 0+0158 <[^>]*> lui	at,[-0-9x]+
-[ 	]*158: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_common
+[ 	]*158: R_MIPS_HI16	small_external_common
 0+015c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*15c: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_common
+[ 	]*15c: R_MIPS_LO16	small_external_common
 0+0160 <[^>]*> ldl	a0,[07]\(at\)
 0+0164 <[^>]*> ldr	a0,[07]\(at\)
 0+0168 <[^>]*> lui	at,[-0-9x]+
-[ 	]*168: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*168: R_MIPS_HI16	\.bss
 0+016c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*16c: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*16c: R_MIPS_LO16	\.bss
 0+0170 <[^>]*> ldl	a0,[07]\(at\)
 0+0174 <[^>]*> ldr	a0,[07]\(at\)
 0+0178 <[^>]*> lui	at,[-0-9x]+
-[ 	]*178: [A-Z0-9_]*HI[A-Z0-9_]*	.sbss.*
+[ 	]*178: R_MIPS_HI16	\.sbss
 0+017c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*17c: [A-Z0-9_]*LO[A-Z0-9_]*	.sbss.*
+[ 	]*17c: R_MIPS_LO16	\.sbss
 0+0180 <[^>]*> ldl	a0,[07]\(at\)
 0+0184 <[^>]*> ldr	a0,[07]\(at\)
 0+0188 <[^>]*> lui	at,0x0
-[ 	]*188: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*188: R_MIPS_HI16	\.data
 0+018c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*18c: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*18c: R_MIPS_LO16	\.data
 0+0190 <[^>]*> ldl	a0,[07]\(at\)
 0+0194 <[^>]*> ldr	a0,[07]\(at\)
 0+0198 <[^>]*> lui	at,0x0
-[ 	]*198: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*198: R_MIPS_HI16	big_external_data_label
 0+019c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*19c: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*19c: R_MIPS_LO16	big_external_data_label
 0+01a0 <[^>]*> ldl	a0,[07]\(at\)
 0+01a4 <[^>]*> ldr	a0,[07]\(at\)
 0+01a8 <[^>]*> lui	at,0x0
-[ 	]*1a8: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_data_label
+[ 	]*1a8: R_MIPS_HI16	small_external_data_label
 0+01ac <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*1ac: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_data_label
+[ 	]*1ac: R_MIPS_LO16	small_external_data_label
 0+01b0 <[^>]*> ldl	a0,[07]\(at\)
 0+01b4 <[^>]*> ldr	a0,[07]\(at\)
 0+01b8 <[^>]*> lui	at,0x0
-[ 	]*1b8: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*1b8: R_MIPS_HI16	big_external_common
 0+01bc <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*1bc: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*1bc: R_MIPS_LO16	big_external_common
 0+01c0 <[^>]*> ldl	a0,[07]\(at\)
 0+01c4 <[^>]*> ldr	a0,[07]\(at\)
 0+01c8 <[^>]*> lui	at,0x0
-[ 	]*1c8: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_common
+[ 	]*1c8: R_MIPS_HI16	small_external_common
 0+01cc <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*1cc: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_common
+[ 	]*1cc: R_MIPS_LO16	small_external_common
 0+01d0 <[^>]*> ldl	a0,[07]\(at\)
 0+01d4 <[^>]*> ldr	a0,[07]\(at\)
 0+01d8 <[^>]*> lui	at,0x0
-[ 	]*1d8: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*1d8: R_MIPS_HI16	\.bss
 0+01dc <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*1dc: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*1dc: R_MIPS_LO16	\.bss
 0+01e0 <[^>]*> ldl	a0,[07]\(at\)
 0+01e4 <[^>]*> ldr	a0,[07]\(at\)
 0+01e8 <[^>]*> lui	at,0x0
-[ 	]*1e8: [A-Z0-9_]*HI[A-Z0-9_]*	.sbss.*
+[ 	]*1e8: R_MIPS_HI16	\.sbss
 0+01ec <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*1ec: [A-Z0-9_]*LO[A-Z0-9_]*	.sbss.*
+[ 	]*1ec: R_MIPS_LO16	\.sbss
 0+01f0 <[^>]*> ldl	a0,[07]\(at\)
 0+01f4 <[^>]*> ldr	a0,[07]\(at\)
 0+01f8 <[^>]*> lui	at,[-0-9x]+
-[ 	]*1f8: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*1f8: R_MIPS_HI16	\.data
 0+01fc <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*1fc: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*1fc: R_MIPS_LO16	\.data
 0+0200 <[^>]*> ldl	a0,[07]\(at\)
 0+0204 <[^>]*> ldr	a0,[07]\(at\)
 0+0208 <[^>]*> lui	at,[-0-9x]+
-[ 	]*208: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*208: R_MIPS_HI16	big_external_data_label
 0+020c <[^>]*> addiu	at,at,0
-[ 	]*20c: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*20c: R_MIPS_LO16	big_external_data_label
 0+0210 <[^>]*> ldl	a0,[07]\(at\)
 0+0214 <[^>]*> ldr	a0,[07]\(at\)
 0+0218 <[^>]*> lui	at,[-0-9x]+
-[ 	]*218: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_data_label
+[ 	]*218: R_MIPS_HI16	small_external_data_label
 0+021c <[^>]*> addiu	at,at,0
-[ 	]*21c: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_data_label
+[ 	]*21c: R_MIPS_LO16	small_external_data_label
 0+0220 <[^>]*> ldl	a0,[07]\(at\)
 0+0224 <[^>]*> ldr	a0,[07]\(at\)
 0+0228 <[^>]*> lui	at,[-0-9x]+
-[ 	]*228: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*228: R_MIPS_HI16	big_external_common
 0+022c <[^>]*> addiu	at,at,0
-[ 	]*22c: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*22c: R_MIPS_LO16	big_external_common
 0+0230 <[^>]*> ldl	a0,[07]\(at\)
 0+0234 <[^>]*> ldr	a0,[07]\(at\)
 0+0238 <[^>]*> lui	at,[-0-9x]+
-[ 	]*238: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_common
+[ 	]*238: R_MIPS_HI16	small_external_common
 0+023c <[^>]*> addiu	at,at,0
-[ 	]*23c: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_common
+[ 	]*23c: R_MIPS_LO16	small_external_common
 0+0240 <[^>]*> ldl	a0,[07]\(at\)
 0+0244 <[^>]*> ldr	a0,[07]\(at\)
 0+0248 <[^>]*> lui	at,[-0-9x]+
-[ 	]*248: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*248: R_MIPS_HI16	\.bss
 0+024c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*24c: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*24c: R_MIPS_LO16	\.bss
 0+0250 <[^>]*> ldl	a0,[07]\(at\)
 0+0254 <[^>]*> ldr	a0,[07]\(at\)
 0+0258 <[^>]*> lui	at,[-0-9x]+
-[ 	]*258: [A-Z0-9_]*HI[A-Z0-9_]*	.sbss.*
+[ 	]*258: R_MIPS_HI16	\.sbss
 0+025c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*25c: [A-Z0-9_]*LO[A-Z0-9_]*	.sbss.*
+[ 	]*25c: R_MIPS_LO16	\.sbss
 0+0260 <[^>]*> ldl	a0,[07]\(at\)
 0+0264 <[^>]*> ldr	a0,[07]\(at\)
 0+0268 <[^>]*> lui	at,[-0-9x]+
-[ 	]*268: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*268: R_MIPS_HI16	\.data
 0+026c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*26c: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*26c: R_MIPS_LO16	\.data
 0+0270 <[^>]*> ldl	a0,[07]\(at\)
 0+0274 <[^>]*> ldr	a0,[07]\(at\)
 0+0278 <[^>]*> lui	at,[-0-9x]+
-[ 	]*278: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*278: R_MIPS_HI16	big_external_data_label
 0+027c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*27c: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*27c: R_MIPS_LO16	big_external_data_label
 0+0280 <[^>]*> ldl	a0,[07]\(at\)
 0+0284 <[^>]*> ldr	a0,[07]\(at\)
 0+0288 <[^>]*> lui	at,[-0-9x]+
-[ 	]*288: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_data_label
+[ 	]*288: R_MIPS_HI16	small_external_data_label
 0+028c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*28c: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_data_label
+[ 	]*28c: R_MIPS_LO16	small_external_data_label
 0+0290 <[^>]*> ldl	a0,[07]\(at\)
 0+0294 <[^>]*> ldr	a0,[07]\(at\)
 0+0298 <[^>]*> lui	at,[-0-9x]+
-[ 	]*298: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*298: R_MIPS_HI16	big_external_common
 0+029c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*29c: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*29c: R_MIPS_LO16	big_external_common
 0+02a0 <[^>]*> ldl	a0,[07]\(at\)
 0+02a4 <[^>]*> ldr	a0,[07]\(at\)
 0+02a8 <[^>]*> lui	at,[-0-9x]+
-[ 	]*2a8: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_common
+[ 	]*2a8: R_MIPS_HI16	small_external_common
 0+02ac <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*2ac: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_common
+[ 	]*2ac: R_MIPS_LO16	small_external_common
 0+02b0 <[^>]*> ldl	a0,[07]\(at\)
 0+02b4 <[^>]*> ldr	a0,[07]\(at\)
 0+02b8 <[^>]*> lui	at,[-0-9x]+
-[ 	]*2b8: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*2b8: R_MIPS_HI16	\.bss
 0+02bc <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*2bc: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*2bc: R_MIPS_LO16	\.bss
 0+02c0 <[^>]*> ldl	a0,[07]\(at\)
 0+02c4 <[^>]*> ldr	a0,[07]\(at\)
 0+02c8 <[^>]*> lui	at,[-0-9x]+
-[ 	]*2c8: [A-Z0-9_]*HI[A-Z0-9_]*	.sbss.*
+[ 	]*2c8: R_MIPS_HI16	\.sbss
 0+02cc <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*2cc: [A-Z0-9_]*LO[A-Z0-9_]*	.sbss.*
+[ 	]*2cc: R_MIPS_LO16	\.sbss
 0+02d0 <[^>]*> ldl	a0,[07]\(at\)
 0+02d4 <[^>]*> ldr	a0,[07]\(at\)
 	...
diff --git a/gas/testsuite/gas/mips/ulh.d b/gas/testsuite/gas/mips/ulh.d
index dbe4a73..d81d7d3 100644
--- a/gas/testsuite/gas/mips/ulh.d
+++ b/gas/testsuite/gas/mips/ulh.d
@@ -44,325 +44,325 @@ Disassembly of section .text:
 0+0088 <[^>]*> sll	at,at,0x8
 0+008c <[^>]*> or	a0,a0,at
 0+0090 <[^>]*> lui	at,[-0-9x]+
-[ 	]*90: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*90: R_MIPS_HI16	\.data
 0+0094 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*94: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*94: R_MIPS_LO16	\.data
 0+0098 <[^>]*> lb	a0,[01]\(at\)
 0+009c <[^>]*> lbu	at,[01]\(at\)
 0+00a0 <[^>]*> sll	a0,a0,0x8
 0+00a4 <[^>]*> or	a0,a0,at
 0+00a8 <[^>]*> lui	at,0x0
-[ 	]*a8: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*a8: R_MIPS_HI16	big_external_data_label
 0+00ac <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*ac: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*ac: R_MIPS_LO16	big_external_data_label
 0+00b0 <[^>]*> lb	a0,[01]\(at\)
 0+00b4 <[^>]*> lbu	at,[01]\(at\)
 0+00b8 <[^>]*> sll	a0,a0,0x8
 0+00bc <[^>]*> or	a0,a0,at
 0+00c0 <[^>]*> addiu	at,gp,0
-[ 	]*c0: [A-Z0-9_]*GPREL[A-Z0-9_]*	small_external_data_label
+[ 	]*c0: R_MIPS_GPREL16	small_external_data_label
 0+00c4 <[^>]*> lb	a0,[01]\(at\)
 0+00c8 <[^>]*> lbu	at,[01]\(at\)
 0+00cc <[^>]*> sll	a0,a0,0x8
 0+00d0 <[^>]*> or	a0,a0,at
 0+00d4 <[^>]*> lui	at,0x0
-[ 	]*d4: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*d4: R_MIPS_HI16	big_external_common
 0+00d8 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*d8: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*d8: R_MIPS_LO16	big_external_common
 0+00dc <[^>]*> lb	a0,[01]\(at\)
 0+00e0 <[^>]*> lbu	at,[01]\(at\)
 0+00e4 <[^>]*> sll	a0,a0,0x8
 0+00e8 <[^>]*> or	a0,a0,at
 0+00ec <[^>]*> addiu	at,gp,0
-[ 	]*ec: [A-Z0-9_]*GPREL[A-Z0-9_]*	small_external_common
+[ 	]*ec: R_MIPS_GPREL16	small_external_common
 0+00f0 <[^>]*> lb	a0,[01]\(at\)
 0+00f4 <[^>]*> lbu	at,[01]\(at\)
 0+00f8 <[^>]*> sll	a0,a0,0x8
 0+00fc <[^>]*> or	a0,a0,at
 0+0100 <[^>]*> lui	at,[-0-9x]+
-[ 	]*100: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*100: R_MIPS_HI16	\.bss
 0+0104 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*104: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*104: R_MIPS_LO16	\.bss
 0+0108 <[^>]*> lb	a0,[01]\(at\)
 0+010c <[^>]*> lbu	at,[01]\(at\)
 0+0110 <[^>]*> sll	a0,a0,0x8
 0+0114 <[^>]*> or	a0,a0,at
 0+0118 <[^>]*> addiu	at,gp,[-0-9]+
-[ 	]*118: [A-Z0-9_]*GPREL[A-Z0-9_]*	.sbss.*
+[ 	]*118: R_MIPS_GPREL16	\.sbss
 0+011c <[^>]*> lb	a0,[01]\(at\)
 0+0120 <[^>]*> lbu	at,[01]\(at\)
 0+0124 <[^>]*> sll	a0,a0,0x8
 0+0128 <[^>]*> or	a0,a0,at
 0+012c <[^>]*> lui	at,0x0
-[ 	]*12c: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*12c: R_MIPS_HI16	\.data
 0+0130 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*130: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*130: R_MIPS_LO16	\.data
 0+0134 <[^>]*> lb	a0,[01]\(at\)
 0+0138 <[^>]*> lbu	at,[01]\(at\)
 0+013c <[^>]*> sll	a0,a0,0x8
 0+0140 <[^>]*> or	a0,a0,at
 0+0144 <[^>]*> lui	at,0x0
-[ 	]*144: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*144: R_MIPS_HI16	big_external_data_label
 0+0148 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*148: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*148: R_MIPS_LO16	big_external_data_label
 0+014c <[^>]*> lb	a0,[01]\(at\)
 0+0150 <[^>]*> lbu	at,[01]\(at\)
 0+0154 <[^>]*> sll	a0,a0,0x8
 0+0158 <[^>]*> or	a0,a0,at
 0+015c <[^>]*> addiu	at,gp,1
-[ 	]*15c: [A-Z0-9_]*GPREL[A-Z0-9_]*	small_external_data_label
+[ 	]*15c: R_MIPS_GPREL16	small_external_data_label
 0+0160 <[^>]*> lb	a0,[01]\(at\)
 0+0164 <[^>]*> lbu	at,[01]\(at\)
 0+0168 <[^>]*> sll	a0,a0,0x8
 0+016c <[^>]*> or	a0,a0,at
 0+0170 <[^>]*> lui	at,0x0
-[ 	]*170: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*170: R_MIPS_HI16	big_external_common
 0+0174 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*174: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*174: R_MIPS_LO16	big_external_common
 0+0178 <[^>]*> lb	a0,[01]\(at\)
 0+017c <[^>]*> lbu	at,[01]\(at\)
 0+0180 <[^>]*> sll	a0,a0,0x8
 0+0184 <[^>]*> or	a0,a0,at
 0+0188 <[^>]*> addiu	at,gp,1
-[ 	]*188: [A-Z0-9_]*GPREL[A-Z0-9_]*	small_external_common
+[ 	]*188: R_MIPS_GPREL16	small_external_common
 0+018c <[^>]*> lb	a0,[01]\(at\)
 0+0190 <[^>]*> lbu	at,[01]\(at\)
 0+0194 <[^>]*> sll	a0,a0,0x8
 0+0198 <[^>]*> or	a0,a0,at
 0+019c <[^>]*> lui	at,0x0
-[ 	]*19c: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*19c: R_MIPS_HI16	\.bss
 0+01a0 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*1a0: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*1a0: R_MIPS_LO16	\.bss
 0+01a4 <[^>]*> lb	a0,[01]\(at\)
 0+01a8 <[^>]*> lbu	at,[01]\(at\)
 0+01ac <[^>]*> sll	a0,a0,0x8
 0+01b0 <[^>]*> or	a0,a0,at
 0+01b4 <[^>]*> addiu	at,gp,[-0-9]+
-[ 	]*1b4: [A-Z0-9_]*GPREL[A-Z0-9_]*	.sbss.*
+[ 	]*1b4: R_MIPS_GPREL16	\.sbss
 0+01b8 <[^>]*> lb	a0,[01]\(at\)
 0+01bc <[^>]*> lbu	at,[01]\(at\)
 0+01c0 <[^>]*> sll	a0,a0,0x8
 0+01c4 <[^>]*> or	a0,a0,at
 0+01c8 <[^>]*> lui	at,[-0-9x]+
-[ 	]*1c8: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*1c8: R_MIPS_HI16	\.data
 0+01cc <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*1cc: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*1cc: R_MIPS_LO16	\.data
 0+01d0 <[^>]*> lb	a0,[01]\(at\)
 0+01d4 <[^>]*> lbu	at,[01]\(at\)
 0+01d8 <[^>]*> sll	a0,a0,0x8
 0+01dc <[^>]*> or	a0,a0,at
 0+01e0 <[^>]*> lui	at,[-0-9x]+
-[ 	]*1e0: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*1e0: R_MIPS_HI16	big_external_data_label
 0+01e4 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*1e4: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*1e4: R_MIPS_LO16	big_external_data_label
 0+01e8 <[^>]*> lb	a0,[01]\(at\)
 0+01ec <[^>]*> lbu	at,[01]\(at\)
 0+01f0 <[^>]*> sll	a0,a0,0x8
 0+01f4 <[^>]*> or	a0,a0,at
 0+01f8 <[^>]*> lui	at,[-0-9x]+
-[ 	]*1f8: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_data_label
+[ 	]*1f8: R_MIPS_HI16	small_external_data_label
 0+01fc <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*1fc: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_data_label
+[ 	]*1fc: R_MIPS_LO16	small_external_data_label
 0+0200 <[^>]*> lb	a0,[01]\(at\)
 0+0204 <[^>]*> lbu	at,[01]\(at\)
 0+0208 <[^>]*> sll	a0,a0,0x8
 0+020c <[^>]*> or	a0,a0,at
 0+0210 <[^>]*> lui	at,[-0-9x]+
-[ 	]*210: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*210: R_MIPS_HI16	big_external_common
 0+0214 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*214: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*214: R_MIPS_LO16	big_external_common
 0+0218 <[^>]*> lb	a0,[01]\(at\)
 0+021c <[^>]*> lbu	at,[01]\(at\)
 0+0220 <[^>]*> sll	a0,a0,0x8
 0+0224 <[^>]*> or	a0,a0,at
 0+0228 <[^>]*> lui	at,[-0-9x]+
-[ 	]*228: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_common
+[ 	]*228: R_MIPS_HI16	small_external_common
 0+022c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*22c: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_common
+[ 	]*22c: R_MIPS_LO16	small_external_common
 0+0230 <[^>]*> lb	a0,[01]\(at\)
 0+0234 <[^>]*> lbu	at,[01]\(at\)
 0+0238 <[^>]*> sll	a0,a0,0x8
 0+023c <[^>]*> or	a0,a0,at
 0+0240 <[^>]*> lui	at,[-0-9x]+
-[ 	]*240: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*240: R_MIPS_HI16	\.bss
 0+0244 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*244: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*244: R_MIPS_LO16	\.bss
 0+0248 <[^>]*> lb	a0,[01]\(at\)
 0+024c <[^>]*> lbu	at,[01]\(at\)
 0+0250 <[^>]*> sll	a0,a0,0x8
 0+0254 <[^>]*> or	a0,a0,at
 0+0258 <[^>]*> lui	at,[-0-9x]+
-[ 	]*258: [A-Z0-9_]*HI[A-Z0-9_]*	.sbss.*
+[ 	]*258: R_MIPS_HI16	\.sbss
 0+025c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*25c: [A-Z0-9_]*LO[A-Z0-9_]*	.sbss.*
+[ 	]*25c: R_MIPS_LO16	\.sbss
 0+0260 <[^>]*> lb	a0,[01]\(at\)
 0+0264 <[^>]*> lbu	at,[01]\(at\)
 0+0268 <[^>]*> sll	a0,a0,0x8
 0+026c <[^>]*> or	a0,a0,at
 0+0270 <[^>]*> lui	at,0x0
-[ 	]*270: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*270: R_MIPS_HI16	\.data
 0+0274 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*274: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*274: R_MIPS_LO16	\.data
 0+0278 <[^>]*> lb	a0,[01]\(at\)
 0+027c <[^>]*> lbu	at,[01]\(at\)
 0+0280 <[^>]*> sll	a0,a0,0x8
 0+0284 <[^>]*> or	a0,a0,at
 0+0288 <[^>]*> lui	at,0x0
-[ 	]*288: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*288: R_MIPS_HI16	big_external_data_label
 0+028c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*28c: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*28c: R_MIPS_LO16	big_external_data_label
 0+0290 <[^>]*> lb	a0,[01]\(at\)
 0+0294 <[^>]*> lbu	at,[01]\(at\)
 0+0298 <[^>]*> sll	a0,a0,0x8
 0+029c <[^>]*> or	a0,a0,at
 0+02a0 <[^>]*> lui	at,0x0
-[ 	]*2a0: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_data_label
+[ 	]*2a0: R_MIPS_HI16	small_external_data_label
 0+02a4 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*2a4: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_data_label
+[ 	]*2a4: R_MIPS_LO16	small_external_data_label
 0+02a8 <[^>]*> lb	a0,[01]\(at\)
 0+02ac <[^>]*> lbu	at,[01]\(at\)
 0+02b0 <[^>]*> sll	a0,a0,0x8
 0+02b4 <[^>]*> or	a0,a0,at
 0+02b8 <[^>]*> lui	at,0x0
-[ 	]*2b8: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*2b8: R_MIPS_HI16	big_external_common
 0+02bc <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*2bc: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*2bc: R_MIPS_LO16	big_external_common
 0+02c0 <[^>]*> lb	a0,[01]\(at\)
 0+02c4 <[^>]*> lbu	at,[01]\(at\)
 0+02c8 <[^>]*> sll	a0,a0,0x8
 0+02cc <[^>]*> or	a0,a0,at
 0+02d0 <[^>]*> lui	at,0x0
-[ 	]*2d0: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_common
+[ 	]*2d0: R_MIPS_HI16	small_external_common
 0+02d4 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*2d4: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_common
+[ 	]*2d4: R_MIPS_LO16	small_external_common
 0+02d8 <[^>]*> lb	a0,[01]\(at\)
 0+02dc <[^>]*> lbu	at,[01]\(at\)
 0+02e0 <[^>]*> sll	a0,a0,0x8
 0+02e4 <[^>]*> or	a0,a0,at
 0+02e8 <[^>]*> lui	at,0x0
-[ 	]*2e8: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*2e8: R_MIPS_HI16	\.bss
 0+02ec <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*2ec: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*2ec: R_MIPS_LO16	\.bss
 0+02f0 <[^>]*> lb	a0,[01]\(at\)
 0+02f4 <[^>]*> lbu	at,[01]\(at\)
 0+02f8 <[^>]*> sll	a0,a0,0x8
 0+02fc <[^>]*> or	a0,a0,at
 0+0300 <[^>]*> lui	at,0x0
-[ 	]*300: [A-Z0-9_]*HI[A-Z0-9_]*	.sbss.*
+[ 	]*300: R_MIPS_HI16	\.sbss
 0+0304 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*304: [A-Z0-9_]*LO[A-Z0-9_]*	.sbss.*
+[ 	]*304: R_MIPS_LO16	\.sbss
 0+0308 <[^>]*> lb	a0,[01]\(at\)
 0+030c <[^>]*> lbu	at,[01]\(at\)
 0+0310 <[^>]*> sll	a0,a0,0x8
 0+0314 <[^>]*> or	a0,a0,at
 0+0318 <[^>]*> lui	at,[-0-9x]+
-[ 	]*318: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*318: R_MIPS_HI16	\.data
 0+031c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*31c: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*31c: R_MIPS_LO16	\.data
 0+0320 <[^>]*> lb	a0,[01]\(at\)
 0+0324 <[^>]*> lbu	at,[01]\(at\)
 0+0328 <[^>]*> sll	a0,a0,0x8
 0+032c <[^>]*> or	a0,a0,at
 0+0330 <[^>]*> lui	at,[-0-9x]+
-[ 	]*330: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*330: R_MIPS_HI16	big_external_data_label
 0+0334 <[^>]*> addiu	at,at,0
-[ 	]*334: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*334: R_MIPS_LO16	big_external_data_label
 0+0338 <[^>]*> lb	a0,[01]\(at\)
 0+033c <[^>]*> lbu	at,[01]\(at\)
 0+0340 <[^>]*> sll	a0,a0,0x8
 0+0344 <[^>]*> or	a0,a0,at
 0+0348 <[^>]*> lui	at,[-0-9x]+
-[ 	]*348: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_data_label
+[ 	]*348: R_MIPS_HI16	small_external_data_label
 0+034c <[^>]*> addiu	at,at,0
-[ 	]*34c: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_data_label
+[ 	]*34c: R_MIPS_LO16	small_external_data_label
 0+0350 <[^>]*> lb	a0,[01]\(at\)
 0+0354 <[^>]*> lbu	at,[01]\(at\)
 0+0358 <[^>]*> sll	a0,a0,0x8
 0+035c <[^>]*> or	a0,a0,at
 0+0360 <[^>]*> lui	at,[-0-9x]+
-[ 	]*360: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*360: R_MIPS_HI16	big_external_common
 0+0364 <[^>]*> addiu	at,at,0
-[ 	]*364: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*364: R_MIPS_LO16	big_external_common
 0+0368 <[^>]*> lb	a0,[01]\(at\)
 0+036c <[^>]*> lbu	at,[01]\(at\)
 0+0370 <[^>]*> sll	a0,a0,0x8
 0+0374 <[^>]*> or	a0,a0,at
 0+0378 <[^>]*> lui	at,[-0-9x]+
-[ 	]*378: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_common
+[ 	]*378: R_MIPS_HI16	small_external_common
 0+037c <[^>]*> addiu	at,at,0
-[ 	]*37c: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_common
+[ 	]*37c: R_MIPS_LO16	small_external_common
 0+0380 <[^>]*> lb	a0,[01]\(at\)
 0+0384 <[^>]*> lbu	at,[01]\(at\)
 0+0388 <[^>]*> sll	a0,a0,0x8
 0+038c <[^>]*> or	a0,a0,at
 0+0390 <[^>]*> lui	at,[-0-9x]+
-[ 	]*390: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*390: R_MIPS_HI16	\.bss
 0+0394 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*394: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*394: R_MIPS_LO16	\.bss
 0+0398 <[^>]*> lb	a0,[01]\(at\)
 0+039c <[^>]*> lbu	at,[01]\(at\)
 0+03a0 <[^>]*> sll	a0,a0,0x8
 0+03a4 <[^>]*> or	a0,a0,at
 0+03a8 <[^>]*> lui	at,[-0-9x]+
-[ 	]*3a8: [A-Z0-9_]*HI[A-Z0-9_]*	.sbss.*
+[ 	]*3a8: R_MIPS_HI16	\.sbss
 0+03ac <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*3ac: [A-Z0-9_]*LO[A-Z0-9_]*	.sbss.*
+[ 	]*3ac: R_MIPS_LO16	\.sbss
 0+03b0 <[^>]*> lb	a0,[01]\(at\)
 0+03b4 <[^>]*> lbu	at,[01]\(at\)
 0+03b8 <[^>]*> sll	a0,a0,0x8
 0+03bc <[^>]*> or	a0,a0,at
 0+03c0 <[^>]*> lui	at,[-0-9x]+
-[ 	]*3c0: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*3c0: R_MIPS_HI16	\.data
 0+03c4 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*3c4: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*3c4: R_MIPS_LO16	\.data
 0+03c8 <[^>]*> lb	a0,[01]\(at\)
 0+03cc <[^>]*> lbu	at,[01]\(at\)
 0+03d0 <[^>]*> sll	a0,a0,0x8
 0+03d4 <[^>]*> or	a0,a0,at
 0+03d8 <[^>]*> lui	at,[-0-9x]+
-[ 	]*3d8: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*3d8: R_MIPS_HI16	big_external_data_label
 0+03dc <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*3dc: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*3dc: R_MIPS_LO16	big_external_data_label
 0+03e0 <[^>]*> lb	a0,[01]\(at\)
 0+03e4 <[^>]*> lbu	at,[01]\(at\)
 0+03e8 <[^>]*> sll	a0,a0,0x8
 0+03ec <[^>]*> or	a0,a0,at
 0+03f0 <[^>]*> lui	at,[-0-9x]+
-[ 	]*3f0: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_data_label
+[ 	]*3f0: R_MIPS_HI16	small_external_data_label
 0+03f4 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*3f4: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_data_label
+[ 	]*3f4: R_MIPS_LO16	small_external_data_label
 0+03f8 <[^>]*> lb	a0,[01]\(at\)
 0+03fc <[^>]*> lbu	at,[01]\(at\)
 0+0400 <[^>]*> sll	a0,a0,0x8
 0+0404 <[^>]*> or	a0,a0,at
 0+0408 <[^>]*> lui	at,[-0-9x]+
-[ 	]*408: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*408: R_MIPS_HI16	big_external_common
 0+040c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*40c: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*40c: R_MIPS_LO16	big_external_common
 0+0410 <[^>]*> lb	a0,[01]\(at\)
 0+0414 <[^>]*> lbu	at,[01]\(at\)
 0+0418 <[^>]*> sll	a0,a0,0x8
 0+041c <[^>]*> or	a0,a0,at
 0+0420 <[^>]*> lui	at,[-0-9x]+
-[ 	]*420: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_common
+[ 	]*420: R_MIPS_HI16	small_external_common
 0+0424 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*424: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_common
+[ 	]*424: R_MIPS_LO16	small_external_common
 0+0428 <[^>]*> lb	a0,[01]\(at\)
 0+042c <[^>]*> lbu	at,[01]\(at\)
 0+0430 <[^>]*> sll	a0,a0,0x8
 0+0434 <[^>]*> or	a0,a0,at
 0+0438 <[^>]*> lui	at,[-0-9x]+
-[ 	]*438: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*438: R_MIPS_HI16	\.bss
 0+043c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*43c: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*43c: R_MIPS_LO16	\.bss
 0+0440 <[^>]*> lb	a0,[01]\(at\)
 0+0444 <[^>]*> lbu	at,[01]\(at\)
 0+0448 <[^>]*> sll	a0,a0,0x8
 0+044c <[^>]*> or	a0,a0,at
 0+0450 <[^>]*> lui	at,[-0-9x]+
-[ 	]*450: [A-Z0-9_]*HI[A-Z0-9_]*	.sbss.*
+[ 	]*450: R_MIPS_HI16	\.sbss
 0+0454 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*454: [A-Z0-9_]*LO[A-Z0-9_]*	.sbss.*
+[ 	]*454: R_MIPS_LO16	\.sbss
 0+0458 <[^>]*> lb	a0,[01]\(at\)
 0+045c <[^>]*> lbu	at,[01]\(at\)
 0+0460 <[^>]*> sll	a0,a0,0x8
diff --git a/gas/testsuite/gas/mips/ulw.d b/gas/testsuite/gas/mips/ulw.d
index 7d2bec0..e2aa2a5 100644
--- a/gas/testsuite/gas/mips/ulw.d
+++ b/gas/testsuite/gas/mips/ulw.d
@@ -28,243 +28,243 @@ Disassembly of section .text:
 0+0048 <[^>]*> lwl	a0,[14]\(a1\)
 0+004c <[^>]*> lwr	a0,[-0-9]+\(a1\)
 0+0050 <[^>]*> lui	at,[-0-9x]+
-[ 	]*50: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*50: R_MIPS_HI16	\.data
 0+0054 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*54: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*54: R_MIPS_LO16	\.data
 0+0058 <[^>]*> lwl	a0,[03]\(at\)
 0+005c <[^>]*> lwr	a0,[03]\(at\)
 0+0060 <[^>]*> lui	at,0x0
-[ 	]*60: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*60: R_MIPS_HI16	big_external_data_label
 0+0064 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*64: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*64: R_MIPS_LO16	big_external_data_label
 0+0068 <[^>]*> lwl	a0,[03]\(at\)
 0+006c <[^>]*> lwr	a0,[03]\(at\)
 0+0070 <[^>]*> addiu	at,gp,0
-[ 	]*70: [A-Z0-9_]*GPREL[A-Z0-9_]*	small_external_data_label
+[ 	]*70: R_MIPS_GPREL16	small_external_data_label
 0+0074 <[^>]*> lwl	a0,[03]\(at\)
 0+0078 <[^>]*> lwr	a0,[03]\(at\)
 0+007c <[^>]*> lui	at,0x0
-[ 	]*7c: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*7c: R_MIPS_HI16	big_external_common
 0+0080 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*80: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*80: R_MIPS_LO16	big_external_common
 0+0084 <[^>]*> lwl	a0,[03]\(at\)
 0+0088 <[^>]*> lwr	a0,[03]\(at\)
 0+008c <[^>]*> addiu	at,gp,0
-[ 	]*8c: [A-Z0-9_]*GPREL[A-Z0-9_]*	small_external_common
+[ 	]*8c: R_MIPS_GPREL16	small_external_common
 0+0090 <[^>]*> lwl	a0,[03]\(at\)
 0+0094 <[^>]*> lwr	a0,[03]\(at\)
 0+0098 <[^>]*> lui	at,[-0-9x]+
-[ 	]*98: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*98: R_MIPS_HI16	\.bss
 0+009c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*9c: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*9c: R_MIPS_LO16	\.bss
 0+00a0 <[^>]*> lwl	a0,[03]\(at\)
 0+00a4 <[^>]*> lwr	a0,[03]\(at\)
 0+00a8 <[^>]*> addiu	at,gp,[-0-9]+
-[ 	]*a8: [A-Z0-9_]*GPREL[A-Z0-9_]*	.sbss.*
+[ 	]*a8: R_MIPS_GPREL16	\.sbss
 0+00ac <[^>]*> lwl	a0,[03]\(at\)
 0+00b0 <[^>]*> lwr	a0,[03]\(at\)
 0+00b4 <[^>]*> lui	at,0x0
-[ 	]*b4: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*b4: R_MIPS_HI16	\.data
 0+00b8 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*b8: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*b8: R_MIPS_LO16	\.data
 0+00bc <[^>]*> lwl	a0,[03]\(at\)
 0+00c0 <[^>]*> lwr	a0,[03]\(at\)
 0+00c4 <[^>]*> lui	at,0x0
-[ 	]*c4: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*c4: R_MIPS_HI16	big_external_data_label
 0+00c8 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*c8: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*c8: R_MIPS_LO16	big_external_data_label
 0+00cc <[^>]*> lwl	a0,[03]\(at\)
 0+00d0 <[^>]*> lwr	a0,[03]\(at\)
 0+00d4 <[^>]*> addiu	at,gp,1
-[ 	]*d4: [A-Z0-9_]*GPREL[A-Z0-9_]*	small_external_data_label
+[ 	]*d4: R_MIPS_GPREL16	small_external_data_label
 0+00d8 <[^>]*> lwl	a0,[03]\(at\)
 0+00dc <[^>]*> lwr	a0,[03]\(at\)
 0+00e0 <[^>]*> lui	at,0x0
-[ 	]*e0: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*e0: R_MIPS_HI16	big_external_common
 0+00e4 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*e4: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*e4: R_MIPS_LO16	big_external_common
 0+00e8 <[^>]*> lwl	a0,[03]\(at\)
 0+00ec <[^>]*> lwr	a0,[03]\(at\)
 0+00f0 <[^>]*> addiu	at,gp,1
-[ 	]*f0: [A-Z0-9_]*GPREL[A-Z0-9_]*	small_external_common
+[ 	]*f0: R_MIPS_GPREL16	small_external_common
 0+00f4 <[^>]*> lwl	a0,[03]\(at\)
 0+00f8 <[^>]*> lwr	a0,[03]\(at\)
 0+00fc <[^>]*> lui	at,0x0
-[ 	]*fc: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*fc: R_MIPS_HI16	\.bss
 0+0100 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*100: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*100: R_MIPS_LO16	\.bss
 0+0104 <[^>]*> lwl	a0,[03]\(at\)
 0+0108 <[^>]*> lwr	a0,[03]\(at\)
 0+010c <[^>]*> addiu	at,gp,[-0-9]+
-[ 	]*10c: [A-Z0-9_]*GPREL[A-Z0-9_]*	.sbss.*
+[ 	]*10c: R_MIPS_GPREL16	\.sbss
 0+0110 <[^>]*> lwl	a0,[03]\(at\)
 0+0114 <[^>]*> lwr	a0,[03]\(at\)
 0+0118 <[^>]*> lui	at,[-0-9x]+
-[ 	]*118: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*118: R_MIPS_HI16	\.data
 0+011c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*11c: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*11c: R_MIPS_LO16	\.data
 0+0120 <[^>]*> lwl	a0,[03]\(at\)
 0+0124 <[^>]*> lwr	a0,[03]\(at\)
 0+0128 <[^>]*> lui	at,[-0-9x]+
-[ 	]*128: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*128: R_MIPS_HI16	big_external_data_label
 0+012c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*12c: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*12c: R_MIPS_LO16	big_external_data_label
 0+0130 <[^>]*> lwl	a0,[03]\(at\)
 0+0134 <[^>]*> lwr	a0,[03]\(at\)
 0+0138 <[^>]*> lui	at,[-0-9x]+
-[ 	]*138: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_data_label
+[ 	]*138: R_MIPS_HI16	small_external_data_label
 0+013c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*13c: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_data_label
+[ 	]*13c: R_MIPS_LO16	small_external_data_label
 0+0140 <[^>]*> lwl	a0,[03]\(at\)
 0+0144 <[^>]*> lwr	a0,[03]\(at\)
 0+0148 <[^>]*> lui	at,[-0-9x]+
-[ 	]*148: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*148: R_MIPS_HI16	big_external_common
 0+014c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*14c: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*14c: R_MIPS_LO16	big_external_common
 0+0150 <[^>]*> lwl	a0,[03]\(at\)
 0+0154 <[^>]*> lwr	a0,[03]\(at\)
 0+0158 <[^>]*> lui	at,[-0-9x]+
-[ 	]*158: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_common
+[ 	]*158: R_MIPS_HI16	small_external_common
 0+015c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*15c: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_common
+[ 	]*15c: R_MIPS_LO16	small_external_common
 0+0160 <[^>]*> lwl	a0,[03]\(at\)
 0+0164 <[^>]*> lwr	a0,[03]\(at\)
 0+0168 <[^>]*> lui	at,[-0-9x]+
-[ 	]*168: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*168: R_MIPS_HI16	\.bss
 0+016c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*16c: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*16c: R_MIPS_LO16	\.bss
 0+0170 <[^>]*> lwl	a0,[03]\(at\)
 0+0174 <[^>]*> lwr	a0,[03]\(at\)
 0+0178 <[^>]*> lui	at,[-0-9x]+
-[ 	]*178: [A-Z0-9_]*HI[A-Z0-9_]*	.sbss.*
+[ 	]*178: R_MIPS_HI16	\.sbss
 0+017c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*17c: [A-Z0-9_]*LO[A-Z0-9_]*	.sbss.*
+[ 	]*17c: R_MIPS_LO16	\.sbss
 0+0180 <[^>]*> lwl	a0,[03]\(at\)
 0+0184 <[^>]*> lwr	a0,[03]\(at\)
 0+0188 <[^>]*> lui	at,0x0
-[ 	]*188: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*188: R_MIPS_HI16	\.data
 0+018c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*18c: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*18c: R_MIPS_LO16	\.data
 0+0190 <[^>]*> lwl	a0,[03]\(at\)
 0+0194 <[^>]*> lwr	a0,[03]\(at\)
 0+0198 <[^>]*> lui	at,0x0
-[ 	]*198: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*198: R_MIPS_HI16	big_external_data_label
 0+019c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*19c: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*19c: R_MIPS_LO16	big_external_data_label
 0+01a0 <[^>]*> lwl	a0,[03]\(at\)
 0+01a4 <[^>]*> lwr	a0,[03]\(at\)
 0+01a8 <[^>]*> lui	at,0x0
-[ 	]*1a8: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_data_label
+[ 	]*1a8: R_MIPS_HI16	small_external_data_label
 0+01ac <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*1ac: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_data_label
+[ 	]*1ac: R_MIPS_LO16	small_external_data_label
 0+01b0 <[^>]*> lwl	a0,[03]\(at\)
 0+01b4 <[^>]*> lwr	a0,[03]\(at\)
 0+01b8 <[^>]*> lui	at,0x0
-[ 	]*1b8: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*1b8: R_MIPS_HI16	big_external_common
 0+01bc <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*1bc: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*1bc: R_MIPS_LO16	big_external_common
 0+01c0 <[^>]*> lwl	a0,[03]\(at\)
 0+01c4 <[^>]*> lwr	a0,[03]\(at\)
 0+01c8 <[^>]*> lui	at,0x0
-[ 	]*1c8: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_common
+[ 	]*1c8: R_MIPS_HI16	small_external_common
 0+01cc <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*1cc: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_common
+[ 	]*1cc: R_MIPS_LO16	small_external_common
 0+01d0 <[^>]*> lwl	a0,[03]\(at\)
 0+01d4 <[^>]*> lwr	a0,[03]\(at\)
 0+01d8 <[^>]*> lui	at,0x0
-[ 	]*1d8: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*1d8: R_MIPS_HI16	\.bss
 0+01dc <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*1dc: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*1dc: R_MIPS_LO16	\.bss
 0+01e0 <[^>]*> lwl	a0,[03]\(at\)
 0+01e4 <[^>]*> lwr	a0,[03]\(at\)
 0+01e8 <[^>]*> lui	at,0x0
-[ 	]*1e8: [A-Z0-9_]*HI[A-Z0-9_]*	.sbss.*
+[ 	]*1e8: R_MIPS_HI16	\.sbss
 0+01ec <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*1ec: [A-Z0-9_]*LO[A-Z0-9_]*	.sbss.*
+[ 	]*1ec: R_MIPS_LO16	\.sbss
 0+01f0 <[^>]*> lwl	a0,[03]\(at\)
 0+01f4 <[^>]*> lwr	a0,[03]\(at\)
 0+01f8 <[^>]*> lui	at,[-0-9x]+
-[ 	]*1f8: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*1f8: R_MIPS_HI16	\.data
 0+01fc <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*1fc: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*1fc: R_MIPS_LO16	\.data
 0+0200 <[^>]*> lwl	a0,[03]\(at\)
 0+0204 <[^>]*> lwr	a0,[03]\(at\)
 0+0208 <[^>]*> lui	at,[-0-9x]+
-[ 	]*208: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*208: R_MIPS_HI16	big_external_data_label
 0+020c <[^>]*> addiu	at,at,0
-[ 	]*20c: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*20c: R_MIPS_LO16	big_external_data_label
 0+0210 <[^>]*> lwl	a0,[03]\(at\)
 0+0214 <[^>]*> lwr	a0,[03]\(at\)
 0+0218 <[^>]*> lui	at,[-0-9x]+
-[ 	]*218: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_data_label
+[ 	]*218: R_MIPS_HI16	small_external_data_label
 0+021c <[^>]*> addiu	at,at,0
-[ 	]*21c: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_data_label
+[ 	]*21c: R_MIPS_LO16	small_external_data_label
 0+0220 <[^>]*> lwl	a0,[03]\(at\)
 0+0224 <[^>]*> lwr	a0,[03]\(at\)
 0+0228 <[^>]*> lui	at,[-0-9x]+
-[ 	]*228: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*228: R_MIPS_HI16	big_external_common
 0+022c <[^>]*> addiu	at,at,0
-[ 	]*22c: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*22c: R_MIPS_LO16	big_external_common
 0+0230 <[^>]*> lwl	a0,[03]\(at\)
 0+0234 <[^>]*> lwr	a0,[03]\(at\)
 0+0238 <[^>]*> lui	at,[-0-9x]+
-[ 	]*238: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_common
+[ 	]*238: R_MIPS_HI16	small_external_common
 0+023c <[^>]*> addiu	at,at,0
-[ 	]*23c: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_common
+[ 	]*23c: R_MIPS_LO16	small_external_common
 0+0240 <[^>]*> lwl	a0,[03]\(at\)
 0+0244 <[^>]*> lwr	a0,[03]\(at\)
 0+0248 <[^>]*> lui	at,[-0-9x]+
-[ 	]*248: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*248: R_MIPS_HI16	\.bss
 0+024c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*24c: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*24c: R_MIPS_LO16	\.bss
 0+0250 <[^>]*> lwl	a0,[03]\(at\)
 0+0254 <[^>]*> lwr	a0,[03]\(at\)
 0+0258 <[^>]*> lui	at,[-0-9x]+
-[ 	]*258: [A-Z0-9_]*HI[A-Z0-9_]*	.sbss.*
+[ 	]*258: R_MIPS_HI16	\.sbss
 0+025c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*25c: [A-Z0-9_]*LO[A-Z0-9_]*	.sbss.*
+[ 	]*25c: R_MIPS_LO16	\.sbss
 0+0260 <[^>]*> lwl	a0,[03]\(at\)
 0+0264 <[^>]*> lwr	a0,[03]\(at\)
 0+0268 <[^>]*> lui	at,[-0-9x]+
-[ 	]*268: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*268: R_MIPS_HI16	\.data
 0+026c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*26c: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*26c: R_MIPS_LO16	\.data
 0+0270 <[^>]*> lwl	a0,[03]\(at\)
 0+0274 <[^>]*> lwr	a0,[03]\(at\)
 0+0278 <[^>]*> lui	at,[-0-9x]+
-[ 	]*278: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*278: R_MIPS_HI16	big_external_data_label
 0+027c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*27c: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*27c: R_MIPS_LO16	big_external_data_label
 0+0280 <[^>]*> lwl	a0,[03]\(at\)
 0+0284 <[^>]*> lwr	a0,[03]\(at\)
 0+0288 <[^>]*> lui	at,[-0-9x]+
-[ 	]*288: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_data_label
+[ 	]*288: R_MIPS_HI16	small_external_data_label
 0+028c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*28c: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_data_label
+[ 	]*28c: R_MIPS_LO16	small_external_data_label
 0+0290 <[^>]*> lwl	a0,[03]\(at\)
 0+0294 <[^>]*> lwr	a0,[03]\(at\)
 0+0298 <[^>]*> lui	at,[-0-9x]+
-[ 	]*298: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*298: R_MIPS_HI16	big_external_common
 0+029c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*29c: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*29c: R_MIPS_LO16	big_external_common
 0+02a0 <[^>]*> lwl	a0,[03]\(at\)
 0+02a4 <[^>]*> lwr	a0,[03]\(at\)
 0+02a8 <[^>]*> lui	at,[-0-9x]+
-[ 	]*2a8: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_common
+[ 	]*2a8: R_MIPS_HI16	small_external_common
 0+02ac <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*2ac: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_common
+[ 	]*2ac: R_MIPS_LO16	small_external_common
 0+02b0 <[^>]*> lwl	a0,[03]\(at\)
 0+02b4 <[^>]*> lwr	a0,[03]\(at\)
 0+02b8 <[^>]*> lui	at,[-0-9x]+
-[ 	]*2b8: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*2b8: R_MIPS_HI16	\.bss
 0+02bc <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*2bc: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*2bc: R_MIPS_LO16	\.bss
 0+02c0 <[^>]*> lwl	a0,[03]\(at\)
 0+02c4 <[^>]*> lwr	a0,[03]\(at\)
 0+02c8 <[^>]*> lui	at,[-0-9x]+
-[ 	]*2c8: [A-Z0-9_]*HI[A-Z0-9_]*	.sbss.*
+[ 	]*2c8: R_MIPS_HI16	\.sbss
 0+02cc <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*2cc: [A-Z0-9_]*LO[A-Z0-9_]*	.sbss.*
+[ 	]*2cc: R_MIPS_LO16	\.sbss
 0+02d0 <[^>]*> lwl	a0,[03]\(at\)
 0+02d4 <[^>]*> lwr	a0,[03]\(at\)
 	...
diff --git a/gas/testsuite/gas/mips/usd.d b/gas/testsuite/gas/mips/usd.d
index 23855bb..9e07d5d 100644
--- a/gas/testsuite/gas/mips/usd.d
+++ b/gas/testsuite/gas/mips/usd.d
@@ -28,243 +28,243 @@ Disassembly of section .text:
 0+0048 <[^>]*> sdl	a0,[18]\(a1\)
 0+004c <[^>]*> sdr	a0,[-0-9]+\(a1\)
 0+0050 <[^>]*> lui	at,[-0-9x]+
-[ 	]*50: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*50: R_MIPS_HI16	\.data
 0+0054 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*54: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*54: R_MIPS_LO16	\.data
 0+0058 <[^>]*> sdl	a0,[07]\(at\)
 0+005c <[^>]*> sdr	a0,[07]\(at\)
 0+0060 <[^>]*> lui	at,[-0-9x]+
-[ 	]*60: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*60: R_MIPS_HI16	big_external_data_label
 0+0064 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*64: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*64: R_MIPS_LO16	big_external_data_label
 0+0068 <[^>]*> sdl	a0,[07]\(at\)
 0+006c <[^>]*> sdr	a0,[07]\(at\)
 0+0070 <[^>]*> addiu	at,gp,0
-[ 	]*70: [A-Z0-9_]*GPREL[A-Z0-9_]*	small_external_data_label
+[ 	]*70: R_MIPS_GPREL16	small_external_data_label
 0+0074 <[^>]*> sdl	a0,[07]\(at\)
 0+0078 <[^>]*> sdr	a0,[07]\(at\)
 0+007c <[^>]*> lui	at,0x0
-[ 	]*7c: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*7c: R_MIPS_HI16	big_external_common
 0+0080 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*80: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*80: R_MIPS_LO16	big_external_common
 0+0084 <[^>]*> sdl	a0,[07]\(at\)
 0+0088 <[^>]*> sdr	a0,[07]\(at\)
 0+008c <[^>]*> addiu	at,gp,0
-[ 	]*8c: [A-Z0-9_]*GPREL[A-Z0-9_]*	small_external_common
+[ 	]*8c: R_MIPS_GPREL16	small_external_common
 0+0090 <[^>]*> sdl	a0,[07]\(at\)
 0+0094 <[^>]*> sdr	a0,[07]\(at\)
 0+0098 <[^>]*> lui	at,[-0-9x]+
-[ 	]*98: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*98: R_MIPS_HI16	\.bss
 0+009c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*9c: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*9c: R_MIPS_LO16	\.bss
 0+00a0 <[^>]*> sdl	a0,[07]\(at\)
 0+00a4 <[^>]*> sdr	a0,[07]\(at\)
 0+00a8 <[^>]*> addiu	at,gp,[-0-9]+
-[ 	]*a8: [A-Z0-9_]*GPREL[A-Z0-9_]*	.sbss.*
+[ 	]*a8: R_MIPS_GPREL16	\.sbss
 0+00ac <[^>]*> sdl	a0,[07]\(at\)
 0+00b0 <[^>]*> sdr	a0,[07]\(at\)
 0+00b4 <[^>]*> lui	at,0x0
-[ 	]*b4: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*b4: R_MIPS_HI16	\.data
 0+00b8 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*b8: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*b8: R_MIPS_LO16	\.data
 0+00bc <[^>]*> sdl	a0,[07]\(at\)
 0+00c0 <[^>]*> sdr	a0,[07]\(at\)
 0+00c4 <[^>]*> lui	at,0x0
-[ 	]*c4: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*c4: R_MIPS_HI16	big_external_data_label
 0+00c8 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*c8: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*c8: R_MIPS_LO16	big_external_data_label
 0+00cc <[^>]*> sdl	a0,[07]\(at\)
 0+00d0 <[^>]*> sdr	a0,[07]\(at\)
 0+00d4 <[^>]*> addiu	at,gp,1
-[ 	]*d4: [A-Z0-9_]*GPREL[A-Z0-9_]*	small_external_data_label
+[ 	]*d4: R_MIPS_GPREL16	small_external_data_label
 0+00d8 <[^>]*> sdl	a0,[07]\(at\)
 0+00dc <[^>]*> sdr	a0,[07]\(at\)
 0+00e0 <[^>]*> lui	at,0x0
-[ 	]*e0: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*e0: R_MIPS_HI16	big_external_common
 0+00e4 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*e4: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*e4: R_MIPS_LO16	big_external_common
 0+00e8 <[^>]*> sdl	a0,[07]\(at\)
 0+00ec <[^>]*> sdr	a0,[07]\(at\)
 0+00f0 <[^>]*> addiu	at,gp,1
-[ 	]*f0: [A-Z0-9_]*GPREL[A-Z0-9_]*	small_external_common
+[ 	]*f0: R_MIPS_GPREL16	small_external_common
 0+00f4 <[^>]*> sdl	a0,[07]\(at\)
 0+00f8 <[^>]*> sdr	a0,[07]\(at\)
 0+00fc <[^>]*> lui	at,0x0
-[ 	]*fc: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*fc: R_MIPS_HI16	\.bss
 0+0100 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*100: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*100: R_MIPS_LO16	\.bss
 0+0104 <[^>]*> sdl	a0,[07]\(at\)
 0+0108 <[^>]*> sdr	a0,[07]\(at\)
 0+010c <[^>]*> addiu	at,gp,[-0-9]+
-[ 	]*10c: [A-Z0-9_]*GPREL[A-Z0-9_]*	.sbss.*
+[ 	]*10c: R_MIPS_GPREL16	\.sbss
 0+0110 <[^>]*> sdl	a0,[07]\(at\)
 0+0114 <[^>]*> sdr	a0,[07]\(at\)
 0+0118 <[^>]*> lui	at,[-0-9x]+
-[ 	]*118: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*118: R_MIPS_HI16	\.data
 0+011c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*11c: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*11c: R_MIPS_LO16	\.data
 0+0120 <[^>]*> sdl	a0,[07]\(at\)
 0+0124 <[^>]*> sdr	a0,[07]\(at\)
 0+0128 <[^>]*> lui	at,[-0-9x]+
-[ 	]*128: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*128: R_MIPS_HI16	big_external_data_label
 0+012c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*12c: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*12c: R_MIPS_LO16	big_external_data_label
 0+0130 <[^>]*> sdl	a0,[07]\(at\)
 0+0134 <[^>]*> sdr	a0,[07]\(at\)
 0+0138 <[^>]*> lui	at,[-0-9x]+
-[ 	]*138: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_data_label
+[ 	]*138: R_MIPS_HI16	small_external_data_label
 0+013c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*13c: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_data_label
+[ 	]*13c: R_MIPS_LO16	small_external_data_label
 0+0140 <[^>]*> sdl	a0,[07]\(at\)
 0+0144 <[^>]*> sdr	a0,[07]\(at\)
 0+0148 <[^>]*> lui	at,[-0-9x]+
-[ 	]*148: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*148: R_MIPS_HI16	big_external_common
 0+014c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*14c: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*14c: R_MIPS_LO16	big_external_common
 0+0150 <[^>]*> sdl	a0,[07]\(at\)
 0+0154 <[^>]*> sdr	a0,[07]\(at\)
 0+0158 <[^>]*> lui	at,[-0-9x]+
-[ 	]*158: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_common
+[ 	]*158: R_MIPS_HI16	small_external_common
 0+015c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*15c: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_common
+[ 	]*15c: R_MIPS_LO16	small_external_common
 0+0160 <[^>]*> sdl	a0,[07]\(at\)
 0+0164 <[^>]*> sdr	a0,[07]\(at\)
 0+0168 <[^>]*> lui	at,[-0-9x]+
-[ 	]*168: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*168: R_MIPS_HI16	\.bss
 0+016c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*16c: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*16c: R_MIPS_LO16	\.bss
 0+0170 <[^>]*> sdl	a0,[07]\(at\)
 0+0174 <[^>]*> sdr	a0,[07]\(at\)
 0+0178 <[^>]*> lui	at,[-0-9x]+
-[ 	]*178: [A-Z0-9_]*HI[A-Z0-9_]*	.sbss.*
+[ 	]*178: R_MIPS_HI16	\.sbss
 0+017c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*17c: [A-Z0-9_]*LO[A-Z0-9_]*	.sbss.*
+[ 	]*17c: R_MIPS_LO16	\.sbss
 0+0180 <[^>]*> sdl	a0,[07]\(at\)
 0+0184 <[^>]*> sdr	a0,[07]\(at\)
 0+0188 <[^>]*> lui	at,0x0
-[ 	]*188: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*188: R_MIPS_HI16	\.data
 0+018c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*18c: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*18c: R_MIPS_LO16	\.data
 0+0190 <[^>]*> sdl	a0,[07]\(at\)
 0+0194 <[^>]*> sdr	a0,[07]\(at\)
 0+0198 <[^>]*> lui	at,0x0
-[ 	]*198: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*198: R_MIPS_HI16	big_external_data_label
 0+019c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*19c: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*19c: R_MIPS_LO16	big_external_data_label
 0+01a0 <[^>]*> sdl	a0,[07]\(at\)
 0+01a4 <[^>]*> sdr	a0,[07]\(at\)
 0+01a8 <[^>]*> lui	at,0x0
-[ 	]*1a8: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_data_label
+[ 	]*1a8: R_MIPS_HI16	small_external_data_label
 0+01ac <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*1ac: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_data_label
+[ 	]*1ac: R_MIPS_LO16	small_external_data_label
 0+01b0 <[^>]*> sdl	a0,[07]\(at\)
 0+01b4 <[^>]*> sdr	a0,[07]\(at\)
 0+01b8 <[^>]*> lui	at,0x0
-[ 	]*1b8: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*1b8: R_MIPS_HI16	big_external_common
 0+01bc <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*1bc: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*1bc: R_MIPS_LO16	big_external_common
 0+01c0 <[^>]*> sdl	a0,[07]\(at\)
 0+01c4 <[^>]*> sdr	a0,[07]\(at\)
 0+01c8 <[^>]*> lui	at,0x0
-[ 	]*1c8: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_common
+[ 	]*1c8: R_MIPS_HI16	small_external_common
 0+01cc <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*1cc: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_common
+[ 	]*1cc: R_MIPS_LO16	small_external_common
 0+01d0 <[^>]*> sdl	a0,[07]\(at\)
 0+01d4 <[^>]*> sdr	a0,[07]\(at\)
 0+01d8 <[^>]*> lui	at,0x0
-[ 	]*1d8: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*1d8: R_MIPS_HI16	\.bss
 0+01dc <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*1dc: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*1dc: R_MIPS_LO16	\.bss
 0+01e0 <[^>]*> sdl	a0,[07]\(at\)
 0+01e4 <[^>]*> sdr	a0,[07]\(at\)
 0+01e8 <[^>]*> lui	at,0x0
-[ 	]*1e8: [A-Z0-9_]*HI[A-Z0-9_]*	.sbss.*
+[ 	]*1e8: R_MIPS_HI16	\.sbss
 0+01ec <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*1ec: [A-Z0-9_]*LO[A-Z0-9_]*	.sbss.*
+[ 	]*1ec: R_MIPS_LO16	\.sbss
 0+01f0 <[^>]*> sdl	a0,[07]\(at\)
 0+01f4 <[^>]*> sdr	a0,[07]\(at\)
 0+01f8 <[^>]*> lui	at,[-0-9x]+
-[ 	]*1f8: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*1f8: R_MIPS_HI16	\.data
 0+01fc <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*1fc: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*1fc: R_MIPS_LO16	\.data
 0+0200 <[^>]*> sdl	a0,[07]\(at\)
 0+0204 <[^>]*> sdr	a0,[07]\(at\)
 0+0208 <[^>]*> lui	at,[-0-9x]+
-[ 	]*208: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*208: R_MIPS_HI16	big_external_data_label
 0+020c <[^>]*> addiu	at,at,0
-[ 	]*20c: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*20c: R_MIPS_LO16	big_external_data_label
 0+0210 <[^>]*> sdl	a0,[07]\(at\)
 0+0214 <[^>]*> sdr	a0,[07]\(at\)
 0+0218 <[^>]*> lui	at,[-0-9x]+
-[ 	]*218: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_data_label
+[ 	]*218: R_MIPS_HI16	small_external_data_label
 0+021c <[^>]*> addiu	at,at,0
-[ 	]*21c: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_data_label
+[ 	]*21c: R_MIPS_LO16	small_external_data_label
 0+0220 <[^>]*> sdl	a0,[07]\(at\)
 0+0224 <[^>]*> sdr	a0,[07]\(at\)
 0+0228 <[^>]*> lui	at,[-0-9x]+
-[ 	]*228: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*228: R_MIPS_HI16	big_external_common
 0+022c <[^>]*> addiu	at,at,0
-[ 	]*22c: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*22c: R_MIPS_LO16	big_external_common
 0+0230 <[^>]*> sdl	a0,[07]\(at\)
 0+0234 <[^>]*> sdr	a0,[07]\(at\)
 0+0238 <[^>]*> lui	at,[-0-9x]+
-[ 	]*238: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_common
+[ 	]*238: R_MIPS_HI16	small_external_common
 0+023c <[^>]*> addiu	at,at,0
-[ 	]*23c: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_common
+[ 	]*23c: R_MIPS_LO16	small_external_common
 0+0240 <[^>]*> sdl	a0,[07]\(at\)
 0+0244 <[^>]*> sdr	a0,[07]\(at\)
 0+0248 <[^>]*> lui	at,[-0-9x]+
-[ 	]*248: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*248: R_MIPS_HI16	\.bss
 0+024c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*24c: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*24c: R_MIPS_LO16	\.bss
 0+0250 <[^>]*> sdl	a0,[07]\(at\)
 0+0254 <[^>]*> sdr	a0,[07]\(at\)
 0+0258 <[^>]*> lui	at,[-0-9x]+
-[ 	]*258: [A-Z0-9_]*HI[A-Z0-9_]*	.sbss.*
+[ 	]*258: R_MIPS_HI16	\.sbss
 0+025c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*25c: [A-Z0-9_]*LO[A-Z0-9_]*	.sbss.*
+[ 	]*25c: R_MIPS_LO16	\.sbss
 0+0260 <[^>]*> sdl	a0,[07]\(at\)
 0+0264 <[^>]*> sdr	a0,[07]\(at\)
 0+0268 <[^>]*> lui	at,[-0-9x]+
-[ 	]*268: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*268: R_MIPS_HI16	\.data
 0+026c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*26c: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*26c: R_MIPS_LO16	\.data
 0+0270 <[^>]*> sdl	a0,[07]\(at\)
 0+0274 <[^>]*> sdr	a0,[07]\(at\)
 0+0278 <[^>]*> lui	at,[-0-9x]+
-[ 	]*278: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*278: R_MIPS_HI16	big_external_data_label
 0+027c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*27c: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*27c: R_MIPS_LO16	big_external_data_label
 0+0280 <[^>]*> sdl	a0,[07]\(at\)
 0+0284 <[^>]*> sdr	a0,[07]\(at\)
 0+0288 <[^>]*> lui	at,[-0-9x]+
-[ 	]*288: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_data_label
+[ 	]*288: R_MIPS_HI16	small_external_data_label
 0+028c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*28c: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_data_label
+[ 	]*28c: R_MIPS_LO16	small_external_data_label
 0+0290 <[^>]*> sdl	a0,[07]\(at\)
 0+0294 <[^>]*> sdr	a0,[07]\(at\)
 0+0298 <[^>]*> lui	at,[-0-9x]+
-[ 	]*298: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*298: R_MIPS_HI16	big_external_common
 0+029c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*29c: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*29c: R_MIPS_LO16	big_external_common
 0+02a0 <[^>]*> sdl	a0,[07]\(at\)
 0+02a4 <[^>]*> sdr	a0,[07]\(at\)
 0+02a8 <[^>]*> lui	at,[-0-9x]+
-[ 	]*2a8: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_common
+[ 	]*2a8: R_MIPS_HI16	small_external_common
 0+02ac <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*2ac: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_common
+[ 	]*2ac: R_MIPS_LO16	small_external_common
 0+02b0 <[^>]*> sdl	a0,[07]\(at\)
 0+02b4 <[^>]*> sdr	a0,[07]\(at\)
 0+02b8 <[^>]*> lui	at,[-0-9x]+
-[ 	]*2b8: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*2b8: R_MIPS_HI16	\.bss
 0+02bc <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*2bc: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*2bc: R_MIPS_LO16	\.bss
 0+02c0 <[^>]*> sdl	a0,[07]\(at\)
 0+02c4 <[^>]*> sdr	a0,[07]\(at\)
 0+02c8 <[^>]*> lui	at,[-0-9x]+
-[ 	]*2c8: [A-Z0-9_]*HI[A-Z0-9_]*	.sbss.*
+[ 	]*2c8: R_MIPS_HI16	\.sbss
 0+02cc <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*2cc: [A-Z0-9_]*LO[A-Z0-9_]*	.sbss.*
+[ 	]*2cc: R_MIPS_LO16	\.sbss
 0+02d0 <[^>]*> sdl	a0,[07]\(at\)
 0+02d4 <[^>]*> sdr	a0,[07]\(at\)
 	...
diff --git a/gas/testsuite/gas/mips/ush.d b/gas/testsuite/gas/mips/ush.d
index c2d95f2..9580999 100644
--- a/gas/testsuite/gas/mips/ush.d
+++ b/gas/testsuite/gas/mips/ush.d
@@ -45,9 +45,9 @@ Disassembly of section .text:
 0+008c <[^>]*> srl	at,a0,0x8
 0+0090 <[^>]*> sb	at,[12]\(a1\)
 0+0094 <[^>]*> lui	at,[-0-9x]+
-[ 	]*94: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*94: R_MIPS_HI16	\.data
 0+0098 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*98: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*98: R_MIPS_LO16	\.data
 0+009c <[^>]*> sb	a0,[01]\(at\)
 0+00a0 <[^>]*> srl	a0,a0,0x8
 0+00a4 <[^>]*> sb	a0,[01]\(at\)
@@ -55,9 +55,9 @@ Disassembly of section .text:
 0+00ac <[^>]*> sll	a0,a0,0x8
 0+00b0 <[^>]*> or	a0,a0,at
 0+00b4 <[^>]*> lui	at,0x0
-[ 	]*b4: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*b4: R_MIPS_HI16	big_external_data_label
 0+00b8 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*b8: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*b8: R_MIPS_LO16	big_external_data_label
 0+00bc <[^>]*> sb	a0,[01]\(at\)
 0+00c0 <[^>]*> srl	a0,a0,0x8
 0+00c4 <[^>]*> sb	a0,[01]\(at\)
@@ -65,7 +65,7 @@ Disassembly of section .text:
 0+00cc <[^>]*> sll	a0,a0,0x8
 0+00d0 <[^>]*> or	a0,a0,at
 0+00d4 <[^>]*> addiu	at,gp,0
-[ 	]*d4: [A-Z0-9_]*GPREL[A-Z0-9_]*	small_external_data_label
+[ 	]*d4: R_MIPS_GPREL16	small_external_data_label
 0+00d8 <[^>]*> sb	a0,[01]\(at\)
 0+00dc <[^>]*> srl	a0,a0,0x8
 0+00e0 <[^>]*> sb	a0,[01]\(at\)
@@ -73,9 +73,9 @@ Disassembly of section .text:
 0+00e8 <[^>]*> sll	a0,a0,0x8
 0+00ec <[^>]*> or	a0,a0,at
 0+00f0 <[^>]*> lui	at,[-0-9x]+
-[ 	]*f0: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*f0: R_MIPS_HI16	big_external_common
 0+00f4 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*f4: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*f4: R_MIPS_LO16	big_external_common
 0+00f8 <[^>]*> sb	a0,[01]\(at\)
 0+00fc <[^>]*> srl	a0,a0,0x8
 0+0100 <[^>]*> sb	a0,[01]\(at\)
@@ -83,7 +83,7 @@ Disassembly of section .text:
 0+0108 <[^>]*> sll	a0,a0,0x8
 0+010c <[^>]*> or	a0,a0,at
 0+0110 <[^>]*> addiu	at,gp,0
-[ 	]*110: [A-Z0-9_]*GPREL[A-Z0-9_]*	small_external_common
+[ 	]*110: R_MIPS_GPREL16	small_external_common
 0+0114 <[^>]*> sb	a0,[01]\(at\)
 0+0118 <[^>]*> srl	a0,a0,0x8
 0+011c <[^>]*> sb	a0,[01]\(at\)
@@ -91,9 +91,9 @@ Disassembly of section .text:
 0+0124 <[^>]*> sll	a0,a0,0x8
 0+0128 <[^>]*> or	a0,a0,at
 0+012c <[^>]*> lui	at,[-0-9x]+
-[ 	]*12c: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*12c: R_MIPS_HI16	\.bss
 0+0130 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*130: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*130: R_MIPS_LO16	\.bss
 0+0134 <[^>]*> sb	a0,[01]\(at\)
 0+0138 <[^>]*> srl	a0,a0,0x8
 0+013c <[^>]*> sb	a0,[01]\(at\)
@@ -101,7 +101,7 @@ Disassembly of section .text:
 0+0144 <[^>]*> sll	a0,a0,0x8
 0+0148 <[^>]*> or	a0,a0,at
 0+014c <[^>]*> addiu	at,gp,[-0-9]+
-[ 	]*14c: [A-Z0-9_]*GPREL[A-Z0-9_]*	.sbss.*
+[ 	]*14c: R_MIPS_GPREL16	\.sbss
 0+0150 <[^>]*> sb	a0,[01]\(at\)
 0+0154 <[^>]*> srl	a0,a0,0x8
 0+0158 <[^>]*> sb	a0,[01]\(at\)
@@ -109,9 +109,9 @@ Disassembly of section .text:
 0+0160 <[^>]*> sll	a0,a0,0x8
 0+0164 <[^>]*> or	a0,a0,at
 0+0168 <[^>]*> lui	at,0x0
-[ 	]*168: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*168: R_MIPS_HI16	\.data
 0+016c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*16c: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*16c: R_MIPS_LO16	\.data
 0+0170 <[^>]*> sb	a0,[01]\(at\)
 0+0174 <[^>]*> srl	a0,a0,0x8
 0+0178 <[^>]*> sb	a0,[01]\(at\)
@@ -119,9 +119,9 @@ Disassembly of section .text:
 0+0180 <[^>]*> sll	a0,a0,0x8
 0+0184 <[^>]*> or	a0,a0,at
 0+0188 <[^>]*> lui	at,0x0
-[ 	]*188: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*188: R_MIPS_HI16	big_external_data_label
 0+018c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*18c: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*18c: R_MIPS_LO16	big_external_data_label
 0+0190 <[^>]*> sb	a0,[01]\(at\)
 0+0194 <[^>]*> srl	a0,a0,0x8
 0+0198 <[^>]*> sb	a0,[01]\(at\)
@@ -129,7 +129,7 @@ Disassembly of section .text:
 0+01a0 <[^>]*> sll	a0,a0,0x8
 0+01a4 <[^>]*> or	a0,a0,at
 0+01a8 <[^>]*> addiu	at,gp,1
-[ 	]*1a8: [A-Z0-9_]*GPREL[A-Z0-9_]*	small_external_data_label
+[ 	]*1a8: R_MIPS_GPREL16	small_external_data_label
 0+01ac <[^>]*> sb	a0,[01]\(at\)
 0+01b0 <[^>]*> srl	a0,a0,0x8
 0+01b4 <[^>]*> sb	a0,[01]\(at\)
@@ -137,9 +137,9 @@ Disassembly of section .text:
 0+01bc <[^>]*> sll	a0,a0,0x8
 0+01c0 <[^>]*> or	a0,a0,at
 0+01c4 <[^>]*> lui	at,0x0
-[ 	]*1c4: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*1c4: R_MIPS_HI16	big_external_common
 0+01c8 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*1c8: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*1c8: R_MIPS_LO16	big_external_common
 0+01cc <[^>]*> sb	a0,[01]\(at\)
 0+01d0 <[^>]*> srl	a0,a0,0x8
 0+01d4 <[^>]*> sb	a0,[01]\(at\)
@@ -147,7 +147,7 @@ Disassembly of section .text:
 0+01dc <[^>]*> sll	a0,a0,0x8
 0+01e0 <[^>]*> or	a0,a0,at
 0+01e4 <[^>]*> addiu	at,gp,1
-[ 	]*1e4: [A-Z0-9_]*GPREL[A-Z0-9_]*	small_external_common
+[ 	]*1e4: R_MIPS_GPREL16	small_external_common
 0+01e8 <[^>]*> sb	a0,[01]\(at\)
 0+01ec <[^>]*> srl	a0,a0,0x8
 0+01f0 <[^>]*> sb	a0,[01]\(at\)
@@ -155,9 +155,9 @@ Disassembly of section .text:
 0+01f8 <[^>]*> sll	a0,a0,0x8
 0+01fc <[^>]*> or	a0,a0,at
 0+0200 <[^>]*> lui	at,0x0
-[ 	]*200: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*200: R_MIPS_HI16	\.bss
 0+0204 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*204: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*204: R_MIPS_LO16	\.bss
 0+0208 <[^>]*> sb	a0,[01]\(at\)
 0+020c <[^>]*> srl	a0,a0,0x8
 0+0210 <[^>]*> sb	a0,[01]\(at\)
@@ -165,7 +165,7 @@ Disassembly of section .text:
 0+0218 <[^>]*> sll	a0,a0,0x8
 0+021c <[^>]*> or	a0,a0,at
 0+0220 <[^>]*> addiu	at,gp,[-0-9]+
-[ 	]*220: [A-Z0-9_]*GPREL[A-Z0-9_]*	.sbss.*
+[ 	]*220: R_MIPS_GPREL16	\.sbss
 0+0224 <[^>]*> sb	a0,[01]\(at\)
 0+0228 <[^>]*> srl	a0,a0,0x8
 0+022c <[^>]*> sb	a0,[01]\(at\)
@@ -173,9 +173,9 @@ Disassembly of section .text:
 0+0234 <[^>]*> sll	a0,a0,0x8
 0+0238 <[^>]*> or	a0,a0,at
 0+023c <[^>]*> lui	at,[-0-9x]+
-[ 	]*23c: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*23c: R_MIPS_HI16	\.data
 0+0240 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*240: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*240: R_MIPS_LO16	\.data
 0+0244 <[^>]*> sb	a0,[01]\(at\)
 0+0248 <[^>]*> srl	a0,a0,0x8
 0+024c <[^>]*> sb	a0,[01]\(at\)
@@ -183,9 +183,9 @@ Disassembly of section .text:
 0+0254 <[^>]*> sll	a0,a0,0x8
 0+0258 <[^>]*> or	a0,a0,at
 0+025c <[^>]*> lui	at,[-0-9x]+
-[ 	]*25c: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*25c: R_MIPS_HI16	big_external_data_label
 0+0260 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*260: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*260: R_MIPS_LO16	big_external_data_label
 0+0264 <[^>]*> sb	a0,[01]\(at\)
 0+0268 <[^>]*> srl	a0,a0,0x8
 0+026c <[^>]*> sb	a0,[01]\(at\)
@@ -193,9 +193,9 @@ Disassembly of section .text:
 0+0274 <[^>]*> sll	a0,a0,0x8
 0+0278 <[^>]*> or	a0,a0,at
 0+027c <[^>]*> lui	at,[-0-9x]+
-[ 	]*27c: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_data_label
+[ 	]*27c: R_MIPS_HI16	small_external_data_label
 0+0280 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*280: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_data_label
+[ 	]*280: R_MIPS_LO16	small_external_data_label
 0+0284 <[^>]*> sb	a0,[01]\(at\)
 0+0288 <[^>]*> srl	a0,a0,0x8
 0+028c <[^>]*> sb	a0,[01]\(at\)
@@ -203,9 +203,9 @@ Disassembly of section .text:
 0+0294 <[^>]*> sll	a0,a0,0x8
 0+0298 <[^>]*> or	a0,a0,at
 0+029c <[^>]*> lui	at,[-0-9x]+
-[ 	]*29c: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*29c: R_MIPS_HI16	big_external_common
 0+02a0 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*2a0: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*2a0: R_MIPS_LO16	big_external_common
 0+02a4 <[^>]*> sb	a0,[01]\(at\)
 0+02a8 <[^>]*> srl	a0,a0,0x8
 0+02ac <[^>]*> sb	a0,[01]\(at\)
@@ -213,9 +213,9 @@ Disassembly of section .text:
 0+02b4 <[^>]*> sll	a0,a0,0x8
 0+02b8 <[^>]*> or	a0,a0,at
 0+02bc <[^>]*> lui	at,[-0-9x]+
-[ 	]*2bc: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_common
+[ 	]*2bc: R_MIPS_HI16	small_external_common
 0+02c0 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*2c0: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_common
+[ 	]*2c0: R_MIPS_LO16	small_external_common
 0+02c4 <[^>]*> sb	a0,[01]\(at\)
 0+02c8 <[^>]*> srl	a0,a0,0x8
 0+02cc <[^>]*> sb	a0,[01]\(at\)
@@ -223,9 +223,9 @@ Disassembly of section .text:
 0+02d4 <[^>]*> sll	a0,a0,0x8
 0+02d8 <[^>]*> or	a0,a0,at
 0+02dc <[^>]*> lui	at,[-0-9x]+
-[ 	]*2dc: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*2dc: R_MIPS_HI16	\.bss
 0+02e0 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*2e0: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*2e0: R_MIPS_LO16	\.bss
 0+02e4 <[^>]*> sb	a0,[01]\(at\)
 0+02e8 <[^>]*> srl	a0,a0,0x8
 0+02ec <[^>]*> sb	a0,[01]\(at\)
@@ -233,9 +233,9 @@ Disassembly of section .text:
 0+02f4 <[^>]*> sll	a0,a0,0x8
 0+02f8 <[^>]*> or	a0,a0,at
 0+02fc <[^>]*> lui	at,[-0-9x]+
-[ 	]*2fc: [A-Z0-9_]*HI[A-Z0-9_]*	.sbss.*
+[ 	]*2fc: R_MIPS_HI16	\.sbss
 0+0300 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*300: [A-Z0-9_]*LO[A-Z0-9_]*	.sbss.*
+[ 	]*300: R_MIPS_LO16	\.sbss
 0+0304 <[^>]*> sb	a0,[01]\(at\)
 0+0308 <[^>]*> srl	a0,a0,0x8
 0+030c <[^>]*> sb	a0,[01]\(at\)
@@ -243,9 +243,9 @@ Disassembly of section .text:
 0+0314 <[^>]*> sll	a0,a0,0x8
 0+0318 <[^>]*> or	a0,a0,at
 0+031c <[^>]*> lui	at,0x0
-[ 	]*31c: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*31c: R_MIPS_HI16	\.data
 0+0320 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*320: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*320: R_MIPS_LO16	\.data
 0+0324 <[^>]*> sb	a0,[01]\(at\)
 0+0328 <[^>]*> srl	a0,a0,0x8
 0+032c <[^>]*> sb	a0,[01]\(at\)
@@ -253,9 +253,9 @@ Disassembly of section .text:
 0+0334 <[^>]*> sll	a0,a0,0x8
 0+0338 <[^>]*> or	a0,a0,at
 0+033c <[^>]*> lui	at,0x0
-[ 	]*33c: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*33c: R_MIPS_HI16	big_external_data_label
 0+0340 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*340: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*340: R_MIPS_LO16	big_external_data_label
 0+0344 <[^>]*> sb	a0,[01]\(at\)
 0+0348 <[^>]*> srl	a0,a0,0x8
 0+034c <[^>]*> sb	a0,[01]\(at\)
@@ -263,9 +263,9 @@ Disassembly of section .text:
 0+0354 <[^>]*> sll	a0,a0,0x8
 0+0358 <[^>]*> or	a0,a0,at
 0+035c <[^>]*> lui	at,0x0
-[ 	]*35c: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_data_label
+[ 	]*35c: R_MIPS_HI16	small_external_data_label
 0+0360 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*360: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_data_label
+[ 	]*360: R_MIPS_LO16	small_external_data_label
 0+0364 <[^>]*> sb	a0,[01]\(at\)
 0+0368 <[^>]*> srl	a0,a0,0x8
 0+036c <[^>]*> sb	a0,[01]\(at\)
@@ -273,9 +273,9 @@ Disassembly of section .text:
 0+0374 <[^>]*> sll	a0,a0,0x8
 0+0378 <[^>]*> or	a0,a0,at
 0+037c <[^>]*> lui	at,0x0
-[ 	]*37c: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*37c: R_MIPS_HI16	big_external_common
 0+0380 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*380: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*380: R_MIPS_LO16	big_external_common
 0+0384 <[^>]*> sb	a0,[01]\(at\)
 0+0388 <[^>]*> srl	a0,a0,0x8
 0+038c <[^>]*> sb	a0,[01]\(at\)
@@ -283,9 +283,9 @@ Disassembly of section .text:
 0+0394 <[^>]*> sll	a0,a0,0x8
 0+0398 <[^>]*> or	a0,a0,at
 0+039c <[^>]*> lui	at,0x0
-[ 	]*39c: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_common
+[ 	]*39c: R_MIPS_HI16	small_external_common
 0+03a0 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*3a0: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_common
+[ 	]*3a0: R_MIPS_LO16	small_external_common
 0+03a4 <[^>]*> sb	a0,[01]\(at\)
 0+03a8 <[^>]*> srl	a0,a0,0x8
 0+03ac <[^>]*> sb	a0,[01]\(at\)
@@ -293,9 +293,9 @@ Disassembly of section .text:
 0+03b4 <[^>]*> sll	a0,a0,0x8
 0+03b8 <[^>]*> or	a0,a0,at
 0+03bc <[^>]*> lui	at,0x0
-[ 	]*3bc: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*3bc: R_MIPS_HI16	\.bss
 0+03c0 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*3c0: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*3c0: R_MIPS_LO16	\.bss
 0+03c4 <[^>]*> sb	a0,[01]\(at\)
 0+03c8 <[^>]*> srl	a0,a0,0x8
 0+03cc <[^>]*> sb	a0,[01]\(at\)
@@ -303,9 +303,9 @@ Disassembly of section .text:
 0+03d4 <[^>]*> sll	a0,a0,0x8
 0+03d8 <[^>]*> or	a0,a0,at
 0+03dc <[^>]*> lui	at,0x0
-[ 	]*3dc: [A-Z0-9_]*HI[A-Z0-9_]*	.sbss.*
+[ 	]*3dc: R_MIPS_HI16	\.sbss
 0+03e0 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*3e0: [A-Z0-9_]*LO[A-Z0-9_]*	.sbss.*
+[ 	]*3e0: R_MIPS_LO16	\.sbss
 0+03e4 <[^>]*> sb	a0,[01]\(at\)
 0+03e8 <[^>]*> srl	a0,a0,0x8
 0+03ec <[^>]*> sb	a0,[01]\(at\)
@@ -313,9 +313,9 @@ Disassembly of section .text:
 0+03f4 <[^>]*> sll	a0,a0,0x8
 0+03f8 <[^>]*> or	a0,a0,at
 0+03fc <[^>]*> lui	at,[-0-9x]+
-[ 	]*3fc: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*3fc: R_MIPS_HI16	\.data
 0+0400 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*400: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*400: R_MIPS_LO16	\.data
 0+0404 <[^>]*> sb	a0,[01]\(at\)
 0+0408 <[^>]*> srl	a0,a0,0x8
 0+040c <[^>]*> sb	a0,[01]\(at\)
@@ -323,9 +323,9 @@ Disassembly of section .text:
 0+0414 <[^>]*> sll	a0,a0,0x8
 0+0418 <[^>]*> or	a0,a0,at
 0+041c <[^>]*> lui	at,[-0-9x]+
-[ 	]*41c: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*41c: R_MIPS_HI16	big_external_data_label
 0+0420 <[^>]*> addiu	at,at,0
-[ 	]*420: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*420: R_MIPS_LO16	big_external_data_label
 0+0424 <[^>]*> sb	a0,[01]\(at\)
 0+0428 <[^>]*> srl	a0,a0,0x8
 0+042c <[^>]*> sb	a0,[01]\(at\)
@@ -333,9 +333,9 @@ Disassembly of section .text:
 0+0434 <[^>]*> sll	a0,a0,0x8
 0+0438 <[^>]*> or	a0,a0,at
 0+043c <[^>]*> lui	at,[-0-9x]+
-[ 	]*43c: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_data_label
+[ 	]*43c: R_MIPS_HI16	small_external_data_label
 0+0440 <[^>]*> addiu	at,at,0
-[ 	]*440: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_data_label
+[ 	]*440: R_MIPS_LO16	small_external_data_label
 0+0444 <[^>]*> sb	a0,[01]\(at\)
 0+0448 <[^>]*> srl	a0,a0,0x8
 0+044c <[^>]*> sb	a0,[01]\(at\)
@@ -343,9 +343,9 @@ Disassembly of section .text:
 0+0454 <[^>]*> sll	a0,a0,0x8
 0+0458 <[^>]*> or	a0,a0,at
 0+045c <[^>]*> lui	at,[-0-9x]+
-[ 	]*45c: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*45c: R_MIPS_HI16	big_external_common
 0+0460 <[^>]*> addiu	at,at,0
-[ 	]*460: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*460: R_MIPS_LO16	big_external_common
 0+0464 <[^>]*> sb	a0,[01]\(at\)
 0+0468 <[^>]*> srl	a0,a0,0x8
 0+046c <[^>]*> sb	a0,[01]\(at\)
@@ -353,9 +353,9 @@ Disassembly of section .text:
 0+0474 <[^>]*> sll	a0,a0,0x8
 0+0478 <[^>]*> or	a0,a0,at
 0+047c <[^>]*> lui	at,[-0-9x]+
-[ 	]*47c: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_common
+[ 	]*47c: R_MIPS_HI16	small_external_common
 0+0480 <[^>]*> addiu	at,at,0
-[ 	]*480: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_common
+[ 	]*480: R_MIPS_LO16	small_external_common
 0+0484 <[^>]*> sb	a0,[01]\(at\)
 0+0488 <[^>]*> srl	a0,a0,0x8
 0+048c <[^>]*> sb	a0,[01]\(at\)
@@ -363,9 +363,9 @@ Disassembly of section .text:
 0+0494 <[^>]*> sll	a0,a0,0x8
 0+0498 <[^>]*> or	a0,a0,at
 0+049c <[^>]*> lui	at,[-0-9x]+
-[ 	]*49c: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*49c: R_MIPS_HI16	\.bss
 0+04a0 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*4a0: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*4a0: R_MIPS_LO16	\.bss
 0+04a4 <[^>]*> sb	a0,[01]\(at\)
 0+04a8 <[^>]*> srl	a0,a0,0x8
 0+04ac <[^>]*> sb	a0,[01]\(at\)
@@ -373,9 +373,9 @@ Disassembly of section .text:
 0+04b4 <[^>]*> sll	a0,a0,0x8
 0+04b8 <[^>]*> or	a0,a0,at
 0+04bc <[^>]*> lui	at,[-0-9x]+
-[ 	]*4bc: [A-Z0-9_]*HI[A-Z0-9_]*	.sbss.*
+[ 	]*4bc: R_MIPS_HI16	\.sbss
 0+04c0 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*4c0: [A-Z0-9_]*LO[A-Z0-9_]*	.sbss.*
+[ 	]*4c0: R_MIPS_LO16	\.sbss
 0+04c4 <[^>]*> sb	a0,[01]\(at\)
 0+04c8 <[^>]*> srl	a0,a0,0x8
 0+04cc <[^>]*> sb	a0,[01]\(at\)
@@ -383,9 +383,9 @@ Disassembly of section .text:
 0+04d4 <[^>]*> sll	a0,a0,0x8
 0+04d8 <[^>]*> or	a0,a0,at
 0+04dc <[^>]*> lui	at,[-0-9x]+
-[ 	]*4dc: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*4dc: R_MIPS_HI16	\.data
 0+04e0 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*4e0: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*4e0: R_MIPS_LO16	\.data
 0+04e4 <[^>]*> sb	a0,[01]\(at\)
 0+04e8 <[^>]*> srl	a0,a0,0x8
 0+04ec <[^>]*> sb	a0,[01]\(at\)
@@ -393,9 +393,9 @@ Disassembly of section .text:
 0+04f4 <[^>]*> sll	a0,a0,0x8
 0+04f8 <[^>]*> or	a0,a0,at
 0+04fc <[^>]*> lui	at,[-0-9x]+
-[ 	]*4fc: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*4fc: R_MIPS_HI16	big_external_data_label
 0+0500 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*500: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*500: R_MIPS_LO16	big_external_data_label
 0+0504 <[^>]*> sb	a0,[01]\(at\)
 0+0508 <[^>]*> srl	a0,a0,0x8
 0+050c <[^>]*> sb	a0,[01]\(at\)
@@ -403,9 +403,9 @@ Disassembly of section .text:
 0+0514 <[^>]*> sll	a0,a0,0x8
 0+0518 <[^>]*> or	a0,a0,at
 0+051c <[^>]*> lui	at,[-0-9x]+
-[ 	]*51c: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_data_label
+[ 	]*51c: R_MIPS_HI16	small_external_data_label
 0+0520 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*520: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_data_label
+[ 	]*520: R_MIPS_LO16	small_external_data_label
 0+0524 <[^>]*> sb	a0,[01]\(at\)
 0+0528 <[^>]*> srl	a0,a0,0x8
 0+052c <[^>]*> sb	a0,[01]\(at\)
@@ -413,9 +413,9 @@ Disassembly of section .text:
 0+0534 <[^>]*> sll	a0,a0,0x8
 0+0538 <[^>]*> or	a0,a0,at
 0+053c <[^>]*> lui	at,[-0-9x]+
-[ 	]*53c: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*53c: R_MIPS_HI16	big_external_common
 0+0540 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*540: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*540: R_MIPS_LO16	big_external_common
 0+0544 <[^>]*> sb	a0,[01]\(at\)
 0+0548 <[^>]*> srl	a0,a0,0x8
 0+054c <[^>]*> sb	a0,[01]\(at\)
@@ -423,9 +423,9 @@ Disassembly of section .text:
 0+0554 <[^>]*> sll	a0,a0,0x8
 0+0558 <[^>]*> or	a0,a0,at
 0+055c <[^>]*> lui	at,[-0-9x]+
-[ 	]*55c: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_common
+[ 	]*55c: R_MIPS_HI16	small_external_common
 0+0560 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*560: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_common
+[ 	]*560: R_MIPS_LO16	small_external_common
 0+0564 <[^>]*> sb	a0,[01]\(at\)
 0+0568 <[^>]*> srl	a0,a0,0x8
 0+056c <[^>]*> sb	a0,[01]\(at\)
@@ -433,9 +433,9 @@ Disassembly of section .text:
 0+0574 <[^>]*> sll	a0,a0,0x8
 0+0578 <[^>]*> or	a0,a0,at
 0+057c <[^>]*> lui	at,[-0-9x]+
-[ 	]*57c: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*57c: R_MIPS_HI16	\.bss
 0+0580 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*580: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*580: R_MIPS_LO16	\.bss
 0+0584 <[^>]*> sb	a0,[01]\(at\)
 0+0588 <[^>]*> srl	a0,a0,0x8
 0+058c <[^>]*> sb	a0,[01]\(at\)
@@ -443,9 +443,9 @@ Disassembly of section .text:
 0+0594 <[^>]*> sll	a0,a0,0x8
 0+0598 <[^>]*> or	a0,a0,at
 0+059c <[^>]*> lui	at,[-0-9x]+
-[ 	]*59c: [A-Z0-9_]*HI[A-Z0-9_]*	.sbss.*
+[ 	]*59c: R_MIPS_HI16	\.sbss
 0+05a0 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*5a0: [A-Z0-9_]*LO[A-Z0-9_]*	.sbss.*
+[ 	]*5a0: R_MIPS_LO16	\.sbss
 0+05a4 <[^>]*> sb	a0,[01]\(at\)
 0+05a8 <[^>]*> srl	a0,a0,0x8
 0+05ac <[^>]*> sb	a0,[01]\(at\)
diff --git a/gas/testsuite/gas/mips/usw.d b/gas/testsuite/gas/mips/usw.d
index 7c25390..814b983 100644
--- a/gas/testsuite/gas/mips/usw.d
+++ b/gas/testsuite/gas/mips/usw.d
@@ -28,243 +28,243 @@ Disassembly of section .text:
 0+0048 <[^>]*> swl	a0,[14]\(a1\)
 0+004c <[^>]*> swr	a0,[-0-9]+\(a1\)
 0+0050 <[^>]*> lui	at,[-0-9x]+
-[ 	]*50: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*50: R_MIPS_HI16	\.data
 0+0054 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*54: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*54: R_MIPS_LO16	\.data
 0+0058 <[^>]*> swl	a0,[03]\(at\)
 0+005c <[^>]*> swr	a0,[03]\(at\)
 0+0060 <[^>]*> lui	at,[-0-9x]+
-[ 	]*60: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*60: R_MIPS_HI16	big_external_data_label
 0+0064 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*64: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*64: R_MIPS_LO16	big_external_data_label
 0+0068 <[^>]*> swl	a0,[03]\(at\)
 0+006c <[^>]*> swr	a0,[03]\(at\)
 0+0070 <[^>]*> addiu	at,gp,0
-[ 	]*70: [A-Z0-9_]*GPREL[A-Z0-9_]*	small_external_data_label
+[ 	]*70: R_MIPS_GPREL16	small_external_data_label
 0+0074 <[^>]*> swl	a0,[03]\(at\)
 0+0078 <[^>]*> swr	a0,[03]\(at\)
 0+007c <[^>]*> lui	at,0x0
-[ 	]*7c: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*7c: R_MIPS_HI16	big_external_common
 0+0080 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*80: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*80: R_MIPS_LO16	big_external_common
 0+0084 <[^>]*> swl	a0,[03]\(at\)
 0+0088 <[^>]*> swr	a0,[03]\(at\)
 0+008c <[^>]*> addiu	at,gp,0
-[ 	]*8c: [A-Z0-9_]*GPREL[A-Z0-9_]*	small_external_common
+[ 	]*8c: R_MIPS_GPREL16	small_external_common
 0+0090 <[^>]*> swl	a0,[03]\(at\)
 0+0094 <[^>]*> swr	a0,[03]\(at\)
 0+0098 <[^>]*> lui	at,[-0-9x]+
-[ 	]*98: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*98: R_MIPS_HI16	\.bss
 0+009c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*9c: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*9c: R_MIPS_LO16	\.bss
 0+00a0 <[^>]*> swl	a0,[03]\(at\)
 0+00a4 <[^>]*> swr	a0,[03]\(at\)
 0+00a8 <[^>]*> addiu	at,gp,[-0-9]+
-[ 	]*a8: [A-Z0-9_]*GPREL[A-Z0-9_]*	.sbss.*
+[ 	]*a8: R_MIPS_GPREL16	\.sbss
 0+00ac <[^>]*> swl	a0,[03]\(at\)
 0+00b0 <[^>]*> swr	a0,[03]\(at\)
 0+00b4 <[^>]*> lui	at,0x0
-[ 	]*b4: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*b4: R_MIPS_HI16	\.data
 0+00b8 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*b8: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*b8: R_MIPS_LO16	\.data
 0+00bc <[^>]*> swl	a0,[03]\(at\)
 0+00c0 <[^>]*> swr	a0,[03]\(at\)
 0+00c4 <[^>]*> lui	at,0x0
-[ 	]*c4: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*c4: R_MIPS_HI16	big_external_data_label
 0+00c8 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*c8: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*c8: R_MIPS_LO16	big_external_data_label
 0+00cc <[^>]*> swl	a0,[03]\(at\)
 0+00d0 <[^>]*> swr	a0,[03]\(at\)
 0+00d4 <[^>]*> addiu	at,gp,1
-[ 	]*d4: [A-Z0-9_]*GPREL[A-Z0-9_]*	small_external_data_label
+[ 	]*d4: R_MIPS_GPREL16	small_external_data_label
 0+00d8 <[^>]*> swl	a0,[03]\(at\)
 0+00dc <[^>]*> swr	a0,[03]\(at\)
 0+00e0 <[^>]*> lui	at,0x0
-[ 	]*e0: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*e0: R_MIPS_HI16	big_external_common
 0+00e4 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*e4: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*e4: R_MIPS_LO16	big_external_common
 0+00e8 <[^>]*> swl	a0,[03]\(at\)
 0+00ec <[^>]*> swr	a0,[03]\(at\)
 0+00f0 <[^>]*> addiu	at,gp,1
-[ 	]*f0: [A-Z0-9_]*GPREL[A-Z0-9_]*	small_external_common
+[ 	]*f0: R_MIPS_GPREL16	small_external_common
 0+00f4 <[^>]*> swl	a0,[03]\(at\)
 0+00f8 <[^>]*> swr	a0,[03]\(at\)
 0+00fc <[^>]*> lui	at,0x0
-[ 	]*fc: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*fc: R_MIPS_HI16	\.bss
 0+0100 <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*100: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*100: R_MIPS_LO16	\.bss
 0+0104 <[^>]*> swl	a0,[03]\(at\)
 0+0108 <[^>]*> swr	a0,[03]\(at\)
 0+010c <[^>]*> addiu	at,gp,[-0-9]+
-[ 	]*10c: [A-Z0-9_]*GPREL[A-Z0-9_]*	.sbss.*
+[ 	]*10c: R_MIPS_GPREL16	\.sbss
 0+0110 <[^>]*> swl	a0,[03]\(at\)
 0+0114 <[^>]*> swr	a0,[03]\(at\)
 0+0118 <[^>]*> lui	at,[-0-9x]+
-[ 	]*118: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*118: R_MIPS_HI16	\.data
 0+011c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*11c: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*11c: R_MIPS_LO16	\.data
 0+0120 <[^>]*> swl	a0,[03]\(at\)
 0+0124 <[^>]*> swr	a0,[03]\(at\)
 0+0128 <[^>]*> lui	at,[-0-9x]+
-[ 	]*128: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*128: R_MIPS_HI16	big_external_data_label
 0+012c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*12c: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*12c: R_MIPS_LO16	big_external_data_label
 0+0130 <[^>]*> swl	a0,[03]\(at\)
 0+0134 <[^>]*> swr	a0,[03]\(at\)
 0+0138 <[^>]*> lui	at,[-0-9x]+
-[ 	]*138: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_data_label
+[ 	]*138: R_MIPS_HI16	small_external_data_label
 0+013c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*13c: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_data_label
+[ 	]*13c: R_MIPS_LO16	small_external_data_label
 0+0140 <[^>]*> swl	a0,[03]\(at\)
 0+0144 <[^>]*> swr	a0,[03]\(at\)
 0+0148 <[^>]*> lui	at,[-0-9x]+
-[ 	]*148: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*148: R_MIPS_HI16	big_external_common
 0+014c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*14c: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*14c: R_MIPS_LO16	big_external_common
 0+0150 <[^>]*> swl	a0,[03]\(at\)
 0+0154 <[^>]*> swr	a0,[03]\(at\)
 0+0158 <[^>]*> lui	at,[-0-9x]+
-[ 	]*158: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_common
+[ 	]*158: R_MIPS_HI16	small_external_common
 0+015c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*15c: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_common
+[ 	]*15c: R_MIPS_LO16	small_external_common
 0+0160 <[^>]*> swl	a0,[03]\(at\)
 0+0164 <[^>]*> swr	a0,[03]\(at\)
 0+0168 <[^>]*> lui	at,[-0-9x]+
-[ 	]*168: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*168: R_MIPS_HI16	\.bss
 0+016c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*16c: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*16c: R_MIPS_LO16	\.bss
 0+0170 <[^>]*> swl	a0,[03]\(at\)
 0+0174 <[^>]*> swr	a0,[03]\(at\)
 0+0178 <[^>]*> lui	at,[-0-9x]+
-[ 	]*178: [A-Z0-9_]*HI[A-Z0-9_]*	.sbss.*
+[ 	]*178: R_MIPS_HI16	\.sbss
 0+017c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*17c: [A-Z0-9_]*LO[A-Z0-9_]*	.sbss.*
+[ 	]*17c: R_MIPS_LO16	\.sbss
 0+0180 <[^>]*> swl	a0,[03]\(at\)
 0+0184 <[^>]*> swr	a0,[03]\(at\)
 0+0188 <[^>]*> lui	at,0x0
-[ 	]*188: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*188: R_MIPS_HI16	\.data
 0+018c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*18c: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*18c: R_MIPS_LO16	\.data
 0+0190 <[^>]*> swl	a0,[03]\(at\)
 0+0194 <[^>]*> swr	a0,[03]\(at\)
 0+0198 <[^>]*> lui	at,0x0
-[ 	]*198: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*198: R_MIPS_HI16	big_external_data_label
 0+019c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*19c: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*19c: R_MIPS_LO16	big_external_data_label
 0+01a0 <[^>]*> swl	a0,[03]\(at\)
 0+01a4 <[^>]*> swr	a0,[03]\(at\)
 0+01a8 <[^>]*> lui	at,0x0
-[ 	]*1a8: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_data_label
+[ 	]*1a8: R_MIPS_HI16	small_external_data_label
 0+01ac <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*1ac: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_data_label
+[ 	]*1ac: R_MIPS_LO16	small_external_data_label
 0+01b0 <[^>]*> swl	a0,[03]\(at\)
 0+01b4 <[^>]*> swr	a0,[03]\(at\)
 0+01b8 <[^>]*> lui	at,0x0
-[ 	]*1b8: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*1b8: R_MIPS_HI16	big_external_common
 0+01bc <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*1bc: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*1bc: R_MIPS_LO16	big_external_common
 0+01c0 <[^>]*> swl	a0,[03]\(at\)
 0+01c4 <[^>]*> swr	a0,[03]\(at\)
 0+01c8 <[^>]*> lui	at,0x0
-[ 	]*1c8: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_common
+[ 	]*1c8: R_MIPS_HI16	small_external_common
 0+01cc <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*1cc: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_common
+[ 	]*1cc: R_MIPS_LO16	small_external_common
 0+01d0 <[^>]*> swl	a0,[03]\(at\)
 0+01d4 <[^>]*> swr	a0,[03]\(at\)
 0+01d8 <[^>]*> lui	at,0x0
-[ 	]*1d8: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*1d8: R_MIPS_HI16	\.bss
 0+01dc <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*1dc: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*1dc: R_MIPS_LO16	\.bss
 0+01e0 <[^>]*> swl	a0,[03]\(at\)
 0+01e4 <[^>]*> swr	a0,[03]\(at\)
 0+01e8 <[^>]*> lui	at,0x0
-[ 	]*1e8: [A-Z0-9_]*HI[A-Z0-9_]*	.sbss.*
+[ 	]*1e8: R_MIPS_HI16	\.sbss
 0+01ec <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*1ec: [A-Z0-9_]*LO[A-Z0-9_]*	.sbss.*
+[ 	]*1ec: R_MIPS_LO16	\.sbss
 0+01f0 <[^>]*> swl	a0,[03]\(at\)
 0+01f4 <[^>]*> swr	a0,[03]\(at\)
 0+01f8 <[^>]*> lui	at,[-0-9x]+
-[ 	]*1f8: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*1f8: R_MIPS_HI16	\.data
 0+01fc <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*1fc: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*1fc: R_MIPS_LO16	\.data
 0+0200 <[^>]*> swl	a0,[03]\(at\)
 0+0204 <[^>]*> swr	a0,[03]\(at\)
 0+0208 <[^>]*> lui	at,[-0-9x]+
-[ 	]*208: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*208: R_MIPS_HI16	big_external_data_label
 0+020c <[^>]*> addiu	at,at,0
-[ 	]*20c: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*20c: R_MIPS_LO16	big_external_data_label
 0+0210 <[^>]*> swl	a0,[03]\(at\)
 0+0214 <[^>]*> swr	a0,[03]\(at\)
 0+0218 <[^>]*> lui	at,[-0-9x]+
-[ 	]*218: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_data_label
+[ 	]*218: R_MIPS_HI16	small_external_data_label
 0+021c <[^>]*> addiu	at,at,0
-[ 	]*21c: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_data_label
+[ 	]*21c: R_MIPS_LO16	small_external_data_label
 0+0220 <[^>]*> swl	a0,[03]\(at\)
 0+0224 <[^>]*> swr	a0,[03]\(at\)
 0+0228 <[^>]*> lui	at,[-0-9x]+
-[ 	]*228: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*228: R_MIPS_HI16	big_external_common
 0+022c <[^>]*> addiu	at,at,0
-[ 	]*22c: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*22c: R_MIPS_LO16	big_external_common
 0+0230 <[^>]*> swl	a0,[03]\(at\)
 0+0234 <[^>]*> swr	a0,[03]\(at\)
 0+0238 <[^>]*> lui	at,[-0-9x]+
-[ 	]*238: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_common
+[ 	]*238: R_MIPS_HI16	small_external_common
 0+023c <[^>]*> addiu	at,at,0
-[ 	]*23c: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_common
+[ 	]*23c: R_MIPS_LO16	small_external_common
 0+0240 <[^>]*> swl	a0,[03]\(at\)
 0+0244 <[^>]*> swr	a0,[03]\(at\)
 0+0248 <[^>]*> lui	at,[-0-9x]+
-[ 	]*248: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*248: R_MIPS_HI16	\.bss
 0+024c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*24c: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*24c: R_MIPS_LO16	\.bss
 0+0250 <[^>]*> swl	a0,[03]\(at\)
 0+0254 <[^>]*> swr	a0,[03]\(at\)
 0+0258 <[^>]*> lui	at,[-0-9x]+
-[ 	]*258: [A-Z0-9_]*HI[A-Z0-9_]*	.sbss.*
+[ 	]*258: R_MIPS_HI16	\.sbss
 0+025c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*25c: [A-Z0-9_]*LO[A-Z0-9_]*	.sbss.*
+[ 	]*25c: R_MIPS_LO16	\.sbss
 0+0260 <[^>]*> swl	a0,[03]\(at\)
 0+0264 <[^>]*> swr	a0,[03]\(at\)
 0+0268 <[^>]*> lui	at,[-0-9x]+
-[ 	]*268: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
+[ 	]*268: R_MIPS_HI16	\.data
 0+026c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*26c: [A-Z0-9_]*LO[A-Z0-9_]*	.data.*
+[ 	]*26c: R_MIPS_LO16	\.data
 0+0270 <[^>]*> swl	a0,[03]\(at\)
 0+0274 <[^>]*> swr	a0,[03]\(at\)
 0+0278 <[^>]*> lui	at,[-0-9x]+
-[ 	]*278: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_data_label
+[ 	]*278: R_MIPS_HI16	big_external_data_label
 0+027c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*27c: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_data_label
+[ 	]*27c: R_MIPS_LO16	big_external_data_label
 0+0280 <[^>]*> swl	a0,[03]\(at\)
 0+0284 <[^>]*> swr	a0,[03]\(at\)
 0+0288 <[^>]*> lui	at,[-0-9x]+
-[ 	]*288: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_data_label
+[ 	]*288: R_MIPS_HI16	small_external_data_label
 0+028c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*28c: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_data_label
+[ 	]*28c: R_MIPS_LO16	small_external_data_label
 0+0290 <[^>]*> swl	a0,[03]\(at\)
 0+0294 <[^>]*> swr	a0,[03]\(at\)
 0+0298 <[^>]*> lui	at,[-0-9x]+
-[ 	]*298: [A-Z0-9_]*HI[A-Z0-9_]*	big_external_common
+[ 	]*298: R_MIPS_HI16	big_external_common
 0+029c <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*29c: [A-Z0-9_]*LO[A-Z0-9_]*	big_external_common
+[ 	]*29c: R_MIPS_LO16	big_external_common
 0+02a0 <[^>]*> swl	a0,[03]\(at\)
 0+02a4 <[^>]*> swr	a0,[03]\(at\)
 0+02a8 <[^>]*> lui	at,[-0-9x]+
-[ 	]*2a8: [A-Z0-9_]*HI[A-Z0-9_]*	small_external_common
+[ 	]*2a8: R_MIPS_HI16	small_external_common
 0+02ac <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*2ac: [A-Z0-9_]*LO[A-Z0-9_]*	small_external_common
+[ 	]*2ac: R_MIPS_LO16	small_external_common
 0+02b0 <[^>]*> swl	a0,[03]\(at\)
 0+02b4 <[^>]*> swr	a0,[03]\(at\)
 0+02b8 <[^>]*> lui	at,[-0-9x]+
-[ 	]*2b8: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
+[ 	]*2b8: R_MIPS_HI16	\.bss
 0+02bc <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*2bc: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
+[ 	]*2bc: R_MIPS_LO16	\.bss
 0+02c0 <[^>]*> swl	a0,[03]\(at\)
 0+02c4 <[^>]*> swr	a0,[03]\(at\)
 0+02c8 <[^>]*> lui	at,[-0-9x]+
-[ 	]*2c8: [A-Z0-9_]*HI[A-Z0-9_]*	.sbss.*
+[ 	]*2c8: R_MIPS_HI16	\.sbss
 0+02cc <[^>]*> addiu	at,at,[-0-9]+
-[ 	]*2cc: [A-Z0-9_]*LO[A-Z0-9_]*	.sbss.*
+[ 	]*2cc: R_MIPS_LO16	\.sbss
 0+02d0 <[^>]*> swl	a0,[03]\(at\)
 0+02d4 <[^>]*> swr	a0,[03]\(at\)
 	...
author	Maciej W. Rozycki <macro@imgtec.com>	2016-07-02 23:39:18 +0100
committer	Maciej W. Rozycki <macro@imgtec.com>	2016-07-02 23:41:31 +0100
commit	fcedb9f3ca87f43165a8c88fae251344bf6687d0 (patch)
tree	05ec111bac1d4176d3b0753b82253dc83f014985 /gas
parent	6f50d611582fab3ca8cf70ec3acf79e19c8706c4 (diff)
download	binutils-fcedb9f3ca87f43165a8c88fae251344bf6687d0.zip binutils-fcedb9f3ca87f43165a8c88fae251344bf6687d0.tar.gz binutils-fcedb9f3ca87f43165a8c88fae251344bf6687d0.tar.bz2