* gas/mips/elf-rel-got-n32.d: Fix ulw and usw patterns for

little-endian.
* gas/mips/elf-rel-got-n64.d: Likewise.
* gas/mips/elf-rel-xgot-n32.d: Likewise.
* gas/mips/elf-rel-xgot-n64.d: Likewise.

5 files changed, 200 insertions, 192 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 28754a4..26fda7b 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2003-09-01  Maciej W. Rozycki  <macro@ds2.pg.gda.pl>
+
+        * gas/mips/elf-rel-got-n32.d: Fix ulw and usw patterns for
+        little-endian.
+        * gas/mips/elf-rel-got-n64.d: Likewise.
+        * gas/mips/elf-rel-xgot-n32.d: Likewise.
+        * gas/mips/elf-rel-xgot-n64.d: Likewise.
+
 2003-08-29  Jakub Jelinek  <jakub@redhat.com>
 
 	* gas/cfi/cfi-sparc-1.s: New test.
diff --git a/gas/testsuite/gas/mips/elf-rel-got-n32.d b/gas/testsuite/gas/mips/elf-rel-got-n32.d
index 265ba48..4ce7673 100644
--- a/gas/testsuite/gas/mips/elf-rel-got-n32.d
+++ b/gas/testsuite/gas/mips/elf-rel-got-n32.d
@@ -58,36 +58,36 @@ Disassembly of section \.text:
 			80: R_MIPS_GOT_OFST	dg1\+0x38
 00000084 <fn\+0x84> 8f810000 	lw	at,0\(gp\)
 			84: R_MIPS_GOT_DISP	dg1
-00000088 <fn\+0x88> 88250000 	lwl	a1,0\(at\)
-0000008c <fn\+0x8c> 98250003 	lwr	a1,3\(at\)
+00000088 <fn\+0x88> 8825000[03] 	lwl	a1,[03]\(at\)
+0000008c <fn\+0x8c> 9825000[03] 	lwr	a1,[03]\(at\)
 00000090 <fn\+0x90> 8f810000 	lw	at,0\(gp\)
 			90: R_MIPS_GOT_DISP	dg1
 00000094 <fn\+0x94> 2421000c 	addiu	at,at,12
-00000098 <fn\+0x98> 88250000 	lwl	a1,0\(at\)
-0000009c <fn\+0x9c> 98250003 	lwr	a1,3\(at\)
+00000098 <fn\+0x98> 8825000[03] 	lwl	a1,[03]\(at\)
+0000009c <fn\+0x9c> 9825000[03] 	lwr	a1,[03]\(at\)
 000000a0 <fn\+0xa0> 8f810000 	lw	at,0\(gp\)
 			a0: R_MIPS_GOT_DISP	dg1
 000000a4 <fn\+0xa4> 00310821 	addu	at,at,s1
-000000a8 <fn\+0xa8> 88250000 	lwl	a1,0\(at\)
-000000ac <fn\+0xac> 98250003 	lwr	a1,3\(at\)
+000000a8 <fn\+0xa8> 8825000[03] 	lwl	a1,[03]\(at\)
+000000ac <fn\+0xac> 9825000[03] 	lwr	a1,[03]\(at\)
 000000b0 <fn\+0xb0> 8f810000 	lw	at,0\(gp\)
 			b0: R_MIPS_GOT_DISP	dg1
 000000b4 <fn\+0xb4> 2421000c 	addiu	at,at,12
 000000b8 <fn\+0xb8> 00310821 	addu	at,at,s1
-000000bc <fn\+0xbc> 88250000 	lwl	a1,0\(at\)
-000000c0 <fn\+0xc0> 98250003 	lwr	a1,3\(at\)
+000000bc <fn\+0xbc> 8825000[03] 	lwl	a1,[03]\(at\)
+000000c0 <fn\+0xc0> 9825000[03] 	lwr	a1,[03]\(at\)
 000000c4 <fn\+0xc4> 8f810000 	lw	at,0\(gp\)
 			c4: R_MIPS_GOT_DISP	dg1
 000000c8 <fn\+0xc8> 24210022 	addiu	at,at,34
 000000cc <fn\+0xcc> 00250821 	addu	at,at,a1
-000000d0 <fn\+0xd0> 88250000 	lwl	a1,0\(at\)
-000000d4 <fn\+0xd4> 98250003 	lwr	a1,3\(at\)
+000000d0 <fn\+0xd0> 8825000[03] 	lwl	a1,[03]\(at\)
+000000d4 <fn\+0xd4> 9825000[03] 	lwr	a1,[03]\(at\)
 000000d8 <fn\+0xd8> 8f810000 	lw	at,0\(gp\)
 			d8: R_MIPS_GOT_DISP	dg1
 000000dc <fn\+0xdc> 24210038 	addiu	at,at,56
 000000e0 <fn\+0xe0> 00250821 	addu	at,at,a1
-000000e4 <fn\+0xe4> a8250000 	swl	a1,0\(at\)
-000000e8 <fn\+0xe8> b8250003 	swr	a1,3\(at\)
+000000e4 <fn\+0xe4> a825000[03] 	swl	a1,[03]\(at\)
+000000e8 <fn\+0xe8> b825000[03] 	swr	a1,[03]\(at\)
 000000ec <fn\+0xec> 8f850000 	lw	a1,0\(gp\)
 			ec: R_MIPS_GOT_DISP	\.data\+0x3c
 000000f0 <fn\+0xf0> 8f850000 	lw	a1,0\(gp\)
@@ -133,32 +133,32 @@ Disassembly of section \.text:
 			14c: R_MIPS_GOT_OFST	\.data\+0x74
 00000150 <fn\+0x150> 8f810000 	lw	at,0\(gp\)
 			150: R_MIPS_GOT_DISP	\.data\+0x3c
-00000154 <fn\+0x154> 88250000 	lwl	a1,0\(at\)
-00000158 <fn\+0x158> 98250003 	lwr	a1,3\(at\)
+00000154 <fn\+0x154> 8825000[03] 	lwl	a1,[03]\(at\)
+00000158 <fn\+0x158> 9825000[03] 	lwr	a1,[03]\(at\)
 0000015c <fn\+0x15c> 8f810000 	lw	at,0\(gp\)
 			15c: R_MIPS_GOT_DISP	\.data\+0x48
-00000160 <fn\+0x160> 88250000 	lwl	a1,0\(at\)
-00000164 <fn\+0x164> 98250003 	lwr	a1,3\(at\)
+00000160 <fn\+0x160> 8825000[03] 	lwl	a1,[03]\(at\)
+00000164 <fn\+0x164> 9825000[03] 	lwr	a1,[03]\(at\)
 00000168 <fn\+0x168> 8f810000 	lw	at,0\(gp\)
 			168: R_MIPS_GOT_DISP	\.data\+0x3c
 0000016c <fn\+0x16c> 00310821 	addu	at,at,s1
-00000170 <fn\+0x170> 88250000 	lwl	a1,0\(at\)
-00000174 <fn\+0x174> 98250003 	lwr	a1,3\(at\)
+00000170 <fn\+0x170> 8825000[03] 	lwl	a1,[03]\(at\)
+00000174 <fn\+0x174> 9825000[03] 	lwr	a1,[03]\(at\)
 00000178 <fn\+0x178> 8f810000 	lw	at,0\(gp\)
 			178: R_MIPS_GOT_DISP	\.data\+0x48
 0000017c <fn\+0x17c> 00310821 	addu	at,at,s1
-00000180 <fn\+0x180> 88250000 	lwl	a1,0\(at\)
-00000184 <fn\+0x184> 98250003 	lwr	a1,3\(at\)
+00000180 <fn\+0x180> 8825000[03] 	lwl	a1,[03]\(at\)
+00000184 <fn\+0x184> 9825000[03] 	lwr	a1,[03]\(at\)
 00000188 <fn\+0x188> 8f810000 	lw	at,0\(gp\)
 			188: R_MIPS_GOT_DISP	\.data\+0x5e
 0000018c <fn\+0x18c> 00250821 	addu	at,at,a1
-00000190 <fn\+0x190> 88250000 	lwl	a1,0\(at\)
-00000194 <fn\+0x194> 98250003 	lwr	a1,3\(at\)
+00000190 <fn\+0x190> 8825000[03] 	lwl	a1,[03]\(at\)
+00000194 <fn\+0x194> 9825000[03] 	lwr	a1,[03]\(at\)
 00000198 <fn\+0x198> 8f810000 	lw	at,0\(gp\)
 			198: R_MIPS_GOT_DISP	\.data\+0x74
 0000019c <fn\+0x19c> 00250821 	addu	at,at,a1
-000001a0 <fn\+0x1a0> a8250000 	swl	a1,0\(at\)
-000001a4 <fn\+0x1a4> b8250003 	swr	a1,3\(at\)
+000001a0 <fn\+0x1a0> a825000[03] 	swl	a1,[03]\(at\)
+000001a4 <fn\+0x1a4> b825000[03] 	swr	a1,[03]\(at\)
 000001a8 <fn\+0x1a8> 8f850000 	lw	a1,0\(gp\)
 			1a8: R_MIPS_GOT_DISP	fn
 000001ac <fn\+0x1ac> 8f850000 	lw	a1,0\(gp\)
@@ -230,36 +230,36 @@ Disassembly of section \.text:
 			250: R_MIPS_GOT_OFST	dg2\+0x38
 00000254 <fn\+0x254> 8f810000 	lw	at,0\(gp\)
 			254: R_MIPS_GOT_DISP	dg2
-00000258 <fn\+0x258> 88250000 	lwl	a1,0\(at\)
-0000025c <fn\+0x25c> 98250003 	lwr	a1,3\(at\)
+00000258 <fn\+0x258> 8825000[03] 	lwl	a1,[03]\(at\)
+0000025c <fn\+0x25c> 9825000[03] 	lwr	a1,[03]\(at\)
 00000260 <fn\+0x260> 8f810000 	lw	at,0\(gp\)
 			260: R_MIPS_GOT_DISP	dg2
 00000264 <fn\+0x264> 2421000c 	addiu	at,at,12
