* gas/mips/e32-rel2.d: Adjust expected output to remove the 0x4000

        offset.
        * gas/mips/e32el-rel2.d: Likewise.
        * gas/mips/elf-rel2.d: Likewise.
        * gas/mips/elf-rel9-mips16.d: Likewise.
        * gas/mips/elf-rel9.d: Likewise.
        * gas/mips/elfel-rel2.d: Likewise.
        * gas/mips/lb.d: Likewise.
        * gas/mips/mips-abi32.d: Likewise.
        * gas/mips/mips-gp32-fp32.d: Likewise.
        * gas/mips/mips-gp32-fp64.d: Likewise.
        * gas/mips/mips-gp64-fp32.d: Likewise.
        * gas/mips/mips-gp64-fp64.d: Likewise.
        * gas/mips/mips32-sf32.d: Likewise.

14 files changed, 131 insertions, 114 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 9f39a07..5c0b550 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,20 @@
+2009-02-16  Nick Clifton  <nickc@redhat.com>
+
+	* gas/mips/e32-rel2.d: Adjust expected output to remove the 0x4000
+	offset.
+	* gas/mips/e32el-rel2.d: Likewise.
+	* gas/mips/elf-rel2.d: Likewise.
+	* gas/mips/elf-rel9-mips16.d: Likewise.
+	* gas/mips/elf-rel9.d: Likewise.
+	* gas/mips/elfel-rel2.d: Likewise.
+	* gas/mips/lb.d: Likewise.
+	* gas/mips/mips-abi32.d: Likewise.
+	* gas/mips/mips-gp32-fp32.d: Likewise.
+	* gas/mips/mips-gp32-fp64.d: Likewise.
+	* gas/mips/mips-gp64-fp32.d: Likewise.
+	* gas/mips/mips-gp64-fp64.d: Likewise.
+	* gas/mips/mips32-sf32.d: Likewise.
+
 2009-02-12  Nathan Sidwell  <nathan@codesourcery.com>
 
 	* m68k/br-isac.d, m68k/br-isac.s: Add stldsr test.
diff --git a/gas/testsuite/gas/mips/e32-rel2.d b/gas/testsuite/gas/mips/e32-rel2.d
index c0f67d2..6d0ed59 100644
--- a/gas/testsuite/gas/mips/e32-rel2.d
+++ b/gas/testsuite/gas/mips/e32-rel2.d
@@ -11,21 +11,21 @@
 
 RELOCATION RECORDS FOR \[\.text\]:
 OFFSET [ ]+ TYPE              VALUE 
-0+0000000 R_MIPS_LITERAL    \.lit8\+0x0+0004000
-0+0000004 R_MIPS_LITERAL    \.lit8\+0x0+0004000
-0+0000008 R_MIPS_LITERAL    \.lit8\+0x0+0004000
-0+000000c R_MIPS_LITERAL    \.lit8\+0x0+0004000
-0+0000010 R_MIPS_LITERAL    \.lit8\+0x0+0004000
-0+0000014 R_MIPS_LITERAL    \.lit8\+0x0+0004000
-0+0000018 R_MIPS_LITERAL    \.lit4\+0x0+0004000
-0+000001c R_MIPS_LITERAL    \.lit4\+0x0+0004000
-0+0000020 R_MIPS_LITERAL    \.lit4\+0x0+0004000
-0+0000024 R_MIPS_GPREL16    \.sdata\+0x0+0004000
-0+0000028 R_MIPS_GPREL16    \.sdata\+0x0+0004000
-0+000002c R_MIPS_GPREL16    \.sdata\+0x0+0004000
+0+0000000 R_MIPS_LITERAL    \.lit8
+0+0000004 R_MIPS_LITERAL    \.lit8
+0+0000008 R_MIPS_LITERAL    \.lit8
+0+000000c R_MIPS_LITERAL    \.lit8
+0+0000010 R_MIPS_LITERAL    \.lit8
+0+0000014 R_MIPS_LITERAL    \.lit8
+0+0000018 R_MIPS_LITERAL    \.lit4
+0+000001c R_MIPS_LITERAL    \.lit4
+0+0000020 R_MIPS_LITERAL    \.lit4
+0+0000024 R_MIPS_GPREL16    \.sdata
+0+0000028 R_MIPS_GPREL16    \.sdata
+0+000002c R_MIPS_GPREL16    \.sdata
 
 
 Contents of section \.text:
