[PATCH v2 01/15] MIPS: Do not adjust microMIPS HI/LO relocs to be section relative

Wed Oct 29 14:09:18 GMT 2025

From: Matthew Fortune <matthew.fortune@imgtec.com>

microMIPS HI/LO16 relocations can be relaxed to the PC23_S2 relocation,
which may overflow in the process.

gas/ChangeLog:
	* config/tc-mips.c (mips_fix_adjustable): Prevent converting
	microMIPS HI/LO relocs to section relative.
	* testsuite/gas/mips/l_d.d: Adjust for HI/LO symbols.
	* testsuite/gas/mips/ld.d: Likewise.
	* testsuite/gas/mips/lui-2.l: Likewise.
	* testsuite/gas/mips/micromips-branch-relax-insn32-pic.d: Likewise.
	* testsuite/gas/mips/micromips-branch-relax-pic.d: Likewise.
	* testsuite/gas/mips/micromips-hilo-match.d: Likewise.
	* testsuite/gas/mips/micromips-hilo.d: Likewise.
	* testsuite/gas/mips/micromips@jal-svr4pic-local.d: Likewise.
	* testsuite/gas/mips/micromips@jal-svr4pic-noreorder.d: Likewise.
	* testsuite/gas/mips/micromips@jal-svr4pic.d: Likewise.
	* testsuite/gas/mips/micromips@lb-svr4pic-ilocks.d: Likewise.
	* testsuite/gas/mips/micromips@lui.d: Likewise.
	* testsuite/gas/mips/micromips@relax-at.d: Likewise.
	* testsuite/gas/mips/micromips@relax-offset.d: Likewise.
	* testsuite/gas/mips/micromips@relax.d: Likewise.
	* testsuite/gas/mips/option-pic-relax-4.d: Likewise.
	* testsuite/gas/mips/s_d.d: Likewise.
	* testsuite/gas/mips/sd.d: Likewise.
---
 gas/config/tc-mips.c                          |   9 +-
 gas/testsuite/gas/mips/l_d.d                  | 128 +++---
 gas/testsuite/gas/mips/ld.d                   | 192 ++++-----
 gas/testsuite/gas/mips/lui-2.l                |   2 +-
 .../mips/micromips-branch-relax-insn32-pic.d  | 368 ++++++++--------
 .../gas/mips/micromips-branch-relax-pic.d     | 392 +++++++++---------
 gas/testsuite/gas/mips/micromips-hilo-match.d |   4 +-
 gas/testsuite/gas/mips/micromips-hilo.d       | 216 +++++-----
 .../gas/mips/micromips@jal-svr4pic-local.d    |   6 +-
 .../mips/micromips@jal-svr4pic-noreorder.d    |   6 +-
 .../gas/mips/micromips@jal-svr4pic.d          |   6 +-
 .../gas/mips/micromips@lb-svr4pic-ilocks.d    |  56 +--
 gas/testsuite/gas/mips/micromips@lui.d        |  12 +-
 gas/testsuite/gas/mips/micromips@relax-at.d   | 308 +++++++-------
 .../gas/mips/micromips@relax-offset.d         |   8 +-
 gas/testsuite/gas/mips/micromips@relax.d      | 308 +++++++-------
 gas/testsuite/gas/mips/option-pic-relax-4.d   |   8 +-
 gas/testsuite/gas/mips/s_d.d                  | 128 +++---
 gas/testsuite/gas/mips/sd.d                   | 192 ++++-----
 19 files changed, 1177 insertions(+), 1172 deletions(-)

diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index 5f1099da96c..8cd9f31c492 100644
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -18291,11 +18291,16 @@ mips_fix_adjustable (fixS *fixp)
      relocation, and has thus allowed orphaned R_MIPS_LO16 relocations to be
      placed anywhere.  Rather than break backwards compatibility by changing
      this, it seems better not to force the issue, and instead keep the
-     original symbol.  This will work with either linker behavior.  */
+     original symbol.  This will work with either linker behavior.
+
+     Additionally microMIPS HI16/LO16 relocation pairs may be subject to
+     linker relaxation to the PC-relative PC23_S2 relocation that may
+     overflow in the process.  */
   if ((lo16_reloc_p (fixp->fx_r_type)
        || reloc_needs_lo_p (fixp->fx_r_type))
       && HAVE_IN_PLACE_ADDENDS
-      && (S_GET_SEGMENT (fixp->fx_addsy)->flags & SEC_MERGE) != 0)
+      && (micromips_reloc_p (fixp->fx_r_type)
+	  || S_GET_SEGMENT (fixp->fx_addsy)->flags & SEC_MERGE) != 0)
     return 0;
 
   /* There is no place to store an in-place offset for JALR relocations.  */
