This is the mail archive of the
binutils-cvs@sourceware.org
mailing list for the binutils project.
[binutils-gdb] MIPS/GAS/testsuite: Remove remnants of a.out/ECOFF support
- From: Maciej W.Rozycki <macro at sourceware dot org>
- To: bfd-cvs at sourceware dot org
- Date: 2 Jul 2016 22:51:57 -0000
- Subject: [binutils-gdb] MIPS/GAS/testsuite: Remove remnants of a.out/ECOFF support
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=fcedb9f3ca87f43165a8c88fae251344bf6687d0
commit fcedb9f3ca87f43165a8c88fae251344bf6687d0
Author: Maciej W. Rozycki <macro@imgtec.com>
Date: Sat Jul 2 23:39:18 2016 +0100
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.
Diff:
---
gas/ChangeLog | 30 +++
gas/testsuite/gas/mips/beq.d | 8 +-
gas/testsuite/gas/mips/bge.d | 4 +-
gas/testsuite/gas/mips/bgeu.d | 4 +-
gas/testsuite/gas/mips/blt.d | 4 +-
gas/testsuite/gas/mips/bltu.d | 4 +-
gas/testsuite/gas/mips/branch-likely.d | 20 +-
gas/testsuite/gas/mips/ecoff@ld-forward.d | 5 -
gas/testsuite/gas/mips/ecoff@ld-zero-3.d | 4 -
gas/testsuite/gas/mips/ecoff@ld.d | 386 ------------------------------
gas/testsuite/gas/mips/ecoff@sd-forward.d | 5 -
gas/testsuite/gas/mips/ecoff@sd.d | 386 ------------------------------
gas/testsuite/gas/mips/la.d | 320 ++++++++++++-------------
gas/testsuite/gas/mips/lb.d | 312 ++++++++++++------------
gas/testsuite/gas/mips/lifloat.d | 12 +-
gas/testsuite/gas/mips/mipsr6@beq.d | 20 +-
gas/testsuite/gas/mips/mipsr6@bge.d | 32 +--
gas/testsuite/gas/mips/mipsr6@bgeu.d | 26 +-
gas/testsuite/gas/mips/mipsr6@blt.d | 32 +--
gas/testsuite/gas/mips/mipsr6@bltu.d | 26 +-
gas/testsuite/gas/mips/sb.d | 312 ++++++++++++------------
gas/testsuite/gas/mips/uld.d | 156 ++++++------
gas/testsuite/gas/mips/ulh.d | 156 ++++++------
gas/testsuite/gas/mips/ulw.d | 156 ++++++------
gas/testsuite/gas/mips/usd.d | 156 ++++++------
gas/testsuite/gas/mips/ush.d | 156 ++++++------
gas/testsuite/gas/mips/usw.d | 156 ++++++------
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_]* sm[...]
[diff truncated at 100000 bytes]