- 0000 c783c000 c782c004 c783c008 c782c00c  .*
- 0010 c783c010 c782c014 c782c000 c782c004  .*
- 0020 c782c008 8f82c000 8f82c004 8f82c008  .*
+ 0000 c7830000 c7820004 c7830008 c782000c  .*
+ 0010 c7830010 c7820014 c7820000 c7820004  .*
+ 0020 c7820008 8f820000 8f820004 8f820008  .*
diff --git a/gas/testsuite/gas/mips/e32el-rel2.d b/gas/testsuite/gas/mips/e32el-rel2.d
index 2bf8254..4d5e980 100644
--- a/gas/testsuite/gas/mips/e32el-rel2.d
+++ b/gas/testsuite/gas/mips/e32el-rel2.d
@@ -11,18 +11,18 @@
 
 RELOCATION RECORDS FOR \[\.text\]:
 OFFSET [ ]+ TYPE              VALUE 
-0+0000000 R_MIPS_LITERAL    \.lit8\+0x0+0004000
-0+0000004 R_MIPS_LITERAL    \.lit8\+0x0+0004000
-0+0000008 R_MIPS_LITERAL    \.lit8\+0x0+0004000
-0+000000c R_MIPS_LITERAL    \.lit4\+0x0+0004000
-0+0000010 R_MIPS_LITERAL    \.lit4\+0x0+0004000
-0+0000014 R_MIPS_LITERAL    \.lit4\+0x0+0004000
-0+0000018 R_MIPS_GPREL16    \.sdata\+0x0+0004000
-0+000001c R_MIPS_GPREL16    \.sdata\+0x0+0004000
-0+0000020 R_MIPS_GPREL16    \.sdata\+0x0+0004000
+0+0000000 R_MIPS_LITERAL    \.lit8
+0+0000004 R_MIPS_LITERAL    \.lit8
+0+0000008 R_MIPS_LITERAL    \.lit8
+0+000000c R_MIPS_LITERAL    \.lit4
+0+0000010 R_MIPS_LITERAL    \.lit4
+0+0000014 R_MIPS_LITERAL    \.lit4
+0+0000018 R_MIPS_GPREL16    \.sdata
+0+000001c R_MIPS_GPREL16    \.sdata
+0+0000020 R_MIPS_GPREL16    \.sdata
 
 
 Contents of section \.text:
- 0000 00c082d7 08c082d7 10c082d7 00c082c7  .*
- 0010 04c082c7 08c082c7 00c0828f 04c0828f  .*
- 0020 08c0828f .*
+ 0000 000082d7 080082d7 100082d7 000082c7  .*
+ 0010 040082c7 080082c7 0000828f 0400828f  .*
+ 0020 0800828f .*
diff --git a/gas/testsuite/gas/mips/elf-rel2.d b/gas/testsuite/gas/mips/elf-rel2.d
index 0cb1d41..4bd9cee 100644
--- a/gas/testsuite/gas/mips/elf-rel2.d
+++ b/gas/testsuite/gas/mips/elf-rel2.d
@@ -10,18 +10,18 @@
 
 RELOCATION RECORDS FOR \[\.text\]:
 OFFSET [ ]+ TYPE              VALUE 
-0+0000000 R_MIPS_LITERAL    \.lit8\+0x0+0004000
-0+0000004 R_MIPS_LITERAL    \.lit8\+0x0+0004000
-0+0000008 R_MIPS_LITERAL    \.lit8\+0x0+0004000
-0+000000c R_MIPS_LITERAL    \.lit4\+0x0+0004000
-0+0000010 R_MIPS_LITERAL    \.lit4\+0x0+0004000
-0+0000014 R_MIPS_LITERAL    \.lit4\+0x0+0004000
-0+0000018 R_MIPS_GPREL16    \.sdata\+0x0+0004000
-0+000001c R_MIPS_GPREL16    \.sdata\+0x0+0004000
-0+0000020 R_MIPS_GPREL16    \.sdata\+0x0+0004000
+0+0000000 R_MIPS_LITERAL    \.lit8
+0+0000004 R_MIPS_LITERAL    \.lit8
+0+0000008 R_MIPS_LITERAL    \.lit8
+0+000000c R_MIPS_LITERAL    \.lit4
+0+0000010 R_MIPS_LITERAL    \.lit4
+0+0000014 R_MIPS_LITERAL    \.lit4
+0+0000018 R_MIPS_GPREL16    \.sdata
+0+000001c R_MIPS_GPREL16    \.sdata
+0+0000020 R_MIPS_GPREL16    \.sdata
 
 
 Contents of section \.text:
- 0000 d782c000 d782c008 d782c010 c782c000  .*
- 0010 c782c004 c782c008 8f82c000 8f82c004  .*
- 0020 8f82c008 .*
+ 0000 d7820000 d7820008 d7820010 c7820000  .*
+ 0010 c7820004 c7820008 8f820000 8f820004  .*
+ 0020 8f820008 .*
diff --git a/gas/testsuite/gas/mips/elf-rel9-mips16.d b/gas/testsuite/gas/mips/elf-rel9-mips16.d
index 738c6fd..6aea475 100644
--- a/gas/testsuite/gas/mips/elf-rel9-mips16.d
+++ b/gas/testsuite/gas/mips/elf-rel9-mips16.d
@@ -52,19 +52,19 @@ Disassembly of section \.text:
 			52: R_MIPS16_GOT16	\.data
   56:	f342 4c05 	addiu	\$4,4933
 			56: R_MIPS16_LO16	\.data
-  5a:	f018 9a80 	lw	\$4,-16384\(\$2\)
+  5a:	f000 9a80 	lw	\$4,0\(\$2\)
 			5a: R_MIPS16_GPREL	\.sdata
-  5e:	f018 9a84 	lw	\$4,-16380\(\$2\)
+  5e:	f000 9a84 	lw	\$4,4\(\$2\)
 			5e: R_MIPS16_GPREL	\.sdata
-  62:	f018 9a84 	lw	\$4,-16380\(\$2\)
+  62:	f000 9a84 	lw	\$4,4\(\$2\)
 			62: R_MIPS16_GPREL	\.sdata
-  66:	f018 9a88 	lw	\$4,-16376\(\$2\)
+  66:	f000 9a88 	lw	\$4,8\(\$2\)
 			66: R_MIPS16_GPREL	\.sdata
-  6a:	f018 9a8c 	lw	\$4,-16372\(\$2\)
+  6a:	f000 9a8c 	lw	\$4,12\(\$2\)
 			6a: R_MIPS16_GPREL	\.sdata
-  6e:	f018 9a94 	lw	\$4,-16364\(\$2\)
+  6e:	f000 9a94 	lw	\$4,20\(\$2\)
 			6e: R_MIPS16_GPREL	\.sdata
-  72:	f018 9a98 	lw	\$4,-16360\(\$2\)
+  72:	f000 9a98 	lw	\$4,24\(\$2\)
 			72: R_MIPS16_GPREL	\.sdata
   76:	6500      	nop
 #pass
diff --git a/gas/testsuite/gas/mips/elf-rel9.d b/gas/testsuite/gas/mips/elf-rel9.d
index 1f7f1be..792a5a4 100644
--- a/gas/testsuite/gas/mips/elf-rel9.d
+++ b/gas/testsuite/gas/mips/elf-rel9.d
@@ -51,18 +51,18 @@ Disassembly of section \.text:
 			50: R_MIPS_GOT16	\.data
   54:	24841345 	addiu	\$4,\$4,4933
 			54: R_MIPS_LO16	\.data