-00000268 <fn\+0x268> 88250000 	lwl	a1,0\(at\)
-0000026c <fn\+0x26c> 98250003 	lwr	a1,3\(at\)
+00000268 <fn\+0x268> 8825000[03] 	lwl	a1,[03]\(at\)
+0000026c <fn\+0x26c> 9825000[03] 	lwr	a1,[03]\(at\)
 00000270 <fn\+0x270> 8f810000 	lw	at,0\(gp\)
 			270: R_MIPS_GOT_DISP	dg2
 00000274 <fn\+0x274> 00310821 	addu	at,at,s1
-00000278 <fn\+0x278> 88250000 	lwl	a1,0\(at\)
-0000027c <fn\+0x27c> 98250003 	lwr	a1,3\(at\)
+00000278 <fn\+0x278> 8825000[03] 	lwl	a1,[03]\(at\)
+0000027c <fn\+0x27c> 9825000[03] 	lwr	a1,[03]\(at\)
 00000280 <fn\+0x280> 8f810000 	lw	at,0\(gp\)
 			280: R_MIPS_GOT_DISP	dg2
 00000284 <fn\+0x284> 2421000c 	addiu	at,at,12
 00000288 <fn\+0x288> 00310821 	addu	at,at,s1
-0000028c <fn\+0x28c> 88250000 	lwl	a1,0\(at\)
-00000290 <fn\+0x290> 98250003 	lwr	a1,3\(at\)
+0000028c <fn\+0x28c> 8825000[03] 	lwl	a1,[03]\(at\)
+00000290 <fn\+0x290> 9825000[03] 	lwr	a1,[03]\(at\)
 00000294 <fn\+0x294> 8f810000 	lw	at,0\(gp\)
 			294: R_MIPS_GOT_DISP	dg2
 00000298 <fn\+0x298> 24210022 	addiu	at,at,34
 0000029c <fn\+0x29c> 00250821 	addu	at,at,a1
-000002a0 <fn\+0x2a0> 88250000 	lwl	a1,0\(at\)
-000002a4 <fn\+0x2a4> 98250003 	lwr	a1,3\(at\)
+000002a0 <fn\+0x2a0> 8825000[03] 	lwl	a1,[03]\(at\)
+000002a4 <fn\+0x2a4> 9825000[03] 	lwr	a1,[03]\(at\)
 000002a8 <fn\+0x2a8> 8f810000 	lw	at,0\(gp\)
 			2a8: R_MIPS_GOT_DISP	dg2
 000002ac <fn\+0x2ac> 24210038 	addiu	at,at,56
 000002b0 <fn\+0x2b0> 00250821 	addu	at,at,a1
-000002b4 <fn\+0x2b4> a8250000 	swl	a1,0\(at\)
-000002b8 <fn\+0x2b8> b8250003 	swr	a1,3\(at\)
+000002b4 <fn\+0x2b4> a825000[03] 	swl	a1,[03]\(at\)
+000002b8 <fn\+0x2b8> b825000[03] 	swr	a1,[03]\(at\)
 000002bc <fn\+0x2bc> 8f850000 	lw	a1,0\(gp\)
 			2bc: R_MIPS_GOT_DISP	\.data\+0xb4
 000002c0 <fn\+0x2c0> 8f850000 	lw	a1,0\(gp\)
@@ -305,32 +305,32 @@ Disassembly of section \.text:
 			31c: R_MIPS_GOT_OFST	\.data\+0xec
 00000320 <fn\+0x320> 8f810000 	lw	at,0\(gp\)
 			320: R_MIPS_GOT_DISP	\.data\+0xb4
-00000324 <fn\+0x324> 88250000 	lwl	a1,0\(at\)
-00000328 <fn\+0x328> 98250003 	lwr	a1,3\(at\)
+00000324 <fn\+0x324> 8825000[03] 	lwl	a1,[03]\(at\)
+00000328 <fn\+0x328> 9825000[03] 	lwr	a1,[03]\(at\)
 0000032c <fn\+0x32c> 8f810000 	lw	at,0\(gp\)
 			32c: R_MIPS_GOT_DISP	\.data\+0xc0
-00000330 <fn\+0x330> 88250000 	lwl	a1,0\(at\)
-00000334 <fn\+0x334> 98250003 	lwr	a1,3\(at\)
+00000330 <fn\+0x330> 8825000[03] 	lwl	a1,[03]\(at\)
+00000334 <fn\+0x334> 9825000[03] 	lwr	a1,[03]\(at\)
 00000338 <fn\+0x338> 8f810000 	lw	at,0\(gp\)
 			338: R_MIPS_GOT_DISP	\.data\+0xb4
 0000033c <fn\+0x33c> 00310821 	addu	at,at,s1
-00000340 <fn\+0x340> 88250000 	lwl	a1,0\(at\)
-00000344 <fn\+0x344> 98250003 	lwr	a1,3\(at\)
+00000340 <fn\+0x340> 8825000[03] 	lwl	a1,[03]\(at\)
+00000344 <fn\+0x344> 9825000[03] 	lwr	a1,[03]\(at\)
 00000348 <fn\+0x348> 8f810000 	lw	at,0\(gp\)
 			348: R_MIPS_GOT_DISP	\.data\+0xc0
 0000034c <fn\+0x34c> 00310821 	addu	at,at,s1
-00000350 <fn\+0x350> 88250000 	lwl	a1,0\(at\)
-00000354 <fn\+0x354> 98250003 	lwr	a1,3\(at\)
+00000350 <fn\+0x350> 8825000[03] 	lwl	a1,[03]\(at\)
+00000354 <fn\+0x354> 9825000[03] 	lwr	a1,[03]\(at\)
 00000358 <fn\+0x358> 8f810000 	lw	at,0\(gp\)
 			358: R_MIPS_GOT_DISP	\.data\+0xd6
 0000035c <fn\+0x35c> 00250821 	addu	at,at,a1
-00000360 <fn\+0x360> 88250000 	lwl	a1,0\(at\)
-00000364 <fn\+0x364> 98250003 	lwr	a1,3\(at\)
+00000360 <fn\+0x360> 8825000[03] 	lwl	a1,[03]\(at\)
+00000364 <fn\+0x364> 9825000[03] 	lwr	a1,[03]\(at\)
 00000368 <fn\+0x368> 8f810000 	lw	at,0\(gp\)
 			368: R_MIPS_GOT_DISP	\.data\+0xec
 0000036c <fn\+0x36c> 00250821 	addu	at,at,a1
-00000370 <fn\+0x370> a8250000 	swl	a1,0\(at\)
-00000374 <fn\+0x374> b8250003 	swr	a1,3\(at\)
+00000370 <fn\+0x370> a825000[03] 	swl	a1,[03]\(at\)
+00000374 <fn\+0x374> b825000[03] 	swr	a1,[03]\(at\)
 00000378 <fn\+0x378> 8f850000 	lw	a1,0\(gp\)
 			378: R_MIPS_GOT_DISP	fn2
 0000037c <fn\+0x37c> 8f850000 	lw	a1,0\(gp\)
diff --git a/gas/testsuite/gas/mips/elf-rel-got-n64.d b/gas/testsuite/gas/mips/elf-rel-got-n64.d
index 60abe54..9fe98b5 100644
--- a/gas/testsuite/gas/mips/elf-rel-got-n64.d
+++ b/gas/testsuite/gas/mips/elf-rel-got-n64.d
@@ -96,46 +96,46 @@ Disassembly of section \.text:
 			84: R_MIPS_GOT_DISP	dg1
 			84: R_MIPS_NONE	\*ABS\*
 			84: R_MIPS_NONE	\*ABS\*
-0000000000000088 <fn\+0x88> 88250000 	lwl	a1,0\(at\)
-000000000000008c <fn\+0x8c> 98250003 	lwr	a1,3\(at\)
+0000000000000088 <fn\+0x88> 8825000[03] 	lwl	a1,[03]\(at\)
+000000000000008c <fn\+0x8c> 9825000[03] 	lwr	a1,[03]\(at\)
 0000000000000090 <fn\+0x90> df810000 	ld	at,0\(gp\)
 			90: R_MIPS_GOT_DISP	dg1
 			90: R_MIPS_NONE	\*ABS\*
 			90: R_MIPS_NONE	\*ABS\*
 0000000000000094 <fn\+0x94> 6421000c 	daddiu	at,at,12
-0000000000000098 <fn\+0x98> 88250000 	lwl	a1,0\(at\)
-000000000000009c <fn\+0x9c> 98250003 	lwr	a1,3\(at\)
+0000000000000098 <fn\+0x98> 8825000[03] 	lwl	a1,[03]\(at\)
+000000000000009c <fn\+0x9c> 9825000[03] 	lwr	a1,[03]\(at\)
 00000000000000a0 <fn\+0xa0> df810000 	ld	at,0\(gp\)
 			a0: R_MIPS_GOT_DISP	dg1
 			a0: R_MIPS_NONE	\*ABS\*
 			a0: R_MIPS_NONE	\*ABS\*
 00000000000000a4 <fn\+0xa4> 0031082d 	daddu	at,at,s1
-00000000000000a8 <fn\+0xa8> 88250000 	lwl	a1,0\(at\)
-00000000000000ac <fn\+0xac> 98250003 	lwr	a1,3\(at\)
+00000000000000a8 <fn\+0xa8> 8825000[03] 	lwl	a1,[03]\(at\)
+00000000000000ac <fn\+0xac> 9825000[03] 	lwr	a1,[03]\(at\)
 00000000000000b0 <fn\+0xb0> df810000 	ld	at,0\(gp\)
 			b0: R_MIPS_GOT_DISP	dg1
 			b0: R_MIPS_NONE	\*ABS\*
 			b0: R_MIPS_NONE	\*ABS\*
 00000000000000b4 <fn\+0xb4> 6421000c 	daddiu	at,at,12
 00000000000000b8 <fn\+0xb8> 0031082d 	daddu	at,at,s1
