* config/tc-mips.c (ADDRESS_ADD_INSN,ADDRESS_ADDI_INSN): Remove

	special handling for n32 ABI.
	(macro): Likewise.
	* gas/mips/elf-rel-got-n32.d: Remove special handling for n32 ABI.
	* gas/mips/elf-rel-xgot-n32.d: Likewise.
	* gas/mips/jal-newabi.d: Likewise.
	* ld-mips-elf/elf-rel-got-n32.d: Remove special handling for n32 ABI.
	* ld-mips-elf/elf-rel-xgot-n32.d: Likewise.

6 files changed, 228 insertions, 219 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index be20d50..e5270cd 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2003-06-21  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* config/tc-mips.c (ADDRESS_ADD_INSN,ADDRESS_ADDI_INSN): Remove
+	special handling for n32 ABI.
+	(macro): Likewise.
+
 2003-06-19  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
 
 	* config/tc-mips.c (s_cpsetup,s_cprestore,s_cpreturn): Revert
diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index e1053cb..8b89be8 100644
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -300,15 +300,14 @@ static int mips_32bitmode = 0;
 #define HAVE_64BIT_ADDRESS_CONSTANTS (HAVE_64BIT_ADDRESSES \
 				      || HAVE_64BIT_GPRS)
 
-/* Addresses are loaded in different ways, depending on the address
-   size in use and the ABI.  N32_ABI uses additions with overflow
-   checking, this allows to catch code generation errors which would
-   distort the proper sign extension of the 64-bit wide registers.  */
+/* Addresses are loaded in different ways, depending on the address size
+   in use.  The n32 ABI Documentation also mandates the use of additions
+   with overflow checking, but existing implementations don't follow it.  */
 #define ADDRESS_ADD_INSN						\
-   (HAVE_32BIT_ADDRESSES ? (HAVE_NEWABI ? "add" : "addu") : "daddu")
+   (HAVE_32BIT_ADDRESSES ? "addu" : "daddu")
 
 #define ADDRESS_ADDI_INSN						\
-   (HAVE_32BIT_ADDRESSES ? (HAVE_NEWABI ? "addi" : "addiu") : "daddiu")
+   (HAVE_32BIT_ADDRESSES ? "addiu" : "daddiu")
 
 #define ADDRESS_LOAD_INSN						\
    (HAVE_32BIT_ADDRESSES ? "lw" : "ld")
@@ -4851,8 +4850,7 @@ macro (ip)
 	  && offset_expr.X_add_number < 0x8000)
 	{
 	  macro_build ((char *) NULL, &icnt, &offset_expr,
-		       (dbl || HAVE_64BIT_ADDRESSES) ? "daddiu" :
-		       HAVE_NEWABI ? "addi" : "addiu",
+		       (dbl || HAVE_64BIT_ADDRESSES) ? "daddiu" : "addiu",
 		       "t,r,j", treg, sreg, (int) BFD_RELOC_LO16);
 	  return;
 	}
@@ -5618,8 +5616,7 @@ macro (ip)
 	  char *s;
 
 	  if (mips_pic == EMBEDDED_PIC || mips_pic == NO_PIC)
-	    s = (dbl || HAVE_64BIT_ADDRESSES) ? "daddu" :
-	      HAVE_NEWABI ? "add" : "addu";
+	    s = (dbl || HAVE_64BIT_ADDRESSES) ? "daddu" : "addu";
 	  else
 	    s = ADDRESS_ADD_INSN;
 
@@ -6063,7 +6060,7 @@ macro (ip)
           macro_build ((char *) NULL, &icnt, (expressionS *) NULL,
                        ((bfd_arch_bits_per_address (stdoutput) == 32
                          || ! ISA_HAS_64BIT_REGS (mips_opts.isa))
-                        ? HAVE_NEWABI ? "add" : "addu" : "daddu"),
+                        ? "addu" : "daddu"),
                        "d,v,t", tempreg, tempreg, breg);
           macro_build ((char *) NULL, &icnt, &offset_expr, s, fmt, treg,
                        (int) BFD_RELOC_PCREL_LO16, tempreg);
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 9642810..adbdc8f 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2003-06-21  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* gas/mips/elf-rel-got-n32.d: Remove special handling for n32 ABI.
+	* gas/mips/elf-rel-xgot-n32.d: Likewise.
+	* gas/mips/jal-newabi.d: Likewise.
+
 2003-06-21  Christian Groessler  <chris@groessler.org>
 
 	* gas/z8k: New directory.
diff --git a/gas/testsuite/gas/mips/elf-rel-got-n32.d b/gas/testsuite/gas/mips/elf-rel-got-n32.d
index b6ff395..265ba48 100644
--- a/gas/testsuite/gas/mips/elf-rel-got-n32.d
+++ b/gas/testsuite/gas/mips/elf-rel-got-n32.d
@@ -9,25 +9,25 @@ Disassembly of section \.text:
 			0: R_MIPS_GOT_DISP	dg1
 00000004 <fn\+0x4> 8f850000 	lw	a1,0\(gp\)
 			4: R_MIPS_GOT_DISP	dg1
-00000008 <fn\+0x8> 20a5000c 	addi	a1,a1,12
+00000008 <fn\+0x8> 24a5000c 	addiu	a1,a1,12
 0000000c <fn\+0xc> 8f850000 	lw	a1,0\(gp\)
 			c: R_MIPS_GOT_DISP	dg1
 00000010 <fn\+0x10> 3c010002 	lui	at,0x2
-00000014 <fn\+0x14> 2021e240 	addi	at,at,-7616
-00000018 <fn\+0x18> 00a12820 	add	a1,a1,at
+00000014 <fn\+0x14> 2421e240 	addiu	at,at,-7616
+00000018 <fn\+0x18> 00a12821 	addu	a1,a1,at
 0000001c <fn\+0x1c> 8f850000 	lw	a1,0\(gp\)
 			1c: R_MIPS_GOT_DISP	dg1
-00000020 <fn\+0x20> 00b12820 	add	a1,a1,s1
+00000020 <fn\+0x20> 00b12821 	addu	a1,a1,s1
 00000024 <fn\+0x24> 8f850000 	lw	a1,0\(gp\)
 			24: R_MIPS_GOT_DISP	dg1
-00000028 <fn\+0x28> 20a5000c 	addi	a1,a1,12
-0000002c <fn\+0x2c> 00b12820 	add	a1,a1,s1
+00000028 <fn\+0x28> 24a5000c 	addiu	a1,a1,12
+0000002c <fn\+0x2c> 00b12821 	addu	a1,a1,s1
 00000030 <fn\+0x30> 8f850000 	lw	a1,0\(gp\)
 			30: R_MIPS_GOT_DISP	dg1
 00000034 <fn\+0x34> 3c010002 	lui	at,0x2
-00000038 <fn\+0x38> 2021e240 	addi	at,at,-7616
-0000003c <fn\+0x3c> 00a12820 	add	a1,a1,at
-00000040 <fn\+0x40> 00b12820 	add	a1,a1,s1
+00000038 <fn\+0x38> 2421e240 	addiu	at,at,-7616
+0000003c <fn\+0x3c> 00a12821 	addu	a1,a1,at
+00000040 <fn\+0x40> 00b12821 	addu	a1,a1,s1
 00000044 <fn\+0x44> 8f850000 	lw	a1,0\(gp\)
 			44: R_MIPS_GOT_PAGE	dg1
 00000048 <fn\+0x48> 8ca50000 	lw	a1,0\(a1\)
@@ -38,22 +38,22 @@ Disassembly of section \.text:
 			50: R_MIPS_GOT_OFST	dg1\+0xc
 00000054 <fn\+0x54> 8f850000 	lw	a1,0\(gp\)
 			54: R_MIPS_GOT_PAGE	dg1
-00000058 <fn\+0x58> 00b12820 	add	a1,a1,s1
+00000058 <fn\+0x58> 00b12821 	addu	a1,a1,s1
 0000005c <fn\+0x5c> 8ca50000 	lw	a1,0\(a1\)
 			5c: R_MIPS_GOT_OFST	dg1
 00000060 <fn\+0x60> 8f850000 	lw	a1,0\(gp\)
 			60: R_MIPS_GOT_PAGE	dg1\+0xc
-00000064 <fn\+0x64> 00b12820 	add	a1,a1,s1
+00000064 <fn\+0x64> 00b12821 	addu	a1,a1,s1
 00000068 <fn\+0x68> 8ca50000 	lw	a1,0\(a1\)
 			68: R_MIPS_GOT_OFST	dg1\+0xc
 0000006c <fn\+0x6c> 8f810000 	lw	at,0\(gp\)
 			6c: R_MIPS_GOT_PAGE	dg1\+0x22
-00000070 <fn\+0x70> 00250820 	add	at,at,a1
+00000070 <fn\+0x70> 00250821 	addu	at,at,a1
 00000074 <fn\+0x74> 8c250000 	lw	a1,0\(at\)
 			74: R_MIPS_GOT_OFST	dg1\+0x22
 00000078 <fn\+0x78> 8f810000 	lw	at,0\(gp\)
 			78: R_MIPS_GOT_PAGE	dg1\+0x38
-0000007c <fn\+0x7c> 00250820 	add	at,at,a1
+0000007c <fn\+0x7c> 00250821 	addu	at,at,a1
 00000080 <fn\+0x80> ac250000 	sw	a1,0\(at\)
 			80: R_MIPS_GOT_OFST	dg1\+0x38
 00000084 <fn\+0x84> 8f810000 	lw	at,0\(gp\)
@@ -62,30 +62,30 @@ Disassembly of section \.text:
 0000008c <fn\+0x8c> 98250003 	lwr	a1,3\(at\)
 00000090 <fn\+0x90> 8f810000 	lw	at,0\(gp\)
 			90: R_MIPS_GOT_DISP	dg1
-00000094 <fn\+0x94> 2021000c 	addi	at,at,12
+00000094 <fn\+0x94> 2421000c 	addiu	at,at,12
 00000098 <fn\+0x98> 88250000 	lwl	a1,0\(at\)
 0000009c <fn\+0x9c> 98250003 	lwr	a1,3\(at\)
 000000a0 <fn\+0xa0> 8f810000 	lw	at,0\(gp\)
 			a0: R_MIPS_GOT_DISP	dg1