-  58:	8f84c000 	lw	\$4,-16384\(\$28\)
-			58: R_MIPS_GPREL16	\.sdata\+0x4000
-  5c:	8f84c004 	lw	\$4,-16380\(\$28\)
-			5c: R_MIPS_GPREL16	\.sdata\+0x4000
-  60:	8f84c004 	lw	\$4,-16380\(\$28\)
-			60: R_MIPS_GPREL16	\.sdata\+0x4000
-  64:	8f84c008 	lw	\$4,-16376\(\$28\)
-			64: R_MIPS_GPREL16	\.sdata\+0x4000
-  68:	8f84c00c 	lw	\$4,-16372\(\$28\)
-			68: R_MIPS_GPREL16	\.sdata\+0x4000
-  6c:	8f84c014 	lw	\$4,-16364\(\$28\)
-			6c: R_MIPS_GPREL16	\.sdata\+0x4000
-  70:	8f84c018 	lw	\$4,-16360\(\$28\)
-			70: R_MIPS_GPREL16	\.sdata\+0x4000
+  58:	8f840000 	lw	\$4,0\(\$28\)
+			58: R_MIPS_GPREL16	\.sdata
+  5c:	8f840004 	lw	\$4,4\(\$28\)
+			5c: R_MIPS_GPREL16	\.sdata
+  60:	8f840004 	lw	\$4,4\(\$28\)
+			60: R_MIPS_GPREL16	\.sdata
+  64:	8f840008 	lw	\$4,8\(\$28\)
+			64: R_MIPS_GPREL16	\.sdata
+  68:	8f84000c 	lw	\$4,12\(\$28\)
+			68: R_MIPS_GPREL16	\.sdata
+  6c:	8f840014 	lw	\$4,20\(\$28\)
+			6c: R_MIPS_GPREL16	\.sdata
+  70:	8f840018 	lw	\$4,24\(\$28\)
+			70: R_MIPS_GPREL16	\.sdata
 	\.\.\.
diff --git a/gas/testsuite/gas/mips/elfel-rel2.d b/gas/testsuite/gas/mips/elfel-rel2.d
index 4944160..354a578 100644
--- a/gas/testsuite/gas/mips/elfel-rel2.d
+++ b/gas/testsuite/gas/mips/elfel-rel2.d
@@ -11,18 +11,18 @@
 
 RELOCATION RECORDS FOR \[\.text\]:
 OFFSET [ ]+ TYPE              VALUE 
-0+0000000 R_MIPS_LITERAL    \.lit8\+0x0+0004000
-0+0000004 R_MIPS_LITERAL    \.lit8\+0x0+0004000
-0+0000008 R_MIPS_LITERAL    \.lit8\+0x0+0004000
-0+000000c R_MIPS_LITERAL    \.lit4\+0x0+0004000
-0+0000010 R_MIPS_LITERAL    \.lit4\+0x0+0004000
-0+0000014 R_MIPS_LITERAL    \.lit4\+0x0+0004000
-0+0000018 R_MIPS_GPREL16    \.sdata\+0x0+0004000
-0+000001c R_MIPS_GPREL16    \.sdata\+0x0+0004000
-0+0000020 R_MIPS_GPREL16    \.sdata\+0x0+0004000
+0+0000000 R_MIPS_LITERAL    \.lit8
+0+0000004 R_MIPS_LITERAL    \.lit8
+0+0000008 R_MIPS_LITERAL    \.lit8
+0+000000c R_MIPS_LITERAL    \.lit4
+0+0000010 R_MIPS_LITERAL    \.lit4
+0+0000014 R_MIPS_LITERAL    \.lit4
+0+0000018 R_MIPS_GPREL16    \.sdata
+0+000001c R_MIPS_GPREL16    \.sdata
+0+0000020 R_MIPS_GPREL16    \.sdata
 
 
 Contents of section \.text:
- 0000 00c082d7 08c082d7 10c082d7 00c082c7  .*
- 0010 04c082c7 08c082c7 00c0828f 04c0828f  .*
- 0020 08c0828f .*
+ 0000 000082d7 080082d7 100082d7 000082c7  .*
+ 0010 040082c7 080082c7 0000828f 0400828f  .*
+ 0020 0800828f .*
diff --git a/gas/testsuite/gas/mips/lb.d b/gas/testsuite/gas/mips/lb.d
index ccc28cb..4a43c7f 100644
--- a/gas/testsuite/gas/mips/lb.d
+++ b/gas/testsuite/gas/mips/lb.d
@@ -48,7 +48,7 @@ Disassembly of section .text:
 [ 	]*74: [A-Z0-9_]*HI[A-Z0-9_]*	.bss.*
 0+0078 <[^>]*> lb	a0,[0-9]+\(a0\)
 [ 	]*78: [A-Z0-9_]*LO[A-Z0-9_]*	.bss.*
-0+007c <[^>]*> lb	a0,-16384\(gp\)
+0+007c <[^>]*> lb	a0,0\(gp\)
 [ 	]*7c: [A-Z0-9_]*GPREL[A-Z0-9_]*	.sbss.*
 0+0080 <[^>]*> lui	a0,0x0
 [ 	]*80: [A-Z0-9_]*HI[A-Z0-9_]*	.data.*