-00000000000000bc <fn\+0xbc> 88250000 	lwl	a1,0\(at\)
-00000000000000c0 <fn\+0xc0> 98250003 	lwr	a1,3\(at\)
+00000000000000bc <fn\+0xbc> 8825000[03] 	lwl	a1,[03]\(at\)
+00000000000000c0 <fn\+0xc0> 9825000[03] 	lwr	a1,[03]\(at\)
 00000000000000c4 <fn\+0xc4> df810000 	ld	at,0\(gp\)
 			c4: R_MIPS_GOT_DISP	dg1
 			c4: R_MIPS_NONE	\*ABS\*
 			c4: R_MIPS_NONE	\*ABS\*
 00000000000000c8 <fn\+0xc8> 64210022 	daddiu	at,at,34
 00000000000000cc <fn\+0xcc> 0025082d 	daddu	at,at,a1
-00000000000000d0 <fn\+0xd0> 88250000 	lwl	a1,0\(at\)
-00000000000000d4 <fn\+0xd4> 98250003 	lwr	a1,3\(at\)
+00000000000000d0 <fn\+0xd0> 8825000[03] 	lwl	a1,[03]\(at\)
+00000000000000d4 <fn\+0xd4> 9825000[03] 	lwr	a1,[03]\(at\)
 00000000000000d8 <fn\+0xd8> df810000 	ld	at,0\(gp\)
 			d8: R_MIPS_GOT_DISP	dg1
 			d8: R_MIPS_NONE	\*ABS\*
 			d8: R_MIPS_NONE	\*ABS\*
 00000000000000dc <fn\+0xdc> 64210038 	daddiu	at,at,56
 00000000000000e0 <fn\+0xe0> 0025082d 	daddu	at,at,a1
-00000000000000e4 <fn\+0xe4> a8250000 	swl	a1,0\(at\)
-00000000000000e8 <fn\+0xe8> b8250003 	swr	a1,3\(at\)
+00000000000000e4 <fn\+0xe4> a825000[03] 	swl	a1,[03]\(at\)
+00000000000000e8 <fn\+0xe8> b825000[03] 	swr	a1,[03]\(at\)
 00000000000000ec <fn\+0xec> df850000 	ld	a1,0\(gp\)
 			ec: R_MIPS_GOT_DISP	\.data\+0x3c
 			ec: R_MIPS_NONE	\*ABS\*\+0x3c
@@ -219,42 +219,42 @@ Disassembly of section \.text:
 			150: R_MIPS_GOT_DISP	\.data\+0x3c
 			150: R_MIPS_NONE	\*ABS\*\+0x3c
 			150: R_MIPS_NONE	\*ABS\*\+0x3c
-0000000000000154 <fn\+0x154> 88250000 	lwl	a1,0\(at\)
-0000000000000158 <fn\+0x158> 98250003 	lwr	a1,3\(at\)
+0000000000000154 <fn\+0x154> 8825000[03] 	lwl	a1,[03]\(at\)
+0000000000000158 <fn\+0x158> 9825000[03] 	lwr	a1,[03]\(at\)
 000000000000015c <fn\+0x15c> df810000 	ld	at,0\(gp\)
 			15c: R_MIPS_GOT_DISP	\.data\+0x48
 			15c: R_MIPS_NONE	\*ABS\*\+0x48
 			15c: R_MIPS_NONE	\*ABS\*\+0x48
-0000000000000160 <fn\+0x160> 88250000 	lwl	a1,0\(at\)
-0000000000000164 <fn\+0x164> 98250003 	lwr	a1,3\(at\)
+0000000000000160 <fn\+0x160> 8825000[03] 	lwl	a1,[03]\(at\)
+0000000000000164 <fn\+0x164> 9825000[03] 	lwr	a1,[03]\(at\)
 0000000000000168 <fn\+0x168> df810000 	ld	at,0\(gp\)
 			168: R_MIPS_GOT_DISP	\.data\+0x3c
 			168: R_MIPS_NONE	\*ABS\*\+0x3c
 			168: R_MIPS_NONE	\*ABS\*\+0x3c
 000000000000016c <fn\+0x16c> 0031082d 	daddu	at,at,s1
-0000000000000170 <fn\+0x170> 88250000 	lwl	a1,0\(at\)
-0000000000000174 <fn\+0x174> 98250003 	lwr	a1,3\(at\)
+0000000000000170 <fn\+0x170> 8825000[03] 	lwl	a1,[03]\(at\)
+0000000000000174 <fn\+0x174> 9825000[03] 	lwr	a1,[03]\(at\)
 0000000000000178 <fn\+0x178> df810000 	ld	at,0\(gp\)
 			178: R_MIPS_GOT_DISP	\.data\+0x48
 			178: R_MIPS_NONE	\*ABS\*\+0x48
 			178: R_MIPS_NONE	\*ABS\*\+0x48
 000000000000017c <fn\+0x17c> 0031082d 	daddu	at,at,s1
-0000000000000180 <fn\+0x180> 88250000 	lwl	a1,0\(at\)
-0000000000000184 <fn\+0x184> 98250003 	lwr	a1,3\(at\)
+0000000000000180 <fn\+0x180> 8825000[03] 	lwl	a1,[03]\(at\)
+0000000000000184 <fn\+0x184> 9825000[03] 	lwr	a1,[03]\(at\)
 0000000000000188 <fn\+0x188> df810000 	ld	at,0\(gp\)
 			188: R_MIPS_GOT_DISP	\.data\+0x5e
 			188: R_MIPS_NONE	\*ABS\*\+0x5e
 			188: R_MIPS_NONE	\*ABS\*\+0x5e
 000000000000018c <fn\+0x18c> 0025082d 	daddu	at,at,a1
-0000000000000190 <fn\+0x190> 88250000 	lwl	a1,0\(at\)
-0000000000000194 <fn\+0x194> 98250003 	lwr	a1,3\(at\)
+0000000000000190 <fn\+0x190> 8825000[03] 	lwl	a1,[03]\(at\)
+0000000000000194 <fn\+0x194> 9825000[03] 	lwr	a1,[03]\(at\)
 0000000000000198 <fn\+0x198> df810000 	ld	at,0\(gp\)
 			198: R_MIPS_GOT_DISP	\.data\+0x74
 			198: R_MIPS_NONE	\*ABS\*\+0x74
 			198: R_MIPS_NONE	\*ABS\*\+0x74
 000000000000019c <fn\+0x19c> 0025082d 	daddu	at,at,a1
-00000000000001a0 <fn\+0x1a0> a8250000 	swl	a1,0\(at\)
-00000000000001a4 <fn\+0x1a4> b8250003 	swr	a1,3\(at\)
+00000000000001a0 <fn\+0x1a0> a825000[03] 	swl	a1,[03]\(at\)
+00000000000001a4 <fn\+0x1a4> b825000[03] 	swr	a1,[03]\(at\)
 00000000000001a8 <fn\+0x1a8> df850000 	ld	a1,0\(gp\)
 			1a8: R_MIPS_GOT_DISP	fn
 			1a8: R_MIPS_NONE	\*ABS\*
@@ -380,46 +380,46 @@ Disassembly of section \.text:
 			254: R_MIPS_GOT_DISP	dg2
 			254: R_MIPS_NONE	\*ABS\*
 			254: R_MIPS_NONE	\*ABS\*
-0000000000000258 <fn\+0x258> 88250000 	lwl	a1,0\(at\)
-000000000000025c <fn\+0x25c> 98250003 	lwr	a1,3\(at\)
+0000000000000258 <fn\+0x258> 8825000[03] 	lwl	a1,[03]\(at\)
+000000000000025c <fn\+0x25c> 9825000[03] 	lwr	a1,[03]\(at\)
 0000000000000260 <fn\+0x260> df810000 	ld	at,0\(gp\)
 			260: R_MIPS_GOT_DISP	dg2
 			260: R_MIPS_NONE	\*ABS\*
 			260: R_MIPS_NONE	\*ABS\*
 0000000000000264 <fn\+0x264> 6421000c 	daddiu	at,at,12
-0000000000000268 <fn\+0x268> 88250000 	lwl	a1,0\(at\)
-000000000000026c <fn\+0x26c> 98250003 	lwr	a1,3\(at\)
+0000000000000268 <fn\+0x268> 8825000[03] 	lwl	a1,[03]\(at\)
+000000000000026c <fn\+0x26c> 9825000[03] 	lwr	a1,[03]\(at\)
 0000000000000270 <fn\+0x270> df810000 	ld	at,0\(gp\)
 			270: R_MIPS_GOT_DISP	dg2
 			270: R_MIPS_NONE	\*ABS\*
 			270: R_MIPS_NONE	\*ABS\*
 0000000000000274 <fn\+0x274> 0031082d 	daddu	at,at,s1
-0000000000000278 <fn\+0x278> 88250000 	lwl	a1,0\(at\)
-000000000000027c <fn\+0x27c> 98250003 	lwr	a1,3\(at\)
+0000000000000278 <fn\+0x278> 8825000[03] 	lwl	a1,[03]\(at\)
+000000000000027c <fn\+0x27c> 9825000[03] 	lwr	a1,[03]\(at\)
 0000000000000280 <fn\+0x280> df810000 	ld	at,0\(gp\)
 			280: R_MIPS_GOT_DISP	dg2
 			280: R_MIPS_NONE	\*ABS\*
 			280: R_MIPS_NONE	\*ABS\*
 0000000000000284 <fn\+0x284> 6421000c 	daddiu	at,at,12
 0000000000000288 <fn\+0x288> 0031082d 	daddu	at,at,s1