-000000a4 <fn\+0xa4> 00310820 	add	at,at,s1
+000000a4 <fn\+0xa4> 00310821 	addu	at,at,s1
 000000a8 <fn\+0xa8> 88250000 	lwl	a1,0\(at\)
 000000ac <fn\+0xac> 98250003 	lwr	a1,3\(at\)
 000000b0 <fn\+0xb0> 8f810000 	lw	at,0\(gp\)
 			b0: R_MIPS_GOT_DISP	dg1
-000000b4 <fn\+0xb4> 2021000c 	addi	at,at,12
-000000b8 <fn\+0xb8> 00310820 	add	at,at,s1
+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\)
 000000c4 <fn\+0xc4> 8f810000 	lw	at,0\(gp\)
 			c4: R_MIPS_GOT_DISP	dg1
-000000c8 <fn\+0xc8> 20210022 	addi	at,at,34
-000000cc <fn\+0xcc> 00250820 	add	at,at,a1
+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\)
 000000d8 <fn\+0xd8> 8f810000 	lw	at,0\(gp\)
 			d8: R_MIPS_GOT_DISP	dg1
-000000dc <fn\+0xdc> 20210038 	addi	at,at,56
-000000e0 <fn\+0xe0> 00250820 	add	at,at,a1
+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\)
 000000ec <fn\+0xec> 8f850000 	lw	a1,0\(gp\)
@@ -96,13 +96,13 @@ Disassembly of section \.text:
 			f4: R_MIPS_GOT_DISP	\.data\+0x1e27c
 000000f8 <fn\+0xf8> 8f850000 	lw	a1,0\(gp\)
 			f8: R_MIPS_GOT_DISP	\.data\+0x3c
-000000fc <fn\+0xfc> 00b12820 	add	a1,a1,s1
+000000fc <fn\+0xfc> 00b12821 	addu	a1,a1,s1
 00000100 <fn\+0x100> 8f850000 	lw	a1,0\(gp\)
 			100: R_MIPS_GOT_DISP	\.data\+0x48
-00000104 <fn\+0x104> 00b12820 	add	a1,a1,s1
+00000104 <fn\+0x104> 00b12821 	addu	a1,a1,s1
 00000108 <fn\+0x108> 8f850000 	lw	a1,0\(gp\)
 			108: R_MIPS_GOT_DISP	\.data\+0x1e27c
-0000010c <fn\+0x10c> 00b12820 	add	a1,a1,s1
+0000010c <fn\+0x10c> 00b12821 	addu	a1,a1,s1
 00000110 <fn\+0x110> 8f850000 	lw	a1,0\(gp\)
 			110: R_MIPS_GOT_PAGE	\.data\+0x3c
 00000114 <fn\+0x114> 8ca50000 	lw	a1,0\(a1\)
@@ -113,22 +113,22 @@ Disassembly of section \.text:
 			11c: R_MIPS_GOT_OFST	\.data\+0x48
 00000120 <fn\+0x120> 8f850000 	lw	a1,0\(gp\)
 			120: R_MIPS_GOT_PAGE	\.data\+0x3c
-00000124 <fn\+0x124> 00b12820 	add	a1,a1,s1
+00000124 <fn\+0x124> 00b12821 	addu	a1,a1,s1
 00000128 <fn\+0x128> 8ca50000 	lw	a1,0\(a1\)
 			128: R_MIPS_GOT_OFST	\.data\+0x3c
 0000012c <fn\+0x12c> 8f850000 	lw	a1,0\(gp\)
 			12c: R_MIPS_GOT_PAGE	\.data\+0x48
-00000130 <fn\+0x130> 00b12820 	add	a1,a1,s1
+00000130 <fn\+0x130> 00b12821 	addu	a1,a1,s1
 00000134 <fn\+0x134> 8ca50000 	lw	a1,0\(a1\)
 			134: R_MIPS_GOT_OFST	\.data\+0x48
 00000138 <fn\+0x138> 8f810000 	lw	at,0\(gp\)
 			138: R_MIPS_GOT_PAGE	\.data\+0x5e
-0000013c <fn\+0x13c> 00250820 	add	at,at,a1
+0000013c <fn\+0x13c> 00250821 	addu	at,at,a1
 00000140 <fn\+0x140> 8c250000 	lw	a1,0\(at\)
 			140: R_MIPS_GOT_OFST	\.data\+0x5e
 00000144 <fn\+0x144> 8f810000 	lw	at,0\(gp\)
 			144: R_MIPS_GOT_PAGE	\.data\+0x74
-00000148 <fn\+0x148> 00250820 	add	at,at,a1
+00000148 <fn\+0x148> 00250821 	addu	at,at,a1
 0000014c <fn\+0x14c> ac250000 	sw	a1,0\(at\)
 			14c: R_MIPS_GOT_OFST	\.data\+0x74
 00000150 <fn\+0x150> 8f810000 	lw	at,0\(gp\)
@@ -141,22 +141,22 @@ Disassembly of section \.text:
 00000164 <fn\+0x164> 98250003 	lwr	a1,3\(at\)
 00000168 <fn\+0x168> 8f810000 	lw	at,0\(gp\)
 			168: R_MIPS_GOT_DISP	\.data\+0x3c
-0000016c <fn\+0x16c> 00310820 	add	at,at,s1
+0000016c <fn\+0x16c> 00310821 	addu	at,at,s1
 00000170 <fn\+0x170> 88250000 	lwl	a1,0\(at\)
 00000174 <fn\+0x174> 98250003 	lwr	a1,3\(at\)
 00000178 <fn\+0x178> 8f810000 	lw	at,0\(gp\)
 			178: R_MIPS_GOT_DISP	\.data\+0x48
-0000017c <fn\+0x17c> 00310820 	add	at,at,s1
+0000017c <fn\+0x17c> 00310821 	addu	at,at,s1
 00000180 <fn\+0x180> 88250000 	lwl	a1,0\(at\)
 00000184 <fn\+0x184> 98250003 	lwr	a1,3\(at\)
 00000188 <fn\+0x188> 8f810000 	lw	at,0\(gp\)
 			188: R_MIPS_GOT_DISP	\.data\+0x5e
-0000018c <fn\+0x18c> 00250820 	add	at,at,a1
+0000018c <fn\+0x18c> 00250821 	addu	at,at,a1
 00000190 <fn\+0x190> 88250000 	lwl	a1,0\(at\)
 00000194 <fn\+0x194> 98250003 	lwr	a1,3\(at\)
 00000198 <fn\+0x198> 8f810000 	lw	at,0\(gp\)
 			198: R_MIPS_GOT_DISP	\.data\+0x74
-0000019c <fn\+0x19c> 00250820 	add	at,at,a1
+0000019c <fn\+0x19c> 00250821 	addu	at,at,a1
 000001a0 <fn\+0x1a0> a8250000 	swl	a1,0\(at\)
 000001a4 <fn\+0x1a4> b8250003 	swr	a1,3\(at\)
 000001a8 <fn\+0x1a8> 8f850000 	lw	a1,0\(gp\)
@@ -181,25 +181,25 @@ Disassembly of section \.text:
 			1d0: R_MIPS_GOT_DISP	dg2
 000001d4 <fn\+0x1d4> 8f850000 	lw	a1,0\(gp\)
 			1d4: R_MIPS_GOT_DISP	dg2
-000001d8 <fn\+0x1d8> 20a5000c 	addi	a1,a1,12
+000001d8 <fn\+0x1d8> 24a5000c 	addiu	a1,a1,12
 000001dc <fn\+0x1dc> 8f850000 	lw	a1,0\(gp\)
 			1dc: R_MIPS_GOT_DISP	dg2
 000001e0 <fn\+0x1e0> 3c010002 	lui	at,0x2
-000001e4 <fn\+0x1e4> 2021e240 	addi	at,at,-7616
-000001e8 <fn\+0x1e8> 00a12820 	add	a1,a1,at
+000001e4 <fn\+0x1e4> 2421e240 	addiu	at,at,-7616
+000001e8 <fn\+0x1e8> 00a12821 	addu	a1,a1,at
 000001ec <fn\+0x1ec> 8f850000 	lw	a1,0\(gp\)
 			1ec: R_MIPS_GOT_DISP	dg2
-000001f0 <fn\+0x1f0> 00b12820 	add	a1,a1,s1
+000001f0 <fn\+0x1f0> 00b12821 	addu	a1,a1,s1
 000001f4 <fn\+0x1f4> 8f850000 	lw	a1,0\(gp\)
 			1f4: R_MIPS_GOT_DISP	dg2
-000001f8 <fn\+0x1f8> 20a5000c 	addi	a1,a1,12
-000001fc <fn\+0x1fc> 00b12820 	add	a1,a1,s1
+000001f8 <fn\+0x1f8> 24a5000c 	addiu	a1,a1,12
+000001fc <fn\+0x1fc> 00b12821 	addu	a1,a1,s1
 00000200 <fn\+0x200> 8f850000 	lw	a1,0\(gp\)
 			200: R_MIPS_GOT_DISP	dg2
 00000204 <fn\+0x204> 3c010002 	lui	at,0x2
-00000208 <fn\+0x208> 2021e240 	addi	at,at,-7616
-0000020c <fn\+0x20c> 00a12820 	add	a1,a1,at
-00000210 <fn\+0x210> 00b12820 	add	a1,a1,s1
+00000208 <fn\+0x208> 2421e240 	addiu	at,at,-7616
+0000020c <fn\+0x20c> 00a12821 	addu	a1,a1,at
+00000210 <fn\+0x210> 00b12821 	addu	a1,a1,s1
 00000214 <fn\+0x214> 8f850000 	lw	a1,0\(gp\)
 			214: R_MIPS_GOT_PAGE	dg2
 00000218 <fn\+0x218> 8ca50000 	lw	a1,0\(a1\)
@@ -210,22 +210,22 @@ Disassembly of section \.text:
 			220: R_MIPS_GOT_OFST	dg2\+0xc
 00000224 <fn\+0x224> 8f850000 	lw	a1,0\(gp\)
 			224: R_MIPS_GOT_PAGE	dg2
