* 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.

1 files changed, 65 insertions, 65 deletions

diff --git a/gas/testsuite/gas/mips/elf-rel-got-n32.d b/gas/testsuite/gas/mips/elf-rel-got-n32.d
index b6ff395f05..265ba480a2 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