-000000000000028c <fn\+0x28c> 88250000 	lwl	a1,0\(at\)
-0000000000000290 <fn\+0x290> 98250003 	lwr	a1,3\(at\)
+000000000000028c <fn\+0x28c> 8825000[03] 	lwl	a1,[03]\(at\)
+0000000000000290 <fn\+0x290> 9825000[03] 	lwr	a1,[03]\(at\)
 0000000000000294 <fn\+0x294> df810000 	ld	at,0\(gp\)
 			294: R_MIPS_GOT_DISP	dg2
 			294: R_MIPS_NONE	\*ABS\*
 			294: R_MIPS_NONE	\*ABS\*
 0000000000000298 <fn\+0x298> 64210022 	daddiu	at,at,34
 000000000000029c <fn\+0x29c> 0025082d 	daddu	at,at,a1
-00000000000002a0 <fn\+0x2a0> 88250000 	lwl	a1,0\(at\)
-00000000000002a4 <fn\+0x2a4> 98250003 	lwr	a1,3\(at\)
+00000000000002a0 <fn\+0x2a0> 8825000[03] 	lwl	a1,[03]\(at\)
+00000000000002a4 <fn\+0x2a4> 9825000[03] 	lwr	a1,[03]\(at\)
 00000000000002a8 <fn\+0x2a8> df810000 	ld	at,0\(gp\)
 			2a8: R_MIPS_GOT_DISP	dg2
 			2a8: R_MIPS_NONE	\*ABS\*
 			2a8: R_MIPS_NONE	\*ABS\*
 00000000000002ac <fn\+0x2ac> 64210038 	daddiu	at,at,56
 00000000000002b0 <fn\+0x2b0> 0025082d 	daddu	at,at,a1
-00000000000002b4 <fn\+0x2b4> a8250000 	swl	a1,0\(at\)
-00000000000002b8 <fn\+0x2b8> b8250003 	swr	a1,3\(at\)
+00000000000002b4 <fn\+0x2b4> a825000[03] 	swl	a1,[03]\(at\)
+00000000000002b8 <fn\+0x2b8> b825000[03] 	swr	a1,[03]\(at\)
 00000000000002bc <fn\+0x2bc> df850000 	ld	a1,0\(gp\)
 			2bc: R_MIPS_GOT_DISP	\.data\+0xb4
 			2bc: R_MIPS_NONE	\*ABS\*\+0xb4
@@ -503,42 +503,42 @@ Disassembly of section \.text:
 			320: R_MIPS_GOT_DISP	\.data\+0xb4
 			320: R_MIPS_NONE	\*ABS\*\+0xb4
 			320: R_MIPS_NONE	\*ABS\*\+0xb4
-0000000000000324 <fn\+0x324> 88250000 	lwl	a1,0\(at\)
-0000000000000328 <fn\+0x328> 98250003 	lwr	a1,3\(at\)
+0000000000000324 <fn\+0x324> 8825000[03] 	lwl	a1,[03]\(at\)
+0000000000000328 <fn\+0x328> 9825000[03] 	lwr	a1,[03]\(at\)
 000000000000032c <fn\+0x32c> df810000 	ld	at,0\(gp\)
 			32c: R_MIPS_GOT_DISP	\.data\+0xc0
 			32c: R_MIPS_NONE	\*ABS\*\+0xc0
 			32c: R_MIPS_NONE	\*ABS\*\+0xc0
-0000000000000330 <fn\+0x330> 88250000 	lwl	a1,0\(at\)
-0000000000000334 <fn\+0x334> 98250003 	lwr	a1,3\(at\)
+0000000000000330 <fn\+0x330> 8825000[03] 	lwl	a1,[03]\(at\)
+0000000000000334 <fn\+0x334> 9825000[03] 	lwr	a1,[03]\(at\)
 0000000000000338 <fn\+0x338> df810000 	ld	at,0\(gp\)
 			338: R_MIPS_GOT_DISP	\.data\+0xb4
 			338: R_MIPS_NONE	\*ABS\*\+0xb4
 			338: R_MIPS_NONE	\*ABS\*\+0xb4
 000000000000033c <fn\+0x33c> 0031082d 	daddu	at,at,s1
-0000000000000340 <fn\+0x340> 88250000 	lwl	a1,0\(at\)
-0000000000000344 <fn\+0x344> 98250003 	lwr	a1,3\(at\)
+0000000000000340 <fn\+0x340> 8825000[03] 	lwl	a1,[03]\(at\)
+0000000000000344 <fn\+0x344> 9825000[03] 	lwr	a1,[03]\(at\)
 0000000000000348 <fn\+0x348> df810000 	ld	at,0\(gp\)
 			348: R_MIPS_GOT_DISP	\.data\+0xc0
 			348: R_MIPS_NONE	\*ABS\*\+0xc0
 			348: R_MIPS_NONE	\*ABS\*\+0xc0
 000000000000034c <fn\+0x34c> 0031082d 	daddu	at,at,s1
-0000000000000350 <fn\+0x350> 88250000 	lwl	a1,0\(at\)
-0000000000000354 <fn\+0x354> 98250003 	lwr	a1,3\(at\)
+0000000000000350 <fn\+0x350> 8825000[03] 	lwl	a1,[03]\(at\)
+0000000000000354 <fn\+0x354> 9825000[03] 	lwr	a1,[03]\(at\)
 0000000000000358 <fn\+0x358> df810000 	ld	at,0\(gp\)
 			358: R_MIPS_GOT_DISP	\.data\+0xd6
 			358: R_MIPS_NONE	\*ABS\*\+0xd6
 			358: R_MIPS_NONE	\*ABS\*\+0xd6
 000000000000035c <fn\+0x35c> 0025082d 	daddu	at,at,a1
-0000000000000360 <fn\+0x360> 88250000 	lwl	a1,0\(at\)
-0000000000000364 <fn\+0x364> 98250003 	lwr	a1,3\(at\)
+0000000000000360 <fn\+0x360> 8825000[03] 	lwl	a1,[03]\(at\)
+0000000000000364 <fn\+0x364> 9825000[03] 	lwr	a1,[03]\(at\)
 0000000000000368 <fn\+0x368> df810000 	ld	at,0\(gp\)
 			368: R_MIPS_GOT_DISP	\.data\+0xec
 			368: R_MIPS_NONE	\*ABS\*\+0xec
 			368: R_MIPS_NONE	\*ABS\*\+0xec
 000000000000036c <fn\+0x36c> 0025082d 	daddu	at,at,a1
-0000000000000370 <fn\+0x370> a8250000 	swl	a1,0\(at\)
-0000000000000374 <fn\+0x374> b8250003 	swr	a1,3\(at\)
+0000000000000370 <fn\+0x370> a825000[03] 	swl	a1,[03]\(at\)
+0000000000000374 <fn\+0x374> b825000[03] 	swr	a1,[03]\(at\)
 0000000000000378 <fn\+0x378> df850000 	ld	a1,0\(gp\)
 			378: R_MIPS_GOT_DISP	fn2
 			378: R_MIPS_NONE	\*ABS\*
diff --git a/gas/testsuite/gas/mips/elf-rel-xgot-n32.d b/gas/testsuite/gas/mips/elf-rel-xgot-n32.d
index 50dc0a1..7221931 100644
--- a/gas/testsuite/gas/mips/elf-rel-xgot-n32.d
+++ b/gas/testsuite/gas/mips/elf-rel-xgot-n32.d
@@ -92,24 +92,24 @@ Disassembly of section \.text:
 000000e8 <fn\+0xe8> 003c0821 	addu	at,at,gp
 000000ec <fn\+0xec> 8c210000 	lw	at,0\(at\)
 			ec: R_MIPS_GOT_LO16	dg1
-000000f0 <fn\+0xf0> 88250000 	lwl	a1,0\(at\)
-000000f4 <fn\+0xf4> 98250003 	lwr	a1,3\(at\)
+000000f0 <fn\+0xf0> 8825000[03] 	lwl	a1,[03]\(at\)
+000000f4 <fn\+0xf4> 9825000[03] 	lwr	a1,[03]\(at\)
 000000f8 <fn\+0xf8> 3c010000 	lui	at,0x0
 			f8: R_MIPS_GOT_HI16	dg1
 000000fc <fn\+0xfc> 003c0821 	addu	at,at,gp
 00000100 <fn\+0x100> 8c210000 	lw	at,0\(at\)
 			100: R_MIPS_GOT_LO16	dg1
 00000104 <fn\+0x104> 2421000c 	addiu	at,at,12
-00000108 <fn\+0x108> 88250000 	lwl	a1,0\(at\)
-0000010c <fn\+0x10c> 98250003 	lwr	a1,3\(at\)
+00000108 <fn\+0x108> 8825000[03] 	lwl	a1,[03]\(at\)
+0000010c <fn\+0x10c> 9825000[03] 	lwr	a1,[03]\(at\)
 00000110 <fn\+0x110> 3c010000 	lui	at,0x0
 			110: R_MIPS_GOT_HI16	dg1
 00000114 <fn\+0x114> 003c0821 	addu	at,at,gp
 00000118 <fn\+0x118> 8c210000 	lw	at,0\(at\)
 			118: R_MIPS_GOT_LO16	dg1
 0000011c <fn\+0x11c> 00310821 	addu	at,at,s1
-00000120 <fn\+0x120> 88250000 	lwl	a1,0\(at\)
-00000124 <fn\+0x124> 98250003 	lwr	a1,3\(at\)
+00000120 <fn\+0x120> 8825000[03] 	lwl	a1,[03]\(at\)
+00000124 <fn\+0x124> 9825000[03] 	lwr	a1,[03]\(at\)
 00000128 <fn\+0x128> 3c010000 	lui	at,0x0
 			128: R_MIPS_GOT_HI16	dg1
 0000012c <fn\+0x12c> 003c0821 	addu	at,at,gp