-00000228 <fn\+0x228> 00b12820 	add	a1,a1,s1
+00000228 <fn\+0x228> 00b12821 	addu	a1,a1,s1
 0000022c <fn\+0x22c> 8ca50000 	lw	a1,0\(a1\)
 			22c: R_MIPS_GOT_OFST	dg2
 00000230 <fn\+0x230> 8f850000 	lw	a1,0\(gp\)
 			230: R_MIPS_GOT_PAGE	dg2\+0xc
-00000234 <fn\+0x234> 00b12820 	add	a1,a1,s1
+00000234 <fn\+0x234> 00b12821 	addu	a1,a1,s1
 00000238 <fn\+0x238> 8ca50000 	lw	a1,0\(a1\)
 			238: R_MIPS_GOT_OFST	dg2\+0xc
 0000023c <fn\+0x23c> 8f810000 	lw	at,0\(gp\)
 			23c: R_MIPS_GOT_PAGE	dg2\+0x22
-00000240 <fn\+0x240> 00250820 	add	at,at,a1
+00000240 <fn\+0x240> 00250821 	addu	at,at,a1
 00000244 <fn\+0x244> 8c250000 	lw	a1,0\(at\)
 			244: R_MIPS_GOT_OFST	dg2\+0x22
 00000248 <fn\+0x248> 8f810000 	lw	at,0\(gp\)
 			248: R_MIPS_GOT_PAGE	dg2\+0x38
-0000024c <fn\+0x24c> 00250820 	add	at,at,a1
+0000024c <fn\+0x24c> 00250821 	addu	at,at,a1
 00000250 <fn\+0x250> ac250000 	sw	a1,0\(at\)
 			250: R_MIPS_GOT_OFST	dg2\+0x38
 00000254 <fn\+0x254> 8f810000 	lw	at,0\(gp\)
@@ -234,30 +234,30 @@ Disassembly of section \.text:
 0000025c <fn\+0x25c> 98250003 	lwr	a1,3\(at\)
 00000260 <fn\+0x260> 8f810000 	lw	at,0\(gp\)
 			260: R_MIPS_GOT_DISP	dg2
-00000264 <fn\+0x264> 2021000c 	addi	at,at,12
+00000264 <fn\+0x264> 2421000c 	addiu	at,at,12
 00000268 <fn\+0x268> 88250000 	lwl	a1,0\(at\)
 0000026c <fn\+0x26c> 98250003 	lwr	a1,3\(at\)
 00000270 <fn\+0x270> 8f810000 	lw	at,0\(gp\)
 			270: R_MIPS_GOT_DISP	dg2
-00000274 <fn\+0x274> 00310820 	add	at,at,s1
+00000274 <fn\+0x274> 00310821 	addu	at,at,s1
 00000278 <fn\+0x278> 88250000 	lwl	a1,0\(at\)
 0000027c <fn\+0x27c> 98250003 	lwr	a1,3\(at\)
 00000280 <fn\+0x280> 8f810000 	lw	at,0\(gp\)
 			280: R_MIPS_GOT_DISP	dg2
-00000284 <fn\+0x284> 2021000c 	addi	at,at,12
-00000288 <fn\+0x288> 00310820 	add	at,at,s1
+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\)
 00000294 <fn\+0x294> 8f810000 	lw	at,0\(gp\)
 			294: R_MIPS_GOT_DISP	dg2
-00000298 <fn\+0x298> 20210022 	addi	at,at,34
-0000029c <fn\+0x29c> 00250820 	add	at,at,a1
+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\)
 000002a8 <fn\+0x2a8> 8f810000 	lw	at,0\(gp\)
 			2a8: R_MIPS_GOT_DISP	dg2
-000002ac <fn\+0x2ac> 20210038 	addi	at,at,56
-000002b0 <fn\+0x2b0> 00250820 	add	at,at,a1
+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\)
 000002bc <fn\+0x2bc> 8f850000 	lw	a1,0\(gp\)
@@ -268,13 +268,13 @@ Disassembly of section \.text:
 			2c4: R_MIPS_GOT_DISP	\.data\+0x1e2f4
 000002c8 <fn\+0x2c8> 8f850000 	lw	a1,0\(gp\)
 			2c8: R_MIPS_GOT_DISP	\.data\+0xb4
-000002cc <fn\+0x2cc> 00b12820 	add	a1,a1,s1
+000002cc <fn\+0x2cc> 00b12821 	addu	a1,a1,s1
 000002d0 <fn\+0x2d0> 8f850000 	lw	a1,0\(gp\)
 			2d0: R_MIPS_GOT_DISP	\.data\+0xc0
-000002d4 <fn\+0x2d4> 00b12820 	add	a1,a1,s1
+000002d4 <fn\+0x2d4> 00b12821 	addu	a1,a1,s1
 000002d8 <fn\+0x2d8> 8f850000 	lw	a1,0\(gp\)
 			2d8: R_MIPS_GOT_DISP	\.data\+0x1e2f4
-000002dc <fn\+0x2dc> 00b12820 	add	a1,a1,s1
+000002dc <fn\+0x2dc> 00b12821 	addu	a1,a1,s1
 000002e0 <fn\+0x2e0> 8f850000 	lw	a1,0\(gp\)
 			2e0: R_MIPS_GOT_PAGE	\.data\+0xb4
 000002e4 <fn\+0x2e4> 8ca50000 	lw	a1,0\(a1\)
@@ -285,22 +285,22 @@ Disassembly of section \.text:
 			2ec: R_MIPS_GOT_OFST	\.data\+0xc0
 000002f0 <fn\+0x2f0> 8f850000 	lw	a1,0\(gp\)
 			2f0: R_MIPS_GOT_PAGE	\.data\+0xb4
-000002f4 <fn\+0x2f4> 00b12820 	add	a1,a1,s1
+000002f4 <fn\+0x2f4> 00b12821 	addu	a1,a1,s1
 000002f8 <fn\+0x2f8> 8ca50000 	lw	a1,0\(a1\)
 			2f8: R_MIPS_GOT_OFST	\.data\+0xb4
 000002fc <fn\+0x2fc> 8f850000 	lw	a1,0\(gp\)
 			2fc: R_MIPS_GOT_PAGE	\.data\+0xc0
-00000300 <fn\+0x300> 00b12820 	add	a1,a1,s1
+00000300 <fn\+0x300> 00b12821 	addu	a1,a1,s1
 00000304 <fn\+0x304> 8ca50000 	lw	a1,0\(a1\)
 			304: R_MIPS_GOT_OFST	\.data\+0xc0
 00000308 <fn\+0x308> 8f810000 	lw	at,0\(gp\)
 			308: R_MIPS_GOT_PAGE	\.data\+0xd6
-0000030c <fn\+0x30c> 00250820 	add	at,at,a1
+0000030c <fn\+0x30c> 00250821 	addu	at,at,a1
 00000310 <fn\+0x310> 8c250000 	lw	a1,0\(at\)
 			310: R_MIPS_GOT_OFST	\.data\+0xd6
 00000314 <fn\+0x314> 8f810000 	lw	at,0\(gp\)
 			314: R_MIPS_GOT_PAGE	\.data\+0xec
-00000318 <fn\+0x318> 00250820 	add	at,at,a1
+00000318 <fn\+0x318> 00250821 	addu	at,at,a1
 0000031c <fn\+0x31c> ac250000 	sw	a1,0\(at\)
 			31c: R_MIPS_GOT_OFST	\.data\+0xec
 00000320 <fn\+0x320> 8f810000 	lw	at,0\(gp\)
@@ -313,22 +313,22 @@ Disassembly of section \.text:
 00000334 <fn\+0x334> 98250003 	lwr	a1,3\(at\)
 00000338 <fn\+0x338> 8f810000 	lw	at,0\(gp\)
 			338: R_MIPS_GOT_DISP	\.data\+0xb4
-0000033c <fn\+0x33c> 00310820 	add	at,at,s1
+0000033c <fn\+0x33c> 00310821 	addu	at,at,s1
 00000340 <fn\+0x340> 88250000 	lwl	a1,0\(at\)
 00000344 <fn\+0x344> 98250003 	lwr	a1,3\(at\)
 00000348 <fn\+0x348> 8f810000 	lw	at,0\(gp\)
 			348: R_MIPS_GOT_DISP	\.data\+0xc0
-0000034c <fn\+0x34c> 00310820 	add	at,at,s1
+0000034c <fn\+0x34c> 00310821 	addu	at,at,s1
 00000350 <fn\+0x350> 88250000 	lwl	a1,0\(at\)
 00000354 <fn\+0x354> 98250003 	lwr	a1,3\(at\)
 00000358 <fn\+0x358> 8f810000 	lw	at,0\(gp\)
 			358: R_MIPS_GOT_DISP	\.data\+0xd6
-0000035c <fn\+0x35c> 00250820 	add	at,at,a1
+0000035c <fn\+0x35c> 00250821 	addu	at,at,a1
 00000360 <fn\+0x360> 88250000 	lwl	a1,0\(at\)
 00000364 <fn\+0x364> 98250003 	lwr	a1,3\(at\)
 00000368 <fn\+0x368> 8f810000 	lw	at,0\(gp\)
 			368: R_MIPS_GOT_DISP	\.data\+0xec
-0000036c <fn\+0x36c> 00250820 	add	at,at,a1
+0000036c <fn\+0x36c> 00250821 	addu	at,at,a1
 00000370 <fn\+0x370> a8250000 	swl	a1,0\(at\)
 00000374 <fn\+0x374> b8250003 	swr	a1,3\(at\)
 00000378 <fn\+0x378> 8f850000 	lw	a1,0\(gp\)
@@ -380,7 +380,7 @@ Disassembly of section \.text:
 			3e8: R_MIPS_GOT_OFST	\.data\+0x48
 000003ec <fn\+0x3ec> 8f810000 	lw	at,0\(gp\)
 			3ec: R_MIPS_GOT_PAGE	\.data\+0xd6
