diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 210e09eb1fe..ac9aaddef4d 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,22 @@
+2006-02-04  Richard Sandiford  <richard@codesourcery.com>
+
+	* ld-mips-elf/rel32-n32.d: Adjust for changes in linker behaviour.
+	* ld-mips-elf/rel32-o32.d: Likewise.
+	* ld-mips-elf/rel64.d: Likewise.
+	* ld-mips-elf/tls-multi-got-1.got: Likewise.
+	* ld-mips-elf/tls-multi-got-1.r: Likewise.
+	* ld-mips-elf/tlsdyn-o32-1.d: Likewise.
+	* ld-mips-elf/tlsdyn-o32-1.got: Likewise.
+	* ld-mips-elf/tlsdyn-o32-2.d: Likewise.
+	* ld-mips-elf/tlsdyn-o32-2.got: Likewise.
+	* ld-mips-elf/tlsdyn-o32-3.d: Likewise.
+	* ld-mips-elf/tlsdyn-o32-3.got: Likewise.
+	* ld-mips-elf/tlsdyn-o32.d: Likewise.
+	* ld-mips-elf/tlsdyn-o32.got: Likewise.
+	* ld-mips-elf/tlslib-o32-hidden.got: Likewise.
+	* ld-mips-elf/tlslib-o32-ver.got: Likewise.
+	* ld-mips-elf/tlslib-o32.got: Likewise.
+
 2006-02-02  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* ld-i386/tlsbin.rd: Undo the last change.
diff --git a/ld/testsuite/ld-mips-elf/rel32-n32.d b/ld/testsuite/ld-mips-elf/rel32-n32.d
index 373169051f9..c071c0170c3 100644
--- a/ld/testsuite/ld-mips-elf/rel32-n32.d
+++ b/ld/testsuite/ld-mips-elf/rel32-n32.d
@@ -4,12 +4,12 @@
 #readelf: -x 5 -r
 #ld: -shared -melf32btsmipn32
 
-Relocation section '.rel.dyn' at offset 0x2c0 contains 2 entries:
+Relocation section '.rel.dyn' at offset .* contains 2 entries:
  Offset     Info    Type            Sym.Value  Sym. Name
 00000000  00000000 R_MIPS_NONE      
-000002e0  00000003 R_MIPS_REL32     
+000002d0  00000003 R_MIPS_REL32     
 
 Hex dump of section '.text':
-  0x000002d0 00000000 00000000 00000000 00000000 ................
-  0x000002e0 000002e0 00000000 00000000 00000000 ................
-  0x000002f0 00000000 00000000 00000000 00000000 ................
+  0x000002c0 00000000 00000000 00000000 00000000 ................
+  0x000002d0 000002d0 00000000 00000000 00000000 ................
+  0x000002e0 00000000 00000000 00000000 00000000 ................
diff --git a/ld/testsuite/ld-mips-elf/rel32-o32.d b/ld/testsuite/ld-mips-elf/rel32-o32.d
index 188bf3c5f56..d98bf211598 100644
--- a/ld/testsuite/ld-mips-elf/rel32-o32.d
+++ b/ld/testsuite/ld-mips-elf/rel32-o32.d
@@ -4,12 +4,12 @@
 #readelf: -x 6 -r
 #ld: -shared -melf32btsmip
 
-Relocation section '.rel.dyn' at offset 0x2d8 contains 2 entries:
+Relocation section '.rel.dyn' at offset .* contains 2 entries:
  Offset     Info    Type            Sym.Value  Sym. Name
 00000000  00000000 R_MIPS_NONE      
-00000300  00000003 R_MIPS_REL32     
+000002f0  00000003 R_MIPS_REL32     
 
 Hex dump of section '.text':
-  0x000002f0 00000000 00000000 00000000 00000000 ................
-  0x00000300 00000300 00000000 00000000 00000000 ................
-  0x00000310 00000000 00000000 00000000 00000000 ................
+  0x000002e0 00000000 00000000 00000000 00000000 ................
+  0x000002f0 000002f0 00000000 00000000 00000000 ................
+  0x00000300 00000000 00000000 00000000 00000000 ................
diff --git a/ld/testsuite/ld-mips-elf/rel64.d b/ld/testsuite/ld-mips-elf/rel64.d
index ea4da7739cc..61fbf879a5a 100644
--- a/ld/testsuite/ld-mips-elf/rel64.d
+++ b/ld/testsuite/ld-mips-elf/rel64.d
@@ -4,16 +4,16 @@
 #readelf: -x 6 -r
 #ld: -shared -melf64btsmip
 
-Relocation section '.rel.dyn' at offset 0x440 contains 2 entries:
+Relocation section '.rel.dyn' at offset .* contains 2 entries:
   Offset          Info           Type           Sym. Value    Sym. Name
 000000000000  000000000000 R_MIPS_NONE      
                     Type2: R_MIPS_NONE      
                     Type3: R_MIPS_NONE      
-000000000470  000000001203 R_MIPS_REL32     
+000000000450  000000001203 R_MIPS_REL32     
                     Type2: R_MIPS_64        
                     Type3: R_MIPS_NONE      
 
 Hex dump of section '.text':
+  0x00000440 00000000 00000000 00000000 00000000 ................
+  0x00000450 00000000 00000450 00000000 00000000 ................
   0x00000460 00000000 00000000 00000000 00000000 ................