@@ -117,8 +117,8 @@ Disassembly of section \.text:
 			130: R_MIPS_GOT_LO16	dg1
 00000134 <fn\+0x134> 2421000c 	addiu	at,at,12
 00000138 <fn\+0x138> 00310821 	addu	at,at,s1
-0000013c <fn\+0x13c> 88250000 	lwl	a1,0\(at\)
-00000140 <fn\+0x140> 98250003 	lwr	a1,3\(at\)
+0000013c <fn\+0x13c> 8825000[03] 	lwl	a1,[03]\(at\)
+00000140 <fn\+0x140> 9825000[03] 	lwr	a1,[03]\(at\)
 00000144 <fn\+0x144> 3c010000 	lui	at,0x0
 			144: R_MIPS_GOT_HI16	dg1
 00000148 <fn\+0x148> 003c0821 	addu	at,at,gp
@@ -126,8 +126,8 @@ Disassembly of section \.text:
 			14c: R_MIPS_GOT_LO16	dg1
 00000150 <fn\+0x150> 24210022 	addiu	at,at,34
 00000154 <fn\+0x154> 00250821 	addu	at,at,a1
-00000158 <fn\+0x158> 88250000 	lwl	a1,0\(at\)
-0000015c <fn\+0x15c> 98250003 	lwr	a1,3\(at\)
+00000158 <fn\+0x158> 8825000[03] 	lwl	a1,[03]\(at\)
+0000015c <fn\+0x15c> 9825000[03] 	lwr	a1,[03]\(at\)
 00000160 <fn\+0x160> 3c010000 	lui	at,0x0
 			160: R_MIPS_GOT_HI16	dg1
 00000164 <fn\+0x164> 003c0821 	addu	at,at,gp
@@ -135,8 +135,8 @@ Disassembly of section \.text:
 			168: R_MIPS_GOT_LO16	dg1
 0000016c <fn\+0x16c> 24210038 	addiu	at,at,56
 00000170 <fn\+0x170> 00250821 	addu	at,at,a1
-00000174 <fn\+0x174> a8250000 	swl	a1,0\(at\)
-00000178 <fn\+0x178> b8250003 	swr	a1,3\(at\)
+00000174 <fn\+0x174> a825000[03] 	swl	a1,[03]\(at\)
+00000178 <fn\+0x178> b825000[03] 	swr	a1,[03]\(at\)
 0000017c <fn\+0x17c> 8f850000 	lw	a1,0\(gp\)
 			17c: R_MIPS_GOT_PAGE	\.data\+0x3c
 00000180 <fn\+0x180> 24a50000 	addiu	a1,a1,0
@@ -196,42 +196,42 @@ Disassembly of section \.text:
 			1f8: R_MIPS_GOT_PAGE	\.data\+0x3c
 000001fc <fn\+0x1fc> 24210000 	addiu	at,at,0
 			1fc: R_MIPS_GOT_OFST	\.data\+0x3c
-00000200 <fn\+0x200> 88250000 	lwl	a1,0\(at\)
-00000204 <fn\+0x204> 98250003 	lwr	a1,3\(at\)
+00000200 <fn\+0x200> 8825000[03] 	lwl	a1,[03]\(at\)
+00000204 <fn\+0x204> 9825000[03] 	lwr	a1,[03]\(at\)
 00000208 <fn\+0x208> 8f810000 	lw	at,0\(gp\)
 			208: R_MIPS_GOT_PAGE	\.data\+0x48
 0000020c <fn\+0x20c> 24210000 	addiu	at,at,0
 			20c: R_MIPS_GOT_OFST	\.data\+0x48
-00000210 <fn\+0x210> 88250000 	lwl	a1,0\(at\)
-00000214 <fn\+0x214> 98250003 	lwr	a1,3\(at\)
+00000210 <fn\+0x210> 8825000[03] 	lwl	a1,[03]\(at\)
+00000214 <fn\+0x214> 9825000[03] 	lwr	a1,[03]\(at\)
 00000218 <fn\+0x218> 8f810000 	lw	at,0\(gp\)
 			218: R_MIPS_GOT_PAGE	\.data\+0x3c
 0000021c <fn\+0x21c> 24210000 	addiu	at,at,0
 			21c: R_MIPS_GOT_OFST	\.data\+0x3c
 00000220 <fn\+0x220> 00310821 	addu	at,at,s1
-00000224 <fn\+0x224> 88250000 	lwl	a1,0\(at\)
-00000228 <fn\+0x228> 98250003 	lwr	a1,3\(at\)
+00000224 <fn\+0x224> 8825000[03] 	lwl	a1,[03]\(at\)
+00000228 <fn\+0x228> 9825000[03] 	lwr	a1,[03]\(at\)
 0000022c <fn\+0x22c> 8f810000 	lw	at,0\(gp\)
 			22c: R_MIPS_GOT_PAGE	\.data\+0x48
 00000230 <fn\+0x230> 24210000 	addiu	at,at,0
 			230: R_MIPS_GOT_OFST	\.data\+0x48
 00000234 <fn\+0x234> 00310821 	addu	at,at,s1
-00000238 <fn\+0x238> 88250000 	lwl	a1,0\(at\)
-0000023c <fn\+0x23c> 98250003 	lwr	a1,3\(at\)
+00000238 <fn\+0x238> 8825000[03] 	lwl	a1,[03]\(at\)
+0000023c <fn\+0x23c> 9825000[03] 	lwr	a1,[03]\(at\)
 00000240 <fn\+0x240> 8f810000 	lw	at,0\(gp\)
 			240: R_MIPS_GOT_PAGE	\.data\+0x5e
 00000244 <fn\+0x244> 24210000 	addiu	at,at,0
 			244: R_MIPS_GOT_OFST	\.data\+0x5e
 00000248 <fn\+0x248> 00250821 	addu	at,at,a1
-0000024c <fn\+0x24c> 88250000 	lwl	a1,0\(at\)
-00000250 <fn\+0x250> 98250003 	lwr	a1,3\(at\)
+0000024c <fn\+0x24c> 8825000[03] 	lwl	a1,[03]\(at\)
+00000250 <fn\+0x250> 9825000[03] 	lwr	a1,[03]\(at\)
 00000254 <fn\+0x254> 8f810000 	lw	at,0\(gp\)
 			254: R_MIPS_GOT_PAGE	\.data\+0x74
 00000258 <fn\+0x258> 24210000 	addiu	at,at,0
 			258: R_MIPS_GOT_OFST	\.data\+0x74
 0000025c <fn\+0x25c> 00250821 	addu	at,at,a1
-00000260 <fn\+0x260> a8250000 	swl	a1,0\(at\)
-00000264 <fn\+0x264> b8250003 	swr	a1,3\(at\)
+00000260 <fn\+0x260> a825000[03] 	swl	a1,[03]\(at\)
+00000264 <fn\+0x264> b825000[03] 	swr	a1,[03]\(at\)
 00000268 <fn\+0x268> 3c050000 	lui	a1,0x0
 			268: R_MIPS_GOT_HI16	fn
 0000026c <fn\+0x26c> 00bc2821 	addu	a1,a1,gp
@@ -351,24 +351,24 @@ Disassembly of section \.text:
 0000039c <fn\+0x39c> 003c0821 	addu	at,at,gp
 000003a0 <fn\+0x3a0> 8c210000 	lw	at,0\(at\)
 			3a0: R_MIPS_GOT_LO16	dg2
-000003a4 <fn\+0x3a4> 88250000 	lwl	a1,0\(at\)
-000003a8 <fn\+0x3a8> 98250003 	lwr	a1,3\(at\)
+000003a4 <fn\+0x3a4> 8825000[03] 	lwl	a1,[03]\(at\)
+000003a8 <fn\+0x3a8> 9825000[03] 	lwr	a1,[03]\(at\)
 000003ac <fn\+0x3ac> 3c010000 	lui	at,0x0
 			3ac: R_MIPS_GOT_HI16	dg2
 000003b0 <fn\+0x3b0> 003c0821 	addu	at,at,gp
 000003b4 <fn\+0x3b4> 8c210000 	lw	at,0\(at\)
 			3b4: R_MIPS_GOT_LO16	dg2
 000003b8 <fn\+0x3b8> 2421000c 	addiu	at,at,12
-000003bc <fn\+0x3bc> 88250000 	lwl	a1,0\(at\)
-000003c0 <fn\+0x3c0> 98250003 	lwr	a1,3\(at\)
+000003bc <fn\+0x3bc> 8825000[03] 	lwl	a1,[03]\(at\)
+000003c0 <fn\+0x3c0> 9825000[03] 	lwr	a1,[03]\(at\)
 000003c4 <fn\+0x3c4> 3c010000 	lui	at,0x0
 			3c4: R_MIPS_GOT_HI16	dg2
 000003c8 <fn\+0x3c8> 003c0821 	addu	at,at,gp
 000003cc <fn\+0x3cc> 8c210000 	lw	at,0\(at\)
 			3cc: R_MIPS_GOT_LO16	dg2
 000003d0 <fn\+0x3d0> 00310821 	addu	at,at,s1
-000003d4 <fn\+0x3d4> 88250000 	lwl	a1,0\(at\)
-000003d8 <fn\+0x3d8> 98250003 	lwr	a1,3\(at\)
+000003d4 <fn\+0x3d4> 8825000[03] 	lwl	a1,[03]\(at\)
+000003d8 <fn\+0x3d8> 9825000[03] 	lwr	a1,[03]\(at\)
 000003dc <fn\+0x3dc> 3c010000 	lui	at,0x0
 			3dc: R_MIPS_GOT_HI16	dg2
 000003e0 <fn\+0x3e0> 003c0821 	addu	at,at,gp