-000003f0 <fn\+0x3f0> 00250820 	add	at,at,a1
+000003f0 <fn\+0x3f0> 00250821 	addu	at,at,a1
 000003f4 <fn\+0x3f4> 10000003 	b	00000404 <fn2>
 000003f8 <fn\+0x3f8> 8c250000 	lw	a1,0\(at\)
 			3f8: R_MIPS_GOT_OFST	\.data\+0xd6
diff --git a/gas/testsuite/gas/mips/elf-rel-xgot-n32.d b/gas/testsuite/gas/mips/elf-rel-xgot-n32.d
index 8eac99e..50dc0a1 100644
--- a/gas/testsuite/gas/mips/elf-rel-xgot-n32.d
+++ b/gas/testsuite/gas/mips/elf-rel-xgot-n32.d
@@ -8,162 +8,162 @@
 Disassembly of section \.text:
 00000000 <fn> 3c050000 	lui	a1,0x0
 			0: R_MIPS_GOT_HI16	dg1
-00000004 <fn\+0x4> 00bc2820 	add	a1,a1,gp
+00000004 <fn\+0x4> 00bc2821 	addu	a1,a1,gp
 00000008 <fn\+0x8> 8ca50000 	lw	a1,0\(a1\)
 			8: R_MIPS_GOT_LO16	dg1
 0000000c <fn\+0xc> 3c050000 	lui	a1,0x0
 			c: R_MIPS_GOT_HI16	dg1
-00000010 <fn\+0x10> 00bc2820 	add	a1,a1,gp
+00000010 <fn\+0x10> 00bc2821 	addu	a1,a1,gp
 00000014 <fn\+0x14> 8ca50000 	lw	a1,0\(a1\)
 			14: R_MIPS_GOT_LO16	dg1
-00000018 <fn\+0x18> 20a5000c 	addi	a1,a1,12
+00000018 <fn\+0x18> 24a5000c 	addiu	a1,a1,12
 0000001c <fn\+0x1c> 3c050000 	lui	a1,0x0
 			1c: R_MIPS_GOT_HI16	dg1
-00000020 <fn\+0x20> 00bc2820 	add	a1,a1,gp
+00000020 <fn\+0x20> 00bc2821 	addu	a1,a1,gp
 00000024 <fn\+0x24> 8ca50000 	lw	a1,0\(a1\)
 			24: R_MIPS_GOT_LO16	dg1
 00000028 <fn\+0x28> 3c010002 	lui	at,0x2
-0000002c <fn\+0x2c> 2021e240 	addi	at,at,-7616
-00000030 <fn\+0x30> 00a12820 	add	a1,a1,at
+0000002c <fn\+0x2c> 2421e240 	addiu	at,at,-7616
+00000030 <fn\+0x30> 00a12821 	addu	a1,a1,at
 00000034 <fn\+0x34> 3c050000 	lui	a1,0x0
 			34: R_MIPS_GOT_HI16	dg1
-00000038 <fn\+0x38> 00bc2820 	add	a1,a1,gp
+00000038 <fn\+0x38> 00bc2821 	addu	a1,a1,gp
 0000003c <fn\+0x3c> 8ca50000 	lw	a1,0\(a1\)
 			3c: R_MIPS_GOT_LO16	dg1
-00000040 <fn\+0x40> 00b12820 	add	a1,a1,s1
+00000040 <fn\+0x40> 00b12821 	addu	a1,a1,s1
 00000044 <fn\+0x44> 3c050000 	lui	a1,0x0
 			44: R_MIPS_GOT_HI16	dg1
-00000048 <fn\+0x48> 00bc2820 	add	a1,a1,gp
+00000048 <fn\+0x48> 00bc2821 	addu	a1,a1,gp
 0000004c <fn\+0x4c> 8ca50000 	lw	a1,0\(a1\)
 			4c: R_MIPS_GOT_LO16	dg1
-00000050 <fn\+0x50> 20a5000c 	addi	a1,a1,12
-00000054 <fn\+0x54> 00b12820 	add	a1,a1,s1
+00000050 <fn\+0x50> 24a5000c 	addiu	a1,a1,12
+00000054 <fn\+0x54> 00b12821 	addu	a1,a1,s1
 00000058 <fn\+0x58> 3c050000 	lui	a1,0x0
 			58: R_MIPS_GOT_HI16	dg1
-0000005c <fn\+0x5c> 00bc2820 	add	a1,a1,gp
+0000005c <fn\+0x5c> 00bc2821 	addu	a1,a1,gp
 00000060 <fn\+0x60> 8ca50000 	lw	a1,0\(a1\)
 			60: R_MIPS_GOT_LO16	dg1
 00000064 <fn\+0x64> 3c010002 	lui	at,0x2
-00000068 <fn\+0x68> 2021e240 	addi	at,at,-7616
-0000006c <fn\+0x6c> 00a12820 	add	a1,a1,at
-00000070 <fn\+0x70> 00b12820 	add	a1,a1,s1
+00000068 <fn\+0x68> 2421e240 	addiu	at,at,-7616
+0000006c <fn\+0x6c> 00a12821 	addu	a1,a1,at
+00000070 <fn\+0x70> 00b12821 	addu	a1,a1,s1
 00000074 <fn\+0x74> 3c050000 	lui	a1,0x0
 			74: R_MIPS_GOT_HI16	dg1
-00000078 <fn\+0x78> 00bc2820 	add	a1,a1,gp
+00000078 <fn\+0x78> 00bc2821 	addu	a1,a1,gp
 0000007c <fn\+0x7c> 8ca50000 	lw	a1,0\(a1\)
 			7c: R_MIPS_GOT_LO16	dg1
 00000080 <fn\+0x80> 8ca50000 	lw	a1,0\(a1\)
 00000084 <fn\+0x84> 3c050000 	lui	a1,0x0
 			84: R_MIPS_GOT_HI16	dg1
-00000088 <fn\+0x88> 00bc2820 	add	a1,a1,gp
+00000088 <fn\+0x88> 00bc2821 	addu	a1,a1,gp
 0000008c <fn\+0x8c> 8ca50000 	lw	a1,0\(a1\)
 			8c: R_MIPS_GOT_LO16	dg1
 00000090 <fn\+0x90> 8ca5000c 	lw	a1,12\(a1\)
 00000094 <fn\+0x94> 3c050000 	lui	a1,0x0
 			94: R_MIPS_GOT_HI16	dg1
-00000098 <fn\+0x98> 00bc2820 	add	a1,a1,gp
+00000098 <fn\+0x98> 00bc2821 	addu	a1,a1,gp
 0000009c <fn\+0x9c> 8ca50000 	lw	a1,0\(a1\)
 			9c: R_MIPS_GOT_LO16	dg1
-000000a0 <fn\+0xa0> 00b12820 	add	a1,a1,s1
+000000a0 <fn\+0xa0> 00b12821 	addu	a1,a1,s1
 000000a4 <fn\+0xa4> 8ca50000 	lw	a1,0\(a1\)
 000000a8 <fn\+0xa8> 3c050000 	lui	a1,0x0
 			a8: R_MIPS_GOT_HI16	dg1
-000000ac <fn\+0xac> 00bc2820 	add	a1,a1,gp
+000000ac <fn\+0xac> 00bc2821 	addu	a1,a1,gp
 000000b0 <fn\+0xb0> 8ca50000 	lw	a1,0\(a1\)
 			b0: R_MIPS_GOT_LO16	dg1
-000000b4 <fn\+0xb4> 00b12820 	add	a1,a1,s1
+000000b4 <fn\+0xb4> 00b12821 	addu	a1,a1,s1
 000000b8 <fn\+0xb8> 8ca5000c 	lw	a1,12\(a1\)
 000000bc <fn\+0xbc> 3c010000 	lui	at,0x0
 			bc: R_MIPS_GOT_HI16	dg1
-000000c0 <fn\+0xc0> 003c0820 	add	at,at,gp
+000000c0 <fn\+0xc0> 003c0821 	addu	at,at,gp
 000000c4 <fn\+0xc4> 8c210000 	lw	at,0\(at\)
 			c4: R_MIPS_GOT_LO16	dg1
-000000c8 <fn\+0xc8> 00250820 	add	at,at,a1
+000000c8 <fn\+0xc8> 00250821 	addu	at,at,a1
 000000cc <fn\+0xcc> 8c250022 	lw	a1,34\(at\)
 000000d0 <fn\+0xd0> 3c010000 	lui	at,0x0
 			d0: R_MIPS_GOT_HI16	dg1
-000000d4 <fn\+0xd4> 003c0820 	add	at,at,gp
+000000d4 <fn\+0xd4> 003c0821 	addu	at,at,gp
 000000d8 <fn\+0xd8> 8c210000 	lw	at,0\(at\)
 			d8: R_MIPS_GOT_LO16	dg1
-000000dc <fn\+0xdc> 00250820 	add	at,at,a1
+000000dc <fn\+0xdc> 00250821 	addu	at,at,a1
 000000e0 <fn\+0xe0> ac250038 	sw	a1,56\(at\)
 000000e4 <fn\+0xe4> 3c010000 	lui	at,0x0
 			e4: R_MIPS_GOT_HI16	dg1
-000000e8 <fn\+0xe8> 003c0820 	add	at,at,gp
+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\)
 000000f8 <fn\+0xf8> 3c010000 	lui	at,0x0
 			f8: R_MIPS_GOT_HI16	dg1
-000000fc <fn\+0xfc> 003c0820 	add	at,at,gp
+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> 2021000c 	addi	at,at,12
+00000104 <fn\+0x104> 2421000c 	addiu	at,at,12
 00000108 <fn\+0x108> 88250000 	lwl	a1,0\(at\)
 0000010c <fn\+0x10c> 98250003 	lwr	a1,3\(at\)
 00000110 <fn\+0x110> 3c010000 	lui	at,0x0
 			110: R_MIPS_GOT_HI16	dg1
-00000114 <fn\+0x114> 003c0820 	add	at,at,gp
+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> 00310820 	add	at,at,s1
+0000011c <fn\+0x11c> 00310821 	addu	at,at,s1
 00000120 <fn\+0x120> 88250000 	lwl	a1,0\(at\)
 00000124 <fn\+0x124> 98250003 	lwr	a1,3\(at\)
 00000128 <fn\+0x128> 3c010000 	lui	at,0x0
 			128: R_MIPS_GOT_HI16	dg1