-  0x00000470 00000000 00000470 00000000 00000000 ................
-  0x00000480 00000000 00000000 00000000 00000000 ................
diff --git a/ld/testsuite/ld-mips-elf/tls-multi-got-1.got b/ld/testsuite/ld-mips-elf/tls-multi-got-1.got
index 49b3d903f87..fb8cc665976 100644
--- a/ld/testsuite/ld-mips-elf/tls-multi-got-1.got
+++ b/ld/testsuite/ld-mips-elf/tls-multi-got-1.got
@@ -4,17 +4,17 @@
 DYNAMIC RELOCATION RECORDS
 OFFSET   TYPE              VALUE 
 00000000 R_MIPS_NONE       \*ABS\*
-00149630 R_MIPS_TLS_DTPMOD32  \*ABS\*
-0013f9a8 R_MIPS_TLS_DTPMOD32  \*ABS\*
-0014963c R_MIPS_TLS_DTPMOD32  tlsvar_gd
-00149640 R_MIPS_TLS_DTPREL32  tlsvar_gd
-0013f9b4 R_MIPS_TLS_DTPMOD32  tlsvar_gd
-0013f9b8 R_MIPS_TLS_DTPREL32  tlsvar_gd
-00149638 R_MIPS_TLS_TPREL32  tlsvar_ie
-0013f9b0 R_MIPS_TLS_TPREL32  tlsvar_ie
-0013602c R_MIPS_REL32      sym_2_8355
+001495d0 R_MIPS_TLS_DTPMOD32  \*ABS\*
+0013f948 R_MIPS_TLS_DTPMOD32  \*ABS\*
+001495dc R_MIPS_TLS_DTPMOD32  tlsvar_gd
+001495e0 R_MIPS_TLS_DTPREL32  tlsvar_gd
+0013f954 R_MIPS_TLS_DTPMOD32  tlsvar_gd
+0013f958 R_MIPS_TLS_DTPREL32  tlsvar_gd
+001495d8 R_MIPS_TLS_TPREL32  tlsvar_ie
+0013f950 R_MIPS_TLS_TPREL32  tlsvar_ie
+00135fcc R_MIPS_REL32      sym_2_8355
 #...
-00142d4c R_MIPS_REL32      sym_1_0945
+00142cec R_MIPS_REL32      sym_1_0945
 00000000 R_MIPS_NONE       \*ABS\*
 00000000 R_MIPS_NONE       \*ABS\*
 00000000 R_MIPS_NONE       \*ABS\*
@@ -40,19 +40,19 @@ OFFSET   TYPE              VALUE
 
 
 Contents of section .got:
- 122480 00000000 80000000 00000000 00000000  ................
- 122490 00000000 00000000 00000000 00000000  ................
- 1224a0 00000000 00000000 00000000 00000000  ................
- 1224b0 00000000 000e0aac 000d35f4 000d35e4  ..........5...5.
+ 122420 00000000 80000000 00000000 00000000  ................
+ 122430 00000000 00000000 00000000 00000000  ................
+ 122440 00000000 00000000 00000000 00000000  ................
+ 122450 00000000 000e0a4c 000d3594 000d3584  ..........5...5.
 #...
- 13f990 00000000 00000000 00000000 00000000  ................
- 13f9a0 00000000 00000000 00000000 00000000  ................
- 13f9b0 00000000 00000000 00000000 00000000  ................
- 13f9c0 80000000 00000000 00000000 00000000  ................
+ 13f930 00000000 00000000 00000000 00000000  ................
+ 13f940 00000000 00000000 00000000 00000000  ................
+ 13f950 00000000 00000000 00000000 00000000  ................
+ 13f960 80000000 00000000 00000000 00000000  ................
 #...
- 149600 00000000 00000000 00000000 00000000  ................
- 149610 00000000 00000000 00000000 00000000  ................
- 149620 00000000 00000000 00000000 00000000  ................
- 149630 00000000 00000000 00000000 00000000  ................
- 149640 00000000                             ....            
+ 1495a0 00000000 00000000 00000000 00000000  ................
+ 1495b0 00000000 00000000 00000000 00000000  ................
+ 1495c0 00000000 00000000 00000000 00000000  ................
+ 1495d0 00000000 00000000 00000000 00000000  ................
+ 1495e0 00000000                             ....            
 #pass
diff --git a/ld/testsuite/ld-mips-elf/tls-multi-got-1.r b/ld/testsuite/ld-mips-elf/tls-multi-got-1.r
index 84f7227d49b..6b6be78bee7 100644
--- a/ld/testsuite/ld-mips-elf/tls-multi-got-1.r
+++ b/ld/testsuite/ld-mips-elf/tls-multi-got-1.r
@@ -2,41 +2,41 @@
 Dynamic section at offset 0xec contains 19 entries:
   Tag        Type                         Name/Value
  0x00000004 \(HASH\)                       0x1ac
- 0x00000005 \(STRTAB\)                     0x71e08
- 0x00000006 \(SYMTAB\)                     0x23ae8
- 0x0000000a \(STRSZ\)                      220100 \(bytes\)
+ 0x00000005 \(STRTAB\)                     0x71db8
+ 0x00000006 \(SYMTAB\)                     0x23ad8
+ 0x0000000a \(STRSZ\)                      220091 \(bytes\)
  0x0000000b \(SYMENT\)                     16 \(bytes\)
  0x00000015 \(DEBUG\)                      0x0