@@ -376,8 +376,8 @@ Disassembly of section \.text:
 			3e4: R_MIPS_GOT_LO16	dg2
 000003e8 <fn\+0x3e8> 2421000c 	addiu	at,at,12
 000003ec <fn\+0x3ec> 00310821 	addu	at,at,s1
-000003f0 <fn\+0x3f0> 88250000 	lwl	a1,0\(at\)
-000003f4 <fn\+0x3f4> 98250003 	lwr	a1,3\(at\)
+000003f0 <fn\+0x3f0> 8825000[03] 	lwl	a1,[03]\(at\)
+000003f4 <fn\+0x3f4> 9825000[03] 	lwr	a1,[03]\(at\)
 000003f8 <fn\+0x3f8> 3c010000 	lui	at,0x0
 			3f8: R_MIPS_GOT_HI16	dg2
 000003fc <fn\+0x3fc> 003c0821 	addu	at,at,gp
@@ -385,8 +385,8 @@ Disassembly of section \.text:
 			400: R_MIPS_GOT_LO16	dg2
 00000404 <fn\+0x404> 24210022 	addiu	at,at,34
 00000408 <fn\+0x408> 00250821 	addu	at,at,a1
-0000040c <fn\+0x40c> 88250000 	lwl	a1,0\(at\)
-00000410 <fn\+0x410> 98250003 	lwr	a1,3\(at\)
+0000040c <fn\+0x40c> 8825000[03] 	lwl	a1,[03]\(at\)
+00000410 <fn\+0x410> 9825000[03] 	lwr	a1,[03]\(at\)
 00000414 <fn\+0x414> 3c010000 	lui	at,0x0
 			414: R_MIPS_GOT_HI16	dg2
 00000418 <fn\+0x418> 003c0821 	addu	at,at,gp
@@ -394,8 +394,8 @@ Disassembly of section \.text:
 			41c: R_MIPS_GOT_LO16	dg2
 00000420 <fn\+0x420> 24210038 	addiu	at,at,56
 00000424 <fn\+0x424> 00250821 	addu	at,at,a1
-00000428 <fn\+0x428> a8250000 	swl	a1,0\(at\)
-0000042c <fn\+0x42c> b8250003 	swr	a1,3\(at\)
+00000428 <fn\+0x428> a825000[03] 	swl	a1,[03]\(at\)
+0000042c <fn\+0x42c> b825000[03] 	swr	a1,[03]\(at\)
 00000430 <fn\+0x430> 8f850000 	lw	a1,0\(gp\)
 			430: R_MIPS_GOT_PAGE	\.data\+0xb4
 00000434 <fn\+0x434> 24a50000 	addiu	a1,a1,0
@@ -455,42 +455,42 @@ Disassembly of section \.text:
 			4ac: R_MIPS_GOT_PAGE	\.data\+0xb4
 000004b0 <fn\+0x4b0> 24210000 	addiu	at,at,0
 			4b0: R_MIPS_GOT_OFST	\.data\+0xb4
-000004b4 <fn\+0x4b4> 88250000 	lwl	a1,0\(at\)
-000004b8 <fn\+0x4b8> 98250003 	lwr	a1,3\(at\)
+000004b4 <fn\+0x4b4> 8825000[03] 	lwl	a1,[03]\(at\)
+000004b8 <fn\+0x4b8> 9825000[03] 	lwr	a1,[03]\(at\)
 000004bc <fn\+0x4bc> 8f810000 	lw	at,0\(gp\)
 			4bc: R_MIPS_GOT_PAGE	\.data\+0xc0
 000004c0 <fn\+0x4c0> 24210000 	addiu	at,at,0
 			4c0: R_MIPS_GOT_OFST	\.data\+0xc0
-000004c4 <fn\+0x4c4> 88250000 	lwl	a1,0\(at\)
-000004c8 <fn\+0x4c8> 98250003 	lwr	a1,3\(at\)
+000004c4 <fn\+0x4c4> 8825000[03] 	lwl	a1,[03]\(at\)
+000004c8 <fn\+0x4c8> 9825000[03] 	lwr	a1,[03]\(at\)
 000004cc <fn\+0x4cc> 8f810000 	lw	at,0\(gp\)
 			4cc: R_MIPS_GOT_PAGE	\.data\+0xb4
 000004d0 <fn\+0x4d0> 24210000 	addiu	at,at,0
 			4d0: R_MIPS_GOT_OFST	\.data\+0xb4
 000004d4 <fn\+0x4d4> 00310821 	addu	at,at,s1
-000004d8 <fn\+0x4d8> 88250000 	lwl	a1,0\(at\)
-000004dc <fn\+0x4dc> 98250003 	lwr	a1,3\(at\)
+000004d8 <fn\+0x4d8> 8825000[03] 	lwl	a1,[03]\(at\)
+000004dc <fn\+0x4dc> 9825000[03] 	lwr	a1,[03]\(at\)
 000004e0 <fn\+0x4e0> 8f810000 	lw	at,0\(gp\)
 			4e0: R_MIPS_GOT_PAGE	\.data\+0xc0
 000004e4 <fn\+0x4e4> 24210000 	addiu	at,at,0
 			4e4: R_MIPS_GOT_OFST	\.data\+0xc0
 000004e8 <fn\+0x4e8> 00310821 	addu	at,at,s1
-000004ec <fn\+0x4ec> 88250000 	lwl	a1,0\(at\)
-000004f0 <fn\+0x4f0> 98250003 	lwr	a1,3\(at\)
+000004ec <fn\+0x4ec> 8825000[03] 	lwl	a1,[03]\(at\)
+000004f0 <fn\+0x4f0> 9825000[03] 	lwr	a1,[03]\(at\)
 000004f4 <fn\+0x4f4> 8f810000 	lw	at,0\(gp\)
 			4f4: R_MIPS_GOT_PAGE	\.data\+0xd6
 000004f8 <fn\+0x4f8> 24210000 	addiu	at,at,0
 			4f8: R_MIPS_GOT_OFST	\.data\+0xd6
 000004fc <fn\+0x4fc> 00250821 	addu	at,at,a1
-00000500 <fn\+0x500> 88250000 	lwl	a1,0\(at\)
-00000504 <fn\+0x504> 98250003 	lwr	a1,3\(at\)
+00000500 <fn\+0x500> 8825000[03] 	lwl	a1,[03]\(at\)
+00000504 <fn\+0x504> 9825000[03] 	lwr	a1,[03]\(at\)
 00000508 <fn\+0x508> 8f810000 	lw	at,0\(gp\)
 			508: R_MIPS_GOT_PAGE	\.data\+0xec
 0000050c <fn\+0x50c> 24210000 	addiu	at,at,0
 			50c: R_MIPS_GOT_OFST	\.data\+0xec
 00000510 <fn\+0x510> 00250821 	addu	at,at,a1
-00000514 <fn\+0x514> a8250000 	swl	a1,0\(at\)
-00000518 <fn\+0x518> b8250003 	swr	a1,3\(at\)
+00000514 <fn\+0x514> a825000[03] 	swl	a1,[03]\(at\)
+00000518 <fn\+0x518> b825000[03] 	swr	a1,[03]\(at\)
 0000051c <fn\+0x51c> 3c050000 	lui	a1,0x0
 			51c: R_MIPS_GOT_HI16	fn2
 00000520 <fn\+0x520> 00bc2821 	addu	a1,a1,gp
diff --git a/gas/testsuite/gas/mips/elf-rel-xgot-n64.d b/gas/testsuite/gas/mips/elf-rel-xgot-n64.d
index 59a3b13..167b47d 100644
--- a/gas/testsuite/gas/mips/elf-rel-xgot-n64.d
+++ b/gas/testsuite/gas/mips/elf-rel-xgot-n64.d
@@ -144,8 +144,8 @@ Disassembly of section \.text:
 			ec: R_MIPS_GOT_LO16	dg1
 			ec: R_MIPS_NONE	\*ABS\*
 			ec: R_MIPS_NONE	\*ABS\*
-00000000000000f0 <fn\+0xf0> 88250000 	lwl	a1,0\(at\)
-00000000000000f4 <fn\+0xf4> 98250003 	lwr	a1,3\(at\)
+00000000000000f0 <fn\+0xf0> 8825000[03] 	lwl	a1,[03]\(at\)
+00000000000000f4 <fn\+0xf4> 9825000[03] 	lwr	a1,[03]\(at\)
 00000000000000f8 <fn\+0xf8> 3c010000 	lui	at,0x0
 			f8: R_MIPS_GOT_HI16	dg1
 			f8: R_MIPS_NONE	\*ABS\*
@@ -156,8 +156,8 @@ Disassembly of section \.text:
 			100: R_MIPS_NONE	\*ABS\*
 			100: R_MIPS_NONE	\*ABS\*
 0000000000000104 <fn\+0x104> 6421000c 	daddiu	at,at,12
-0000000000000108 <fn\+0x108> 88250000 	lwl	a1,0\(at\)
-000000000000010c <fn\+0x10c> 98250003 	lwr	a1,3\(at\)
+0000000000000108 <fn\+0x108> 8825000[03] 	lwl	a1,[03]\(at\)
+000000000000010c <fn\+0x10c> 9825000[03] 	lwr	a1,[03]\(at\)
 0000000000000110 <fn\+0x110> 3c010000 	lui	at,0x0
 			110: R_MIPS_GOT_HI16	dg1
 			110: R_MIPS_NONE	\*ABS\*
@@ -168,8 +168,8 @@ Disassembly of section \.text:
 			118: R_MIPS_NONE	\*ABS\*
 			118: R_MIPS_NONE	\*ABS\*
 000000000000011c <fn\+0x11c> 0031082d 	daddu	at,at,s1