diff --git a/gas/testsuite/gas/mips/mips-abi32.d b/gas/testsuite/gas/mips/mips-abi32.d
index 15b2eea..51ab40c 100644
--- a/gas/testsuite/gas/mips/mips-abi32.d
+++ b/gas/testsuite/gas/mips/mips-abi32.d
@@ -9,31 +9,31 @@ Disassembly of section .text:
 0+000 <[^>]*>:
    0:	3c041234 	lui	a0,0x1234
    4:	34845678 	ori	a0,a0,0x5678
-   8:	2784c000 	addiu	a0,gp,-16384
+   8:	27840000 	addiu	a0,gp,0
    c:	3c040000 	lui	a0,0x0
   10:	24840000 	addiu	a0,a0,0
   14:	3c040000 	lui	a0,0x0
   18:	24840108 	addiu	a0,a0,264
   1c:	08000042 	j	108 <[^>]*>
   20:	0c000042 	jal	108 <[^>]*>
-  24:	8f84c000 	lw	a0,-16384\(gp\)
+  24:	8f840000 	lw	a0,0\(gp\)
   28:	3c040000 	lui	a0,0x0
   2c:	8c840000 	lw	a0,0\(a0\)
   30:	3c040000 	lui	a0,0x0
   34:	8c840108 	lw	a0,264\(a0\)
-  38:	8f84c000 	lw	a0,-16384\(gp\)
-  3c:	8f85c004 	lw	a1,-16380\(gp\)
+  38:	8f840000 	lw	a0,0\(gp\)
+  3c:	8f850004 	lw	a1,4\(gp\)
   40:	3c010000 	lui	at,0x0
   44:	8c240000 	lw	a0,0\(at\)
   48:	8c250004 	lw	a1,4\(at\)
   4c:	3c010000 	lui	at,0x0
   50:	8c240108 	lw	a0,264\(at\)
   54:	8c25010c 	lw	a1,268\(at\)
-  58:	af84c000 	sw	a0,-16384\(gp\)
+  58:	af840000 	sw	a0,0\(gp\)
   5c:	3c010000 	lui	at,0x0
   60:	ac240000 	sw	a0,0\(at\)
-  64:	af84c000 	sw	a0,-16384\(gp\)
-  68:	af85c004 	sw	a1,-16380\(gp\)
+  64:	af840000 	sw	a0,0\(gp\)
+  68:	af850004 	sw	a1,4\(gp\)
   6c:	3c010000 	lui	at,0x0
   70:	ac240000 	sw	a0,0\(at\)
   74:	ac250004 	sw	a1,4\(at\)
@@ -67,7 +67,7 @@ Disassembly of section .text:
   e4:	3c013ff0 	lui	at,0x3ff0
   e8:	44810800 	mtc1	at,\$f1
   ec:	44800000 	mtc1	zero,\$f0
-  f0:	d780c000 	ldc1	\$f0,-16384\(gp\)
+  f0:	d7800000 	ldc1	\$f0,0\(gp\)
   f4:	24a40064 	addiu	a0,a1,100
   f8:	2c840001 	sltiu	a0,a0,1
   fc:	24a40064 	addiu	a0,a1,100
diff --git a/gas/testsuite/gas/mips/mips-gp32-fp32.d b/gas/testsuite/gas/mips/mips-gp32-fp32.d
index ab943f1..82e3828 100644
--- a/gas/testsuite/gas/mips/mips-gp32-fp32.d
+++ b/gas/testsuite/gas/mips/mips-gp32-fp32.d
@@ -9,31 +9,31 @@ Disassembly of section .text:
 0+000 <[^>]*>:
    0:	3c041234 	lui	a0,0x1234
    4:	34845678 	ori	a0,a0,0x5678
-   8:	2784c000 	addiu	a0,gp,-16384
+   8:	27840000 	addiu	a0,gp,0
    c:	3c040000 	lui	a0,0x0
   10:	24840000 	addiu	a0,a0,0
   14:	3c040000 	lui	a0,0x0
   18:	24840108 	addiu	a0,a0,264
   1c:	08000042 	j	108 <[^>]*>
   20:	0c000042 	jal	108 <[^>]*>