- 0x00000003 \(PLTGOT\)                     0x122480
- 0x00000011 \(REL\)                        0xa79cc
+ 0x00000003 \(PLTGOT\)                     0x122420
+ 0x00000011 \(REL\)                        0xa7974
  0x00000012 \(RELSZ\)                      160072 \(bytes\)
  0x00000013 \(RELENT\)                     8 \(bytes\)
  0x70000001 \(MIPS_RLD_VERSION\)           1
  0x70000005 \(MIPS_FLAGS\)                 NOTPOT
  0x70000006 \(MIPS_BASE_ADDRESS\)          0
  0x7000000a \(MIPS_LOCAL_GOTNO\)           13
- 0x70000011 \(MIPS_SYMTABNO\)              20018
- 0x70000012 \(MIPS_UNREFEXTNO\)            15
- 0x70000013 \(MIPS_GOTSYM\)                0x12
+ 0x70000011 \(MIPS_SYMTABNO\)              20014
+ 0x70000012 \(MIPS_UNREFEXTNO\)            11
+ 0x70000013 \(MIPS_GOTSYM\)                0xe
  0x0000001e \(FLAGS\)                      STATIC_TLS
  0x00000000 \(NULL\)                       0x0
 
 Relocation section '\.rel\.dyn' at offset 0x[0-9a-f]+ contains 20031 entries:
  Offset     Info    Type            Sym.Value  Sym. Name
 00000000  00000000 R_MIPS_NONE      
-00149630  00000026 R_MIPS_TLS_DTPMOD
-0013f9a8  00000026 R_MIPS_TLS_DTPMOD
-0014963c  00000a26 R_MIPS_TLS_DTPMOD 00000000   tlsvar_gd
-00149640  00000a27 R_MIPS_TLS_DTPREL 00000000   tlsvar_gd
-0013f9b4  00000a26 R_MIPS_TLS_DTPMOD 00000000   tlsvar_gd
-0013f9b8  00000a27 R_MIPS_TLS_DTPREL 00000000   tlsvar_gd
-00149638  0000102f R_MIPS_TLS_TPREL3 00000004   tlsvar_ie
-0013f9b0  0000102f R_MIPS_TLS_TPREL3 00000004   tlsvar_ie
-0013602c  00001203 R_MIPS_REL32      000e0aac   sym_2_8355
-0014250c  00001303 R_MIPS_REL32      000d35f4   sym_1_4745
+001495d0  00000026 R_MIPS_TLS_DTPMOD
+0013f948  00000026 R_MIPS_TLS_DTPMOD
+001495dc  00000626 R_MIPS_TLS_DTPMOD 00000000   tlsvar_gd
+001495e0  00000627 R_MIPS_TLS_DTPREL 00000000   tlsvar_gd
+0013f954  00000626 R_MIPS_TLS_DTPMOD 00000000   tlsvar_gd
+0013f958  00000627 R_MIPS_TLS_DTPREL 00000000   tlsvar_gd
+001495d8  00000c2f R_MIPS_TLS_TPREL3 00000004   tlsvar_ie
+0013f950  00000c2f R_MIPS_TLS_TPREL3 00000004   tlsvar_ie
+00135fcc  00000e03 R_MIPS_REL32      000e0a4c   sym_2_8355
+001424ac  00000f03 R_MIPS_REL32      000d3594   sym_1_4745
 #...
-00136a10  004e3003 R_MIPS_REL32      000da990   sym_2_2140
-00142d4c  004e3103 R_MIPS_REL32      000cfa94   sym_1_0945
+001369b0  004e2c03 R_MIPS_REL32      000da930   sym_2_2140
+00142cec  004e2d03 R_MIPS_REL32      000cfa34   sym_1_0945
 00000000  00000000 R_MIPS_NONE      
 00000000  00000000 R_MIPS_NONE      
 00000000  00000000 R_MIPS_NONE      
diff --git a/ld/testsuite/ld-mips-elf/tlsdyn-o32-1.d b/ld/testsuite/ld-mips-elf/tlsdyn-o32-1.d
index 6edfa9f85af..80da24763f4 100644
--- a/ld/testsuite/ld-mips-elf/tlsdyn-o32-1.d
+++ b/ld/testsuite/ld-mips-elf/tlsdyn-o32-1.d
@@ -5,7 +5,7 @@ Disassembly of section .text:
 
 .* <__start>:
   .*:	3c1c0fc0 	lui	gp,0xfc0
-  .*:	279c7b60 	addiu	gp,gp,31584
+  .*:	279c7b70 	addiu	gp,gp,31600
   .*:	0399e021 	addu	gp,gp,t9
   .*:	27bdfff0 	addiu	sp,sp,-16
   .*:	afbe0008 	sw	s8,8\(sp\)
@@ -55,7 +55,7 @@ Disassembly of section .text:
 
 .* <other>:
   .*:	3c1c0fc0 	lui	gp,0xfc0