-0000000000000120 <fn\+0x120> 88250000 	lwl	a1,0\(at\)
-0000000000000124 <fn\+0x124> 98250003 	lwr	a1,3\(at\)
+0000000000000120 <fn\+0x120> 8825000[03] 	lwl	a1,[03]\(at\)
+0000000000000124 <fn\+0x124> 9825000[03] 	lwr	a1,[03]\(at\)
 0000000000000128 <fn\+0x128> 3c010000 	lui	at,0x0
 			128: R_MIPS_GOT_HI16	dg1
 			128: R_MIPS_NONE	\*ABS\*
@@ -181,8 +181,8 @@ Disassembly of section \.text:
 			130: R_MIPS_NONE	\*ABS\*
 0000000000000134 <fn\+0x134> 6421000c 	daddiu	at,at,12
 0000000000000138 <fn\+0x138> 0031082d 	daddu	at,at,s1
-000000000000013c <fn\+0x13c> 88250000 	lwl	a1,0\(at\)
-0000000000000140 <fn\+0x140> 98250003 	lwr	a1,3\(at\)
+000000000000013c <fn\+0x13c> 8825000[03] 	lwl	a1,[03]\(at\)
+0000000000000140 <fn\+0x140> 9825000[03] 	lwr	a1,[03]\(at\)
 0000000000000144 <fn\+0x144> 3c010000 	lui	at,0x0
 			144: R_MIPS_GOT_HI16	dg1
 			144: R_MIPS_NONE	\*ABS\*
@@ -194,8 +194,8 @@ Disassembly of section \.text:
 			14c: R_MIPS_NONE	\*ABS\*
 0000000000000150 <fn\+0x150> 64210022 	daddiu	at,at,34
 0000000000000154 <fn\+0x154> 0025082d 	daddu	at,at,a1
-0000000000000158 <fn\+0x158> 88250000 	lwl	a1,0\(at\)
-000000000000015c <fn\+0x15c> 98250003 	lwr	a1,3\(at\)
+0000000000000158 <fn\+0x158> 8825000[03] 	lwl	a1,[03]\(at\)
+000000000000015c <fn\+0x15c> 9825000[03] 	lwr	a1,[03]\(at\)
 0000000000000160 <fn\+0x160> 3c010000 	lui	at,0x0
 			160: R_MIPS_GOT_HI16	dg1
 			160: R_MIPS_NONE	\*ABS\*
@@ -207,8 +207,8 @@ Disassembly of section \.text:
 			168: R_MIPS_NONE	\*ABS\*
 000000000000016c <fn\+0x16c> 64210038 	daddiu	at,at,56
 0000000000000170 <fn\+0x170> 0025082d 	daddu	at,at,a1
-0000000000000174 <fn\+0x174> a8250000 	swl	a1,0\(at\)
-0000000000000178 <fn\+0x178> b8250003 	swr	a1,3\(at\)
+0000000000000174 <fn\+0x174> a825000[03] 	swl	a1,[03]\(at\)
+0000000000000178 <fn\+0x178> b825000[03] 	swr	a1,[03]\(at\)
 000000000000017c <fn\+0x17c> df850000 	ld	a1,0\(gp\)
 			17c: R_MIPS_GOT_PAGE	\.data\+0x3c
 			17c: R_MIPS_NONE	\*ABS\*\+0x3c
@@ -320,8 +320,8 @@ Disassembly of section \.text:
 			1fc: R_MIPS_GOT_OFST	\.data\+0x3c
 			1fc: R_MIPS_NONE	\*ABS\*\+0x3c
 			1fc: R_MIPS_NONE	\*ABS\*\+0x3c
-0000000000000200 <fn\+0x200> 88250000 	lwl	a1,0\(at\)
-0000000000000204 <fn\+0x204> 98250003 	lwr	a1,3\(at\)
+0000000000000200 <fn\+0x200> 8825000[03] 	lwl	a1,[03]\(at\)
+0000000000000204 <fn\+0x204> 9825000[03] 	lwr	a1,[03]\(at\)
 0000000000000208 <fn\+0x208> df810000 	ld	at,0\(gp\)
 			208: R_MIPS_GOT_PAGE	\.data\+0x48
 			208: R_MIPS_NONE	\*ABS\*\+0x48
@@ -330,8 +330,8 @@ Disassembly of section \.text:
 			20c: R_MIPS_GOT_OFST	\.data\+0x48
 			20c: R_MIPS_NONE	\*ABS\*\+0x48
 			20c: R_MIPS_NONE	\*ABS\*\+0x48
-0000000000000210 <fn\+0x210> 88250000 	lwl	a1,0\(at\)
-0000000000000214 <fn\+0x214> 98250003 	lwr	a1,3\(at\)
+0000000000000210 <fn\+0x210> 8825000[03] 	lwl	a1,[03]\(at\)
+0000000000000214 <fn\+0x214> 9825000[03] 	lwr	a1,[03]\(at\)
 0000000000000218 <fn\+0x218> df810000 	ld	at,0\(gp\)
 			218: R_MIPS_GOT_PAGE	\.data\+0x3c
 			218: R_MIPS_NONE	\*ABS\*\+0x3c
@@ -341,8 +341,8 @@ Disassembly of section \.text:
 			21c: R_MIPS_NONE	\*ABS\*\+0x3c
 			21c: R_MIPS_NONE	\*ABS\*\+0x3c
 0000000000000220 <fn\+0x220> 0031082d 	daddu	at,at,s1
-0000000000000224 <fn\+0x224> 88250000 	lwl	a1,0\(at\)
-0000000000000228 <fn\+0x228> 98250003 	lwr	a1,3\(at\)
+0000000000000224 <fn\+0x224> 8825000[03] 	lwl	a1,[03]\(at\)
+0000000000000228 <fn\+0x228> 9825000[03] 	lwr	a1,[03]\(at\)
 000000000000022c <fn\+0x22c> df810000 	ld	at,0\(gp\)
 			22c: R_MIPS_GOT_PAGE	\.data\+0x48
 			22c: R_MIPS_NONE	\*ABS\*\+0x48
@@ -352,8 +352,8 @@ Disassembly of section \.text:
 			230: R_MIPS_NONE	\*ABS\*\+0x48
 			230: R_MIPS_NONE	\*ABS\*\+0x48
 0000000000000234 <fn\+0x234> 0031082d 	daddu	at,at,s1
-0000000000000238 <fn\+0x238> 88250000 	lwl	a1,0\(at\)
-000000000000023c <fn\+0x23c> 98250003 	lwr	a1,3\(at\)
+0000000000000238 <fn\+0x238> 8825000[03] 	lwl	a1,[03]\(at\)
+000000000000023c <fn\+0x23c> 9825000[03] 	lwr	a1,[03]\(at\)
 0000000000000240 <fn\+0x240> df810000 	ld	at,0\(gp\)
 			240: R_MIPS_GOT_PAGE	\.data\+0x5e
 			240: R_MIPS_NONE	\*ABS\*\+0x5e
@@ -363,8 +363,8 @@ Disassembly of section \.text:
 			244: R_MIPS_NONE	\*ABS\*\+0x5e
 			244: R_MIPS_NONE	\*ABS\*\+0x5e
 0000000000000248 <fn\+0x248> 0025082d 	daddu	at,at,a1
-000000000000024c <fn\+0x24c> 88250000 	lwl	a1,0\(at\)
-0000000000000250 <fn\+0x250> 98250003 	lwr	a1,3\(at\)
+000000000000024c <fn\+0x24c> 8825000[03] 	lwl	a1,[03]\(at\)
+0000000000000250 <fn\+0x250> 9825000[03] 	lwr	a1,[03]\(at\)
 0000000000000254 <fn\+0x254> df810000 	ld	at,0\(gp\)
 			254: R_MIPS_GOT_PAGE	\.data\+0x74
 			254: R_MIPS_NONE	\*ABS\*\+0x74
@@ -374,8 +374,8 @@ Disassembly of section \.text:
 			258: R_MIPS_NONE	\*ABS\*\+0x74
 			258: R_MIPS_NONE	\*ABS\*\+0x74
 000000000000025c <fn\+0x25c> 0025082d 	daddu	at,at,a1
-0000000000000260 <fn\+0x260> a8250000 	swl	a1,0\(at\)
-0000000000000264 <fn\+0x264> b8250003 	swr	a1,3\(at\)
+0000000000000260 <fn\+0x260> a825000[03] 	swl	a1,[03]\(at\)
+0000000000000264 <fn\+0x264> b825000[03] 	swr	a1,[03]\(at\)
 0000000000000268 <fn\+0x268> 3c050000 	lui	a1,0x0
 			268: R_MIPS_GOT_HI16	fn
 			268: R_MIPS_NONE	\*ABS\*
@@ -575,8 +575,8 @@ Disassembly of section \.text:
 			3a0: R_MIPS_GOT_LO16	dg2
 			3a0: R_MIPS_NONE	\*ABS\*
 			3a0: R_MIPS_NONE	\*ABS\*
-00000000000003a4 <fn\+0x3a4> 88250000 	lwl	a1,0\(at\)
-00000000000003a8 <fn\+0x3a8> 98250003 	lwr	a1,3\(at\)
+00000000000003a4 <fn\+0x3a4> 8825000[03] 	lwl	a1,[03]\(at\)
+00000000000003a8 <fn\+0x3a8> 9825000[03] 	lwr	a1,[03]\(at\)
 00000000000003ac <fn\+0x3ac> 3c010000 	lui	at,0x0
 			3ac: R_MIPS_GOT_HI16	dg2
 			3ac: R_MIPS_NONE	\*ABS\*
@@ -587,8 +587,8 @@ Disassembly of section \.text:
 			3b4: R_MIPS_NONE	\*ABS\*
 			3b4: R_MIPS_NONE	\*ABS\*
 00000000000003b8 <fn\+0x3b8> 6421000c 	daddiu	at,at,12