-  24:	8f84c000 	lw	a0,-16384\(gp\)
+  24:	8f840000 	lw	a0,0\(gp\)
   28:	3c040000 	lui	a0,0x0
   2c:	8c840000 	lw	a0,0\(a0\)
   30:	3c040000 	lui	a0,0x0
   34:	8c840108 	lw	a0,264\(a0\)
-  38:	8f84c000 	lw	a0,-16384\(gp\)
-  3c:	8f85c004 	lw	a1,-16380\(gp\)
+  38:	8f840000 	lw	a0,0\(gp\)
+  3c:	8f850004 	lw	a1,4\(gp\)
   40:	3c010000 	lui	at,0x0
   44:	8c240000 	lw	a0,0\(at\)
   48:	8c250004 	lw	a1,4\(at\)
   4c:	3c010000 	lui	at,0x0
   50:	8c240108 	lw	a0,264\(at\)
   54:	8c25010c 	lw	a1,268\(at\)
-  58:	af84c000 	sw	a0,-16384\(gp\)
+  58:	af840000 	sw	a0,0\(gp\)
   5c:	3c010000 	lui	at,0x0
   60:	ac240000 	sw	a0,0\(at\)
-  64:	af84c000 	sw	a0,-16384\(gp\)
-  68:	af85c004 	sw	a1,-16380\(gp\)
+  64:	af840000 	sw	a0,0\(gp\)
+  68:	af850004 	sw	a1,4\(gp\)
   6c:	3c010000 	lui	at,0x0
   70:	ac240000 	sw	a0,0\(at\)
   74:	ac250004 	sw	a1,4\(at\)
@@ -67,7 +67,7 @@ Disassembly of section .text:
   e4:	3c013ff0 	lui	at,0x3ff0
   e8:	44810800 	mtc1	at,\$f1
   ec:	44800000 	mtc1	zero,\$f0
-  f0:	d780c000 	ldc1	\$f0,-16384\(gp\)
+  f0:	d7800000 	ldc1	\$f0,0\(gp\)
   f4:	24a40064 	addiu	a0,a1,100
   f8:	2c840001 	sltiu	a0,a0,1
   fc:	24a40064 	addiu	a0,a1,100
diff --git a/gas/testsuite/gas/mips/mips-gp32-fp64.d b/gas/testsuite/gas/mips/mips-gp32-fp64.d
index 8fcd563..2181bb1 100644
--- a/gas/testsuite/gas/mips/mips-gp32-fp64.d
+++ b/gas/testsuite/gas/mips/mips-gp32-fp64.d
@@ -10,31 +10,31 @@ Disassembly of section .text:
 0+000 <[^>]*>:
    0:	3c041234 	lui	a0,0x1234
    4:	34845678 	ori	a0,a0,0x5678
-   8:	2784c000 	addiu	a0,gp,-16384
+   8:	27840000 	addiu	a0,gp,0
    c:	3c040000 	lui	a0,0x0
   10:	24840000 	addiu	a0,a0,0
   14:	3c040000 	lui	a0,0x0
   18:	24840104 	addiu	a0,a0,260
   1c:	08000041 	j	104 <[^>]*>
   20:	0c000041 	jal	104 <[^>]*>
-  24:	8f84c000 	lw	a0,-16384\(gp\)
+  24:	8f840000 	lw	a0,0\(gp\)
   28:	3c040000 	lui	a0,0x0
   2c:	8c840000 	lw	a0,0\(a0\)
   30:	3c040000 	lui	a0,0x0
   34:	8c840104 	lw	a0,260\(a0\)
-  38:	8f84c000 	lw	a0,-16384\(gp\)
-  3c:	8f85c004 	lw	a1,-16380\(gp\)
+  38:	8f840000 	lw	a0,0\(gp\)
+  3c:	8f850004 	lw	a1,4\(gp\)
   40:	3c010000 	lui	at,0x0
   44:	8c240000 	lw	a0,0\(at\)
   48:	8c250004 	lw	a1,4\(at\)
   4c:	3c010000 	lui	at,0x0
   50:	8c240104 	lw	a0,260\(at\)
   54:	8c250108 	lw	a1,264\(at\)
-  58:	af84c000 	sw	a0,-16384\(gp\)
+  58:	af840000 	sw	a0,0\(gp\)
   5c:	3c010000 	lui	at,0x0
   60:	ac240000 	sw	a0,0\(at\)