-  .*:	279c7aa0 	addiu	gp,gp,31392
+  .*:	279c7ab0 	addiu	gp,gp,31408
   .*:	0399e021 	addu	gp,gp,t9
   .*:	27bdfff0 	addiu	sp,sp,-16
   .*:	afbe0008 	sw	s8,8\(sp\)
diff --git a/ld/testsuite/ld-mips-elf/tlsdyn-o32-1.got b/ld/testsuite/ld-mips-elf/tlsdyn-o32-1.got
index b19f4d86c9a..8f5084fb51e 100644
--- a/ld/testsuite/ld-mips-elf/tlsdyn-o32-1.got
+++ b/ld/testsuite/ld-mips-elf/tlsdyn-o32-1.got
@@ -4,16 +4,16 @@
 DYNAMIC RELOCATION RECORDS
 OFFSET   TYPE              VALUE 
 00000000 R_MIPS_NONE       \*ABS\*
-10000054 R_MIPS_TLS_DTPMOD32  tlsbin_gd
-10000058 R_MIPS_TLS_DTPREL32  tlsbin_gd
-10000048 R_MIPS_TLS_DTPMOD32  tlsvar_gd
-1000004c R_MIPS_TLS_DTPREL32  tlsvar_gd
-10000050 R_MIPS_TLS_TPREL32  tlsvar_ie
-1000005c R_MIPS_TLS_TPREL32  tlsbin_ie
+10000044 R_MIPS_TLS_DTPMOD32  tlsbin_gd
+10000048 R_MIPS_TLS_DTPREL32  tlsbin_gd
+10000038 R_MIPS_TLS_DTPMOD32  tlsvar_gd
+1000003c R_MIPS_TLS_DTPREL32  tlsvar_gd
+10000040 R_MIPS_TLS_TPREL32  tlsvar_ie
+1000004c R_MIPS_TLS_TPREL32  tlsbin_ie
 
 
 Contents of section .got:
- 10000020 00000000 80000000 00000000 00000000  ................
- 10000030 00000000 00000000 00000000 0040055c  .............@..
- 10000040 00000001 00000000 00000000 00000000  ................
- 10000050 00000000 00000000 00000000 00000000  ................
+ 10000010 00000000 80000000 00000000 00000000  ................
+ 10000020 00000000 00000000 00000000 0040053c  .............@..
+ 10000030 00000001 00000000 00000000 00000000  ................
+ 10000040 00000000 00000000 00000000 00000000  ................
diff --git a/ld/testsuite/ld-mips-elf/tlsdyn-o32-2.d b/ld/testsuite/ld-mips-elf/tlsdyn-o32-2.d
index 6edfa9f85af..00965208dc0 100644
--- a/ld/testsuite/ld-mips-elf/tlsdyn-o32-2.d
+++ b/ld/testsuite/ld-mips-elf/tlsdyn-o32-2.d
@@ -5,26 +5,26 @@ Disassembly of section .text:
 
 .* <__start>:
   .*:	3c1c0fc0 	lui	gp,0xfc0
-  .*:	279c7b60 	addiu	gp,gp,31584
+  .*:	279c7b70 	addiu	gp,gp,31600
   .*:	0399e021 	addu	gp,gp,t9
   .*:	27bdfff0 	addiu	sp,sp,-16
   .*:	afbe0008 	sw	s8,8\(sp\)
   .*:	03a0f021 	move	s8,sp
   .*:	afbc0000 	sw	gp,0\(sp\)
-  .*:	8f99802c 	lw	t9,-32724\(gp\)
-  .*:	27848044 	addiu	a0,gp,-32700
+  .*:	8f998030 	lw	t9,-32720\(gp\)
+  .*:	27848048 	addiu	a0,gp,-32696
   .*:	0320f809 	jalr	t9
   .*:	00000000 	nop
   .*:	8fdc0000 	lw	gp,0\(s8\)
   .*:	00000000 	nop
-  .*:	8f99802c 	lw	t9,-32724\(gp\)
-  .*:	27848038 	addiu	a0,gp,-32712
+  .*:	8f998030 	lw	t9,-32720\(gp\)
+  .*:	2784803c 	addiu	a0,gp,-32708
   .*:	0320f809 	jalr	t9
   .*:	00000000 	nop
   .*:	8fdc0000 	lw	gp,0\(s8\)
   .*:	00000000 	nop
-  .*:	8f99802c 	lw	t9,-32724\(gp\)
-  .*:	27848030 	addiu	a0,gp,-32720
+  .*:	8f998030 	lw	t9,-32720\(gp\)
+  .*:	27848034 	addiu	a0,gp,-32716
   .*:	0320f809 	jalr	t9
   .*:	00000000 	nop
   .*:	8fdc0000 	lw	gp,0\(s8\)
@@ -33,10 +33,10 @@ Disassembly of section .text:
   .*:	24638000 	addiu	v1,v1,-32768
   .*:	00621821 	addu	v1,v1,v0
   .*:	7c02283b 	rdhwr	v0,\$5
-  .*:	8f83804c 	lw	v1,-32692\(gp\)
+  .*:	8f838050 	lw	v1,-32688\(gp\)
   .*:	00000000 	nop
   .*:	00621821 	addu	v1,v1,v0