-0000012c <fn\+0x12c> 003c0820 	add	at,at,gp
+0000012c <fn\+0x12c> 003c0821 	addu	at,at,gp
 00000130 <fn\+0x130> 8c210000 	lw	at,0\(at\)
 			130: R_MIPS_GOT_LO16	dg1
-00000134 <fn\+0x134> 2021000c 	addi	at,at,12
-00000138 <fn\+0x138> 00310820 	add	at,at,s1
+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\)
 00000144 <fn\+0x144> 3c010000 	lui	at,0x0
 			144: R_MIPS_GOT_HI16	dg1
-00000148 <fn\+0x148> 003c0820 	add	at,at,gp
+00000148 <fn\+0x148> 003c0821 	addu	at,at,gp
 0000014c <fn\+0x14c> 8c210000 	lw	at,0\(at\)
 			14c: R_MIPS_GOT_LO16	dg1
-00000150 <fn\+0x150> 20210022 	addi	at,at,34
-00000154 <fn\+0x154> 00250820 	add	at,at,a1
+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\)
 00000160 <fn\+0x160> 3c010000 	lui	at,0x0
 			160: R_MIPS_GOT_HI16	dg1
-00000164 <fn\+0x164> 003c0820 	add	at,at,gp
+00000164 <fn\+0x164> 003c0821 	addu	at,at,gp
 00000168 <fn\+0x168> 8c210000 	lw	at,0\(at\)
 			168: R_MIPS_GOT_LO16	dg1
-0000016c <fn\+0x16c> 20210038 	addi	at,at,56
-00000170 <fn\+0x170> 00250820 	add	at,at,a1
+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\)
 0000017c <fn\+0x17c> 8f850000 	lw	a1,0\(gp\)
 			17c: R_MIPS_GOT_PAGE	\.data\+0x3c
-00000180 <fn\+0x180> 20a50000 	addi	a1,a1,0
+00000180 <fn\+0x180> 24a50000 	addiu	a1,a1,0
 			180: R_MIPS_GOT_OFST	\.data\+0x3c
 00000184 <fn\+0x184> 8f850000 	lw	a1,0\(gp\)
 			184: R_MIPS_GOT_PAGE	\.data\+0x48
-00000188 <fn\+0x188> 20a50000 	addi	a1,a1,0
+00000188 <fn\+0x188> 24a50000 	addiu	a1,a1,0
 			188: R_MIPS_GOT_OFST	\.data\+0x48
 0000018c <fn\+0x18c> 8f850000 	lw	a1,0\(gp\)
 			18c: R_MIPS_GOT_PAGE	\.data\+0x1e27c
-00000190 <fn\+0x190> 20a50000 	addi	a1,a1,0
+00000190 <fn\+0x190> 24a50000 	addiu	a1,a1,0
 			190: R_MIPS_GOT_OFST	\.data\+0x1e27c
 00000194 <fn\+0x194> 8f850000 	lw	a1,0\(gp\)
 			194: R_MIPS_GOT_PAGE	\.data\+0x3c
-00000198 <fn\+0x198> 20a50000 	addi	a1,a1,0
+00000198 <fn\+0x198> 24a50000 	addiu	a1,a1,0
 			198: R_MIPS_GOT_OFST	\.data\+0x3c
-0000019c <fn\+0x19c> 00b12820 	add	a1,a1,s1
+0000019c <fn\+0x19c> 00b12821 	addu	a1,a1,s1
 000001a0 <fn\+0x1a0> 8f850000 	lw	a1,0\(gp\)
 			1a0: R_MIPS_GOT_PAGE	\.data\+0x48
-000001a4 <fn\+0x1a4> 20a50000 	addi	a1,a1,0
+000001a4 <fn\+0x1a4> 24a50000 	addiu	a1,a1,0
 			1a4: R_MIPS_GOT_OFST	\.data\+0x48
-000001a8 <fn\+0x1a8> 00b12820 	add	a1,a1,s1
+000001a8 <fn\+0x1a8> 00b12821 	addu	a1,a1,s1
 000001ac <fn\+0x1ac> 8f850000 	lw	a1,0\(gp\)
 			1ac: R_MIPS_GOT_PAGE	\.data\+0x1e27c
-000001b0 <fn\+0x1b0> 20a50000 	addi	a1,a1,0
+000001b0 <fn\+0x1b0> 24a50000 	addiu	a1,a1,0
 			1b0: R_MIPS_GOT_OFST	\.data\+0x1e27c
-000001b4 <fn\+0x1b4> 00b12820 	add	a1,a1,s1
+000001b4 <fn\+0x1b4> 00b12821 	addu	a1,a1,s1
 000001b8 <fn\+0x1b8> 8f850000 	lw	a1,0\(gp\)
 			1b8: R_MIPS_GOT_PAGE	\.data\+0x3c
 000001bc <fn\+0x1bc> 8ca50000 	lw	a1,0\(a1\)
@@ -174,85 +174,85 @@ Disassembly of section \.text:
 			1c4: R_MIPS_GOT_OFST	\.data\+0x48
 000001c8 <fn\+0x1c8> 8f850000 	lw	a1,0\(gp\)
 			1c8: R_MIPS_GOT_PAGE	\.data\+0x3c
-000001cc <fn\+0x1cc> 00b12820 	add	a1,a1,s1
+000001cc <fn\+0x1cc> 00b12821 	addu	a1,a1,s1
 000001d0 <fn\+0x1d0> 8ca50000 	lw	a1,0\(a1\)
 			1d0: R_MIPS_GOT_OFST	\.data\+0x3c
 000001d4 <fn\+0x1d4> 8f850000 	lw	a1,0\(gp\)
 			1d4: R_MIPS_GOT_PAGE	\.data\+0x48
-000001d8 <fn\+0x1d8> 00b12820 	add	a1,a1,s1
+000001d8 <fn\+0x1d8> 00b12821 	addu	a1,a1,s1
 000001dc <fn\+0x1dc> 8ca50000 	lw	a1,0\(a1\)
 			1dc: R_MIPS_GOT_OFST	\.data\+0x48
 000001e0 <fn\+0x1e0> 8f810000 	lw	at,0\(gp\)
 			1e0: R_MIPS_GOT_PAGE	\.data\+0x5e
-000001e4 <fn\+0x1e4> 00250820 	add	at,at,a1
+000001e4 <fn\+0x1e4> 00250821 	addu	at,at,a1
 000001e8 <fn\+0x1e8> 8c250000 	lw	a1,0\(at\)
 			1e8: R_MIPS_GOT_OFST	\.data\+0x5e
 000001ec <fn\+0x1ec> 8f810000 	lw	at,0\(gp\)
 			1ec: R_MIPS_GOT_PAGE	\.data\+0x74
-000001f0 <fn\+0x1f0> 00250820 	add	at,at,a1
+000001f0 <fn\+0x1f0> 00250821 	addu	at,at,a1
 000001f4 <fn\+0x1f4> ac250000 	sw	a1,0\(at\)
 			1f4: R_MIPS_GOT_OFST	\.data\+0x74
 000001f8 <fn\+0x1f8> 8f810000 	lw	at,0\(gp\)
 			1f8: R_MIPS_GOT_PAGE	\.data\+0x3c
-000001fc <fn\+0x1fc> 20210000 	addi	at,at,0
+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\)
 00000208 <fn\+0x208> 8f810000 	lw	at,0\(gp\)
 			208: R_MIPS_GOT_PAGE	\.data\+0x48
-0000020c <fn\+0x20c> 20210000 	addi	at,at,0
+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\)
 00000218 <fn\+0x218> 8f810000 	lw	at,0\(gp\)
 			218: R_MIPS_GOT_PAGE	\.data\+0x3c
-0000021c <fn\+0x21c> 20210000 	addi	at,at,0
+0000021c <fn\+0x21c> 24210000 	addiu	at,at,0
 			21c: R_MIPS_GOT_OFST	\.data\+0x3c
-00000220 <fn\+0x220> 00310820 	add	at,at,s1
+00000220 <fn\+0x220> 00310821 	addu	at,at,s1
 00000224 <fn\+0x224> 88250000 	lwl	a1,0\(at\)
 00000228 <fn\+0x228> 98250003 	lwr	a1,3\(at\)
 0000022c <fn\+0x22c> 8f810000 	lw	at,0\(gp\)
 			22c: R_MIPS_GOT_PAGE	\.data\+0x48
-00000230 <fn\+0x230> 20210000 	addi	at,at,0
+00000230 <fn\+0x230> 24210000 	addiu	at,at,0
 			230: R_MIPS_GOT_OFST	\.data\+0x48
-00000234 <fn\+0x234> 00310820 	add	at,at,s1
+00000234 <fn\+0x234> 00310821 	addu	at,at,s1
 00000238 <fn\+0x238> 88250000 	lwl	a1,0\(at\)
 0000023c <fn\+0x23c> 98250003 	lwr	a1,3\(at\)
 00000240 <fn\+0x240> 8f810000 	lw	at,0\(gp\)
 			240: R_MIPS_GOT_PAGE	\.data\+0x5e
-00000244 <fn\+0x244> 20210000 	addi	at,at,0
+00000244 <fn\+0x244> 24210000 	addiu	at,at,0
 			244: R_MIPS_GOT_OFST	\.data\+0x5e
-00000248 <fn\+0x248> 00250820 	add	at,at,a1
+00000248 <fn\+0x248> 00250821 	addu	at,at,a1
 0000024c <fn\+0x24c> 88250000 	lwl	a1,0\(at\)
 00000250 <fn\+0x250> 98250003 	lwr	a1,3\(at\)
 00000254 <fn\+0x254> 8f810000 	lw	at,0\(gp\)
 			254: R_MIPS_GOT_PAGE	\.data\+0x74
-00000258 <fn\+0x258> 20210000 	addi	at,at,0
+00000258 <fn\+0x258> 24210000 	addiu	at,at,0
 			258: R_MIPS_GOT_OFST	\.data\+0x74