-  64:	af84c000 	sw	a0,-16384\(gp\)
-  68:	af85c004 	sw	a1,-16380\(gp\)
+  64:	af840000 	sw	a0,0\(gp\)
+  68:	af850004 	sw	a1,4\(gp\)
   6c:	3c010000 	lui	at,0x0
   70:	ac240000 	sw	a0,0\(at\)
   74:	ac250004 	sw	a1,4\(at\)
@@ -65,8 +65,8 @@ Disassembly of section .text:
   d8:	3c010000 	lui	at,0x0
   dc:	8c240000 	lw	a0,0\(at\)
   e0:	8c250004 	lw	a1,4\(at\)
-  e4:	d780c000 	ldc1	\$f0,-16384\(gp\)
-  e8:	d780c008 	ldc1	\$f0,-16376\(gp\)
+  e4:	d7800000 	ldc1	\$f0,0\(gp\)
+  e8:	d7800008 	ldc1	\$f0,8\(gp\)
   ec:	24a40064 	addiu	a0,a1,100
   f0:	2c840001 	sltiu	a0,a0,1
   f4:	24a40064 	addiu	a0,a1,100
diff --git a/gas/testsuite/gas/mips/mips-gp64-fp32.d b/gas/testsuite/gas/mips/mips-gp64-fp32.d
index 39b490e..9f7540b 100644
--- a/gas/testsuite/gas/mips/mips-gp64-fp32.d
+++ b/gas/testsuite/gas/mips/mips-gp64-fp32.d
@@ -10,27 +10,27 @@ Disassembly of section .text:
 0+000 <[^>]*>:
    0:	3c041234 	lui	a0,0x1234
    4:	34845678 	ori	a0,a0,0x5678
-   8:	2784c000 	addiu	a0,gp,-16384
+   8:	27840000 	addiu	a0,gp,0
    c:	3c040000 	lui	a0,0x0
   10:	24840000 	addiu	a0,a0,0
   14:	3c040000 	lui	a0,0x0
   18:	2484015c 	addiu	a0,a0,348
   1c:	08000057 	j	15c <[^>]*>
   20:	0c000057 	jal	15c <[^>]*>
-  24:	8f84c000 	lw	a0,-16384\(gp\)
+  24:	8f840000 	lw	a0,0\(gp\)
   28:	3c040000 	lui	a0,0x0
   2c:	8c840000 	lw	a0,0\(a0\)
   30:	3c040000 	lui	a0,0x0
   34:	8c84015c 	lw	a0,348\(a0\)
-  38:	df84c000 	ld	a0,-16384\(gp\)
+  38:	df840000 	ld	a0,0\(gp\)
   3c:	3c040000 	lui	a0,0x0
   40:	dc840000 	ld	a0,0\(a0\)
   44:	3c040000 	lui	a0,0x0
   48:	dc84015c 	ld	a0,348\(a0\)
-  4c:	af84c000 	sw	a0,-16384\(gp\)
+  4c:	af840000 	sw	a0,0\(gp\)
   50:	3c010000 	lui	at,0x0
   54:	ac240000 	sw	a0,0\(at\)
-  58:	ff84c000 	sd	a0,-16384\(gp\)
+  58:	ff840000 	sd	a0,0\(gp\)
   5c:	3c010000 	lui	at,0x0
   60:	fc240000 	sd	a0,0\(at\)
   64:	3c010000 	lui	at,0x0
@@ -62,13 +62,13 @@ Disassembly of section .text:
   cc:	3c013ff0 	lui	at,0x3ff0
   d0:	44810800 	mtc1	at,\$f1
   d4:	44800000 	mtc1	zero,\$f0
-  d8:	d780c000 	ldc1	\$f0,-16384\(gp\)
+  d8:	d7800000 	ldc1	\$f0,0\(gp\)
   dc:	64a40064 	daddiu	a0,a1,100
   e0:	2c840001 	sltiu	a0,a0,1
   e4:	64a40064 	daddiu	a0,a1,100
   e8:	0004202b 	sltu	a0,zero,a0
   ec:	00a0202d 	move	a0,a1
-  f0:	2784c000 	addiu	a0,gp,-16384
+  f0:	27840000 	addiu	a0,gp,0
   f4:	3c040000 	lui	a0,0x0
   f8:	24840000 	addiu	a0,a0,0
   fc:	3c010000 	lui	at,0x0