-  .*:	8f838040 	lw	v1,-32704\(gp\)
+  .*:	8f838044 	lw	v1,-32700\(gp\)
   .*:	00000000 	nop
   .*:	00621821 	addu	v1,v1,v0
   .*:	7c02283b 	rdhwr	v0,\$5
@@ -55,26 +55,26 @@ Disassembly of section .text:
 
 .* <other>:
   .*:	3c1c0fc0 	lui	gp,0xfc0
-  .*:	279c7aa0 	addiu	gp,gp,31392
+  .*:	279c7ab0 	addiu	gp,gp,31408
   .*:	0399e021 	addu	gp,gp,t9
   .*:	27bdfff0 	addiu	sp,sp,-16
   .*:	afbe0008 	sw	s8,8\(sp\)
   .*:	03a0f021 	move	s8,sp
   .*:	afbc0000 	sw	gp,0\(sp\)
-  .*:	8f99802c 	lw	t9,-32724\(gp\)
-  .*:	27848044 	addiu	a0,gp,-32700
+  .*:	8f998030 	lw	t9,-32720\(gp\)
+  .*:	27848048 	addiu	a0,gp,-32696
   .*:	0320f809 	jalr	t9
   .*:	00000000 	nop
   .*:	8fdc0000 	lw	gp,0\(s8\)
   .*:	00000000 	nop
-  .*:	8f99802c 	lw	t9,-32724\(gp\)
-  .*:	27848038 	addiu	a0,gp,-32712
+  .*:	8f998030 	lw	t9,-32720\(gp\)
+  .*:	2784803c 	addiu	a0,gp,-32708
   .*:	0320f809 	jalr	t9
   .*:	00000000 	nop
   .*:	8fdc0000 	lw	gp,0\(s8\)
   .*:	00000000 	nop
-  .*:	8f99802c 	lw	t9,-32724\(gp\)
-  .*:	27848030 	addiu	a0,gp,-32720
+  .*:	8f998030 	lw	t9,-32720\(gp\)
+  .*:	27848034 	addiu	a0,gp,-32716
   .*:	0320f809 	jalr	t9
   .*:	00000000 	nop
   .*:	8fdc0000 	lw	gp,0\(s8\)
@@ -83,10 +83,10 @@ Disassembly of section .text:
   .*:	24638000 	addiu	v1,v1,-32768
   .*:	00621821 	addu	v1,v1,v0
   .*:	7c02283b 	rdhwr	v0,\$5
-  .*:	8f83804c 	lw	v1,-32692\(gp\)
+  .*:	8f838050 	lw	v1,-32688\(gp\)
   .*:	00000000 	nop
   .*:	00621821 	addu	v1,v1,v0
-  .*:	8f838040 	lw	v1,-32704\(gp\)
+  .*:	8f838044 	lw	v1,-32700\(gp\)
   .*:	00000000 	nop
   .*:	00621821 	addu	v1,v1,v0
   .*:	7c02283b 	rdhwr	v0,\$5
diff --git a/ld/testsuite/ld-mips-elf/tlsdyn-o32-2.got b/ld/testsuite/ld-mips-elf/tlsdyn-o32-2.got
index 6ea06d3dab2..9f8b3ba1cf2 100644
--- a/ld/testsuite/ld-mips-elf/tlsdyn-o32-2.got
+++ b/ld/testsuite/ld-mips-elf/tlsdyn-o32-2.got
@@ -4,17 +4,17 @@
 DYNAMIC RELOCATION RECORDS
 OFFSET   TYPE              VALUE 
 00000000 R_MIPS_NONE       \*ABS\*
-10000054 R_MIPS_TLS_DTPMOD32  tlsbin_gd
-10000058 R_MIPS_TLS_DTPREL32  tlsbin_gd
-10000048 R_MIPS_TLS_DTPMOD32  tlsvar_gd
-1000004c R_MIPS_TLS_DTPREL32  tlsvar_gd
-10000050 R_MIPS_TLS_TPREL32  tlsvar_ie
-1000005c R_MIPS_TLS_TPREL32  tlsbin_ie
+10000048 R_MIPS_TLS_DTPMOD32  tlsbin_gd
+1000004c R_MIPS_TLS_DTPREL32  tlsbin_gd
+1000003c R_MIPS_TLS_DTPMOD32  tlsvar_gd
+10000040 R_MIPS_TLS_DTPREL32  tlsvar_gd
+10000044 R_MIPS_TLS_TPREL32  tlsvar_ie
+10000050 R_MIPS_TLS_TPREL32  tlsbin_ie
 
 
 Contents of section .got:
- 10000020 00000000 80000000 00000000 00000000  ................
- 10000030 00000000 00000000 00000000 0040055c  .............@..
- 10000040 00000001 00000000 00000000 00000000  ................
+ 10000010 00000000 80000000 00000000 00000000  ................
+ 10000020 00000000 00000000 00000000 00000000  ................
+ 10000030 0040053c 00000001 00000000 00000000  .@.<............
+ 10000040 00000000 00000000 00000000 00000000  ................
  10000050 00000000 00000000 00000000 00000000  ................