-0000025c <fn\+0x25c> 00250820 	add	at,at,a1
+0000025c <fn\+0x25c> 00250821 	addu	at,at,a1
 00000260 <fn\+0x260> a8250000 	swl	a1,0\(at\)
 00000264 <fn\+0x264> b8250003 	swr	a1,3\(at\)
 00000268 <fn\+0x268> 3c050000 	lui	a1,0x0
 			268: R_MIPS_GOT_HI16	fn
-0000026c <fn\+0x26c> 00bc2820 	add	a1,a1,gp
+0000026c <fn\+0x26c> 00bc2821 	addu	a1,a1,gp
 00000270 <fn\+0x270> 8ca50000 	lw	a1,0\(a1\)
 			270: R_MIPS_GOT_LO16	fn
 00000274 <fn\+0x274> 8f850000 	lw	a1,0\(gp\)
 			274: R_MIPS_GOT_PAGE	\.text
-00000278 <fn\+0x278> 20a50000 	addi	a1,a1,0
+00000278 <fn\+0x278> 24a50000 	addiu	a1,a1,0
 			278: R_MIPS_GOT_OFST	\.text
 0000027c <fn\+0x27c> 3c190000 	lui	t9,0x0
 			27c: R_MIPS_CALL_HI16	fn
-00000280 <fn\+0x280> 033cc820 	add	t9,t9,gp
+00000280 <fn\+0x280> 033cc821 	addu	t9,t9,gp
 00000284 <fn\+0x284> 8f390000 	lw	t9,0\(t9\)
 			284: R_MIPS_CALL_LO16	fn
 00000288 <fn\+0x288> 8f990000 	lw	t9,0\(gp\)
 			288: R_MIPS_GOT_PAGE	\.text
-0000028c <fn\+0x28c> 23390000 	addi	t9,t9,0
+0000028c <fn\+0x28c> 27390000 	addiu	t9,t9,0
 			28c: R_MIPS_GOT_OFST	\.text
 00000290 <fn\+0x290> 3c190000 	lui	t9,0x0
 			290: R_MIPS_CALL_HI16	fn
-00000294 <fn\+0x294> 033cc820 	add	t9,t9,gp
+00000294 <fn\+0x294> 033cc821 	addu	t9,t9,gp
 00000298 <fn\+0x298> 8f390000 	lw	t9,0\(t9\)
 			298: R_MIPS_CALL_LO16	fn
 0000029c <fn\+0x29c> 0320f809 	jalr	t9
@@ -260,169 +260,169 @@ Disassembly of section \.text:
 000002a0 <fn\+0x2a0> 00000000 	nop
 000002a4 <fn\+0x2a4> 8f990000 	lw	t9,0\(gp\)
 			2a4: R_MIPS_GOT_PAGE	\.text
-000002a8 <fn\+0x2a8> 23390000 	addi	t9,t9,0
+000002a8 <fn\+0x2a8> 27390000 	addiu	t9,t9,0
 			2a8: R_MIPS_GOT_OFST	\.text
 000002ac <fn\+0x2ac> 0320f809 	jalr	t9
 			2ac: R_MIPS_JALR	\.text
 000002b0 <fn\+0x2b0> 00000000 	nop
 000002b4 <fn\+0x2b4> 3c050000 	lui	a1,0x0
 			2b4: R_MIPS_GOT_HI16	dg2
-000002b8 <fn\+0x2b8> 00bc2820 	add	a1,a1,gp
+000002b8 <fn\+0x2b8> 00bc2821 	addu	a1,a1,gp
 000002bc <fn\+0x2bc> 8ca50000 	lw	a1,0\(a1\)
 			2bc: R_MIPS_GOT_LO16	dg2
 000002c0 <fn\+0x2c0> 3c050000 	lui	a1,0x0
 			2c0: R_MIPS_GOT_HI16	dg2
-000002c4 <fn\+0x2c4> 00bc2820 	add	a1,a1,gp
+000002c4 <fn\+0x2c4> 00bc2821 	addu	a1,a1,gp
 000002c8 <fn\+0x2c8> 8ca50000 	lw	a1,0\(a1\)
 			2c8: R_MIPS_GOT_LO16	dg2
-000002cc <fn\+0x2cc> 20a5000c 	addi	a1,a1,12
+000002cc <fn\+0x2cc> 24a5000c 	addiu	a1,a1,12
 000002d0 <fn\+0x2d0> 3c050000 	lui	a1,0x0
 			2d0: R_MIPS_GOT_HI16	dg2
-000002d4 <fn\+0x2d4> 00bc2820 	add	a1,a1,gp
+000002d4 <fn\+0x2d4> 00bc2821 	addu	a1,a1,gp
 000002d8 <fn\+0x2d8> 8ca50000 	lw	a1,0\(a1\)
 			2d8: R_MIPS_GOT_LO16	dg2
 000002dc <fn\+0x2dc> 3c010002 	lui	at,0x2
-000002e0 <fn\+0x2e0> 2021e240 	addi	at,at,-7616
-000002e4 <fn\+0x2e4> 00a12820 	add	a1,a1,at
+000002e0 <fn\+0x2e0> 2421e240 	addiu	at,at,-7616
+000002e4 <fn\+0x2e4> 00a12821 	addu	a1,a1,at
 000002e8 <fn\+0x2e8> 3c050000 	lui	a1,0x0
 			2e8: R_MIPS_GOT_HI16	dg2
-000002ec <fn\+0x2ec> 00bc2820 	add	a1,a1,gp
+000002ec <fn\+0x2ec> 00bc2821 	addu	a1,a1,gp
 000002f0 <fn\+0x2f0> 8ca50000 	lw	a1,0\(a1\)
 			2f0: R_MIPS_GOT_LO16	dg2
-000002f4 <fn\+0x2f4> 00b12820 	add	a1,a1,s1
+000002f4 <fn\+0x2f4> 00b12821 	addu	a1,a1,s1
 000002f8 <fn\+0x2f8> 3c050000 	lui	a1,0x0
 			2f8: R_MIPS_GOT_HI16	dg2
-000002fc <fn\+0x2fc> 00bc2820 	add	a1,a1,gp
+000002fc <fn\+0x2fc> 00bc2821 	addu	a1,a1,gp
 00000300 <fn\+0x300> 8ca50000 	lw	a1,0\(a1\)
 			300: R_MIPS_GOT_LO16	dg2
-00000304 <fn\+0x304> 20a5000c 	addi	a1,a1,12
-00000308 <fn\+0x308> 00b12820 	add	a1,a1,s1
+00000304 <fn\+0x304> 24a5000c 	addiu	a1,a1,12
+00000308 <fn\+0x308> 00b12821 	addu	a1,a1,s1
 0000030c <fn\+0x30c> 3c050000 	lui	a1,0x0
 			30c: R_MIPS_GOT_HI16	dg2
-00000310 <fn\+0x310> 00bc2820 	add	a1,a1,gp
+00000310 <fn\+0x310> 00bc2821 	addu	a1,a1,gp
 00000314 <fn\+0x314> 8ca50000 	lw	a1,0\(a1\)
 			314: R_MIPS_GOT_LO16	dg2
 00000318 <fn\+0x318> 3c010002 	lui	at,0x2
-0000031c <fn\+0x31c> 2021e240 	addi	at,at,-7616
-00000320 <fn\+0x320> 00a12820 	add	a1,a1,at
-00000324 <fn\+0x324> 00b12820 	add	a1,a1,s1
+0000031c <fn\+0x31c> 2421e240 	addiu	at,at,-7616
+00000320 <fn\+0x320> 00a12821 	addu	a1,a1,at
+00000324 <fn\+0x324> 00b12821 	addu	a1,a1,s1
 00000328 <fn\+0x328> 3c050000 	lui	a1,0x0
 			328: R_MIPS_GOT_HI16	dg2
-0000032c <fn\+0x32c> 00bc2820 	add	a1,a1,gp
+0000032c <fn\+0x32c> 00bc2821 	addu	a1,a1,gp
 00000330 <fn\+0x330> 8ca50000 	lw	a1,0\(a1\)
 			330: R_MIPS_GOT_LO16	dg2
 00000334 <fn\+0x334> 8ca50000 	lw	a1,0\(a1\)
 00000338 <fn\+0x338> 3c050000 	lui	a1,0x0
 			338: R_MIPS_GOT_HI16	dg2
-0000033c <fn\+0x33c> 00bc2820 	add	a1,a1,gp
+0000033c <fn\+0x33c> 00bc2821 	addu	a1,a1,gp
 00000340 <fn\+0x340> 8ca50000 	lw	a1,0\(a1\)
 			340: R_MIPS_GOT_LO16	dg2
 00000344 <fn\+0x344> 8ca5000c 	lw	a1,12\(a1\)
 00000348 <fn\+0x348> 3c050000 	lui	a1,0x0
 			348: R_MIPS_GOT_HI16	dg2
-0000034c <fn\+0x34c> 00bc2820 	add	a1,a1,gp
+0000034c <fn\+0x34c> 00bc2821 	addu	a1,a1,gp
 00000350 <fn\+0x350> 8ca50000 	lw	a1,0\(a1\)
 			350: R_MIPS_GOT_LO16	dg2
-00000354 <fn\+0x354> 00b12820 	add	a1,a1,s1
+00000354 <fn\+0x354> 00b12821 	addu	a1,a1,s1
 00000358 <fn\+0x358> 8ca50000 	lw	a1,0\(a1\)
 0000035c <fn\+0x35c> 3c050000 	lui	a1,0x0
 			35c: R_MIPS_GOT_HI16	dg2
-00000360 <fn\+0x360> 00bc2820 	add	a1,a1,gp
+00000360 <fn\+0x360> 00bc2821 	addu	a1,a1,gp
 00000364 <fn\+0x364> 8ca50000 	lw	a1,0\(a1\)
 			364: R_MIPS_GOT_LO16	dg2
-00000368 <fn\+0x368> 00b12820 	add	a1,a1,s1
+00000368 <fn\+0x368> 00b12821 	addu	a1,a1,s1
 0000036c <fn\+0x36c> 8ca5000c 	lw	a1,12\(a1\)
 00000370 <fn\+0x370> 3c010000 	lui	at,0x0
 			370: R_MIPS_GOT_HI16	dg2