-00000000000003bc <fn\+0x3bc> 88250000 	lwl	a1,0\(at\)
-00000000000003c0 <fn\+0x3c0> 98250003 	lwr	a1,3\(at\)
+00000000000003bc <fn\+0x3bc> 8825000[03] 	lwl	a1,[03]\(at\)
+00000000000003c0 <fn\+0x3c0> 9825000[03] 	lwr	a1,[03]\(at\)
 00000000000003c4 <fn\+0x3c4> 3c010000 	lui	at,0x0
 			3c4: R_MIPS_GOT_HI16	dg2
 			3c4: R_MIPS_NONE	\*ABS\*
@@ -599,8 +599,8 @@ Disassembly of section \.text:
 			3cc: R_MIPS_NONE	\*ABS\*
 			3cc: R_MIPS_NONE	\*ABS\*
 00000000000003d0 <fn\+0x3d0> 0031082d 	daddu	at,at,s1
-00000000000003d4 <fn\+0x3d4> 88250000 	lwl	a1,0\(at\)
-00000000000003d8 <fn\+0x3d8> 98250003 	lwr	a1,3\(at\)
+00000000000003d4 <fn\+0x3d4> 8825000[03] 	lwl	a1,[03]\(at\)
+00000000000003d8 <fn\+0x3d8> 9825000[03] 	lwr	a1,[03]\(at\)
 00000000000003dc <fn\+0x3dc> 3c010000 	lui	at,0x0
 			3dc: R_MIPS_GOT_HI16	dg2
 			3dc: R_MIPS_NONE	\*ABS\*
@@ -612,8 +612,8 @@ Disassembly of section \.text:
 			3e4: R_MIPS_NONE	\*ABS\*
 00000000000003e8 <fn\+0x3e8> 6421000c 	daddiu	at,at,12
 00000000000003ec <fn\+0x3ec> 0031082d 	daddu	at,at,s1
-00000000000003f0 <fn\+0x3f0> 88250000 	lwl	a1,0\(at\)
-00000000000003f4 <fn\+0x3f4> 98250003 	lwr	a1,3\(at\)
+00000000000003f0 <fn\+0x3f0> 8825000[03] 	lwl	a1,[03]\(at\)
+00000000000003f4 <fn\+0x3f4> 9825000[03] 	lwr	a1,[03]\(at\)
 00000000000003f8 <fn\+0x3f8> 3c010000 	lui	at,0x0
 			3f8: R_MIPS_GOT_HI16	dg2
 			3f8: R_MIPS_NONE	\*ABS\*
@@ -625,8 +625,8 @@ Disassembly of section \.text:
 			400: R_MIPS_NONE	\*ABS\*
 0000000000000404 <fn\+0x404> 64210022 	daddiu	at,at,34
 0000000000000408 <fn\+0x408> 0025082d 	daddu	at,at,a1
-000000000000040c <fn\+0x40c> 88250000 	lwl	a1,0\(at\)
-0000000000000410 <fn\+0x410> 98250003 	lwr	a1,3\(at\)
+000000000000040c <fn\+0x40c> 8825000[03] 	lwl	a1,[03]\(at\)
+0000000000000410 <fn\+0x410> 9825000[03] 	lwr	a1,[03]\(at\)
 0000000000000414 <fn\+0x414> 3c010000 	lui	at,0x0
 			414: R_MIPS_GOT_HI16	dg2
 			414: R_MIPS_NONE	\*ABS\*
@@ -638,8 +638,8 @@ Disassembly of section \.text:
 			41c: R_MIPS_NONE	\*ABS\*
 0000000000000420 <fn\+0x420> 64210038 	daddiu	at,at,56
 0000000000000424 <fn\+0x424> 0025082d 	daddu	at,at,a1
-0000000000000428 <fn\+0x428> a8250000 	swl	a1,0\(at\)
-000000000000042c <fn\+0x42c> b8250003 	swr	a1,3\(at\)
+0000000000000428 <fn\+0x428> a825000[03] 	swl	a1,[03]\(at\)
+000000000000042c <fn\+0x42c> b825000[03] 	swr	a1,[03]\(at\)
 0000000000000430 <fn\+0x430> df850000 	ld	a1,0\(gp\)
 			430: R_MIPS_GOT_PAGE	\.data\+0xb4
 			430: R_MIPS_NONE	\*ABS\*\+0xb4
@@ -751,8 +751,8 @@ Disassembly of section \.text:
 			4b0: R_MIPS_GOT_OFST	\.data\+0xb4
 			4b0: R_MIPS_NONE	\*ABS\*\+0xb4
 			4b0: R_MIPS_NONE	\*ABS\*\+0xb4
-00000000000004b4 <fn\+0x4b4> 88250000 	lwl	a1,0\(at\)
-00000000000004b8 <fn\+0x4b8> 98250003 	lwr	a1,3\(at\)
+00000000000004b4 <fn\+0x4b4> 8825000[03] 	lwl	a1,[03]\(at\)
+00000000000004b8 <fn\+0x4b8> 9825000[03] 	lwr	a1,[03]\(at\)
 00000000000004bc <fn\+0x4bc> df810000 	ld	at,0\(gp\)
 			4bc: R_MIPS_GOT_PAGE	\.data\+0xc0
 			4bc: R_MIPS_NONE	\*ABS\*\+0xc0
@@ -761,8 +761,8 @@ Disassembly of section \.text:
 			4c0: R_MIPS_GOT_OFST	\.data\+0xc0
 			4c0: R_MIPS_NONE	\*ABS\*\+0xc0
 			4c0: R_MIPS_NONE	\*ABS\*\+0xc0
-00000000000004c4 <fn\+0x4c4> 88250000 	lwl	a1,0\(at\)
-00000000000004c8 <fn\+0x4c8> 98250003 	lwr	a1,3\(at\)
+00000000000004c4 <fn\+0x4c4> 8825000[03] 	lwl	a1,[03]\(at\)
+00000000000004c8 <fn\+0x4c8> 9825000[03] 	lwr	a1,[03]\(at\)
 00000000000004cc <fn\+0x4cc> df810000 	ld	at,0\(gp\)
 			4cc: R_MIPS_GOT_PAGE	\.data\+0xb4
 			4cc: R_MIPS_NONE	\*ABS\*\+0xb4
@@ -772,8 +772,8 @@ Disassembly of section \.text:
 			4d0: R_MIPS_NONE	\*ABS\*\+0xb4
 			4d0: R_MIPS_NONE	\*ABS\*\+0xb4
 00000000000004d4 <fn\+0x4d4> 0031082d 	daddu	at,at,s1
-00000000000004d8 <fn\+0x4d8> 88250000 	lwl	a1,0\(at\)
-00000000000004dc <fn\+0x4dc> 98250003 	lwr	a1,3\(at\)
+00000000000004d8 <fn\+0x4d8> 8825000[03] 	lwl	a1,[03]\(at\)
+00000000000004dc <fn\+0x4dc> 9825000[03] 	lwr	a1,[03]\(at\)
 00000000000004e0 <fn\+0x4e0> df810000 	ld	at,0\(gp\)
 			4e0: R_MIPS_GOT_PAGE	\.data\+0xc0
 			4e0: R_MIPS_NONE	\*ABS\*\+0xc0
@@ -783,8 +783,8 @@ Disassembly of section \.text:
 			4e4: R_MIPS_NONE	\*ABS\*\+0xc0
 			4e4: R_MIPS_NONE	\*ABS\*\+0xc0
 00000000000004e8 <fn\+0x4e8> 0031082d 	daddu	at,at,s1
-00000000000004ec <fn\+0x4ec> 88250000 	lwl	a1,0\(at\)
-00000000000004f0 <fn\+0x4f0> 98250003 	lwr	a1,3\(at\)
+00000000000004ec <fn\+0x4ec> 8825000[03] 	lwl	a1,[03]\(at\)
+00000000000004f0 <fn\+0x4f0> 9825000[03] 	lwr	a1,[03]\(at\)
 00000000000004f4 <fn\+0x4f4> df810000 	ld	at,0\(gp\)
 			4f4: R_MIPS_GOT_PAGE	\.data\+0xd6
 			4f4: R_MIPS_NONE	\*ABS\*\+0xd6
@@ -794,8 +794,8 @@ Disassembly of section \.text:
 			4f8: R_MIPS_NONE	\*ABS\*\+0xd6
 			4f8: R_MIPS_NONE	\*ABS\*\+0xd6
 00000000000004fc <fn\+0x4fc> 0025082d 	daddu	at,at,a1
-0000000000000500 <fn\+0x500> 88250000 	lwl	a1,0\(at\)
-0000000000000504 <fn\+0x504> 98250003 	lwr	a1,3\(at\)
+0000000000000500 <fn\+0x500> 8825000[03] 	lwl	a1,[03]\(at\)
+0000000000000504 <fn\+0x504> 9825000[03] 	lwr	a1,[03]\(at\)
 0000000000000508 <fn\+0x508> df810000 	ld	at,0\(gp\)
 			508: R_MIPS_GOT_PAGE	\.data\+0xec
 			508: R_MIPS_NONE	\*ABS\*\+0xec
@@ -805,8 +805,8 @@ Disassembly of section \.text:
 			50c: R_MIPS_NONE	\*ABS\*\+0xec
 			50c: R_MIPS_NONE	\*ABS\*\+0xec
 0000000000000510 <fn\+0x510> 0025082d 	daddu	at,at,a1
-0000000000000514 <fn\+0x514> a8250000 	swl	a1,0\(at\)
-0000000000000518 <fn\+0x518> b8250003 	swr	a1,3\(at\)
+0000000000000514 <fn\+0x514> a825000[03] 	swl	a1,[03]\(at\)
+0000000000000518 <fn\+0x518> b825000[03] 	swr	a1,[03]\(at\)
 000000000000051c <fn\+0x51c> 3c050000 	lui	a1,0x0
 			51c: R_MIPS_GOT_HI16	fn2
 			51c: R_MIPS_NONE	\*ABS\*