diff --git a/gas/testsuite/gas/mips/l_d.d b/gas/testsuite/gas/mips/l_d.d
index d6616210009..6e9386e8f39 100644
--- a/gas/testsuite/gas/mips/l_d.d
+++ b/gas/testsuite/gas/mips/l_d.d
@@ -30,9 +30,9 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> addu	at,at,a1
 [0-9a-f]+ <[^>]*> ldc1	\$f4,-23131\(at\)
 [0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> ldc1	\$f4,0\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lui	at,0x0
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	big_external_data_label
 [0-9a-f]+ <[^>]*> ldc1	\$f4,0\(at\)
@@ -46,15 +46,15 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> ldc1	\$f4,0\(gp\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_GPREL16	small_external_common
 [0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> ldc1	\$f4,0\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> ldc1	\$f4,0\(gp\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_GPREL16	\.sbss
 [0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> ldc1	\$f4,1\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lui	at,0x0
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	big_external_data_label
 [0-9a-f]+ <[^>]*> ldc1	\$f4,1\(at\)
@@ -68,15 +68,15 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> ldc1	\$f4,1\(gp\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_GPREL16	small_external_common
 [0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> ldc1	\$f4,1\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> ldc1	\$f4,1\(gp\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_GPREL16	\.sbss
 [0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> ldc1	\$f4,-32768\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lui	at,0x1
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	big_external_data_label
 [0-9a-f]+ <[^>]*> ldc1	\$f4,-32768\(at\)
@@ -94,17 +94,17 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> ldc1	\$f4,-32768\(at\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	small_external_common
 [0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> ldc1	\$f4,-32768\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> ldc1	\$f4,-32768\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> ldc1	\$f4,-32768\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lui	at,0x0
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	big_external_data_label
 [0-9a-f]+ <[^>]*> ldc1	\$f4,-32768\(at\)
@@ -122,17 +122,17 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> ldc1	\$f4,-32768\(at\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	small_external_common
 [0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> ldc1	\$f4,-32768\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> ldc1	\$f4,-32768\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> ldc1	\$f4,0\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lui	at,0x1
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	big_external_data_label
 [0-9a-f]+ <[^>]*> ldc1	\$f4,0\(at\)
@@ -150,17 +150,17 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> ldc1	\$f4,0\(at\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	small_external_common
 [0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> ldc1	\$f4,0\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> ldc1	\$f4,0\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> lui	at,0x2
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> ldc1	\$f4,-23131\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lui	at,0x2
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	big_external_data_label
 [0-9a-f]+ <[^>]*> ldc1	\$f4,-23131\(at\)
@@ -178,18 +178,18 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> ldc1	\$f4,-23131\(at\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	small_external_common
 [0-9a-f]+ <[^>]*> lui	at,0x2
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> ldc1	\$f4,-23131\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> lui	at,0x2
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> ldc1	\$f4,-23131\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> addu	at,at,a1
 [0-9a-f]+ <[^>]*> ldc1	\$f4,0\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lui	at,0x0
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	big_external_data_label
 [0-9a-f]+ <[^>]*> addu	at,at,a1
@@ -207,18 +207,18 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> ldc1	\$f4,0\(at\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_GPREL16	small_external_common
 [0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> addu	at,at,a1
 [0-9a-f]+ <[^>]*> ldc1	\$f4,0\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> addu	at,a1,gp
 [0-9a-f]+ <[^>]*> ldc1	\$f4,0\(at\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_GPREL16	\.sbss
 [0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> addu	at,at,a1
 [0-9a-f]+ <[^>]*> ldc1	\$f4,1\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lui	at,0x0
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	big_external_data_label
 [0-9a-f]+ <[^>]*> addu	at,at,a1
@@ -236,18 +236,18 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> ldc1	\$f4,1\(at\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_GPREL16	small_external_common
 [0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> addu	at,at,a1
 [0-9a-f]+ <[^>]*> ldc1	\$f4,1\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> addu	at,a1,gp
 [0-9a-f]+ <[^>]*> ldc1	\$f4,1\(at\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_GPREL16	\.sbss
 [0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> addu	at,at,a1
 [0-9a-f]+ <[^>]*> ldc1	\$f4,-32768\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lui	at,0x1
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	big_external_data_label
 [0-9a-f]+ <[^>]*> addu	at,at,a1
@@ -269,20 +269,20 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> ldc1	\$f4,-32768\(at\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	small_external_common
 [0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> addu	at,at,a1
 [0-9a-f]+ <[^>]*> ldc1	\$f4,-32768\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> addu	at,at,a1
 [0-9a-f]+ <[^>]*> ldc1	\$f4,-32768\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> addu	at,at,a1
 [0-9a-f]+ <[^>]*> ldc1	\$f4,-32768\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lui	at,0x0
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	big_external_data_label
 [0-9a-f]+ <[^>]*> addu	at,at,a1
@@ -304,20 +304,20 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> ldc1	\$f4,-32768\(at\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	small_external_common
 [0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> addu	at,at,a1
 [0-9a-f]+ <[^>]*> ldc1	\$f4,-32768\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> addu	at,at,a1
 [0-9a-f]+ <[^>]*> ldc1	\$f4,-32768\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> addu	at,at,a1
 [0-9a-f]+ <[^>]*> ldc1	\$f4,0\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lui	at,0x1
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	big_external_data_label
 [0-9a-f]+ <[^>]*> addu	at,at,a1
@@ -339,20 +339,20 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> ldc1	\$f4,0\(at\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	small_external_common
 [0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> addu	at,at,a1
 [0-9a-f]+ <[^>]*> ldc1	\$f4,0\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> addu	at,at,a1
 [0-9a-f]+ <[^>]*> ldc1	\$f4,0\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> lui	at,0x2
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> addu	at,at,a1
 [0-9a-f]+ <[^>]*> ldc1	\$f4,-23131\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lui	at,0x2
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	big_external_data_label
 [0-9a-f]+ <[^>]*> addu	at,at,a1
@@ -374,13 +374,13 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> ldc1	\$f4,-23131\(at\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	small_external_common
 [0-9a-f]+ <[^>]*> lui	at,0x2
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> addu	at,at,a1
 [0-9a-f]+ <[^>]*> ldc1	\$f4,-23131\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> lui	at,0x2
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> addu	at,at,a1
 [0-9a-f]+ <[^>]*> ldc1	\$f4,-23131\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(small_local_common|\.sbss)
 	\.\.\.
diff --git a/gas/testsuite/gas/mips/ld.d b/gas/testsuite/gas/mips/ld.d
index d2cd021c027..31410c56fc3 100644
--- a/gas/testsuite/gas/mips/ld.d
+++ b/gas/testsuite/gas/mips/ld.d
@@ -42,11 +42,11 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> lw	a0,-23131\(at\)
 [0-9a-f]+ <[^>]*> lw	a1,-23127\(at\)
 [0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lw	a0,0\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lw	a1,4\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lui	at,0x0
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	big_external_data_label
 [0-9a-f]+ <[^>]*> lw	a0,0\(at\)
@@ -68,21 +68,21 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> lw	a1,4\(gp\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_GPREL16	small_external_common
 [0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> lw	a0,0\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> lw	a1,4\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> lw	a0,0\(gp\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_GPREL16	\.sbss
 [0-9a-f]+ <[^>]*> lw	a1,4\(gp\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_GPREL16	\.sbss
 [0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lw	a0,1\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lw	a1,5\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lui	at,0x0
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	big_external_data_label
 [0-9a-f]+ <[^>]*> lw	a0,1\(at\)
@@ -104,21 +104,21 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> lw	a1,5\(gp\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_GPREL16	small_external_common
 [0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> lw	a0,1\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> lw	a1,5\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> lw	a0,1\(gp\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_GPREL16	\.sbss
 [0-9a-f]+ <[^>]*> lw	a1,5\(gp\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_GPREL16	\.sbss
 [0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lw	a0,-32768\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lw	a1,-32764\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lui	at,0x1
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	big_external_data_label
 [0-9a-f]+ <[^>]*> lw	a0,-32768\(at\)
@@ -144,23 +144,23 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> lw	a1,-32764\(at\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	small_external_common
 [0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> lw	a0,-32768\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> lw	a1,-32764\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> lw	a0,-32768\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> lw	a1,-32764\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lw	a0,-32768\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lw	a1,-32764\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lui	at,0x0
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	big_external_data_label
 [0-9a-f]+ <[^>]*> lw	a0,-32768\(at\)
@@ -186,23 +186,23 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> lw	a1,-32764\(at\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	small_external_common
 [0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> lw	a0,-32768\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> lw	a1,-32764\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> lw	a0,-32768\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> lw	a1,-32764\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lw	a0,0\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lw	a1,4\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lui	at,0x1
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	big_external_data_label
 [0-9a-f]+ <[^>]*> lw	a0,0\(at\)
@@ -228,23 +228,23 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> lw	a1,4\(at\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	small_external_common
 [0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> lw	a0,0\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> lw	a1,4\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> lw	a0,0\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> lw	a1,4\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> lui	at,0x2
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lw	a0,-23131\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lw	a1,-23127\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lui	at,0x2
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	big_external_data_label
 [0-9a-f]+ <[^>]*> lw	a0,-23131\(at\)
@@ -270,24 +270,24 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> lw	a1,-23127\(at\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	small_external_common
 [0-9a-f]+ <[^>]*> lui	at,0x2
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> lw	a0,-23131\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> lw	a1,-23127\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> lui	at,0x2
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> lw	a0,-23131\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> lw	a1,-23127\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> addu	at,a1,at
 [0-9a-f]+ <[^>]*> lw	a0,0\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lw	a1,4\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lui	at,0x0
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	big_external_data_label
 [0-9a-f]+ <[^>]*> addu	at,a1,at
@@ -313,24 +313,24 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> lw	a1,4\(at\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_GPREL16	small_external_common
 [0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> addu	at,a1,at
 [0-9a-f]+ <[^>]*> lw	a0,0\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> lw	a1,4\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> addu	at,a1,gp
 [0-9a-f]+ <[^>]*> lw	a0,0\(at\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_GPREL16	\.sbss
 [0-9a-f]+ <[^>]*> lw	a1,4\(at\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_GPREL16	\.sbss
 [0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> addu	at,a1,at
 [0-9a-f]+ <[^>]*> lw	a0,1\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lw	a1,5\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lui	at,0x0
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	big_external_data_label
 [0-9a-f]+ <[^>]*> addu	at,a1,at
@@ -356,24 +356,24 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> lw	a1,5\(at\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_GPREL16	small_external_common
 [0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> addu	at,a1,at
 [0-9a-f]+ <[^>]*> lw	a0,1\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> lw	a1,5\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> addu	at,a1,gp
 [0-9a-f]+ <[^>]*> lw	a0,1\(at\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_GPREL16	\.sbss
 [0-9a-f]+ <[^>]*> lw	a1,5\(at\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_GPREL16	\.sbss
 [0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> addu	at,a1,at
 [0-9a-f]+ <[^>]*> lw	a0,-32768\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lw	a1,-32764\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lui	at,0x1
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	big_external_data_label
 [0-9a-f]+ <[^>]*> addu	at,a1,at
@@ -403,26 +403,26 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> lw	a1,-32764\(at\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	small_external_common
 [0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> addu	at,a1,at
 [0-9a-f]+ <[^>]*> lw	a0,-32768\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> lw	a1,-32764\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> addu	at,a1,at
 [0-9a-f]+ <[^>]*> lw	a0,-32768\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> lw	a1,-32764\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> addu	at,a1,at
 [0-9a-f]+ <[^>]*> lw	a0,-32768\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lw	a1,-32764\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lui	at,0x0
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	big_external_data_label
 [0-9a-f]+ <[^>]*> addu	at,a1,at
@@ -452,26 +452,26 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> lw	a1,-32764\(at\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	small_external_common
 [0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> addu	at,a1,at
 [0-9a-f]+ <[^>]*> lw	a0,-32768\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> lw	a1,-32764\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> addu	at,a1,at
 [0-9a-f]+ <[^>]*> lw	a0,-32768\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> lw	a1,-32764\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> addu	at,a1,at
 [0-9a-f]+ <[^>]*> lw	a0,0\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lw	a1,4\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lui	at,0x1
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	big_external_data_label
 [0-9a-f]+ <[^>]*> addu	at,a1,at
@@ -501,26 +501,26 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> lw	a1,4\(at\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	small_external_common
 [0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> addu	at,a1,at
 [0-9a-f]+ <[^>]*> lw	a0,0\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> lw	a1,4\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> addu	at,a1,at
 [0-9a-f]+ <[^>]*> lw	a0,0\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> lw	a1,4\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> lui	at,0x2
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> addu	at,a1,at
 [0-9a-f]+ <[^>]*> lw	a0,-23131\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lw	a1,-23127\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lui	at,0x2
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	big_external_data_label
 [0-9a-f]+ <[^>]*> addu	at,a1,at
@@ -550,17 +550,17 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> lw	a1,-23127\(at\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	small_external_common
 [0-9a-f]+ <[^>]*> lui	at,0x2
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> addu	at,a1,at
 [0-9a-f]+ <[^>]*> lw	a0,-23131\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> lw	a1,-23127\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> lui	at,0x2
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> addu	at,a1,at
 [0-9a-f]+ <[^>]*> lw	a0,-23131\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> lw	a1,-23127\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(small_local_common|\.sbss)
 	\.\.\.
diff --git a/gas/testsuite/gas/mips/lui-2.l b/gas/testsuite/gas/mips/lui-2.l
index 713bd798048..142eb7a4ff2 100644
--- a/gas/testsuite/gas/mips/lui-2.l
+++ b/gas/testsuite/gas/mips/lui-2.l
@@ -2,4 +2,4 @@
 .*\.s:10: Error: invalid operands \(\*UND\* and \*UND\* sections\) for `/'
 .*\.s:7: Error: PC-relative reference to a different section
 .*\.s:8: Error: can't resolve baz - bar
-.*\.s:9: Error: can't resolve \.text - baz
+.*\.s:9: Error: can't resolve foo|\.text - baz
\ No newline at end of file
diff --git a/gas/testsuite/gas/mips/micromips-branch-relax-insn32-pic.d b/gas/testsuite/gas/mips/micromips-branch-relax-insn32-pic.d
index c0ccb29baee..3735f9d0687 100644
--- a/gas/testsuite/gas/mips/micromips-branch-relax-insn32-pic.d
+++ b/gas/testsuite/gas/mips/micromips-branch-relax-insn32-pic.d
@@ -63,45 +63,45 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	b403 fffe 	bnez	v1,[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	00a4 1950 	addu	v1,a0,a1
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 04fb 	addiu	at,at,1275
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	0001 0f3c 	jr	at
 [ 0-9a-f]+:	00a4 1950 	addu	v1,a0,a1
-[ 0-9a-f]+:	ff3c 0001 	lw	t9,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3339 04fb 	addiu	t9,t9,1275
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	ff3c 0000 	lw	t9,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3339 0000 	addiu	t9,t9,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	03f9 0f3c 	jalr	t9
 [ 	]*[0-9a-f]+: R_MICROMIPS_JALR	test3
 [ 0-9a-f]+:	00a4 1950 	addu	v1,a0,a1
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 04fb 	addiu	at,at,1275
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	0001 0f3c 	jr	at
 [ 0-9a-f]+:	00a4 1950 	addu	v1,a0,a1
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 04fb 	addiu	at,at,1275
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	0001 0f3c 	jr	at
 [ 0-9a-f]+:	0000 0000 	nop
 [ 0-9a-f]+:	00a4 1950 	addu	v1,a0,a1
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 04fb 	addiu	at,at,1275
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	03e1 0f3c 	jalr	at
 [ 0-9a-f]+:	00a4 1950 	addu	v1,a0,a1
 [ 0-9a-f]+:	b483 fffe 	bne	v1,a0,[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0000 0000 	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 04fb 	addiu	at,at,1275
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	0001 0f3c 	jr	at
 
 [0-9a-f]+ <.*>:
@@ -109,10 +109,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	9483 fffe 	beq	v1,a0,[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0000 0000 	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 04fb 	addiu	at,at,1275
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	0001 0f3c 	jr	at
 
 [0-9a-f]+ <.*>:
@@ -120,10 +120,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	4043 fffe 	bgez	v1,[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0000 0000 	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 04fb 	addiu	at,at,1275
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	0001 0f3c 	jr	at
 
 [0-9a-f]+ <.*>:
@@ -131,10 +131,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	4003 fffe 	bltz	v1,[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0000 0000 	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 04fb 	addiu	at,at,1275
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	0001 0f3c 	jr	at
 
 [0-9a-f]+ <.*>:
@@ -142,10 +142,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	40d4 fffe 	bgtz	s4,[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0000 0000 	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 04fb 	addiu	at,at,1275
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	0001 0f3c 	jr	at
 
 [0-9a-f]+ <.*>:
@@ -153,20 +153,20 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	4094 fffe 	blez	s4,[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0000 0000 	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 04fb 	addiu	at,at,1275
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	0001 0f3c 	jr	at
 
 [0-9a-f]+ <.*>:
 [ 0-9a-f]+:	00a4 1950 	addu	v1,a0,a1
 [ 0-9a-f]+:	40a3 fffe 	bnezc	v1,[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 04fb 	addiu	at,at,1275
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	0001 0f3c 	jr	at
 [ 0-9a-f]+:	0000 0000 	nop
 
@@ -174,10 +174,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	00a4 1950 	addu	v1,a0,a1
 [ 0-9a-f]+:	40e3 fffe 	beqzc	v1,[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 04fb 	addiu	at,at,1275
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	0001 0f3c 	jr	at
 [ 0-9a-f]+:	0000 0000 	nop
 
@@ -186,10 +186,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	401e fffe 	bltz	s8,[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0000 0000 	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 04fb 	addiu	at,at,1275
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	03e1 0f3c 	jalr	at
 
 [0-9a-f]+ <.*>:
@@ -197,10 +197,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	405e fffe 	bgez	s8,[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0000 0000 	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 04fb 	addiu	at,at,1275
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	03e1 0f3c 	jalr	at
 
 [0-9a-f]+ <.*>:
@@ -208,10 +208,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	43a0 fffe 	bc1t	[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0000 0000 	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 04fb 	addiu	at,at,1275
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	0001 0f3c 	jr	at
 
 [0-9a-f]+ <.*>:
@@ -219,10 +219,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	4380 fffe 	bc1f	[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0000 0000 	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 04fb 	addiu	at,at,1275
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	0001 0f3c 	jr	at
 
 [0-9a-f]+ <.*>:
@@ -230,10 +230,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	42a0 fffe 	bc2t	[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0000 0000 	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 04fb 	addiu	at,at,1275
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	0001 0f3c 	jr	at
 
 [0-9a-f]+ <.*>:
@@ -241,10 +241,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	4280 fffe 	bc2f	[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0000 0000 	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 04fb 	addiu	at,at,1275
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	0001 0f3c 	jr	at
 
 [0-9a-f]+ <.*>:
@@ -252,10 +252,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	b483 fffe 	bne	v1,a0,[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0000 0000 	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 04fb 	addiu	at,at,1275
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	0001 0f3c 	jr	at
 [ 0-9a-f]+:	00a4 1950 	addu	v1,a0,a1
 
@@ -263,10 +263,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	b403 fffe 	bnez	v1,[0-9a-f]+ <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0000 0000 	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 04fb 	addiu	at,at,1275
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	0001 0f3c 	jr	at
 
 [0-9a-f]+ <.*>:
@@ -275,10 +275,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	b401 fffe 	bnez	at,[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0000 0000 	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 04fb 	addiu	at,at,1275
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	0001 0f3c 	jr	at
 
 [0-9a-f]+ <.*>:
@@ -287,10 +287,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	b401 fffe 	bnez	at,[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0000 0000 	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 04fb 	addiu	at,at,1275
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	0001 0f3c 	jr	at
 [ 0-9a-f]+:	00a4 1b10 	xor	v1,a0,a1
 
@@ -299,10 +299,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	b401 fffe 	bnez	at,[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0000 0000 	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 04fb 	addiu	at,at,1275
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	0001 0f3c 	jr	at
 
 [0-9a-f]+ <.*>:
@@ -311,10 +311,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	b401 fffe 	bnez	at,[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0000 0000 	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 04fb 	addiu	at,at,1275
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	0001 0f3c 	jr	at
 [ 0-9a-f]+:	00a4 1b10 	xor	v1,a0,a1
 
@@ -322,10 +322,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	4003 fffe 	bltz	v1,[0-9a-f]+ <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0000 0000 	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 04fb 	addiu	at,at,1275
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	03e1 0f3c 	jalr	at
 [ 0-9a-f]+:	00a4 1b10 	xor	v1,a0,a1
 
@@ -333,10 +333,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	4003 fffe 	bltz	v1,[0-9a-f]+ <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0000 0000 	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 04fb 	addiu	at,at,1275
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	0001 0f3c 	jr	at
 [ 0-9a-f]+:	00a4 1b10 	xor	v1,a0,a1
 
@@ -345,10 +345,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	9401 fffe 	beqz	at,[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0000 0000 	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 04fb 	addiu	at,at,1275
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	0001 0f3c 	jr	at
 
 [0-9a-f]+ <.*>:
@@ -357,10 +357,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	9401 fffe 	beqz	at,[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0000 0000 	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 04fb 	addiu	at,at,1275
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	0001 0f3c 	jr	at
 [ 0-9a-f]+:	00a4 1b10 	xor	v1,a0,a1
 
@@ -369,10 +369,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	9401 fffe 	beqz	at,[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0000 0000 	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 04fb 	addiu	at,at,1275
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	0001 0f3c 	jr	at
 
 [0-9a-f]+ <.*>:
@@ -381,10 +381,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	9401 fffe 	beqz	at,[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0000 0000 	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 04fb 	addiu	at,at,1275
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	0001 0f3c 	jr	at
 [ 0-9a-f]+:	00a4 1b10 	xor	v1,a0,a1
 
@@ -392,10 +392,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	4083 fffe 	blez	v1,[0-9a-f]+ <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0000 0000 	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 04fb 	addiu	at,at,1275
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	0001 0f3c 	jr	at
 [ 0-9a-f]+:	00a4 1b10 	xor	v1,a0,a1
 
@@ -404,10 +404,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	b401 fffe 	bnez	at,[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0000 0000 	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 04fb 	addiu	at,at,1275
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	0001 0f3c 	jr	at
 
 [0-9a-f]+ <.*>:
@@ -416,10 +416,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	b401 fffe 	bnez	at,[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0000 0000 	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 04fb 	addiu	at,at,1275
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	0001 0f3c 	jr	at
 [ 0-9a-f]+:	00a4 1b10 	xor	v1,a0,a1
 
@@ -428,10 +428,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	b401 fffe 	bnez	at,[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0000 0000 	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 04fb 	addiu	at,at,1275
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	0001 0f3c 	jr	at
 
 [0-9a-f]+ <.*>:
@@ -440,10 +440,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	b401 fffe 	bnez	at,[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0000 0000 	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 04fb 	addiu	at,at,1275
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	0001 0f3c 	jr	at
 [ 0-9a-f]+:	00a4 1b10 	xor	v1,a0,a1
 
@@ -451,10 +451,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	40c3 fffe 	bgtz	v1,[0-9a-f]+ <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0000 0000 	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 04fb 	addiu	at,at,1275
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	0001 0f3c 	jr	at
 [ 0-9a-f]+:	00a4 1b10 	xor	v1,a0,a1
 
@@ -463,10 +463,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	9401 fffe 	beqz	at,[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0000 0000 	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 04fb 	addiu	at,at,1275
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	0001 0f3c 	jr	at
 
 [0-9a-f]+ <.*>:
@@ -475,10 +475,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	9401 fffe 	beqz	at,[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0000 0000 	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 04fb 	addiu	at,at,1275
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	0001 0f3c 	jr	at
 [ 0-9a-f]+:	00a4 1b10 	xor	v1,a0,a1
 
@@ -487,10 +487,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	9401 fffe 	beqz	at,[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0000 0000 	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 04fb 	addiu	at,at,1275
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	0001 0f3c 	jr	at
 
 [0-9a-f]+ <.*>:
@@ -499,10 +499,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	9401 fffe 	beqz	at,[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0000 0000 	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 04fb 	addiu	at,at,1275
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	0001 0f3c 	jr	at
 [ 0-9a-f]+:	00a4 1b10 	xor	v1,a0,a1
 
@@ -510,10 +510,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	4043 fffe 	bgez	v1,[0-9a-f]+ <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0000 0000 	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 04fb 	addiu	at,at,1275
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	03e1 0f3c 	jalr	at
 [ 0-9a-f]+:	00a4 1b10 	xor	v1,a0,a1
 
@@ -521,10 +521,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	4043 fffe 	bgez	v1,[0-9a-f]+ <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0000 0000 	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 04fb 	addiu	at,at,1275
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	0001 0f3c 	jr	at
 [ 0-9a-f]+:	00a4 1b10 	xor	v1,a0,a1
 
@@ -532,10 +532,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	9483 fffe 	beq	v1,a0,[0-9a-f]+ <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0000 0000 	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 04fb 	addiu	at,at,1275
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	0001 0f3c 	jr	at
 [ 0-9a-f]+:	00a4 1b10 	xor	v1,a0,a1
 
@@ -543,10 +543,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	9403 fffe 	beqz	v1,[0-9a-f]+ <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0000 0000 	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 04fb 	addiu	at,at,1275
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	0001 0f3c 	jr	at
 
 [0-9a-f]+ <.*>:
@@ -554,10 +554,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	9403 fffe 	beqz	v1,[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0000 0000 	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 04fb 	addiu	at,at,1275
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	0001 0f3c 	jr	at
 [ 0-9a-f]+:	00a4 1b10 	xor	v1,a0,a1
 
diff --git a/gas/testsuite/gas/mips/micromips-branch-relax-pic.d b/gas/testsuite/gas/mips/micromips-branch-relax-pic.d
index 444a52cb04e..3e2ace9e5f2 100644
--- a/gas/testsuite/gas/mips/micromips-branch-relax-pic.d
+++ b/gas/testsuite/gas/mips/micromips-branch-relax-pic.d
@@ -90,50 +90,50 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	b403 fffe 	bnez	v1,[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	05d8      	addu	v1,a0,a1
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 045d 	addiu	at,at,1117
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	4581      	jr	at
 [ 0-9a-f]+:	05d8      	addu	v1,a0,a1
-[ 0-9a-f]+:	ff3c 0001 	lw	t9,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3339 045d 	addiu	t9,t9,1117
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	ff3c 0000 	lw	t9,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3339 0000 	addiu	t9,t9,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	03f9 0f3c 	jalr	t9
 [ 	]*[0-9a-f]+: R_MICROMIPS_JALR	test3
 [ 0-9a-f]+:	00a4 1950 	addu	v1,a0,a1
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 045d 	addiu	at,at,1117
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	4581      	jr	at
 [ 0-9a-f]+:	05d8      	addu	v1,a0,a1
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 045d 	addiu	at,at,1117
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	45a1      	jrc	at
 [ 0-9a-f]+:	05d8      	addu	v1,a0,a1
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 045d 	addiu	at,at,1117
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	45c1      	jalr	at
 [ 0-9a-f]+:	00a4 1950 	addu	v1,a0,a1
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 045d 	addiu	at,at,1117
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	45e1      	jalrs	at
 [ 0-9a-f]+:	05d8      	addu	v1,a0,a1
 [ 0-9a-f]+:	b483 fffe 	bne	v1,a0,[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0c00      	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 045d 	addiu	at,at,1117
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	4581      	jr	at
 
 [0-9a-f]+ <.*>:
@@ -141,10 +141,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	9483 fffe 	beq	v1,a0,[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0c00      	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 045d 	addiu	at,at,1117
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	4581      	jr	at
 
 [0-9a-f]+ <.*>:
@@ -152,10 +152,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	4043 fffe 	bgez	v1,[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0c00      	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 045d 	addiu	at,at,1117
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	4581      	jr	at
 
 [0-9a-f]+ <.*>:
@@ -163,10 +163,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	4003 fffe 	bltz	v1,[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0c00      	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 045d 	addiu	at,at,1117
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	4581      	jr	at
 
 [0-9a-f]+ <.*>:
@@ -174,10 +174,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	40d4 fffe 	bgtz	s4,[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0c00      	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 045d 	addiu	at,at,1117
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	4581      	jr	at
 
 [0-9a-f]+ <.*>:
@@ -185,30 +185,30 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	4094 fffe 	blez	s4,[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0c00      	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 045d 	addiu	at,at,1117
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	4581      	jr	at
 
 [0-9a-f]+ <.*>:
 [ 0-9a-f]+:	05d8      	addu	v1,a0,a1
 [ 0-9a-f]+:	40a3 fffe 	bnezc	v1,[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 045d 	addiu	at,at,1117
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	45a1      	jrc	at
 
 [0-9a-f]+ <.*>:
 [ 0-9a-f]+:	05d8      	addu	v1,a0,a1
 [ 0-9a-f]+:	40e3 fffe 	beqzc	v1,[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 045d 	addiu	at,at,1117
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	45a1      	jrc	at
 
 [0-9a-f]+ <.*>:
@@ -216,10 +216,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	401e fffe 	bltz	s8,[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0c00      	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 045d 	addiu	at,at,1117
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	45c1      	jalr	at
 
 [0-9a-f]+ <.*>:
@@ -227,10 +227,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	405e fffe 	bgez	s8,[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0c00      	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 045d 	addiu	at,at,1117
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	45c1      	jalr	at
 
 [0-9a-f]+ <.*>:
@@ -238,10 +238,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	401e fffe 	bltz	s8,[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0c00      	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 045d 	addiu	at,at,1117
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	45e1      	jalrs	at
 
 [0-9a-f]+ <.*>:
@@ -249,10 +249,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	405e fffe 	bgez	s8,[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0c00      	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 045d 	addiu	at,at,1117
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	45e1      	jalrs	at
 
 [0-9a-f]+ <.*>:
@@ -260,10 +260,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	43a0 fffe 	bc1t	[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0c00      	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 045d 	addiu	at,at,1117
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	4581      	jr	at
 
 [0-9a-f]+ <.*>:
@@ -271,10 +271,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	4380 fffe 	bc1f	[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0c00      	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 045d 	addiu	at,at,1117
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	4581      	jr	at
 
 [0-9a-f]+ <.*>:
@@ -282,10 +282,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	42a0 fffe 	bc2t	[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0c00      	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 045d 	addiu	at,at,1117
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	4581      	jr	at
 
 [0-9a-f]+ <.*>:
@@ -293,10 +293,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	4280 fffe 	bc2f	[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0c00      	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 045d 	addiu	at,at,1117
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	4581      	jr	at
 
 [0-9a-f]+ <.*>:
@@ -304,10 +304,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	b483 fffe 	bne	v1,a0,[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0c00      	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 045d 	addiu	at,at,1117
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	4581      	jr	at
 [ 0-9a-f]+:	05d8      	addu	v1,a0,a1
 
@@ -315,10 +315,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	b403 fffe 	bnez	v1,[0-9a-f]+ <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0c00      	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 045d 	addiu	at,at,1117
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	4581      	jr	at
 
 [0-9a-f]+ <.*>:
@@ -327,10 +327,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	b401 fffe 	bnez	at,[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0c00      	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 045d 	addiu	at,at,1117
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	4581      	jr	at
 
 [0-9a-f]+ <.*>:
@@ -339,10 +339,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	b401 fffe 	bnez	at,[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0c00      	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 045d 	addiu	at,at,1117
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	4581      	jr	at
 [ 0-9a-f]+:	00a4 1b10 	xor	v1,a0,a1
 
@@ -351,10 +351,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	b401 fffe 	bnez	at,[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0c00      	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 045d 	addiu	at,at,1117
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	4581      	jr	at
 
 [0-9a-f]+ <.*>:
@@ -363,10 +363,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	b401 fffe 	bnez	at,[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0c00      	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 045d 	addiu	at,at,1117
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	4581      	jr	at
 [ 0-9a-f]+:	00a4 1b10 	xor	v1,a0,a1
 
@@ -374,10 +374,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	4003 fffe 	bltz	v1,[0-9a-f]+ <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0c00      	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 045d 	addiu	at,at,1117
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	45c1      	jalr	at
 [ 0-9a-f]+:	00a4 1b10 	xor	v1,a0,a1
 
@@ -385,10 +385,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	4003 fffe 	bltz	v1,[0-9a-f]+ <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0c00      	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 045d 	addiu	at,at,1117
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	4581      	jr	at
 [ 0-9a-f]+:	00a4 1b10 	xor	v1,a0,a1
 
@@ -397,10 +397,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	9401 fffe 	beqz	at,[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0c00      	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 045d 	addiu	at,at,1117
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	4581      	jr	at
 
 [0-9a-f]+ <.*>:
@@ -409,10 +409,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	9401 fffe 	beqz	at,[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0c00      	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 045d 	addiu	at,at,1117
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	4581      	jr	at
 [ 0-9a-f]+:	00a4 1b10 	xor	v1,a0,a1
 
@@ -421,10 +421,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	9401 fffe 	beqz	at,[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0c00      	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 045d 	addiu	at,at,1117
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	4581      	jr	at
 
 [0-9a-f]+ <.*>:
@@ -433,10 +433,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	9401 fffe 	beqz	at,[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0c00      	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 045d 	addiu	at,at,1117
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	4581      	jr	at
 [ 0-9a-f]+:	00a4 1b10 	xor	v1,a0,a1
 
@@ -444,10 +444,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	4083 fffe 	blez	v1,[0-9a-f]+ <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0c00      	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 045d 	addiu	at,at,1117
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	4581      	jr	at
 [ 0-9a-f]+:	00a4 1b10 	xor	v1,a0,a1
 
@@ -456,10 +456,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	b401 fffe 	bnez	at,[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0c00      	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 045d 	addiu	at,at,1117
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	4581      	jr	at
 
 [0-9a-f]+ <.*>:
@@ -468,10 +468,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	b401 fffe 	bnez	at,[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0c00      	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 045d 	addiu	at,at,1117
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	4581      	jr	at
 [ 0-9a-f]+:	00a4 1b10 	xor	v1,a0,a1
 
@@ -480,10 +480,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	b401 fffe 	bnez	at,[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0c00      	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 045d 	addiu	at,at,1117
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	4581      	jr	at
 
 [0-9a-f]+ <.*>:
@@ -492,10 +492,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	b401 fffe 	bnez	at,[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0c00      	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 045d 	addiu	at,at,1117
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	4581      	jr	at
 [ 0-9a-f]+:	00a4 1b10 	xor	v1,a0,a1
 
@@ -503,10 +503,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	40c3 fffe 	bgtz	v1,[0-9a-f]+ <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0c00      	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 045d 	addiu	at,at,1117
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	4581      	jr	at
 [ 0-9a-f]+:	00a4 1b10 	xor	v1,a0,a1
 
@@ -515,10 +515,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	9401 fffe 	beqz	at,[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0c00      	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 045d 	addiu	at,at,1117
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	4581      	jr	at
 
 [0-9a-f]+ <.*>:
@@ -527,10 +527,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	9401 fffe 	beqz	at,[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0c00      	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 045d 	addiu	at,at,1117
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	4581      	jr	at
 [ 0-9a-f]+:	00a4 1b10 	xor	v1,a0,a1
 
@@ -539,10 +539,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	9401 fffe 	beqz	at,[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0c00      	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 045d 	addiu	at,at,1117
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	4581      	jr	at
 
 [0-9a-f]+ <.*>:
@@ -551,10 +551,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	9401 fffe 	beqz	at,[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0c00      	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 045d 	addiu	at,at,1117
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	4581      	jr	at
 [ 0-9a-f]+:	00a4 1b10 	xor	v1,a0,a1
 
@@ -562,10 +562,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	4043 fffe 	bgez	v1,[0-9a-f]+ <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0c00      	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 045d 	addiu	at,at,1117
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	45c1      	jalr	at
 [ 0-9a-f]+:	00a4 1b10 	xor	v1,a0,a1
 
@@ -573,10 +573,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	4043 fffe 	bgez	v1,[0-9a-f]+ <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0c00      	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 045d 	addiu	at,at,1117
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	4581      	jr	at
 [ 0-9a-f]+:	00a4 1b10 	xor	v1,a0,a1
 
@@ -584,10 +584,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	9483 fffe 	beq	v1,a0,[0-9a-f]+ <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0c00      	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 045d 	addiu	at,at,1117
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	4581      	jr	at
 [ 0-9a-f]+:	00a4 1b10 	xor	v1,a0,a1
 
@@ -595,10 +595,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	9403 fffe 	beqz	v1,[0-9a-f]+ <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0c00      	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 045d 	addiu	at,at,1117
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	4581      	jr	at
 
 [0-9a-f]+ <.*>:
@@ -606,10 +606,10 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	9403 fffe 	beqz	v1,[0-9a-f]+ <.*\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [ 0-9a-f]+:	0c00      	nop
-[ 0-9a-f]+:	fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[ 0-9a-f]+:	3021 045d 	addiu	at,at,1117
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 0-9a-f]+:	fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	test3
+[ 0-9a-f]+:	3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	test3
 [ 0-9a-f]+:	4581      	jr	at
 [ 0-9a-f]+:	00a4 1b10 	xor	v1,a0,a1
 
diff --git a/gas/testsuite/gas/mips/micromips-hilo-match.d b/gas/testsuite/gas/mips/micromips-hilo-match.d
index 216d0671f1d..76659bc9d22 100644
--- a/gas/testsuite/gas/mips/micromips-hilo-match.d
+++ b/gas/testsuite/gas/mips/micromips-hilo-match.d
@@ -24,8 +24,8 @@ OFFSET +TYPE +VALUE
 0000004c R_MIPS_26         func3
 00000024 R_MIPS_HI16       hilo_match
 00000050 R_MIPS_LO16       hilo_match
-0000005e R_MICROMIPS_HI16  .data
-00000068 R_MICROMIPS_LO16  .data
+0000005e R_MICROMIPS_HI16  var2
+00000068 R_MICROMIPS_LO16  var2
 0000006c R_MICROMIPS_26_S1  func1
 00000074 R_MICROMIPS_26_S1  func2
 0000007c R_MICROMIPS_HI16  hilo_match
diff --git a/gas/testsuite/gas/mips/micromips-hilo.d b/gas/testsuite/gas/mips/micromips-hilo.d
index e3f9d73753d..9c0e51bb1ed 100644
--- a/gas/testsuite/gas/mips/micromips-hilo.d
+++ b/gas/testsuite/gas/mips/micromips-hilo.d
@@ -11,13 +11,13 @@ Disassembly of section \.text:
 [ 	]*[0-9a-f]+:	41a4 0000 	lui	a0,0x0
 [ 	]*[0-9a-f]+:	3084 0000 	addiu	a0,a0,0
 [ 	]*[0-9a-f]+:	41a4 0000 	lui	a0,0x0
-[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	\.data
+[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	data_label
 [ 	]*[0-9a-f]+:	3084 0000 	addiu	a0,a0,0
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	data_label
 [ 	]*[0-9a-f]+:	41a4 0000 	lui	a0,0x0
-[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	\.data
-[ 	]*[0-9a-f]+:	3084 0004 	addiu	a0,a0,4
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	data_label2
+[ 	]*[0-9a-f]+:	3084 0000 	addiu	a0,a0,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	data_label2
 [ 	]*[0-9a-f]+:	41a4 0000 	lui	a0,0x0
 [ 	]*[0-9a-f]+: R_MICROMIPS_HI16	big_external_data_label
 [ 	]*[0-9a-f]+:	3084 0000 	addiu	a0,a0,0
@@ -35,23 +35,23 @@ Disassembly of section \.text:
 [ 	]*[0-9a-f]+:	3084 0000 	addiu	a0,a0,0
 [ 	]*[0-9a-f]+: R_MICROMIPS_LO16	small_external_common
 [ 	]*[0-9a-f]+:	41a4 0000 	lui	a0,0x0
-[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	\.bss
+[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	big_local_common
 [ 	]*[0-9a-f]+:	3084 0000 	addiu	a0,a0,0
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	big_local_common
 [ 	]*[0-9a-f]+:	41a4 0000 	lui	a0,0x0
-[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	\.sbss
+[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	small_local_common
 [ 	]*[0-9a-f]+:	3084 0000 	addiu	a0,a0,0
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.sbss
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	small_local_common
 [ 	]*[0-9a-f]+:	41a4 0000 	lui	a0,0x0
 [ 	]*[0-9a-f]+:	3084 0001 	addiu	a0,a0,1
 [ 	]*[0-9a-f]+:	41a4 0000 	lui	a0,0x0
-[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	\.data
+[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	data_label
 [ 	]*[0-9a-f]+:	3084 0001 	addiu	a0,a0,1
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	data_label
 [ 	]*[0-9a-f]+:	41a4 0000 	lui	a0,0x0
-[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	\.data
-[ 	]*[0-9a-f]+:	3084 0005 	addiu	a0,a0,5
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	data_label2
+[ 	]*[0-9a-f]+:	3084 0001 	addiu	a0,a0,1
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	data_label2
 [ 	]*[0-9a-f]+:	41a4 0000 	lui	a0,0x0
 [ 	]*[0-9a-f]+: R_MICROMIPS_HI16	big_external_data_label
 [ 	]*[0-9a-f]+:	3084 0001 	addiu	a0,a0,1
@@ -69,23 +69,23 @@ Disassembly of section \.text:
 [ 	]*[0-9a-f]+:	3084 0001 	addiu	a0,a0,1
 [ 	]*[0-9a-f]+: R_MICROMIPS_LO16	small_external_common
 [ 	]*[0-9a-f]+:	41a4 0000 	lui	a0,0x0
-[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	\.bss
+[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	big_local_common
 [ 	]*[0-9a-f]+:	3084 0001 	addiu	a0,a0,1
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	big_local_common
 [ 	]*[0-9a-f]+:	41a4 0000 	lui	a0,0x0
-[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	\.sbss
+[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	small_local_common
 [ 	]*[0-9a-f]+:	3084 0001 	addiu	a0,a0,1
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.sbss
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	small_local_common
 [ 	]*[0-9a-f]+:	41a4 0001 	lui	a0,0x1
 [ 	]*[0-9a-f]+:	3084 8000 	addiu	a0,a0,-32768
 [ 	]*[0-9a-f]+:	41a4 0001 	lui	a0,0x1
-[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	\.data
+[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	data_label
 [ 	]*[0-9a-f]+:	3084 8000 	addiu	a0,a0,-32768
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	data_label
 [ 	]*[0-9a-f]+:	41a4 0001 	lui	a0,0x1
-[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	\.data
-[ 	]*[0-9a-f]+:	3084 8004 	addiu	a0,a0,-32764
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	data_label2
+[ 	]*[0-9a-f]+:	3084 8000 	addiu	a0,a0,-32768
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	data_label2
 [ 	]*[0-9a-f]+:	41a4 0001 	lui	a0,0x1
 [ 	]*[0-9a-f]+: R_MICROMIPS_HI16	big_external_data_label
 [ 	]*[0-9a-f]+:	3084 8000 	addiu	a0,a0,-32768
@@ -103,23 +103,23 @@ Disassembly of section \.text:
 [ 	]*[0-9a-f]+:	3084 8000 	addiu	a0,a0,-32768
 [ 	]*[0-9a-f]+: R_MICROMIPS_LO16	small_external_common
 [ 	]*[0-9a-f]+:	41a4 0001 	lui	a0,0x1
-[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	\.bss
+[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	big_local_common
 [ 	]*[0-9a-f]+:	3084 8000 	addiu	a0,a0,-32768
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	big_local_common
 [ 	]*[0-9a-f]+:	41a4 0001 	lui	a0,0x1
-[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	\.sbss
+[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	small_local_common
 [ 	]*[0-9a-f]+:	3084 8000 	addiu	a0,a0,-32768
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.sbss
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	small_local_common
 [ 	]*[0-9a-f]+:	41a4 0000 	lui	a0,0x0
 [ 	]*[0-9a-f]+:	3084 8000 	addiu	a0,a0,-32768
 [ 	]*[0-9a-f]+:	41a4 0000 	lui	a0,0x0
-[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	\.data
+[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	data_label
 [ 	]*[0-9a-f]+:	3084 8000 	addiu	a0,a0,-32768
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	data_label
 [ 	]*[0-9a-f]+:	41a4 0000 	lui	a0,0x0
-[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	\.data
-[ 	]*[0-9a-f]+:	3084 8004 	addiu	a0,a0,-32764
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	data_label2
+[ 	]*[0-9a-f]+:	3084 8000 	addiu	a0,a0,-32768
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	data_label2
 [ 	]*[0-9a-f]+:	41a4 0000 	lui	a0,0x0
 [ 	]*[0-9a-f]+: R_MICROMIPS_HI16	big_external_data_label
 [ 	]*[0-9a-f]+:	3084 8000 	addiu	a0,a0,-32768
@@ -137,23 +137,23 @@ Disassembly of section \.text:
 [ 	]*[0-9a-f]+:	3084 8000 	addiu	a0,a0,-32768
 [ 	]*[0-9a-f]+: R_MICROMIPS_LO16	small_external_common
 [ 	]*[0-9a-f]+:	41a4 0000 	lui	a0,0x0
-[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	\.bss
+[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	big_local_common
 [ 	]*[0-9a-f]+:	3084 8000 	addiu	a0,a0,-32768
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	big_local_common
 [ 	]*[0-9a-f]+:	41a4 0000 	lui	a0,0x0
-[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	\.sbss
+[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	small_local_common
 [ 	]*[0-9a-f]+:	3084 8000 	addiu	a0,a0,-32768
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.sbss
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	small_local_common
 [ 	]*[0-9a-f]+:	41a4 0001 	lui	a0,0x1
 [ 	]*[0-9a-f]+:	3084 0000 	addiu	a0,a0,0
 [ 	]*[0-9a-f]+:	41a4 0001 	lui	a0,0x1
-[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	\.data
+[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	data_label
 [ 	]*[0-9a-f]+:	3084 0000 	addiu	a0,a0,0
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	data_label
 [ 	]*[0-9a-f]+:	41a4 0001 	lui	a0,0x1
-[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	\.data
-[ 	]*[0-9a-f]+:	3084 0004 	addiu	a0,a0,4
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	data_label2
+[ 	]*[0-9a-f]+:	3084 0000 	addiu	a0,a0,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	data_label2
 [ 	]*[0-9a-f]+:	41a4 0001 	lui	a0,0x1
 [ 	]*[0-9a-f]+: R_MICROMIPS_HI16	big_external_data_label
 [ 	]*[0-9a-f]+:	3084 0000 	addiu	a0,a0,0
@@ -171,23 +171,23 @@ Disassembly of section \.text:
 [ 	]*[0-9a-f]+:	3084 0000 	addiu	a0,a0,0
 [ 	]*[0-9a-f]+: R_MICROMIPS_LO16	small_external_common
 [ 	]*[0-9a-f]+:	41a4 0001 	lui	a0,0x1
-[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	\.bss
+[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	big_local_common
 [ 	]*[0-9a-f]+:	3084 0000 	addiu	a0,a0,0
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	big_local_common
 [ 	]*[0-9a-f]+:	41a4 0001 	lui	a0,0x1
-[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	\.sbss
+[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	small_local_common
 [ 	]*[0-9a-f]+:	3084 0000 	addiu	a0,a0,0
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.sbss
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	small_local_common
 [ 	]*[0-9a-f]+:	41a4 0002 	lui	a0,0x2
 [ 	]*[0-9a-f]+:	3084 a5a5 	addiu	a0,a0,-23131
 [ 	]*[0-9a-f]+:	41a4 0002 	lui	a0,0x2
-[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	\.data
+[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	data_label
 [ 	]*[0-9a-f]+:	3084 a5a5 	addiu	a0,a0,-23131
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	data_label
 [ 	]*[0-9a-f]+:	41a4 0002 	lui	a0,0x2
-[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	\.data
-[ 	]*[0-9a-f]+:	3084 a5a9 	addiu	a0,a0,-23127
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	data_label2
+[ 	]*[0-9a-f]+:	3084 a5a5 	addiu	a0,a0,-23131
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	data_label2
 [ 	]*[0-9a-f]+:	41a4 0002 	lui	a0,0x2
 [ 	]*[0-9a-f]+: R_MICROMIPS_HI16	big_external_data_label
 [ 	]*[0-9a-f]+:	3084 a5a5 	addiu	a0,a0,-23131
@@ -205,23 +205,23 @@ Disassembly of section \.text:
 [ 	]*[0-9a-f]+:	3084 a5a5 	addiu	a0,a0,-23131
 [ 	]*[0-9a-f]+: R_MICROMIPS_LO16	small_external_common
 [ 	]*[0-9a-f]+:	41a4 0002 	lui	a0,0x2
-[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	\.bss
+[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	big_local_common
 [ 	]*[0-9a-f]+:	3084 a5a5 	addiu	a0,a0,-23131
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	big_local_common
 [ 	]*[0-9a-f]+:	41a4 0002 	lui	a0,0x2
-[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	\.sbss
+[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	small_local_common
 [ 	]*[0-9a-f]+:	3084 a5a5 	addiu	a0,a0,-23131
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.sbss
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	small_local_common
 [ 	]*[0-9a-f]+:	41a5 0000 	lui	a1,0x0
 [ 	]*[0-9a-f]+:	fc85 0000 	lw	a0,0\(a1\)
 [ 	]*[0-9a-f]+:	41a5 0000 	lui	a1,0x0
-[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	\.data
+[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	data_label
 [ 	]*[0-9a-f]+:	fc85 0000 	lw	a0,0\(a1\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	data_label
 [ 	]*[0-9a-f]+:	41a5 0000 	lui	a1,0x0
-[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	\.data
-[ 	]*[0-9a-f]+:	fc85 0004 	lw	a0,4\(a1\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	data_label2
+[ 	]*[0-9a-f]+:	fc85 0000 	lw	a0,0\(a1\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	data_label2
 [ 	]*[0-9a-f]+:	41a5 0000 	lui	a1,0x0
 [ 	]*[0-9a-f]+: R_MICROMIPS_HI16	big_external_data_label
 [ 	]*[0-9a-f]+:	fc85 0000 	lw	a0,0\(a1\)
@@ -239,23 +239,23 @@ Disassembly of section \.text:
 [ 	]*[0-9a-f]+:	fc85 0000 	lw	a0,0\(a1\)
 [ 	]*[0-9a-f]+: R_MICROMIPS_LO16	small_external_common
 [ 	]*[0-9a-f]+:	41a5 0000 	lui	a1,0x0
-[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	\.bss
+[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	big_local_common
 [ 	]*[0-9a-f]+:	fc85 0000 	lw	a0,0\(a1\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	big_local_common
 [ 	]*[0-9a-f]+:	41a5 0000 	lui	a1,0x0
-[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	\.sbss
+[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	small_local_common
 [ 	]*[0-9a-f]+:	fc85 0000 	lw	a0,0\(a1\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.sbss
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	small_local_common
 [ 	]*[0-9a-f]+:	41a5 0000 	lui	a1,0x0
 [ 	]*[0-9a-f]+:	fc85 0001 	lw	a0,1\(a1\)
 [ 	]*[0-9a-f]+:	41a5 0000 	lui	a1,0x0
-[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	\.data
+[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	data_label
 [ 	]*[0-9a-f]+:	fc85 0001 	lw	a0,1\(a1\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	data_label
 [ 	]*[0-9a-f]+:	41a5 0000 	lui	a1,0x0
-[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	\.data
-[ 	]*[0-9a-f]+:	fc85 0005 	lw	a0,5\(a1\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	data_label2
+[ 	]*[0-9a-f]+:	fc85 0001 	lw	a0,1\(a1\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	data_label2
 [ 	]*[0-9a-f]+:	41a5 0000 	lui	a1,0x0
 [ 	]*[0-9a-f]+: R_MICROMIPS_HI16	big_external_data_label
 [ 	]*[0-9a-f]+:	fc85 0001 	lw	a0,1\(a1\)
@@ -273,23 +273,23 @@ Disassembly of section \.text:
 [ 	]*[0-9a-f]+:	fc85 0001 	lw	a0,1\(a1\)
 [ 	]*[0-9a-f]+: R_MICROMIPS_LO16	small_external_common
 [ 	]*[0-9a-f]+:	41a5 0000 	lui	a1,0x0
-[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	\.bss
+[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	big_local_common
 [ 	]*[0-9a-f]+:	fc85 0001 	lw	a0,1\(a1\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	big_local_common
 [ 	]*[0-9a-f]+:	41a5 0000 	lui	a1,0x0
-[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	\.sbss
+[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	small_local_common
 [ 	]*[0-9a-f]+:	fc85 0001 	lw	a0,1\(a1\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.sbss
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	small_local_common
 [ 	]*[0-9a-f]+:	41a5 0001 	lui	a1,0x1
 [ 	]*[0-9a-f]+:	fc85 8000 	lw	a0,-32768\(a1\)
 [ 	]*[0-9a-f]+:	41a5 0001 	lui	a1,0x1
-[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	\.data
+[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	data_label
 [ 	]*[0-9a-f]+:	fc85 8000 	lw	a0,-32768\(a1\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	data_label
 [ 	]*[0-9a-f]+:	41a5 0001 	lui	a1,0x1
-[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	\.data
-[ 	]*[0-9a-f]+:	fc85 8004 	lw	a0,-32764\(a1\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	data_label2
+[ 	]*[0-9a-f]+:	fc85 8000 	lw	a0,-32768\(a1\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	data_label2
 [ 	]*[0-9a-f]+:	41a5 0001 	lui	a1,0x1
 [ 	]*[0-9a-f]+: R_MICROMIPS_HI16	big_external_data_label
 [ 	]*[0-9a-f]+:	fc85 8000 	lw	a0,-32768\(a1\)
@@ -307,23 +307,23 @@ Disassembly of section \.text:
 [ 	]*[0-9a-f]+:	fc85 8000 	lw	a0,-32768\(a1\)
 [ 	]*[0-9a-f]+: R_MICROMIPS_LO16	small_external_common
 [ 	]*[0-9a-f]+:	41a5 0001 	lui	a1,0x1
-[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	\.bss
+[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	big_local_common
 [ 	]*[0-9a-f]+:	fc85 8000 	lw	a0,-32768\(a1\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	big_local_common
 [ 	]*[0-9a-f]+:	41a5 0001 	lui	a1,0x1
-[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	\.sbss
+[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	small_local_common
 [ 	]*[0-9a-f]+:	fc85 8000 	lw	a0,-32768\(a1\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.sbss
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	small_local_common
 [ 	]*[0-9a-f]+:	41a5 0000 	lui	a1,0x0
 [ 	]*[0-9a-f]+:	fc85 8000 	lw	a0,-32768\(a1\)
 [ 	]*[0-9a-f]+:	41a5 0000 	lui	a1,0x0
-[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	\.data
+[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	data_label
 [ 	]*[0-9a-f]+:	fc85 8000 	lw	a0,-32768\(a1\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	data_label
 [ 	]*[0-9a-f]+:	41a5 0000 	lui	a1,0x0
-[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	\.data
-[ 	]*[0-9a-f]+:	fc85 8004 	lw	a0,-32764\(a1\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	data_label2
+[ 	]*[0-9a-f]+:	fc85 8000 	lw	a0,-32768\(a1\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	data_label2
 [ 	]*[0-9a-f]+:	41a5 0000 	lui	a1,0x0
 [ 	]*[0-9a-f]+: R_MICROMIPS_HI16	big_external_data_label
 [ 	]*[0-9a-f]+:	fc85 8000 	lw	a0,-32768\(a1\)
@@ -341,23 +341,23 @@ Disassembly of section \.text:
 [ 	]*[0-9a-f]+:	fc85 8000 	lw	a0,-32768\(a1\)
 [ 	]*[0-9a-f]+: R_MICROMIPS_LO16	small_external_common
 [ 	]*[0-9a-f]+:	41a5 0000 	lui	a1,0x0
-[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	\.bss
+[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	big_local_common
 [ 	]*[0-9a-f]+:	fc85 8000 	lw	a0,-32768\(a1\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	big_local_common
 [ 	]*[0-9a-f]+:	41a5 0000 	lui	a1,0x0
-[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	\.sbss
+[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	small_local_common
 [ 	]*[0-9a-f]+:	fc85 8000 	lw	a0,-32768\(a1\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.sbss
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	small_local_common
 [ 	]*[0-9a-f]+:	41a5 0001 	lui	a1,0x1
 [ 	]*[0-9a-f]+:	fc85 0000 	lw	a0,0\(a1\)
 [ 	]*[0-9a-f]+:	41a5 0001 	lui	a1,0x1
-[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	\.data
+[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	data_label
 [ 	]*[0-9a-f]+:	fc85 0000 	lw	a0,0\(a1\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	data_label
 [ 	]*[0-9a-f]+:	41a5 0001 	lui	a1,0x1
-[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	\.data
-[ 	]*[0-9a-f]+:	fc85 0004 	lw	a0,4\(a1\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	data_label2
+[ 	]*[0-9a-f]+:	fc85 0000 	lw	a0,0\(a1\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	data_label2
 [ 	]*[0-9a-f]+:	41a5 0001 	lui	a1,0x1
 [ 	]*[0-9a-f]+: R_MICROMIPS_HI16	big_external_data_label
 [ 	]*[0-9a-f]+:	fc85 0000 	lw	a0,0\(a1\)
@@ -375,23 +375,23 @@ Disassembly of section \.text:
 [ 	]*[0-9a-f]+:	fc85 0000 	lw	a0,0\(a1\)
 [ 	]*[0-9a-f]+: R_MICROMIPS_LO16	small_external_common
 [ 	]*[0-9a-f]+:	41a5 0001 	lui	a1,0x1
-[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	\.bss
+[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	big_local_common
 [ 	]*[0-9a-f]+:	fc85 0000 	lw	a0,0\(a1\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	big_local_common
 [ 	]*[0-9a-f]+:	41a5 0001 	lui	a1,0x1
-[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	\.sbss
+[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	small_local_common
 [ 	]*[0-9a-f]+:	fc85 0000 	lw	a0,0\(a1\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.sbss
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	small_local_common
 [ 	]*[0-9a-f]+:	41a5 0002 	lui	a1,0x2
 [ 	]*[0-9a-f]+:	fc85 a5a5 	lw	a0,-23131\(a1\)
 [ 	]*[0-9a-f]+:	41a5 0002 	lui	a1,0x2
-[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	\.data
+[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	data_label
 [ 	]*[0-9a-f]+:	fc85 a5a5 	lw	a0,-23131\(a1\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	data_label
 [ 	]*[0-9a-f]+:	41a5 0002 	lui	a1,0x2
-[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	\.data
-[ 	]*[0-9a-f]+:	fc85 a5a9 	lw	a0,-23127\(a1\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	data_label2
+[ 	]*[0-9a-f]+:	fc85 a5a5 	lw	a0,-23131\(a1\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	data_label2
 [ 	]*[0-9a-f]+:	41a5 0002 	lui	a1,0x2
 [ 	]*[0-9a-f]+: R_MICROMIPS_HI16	big_external_data_label
 [ 	]*[0-9a-f]+:	fc85 a5a5 	lw	a0,-23131\(a1\)
@@ -409,11 +409,11 @@ Disassembly of section \.text:
 [ 	]*[0-9a-f]+:	fc85 a5a5 	lw	a0,-23131\(a1\)
 [ 	]*[0-9a-f]+: R_MICROMIPS_LO16	small_external_common
 [ 	]*[0-9a-f]+:	41a5 0002 	lui	a1,0x2
-[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	\.bss
+[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	big_local_common
 [ 	]*[0-9a-f]+:	fc85 a5a5 	lw	a0,-23131\(a1\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	big_local_common
 [ 	]*[0-9a-f]+:	41a5 0002 	lui	a1,0x2
-[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	\.sbss
+[ 	]*[0-9a-f]+: R_MICROMIPS_HI16	small_local_common
 [ 	]*[0-9a-f]+:	fc85 a5a5 	lw	a0,-23131\(a1\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.sbss
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	small_local_common
 	\.\.\.
diff --git a/gas/testsuite/gas/mips/micromips@jal-svr4pic-local.d b/gas/testsuite/gas/mips/micromips@jal-svr4pic-local.d
index b625c4f7fde..e697669a72a 100644
--- a/gas/testsuite/gas/mips/micromips@jal-svr4pic-local.d
+++ b/gas/testsuite/gas/mips/micromips@jal-svr4pic-local.d
@@ -15,9 +15,9 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> cbe7      	sw	ra,28\(sp\)
 [0-9a-f]+ <[^>]*> fb9d 0010 	sw	gp,16\(sp\)
 [0-9a-f]+ <[^>]*> ff3c 0000 	lw	t9,0\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 3339 0031 	addiu	t9,t9,49
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	bar
+[0-9a-f]+ <[^>]*> 3339 0000 	addiu	t9,t9,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	bar
 [0-9a-f]+ <[^>]*> 03f9 4f3c 	jalrs	t9
 [ 	]*[0-9a-f]+: R_MICROMIPS_JALR	bar
 [0-9a-f]+ <[^>]*> 0c00      	nop
diff --git a/gas/testsuite/gas/mips/micromips@jal-svr4pic-noreorder.d b/gas/testsuite/gas/mips/micromips@jal-svr4pic-noreorder.d
index 1a5a48373fa..92840cce003 100644
--- a/gas/testsuite/gas/mips/micromips@jal-svr4pic-noreorder.d
+++ b/gas/testsuite/gas/mips/micromips@jal-svr4pic-noreorder.d
@@ -21,9 +21,9 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> 0c00      	nop
 [0-9a-f]+ <[^>]*> ff9d 0000 	lw	gp,0\(sp\)
 [0-9a-f]+ <[^>]*> ff3c 0000 	lw	t9,0\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 3339 0001 	addiu	t9,t9,1
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	text_label
+[0-9a-f]+ <[^>]*> 3339 0000 	addiu	t9,t9,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	text_label
 [0-9a-f]+ <[^>]*> 03f9 4f3c 	jalrs	t9
 [ 	]*[0-9a-f]+: R_MICROMIPS_JALR	text_label
 [0-9a-f]+ <[^>]*> 0c00      	nop
diff --git a/gas/testsuite/gas/mips/micromips@jal-svr4pic.d b/gas/testsuite/gas/mips/micromips@jal-svr4pic.d
index 75ae1fdfd3c..f171e6a8789 100644
--- a/gas/testsuite/gas/mips/micromips@jal-svr4pic.d
+++ b/gas/testsuite/gas/mips/micromips@jal-svr4pic.d
@@ -21,9 +21,9 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> 0c00      	nop
 [0-9a-f]+ <[^>]*> ff9d 0000 	lw	gp,0\(sp\)
 [0-9a-f]+ <[^>]*> ff3c 0000 	lw	t9,0\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 3339 0001 	addiu	t9,t9,1
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	text_label
+[0-9a-f]+ <[^>]*> 3339 0000 	addiu	t9,t9,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	text_label
 [0-9a-f]+ <[^>]*> 03f9 4f3c 	jalrs	t9
 [ 	]*[0-9a-f]+: R_MICROMIPS_JALR	text_label
 [0-9a-f]+ <[^>]*> 0c00      	nop
diff --git a/gas/testsuite/gas/mips/micromips@lb-svr4pic-ilocks.d b/gas/testsuite/gas/mips/micromips@lb-svr4pic-ilocks.d
index 45bf1e174db..e1c3543ff8d 100644
--- a/gas/testsuite/gas/mips/micromips@lb-svr4pic-ilocks.d
+++ b/gas/testsuite/gas/mips/micromips@lb-svr4pic-ilocks.d
@@ -30,9 +30,9 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> 00a4 2150 	addu	a0,a0,a1
 [0-9a-f]+ <[^>]*> 1c84 a5a5 	lb	a0,-23131\(a0\)
 [0-9a-f]+ <[^>]*> fc9c 0000 	lw	a0,0\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.data
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	data_label
 [0-9a-f]+ <[^>]*> 3084 0000 	addiu	a0,a0,0
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	data_label
 [0-9a-f]+ <[^>]*> 1c84 0000 	lb	a0,0\(a0\)
 [0-9a-f]+ <[^>]*> fc9c 0000 	lw	a0,0\(gp\)
 [ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	big_external_data_label
@@ -47,19 +47,19 @@ Disassembly of section \.text:
 [ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	small_external_common
 [0-9a-f]+ <[^>]*> 1c84 0000 	lb	a0,0\(a0\)
 [0-9a-f]+ <[^>]*> fc9c 0000 	lw	a0,0\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.bss
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	big_local_common
 [0-9a-f]+ <[^>]*> 3084 0000 	addiu	a0,a0,0
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	big_local_common
 [0-9a-f]+ <[^>]*> 1c84 0000 	lb	a0,0\(a0\)
 [0-9a-f]+ <[^>]*> fc9c 0000 	lw	a0,0\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.bss
-[0-9a-f]+ <[^>]*> 3084 03e8 	addiu	a0,a0,1000
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	small_local_common
+[0-9a-f]+ <[^>]*> 3084 0000 	addiu	a0,a0,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	small_local_common
 [0-9a-f]+ <[^>]*> 1c84 0000 	lb	a0,0\(a0\)
 [0-9a-f]+ <[^>]*> fc9c 0000 	lw	a0,0\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.data
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	data_label
 [0-9a-f]+ <[^>]*> 3084 0000 	addiu	a0,a0,0
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	data_label
 [0-9a-f]+ <[^>]*> 1c84 0001 	lb	a0,1\(a0\)
 [0-9a-f]+ <[^>]*> fc9c 0000 	lw	a0,0\(gp\)
 [ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	big_external_data_label
@@ -74,19 +74,19 @@ Disassembly of section \.text:
 [ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	small_external_common
 [0-9a-f]+ <[^>]*> 1c84 0001 	lb	a0,1\(a0\)
 [0-9a-f]+ <[^>]*> fc9c 0000 	lw	a0,0\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.bss
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	big_local_common
 [0-9a-f]+ <[^>]*> 3084 0000 	addiu	a0,a0,0
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	big_local_common
 [0-9a-f]+ <[^>]*> 1c84 0001 	lb	a0,1\(a0\)
 [0-9a-f]+ <[^>]*> fc9c 0000 	lw	a0,0\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.bss
-[0-9a-f]+ <[^>]*> 3084 03e8 	addiu	a0,a0,1000
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	small_local_common
+[0-9a-f]+ <[^>]*> 3084 0000 	addiu	a0,a0,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	small_local_common
 [0-9a-f]+ <[^>]*> 1c84 0001 	lb	a0,1\(a0\)
 [0-9a-f]+ <[^>]*> fc9c 0000 	lw	a0,0\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.data
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	data_label
 [0-9a-f]+ <[^>]*> 3084 0000 	addiu	a0,a0,0
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	data_label
 [0-9a-f]+ <[^>]*> 00a4 2150 	addu	a0,a0,a1
 [0-9a-f]+ <[^>]*> 1c84 0000 	lb	a0,0\(a0\)
 [0-9a-f]+ <[^>]*> fc9c 0000 	lw	a0,0\(gp\)
@@ -106,21 +106,21 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> 00a4 2150 	addu	a0,a0,a1
 [0-9a-f]+ <[^>]*> 1c84 0000 	lb	a0,0\(a0\)
 [0-9a-f]+ <[^>]*> fc9c 0000 	lw	a0,0\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.bss
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	big_local_common
 [0-9a-f]+ <[^>]*> 3084 0000 	addiu	a0,a0,0
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	big_local_common
 [0-9a-f]+ <[^>]*> 00a4 2150 	addu	a0,a0,a1
 [0-9a-f]+ <[^>]*> 1c84 0000 	lb	a0,0\(a0\)
 [0-9a-f]+ <[^>]*> fc9c 0000 	lw	a0,0\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.bss
-[0-9a-f]+ <[^>]*> 3084 03e8 	addiu	a0,a0,1000
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	small_local_common
+[0-9a-f]+ <[^>]*> 3084 0000 	addiu	a0,a0,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	small_local_common
 [0-9a-f]+ <[^>]*> 00a4 2150 	addu	a0,a0,a1
 [0-9a-f]+ <[^>]*> 1c84 0000 	lb	a0,0\(a0\)
 [0-9a-f]+ <[^>]*> fc9c 0000 	lw	a0,0\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.data
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	data_label
 [0-9a-f]+ <[^>]*> 3084 0000 	addiu	a0,a0,0
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	data_label
 [0-9a-f]+ <[^>]*> 00a4 2150 	addu	a0,a0,a1
 [0-9a-f]+ <[^>]*> 1c84 0001 	lb	a0,1\(a0\)
 [0-9a-f]+ <[^>]*> fc9c 0000 	lw	a0,0\(gp\)
@@ -140,15 +140,15 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> 00a4 2150 	addu	a0,a0,a1
 [0-9a-f]+ <[^>]*> 1c84 0001 	lb	a0,1\(a0\)
 [0-9a-f]+ <[^>]*> fc9c 0000 	lw	a0,0\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.bss
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	big_local_common
 [0-9a-f]+ <[^>]*> 3084 0000 	addiu	a0,a0,0
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	big_local_common
 [0-9a-f]+ <[^>]*> 00a4 2150 	addu	a0,a0,a1
 [0-9a-f]+ <[^>]*> 1c84 0001 	lb	a0,1\(a0\)
 [0-9a-f]+ <[^>]*> fc9c 0000 	lw	a0,0\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.bss
-[0-9a-f]+ <[^>]*> 3084 03e8 	addiu	a0,a0,1000
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	small_local_common
+[0-9a-f]+ <[^>]*> 3084 0000 	addiu	a0,a0,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	small_local_common
 [0-9a-f]+ <[^>]*> 00a4 2150 	addu	a0,a0,a1
 [0-9a-f]+ <[^>]*> 1c84 0001 	lb	a0,1\(a0\)
 [0-9a-f]+ <[^>]*> 0c00      	nop
diff --git a/gas/testsuite/gas/mips/micromips@lui.d b/gas/testsuite/gas/mips/micromips@lui.d
index 882bff0d365..10dc17fda7a 100644
--- a/gas/testsuite/gas/mips/micromips@lui.d
+++ b/gas/testsuite/gas/mips/micromips@lui.d
@@ -12,14 +12,14 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> 41a2 0008 	lui	v0,0x8
 [0-9a-f]+ <[^>]*> 41a2 000c 	lui	v0,0xc
 [0-9a-f]+ <[^>]*> 41a2 000c 	lui	v0,0xc
-[0-9a-f]+ <[^>]*> 41a2 000d 	lui	v0,0xd
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[0-9a-f]+ <[^>]*> 41a2 0000 	lui	v0,0x0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	bar
 [0-9a-f]+ <[^>]*> 41a2 0000 	lui	v0,0x0
 [ 	]*[0-9a-f]+: R_MICROMIPS_LO16	ext
-[0-9a-f]+ <[^>]*> 41a2 0021 	lui	v0,0x21
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
-[0-9a-f]+ <[^>]*> 41a2 0029 	lui	v0,0x29
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[0-9a-f]+ <[^>]*> 41a2 0000 	lui	v0,0x0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.L3.B1
+[0-9a-f]+ <[^>]*> 41a2 0000 	lui	v0,0x0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.L4.B1
 [0-9a-f]+ <[^>]*> 41a2 0000 	lui	v0,0x0
 [0-9a-f]+ <[^>]*> 41a2 ffff 	lui	v0,0xffff
 	\.\.\.
diff --git a/gas/testsuite/gas/mips/micromips@relax-at.d b/gas/testsuite/gas/mips/micromips@relax-at.d
index c8711f0eaa6..5c75b047d89 100644
--- a/gas/testsuite/gas/mips/micromips@relax-at.d
+++ b/gas/testsuite/gas/mips/micromips@relax-at.d
@@ -9,371 +9,371 @@
 .*: +file format .*mips.*
 
 Disassembly of section \.text:
-[0-9a-f]+ <[^>]*> ff5c 0002 	lw	k0,2\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 335a 0175 	addiu	k0,k0,373
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[0-9a-f]+ <[^>]*> ff5c 0000 	lw	k0,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	bar
+[0-9a-f]+ <[^>]*> 335a 0000 	addiu	k0,k0,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	bar
 [0-9a-f]+ <[^>]*> 45ba      	jrc	k0
-[0-9a-f]+ <[^>]*> ff5c 0002 	lw	k0,2\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 335a 0175 	addiu	k0,k0,373
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[0-9a-f]+ <[^>]*> ff5c 0000 	lw	k0,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	bar
+[0-9a-f]+ <[^>]*> 335a 0000 	addiu	k0,k0,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	bar
 [0-9a-f]+ <[^>]*> 45da      	jalr	k0
 [0-9a-f]+ <[^>]*> 0000 0000 	nop
 ([0-9a-f]+) <[^>]*> b462 fffe 	bne	v0,v1,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
-[0-9a-f]+ <[^>]*> ff5c 0002 	lw	k0,2\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 335a 0175 	addiu	k0,k0,373
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[0-9a-f]+ <[^>]*> ff5c 0000 	lw	k0,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	bar
+[0-9a-f]+ <[^>]*> 335a 0000 	addiu	k0,k0,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	bar
 [0-9a-f]+ <[^>]*> 45ba      	jrc	k0
 ([0-9a-f]+) <[^>]*> 94a4 fffe 	beq	a0,a1,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
-[0-9a-f]+ <[^>]*> ff5c 0002 	lw	k0,2\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 335a 0175 	addiu	k0,k0,373
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[0-9a-f]+ <[^>]*> ff5c 0000 	lw	k0,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	bar
+[0-9a-f]+ <[^>]*> 335a 0000 	addiu	k0,k0,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	bar
 [0-9a-f]+ <[^>]*> 45ba      	jrc	k0
 ([0-9a-f]+) <[^>]*> 40c2 fffe 	bgtz	v0,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
-[0-9a-f]+ <[^>]*> ff5c 0002 	lw	k0,2\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 335a 0175 	addiu	k0,k0,373
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[0-9a-f]+ <[^>]*> ff5c 0000 	lw	k0,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	bar
+[0-9a-f]+ <[^>]*> 335a 0000 	addiu	k0,k0,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	bar
 [0-9a-f]+ <[^>]*> 45ba      	jrc	k0
 ([0-9a-f]+) <[^>]*> 4083 fffe 	blez	v1,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
-[0-9a-f]+ <[^>]*> ff5c 0002 	lw	k0,2\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 335a 0175 	addiu	k0,k0,373
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[0-9a-f]+ <[^>]*> ff5c 0000 	lw	k0,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	bar
+[0-9a-f]+ <[^>]*> 335a 0000 	addiu	k0,k0,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	bar
 [0-9a-f]+ <[^>]*> 45ba      	jrc	k0
 ([0-9a-f]+) <[^>]*> 4044 fffe 	bgez	a0,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
-[0-9a-f]+ <[^>]*> ff5c 0002 	lw	k0,2\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 335a 0175 	addiu	k0,k0,373
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[0-9a-f]+ <[^>]*> ff5c 0000 	lw	k0,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	bar
+[0-9a-f]+ <[^>]*> 335a 0000 	addiu	k0,k0,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	bar
 [0-9a-f]+ <[^>]*> 45ba      	jrc	k0
 ([0-9a-f]+) <[^>]*> 4005 fffe 	bltz	a1,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
-[0-9a-f]+ <[^>]*> ff5c 0002 	lw	k0,2\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 335a 0175 	addiu	k0,k0,373
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[0-9a-f]+ <[^>]*> ff5c 0000 	lw	k0,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	bar
+[0-9a-f]+ <[^>]*> 335a 0000 	addiu	k0,k0,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	bar
 [0-9a-f]+ <[^>]*> 45ba      	jrc	k0
 ([0-9a-f]+) <[^>]*> 43a0 fffe 	bc1t	\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
-[0-9a-f]+ <[^>]*> ff5c 0002 	lw	k0,2\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 335a 0175 	addiu	k0,k0,373
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[0-9a-f]+ <[^>]*> ff5c 0000 	lw	k0,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	bar
+[0-9a-f]+ <[^>]*> 335a 0000 	addiu	k0,k0,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	bar
 [0-9a-f]+ <[^>]*> 45ba      	jrc	k0
 ([0-9a-f]+) <[^>]*> 4380 fffe 	bc1f	\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
-[0-9a-f]+ <[^>]*> ff5c 0002 	lw	k0,2\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 335a 0175 	addiu	k0,k0,373
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[0-9a-f]+ <[^>]*> ff5c 0000 	lw	k0,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	bar
+[0-9a-f]+ <[^>]*> 335a 0000 	addiu	k0,k0,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	bar
 [0-9a-f]+ <[^>]*> 45ba      	jrc	k0
 ([0-9a-f]+) <[^>]*> 4042 fffe 	bgez	v0,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
-[0-9a-f]+ <[^>]*> ff5c 0002 	lw	k0,2\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 335a 0175 	addiu	k0,k0,373
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[0-9a-f]+ <[^>]*> ff5c 0000 	lw	k0,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	bar
+[0-9a-f]+ <[^>]*> 335a 0000 	addiu	k0,k0,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	bar
 [0-9a-f]+ <[^>]*> 45da      	jalr	k0
 [0-9a-f]+ <[^>]*> 0000 0000 	nop
 ([0-9a-f]+) <[^>]*> 4003 fffe 	bltz	v1,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
-[0-9a-f]+ <[^>]*> ff5c 0002 	lw	k0,2\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 335a 0175 	addiu	k0,k0,373
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[0-9a-f]+ <[^>]*> ff5c 0000 	lw	k0,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	bar
+[0-9a-f]+ <[^>]*> 335a 0000 	addiu	k0,k0,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	bar
 [0-9a-f]+ <[^>]*> 45da      	jalr	k0
 [0-9a-f]+ <[^>]*> 0000 0000 	nop
 ([0-9a-f]+) <[^>]*> b462 fffe 	bne	v0,v1,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
-[0-9a-f]+ <[^>]*> ff5c 0002 	lw	k0,2\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 335a 0175 	addiu	k0,k0,373
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[0-9a-f]+ <[^>]*> ff5c 0000 	lw	k0,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	bar
+[0-9a-f]+ <[^>]*> 335a 0000 	addiu	k0,k0,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	bar
 [0-9a-f]+ <[^>]*> 459a      	jr	k0
 [0-9a-f]+ <[^>]*> 0c00      	nop
 ([0-9a-f]+) <[^>]*> 94a4 fffe 	beq	a0,a1,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
-[0-9a-f]+ <[^>]*> ff5c 0002 	lw	k0,2\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 335a 0175 	addiu	k0,k0,373
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[0-9a-f]+ <[^>]*> ff5c 0000 	lw	k0,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	bar
+[0-9a-f]+ <[^>]*> 335a 0000 	addiu	k0,k0,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	bar
 [0-9a-f]+ <[^>]*> 459a      	jr	k0
 [0-9a-f]+ <[^>]*> 0c00      	nop
 ([0-9a-f]+) <[^>]*> 40c2 fffe 	bgtz	v0,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
-[0-9a-f]+ <[^>]*> ff5c 0002 	lw	k0,2\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 335a 0175 	addiu	k0,k0,373
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[0-9a-f]+ <[^>]*> ff5c 0000 	lw	k0,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	bar
+[0-9a-f]+ <[^>]*> 335a 0000 	addiu	k0,k0,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	bar
 [0-9a-f]+ <[^>]*> 459a      	jr	k0
 [0-9a-f]+ <[^>]*> 0c00      	nop
 ([0-9a-f]+) <[^>]*> 4083 fffe 	blez	v1,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
-[0-9a-f]+ <[^>]*> ff5c 0002 	lw	k0,2\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 335a 0175 	addiu	k0,k0,373
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[0-9a-f]+ <[^>]*> ff5c 0000 	lw	k0,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	bar
+[0-9a-f]+ <[^>]*> 335a 0000 	addiu	k0,k0,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	bar
 [0-9a-f]+ <[^>]*> 459a      	jr	k0
 [0-9a-f]+ <[^>]*> 0c00      	nop
 ([0-9a-f]+) <[^>]*> 4044 fffe 	bgez	a0,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
-[0-9a-f]+ <[^>]*> ff5c 0002 	lw	k0,2\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 335a 0175 	addiu	k0,k0,373
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[0-9a-f]+ <[^>]*> ff5c 0000 	lw	k0,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	bar
+[0-9a-f]+ <[^>]*> 335a 0000 	addiu	k0,k0,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	bar
 [0-9a-f]+ <[^>]*> 459a      	jr	k0
 [0-9a-f]+ <[^>]*> 0c00      	nop
 ([0-9a-f]+) <[^>]*> 4005 fffe 	bltz	a1,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
-[0-9a-f]+ <[^>]*> ff5c 0002 	lw	k0,2\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 335a 0175 	addiu	k0,k0,373
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[0-9a-f]+ <[^>]*> ff5c 0000 	lw	k0,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	bar
+[0-9a-f]+ <[^>]*> 335a 0000 	addiu	k0,k0,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	bar
 [0-9a-f]+ <[^>]*> 459a      	jr	k0
 [0-9a-f]+ <[^>]*> 0c00      	nop
 ([0-9a-f]+) <[^>]*> 43a0 fffe 	bc1t	\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
-[0-9a-f]+ <[^>]*> ff5c 0002 	lw	k0,2\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 335a 0175 	addiu	k0,k0,373
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[0-9a-f]+ <[^>]*> ff5c 0000 	lw	k0,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	bar
+[0-9a-f]+ <[^>]*> 335a 0000 	addiu	k0,k0,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	bar
 [0-9a-f]+ <[^>]*> 459a      	jr	k0
 [0-9a-f]+ <[^>]*> 0c00      	nop
 ([0-9a-f]+) <[^>]*> 4380 fffe 	bc1f	\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
-[0-9a-f]+ <[^>]*> ff5c 0002 	lw	k0,2\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 335a 0175 	addiu	k0,k0,373
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[0-9a-f]+ <[^>]*> ff5c 0000 	lw	k0,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	bar
+[0-9a-f]+ <[^>]*> 335a 0000 	addiu	k0,k0,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	bar
 [0-9a-f]+ <[^>]*> 459a      	jr	k0
 [0-9a-f]+ <[^>]*> 0c00      	nop
 ([0-9a-f]+) <[^>]*> 4042 fffe 	bgez	v0,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
-[0-9a-f]+ <[^>]*> ff5c 0002 	lw	k0,2\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 335a 0175 	addiu	k0,k0,373
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[0-9a-f]+ <[^>]*> ff5c 0000 	lw	k0,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	bar
+[0-9a-f]+ <[^>]*> 335a 0000 	addiu	k0,k0,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	bar
 [0-9a-f]+ <[^>]*> 45fa      	jalrs	k0
 [0-9a-f]+ <[^>]*> 0c00      	nop
 ([0-9a-f]+) <[^>]*> 4003 fffe 	bltz	v1,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
-[0-9a-f]+ <[^>]*> ff5c 0002 	lw	k0,2\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 335a 0175 	addiu	k0,k0,373
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[0-9a-f]+ <[^>]*> ff5c 0000 	lw	k0,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	bar
+[0-9a-f]+ <[^>]*> 335a 0000 	addiu	k0,k0,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	bar
 [0-9a-f]+ <[^>]*> 45fa      	jalrs	k0
 [0-9a-f]+ <[^>]*> 0c00      	nop
 	\.\.\.
 [0-9a-f]+ <[^>]*> ff5c 0000 	lw	k0,0\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 335a 0001 	addiu	k0,k0,1
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	foo
+[0-9a-f]+ <[^>]*> 335a 0000 	addiu	k0,k0,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	foo
 [0-9a-f]+ <[^>]*> 45ba      	jrc	k0
 [0-9a-f]+ <[^>]*> ff5c 0000 	lw	k0,0\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 335a 0001 	addiu	k0,k0,1
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	foo
+[0-9a-f]+ <[^>]*> 335a 0000 	addiu	k0,k0,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	foo
 [0-9a-f]+ <[^>]*> 45da      	jalr	k0
 [0-9a-f]+ <[^>]*> 0000 0000 	nop
 ([0-9a-f]+) <[^>]*> b462 fffe 	bne	v0,v1,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
 [0-9a-f]+ <[^>]*> ff5c 0000 	lw	k0,0\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 335a 0001 	addiu	k0,k0,1
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	foo
+[0-9a-f]+ <[^>]*> 335a 0000 	addiu	k0,k0,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	foo
 [0-9a-f]+ <[^>]*> 45ba      	jrc	k0
 ([0-9a-f]+) <[^>]*> 94a4 fffe 	beq	a0,a1,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
 [0-9a-f]+ <[^>]*> ff5c 0000 	lw	k0,0\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 335a 0001 	addiu	k0,k0,1
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	foo
+[0-9a-f]+ <[^>]*> 335a 0000 	addiu	k0,k0,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	foo
 [0-9a-f]+ <[^>]*> 45ba      	jrc	k0
 ([0-9a-f]+) <[^>]*> 40c2 fffe 	bgtz	v0,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
 [0-9a-f]+ <[^>]*> ff5c 0000 	lw	k0,0\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 335a 0001 	addiu	k0,k0,1
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	foo
+[0-9a-f]+ <[^>]*> 335a 0000 	addiu	k0,k0,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	foo
 [0-9a-f]+ <[^>]*> 45ba      	jrc	k0
 ([0-9a-f]+) <[^>]*> 4083 fffe 	blez	v1,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
 [0-9a-f]+ <[^>]*> ff5c 0000 	lw	k0,0\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 335a 0001 	addiu	k0,k0,1
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	foo
+[0-9a-f]+ <[^>]*> 335a 0000 	addiu	k0,k0,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	foo
 [0-9a-f]+ <[^>]*> 45ba      	jrc	k0
 ([0-9a-f]+) <[^>]*> 4044 fffe 	bgez	a0,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
 [0-9a-f]+ <[^>]*> ff5c 0000 	lw	k0,0\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 335a 0001 	addiu	k0,k0,1
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	foo
+[0-9a-f]+ <[^>]*> 335a 0000 	addiu	k0,k0,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	foo
 [0-9a-f]+ <[^>]*> 45ba      	jrc	k0
 ([0-9a-f]+) <[^>]*> 4005 fffe 	bltz	a1,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
 [0-9a-f]+ <[^>]*> ff5c 0000 	lw	k0,0\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 335a 0001 	addiu	k0,k0,1
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	foo
+[0-9a-f]+ <[^>]*> 335a 0000 	addiu	k0,k0,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	foo
 [0-9a-f]+ <[^>]*> 45ba      	jrc	k0
 ([0-9a-f]+) <[^>]*> 43a0 fffe 	bc1t	\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
 [0-9a-f]+ <[^>]*> ff5c 0000 	lw	k0,0\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 335a 0001 	addiu	k0,k0,1
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	foo
+[0-9a-f]+ <[^>]*> 335a 0000 	addiu	k0,k0,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	foo
 [0-9a-f]+ <[^>]*> 45ba      	jrc	k0
 ([0-9a-f]+) <[^>]*> 4380 fffe 	bc1f	\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
 [0-9a-f]+ <[^>]*> ff5c 0000 	lw	k0,0\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 335a 0001 	addiu	k0,k0,1
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	foo
+[0-9a-f]+ <[^>]*> 335a 0000 	addiu	k0,k0,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	foo
 [0-9a-f]+ <[^>]*> 45ba      	jrc	k0
 ([0-9a-f]+) <[^>]*> 4042 fffe 	bgez	v0,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
 [0-9a-f]+ <[^>]*> ff5c 0000 	lw	k0,0\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 335a 0001 	addiu	k0,k0,1
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	foo
+[0-9a-f]+ <[^>]*> 335a 0000 	addiu	k0,k0,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	foo
 [0-9a-f]+ <[^>]*> 45da      	jalr	k0
 [0-9a-f]+ <[^>]*> 0000 0000 	nop
 ([0-9a-f]+) <[^>]*> 4003 fffe 	bltz	v1,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
 [0-9a-f]+ <[^>]*> ff5c 0000 	lw	k0,0\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 335a 0001 	addiu	k0,k0,1
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	foo
+[0-9a-f]+ <[^>]*> 335a 0000 	addiu	k0,k0,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	foo
 [0-9a-f]+ <[^>]*> 45da      	jalr	k0
 [0-9a-f]+ <[^>]*> 0000 0000 	nop
 ([0-9a-f]+) <[^>]*> b462 fffe 	bne	v0,v1,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
 [0-9a-f]+ <[^>]*> ff5c 0000 	lw	k0,0\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 335a 0001 	addiu	k0,k0,1
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	foo
+[0-9a-f]+ <[^>]*> 335a 0000 	addiu	k0,k0,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	foo
 [0-9a-f]+ <[^>]*> 459a      	jr	k0
 [0-9a-f]+ <[^>]*> 0c00      	nop
 ([0-9a-f]+) <[^>]*> 94a4 fffe 	beq	a0,a1,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
 [0-9a-f]+ <[^>]*> ff5c 0000 	lw	k0,0\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 335a 0001 	addiu	k0,k0,1
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	foo
+[0-9a-f]+ <[^>]*> 335a 0000 	addiu	k0,k0,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	foo
 [0-9a-f]+ <[^>]*> 459a      	jr	k0
 [0-9a-f]+ <[^>]*> 0c00      	nop
 ([0-9a-f]+) <[^>]*> 40c2 fffe 	bgtz	v0,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
 [0-9a-f]+ <[^>]*> ff5c 0000 	lw	k0,0\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 335a 0001 	addiu	k0,k0,1
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	foo
+[0-9a-f]+ <[^>]*> 335a 0000 	addiu	k0,k0,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	foo
 [0-9a-f]+ <[^>]*> 459a      	jr	k0
 [0-9a-f]+ <[^>]*> 0c00      	nop
 ([0-9a-f]+) <[^>]*> 4083 fffe 	blez	v1,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
 [0-9a-f]+ <[^>]*> ff5c 0000 	lw	k0,0\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 335a 0001 	addiu	k0,k0,1
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	foo
+[0-9a-f]+ <[^>]*> 335a 0000 	addiu	k0,k0,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	foo
 [0-9a-f]+ <[^>]*> 459a      	jr	k0
 [0-9a-f]+ <[^>]*> 0c00      	nop
 ([0-9a-f]+) <[^>]*> 4044 fffe 	bgez	a0,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
 [0-9a-f]+ <[^>]*> ff5c 0000 	lw	k0,0\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 335a 0001 	addiu	k0,k0,1
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	foo
+[0-9a-f]+ <[^>]*> 335a 0000 	addiu	k0,k0,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	foo
 [0-9a-f]+ <[^>]*> 459a      	jr	k0
 [0-9a-f]+ <[^>]*> 0c00      	nop
 ([0-9a-f]+) <[^>]*> 4005 fffe 	bltz	a1,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
 [0-9a-f]+ <[^>]*> ff5c 0000 	lw	k0,0\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 335a 0001 	addiu	k0,k0,1
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	foo
+[0-9a-f]+ <[^>]*> 335a 0000 	addiu	k0,k0,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	foo
 [0-9a-f]+ <[^>]*> 459a      	jr	k0
 [0-9a-f]+ <[^>]*> 0c00      	nop
 ([0-9a-f]+) <[^>]*> 43a0 fffe 	bc1t	\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
 [0-9a-f]+ <[^>]*> ff5c 0000 	lw	k0,0\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 335a 0001 	addiu	k0,k0,1
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	foo
+[0-9a-f]+ <[^>]*> 335a 0000 	addiu	k0,k0,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	foo
 [0-9a-f]+ <[^>]*> 459a      	jr	k0
 [0-9a-f]+ <[^>]*> 0c00      	nop
 ([0-9a-f]+) <[^>]*> 4380 fffe 	bc1f	\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
 [0-9a-f]+ <[^>]*> ff5c 0000 	lw	k0,0\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 335a 0001 	addiu	k0,k0,1
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	foo
+[0-9a-f]+ <[^>]*> 335a 0000 	addiu	k0,k0,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	foo
 [0-9a-f]+ <[^>]*> 459a      	jr	k0
 [0-9a-f]+ <[^>]*> 0c00      	nop
 ([0-9a-f]+) <[^>]*> 4042 fffe 	bgez	v0,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
 [0-9a-f]+ <[^>]*> ff5c 0000 	lw	k0,0\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 335a 0001 	addiu	k0,k0,1
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	foo
+[0-9a-f]+ <[^>]*> 335a 0000 	addiu	k0,k0,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	foo
 [0-9a-f]+ <[^>]*> 45fa      	jalrs	k0
 [0-9a-f]+ <[^>]*> 0c00      	nop
 ([0-9a-f]+) <[^>]*> 4003 fffe 	bltz	v1,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
 [0-9a-f]+ <[^>]*> ff5c 0000 	lw	k0,0\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 335a 0001 	addiu	k0,k0,1
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	foo
+[0-9a-f]+ <[^>]*> 335a 0000 	addiu	k0,k0,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	foo
 [0-9a-f]+ <[^>]*> 45fa      	jalrs	k0
 [0-9a-f]+ <[^>]*> 0c00      	nop
 	\.\.\.
diff --git a/gas/testsuite/gas/mips/micromips@relax-offset.d b/gas/testsuite/gas/mips/micromips@relax-offset.d
index cc3c571bec7..bf5eec192fb 100644
--- a/gas/testsuite/gas/mips/micromips@relax-offset.d
+++ b/gas/testsuite/gas/mips/micromips@relax-offset.d
@@ -14,10 +14,10 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> 033c e150 	addu	gp,gp,t9
 [0-9a-f]+ <[^>]*> 40a4 fffe 	bnezc	a0,0000000c <foo\+0xc>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
-[0-9a-f]+ <[^>]*> fc3c 0002 	lw	at,2\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 3021 0025 	addiu	at,at,37
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[0-9a-f]+ <[^>]*> fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	bar
+[0-9a-f]+ <[^>]*> 3021 0004 	addiu	at,at,4
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	bar
 [0-9a-f]+ <[^>]*> 45a1      	jrc	at
 [0-9a-f]+ <[^>]*> 45bf      	jrc	ra
 	\.\.\.
diff --git a/gas/testsuite/gas/mips/micromips@relax.d b/gas/testsuite/gas/mips/micromips@relax.d
index 91fc6ddfa9f..51a364df44d 100644
--- a/gas/testsuite/gas/mips/micromips@relax.d
+++ b/gas/testsuite/gas/mips/micromips@relax.d
@@ -9,371 +9,371 @@
 .*: +file format .*mips.*
 
 Disassembly of section \.text:
-[0-9a-f]+ <[^>]*> fc3c 0002 	lw	at,2\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 3021 0175 	addiu	at,at,373
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[0-9a-f]+ <[^>]*> fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	bar
+[0-9a-f]+ <[^>]*> 3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	bar
 [0-9a-f]+ <[^>]*> 45a1      	jrc	at
-[0-9a-f]+ <[^>]*> fc3c 0002 	lw	at,2\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 3021 0175 	addiu	at,at,373
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[0-9a-f]+ <[^>]*> fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	bar
+[0-9a-f]+ <[^>]*> 3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	bar
 [0-9a-f]+ <[^>]*> 45c1      	jalr	at
 [0-9a-f]+ <[^>]*> 0000 0000 	nop
 ([0-9a-f]+) <[^>]*> b462 fffe 	bne	v0,v1,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
-[0-9a-f]+ <[^>]*> fc3c 0002 	lw	at,2\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 3021 0175 	addiu	at,at,373
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[0-9a-f]+ <[^>]*> fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	bar
+[0-9a-f]+ <[^>]*> 3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	bar
 [0-9a-f]+ <[^>]*> 45a1      	jrc	at
 ([0-9a-f]+) <[^>]*> 94a4 fffe 	beq	a0,a1,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
-[0-9a-f]+ <[^>]*> fc3c 0002 	lw	at,2\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 3021 0175 	addiu	at,at,373
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[0-9a-f]+ <[^>]*> fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	bar
+[0-9a-f]+ <[^>]*> 3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	bar
 [0-9a-f]+ <[^>]*> 45a1      	jrc	at
 ([0-9a-f]+) <[^>]*> 40c2 fffe 	bgtz	v0,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
-[0-9a-f]+ <[^>]*> fc3c 0002 	lw	at,2\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 3021 0175 	addiu	at,at,373
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[0-9a-f]+ <[^>]*> fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	bar
+[0-9a-f]+ <[^>]*> 3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	bar
 [0-9a-f]+ <[^>]*> 45a1      	jrc	at
 ([0-9a-f]+) <[^>]*> 4083 fffe 	blez	v1,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
-[0-9a-f]+ <[^>]*> fc3c 0002 	lw	at,2\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 3021 0175 	addiu	at,at,373
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[0-9a-f]+ <[^>]*> fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	bar
+[0-9a-f]+ <[^>]*> 3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	bar
 [0-9a-f]+ <[^>]*> 45a1      	jrc	at
 ([0-9a-f]+) <[^>]*> 4044 fffe 	bgez	a0,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
-[0-9a-f]+ <[^>]*> fc3c 0002 	lw	at,2\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 3021 0175 	addiu	at,at,373
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[0-9a-f]+ <[^>]*> fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	bar
+[0-9a-f]+ <[^>]*> 3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	bar
 [0-9a-f]+ <[^>]*> 45a1      	jrc	at
 ([0-9a-f]+) <[^>]*> 4005 fffe 	bltz	a1,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
-[0-9a-f]+ <[^>]*> fc3c 0002 	lw	at,2\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 3021 0175 	addiu	at,at,373
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[0-9a-f]+ <[^>]*> fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	bar
+[0-9a-f]+ <[^>]*> 3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	bar
 [0-9a-f]+ <[^>]*> 45a1      	jrc	at
 ([0-9a-f]+) <[^>]*> 43a0 fffe 	bc1t	\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
-[0-9a-f]+ <[^>]*> fc3c 0002 	lw	at,2\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 3021 0175 	addiu	at,at,373
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[0-9a-f]+ <[^>]*> fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	bar
+[0-9a-f]+ <[^>]*> 3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	bar
 [0-9a-f]+ <[^>]*> 45a1      	jrc	at
 ([0-9a-f]+) <[^>]*> 4380 fffe 	bc1f	\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
-[0-9a-f]+ <[^>]*> fc3c 0002 	lw	at,2\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 3021 0175 	addiu	at,at,373
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[0-9a-f]+ <[^>]*> fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	bar
+[0-9a-f]+ <[^>]*> 3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	bar
 [0-9a-f]+ <[^>]*> 45a1      	jrc	at
 ([0-9a-f]+) <[^>]*> 4042 fffe 	bgez	v0,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
-[0-9a-f]+ <[^>]*> fc3c 0002 	lw	at,2\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 3021 0175 	addiu	at,at,373
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[0-9a-f]+ <[^>]*> fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	bar
+[0-9a-f]+ <[^>]*> 3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	bar
 [0-9a-f]+ <[^>]*> 45c1      	jalr	at
 [0-9a-f]+ <[^>]*> 0000 0000 	nop
 ([0-9a-f]+) <[^>]*> 4003 fffe 	bltz	v1,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
-[0-9a-f]+ <[^>]*> fc3c 0002 	lw	at,2\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 3021 0175 	addiu	at,at,373
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[0-9a-f]+ <[^>]*> fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	bar
+[0-9a-f]+ <[^>]*> 3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	bar
 [0-9a-f]+ <[^>]*> 45c1      	jalr	at
 [0-9a-f]+ <[^>]*> 0000 0000 	nop
 ([0-9a-f]+) <[^>]*> b462 fffe 	bne	v0,v1,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
-[0-9a-f]+ <[^>]*> fc3c 0002 	lw	at,2\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 3021 0175 	addiu	at,at,373
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[0-9a-f]+ <[^>]*> fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	bar
+[0-9a-f]+ <[^>]*> 3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	bar
 [0-9a-f]+ <[^>]*> 4581      	jr	at
 [0-9a-f]+ <[^>]*> 0c00      	nop
 ([0-9a-f]+) <[^>]*> 94a4 fffe 	beq	a0,a1,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
-[0-9a-f]+ <[^>]*> fc3c 0002 	lw	at,2\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 3021 0175 	addiu	at,at,373
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[0-9a-f]+ <[^>]*> fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	bar
+[0-9a-f]+ <[^>]*> 3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	bar
 [0-9a-f]+ <[^>]*> 4581      	jr	at
 [0-9a-f]+ <[^>]*> 0c00      	nop
 ([0-9a-f]+) <[^>]*> 40c2 fffe 	bgtz	v0,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
-[0-9a-f]+ <[^>]*> fc3c 0002 	lw	at,2\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 3021 0175 	addiu	at,at,373
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[0-9a-f]+ <[^>]*> fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	bar
+[0-9a-f]+ <[^>]*> 3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	bar
 [0-9a-f]+ <[^>]*> 4581      	jr	at
 [0-9a-f]+ <[^>]*> 0c00      	nop
 ([0-9a-f]+) <[^>]*> 4083 fffe 	blez	v1,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
-[0-9a-f]+ <[^>]*> fc3c 0002 	lw	at,2\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 3021 0175 	addiu	at,at,373
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[0-9a-f]+ <[^>]*> fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	bar
+[0-9a-f]+ <[^>]*> 3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	bar
 [0-9a-f]+ <[^>]*> 4581      	jr	at
 [0-9a-f]+ <[^>]*> 0c00      	nop
 ([0-9a-f]+) <[^>]*> 4044 fffe 	bgez	a0,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
-[0-9a-f]+ <[^>]*> fc3c 0002 	lw	at,2\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 3021 0175 	addiu	at,at,373
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[0-9a-f]+ <[^>]*> fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	bar
+[0-9a-f]+ <[^>]*> 3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	bar
 [0-9a-f]+ <[^>]*> 4581      	jr	at
 [0-9a-f]+ <[^>]*> 0c00      	nop
 ([0-9a-f]+) <[^>]*> 4005 fffe 	bltz	a1,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
-[0-9a-f]+ <[^>]*> fc3c 0002 	lw	at,2\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 3021 0175 	addiu	at,at,373
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[0-9a-f]+ <[^>]*> fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	bar
+[0-9a-f]+ <[^>]*> 3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	bar
 [0-9a-f]+ <[^>]*> 4581      	jr	at
 [0-9a-f]+ <[^>]*> 0c00      	nop
 ([0-9a-f]+) <[^>]*> 43a0 fffe 	bc1t	\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
-[0-9a-f]+ <[^>]*> fc3c 0002 	lw	at,2\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 3021 0175 	addiu	at,at,373
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[0-9a-f]+ <[^>]*> fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	bar
+[0-9a-f]+ <[^>]*> 3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	bar
 [0-9a-f]+ <[^>]*> 4581      	jr	at
 [0-9a-f]+ <[^>]*> 0c00      	nop
 ([0-9a-f]+) <[^>]*> 4380 fffe 	bc1f	\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
-[0-9a-f]+ <[^>]*> fc3c 0002 	lw	at,2\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 3021 0175 	addiu	at,at,373
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[0-9a-f]+ <[^>]*> fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	bar
+[0-9a-f]+ <[^>]*> 3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	bar
 [0-9a-f]+ <[^>]*> 4581      	jr	at
 [0-9a-f]+ <[^>]*> 0c00      	nop
 ([0-9a-f]+) <[^>]*> 4042 fffe 	bgez	v0,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
-[0-9a-f]+ <[^>]*> fc3c 0002 	lw	at,2\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 3021 0175 	addiu	at,at,373
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[0-9a-f]+ <[^>]*> fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	bar
+[0-9a-f]+ <[^>]*> 3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	bar
 [0-9a-f]+ <[^>]*> 45e1      	jalrs	at
 [0-9a-f]+ <[^>]*> 0c00      	nop
 ([0-9a-f]+) <[^>]*> 4003 fffe 	bltz	v1,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
-[0-9a-f]+ <[^>]*> fc3c 0002 	lw	at,2\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 3021 0175 	addiu	at,at,373
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[0-9a-f]+ <[^>]*> fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	bar
+[0-9a-f]+ <[^>]*> 3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	bar
 [0-9a-f]+ <[^>]*> 45e1      	jalrs	at
 [0-9a-f]+ <[^>]*> 0c00      	nop
 	\.\.\.
 [0-9a-f]+ <[^>]*> fc3c 0000 	lw	at,0\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 3021 0001 	addiu	at,at,1
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	foo
+[0-9a-f]+ <[^>]*> 3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	foo
 [0-9a-f]+ <[^>]*> 45a1      	jrc	at
 [0-9a-f]+ <[^>]*> fc3c 0000 	lw	at,0\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 3021 0001 	addiu	at,at,1
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	foo
+[0-9a-f]+ <[^>]*> 3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	foo
 [0-9a-f]+ <[^>]*> 45c1      	jalr	at
 [0-9a-f]+ <[^>]*> 0000 0000 	nop
 ([0-9a-f]+) <[^>]*> b462 fffe 	bne	v0,v1,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
 [0-9a-f]+ <[^>]*> fc3c 0000 	lw	at,0\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 3021 0001 	addiu	at,at,1
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	foo
+[0-9a-f]+ <[^>]*> 3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	foo
 [0-9a-f]+ <[^>]*> 45a1      	jrc	at
 ([0-9a-f]+) <[^>]*> 94a4 fffe 	beq	a0,a1,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
 [0-9a-f]+ <[^>]*> fc3c 0000 	lw	at,0\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 3021 0001 	addiu	at,at,1
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	foo
+[0-9a-f]+ <[^>]*> 3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	foo
 [0-9a-f]+ <[^>]*> 45a1      	jrc	at
 ([0-9a-f]+) <[^>]*> 40c2 fffe 	bgtz	v0,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
 [0-9a-f]+ <[^>]*> fc3c 0000 	lw	at,0\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 3021 0001 	addiu	at,at,1
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	foo
+[0-9a-f]+ <[^>]*> 3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	foo
 [0-9a-f]+ <[^>]*> 45a1      	jrc	at
 ([0-9a-f]+) <[^>]*> 4083 fffe 	blez	v1,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
 [0-9a-f]+ <[^>]*> fc3c 0000 	lw	at,0\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 3021 0001 	addiu	at,at,1
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	foo
+[0-9a-f]+ <[^>]*> 3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	foo
 [0-9a-f]+ <[^>]*> 45a1      	jrc	at
 ([0-9a-f]+) <[^>]*> 4044 fffe 	bgez	a0,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
 [0-9a-f]+ <[^>]*> fc3c 0000 	lw	at,0\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 3021 0001 	addiu	at,at,1
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	foo
+[0-9a-f]+ <[^>]*> 3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	foo
 [0-9a-f]+ <[^>]*> 45a1      	jrc	at
 ([0-9a-f]+) <[^>]*> 4005 fffe 	bltz	a1,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
 [0-9a-f]+ <[^>]*> fc3c 0000 	lw	at,0\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 3021 0001 	addiu	at,at,1
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	foo
+[0-9a-f]+ <[^>]*> 3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	foo
 [0-9a-f]+ <[^>]*> 45a1      	jrc	at
 ([0-9a-f]+) <[^>]*> 43a0 fffe 	bc1t	\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
 [0-9a-f]+ <[^>]*> fc3c 0000 	lw	at,0\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 3021 0001 	addiu	at,at,1
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	foo
+[0-9a-f]+ <[^>]*> 3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	foo
 [0-9a-f]+ <[^>]*> 45a1      	jrc	at
 ([0-9a-f]+) <[^>]*> 4380 fffe 	bc1f	\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
 [0-9a-f]+ <[^>]*> fc3c 0000 	lw	at,0\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 3021 0001 	addiu	at,at,1
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	foo
+[0-9a-f]+ <[^>]*> 3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	foo
 [0-9a-f]+ <[^>]*> 45a1      	jrc	at
 ([0-9a-f]+) <[^>]*> 4042 fffe 	bgez	v0,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
 [0-9a-f]+ <[^>]*> fc3c 0000 	lw	at,0\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 3021 0001 	addiu	at,at,1
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	foo
+[0-9a-f]+ <[^>]*> 3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	foo
 [0-9a-f]+ <[^>]*> 45c1      	jalr	at
 [0-9a-f]+ <[^>]*> 0000 0000 	nop
 ([0-9a-f]+) <[^>]*> 4003 fffe 	bltz	v1,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
 [0-9a-f]+ <[^>]*> fc3c 0000 	lw	at,0\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 3021 0001 	addiu	at,at,1
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	foo
+[0-9a-f]+ <[^>]*> 3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	foo
 [0-9a-f]+ <[^>]*> 45c1      	jalr	at
 [0-9a-f]+ <[^>]*> 0000 0000 	nop
 ([0-9a-f]+) <[^>]*> b462 fffe 	bne	v0,v1,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
 [0-9a-f]+ <[^>]*> fc3c 0000 	lw	at,0\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 3021 0001 	addiu	at,at,1
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	foo
+[0-9a-f]+ <[^>]*> 3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	foo
 [0-9a-f]+ <[^>]*> 4581      	jr	at
 [0-9a-f]+ <[^>]*> 0c00      	nop
 ([0-9a-f]+) <[^>]*> 94a4 fffe 	beq	a0,a1,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
 [0-9a-f]+ <[^>]*> fc3c 0000 	lw	at,0\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 3021 0001 	addiu	at,at,1
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	foo
+[0-9a-f]+ <[^>]*> 3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	foo
 [0-9a-f]+ <[^>]*> 4581      	jr	at
 [0-9a-f]+ <[^>]*> 0c00      	nop
 ([0-9a-f]+) <[^>]*> 40c2 fffe 	bgtz	v0,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
 [0-9a-f]+ <[^>]*> fc3c 0000 	lw	at,0\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 3021 0001 	addiu	at,at,1
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	foo
+[0-9a-f]+ <[^>]*> 3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	foo
 [0-9a-f]+ <[^>]*> 4581      	jr	at
 [0-9a-f]+ <[^>]*> 0c00      	nop
 ([0-9a-f]+) <[^>]*> 4083 fffe 	blez	v1,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
 [0-9a-f]+ <[^>]*> fc3c 0000 	lw	at,0\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 3021 0001 	addiu	at,at,1
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	foo
+[0-9a-f]+ <[^>]*> 3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	foo
 [0-9a-f]+ <[^>]*> 4581      	jr	at
 [0-9a-f]+ <[^>]*> 0c00      	nop
 ([0-9a-f]+) <[^>]*> 4044 fffe 	bgez	a0,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
 [0-9a-f]+ <[^>]*> fc3c 0000 	lw	at,0\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 3021 0001 	addiu	at,at,1
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	foo
+[0-9a-f]+ <[^>]*> 3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	foo
 [0-9a-f]+ <[^>]*> 4581      	jr	at
 [0-9a-f]+ <[^>]*> 0c00      	nop
 ([0-9a-f]+) <[^>]*> 4005 fffe 	bltz	a1,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
 [0-9a-f]+ <[^>]*> fc3c 0000 	lw	at,0\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 3021 0001 	addiu	at,at,1
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	foo
+[0-9a-f]+ <[^>]*> 3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	foo
 [0-9a-f]+ <[^>]*> 4581      	jr	at
 [0-9a-f]+ <[^>]*> 0c00      	nop
 ([0-9a-f]+) <[^>]*> 43a0 fffe 	bc1t	\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
 [0-9a-f]+ <[^>]*> fc3c 0000 	lw	at,0\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 3021 0001 	addiu	at,at,1
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	foo
+[0-9a-f]+ <[^>]*> 3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	foo
 [0-9a-f]+ <[^>]*> 4581      	jr	at
 [0-9a-f]+ <[^>]*> 0c00      	nop
 ([0-9a-f]+) <[^>]*> 4380 fffe 	bc1f	\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
 [0-9a-f]+ <[^>]*> fc3c 0000 	lw	at,0\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 3021 0001 	addiu	at,at,1
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	foo
+[0-9a-f]+ <[^>]*> 3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	foo
 [0-9a-f]+ <[^>]*> 4581      	jr	at
 [0-9a-f]+ <[^>]*> 0c00      	nop
 ([0-9a-f]+) <[^>]*> 4042 fffe 	bgez	v0,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
 [0-9a-f]+ <[^>]*> fc3c 0000 	lw	at,0\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 3021 0001 	addiu	at,at,1
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	foo
+[0-9a-f]+ <[^>]*> 3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	foo
 [0-9a-f]+ <[^>]*> 45e1      	jalrs	at
 [0-9a-f]+ <[^>]*> 0c00      	nop
 ([0-9a-f]+) <[^>]*> 4003 fffe 	bltz	v1,\1 <.*>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	.*
 [0-9a-f]+ <[^>]*> 0c00      	nop
 [0-9a-f]+ <[^>]*> fc3c 0000 	lw	at,0\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 3021 0001 	addiu	at,at,1
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	foo
+[0-9a-f]+ <[^>]*> 3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	foo
 [0-9a-f]+ <[^>]*> 45e1      	jalrs	at
 [0-9a-f]+ <[^>]*> 0c00      	nop
 	\.\.\.
diff --git a/gas/testsuite/gas/mips/option-pic-relax-4.d b/gas/testsuite/gas/mips/option-pic-relax-4.d
index 15adf1155c2..157cf3256b7 100644
--- a/gas/testsuite/gas/mips/option-pic-relax-4.d
+++ b/gas/testsuite/gas/mips/option-pic-relax-4.d
@@ -16,10 +16,10 @@ Disassembly of section \.text:
 [ 	]*[0-9a-f]+: R_MICROMIPS_LO16	_gp_disp
 [0-9a-f]+ <[^>]*> 033c e150 	addu	gp,gp,t9
 [0-9a-f]+ <[^>]*> 0c44      	move	v0,a0
-[0-9a-f]+ <[^>]*> fc3c 0001 	lw	at,1\(gp\)
-[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	\.text
-[0-9a-f]+ <[^>]*> 3021 0019 	addiu	at,at,25
-[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	\.text
+[0-9a-f]+ <[^>]*> fc3c 0000 	lw	at,0\(gp\)
+[ 	]*[0-9a-f]+: R_MICROMIPS_GOT16	bar
+[0-9a-f]+ <[^>]*> 3021 0000 	addiu	at,at,0
+[ 	]*[0-9a-f]+: R_MICROMIPS_LO16	bar
 [0-9a-f]+ <[^>]*> 4581      	jr	at
 [0-9a-f]+ <[^>]*> 0c65      	move	v1,a1
 [0-9a-f]+ <[^>]*> 0c00      	nop
diff --git a/gas/testsuite/gas/mips/s_d.d b/gas/testsuite/gas/mips/s_d.d
index becd2adc81f..e71587d20f2 100644
--- a/gas/testsuite/gas/mips/s_d.d
+++ b/gas/testsuite/gas/mips/s_d.d
@@ -30,9 +30,9 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> addu	at,at,a1
 [0-9a-f]+ <[^>]*> sdc1	\$f4,-23131\(at\)
 [0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> sdc1	\$f4,0\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lui	at,0x0
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	big_external_data_label
 [0-9a-f]+ <[^>]*> sdc1	\$f4,0\(at\)
@@ -46,15 +46,15 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> sdc1	\$f4,0\(gp\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_GPREL16	small_external_common
 [0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> sdc1	\$f4,0\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> sdc1	\$f4,0\(gp\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_GPREL16	\.sbss
 [0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> sdc1	\$f4,1\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lui	at,0x0
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	big_external_data_label
 [0-9a-f]+ <[^>]*> sdc1	\$f4,1\(at\)
@@ -68,15 +68,15 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> sdc1	\$f4,1\(gp\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_GPREL16	small_external_common
 [0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> sdc1	\$f4,1\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> sdc1	\$f4,1\(gp\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_GPREL16	\.sbss
 [0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> sdc1	\$f4,-32768\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lui	at,0x1
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	big_external_data_label
 [0-9a-f]+ <[^>]*> sdc1	\$f4,-32768\(at\)
@@ -94,17 +94,17 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> sdc1	\$f4,-32768\(at\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	small_external_common
 [0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> sdc1	\$f4,-32768\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> sdc1	\$f4,-32768\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> sdc1	\$f4,-32768\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lui	at,0x0
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	big_external_data_label
 [0-9a-f]+ <[^>]*> sdc1	\$f4,-32768\(at\)
@@ -122,17 +122,17 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> sdc1	\$f4,-32768\(at\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	small_external_common
 [0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> sdc1	\$f4,-32768\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> sdc1	\$f4,-32768\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> sdc1	\$f4,0\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lui	at,0x1
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	big_external_data_label
 [0-9a-f]+ <[^>]*> sdc1	\$f4,0\(at\)
@@ -150,17 +150,17 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> sdc1	\$f4,0\(at\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	small_external_common
 [0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> sdc1	\$f4,0\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> sdc1	\$f4,0\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> lui	at,0x2
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> sdc1	\$f4,-23131\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lui	at,0x2
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	big_external_data_label
 [0-9a-f]+ <[^>]*> sdc1	\$f4,-23131\(at\)
@@ -178,18 +178,18 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> sdc1	\$f4,-23131\(at\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	small_external_common
 [0-9a-f]+ <[^>]*> lui	at,0x2
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> sdc1	\$f4,-23131\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> lui	at,0x2
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> sdc1	\$f4,-23131\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> addu	at,at,a1
 [0-9a-f]+ <[^>]*> sdc1	\$f4,0\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lui	at,0x0
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	big_external_data_label
 [0-9a-f]+ <[^>]*> addu	at,at,a1
@@ -207,18 +207,18 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> sdc1	\$f4,0\(at\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_GPREL16	small_external_common
 [0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> addu	at,at,a1
 [0-9a-f]+ <[^>]*> sdc1	\$f4,0\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> addu	at,a1,gp
 [0-9a-f]+ <[^>]*> sdc1	\$f4,0\(at\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_GPREL16	\.sbss
 [0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> addu	at,at,a1
 [0-9a-f]+ <[^>]*> sdc1	\$f4,1\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lui	at,0x0
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	big_external_data_label
 [0-9a-f]+ <[^>]*> addu	at,at,a1
@@ -236,18 +236,18 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> sdc1	\$f4,1\(at\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_GPREL16	small_external_common
 [0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> addu	at,at,a1
 [0-9a-f]+ <[^>]*> sdc1	\$f4,1\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> addu	at,a1,gp
 [0-9a-f]+ <[^>]*> sdc1	\$f4,1\(at\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_GPREL16	\.sbss
 [0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> addu	at,at,a1
 [0-9a-f]+ <[^>]*> sdc1	\$f4,-32768\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lui	at,0x1
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	big_external_data_label
 [0-9a-f]+ <[^>]*> addu	at,at,a1
@@ -269,20 +269,20 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> sdc1	\$f4,-32768\(at\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	small_external_common
 [0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> addu	at,at,a1
 [0-9a-f]+ <[^>]*> sdc1	\$f4,-32768\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> addu	at,at,a1
 [0-9a-f]+ <[^>]*> sdc1	\$f4,-32768\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> addu	at,at,a1
 [0-9a-f]+ <[^>]*> sdc1	\$f4,-32768\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lui	at,0x0
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	big_external_data_label
 [0-9a-f]+ <[^>]*> addu	at,at,a1
@@ -304,20 +304,20 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> sdc1	\$f4,-32768\(at\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	small_external_common
 [0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> addu	at,at,a1
 [0-9a-f]+ <[^>]*> sdc1	\$f4,-32768\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> addu	at,at,a1
 [0-9a-f]+ <[^>]*> sdc1	\$f4,-32768\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> addu	at,at,a1
 [0-9a-f]+ <[^>]*> sdc1	\$f4,0\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lui	at,0x1
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	big_external_data_label
 [0-9a-f]+ <[^>]*> addu	at,at,a1
@@ -339,20 +339,20 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> sdc1	\$f4,0\(at\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	small_external_common
 [0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> addu	at,at,a1
 [0-9a-f]+ <[^>]*> sdc1	\$f4,0\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> addu	at,at,a1
 [0-9a-f]+ <[^>]*> sdc1	\$f4,0\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> lui	at,0x2
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> addu	at,at,a1
 [0-9a-f]+ <[^>]*> sdc1	\$f4,-23131\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lui	at,0x2
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	big_external_data_label
 [0-9a-f]+ <[^>]*> addu	at,at,a1
@@ -374,13 +374,13 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> sdc1	\$f4,-23131\(at\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	small_external_common
 [0-9a-f]+ <[^>]*> lui	at,0x2
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> addu	at,at,a1
 [0-9a-f]+ <[^>]*> sdc1	\$f4,-23131\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> lui	at,0x2
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> addu	at,at,a1
 [0-9a-f]+ <[^>]*> sdc1	\$f4,-23131\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(small_local_common|\.sbss)
 	\.\.\.
diff --git a/gas/testsuite/gas/mips/sd.d b/gas/testsuite/gas/mips/sd.d
index 7295aca9fff..7775442e643 100644
--- a/gas/testsuite/gas/mips/sd.d
+++ b/gas/testsuite/gas/mips/sd.d
@@ -42,11 +42,11 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> sw	a0,-23131\(at\)
 [0-9a-f]+ <[^>]*> sw	a1,-23127\(at\)
 [0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> sw	a0,0\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> sw	a1,4\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lui	at,0x0
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	big_external_data_label
 [0-9a-f]+ <[^>]*> sw	a0,0\(at\)
@@ -68,21 +68,21 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> sw	a1,4\(gp\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_GPREL16	small_external_common
 [0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> sw	a0,0\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> sw	a1,4\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> sw	a0,0\(gp\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_GPREL16	\.sbss
 [0-9a-f]+ <[^>]*> sw	a1,4\(gp\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_GPREL16	\.sbss
 [0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> sw	a0,1\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> sw	a1,5\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lui	at,0x0
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	big_external_data_label
 [0-9a-f]+ <[^>]*> sw	a0,1\(at\)
@@ -104,21 +104,21 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> sw	a1,5\(gp\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_GPREL16	small_external_common
 [0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> sw	a0,1\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> sw	a1,5\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> sw	a0,1\(gp\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_GPREL16	\.sbss
 [0-9a-f]+ <[^>]*> sw	a1,5\(gp\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_GPREL16	\.sbss
 [0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> sw	a0,-32768\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> sw	a1,-32764\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lui	at,0x1
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	big_external_data_label
 [0-9a-f]+ <[^>]*> sw	a0,-32768\(at\)
@@ -144,23 +144,23 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> sw	a1,-32764\(at\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	small_external_common
 [0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> sw	a0,-32768\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> sw	a1,-32764\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> sw	a0,-32768\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> sw	a1,-32764\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> sw	a0,-32768\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> sw	a1,-32764\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lui	at,0x0
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	big_external_data_label
 [0-9a-f]+ <[^>]*> sw	a0,-32768\(at\)
@@ -186,23 +186,23 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> sw	a1,-32764\(at\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	small_external_common
 [0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> sw	a0,-32768\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> sw	a1,-32764\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> sw	a0,-32768\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> sw	a1,-32764\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> sw	a0,0\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> sw	a1,4\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lui	at,0x1
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	big_external_data_label
 [0-9a-f]+ <[^>]*> sw	a0,0\(at\)
@@ -228,23 +228,23 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> sw	a1,4\(at\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	small_external_common
 [0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> sw	a0,0\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> sw	a1,4\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> sw	a0,0\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> sw	a1,4\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> lui	at,0x2
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> sw	a0,-23131\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> sw	a1,-23127\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lui	at,0x2
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	big_external_data_label
 [0-9a-f]+ <[^>]*> sw	a0,-23131\(at\)
@@ -270,24 +270,24 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> sw	a1,-23127\(at\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	small_external_common
 [0-9a-f]+ <[^>]*> lui	at,0x2
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> sw	a0,-23131\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> sw	a1,-23127\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> lui	at,0x2
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> sw	a0,-23131\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> sw	a1,-23127\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> addu	at,a1,at
 [0-9a-f]+ <[^>]*> sw	a0,0\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> sw	a1,4\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lui	at,0x0
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	big_external_data_label
 [0-9a-f]+ <[^>]*> addu	at,a1,at
@@ -313,24 +313,24 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> sw	a1,4\(at\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_GPREL16	small_external_common
 [0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> addu	at,a1,at
 [0-9a-f]+ <[^>]*> sw	a0,0\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> sw	a1,4\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> addu	at,a1,gp
 [0-9a-f]+ <[^>]*> sw	a0,0\(at\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_GPREL16	\.sbss
 [0-9a-f]+ <[^>]*> sw	a1,4\(at\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_GPREL16	\.sbss
 [0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> addu	at,a1,at
 [0-9a-f]+ <[^>]*> sw	a0,1\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> sw	a1,5\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lui	at,0x0
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	big_external_data_label
 [0-9a-f]+ <[^>]*> addu	at,a1,at
@@ -356,24 +356,24 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> sw	a1,5\(at\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_GPREL16	small_external_common
 [0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> addu	at,a1,at
 [0-9a-f]+ <[^>]*> sw	a0,1\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> sw	a1,5\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> addu	at,a1,gp
 [0-9a-f]+ <[^>]*> sw	a0,1\(at\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_GPREL16	\.sbss
 [0-9a-f]+ <[^>]*> sw	a1,5\(at\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_GPREL16	\.sbss
 [0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> addu	at,a1,at
 [0-9a-f]+ <[^>]*> sw	a0,-32768\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> sw	a1,-32764\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lui	at,0x1
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	big_external_data_label
 [0-9a-f]+ <[^>]*> addu	at,a1,at
@@ -403,26 +403,26 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> sw	a1,-32764\(at\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	small_external_common
 [0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> addu	at,a1,at
 [0-9a-f]+ <[^>]*> sw	a0,-32768\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> sw	a1,-32764\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> addu	at,a1,at
 [0-9a-f]+ <[^>]*> sw	a0,-32768\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> sw	a1,-32764\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> addu	at,a1,at
 [0-9a-f]+ <[^>]*> sw	a0,-32768\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> sw	a1,-32764\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lui	at,0x0
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	big_external_data_label
 [0-9a-f]+ <[^>]*> addu	at,a1,at
@@ -452,26 +452,26 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> sw	a1,-32764\(at\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	small_external_common
 [0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> addu	at,a1,at
 [0-9a-f]+ <[^>]*> sw	a0,-32768\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> sw	a1,-32764\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> lui	at,0x0
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> addu	at,a1,at
 [0-9a-f]+ <[^>]*> sw	a0,-32768\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> sw	a1,-32764\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> addu	at,a1,at
 [0-9a-f]+ <[^>]*> sw	a0,0\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> sw	a1,4\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lui	at,0x1
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	big_external_data_label
 [0-9a-f]+ <[^>]*> addu	at,a1,at
@@ -501,26 +501,26 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> sw	a1,4\(at\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	small_external_common
 [0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> addu	at,a1,at
 [0-9a-f]+ <[^>]*> sw	a0,0\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> sw	a1,4\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> lui	at,0x1
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> addu	at,a1,at
 [0-9a-f]+ <[^>]*> sw	a0,0\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> sw	a1,4\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> lui	at,0x2
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> addu	at,a1,at
 [0-9a-f]+ <[^>]*> sw	a0,-23131\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> sw	a1,-23127\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.data
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(data_label|\.data)
 [0-9a-f]+ <[^>]*> lui	at,0x2
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	big_external_data_label
 [0-9a-f]+ <[^>]*> addu	at,a1,at
@@ -550,17 +550,17 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> sw	a1,-23127\(at\)
 [ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	small_external_common
 [0-9a-f]+ <[^>]*> lui	at,0x2
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> addu	at,a1,at
 [0-9a-f]+ <[^>]*> sw	a0,-23131\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> sw	a1,-23127\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.bss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(big_local_common|\.bss)
 [0-9a-f]+ <[^>]*> lui	at,0x2
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_HI16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> addu	at,a1,at
 [0-9a-f]+ <[^>]*> sw	a0,-23131\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(small_local_common|\.sbss)
 [0-9a-f]+ <[^>]*> sw	a1,-23127\(at\)
-[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	\.sbss
+[ 	]*[0-9a-f]+: R_(MICRO)?MIPS_LO16	(small_local_common|\.sbss)
 	\.\.\.
-- 
2.34.1