-00000374 <fn\+0x374> 003c0820 	add	at,at,gp
+00000374 <fn\+0x374> 003c0821 	addu	at,at,gp
 00000378 <fn\+0x378> 8c210000 	lw	at,0\(at\)
 			378: R_MIPS_GOT_LO16	dg2
-0000037c <fn\+0x37c> 00250820 	add	at,at,a1
+0000037c <fn\+0x37c> 00250821 	addu	at,at,a1
 00000380 <fn\+0x380> 8c250022 	lw	a1,34\(at\)
 00000384 <fn\+0x384> 3c010000 	lui	at,0x0
 			384: R_MIPS_GOT_HI16	dg2
-00000388 <fn\+0x388> 003c0820 	add	at,at,gp
+00000388 <fn\+0x388> 003c0821 	addu	at,at,gp
 0000038c <fn\+0x38c> 8c210000 	lw	at,0\(at\)
 			38c: R_MIPS_GOT_LO16	dg2
-00000390 <fn\+0x390> 00250820 	add	at,at,a1
+00000390 <fn\+0x390> 00250821 	addu	at,at,a1
 00000394 <fn\+0x394> ac250038 	sw	a1,56\(at\)
 00000398 <fn\+0x398> 3c010000 	lui	at,0x0
 			398: R_MIPS_GOT_HI16	dg2
-0000039c <fn\+0x39c> 003c0820 	add	at,at,gp
+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\)
 000003ac <fn\+0x3ac> 3c010000 	lui	at,0x0
 			3ac: R_MIPS_GOT_HI16	dg2
-000003b0 <fn\+0x3b0> 003c0820 	add	at,at,gp
+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> 2021000c 	addi	at,at,12
+000003b8 <fn\+0x3b8> 2421000c 	addiu	at,at,12
 000003bc <fn\+0x3bc> 88250000 	lwl	a1,0\(at\)
 000003c0 <fn\+0x3c0> 98250003 	lwr	a1,3\(at\)
 000003c4 <fn\+0x3c4> 3c010000 	lui	at,0x0
 			3c4: R_MIPS_GOT_HI16	dg2
-000003c8 <fn\+0x3c8> 003c0820 	add	at,at,gp
+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> 00310820 	add	at,at,s1
+000003d0 <fn\+0x3d0> 00310821 	addu	at,at,s1
 000003d4 <fn\+0x3d4> 88250000 	lwl	a1,0\(at\)
 000003d8 <fn\+0x3d8> 98250003 	lwr	a1,3\(at\)
 000003dc <fn\+0x3dc> 3c010000 	lui	at,0x0
 			3dc: R_MIPS_GOT_HI16	dg2
-000003e0 <fn\+0x3e0> 003c0820 	add	at,at,gp
+000003e0 <fn\+0x3e0> 003c0821 	addu	at,at,gp
 000003e4 <fn\+0x3e4> 8c210000 	lw	at,0\(at\)
 			3e4: R_MIPS_GOT_LO16	dg2
-000003e8 <fn\+0x3e8> 2021000c 	addi	at,at,12
-000003ec <fn\+0x3ec> 00310820 	add	at,at,s1
+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\)
 000003f8 <fn\+0x3f8> 3c010000 	lui	at,0x0
 			3f8: R_MIPS_GOT_HI16	dg2
-000003fc <fn\+0x3fc> 003c0820 	add	at,at,gp
+000003fc <fn\+0x3fc> 003c0821 	addu	at,at,gp
 00000400 <fn\+0x400> 8c210000 	lw	at,0\(at\)
 			400: R_MIPS_GOT_LO16	dg2
-00000404 <fn\+0x404> 20210022 	addi	at,at,34
-00000408 <fn\+0x408> 00250820 	add	at,at,a1
+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\)
 00000414 <fn\+0x414> 3c010000 	lui	at,0x0
 			414: R_MIPS_GOT_HI16	dg2
-00000418 <fn\+0x418> 003c0820 	add	at,at,gp
+00000418 <fn\+0x418> 003c0821 	addu	at,at,gp
 0000041c <fn\+0x41c> 8c210000 	lw	at,0\(at\)
 			41c: R_MIPS_GOT_LO16	dg2
-00000420 <fn\+0x420> 20210038 	addi	at,at,56
-00000424 <fn\+0x424> 00250820 	add	at,at,a1
+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\)
 00000430 <fn\+0x430> 8f850000 	lw	a1,0\(gp\)
 			430: R_MIPS_GOT_PAGE	\.data\+0xb4
-00000434 <fn\+0x434> 20a50000 	addi	a1,a1,0
+00000434 <fn\+0x434> 24a50000 	addiu	a1,a1,0
 			434: R_MIPS_GOT_OFST	\.data\+0xb4
 00000438 <fn\+0x438> 8f850000 	lw	a1,0\(gp\)
 			438: R_MIPS_GOT_PAGE	\.data\+0xc0
-0000043c <fn\+0x43c> 20a50000 	addi	a1,a1,0
+0000043c <fn\+0x43c> 24a50000 	addiu	a1,a1,0
 			43c: R_MIPS_GOT_OFST	\.data\+0xc0
 00000440 <fn\+0x440> 8f850000 	lw	a1,0\(gp\)
 			440: R_MIPS_GOT_PAGE	\.data\+0x1e2f4
-00000444 <fn\+0x444> 20a50000 	addi	a1,a1,0
+00000444 <fn\+0x444> 24a50000 	addiu	a1,a1,0
 			444: R_MIPS_GOT_OFST	\.data\+0x1e2f4
 00000448 <fn\+0x448> 8f850000 	lw	a1,0\(gp\)
 			448: R_MIPS_GOT_PAGE	\.data\+0xb4
-0000044c <fn\+0x44c> 20a50000 	addi	a1,a1,0
+0000044c <fn\+0x44c> 24a50000 	addiu	a1,a1,0
 			44c: R_MIPS_GOT_OFST	\.data\+0xb4
-00000450 <fn\+0x450> 00b12820 	add	a1,a1,s1
+00000450 <fn\+0x450> 00b12821 	addu	a1,a1,s1
 00000454 <fn\+0x454> 8f850000 	lw	a1,0\(gp\)
 			454: R_MIPS_GOT_PAGE	\.data\+0xc0
-00000458 <fn\+0x458> 20a50000 	addi	a1,a1,0
+00000458 <fn\+0x458> 24a50000 	addiu	a1,a1,0
 			458: R_MIPS_GOT_OFST	\.data\+0xc0
-0000045c <fn\+0x45c> 00b12820 	add	a1,a1,s1
+0000045c <fn\+0x45c> 00b12821 	addu	a1,a1,s1
 00000460 <fn\+0x460> 8f850000 	lw	a1,0\(gp\)
 			460: R_MIPS_GOT_PAGE	\.data\+0x1e2f4
-00000464 <fn\+0x464> 20a50000 	addi	a1,a1,0
+00000464 <fn\+0x464> 24a50000 	addiu	a1,a1,0
 			464: R_MIPS_GOT_OFST	\.data\+0x1e2f4
-00000468 <fn\+0x468> 00b12820 	add	a1,a1,s1
+00000468 <fn\+0x468> 00b12821 	addu	a1,a1,s1
 0000046c <fn\+0x46c> 8f850000 	lw	a1,0\(gp\)
 			46c: R_MIPS_GOT_PAGE	\.data\+0xb4
 00000470 <fn\+0x470> 8ca50000 	lw	a1,0\(a1\)
@@ -433,85 +433,85 @@ Disassembly of section \.text:
 			478: R_MIPS_GOT_OFST	\.data\+0xc0
 0000047c <fn\+0x47c> 8f850000 	lw	a1,0\(gp\)
 			47c: R_MIPS_GOT_PAGE	\.data\+0xb4
-00000480 <fn\+0x480> 00b12820 	add	a1,a1,s1
+00000480 <fn\+0x480> 00b12821 	addu	a1,a1,s1
 00000484 <fn\+0x484> 8ca50000 	lw	a1,0\(a1\)
 			484: R_MIPS_GOT_OFST	\.data\+0xb4
 00000488 <fn\+0x488> 8f850000 	lw	a1,0\(gp\)
 			488: R_MIPS_GOT_PAGE	\.data\+0xc0
-0000048c <fn\+0x48c> 00b12820 	add	a1,a1,s1
+0000048c <fn\+0x48c> 00b12821 	addu	a1,a1,s1
 00000490 <fn\+0x490> 8ca50000 	lw	a1,0\(a1\)
 			490: R_MIPS_GOT_OFST	\.data\+0xc0
 00000494 <fn\+0x494> 8f810000 	lw	at,0\(gp\)
 			494: R_MIPS_GOT_PAGE	\.data\+0xb4
-00000498 <fn\+0x498> 00250820 	add	at,at,a1
+00000498 <fn\+0x498> 00250821 	addu	at,at,a1
 0000049c <fn\+0x49c> 8c250000 	lw	a1,0\(at\)
 			49c: R_MIPS_GOT_OFST	\.data\+0xb4
 000004a0 <fn\+0x4a0> 8f810000 	lw	at,0\(gp\)
 			4a0: R_MIPS_GOT_PAGE	\.data\+0xec
-000004a4 <fn\+0x4a4> 00250820 	add	at,at,a1
+000004a4 <fn\+0x4a4> 00250821 	addu	at,at,a1
 000004a8 <fn\+0x4a8> ac250000 	sw	a1,0\(at\)
 			4a8: R_MIPS_GOT_OFST	\.data\+0xec
 000004ac <fn\+0x4ac> 8f810000 	lw	at,0\(gp\)
 			4ac: R_MIPS_GOT_PAGE	\.data\+0xb4
-000004b0 <fn\+0x4b0> 20210000 	addi	at,at,0
+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\)
 000004bc <fn\+0x4bc> 8f810000 	lw	at,0\(gp\)
 			4bc: R_MIPS_GOT_PAGE	\.data\+0xc0
-000004c0 <fn\+0x4c0> 20210000 	addi	at,at,0
+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\)
 000004cc <fn\+0x4cc> 8f810000 	lw	at,0\(gp\)
 			4cc: R_MIPS_GOT_PAGE	\.data\+0xb4