- 10000060 00000000 00000000 00000000           ............    
diff --git a/ld/testsuite/ld-mips-elf/tlsdyn-o32-3.d b/ld/testsuite/ld-mips-elf/tlsdyn-o32-3.d
index 22b533ea5eb..ae671e8d277 100644
--- a/ld/testsuite/ld-mips-elf/tlsdyn-o32-3.d
+++ b/ld/testsuite/ld-mips-elf/tlsdyn-o32-3.d
@@ -5,26 +5,26 @@ Disassembly of section .text:
 
 .* <other>:
   .*:	3c1c0fc0 	lui	gp,0xfc0
-  .*:	279c7b60 	addiu	gp,gp,31584
+  .*:	279c7b70 	addiu	gp,gp,31600
   .*:	0399e021 	addu	gp,gp,t9
   .*:	27bdfff0 	addiu	sp,sp,-16
   .*:	afbe0008 	sw	s8,8\(sp\)
   .*:	03a0f021 	move	s8,sp
   .*:	afbc0000 	sw	gp,0\(sp\)
-  .*:	8f99802c 	lw	t9,-32724\(gp\)
-  .*:	27848044 	addiu	a0,gp,-32700
+  .*:	8f998030 	lw	t9,-32720\(gp\)
+  .*:	27848048 	addiu	a0,gp,-32696
   .*:	0320f809 	jalr	t9
   .*:	00000000 	nop
   .*:	8fdc0000 	lw	gp,0\(s8\)
   .*:	00000000 	nop
-  .*:	8f99802c 	lw	t9,-32724\(gp\)
-  .*:	27848038 	addiu	a0,gp,-32712
+  .*:	8f998030 	lw	t9,-32720\(gp\)
+  .*:	2784803c 	addiu	a0,gp,-32708
   .*:	0320f809 	jalr	t9
   .*:	00000000 	nop
   .*:	8fdc0000 	lw	gp,0\(s8\)
   .*:	00000000 	nop
-  .*:	8f99802c 	lw	t9,-32724\(gp\)
-  .*:	27848030 	addiu	a0,gp,-32720
+  .*:	8f998030 	lw	t9,-32720\(gp\)
+  .*:	27848034 	addiu	a0,gp,-32716
   .*:	0320f809 	jalr	t9
   .*:	00000000 	nop
   .*:	8fdc0000 	lw	gp,0\(s8\)
@@ -33,10 +33,10 @@ Disassembly of section .text:
   .*:	24638000 	addiu	v1,v1,-32768
   .*:	00621821 	addu	v1,v1,v0
   .*:	7c02283b 	rdhwr	v0,\$5
-  .*:	8f83804c 	lw	v1,-32692\(gp\)
+  .*:	8f838050 	lw	v1,-32688\(gp\)
   .*:	00000000 	nop
   .*:	00621821 	addu	v1,v1,v0
-  .*:	8f838040 	lw	v1,-32704\(gp\)
+  .*:	8f838044 	lw	v1,-32700\(gp\)
   .*:	00000000 	nop
   .*:	00621821 	addu	v1,v1,v0
   .*:	7c02283b 	rdhwr	v0,\$5
@@ -51,26 +51,26 @@ Disassembly of section .text:
 
 .* <__start>:
   .*:	3c1c0fc0 	lui	gp,0xfc0
-  .*:	279c7ab0 	addiu	gp,gp,31408
+  .*:	279c7ac0 	addiu	gp,gp,31424
   .*:	0399e021 	addu	gp,gp,t9
   .*:	27bdfff0 	addiu	sp,sp,-16
   .*:	afbe0008 	sw	s8,8\(sp\)
   .*:	03a0f021 	move	s8,sp
   .*:	afbc0000 	sw	gp,0\(sp\)
-  .*:	8f99802c 	lw	t9,-32724\(gp\)
-  .*:	27848044 	addiu	a0,gp,-32700
+  .*:	8f998030 	lw	t9,-32720\(gp\)
+  .*:	27848048 	addiu	a0,gp,-32696
   .*:	0320f809 	jalr	t9
   .*:	00000000 	nop
   .*:	8fdc0000 	lw	gp,0\(s8\)
   .*:	00000000 	nop
-  .*:	8f99802c 	lw	t9,-32724\(gp\)
-  .*:	27848038 	addiu	a0,gp,-32712
+  .*:	8f998030 	lw	t9,-32720\(gp\)
+  .*:	2784803c 	addiu	a0,gp,-32708
   .*:	0320f809 	jalr	t9
   .*:	00000000 	nop
   .*:	8fdc0000 	lw	gp,0\(s8\)
   .*:	00000000 	nop
-  .*:	8f99802c 	lw	t9,-32724\(gp\)
-  .*:	27848030 	addiu	a0,gp,-32720
+  .*:	8f998030 	lw	t9,-32720\(gp\)
+  .*:	27848034 	addiu	a0,gp,-32716
   .*:	0320f809 	jalr	t9
   .*:	00000000 	nop
   .*:	8fdc0000 	lw	gp,0\(s8\)
@@ -79,10 +79,10 @@ Disassembly of section .text:
   .*:	24638000 	addiu	v1,v1,-32768
   .*:	00621821 	addu	v1,v1,v0
   .*:	7c02283b 	rdhwr	v0,\$5
-  .*:	8f83804c 	lw	v1,-32692\(gp\)
+  .*:	8f838050 	lw	v1,-32688\(gp\)
   .*:	00000000 	nop
   .*:	00621821 	addu	v1,v1,v0