diff --git a/gas/testsuite/gas/mips/mips-gp64-fp64.d b/gas/testsuite/gas/mips/mips-gp64-fp64.d
index 3e1bfd5..5cd5028 100644
--- a/gas/testsuite/gas/mips/mips-gp64-fp64.d
+++ b/gas/testsuite/gas/mips/mips-gp64-fp64.d
@@ -10,27 +10,27 @@ Disassembly of section .text:
 0+000 <[^>]*>:
    0:	3c041234 	lui	a0,0x1234
    4:	34845678 	ori	a0,a0,0x5678
-   8:	2784c000 	addiu	a0,gp,-16384
+   8:	27840000 	addiu	a0,gp,0
    c:	3c040000 	lui	a0,0x0
   10:	24840000 	addiu	a0,a0,0
   14:	3c040000 	lui	a0,0x0
   18:	24840160 	addiu	a0,a0,352
   1c:	08000058 	j	160 <[^>]*>
   20:	0c000058 	jal	160 <[^>]*>
-  24:	8f84c000 	lw	a0,-16384\(gp\)
+  24:	8f840000 	lw	a0,0\(gp\)
   28:	3c040000 	lui	a0,0x0
   2c:	8c840000 	lw	a0,0\(a0\)
   30:	3c040000 	lui	a0,0x0
   34:	8c840160 	lw	a0,352\(a0\)
-  38:	df84c000 	ld	a0,-16384\(gp\)
+  38:	df840000 	ld	a0,0\(gp\)
   3c:	3c040000 	lui	a0,0x0
   40:	dc840000 	ld	a0,0\(a0\)
   44:	3c040000 	lui	a0,0x0
   48:	dc840160 	ld	a0,352\(a0\)
-  4c:	af84c000 	sw	a0,-16384\(gp\)
+  4c:	af840000 	sw	a0,0\(gp\)
   50:	3c010000 	lui	at,0x0
   54:	ac240000 	sw	a0,0\(at\)
-  58:	ff84c000 	sd	a0,-16384\(gp\)
+  58:	ff840000 	sd	a0,0\(gp\)
   5c:	3c010000 	lui	at,0x0
   60:	fc240000 	sd	a0,0\(at\)
   64:	3c010000 	lui	at,0x0
@@ -62,13 +62,13 @@ Disassembly of section .text:
   cc:	3401ffc0 	li	at,0xffc0
   d0:	00010bbc 	dsll32	at,at,0xe
   d4:	44a10000 	dmtc1	at,\$f0
-  d8:	d780c000 	ldc1	\$f0,-16384\(gp\)
+  d8:	d7800000 	ldc1	\$f0,0\(gp\)
   dc:	64a40064 	daddiu	a0,a1,100
   e0:	2c840001 	sltiu	a0,a0,1
   e4:	64a40064 	daddiu	a0,a1,100
   e8:	0004202b 	sltu	a0,zero,a0
   ec:	00a0202d 	move	a0,a1
-  f0:	2784c000 	addiu	a0,gp,-16384
+  f0:	27840000 	addiu	a0,gp,0
   f4:	3c040000 	lui	a0,0x0
   f8:	24840000 	addiu	a0,a0,0
   fc:	3c010000 	lui	at,0x0
diff --git a/gas/testsuite/gas/mips/mips32-sf32.d b/gas/testsuite/gas/mips/mips32-sf32.d
index 128dec5..c4057ae 100644
--- a/gas/testsuite/gas/mips/mips32-sf32.d
+++ b/gas/testsuite/gas/mips/mips32-sf32.d
@@ -9,8 +9,8 @@
 Disassembly of section .text:
 0+0000 <[^>]*> 3c013f80 	lui	\$1,0x3f80
 0+0004 <[^>]*> 44810800 	mtc1	\$1,\$f1
-0+0008 <[^>]*> c783c000 	lwc1	\$f3,-16384\(\$28\)
-			8:.*LITERAL	\.lit4\+0x4000
+0+0008 <[^>]*> c7830000 	lwc1	\$f3,0\(\$28\)
+			8:.*LITERAL	\.lit4
 0+000c <[^>]*> 46030940 	add.s	\$f5,\$f1,\$f3
 0+0010 <[^>]*> 46003a21 	cvt.d.s	\$f8,\$f7
 0+0014 <[^>]*> 46803a21 	cvt.d.w	\$f8,\$f7