-000004d0 <fn\+0x4d0> 20210000 	addi	at,at,0
+000004d0 <fn\+0x4d0> 24210000 	addiu	at,at,0
 			4d0: R_MIPS_GOT_OFST	\.data\+0xb4
-000004d4 <fn\+0x4d4> 00310820 	add	at,at,s1
+000004d4 <fn\+0x4d4> 00310821 	addu	at,at,s1
 000004d8 <fn\+0x4d8> 88250000 	lwl	a1,0\(at\)
 000004dc <fn\+0x4dc> 98250003 	lwr	a1,3\(at\)
 000004e0 <fn\+0x4e0> 8f810000 	lw	at,0\(gp\)
 			4e0: R_MIPS_GOT_PAGE	\.data\+0xc0
-000004e4 <fn\+0x4e4> 20210000 	addi	at,at,0
+000004e4 <fn\+0x4e4> 24210000 	addiu	at,at,0
 			4e4: R_MIPS_GOT_OFST	\.data\+0xc0
-000004e8 <fn\+0x4e8> 00310820 	add	at,at,s1
+000004e8 <fn\+0x4e8> 00310821 	addu	at,at,s1
 000004ec <fn\+0x4ec> 88250000 	lwl	a1,0\(at\)
 000004f0 <fn\+0x4f0> 98250003 	lwr	a1,3\(at\)
 000004f4 <fn\+0x4f4> 8f810000 	lw	at,0\(gp\)
 			4f4: R_MIPS_GOT_PAGE	\.data\+0xd6
-000004f8 <fn\+0x4f8> 20210000 	addi	at,at,0
+000004f8 <fn\+0x4f8> 24210000 	addiu	at,at,0
 			4f8: R_MIPS_GOT_OFST	\.data\+0xd6
-000004fc <fn\+0x4fc> 00250820 	add	at,at,a1
+000004fc <fn\+0x4fc> 00250821 	addu	at,at,a1
 00000500 <fn\+0x500> 88250000 	lwl	a1,0\(at\)
 00000504 <fn\+0x504> 98250003 	lwr	a1,3\(at\)
 00000508 <fn\+0x508> 8f810000 	lw	at,0\(gp\)
 			508: R_MIPS_GOT_PAGE	\.data\+0xec
-0000050c <fn\+0x50c> 20210000 	addi	at,at,0
+0000050c <fn\+0x50c> 24210000 	addiu	at,at,0
 			50c: R_MIPS_GOT_OFST	\.data\+0xec
-00000510 <fn\+0x510> 00250820 	add	at,at,a1
+00000510 <fn\+0x510> 00250821 	addu	at,at,a1
 00000514 <fn\+0x514> a8250000 	swl	a1,0\(at\)
 00000518 <fn\+0x518> b8250003 	swr	a1,3\(at\)
 0000051c <fn\+0x51c> 3c050000 	lui	a1,0x0
 			51c: R_MIPS_GOT_HI16	fn2
-00000520 <fn\+0x520> 00bc2820 	add	a1,a1,gp
+00000520 <fn\+0x520> 00bc2821 	addu	a1,a1,gp
 00000524 <fn\+0x524> 8ca50000 	lw	a1,0\(a1\)
 			524: R_MIPS_GOT_LO16	fn2
 00000528 <fn\+0x528> 8f850000 	lw	a1,0\(gp\)
 			528: R_MIPS_GOT_PAGE	\.text\+0x600
-0000052c <fn\+0x52c> 20a50000 	addi	a1,a1,0
+0000052c <fn\+0x52c> 24a50000 	addiu	a1,a1,0
 			52c: R_MIPS_GOT_OFST	\.text\+0x600
 00000530 <fn\+0x530> 3c190000 	lui	t9,0x0
 			530: R_MIPS_CALL_HI16	fn2
-00000534 <fn\+0x534> 033cc820 	add	t9,t9,gp
+00000534 <fn\+0x534> 033cc821 	addu	t9,t9,gp
 00000538 <fn\+0x538> 8f390000 	lw	t9,0\(t9\)
 			538: R_MIPS_CALL_LO16	fn2
 0000053c <fn\+0x53c> 8f990000 	lw	t9,0\(gp\)
 			53c: R_MIPS_GOT_PAGE	\.text\+0x600
-00000540 <fn\+0x540> 23390000 	addi	t9,t9,0
+00000540 <fn\+0x540> 27390000 	addiu	t9,t9,0
 			540: R_MIPS_GOT_OFST	\.text\+0x600
 00000544 <fn\+0x544> 3c190000 	lui	t9,0x0
 			544: R_MIPS_CALL_HI16	fn2
-00000548 <fn\+0x548> 033cc820 	add	t9,t9,gp
+00000548 <fn\+0x548> 033cc821 	addu	t9,t9,gp
 0000054c <fn\+0x54c> 8f390000 	lw	t9,0\(t9\)
 			54c: R_MIPS_CALL_LO16	fn2
 00000550 <fn\+0x550> 0320f809 	jalr	t9
@@ -519,21 +519,21 @@ Disassembly of section \.text:
 00000554 <fn\+0x554> 00000000 	nop
 00000558 <fn\+0x558> 8f990000 	lw	t9,0\(gp\)
 			558: R_MIPS_GOT_PAGE	\.text\+0x600
-0000055c <fn\+0x55c> 23390000 	addi	t9,t9,0
+0000055c <fn\+0x55c> 27390000 	addiu	t9,t9,0
 			55c: R_MIPS_GOT_OFST	\.text\+0x600
 00000560 <fn\+0x560> 0320f809 	jalr	t9
 			560: R_MIPS_JALR	\.text\+0x600
 00000564 <fn\+0x564> 00000000 	nop
 00000568 <fn\+0x568> 3c050000 	lui	a1,0x0
 			568: R_MIPS_GOT_HI16	dg1
-0000056c <fn\+0x56c> 00bc2820 	add	a1,a1,gp
+0000056c <fn\+0x56c> 00bc2821 	addu	a1,a1,gp
 00000570 <fn\+0x570> 8ca50000 	lw	a1,0\(a1\)
 			570: R_MIPS_GOT_LO16	dg1
 00000574 <fn\+0x574> 1000fea2 	b	00000000 <fn>
 00000578 <fn\+0x578> 00000000 	nop
 0000057c <fn\+0x57c> 3c050000 	lui	a1,0x0
 			57c: R_MIPS_GOT_HI16	dg2
-00000580 <fn\+0x580> 00bc2820 	add	a1,a1,gp
+00000580 <fn\+0x580> 00bc2821 	addu	a1,a1,gp
 00000584 <fn\+0x584> 8ca50000 	lw	a1,0\(a1\)
 			584: R_MIPS_GOT_LO16	dg2
 00000588 <fn\+0x588> 8ca50000 	lw	a1,0\(a1\)
@@ -541,19 +541,19 @@ Disassembly of section \.text:
 00000590 <fn\+0x590> 00000000 	nop
 00000594 <fn\+0x594> 8f850000 	lw	a1,0\(gp\)
 			594: R_MIPS_GOT_PAGE	\.data\+0x3c
-00000598 <fn\+0x598> 20a50000 	addi	a1,a1,0
+00000598 <fn\+0x598> 24a50000 	addiu	a1,a1,0
 			598: R_MIPS_GOT_OFST	\.data\+0x3c
 0000059c <fn\+0x59c> 1000fe98 	b	00000000 <fn>
 000005a0 <fn\+0x5a0> 00000000 	nop
 000005a4 <fn\+0x5a4> 8f850000 	lw	a1,0\(gp\)
 			5a4: R_MIPS_GOT_PAGE	\.data\+0xc0
-000005a8 <fn\+0x5a8> 20a50000 	addi	a1,a1,0
+000005a8 <fn\+0x5a8> 24a50000 	addiu	a1,a1,0
 			5a8: R_MIPS_GOT_OFST	\.data\+0xc0
 000005ac <fn\+0x5ac> 10000014 	b	00000600 <fn2>
 000005b0 <fn\+0x5b0> 00000000 	nop
 000005b4 <fn\+0x5b4> 8f850000 	lw	a1,0\(gp\)
 			5b4: R_MIPS_GOT_PAGE	\.data\+0x1e27c
-000005b8 <fn\+0x5b8> 20a50000 	addi	a1,a1,0
+000005b8 <fn\+0x5b8> 24a50000 	addiu	a1,a1,0
 			5b8: R_MIPS_GOT_OFST	\.data\+0x1e27c
 000005bc <fn\+0x5bc> 1000fe90 	b	00000000 <fn>
 000005c0 <fn\+0x5c0> 00000000 	nop
@@ -571,7 +571,7 @@ Disassembly of section \.text:
 000005e0 <fn\+0x5e0> 00000000 	nop
 000005e4 <fn\+0x5e4> 8f810000 	lw	at,0\(gp\)
 			5e4: R_MIPS_GOT_PAGE	\.data\+0xd6
-000005e8 <fn\+0x5e8> 00250820 	add	at,at,a1
+000005e8 <fn\+0x5e8> 00250821 	addu	at,at,a1
 000005ec <fn\+0x5ec> 8c250000 	lw	a1,0\(at\)
 			5ec: R_MIPS_GOT_OFST	\.data\+0xd6
 000005f0 <fn\+0x5f0> 10000003 	b	00000600 <fn2>
diff --git a/gas/testsuite/gas/mips/jal-newabi.d b/gas/testsuite/gas/mips/jal-newabi.d
index b4503ce..77a0b2b 100644
--- a/gas/testsuite/gas/mips/jal-newabi.d
+++ b/gas/testsuite/gas/mips/jal-newabi.d
@@ -9,7 +9,7 @@ Disassembly of section \.text:
 00000004 <label\+0x4> 34845678 	ori	a0,a0,0x5678
 00000008 <label\+0x8> 8f990000 	lw	t9,0\(gp\)
 			8: R_MIPS_GOT_PAGE	.text
-0000000c <label\+0xc> 23390000 	addi	t9,t9,0
+0000000c <label\+0xc> 27390000 	addiu	t9,t9,0
 			c: R_MIPS_GOT_OFST	.text
 00000010 <label\+0x10> 0320f809 	jalr	t9
 			10: R_MIPS_JALR	.text