-  .*:	8f838040 	lw	v1,-32704\(gp\)
+  .*:	8f838044 	lw	v1,-32700\(gp\)
   .*:	00000000 	nop
   .*:	00621821 	addu	v1,v1,v0
   .*:	7c02283b 	rdhwr	v0,\$5
diff --git a/ld/testsuite/ld-mips-elf/tlsdyn-o32-3.got b/ld/testsuite/ld-mips-elf/tlsdyn-o32-3.got
index 5759b9cf28b..73429523616 100644
--- a/ld/testsuite/ld-mips-elf/tlsdyn-o32-3.got
+++ b/ld/testsuite/ld-mips-elf/tlsdyn-o32-3.got
@@ -4,17 +4,17 @@
 DYNAMIC RELOCATION RECORDS
 OFFSET   TYPE              VALUE 
 00000000 R_MIPS_NONE       \*ABS\*
-10000054 R_MIPS_TLS_DTPMOD32  tlsbin_gd
-10000058 R_MIPS_TLS_DTPREL32  tlsbin_gd
-10000048 R_MIPS_TLS_DTPMOD32  tlsvar_gd
-1000004c R_MIPS_TLS_DTPREL32  tlsvar_gd
-10000050 R_MIPS_TLS_TPREL32  tlsvar_ie
-1000005c R_MIPS_TLS_TPREL32  tlsbin_ie
+10000048 R_MIPS_TLS_DTPMOD32  tlsbin_gd
+1000004c R_MIPS_TLS_DTPREL32  tlsbin_gd
+1000003c R_MIPS_TLS_DTPMOD32  tlsvar_gd
+10000040 R_MIPS_TLS_DTPREL32  tlsvar_gd
+10000044 R_MIPS_TLS_TPREL32  tlsvar_ie
+10000050 R_MIPS_TLS_TPREL32  tlsbin_ie
 
 
 Contents of section .got:
- 10000020 00000000 80000000 00000000 00000000  ................
- 10000030 00000000 00000000 00000000 0040060c  .............@..
- 10000040 00000001 00000000 00000000 00000000  ................
+ 10000010 00000000 80000000 00000000 00000000  ................
+ 10000020 00000000 00000000 00000000 00000000  ................
+ 10000030 004005ec 00000001 00000000 00000000  .@..............
+ 10000040 00000000 00000000 00000000 00000000  ................
  10000050 00000000 00000000 00000000 00000000  ................
- 10000060 00000000 00000000 00000000           ............    
diff --git a/ld/testsuite/ld-mips-elf/tlsdyn-o32.d b/ld/testsuite/ld-mips-elf/tlsdyn-o32.d
index 3bba2c80edb..5fb13a09d5c 100644
--- a/ld/testsuite/ld-mips-elf/tlsdyn-o32.d
+++ b/ld/testsuite/ld-mips-elf/tlsdyn-o32.d
@@ -5,7 +5,7 @@ Disassembly of section .text:
 
 .* <__start>:
   .*:	3c1c0fc0 	lui	gp,0xfc0
-  .*:	279c7b50 	addiu	gp,gp,31568
+  .*:	279c7bb0 	addiu	gp,gp,31664
   .*:	0399e021 	addu	gp,gp,t9
   .*:	27bdfff0 	addiu	sp,sp,-16
   .*:	afbe0008 	sw	s8,8\(sp\)
diff --git a/ld/testsuite/ld-mips-elf/tlsdyn-o32.got b/ld/testsuite/ld-mips-elf/tlsdyn-o32.got
index aaed4acff6a..206fd241985 100644
--- a/ld/testsuite/ld-mips-elf/tlsdyn-o32.got
+++ b/ld/testsuite/ld-mips-elf/tlsdyn-o32.got
@@ -4,16 +4,16 @@ tmpdir/tls-dynamic-o32:     file format elf32-tradbigmips
 DYNAMIC RELOCATION RECORDS
 OFFSET   TYPE              VALUE 
 00000000 R_MIPS_NONE       \*ABS\*
-10000048 R_MIPS_TLS_DTPMOD32  tlsbin_gd
-1000004c R_MIPS_TLS_DTPREL32  tlsbin_gd
-10000058 R_MIPS_TLS_DTPMOD32  tlsvar_gd
-1000005c R_MIPS_TLS_DTPREL32  tlsvar_gd
-10000054 R_MIPS_TLS_TPREL32  tlsbin_ie
-10000050 R_MIPS_TLS_TPREL32  tlsvar_ie
+10000038 R_MIPS_TLS_DTPMOD32  tlsbin_gd
+1000003c R_MIPS_TLS_DTPREL32  tlsbin_gd
+10000048 R_MIPS_TLS_DTPMOD32  tlsvar_gd
+1000004c R_MIPS_TLS_DTPREL32  tlsvar_gd
+10000044 R_MIPS_TLS_TPREL32  tlsbin_ie
+10000040 R_MIPS_TLS_TPREL32  tlsvar_ie
 
 
 Contents of section .got:
- 10000020 00000000 80000000 00000000 00000000  ................
- 10000030 00000000 00000000 00000000 0040056c  ................
- 10000040 00000001 00000000 00000000 00000000  ................
- 10000050 00000000 00000000 00000000 00000000  ................
+ 10000010 00000000 80000000 00000000 00000000  ................
+ 10000020 00000000 00000000 00000000 004004fc  ................
+ 10000030 00000001 00000000 00000000 00000000  ................
+ 10000040 00000000 00000000 00000000 00000000  ................
diff --git a/ld/testsuite/ld-mips-elf/tlslib-o32-hidden.got b/ld/testsuite/ld-mips-elf/tlslib-o32-hidden.got
index d642805e29f..a897ec462ed 100644
--- a/ld/testsuite/ld-mips-elf/tlslib-o32-hidden.got
+++ b/ld/testsuite/ld-mips-elf/tlslib-o32-hidden.got
@@ -4,13 +4,13 @@
 DYNAMIC RELOCATION RECORDS
 OFFSET   TYPE              VALUE 
 00000000 R_MIPS_NONE       \*ABS\*
-0004043c R_MIPS_TLS_DTPMOD32  \*ABS\*
-00040434 R_MIPS_TLS_DTPMOD32  \*ABS\*
-00040430 R_MIPS_TLS_TPREL32  \*ABS\*
+000403fc R_MIPS_TLS_DTPMOD32  \*ABS\*
+000403f4 R_MIPS_TLS_DTPMOD32  \*ABS\*
+000403f0 R_MIPS_TLS_TPREL32  \*ABS\*
 
 
 Contents of section .got:
- 40410 00000000 80000000 00000000 00000000  ................
- 40420 00000000 00000000 00000000 000003e0  ................
- 40430 00000008 00000000 00000000 00000000  ................
- 40440 ffff8004                             ....            
+ 403d0 00000000 80000000 00000000 00000000  ................
+ 403e0 00000000 00000000 00000000 000003a0  ................
+ 403f0 00000008 00000000 00000000 00000000  ................
+ 40400 ffff8004                             ....            
diff --git a/ld/testsuite/ld-mips-elf/tlslib-o32-ver.got b/ld/testsuite/ld-mips-elf/tlslib-o32-ver.got
index 60198b7880a..94de65320da 100644
--- a/ld/testsuite/ld-mips-elf/tlslib-o32-ver.got
+++ b/ld/testsuite/ld-mips-elf/tlslib-o32-ver.got
@@ -4,14 +4,14 @@
 DYNAMIC RELOCATION RECORDS
 OFFSET   TYPE              VALUE 
 00000000 R_MIPS_NONE       \*ABS\*
-000405e4 R_MIPS_TLS_DTPMOD32  \*ABS\*
-000405ec R_MIPS_TLS_DTPMOD32  tlsvar_gd
-000405f0 R_MIPS_TLS_DTPREL32  tlsvar_gd
-000405e0 R_MIPS_TLS_TPREL32  tlsvar_ie
+00040574 R_MIPS_TLS_DTPMOD32  \*ABS\*
+0004057c R_MIPS_TLS_DTPMOD32  tlsvar_gd
+00040580 R_MIPS_TLS_DTPREL32  tlsvar_gd
+00040570 R_MIPS_TLS_TPREL32  tlsvar_ie
 
 
 Contents of section .got:
- 405c0 00000000 80000000 00000000 00000000  ................
- 405d0 00000000 00000000 00000000 00000590  ................
- 405e0 00000000 00000000 00000000 00000000  ................
- 405f0 00000000                             ....            
+ 40550 00000000 80000000 00000000 00000000  ................
+ 40560 00000000 00000000 00000000 00000520  ................
+ 40570 00000000 00000000 00000000 00000000  ................
+ 40580 00000000                             ....            
diff --git a/ld/testsuite/ld-mips-elf/tlslib-o32.got b/ld/testsuite/ld-mips-elf/tlslib-o32.got
index cb49c2b592d..1831eb26e34 100644
--- a/ld/testsuite/ld-mips-elf/tlslib-o32.got
+++ b/ld/testsuite/ld-mips-elf/tlslib-o32.got
@@ -4,14 +4,14 @@ tmpdir/tlslib-o32.so:     file format elf32-tradbigmips
 DYNAMIC RELOCATION RECORDS
 OFFSET   TYPE              VALUE 
 00000000 R_MIPS_NONE       \*ABS\*
-00040534 R_MIPS_TLS_DTPMOD32  \*ABS\*
-0004053c R_MIPS_TLS_DTPMOD32  tlsvar_gd
-00040540 R_MIPS_TLS_DTPREL32  tlsvar_gd
-00040530 R_MIPS_TLS_TPREL32  tlsvar_ie
+000404d4 R_MIPS_TLS_DTPMOD32  \*ABS\*
+000404dc R_MIPS_TLS_DTPMOD32  tlsvar_gd
+000404e0 R_MIPS_TLS_DTPREL32  tlsvar_gd
+000404d0 R_MIPS_TLS_TPREL32  tlsvar_ie
 
 
 Contents of section .got:
- 40510 00000000 80000000 00000000 00000000  ................
- 40520 00000000 00000000 00000000 000004e0  ................
- 40530 00000000 00000000 00000000 00000000  ................
- 40540 00000000                             ....            
+ 404b0 00000000 80000000 00000000 00000000  ................
+ 404c0 00000000 00000000 00000000 00000480  ................
+ 404d0 00000000 00000000 00000000 00000000  ................
+ 404e0 00000000                             ....