From: Richard Sandiford <rdsandiford@googlemail.com>
Date: Tue, 24 Sep 2013 22:15:38 +0000 (+0000)
Subject: bfd/
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2f9efdfcdbf14a135da0a47274884ba788817fda;p=binutils-gdb.git

bfd/
2013-09-24  Gregory Fong  <gregory.0xf0@gmail.com>

	* elfxx-mips.c (mips_elf_create_got_section): Hide
	_GLOBAL_OFFSET_TABLE_.

ld/testsuite/
2013-09-24  Gregory Fong  <gregory.0xf0@gmail.com>

	* ld-mips-elf/eh-frame5.d, ld-mips-elf/jalx-2.dd,
	ld-mips-elf/mips-elf.exp, ld-mips-elf/mips16-pic-2.ad,
	ld-mips-elf/mips16-pic-2.nd, ld-mips-elf/pic-and-nonpic-3a.dd,
	ld-mips-elf/pic-and-nonpic-3b.ad, ld-mips-elf/pic-and-nonpic-3b.dd,
	ld-mips-elf/pic-and-nonpic-3b.nd, ld-mips-elf/pic-and-nonpic-4b.ad,
	ld-mips-elf/pic-and-nonpic-4b.nd, ld-mips-elf/pic-and-nonpic-4b.rd,
	ld-mips-elf/pic-and-nonpic-5b.ad, ld-mips-elf/pic-and-nonpic-5b.nd,
	ld-mips-elf/pic-and-nonpic-6-n32.ad,
	ld-mips-elf/pic-and-nonpic-6-n32.dd,
	ld-mips-elf/pic-and-nonpic-6-n32.nd,
	ld-mips-elf/pic-and-nonpic-6-n64.ad,
	ld-mips-elf/pic-and-nonpic-6-n64.dd,
	ld-mips-elf/pic-and-nonpic-6-n64.nd,
	ld-mips-elf/pic-and-nonpic-6-o32.ad,
	ld-mips-elf/pic-and-nonpic-6-o32.dd,
	ld-mips-elf/pic-and-nonpic-6-o32.nd, ld-mips-elf/rel32-n32.d,
	ld-mips-elf/rel32-o32.d, ld-mips-elf/rel64.d,
	ld-mips-elf/tls-multi-got-1.got, ld-mips-elf/tls-multi-got-1.r,
	ld-mips-elf/tlsdyn-o32-1.d, ld-mips-elf/tlsdyn-o32-1.got,
	ld-mips-elf/tlsdyn-o32-2.d, ld-mips-elf/tlsdyn-o32-2.got,
	ld-mips-elf/tlsdyn-o32-3.d, ld-mips-elf/tlsdyn-o32-3.got,
	ld-mips-elf/tlsdyn-o32.d, ld-mips-elf/tlsdyn-o32.got,
	ld-mips-elf/tlslib-o32-ver.got, ld-mips-elf/tlslib-o32.got: Update
	for removal of _GLOBAL_OFFSET_TABLE_ from .dynsym.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index ea5ea280264..335bc7f06e2 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-24  Gregory Fong  <gregory.0xf0@gmail.com>
+
+	* elfxx-mips.c (mips_elf_create_got_section): Hide
+	_GLOBAL_OFFSET_TABLE_.
+
 2013-09-24  Alan Modra  <amodra@gmail.com>
 
 	* elf32-mips.c (ELF_OSABI): Undef for vxworks.
diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c
index 5d7a7d706fe..d7498e19b44 100644
--- a/bfd/elfxx-mips.c
+++ b/bfd/elfxx-mips.c
@@ -5017,6 +5017,7 @@ mips_elf_create_got_section (bfd *abfd, struct bfd_link_info *info)
   h->non_elf = 0;
   h->def_regular = 1;
   h->type = STT_OBJECT;
+  h->other = (h->other & ~ELF_ST_VISIBILITY (-1)) | STV_HIDDEN;
   elf_hash_table (info)->hgot = h;
 
   if (info->shared
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 04a0af10889..da06c70d0d2 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,30 @@
+2013-09-24  Gregory Fong  <gregory.0xf0@gmail.com>
+
+	* ld-mips-elf/eh-frame5.d, ld-mips-elf/jalx-2.dd,
+	ld-mips-elf/mips-elf.exp, ld-mips-elf/mips16-pic-2.ad,
+	ld-mips-elf/mips16-pic-2.nd, ld-mips-elf/pic-and-nonpic-3a.dd,
+	ld-mips-elf/pic-and-nonpic-3b.ad, ld-mips-elf/pic-and-nonpic-3b.dd,
+	ld-mips-elf/pic-and-nonpic-3b.nd, ld-mips-elf/pic-and-nonpic-4b.ad,
+	ld-mips-elf/pic-and-nonpic-4b.nd, ld-mips-elf/pic-and-nonpic-4b.rd,
+	ld-mips-elf/pic-and-nonpic-5b.ad, ld-mips-elf/pic-and-nonpic-5b.nd,
+	ld-mips-elf/pic-and-nonpic-6-n32.ad,
+	ld-mips-elf/pic-and-nonpic-6-n32.dd,
+	ld-mips-elf/pic-and-nonpic-6-n32.nd,
+	ld-mips-elf/pic-and-nonpic-6-n64.ad,
+	ld-mips-elf/pic-and-nonpic-6-n64.dd,
+	ld-mips-elf/pic-and-nonpic-6-n64.nd,
+	ld-mips-elf/pic-and-nonpic-6-o32.ad,
+	ld-mips-elf/pic-and-nonpic-6-o32.dd,
+	ld-mips-elf/pic-and-nonpic-6-o32.nd, ld-mips-elf/rel32-n32.d,
+	ld-mips-elf/rel32-o32.d, ld-mips-elf/rel64.d,
+	ld-mips-elf/tls-multi-got-1.got, ld-mips-elf/tls-multi-got-1.r,
+	ld-mips-elf/tlsdyn-o32-1.d, ld-mips-elf/tlsdyn-o32-1.got,
+	ld-mips-elf/tlsdyn-o32-2.d, ld-mips-elf/tlsdyn-o32-2.got,
+	ld-mips-elf/tlsdyn-o32-3.d, ld-mips-elf/tlsdyn-o32-3.got,
+	ld-mips-elf/tlsdyn-o32.d, ld-mips-elf/tlsdyn-o32.got,
+	ld-mips-elf/tlslib-o32-ver.got, ld-mips-elf/tlslib-o32.got: Update
+	for removal of _GLOBAL_OFFSET_TABLE_ from .dynsym.
+
 2013-09-18  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
 
 	* ld-aarch64/eh-frame.d: Update expected output to allow for
diff --git a/ld/testsuite/ld-mips-elf/eh-frame5.d b/ld/testsuite/ld-mips-elf/eh-frame5.d
index 91124661477..e079cbc93ed 100644
--- a/ld/testsuite/ld-mips-elf/eh-frame5.d
+++ b/ld/testsuite/ld-mips-elf/eh-frame5.d
@@ -1,5 +1,5 @@
 
-Relocation section '.rel.dyn' at offset 0x101dc contains 8 entries:
+Relocation section '.rel.dyn' at offset 0x101b4 contains 8 entries:
  Offset     Info    Type            Sym.Value  Sym. Name
 00000000  .* R_MIPS_NONE *
 #
diff --git a/ld/testsuite/ld-mips-elf/jalx-2.dd b/ld/testsuite/ld-mips-elf/jalx-2.dd
index 8119ab443ba..50ebdb8415e 100644
--- a/ld/testsuite/ld-mips-elf/jalx-2.dd
+++ b/ld/testsuite/ld-mips-elf/jalx-2.dd
@@ -28,7 +28,7 @@ Disassembly of section \.text:
  4400034:	f89e 0020 	sw	a0,32\(s8\)
  4400038:	f8be 0024 	sw	a1,36\(s8\)
  440003c:	41a2 0440 	lui	v0,0x440
- 4400040:	3082 0290 	addiu	a0,v0,656
+ 4400040:	3082 0260 	addiu	a0,v0,608
  4400044:	f620 004c 	jal	4400098 <printf@micromipsplt>
  4400048:	0000 0000 	nop
  440004c:	f620 0010 	jal	4400020 <internal_function>
diff --git a/ld/testsuite/ld-mips-elf/mips-elf.exp b/ld/testsuite/ld-mips-elf/mips-elf.exp
index 24ecf956ca5..827181b4789 100644
--- a/ld/testsuite/ld-mips-elf/mips-elf.exp
+++ b/ld/testsuite/ld-mips-elf/mips-elf.exp
@@ -514,8 +514,7 @@ if {[istarget mips*-*-linux*]} {
      #
      #     the null symbol entry
      #     the .MIPS.stubs section symbol
-     #     _GLOBAL_OFFSET_TABLE_
-     set base_syms 3
+     set base_syms 2
      foreach dynsym { 7fff 8000 fff0 10000 2fe80 } {
 	 run_ld_link_tests \
 	     [list [list \
diff --git a/ld/testsuite/ld-mips-elf/mips16-pic-2.ad b/ld/testsuite/ld-mips-elf/mips16-pic-2.ad
index 5f746985d6f..52d3ea4c3b9 100644
--- a/ld/testsuite/ld-mips-elf/mips16-pic-2.ad
+++ b/ld/testsuite/ld-mips-elf/mips16-pic-2.ad
@@ -1,6 +1,6 @@
 # [MIPS_GOTSYM, MIPS_SYMTABNO) covers used4...used7.
 #...
- .* \(MIPS_SYMTABNO\) * 9
+ .* \(MIPS_SYMTABNO\) * 8
 #...
- .* \(MIPS_GOTSYM\) * 0x5
+ .* \(MIPS_GOTSYM\) * 0x4
 #pass
diff --git a/ld/testsuite/ld-mips-elf/mips16-pic-2.nd b/ld/testsuite/ld-mips-elf/mips16-pic-2.nd
index 540377b0d74..bc2cd38ee9b 100644
--- a/ld/testsuite/ld-mips-elf/mips16-pic-2.nd
+++ b/ld/testsuite/ld-mips-elf/mips16-pic-2.nd
@@ -1,10 +1,9 @@
 # used8 should come before MIPS_GOTSYM.
 #...
  +3: 000405bc +36 +FUNC +GLOBAL +DEFAULT .* used8
- +4: .* _GLOBAL_OFFSET_TABLE_
- +5: 00040574 +36 +FUNC +GLOBAL +DEFAULT .* used6
- +6: 00040598 +36 +FUNC +GLOBAL +DEFAULT .* used7
- +7: 00040550 +36 +FUNC +GLOBAL +DEFAULT .* used5
- +8: 0004052c +36 +FUNC +GLOBAL +DEFAULT .* used4
+ +4: 00040574 +36 +FUNC +GLOBAL +DEFAULT .* used6
+ +5: 00040598 +36 +FUNC +GLOBAL +DEFAULT .* used7
+ +6: 00040550 +36 +FUNC +GLOBAL +DEFAULT .* used5
+ +7: 0004052c +36 +FUNC +GLOBAL +DEFAULT .* used4
 
 #pass
diff --git a/ld/testsuite/ld-mips-elf/pic-and-nonpic-3a.dd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-3a.dd
index b37a59327ab..dfb4b27bc60 100644
--- a/ld/testsuite/ld-mips-elf/pic-and-nonpic-3a.dd
+++ b/ld/testsuite/ld-mips-elf/pic-and-nonpic-3a.dd
@@ -35,5 +35,5 @@ Disassembly of section \.MIPS\.stubs:
  c00:	8f998010 	lw	t9,-32752\(gp\)
  c04:	03e07821 	move	t7,ra
  c08:	0320f809 	jalr	t9
- c0c:	24180006 	li	t8,6
+ c0c:	24180005 	li	t8,5
 	\.\.\.
diff --git a/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.ad b/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.ad
index 0ad29a382b0..227d15d0cd9 100644
--- a/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.ad
+++ b/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.ad
@@ -16,10 +16,10 @@ Dynamic section at offset .* contains .*:
 # This must be the number of GOT entries - 1, the last entry being for "bar".
  0x7000000a \(MIPS_LOCAL_GOTNO\) * 3
 # This must be MIPS_GOTSYM + 1.
- 0x70000011 \(MIPS_SYMTABNO\) * 7
+ 0x70000011 \(MIPS_SYMTABNO\) * 6
  0x70000012 \(MIPS_UNREFEXTNO\) .*
 # This must be the index of "bar".
- 0x70000013 \(MIPS_GOTSYM\) * 0x6
+ 0x70000013 \(MIPS_GOTSYM\) * 0x5
  0x00000014 \(PLTREL\) * REL
  0x00000017 \(JMPREL\) * 0x43000
  0x00000002 \(PLTRELSZ\) * 8 \(bytes\)
diff --git a/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.dd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.dd
index da79012541b..151b4d28176 100644
--- a/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.dd
+++ b/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.dd
@@ -49,5 +49,5 @@ Disassembly of section \.MIPS\.stubs:
 .*:	8f998010 	lw	t9,-32752\(gp\)
 .*:	03e07821 	move	t7,ra
 .*:	0320f809 	jalr	t9
-.*:	24180006 	li	t8,6
+.*:	24180005 	li	t8,5
 	\.\.\.
diff --git a/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.nd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.nd
index ea2b1850cbc..3f1f4c24bd8 100644
--- a/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.nd
+++ b/ld/testsuite/ld-mips-elf/pic-and-nonpic-3b.nd
@@ -4,6 +4,6 @@ Symbol table '\.dynsym' contains .*:
 .*: 00000000 +0 +FUNC +GLOBAL +DEFAULT +UND +foo
 # The index on the next line should correspond to MIPS_GOTSYM.
 #...
- *6: 00044030 +0 +FUNC +GLOBAL +DEFAULT +UND +bar
+ *5: 00044030 +0 +FUNC +GLOBAL +DEFAULT +UND +bar
 
 #pass
diff --git a/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.ad b/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.ad
index bbc80ec4a64..e14a2d38796 100644
--- a/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.ad
+++ b/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.ad
@@ -19,8 +19,8 @@ Dynamic section at offset .* contains .*:
 # This must be the number of GOT entries - 1, the last entry being for "obj3".
  0x7000000a \(MIPS_LOCAL_GOTNO\) * 2
 # This must be MIPS_GOTSYM + 1.
- 0x70000011 \(MIPS_SYMTABNO\) * 7
+ 0x70000011 \(MIPS_SYMTABNO\) * 6
  0x70000012 \(MIPS_UNREFEXTNO\) .*
 # This must be the index of "obj3".
- 0x70000013 \(MIPS_GOTSYM\) * 0x6
+ 0x70000013 \(MIPS_GOTSYM\) * 0x5
  0x00000000 \(NULL\) * 0x0
diff --git a/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.nd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.nd
index 2e13dd9c9e7..e528cc7ba07 100644
--- a/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.nd
+++ b/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.nd
@@ -7,6 +7,6 @@ Symbol table '\.dynsym' contains .*:
 .*: 000a2008 +4 +OBJECT +GLOBAL +DEFAULT +[0-9]+ +obj2
 # The index on the next line should correspond to MIPS_GOTSYM.
 #...
- *6: 0+ +0 +OBJECT +GLOBAL +DEFAULT +UND +obj3
+ *5: 0+ +0 +OBJECT +GLOBAL +DEFAULT +UND +obj3
 
 #pass
diff --git a/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.rd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.rd
index 8c2c49c1f8f..ca3c0a57773 100644
--- a/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.rd
+++ b/ld/testsuite/ld-mips-elf/pic-and-nonpic-4b.rd
@@ -4,4 +4,4 @@ Relocation section '\.rel\.dyn' at offset .* contains .*:
 00000000 * 00000000 * R_MIPS_NONE *
 000a2000 * 0000017e * R_MIPS_COPY * 000a2000 * obj1
 000a2008 * 0000037e * R_MIPS_COPY * 000a2008 * obj2
-000a1004 * 00000603 * R_MIPS_REL32 * 00000000 * obj3
+000a1004 * 00000503 * R_MIPS_REL32 * 00000000 * obj3
diff --git a/ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.ad b/ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.ad
index fcf0e31c741..d7a672fcbe8 100644
--- a/ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.ad
+++ b/ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.ad
@@ -22,9 +22,9 @@ Dynamic section at offset .* contains .*:
 # for "bar" and "obj2".
  0x7000000a \(MIPS_LOCAL_GOTNO\) * 2
 # This must be MIPS_GOTSYM + 2.
- 0x70000011 \(MIPS_SYMTABNO\) * 9
+ 0x70000011 \(MIPS_SYMTABNO\) * 8
  0x70000012 \(MIPS_UNREFEXTNO\) * .*
- 0x70000013 \(MIPS_GOTSYM\) * 0x7
+ 0x70000013 \(MIPS_GOTSYM\) * 0x6
  0x00000014 \(PLTREL\) * REL
  0x00000017 \(JMPREL\) * 0x43030
  0x00000002 \(PLTRELSZ\) * 8 \(bytes\)
diff --git a/ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.nd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.nd
index 4f389b4e35e..d1ce8d4e709 100644
--- a/ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.nd
+++ b/ld/testsuite/ld-mips-elf/pic-and-nonpic-5b.nd
@@ -4,7 +4,7 @@ Symbol table '\.dynsym' contains .*:
 .*: 00043060 +0 +FUNC +GLOBAL +DEFAULT +\[MIPS PLT\] +UND +foo
 # The index on the next line should correspond to MIPS_GOTSYM.
 #...
- *7: 0+ +0 +OBJECT +GLOBAL +DEFAULT +UND +obj2
- *8: 0+ +0 +FUNC +GLOBAL +DEFAULT +UND +bar
+ *6: 0+ +0 +OBJECT +GLOBAL +DEFAULT +UND +obj2
+ *7: 0+ +0 +FUNC +GLOBAL +DEFAULT +UND +bar
 
 #pass
diff --git a/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.ad b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.ad
index 9399c4738b3..fab55813caf 100644
--- a/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.ad
+++ b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.ad
@@ -17,9 +17,9 @@ Dynamic section at offset .* contains .*:
  0x70000005 \(MIPS_FLAGS\) * NOTPOT
  0x70000006 \(MIPS_BASE_ADDRESS\) * 0x40000
  0x7000000a \(MIPS_LOCAL_GOTNO\) * 2
- 0x70000011 \(MIPS_SYMTABNO\) * 13
+ 0x70000011 \(MIPS_SYMTABNO\) * 12
  0x70000012 \(MIPS_UNREFEXTNO\) * .*
- 0x70000013 \(MIPS_GOTSYM\) * 0x6
+ 0x70000013 \(MIPS_GOTSYM\) * 0x5
  0x00000014 \(PLTREL\) * REL
  0x00000017 \(JMPREL\) * 0x43028
  0x00000002 \(PLTRELSZ\) * 24 \(bytes\)
diff --git a/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.dd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.dd
index dfab46c04b5..df8d02a6a99 100644
--- a/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.dd
+++ b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.dd
@@ -98,5 +98,5 @@ Disassembly of section \.MIPS\.stubs:
    440a0:	8f998010 	lw	t9,-32752\(gp\)
    440a4:	03e07821 	move	t3,ra
    440a8:	0320f809 	jalr	t9
-   440ac:	24180009 	li	t8,9
+   440ac:	24180008 	li	t8,8
 	\.\.\.
diff --git a/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.nd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.nd
index 4b807b5e40f..07bfa6b08c4 100644
--- a/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.nd
+++ b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n32.nd
@@ -6,12 +6,12 @@ Symbol table '\.dynsym' contains .*:
 # and the remaining symbols should have the same order as the
 # GOT layout given in the *.dd dump.
 #...
- *6: 0+ +0 +FUNC +GLOBAL +DEFAULT +UND +extf2
- *7: 0+ +0 +FUNC +GLOBAL +DEFAULT +UND +extf3
- *8: 0+a2000 +24 +OBJECT +GLOBAL +DEFAULT +[0-9]+ +extd2
- *9: 0+440a0 +0 +FUNC +GLOBAL +DEFAULT +UND +extf1
- *10: 0+ +0 +OBJECT +GLOBAL +DEFAULT +UND +extd1
- *11: 0+ +0 +FUNC +GLOBAL +DEFAULT +UND +extf4
- *12: 0+ +0 +OBJECT +GLOBAL +DEFAULT +UND +extd4
+ *5: 0+ +0 +FUNC +GLOBAL +DEFAULT +UND +extf2
+ *6: 0+ +0 +FUNC +GLOBAL +DEFAULT +UND +extf3
+ *7: 0+a2000 +24 +OBJECT +GLOBAL +DEFAULT +[0-9]+ +extd2
+ *8: 0+440a0 +0 +FUNC +GLOBAL +DEFAULT +UND +extf1
+ *9: 0+ +0 +OBJECT +GLOBAL +DEFAULT +UND +extd1
+ *10: 0+ +0 +FUNC +GLOBAL +DEFAULT +UND +extf4
+ *11: 0+ +0 +OBJECT +GLOBAL +DEFAULT +UND +extd4
 
 #pass
diff --git a/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.ad b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.ad
index d4b95339d13..555048326b1 100644
--- a/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.ad
+++ b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.ad
@@ -17,9 +17,9 @@ Dynamic section at offset .* contains .*:
  0x0+70000005 \(MIPS_FLAGS\) * NOTPOT
  0x0+70000006 \(MIPS_BASE_ADDRESS\) * 0x40000
  0x0+7000000a \(MIPS_LOCAL_GOTNO\) * 2
- 0x0+70000011 \(MIPS_SYMTABNO\) * 13
+ 0x0+70000011 \(MIPS_SYMTABNO\) * 12
  0x0+70000012 \(MIPS_UNREFEXTNO\) * .*
- 0x0+70000013 \(MIPS_GOTSYM\) * 0x6
+ 0x0+70000013 \(MIPS_GOTSYM\) * 0x5
  0x0+00000014 \(PLTREL\) * REL
  0x0+00000017 \(JMPREL\) * 0x43050
  0x0+00000002 \(PLTRELSZ\) * 48 \(bytes\)
diff --git a/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.dd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.dd
index 287e558188c..248062366f6 100644
--- a/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.dd
+++ b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.dd
@@ -98,5 +98,5 @@ Disassembly of section \.MIPS\.stubs:
    440a0:	df998010 	ld	t9,-32752\(gp\)
    440a4:	03e0782d 	move	t3,ra
    440a8:	0320f809 	jalr	t9
-   440ac:	64180009 	daddiu	t8,zero,9
+   440ac:	64180008 	daddiu	t8,zero,8
 	\.\.\.
diff --git a/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.nd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.nd
index b511d43a491..867389b77ec 100644
--- a/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.nd
+++ b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-n64.nd
@@ -6,12 +6,12 @@ Symbol table '\.dynsym' contains .*:
 # and the remaining symbols should have the same order as the
 # GOT layout given in the *.dd dump.
 #...
- *6: 0+ +0 +FUNC +GLOBAL +DEFAULT +UND +extf2
- *7: 0+ +0 +FUNC +GLOBAL +DEFAULT +UND +extf3
- *8: 0+a2000 +24 +OBJECT +GLOBAL +DEFAULT +[0-9]+ +extd2
- *9: 0+440a0 +0 +FUNC +GLOBAL +DEFAULT +UND +extf1
- *10: 0+ +0 +OBJECT +GLOBAL +DEFAULT +UND +extd1
- *11: 0+ +0 +FUNC +GLOBAL +DEFAULT +UND +extf4
- *12: 0+ +0 +OBJECT +GLOBAL +DEFAULT +UND +extd4
+ *5: 0+ +0 +FUNC +GLOBAL +DEFAULT +UND +extf2
+ *6: 0+ +0 +FUNC +GLOBAL +DEFAULT +UND +extf3
+ *7: 0+a2000 +24 +OBJECT +GLOBAL +DEFAULT +[0-9]+ +extd2
+ *8: 0+440a0 +0 +FUNC +GLOBAL +DEFAULT +UND +extf1
+ *9: 0+ +0 +OBJECT +GLOBAL +DEFAULT +UND +extd1
+ *10: 0+ +0 +FUNC +GLOBAL +DEFAULT +UND +extf4
+ *11: 0+ +0 +OBJECT +GLOBAL +DEFAULT +UND +extd4
 
 #pass
diff --git a/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.ad b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.ad
index 9399c4738b3..fab55813caf 100644
--- a/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.ad
+++ b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.ad
@@ -17,9 +17,9 @@ Dynamic section at offset .* contains .*:
  0x70000005 \(MIPS_FLAGS\) * NOTPOT
  0x70000006 \(MIPS_BASE_ADDRESS\) * 0x40000
  0x7000000a \(MIPS_LOCAL_GOTNO\) * 2
- 0x70000011 \(MIPS_SYMTABNO\) * 13
+ 0x70000011 \(MIPS_SYMTABNO\) * 12
  0x70000012 \(MIPS_UNREFEXTNO\) * .*
- 0x70000013 \(MIPS_GOTSYM\) * 0x6
+ 0x70000013 \(MIPS_GOTSYM\) * 0x5
  0x00000014 \(PLTREL\) * REL
  0x00000017 \(JMPREL\) * 0x43028
  0x00000002 \(PLTRELSZ\) * 24 \(bytes\)
diff --git a/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.dd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.dd
index 5002d52d3e6..7f101ac22d2 100644
--- a/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.dd
+++ b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.dd
@@ -98,5 +98,5 @@ Disassembly of section \.MIPS\.stubs:
    440a0:	8f998010 	lw	t9,-32752\(gp\)
    440a4:	03e07821 	move	t7,ra
    440a8:	0320f809 	jalr	t9
-   440ac:	24180009 	li	t8,9
+   440ac:	24180008 	li	t8,8
 	\.\.\.
diff --git a/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.nd b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.nd
index 4b807b5e40f..07bfa6b08c4 100644
--- a/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.nd
+++ b/ld/testsuite/ld-mips-elf/pic-and-nonpic-6-o32.nd
@@ -6,12 +6,12 @@ Symbol table '\.dynsym' contains .*:
 # and the remaining symbols should have the same order as the
 # GOT layout given in the *.dd dump.
 #...
- *6: 0+ +0 +FUNC +GLOBAL +DEFAULT +UND +extf2
- *7: 0+ +0 +FUNC +GLOBAL +DEFAULT +UND +extf3
- *8: 0+a2000 +24 +OBJECT +GLOBAL +DEFAULT +[0-9]+ +extd2
- *9: 0+440a0 +0 +FUNC +GLOBAL +DEFAULT +UND +extf1
- *10: 0+ +0 +OBJECT +GLOBAL +DEFAULT +UND +extd1
- *11: 0+ +0 +FUNC +GLOBAL +DEFAULT +UND +extf4
- *12: 0+ +0 +OBJECT +GLOBAL +DEFAULT +UND +extd4
+ *5: 0+ +0 +FUNC +GLOBAL +DEFAULT +UND +extf2
+ *6: 0+ +0 +FUNC +GLOBAL +DEFAULT +UND +extf3
+ *7: 0+a2000 +24 +OBJECT +GLOBAL +DEFAULT +[0-9]+ +extd2
+ *8: 0+440a0 +0 +FUNC +GLOBAL +DEFAULT +UND +extf1
+ *9: 0+ +0 +OBJECT +GLOBAL +DEFAULT +UND +extd1
+ *10: 0+ +0 +FUNC +GLOBAL +DEFAULT +UND +extf4
+ *11: 0+ +0 +OBJECT +GLOBAL +DEFAULT +UND +extd4
 
 #pass
diff --git a/ld/testsuite/ld-mips-elf/rel32-n32.d b/ld/testsuite/ld-mips-elf/rel32-n32.d
index ba83d51832b..43c2632d732 100644
--- a/ld/testsuite/ld-mips-elf/rel32-n32.d
+++ b/ld/testsuite/ld-mips-elf/rel32-n32.d
@@ -10,6 +10,6 @@ Relocation section '.rel.dyn' at offset .* contains 2 entries:
 [0-9a-f ]+R_MIPS_REL32     
 
 Hex dump of section '.text':
-  0x000002d0 00000000 00000000 00000000 00000000 ................
-  0x000002e0 000002e0 00000000 00000000 00000000 ................
-  0x000002f0 00000000 00000000 00000000 00000000 ................
+  0x000002a0 00000000 00000000 00000000 00000000 ................
+  0x000002b0 000002b0 00000000 00000000 00000000 ................
+  0x000002c0 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 ac82459519a..0103d7995c1 100644
--- a/ld/testsuite/ld-mips-elf/rel32-o32.d
+++ b/ld/testsuite/ld-mips-elf/rel32-o32.d
@@ -10,6 +10,6 @@ Relocation section '.rel.dyn' at offset .* contains 2 entries:
 [0-9a-f ]+R_MIPS_REL32     
 
 Hex dump of section '.text':
+  0x000002a0 00000000 00000000 00000000 00000000 ................
+  0x000002b0 000002b0 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/rel64.d b/ld/testsuite/ld-mips-elf/rel64.d
index 595762f0d98..89df314f765 100644
--- a/ld/testsuite/ld-mips-elf/rel64.d
+++ b/ld/testsuite/ld-mips-elf/rel64.d
@@ -14,6 +14,6 @@ Relocation section '.rel.dyn' at offset .* contains 2 entries:
  +Type3: R_MIPS_NONE      
 
 Hex dump of section '.text':
-  0x00000430 00000000 00000000 00000000 00000000 ................
-  0x00000440 00000000 00000440 00000000 00000000 ................
-  0x00000450 00000000 00000000 00000000 00000000 ................
+  0x00000400 00000000 00000000 00000000 00000000 ................
+  0x00000410 00000000 00000410 00000000 00000000 ................
+  0x00000420 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 95b56c2b475..9666adaa47c 100644
--- a/ld/testsuite/ld-mips-elf/tls-multi-got-1.got
+++ b/ld/testsuite/ld-mips-elf/tls-multi-got-1.got
@@ -4,33 +4,33 @@
 DYNAMIC RELOCATION RECORDS
 OFFSET   TYPE              VALUE 
 00000000 R_MIPS_NONE       \*ABS\*
-0013f820 R_MIPS_TLS_DTPMOD32  \*ABS\*
-0014947c R_MIPS_TLS_DTPMOD32  \*ABS\*
-0013f828 R_MIPS_TLS_DTPMOD32  tlsvar_gd
-0013f82c R_MIPS_TLS_DTPREL32  tlsvar_gd
-00149488 R_MIPS_TLS_DTPMOD32  tlsvar_gd
-0014948c R_MIPS_TLS_DTPREL32  tlsvar_gd
-0013f830 R_MIPS_TLS_TPREL32  tlsvar_ie
-00149484 R_MIPS_TLS_TPREL32  tlsvar_ie
-00143ea8 R_MIPS_REL32      sym_1_9526
+0013f7f0 R_MIPS_TLS_DTPMOD32  \*ABS\*
+0014944c R_MIPS_TLS_DTPMOD32  \*ABS\*
+0013f7f8 R_MIPS_TLS_DTPMOD32  tlsvar_gd
+0013f7fc R_MIPS_TLS_DTPREL32  tlsvar_gd
+00149458 R_MIPS_TLS_DTPMOD32  tlsvar_gd
+0014945c R_MIPS_TLS_DTPREL32  tlsvar_gd
+0013f800 R_MIPS_TLS_TPREL32  tlsvar_ie
+00149454 R_MIPS_TLS_TPREL32  tlsvar_ie
+00143e78 R_MIPS_REL32      sym_1_9526
 #...
-00139a84 R_MIPS_REL32      sym_2_8654
+00139a54 R_MIPS_REL32      sym_2_8654
 
 
 Contents of section .got:
- 122350 00000000 80000000 000d7f88 000d65e4  .*
- 122360 000d1f94 000d6000 000d5a38 000d19b0  .*
+ 122320 00000000 80000000 000d7f58 000d65b4  .*
+ 122330 000d1f64 000d5fd0 000d5a08 000d1980  .*
 #...
- 135bd0 000cf1f4 000e0e38 00000000 80000000  .*
- 135be0 00000000 00000000 00000000 00000000  .*
+ 135ba0 000cf1c4 000e0e08 00000000 80000000  .*
+ 135bb0 00000000 00000000 00000000 00000000  .*
 #...
- 13f810 00000000 00000000 00000000 00000000  .*
- 13f820 00000000 00000000 00000000 00000000  .*
- 13f830 00000000 00000000 80000000 00000000  .*
+ 13f7e0 00000000 00000000 00000000 00000000  .*
+ 13f7f0 00000000 00000000 00000000 00000000  .*
+ 13f800 00000000 00000000 80000000 00000000  .*
 #...
+ 149410 00000000 00000000 00000000 00000000  .*
+ 149420 00000000 00000000 00000000 00000000  .*
+ 149430 00000000 00000000 00000000 00000000  .*
  149440 00000000 00000000 00000000 00000000  .*
  149450 00000000 00000000 00000000 00000000  .*
- 149460 00000000 00000000 00000000 00000000  .*
- 149470 00000000 00000000 00000000 00000000  .*
- 149480 00000000 00000000 00000000 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 b69ea70a5f7..aea3d2de3d5 100644
--- a/ld/testsuite/ld-mips-elf/tls-multi-got-1.r
+++ b/ld/testsuite/ld-mips-elf/tls-multi-got-1.r
@@ -4,19 +4,19 @@ Dynamic section at offset .* contains 18 entries:
  0x00000004 \(HASH\)                       0x1c4
  0x00000005 \(STRTAB\).*
  0x00000006 \(SYMTAB\).*
- 0x0000000a \(STRSZ\)                      220087 \(bytes\)
+ 0x0000000a \(STRSZ\)                      220065 \(bytes\)
  0x0000000b \(SYMENT\)                     16 \(bytes\)
- 0x00000003 \(PLTGOT\)                     0x122350
- 0x00000011 \(REL\)                        0xa7960
+ 0x00000003 \(PLTGOT\)                     0x122320
+ 0x00000011 \(REL\)                        0xa7938
  0x00000012 \(RELSZ\)                      160072 \(bytes\)
  0x00000013 \(RELENT\)                     8 \(bytes\)
  0x70000001 \(MIPS_RLD_VERSION\)           1
  0x70000005 \(MIPS_FLAGS\)                 NOTPOT
  0x70000006 \(MIPS_BASE_ADDRESS\)          0x0
  0x7000000a \(MIPS_LOCAL_GOTNO\)           2
- 0x70000011 \(MIPS_SYMTABNO\)              20012
+ 0x70000011 \(MIPS_SYMTABNO\)              20011
  0x70000012 \(MIPS_UNREFEXTNO\)            10
- 0x70000013 \(MIPS_GOTSYM\)                0xc
+ 0x70000013 \(MIPS_GOTSYM\)                0xb
  0x0000001e \(FLAGS\)                      STATIC_TLS
  0x00000000 \(NULL\)                       0x0
 
@@ -31,8 +31,8 @@ Relocation section '\.rel\.dyn' at offset 0x[0-9a-f]+ contains 20009 entries:
 [0-9a-f ]+R_MIPS_TLS_DTPREL 00000000   tlsvar_gd
 [0-9a-f ]+R_MIPS_TLS_TPREL3 00000004   tlsvar_ie
 [0-9a-f ]+R_MIPS_TLS_TPREL3 00000004   tlsvar_ie
-[0-9a-f ]+R_MIPS_REL32      000d7f88   sym_1_9526
-[0-9a-f ]+R_MIPS_REL32      000d65e4   sym_1_7885
+[0-9a-f ]+R_MIPS_REL32      000d7f58   sym_1_9526
+[0-9a-f ]+R_MIPS_REL32      000d65b4   sym_1_7885
 #...
-[0-9a-f ]+R_MIPS_REL32      000cf1f4   sym_1_0465
-[0-9a-f ]+R_MIPS_REL32      000e0e38   sym_2_8654
+[0-9a-f ]+R_MIPS_REL32      000cf1c4   sym_1_0465
+[0-9a-f ]+R_MIPS_REL32      000e0e08   sym_2_8654
diff --git a/ld/testsuite/ld-mips-elf/tlsdyn-o32-1.d b/ld/testsuite/ld-mips-elf/tlsdyn-o32-1.d
index 77c210f0524..ca52d8b18c0 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
-  .*:	279c7c10 	addiu	gp,gp,31760
+  .*:	279c7c40 	addiu	gp,gp,31808
   .*:	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
-  .*:	279c7b50 	addiu	gp,gp,31568
+  .*:	279c7b80 	addiu	gp,gp,31616
   .*:	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 fe067080b28..d70fdd0bb30 100644
--- a/ld/testsuite/ld-mips-elf/tlsdyn-o32-1.got
+++ b/ld/testsuite/ld-mips-elf/tlsdyn-o32-1.got
@@ -13,6 +13,6 @@ OFFSET   TYPE              VALUE
 
 
 Contents of section .got:
- 10000020 00000000 80000000 004004ac 00000000  .........@......
+ 10000020 00000000 80000000 0040047c 00000000  ................
  10000030 00000000 00000000 00000000 00000000  ................
  10000040 00000000 00000001 00000000           ............    
diff --git a/ld/testsuite/ld-mips-elf/tlsdyn-o32-2.d b/ld/testsuite/ld-mips-elf/tlsdyn-o32-2.d
index 77c210f0524..ca52d8b18c0 100644
--- a/ld/testsuite/ld-mips-elf/tlsdyn-o32-2.d
+++ b/ld/testsuite/ld-mips-elf/tlsdyn-o32-2.d
@@ -5,7 +5,7 @@ Disassembly of section .text:
 
 .* <__start>:
   .*:	3c1c0fc0 	lui	gp,0xfc0
-  .*:	279c7c10 	addiu	gp,gp,31760
+  .*:	279c7c40 	addiu	gp,gp,31808
   .*:	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
-  .*:	279c7b50 	addiu	gp,gp,31568
+  .*:	279c7b80 	addiu	gp,gp,31616
   .*:	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-2.got b/ld/testsuite/ld-mips-elf/tlsdyn-o32-2.got
index 58502a78426..6b001576285 100644
--- a/ld/testsuite/ld-mips-elf/tlsdyn-o32-2.got
+++ b/ld/testsuite/ld-mips-elf/tlsdyn-o32-2.got
@@ -13,6 +13,6 @@ OFFSET   TYPE              VALUE
 
 
 Contents of section .got:
- 10000020 00000000 80000000 004004ac 00000000  .*
+ 10000020 00000000 80000000 0040047c 00000000  .*
  10000030 00000000 00000000 00000000 00000000  .*
  10000040 00000000 00000001 00000000           .*
diff --git a/ld/testsuite/ld-mips-elf/tlsdyn-o32-3.d b/ld/testsuite/ld-mips-elf/tlsdyn-o32-3.d
index 5c1ffe406c2..78eb8825521 100644
--- a/ld/testsuite/ld-mips-elf/tlsdyn-o32-3.d
+++ b/ld/testsuite/ld-mips-elf/tlsdyn-o32-3.d
@@ -5,7 +5,7 @@ Disassembly of section .text:
 
 .* <other>:
   .*:	3c1c0fc0 	lui	gp,0xfc0
-  .*:	279c7c10 	addiu	gp,gp,31760
+  .*:	279c7c40 	addiu	gp,gp,31808
   .*:	0399e021 	addu	gp,gp,t9
   .*:	27bdfff0 	addiu	sp,sp,-16
   .*:	afbe0008 	sw	s8,8\(sp\)
@@ -51,7 +51,7 @@ Disassembly of section .text:
 
 .* <__start>:
   .*:	3c1c0fc0 	lui	gp,0xfc0
-  .*:	279c7b60 	addiu	gp,gp,31584
+  .*:	279c7b90 	addiu	gp,gp,31632
   .*:	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-3.got b/ld/testsuite/ld-mips-elf/tlsdyn-o32-3.got
index 9980d3c6ddf..01eb44f98c5 100644
--- a/ld/testsuite/ld-mips-elf/tlsdyn-o32-3.got
+++ b/ld/testsuite/ld-mips-elf/tlsdyn-o32-3.got
@@ -13,6 +13,6 @@ OFFSET   TYPE              VALUE
 
 
 Contents of section .got:
- 10000020 00000000 80000000 0040055c 00000000  .*
+ 10000020 00000000 80000000 0040052c 00000000  .*
  10000030 00000000 00000000 00000000 00000000  .*
  10000040 00000000 00000001 00000000           .*
diff --git a/ld/testsuite/ld-mips-elf/tlsdyn-o32.d b/ld/testsuite/ld-mips-elf/tlsdyn-o32.d
index b346409ac5b..699035bb3c6 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
-  .*:	279c7bc0 	addiu	gp,gp,31680
+  .*:	279c7bf0 	addiu	gp,gp,31728
   .*:	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 395b0702c0b..a1587a69e9c 100644
--- a/ld/testsuite/ld-mips-elf/tlsdyn-o32.got
+++ b/ld/testsuite/ld-mips-elf/tlsdyn-o32.got
@@ -13,6 +13,6 @@ OFFSET   TYPE              VALUE
 
 
 Contents of section .got:
- 10000020 00000000 80000000 004004fc 00000000  ................
+ 10000020 00000000 80000000 004004cc 00000000  ................
  10000030 00000000 00000000 00000001 00000000  ................
  10000040 00000000 00000000 00000000           ............    
diff --git a/ld/testsuite/ld-mips-elf/tlslib-o32-ver.got b/ld/testsuite/ld-mips-elf/tlslib-o32-ver.got
index e4b26c8b34c..a5b08019b93 100644
--- a/ld/testsuite/ld-mips-elf/tlslib-o32-ver.got
+++ b/ld/testsuite/ld-mips-elf/tlslib-o32-ver.got
@@ -4,12 +4,12 @@
 DYNAMIC RELOCATION RECORDS
 OFFSET   TYPE              VALUE 
 00000000 R_MIPS_NONE       \*ABS\*
-00040508 R_MIPS_TLS_DTPMOD32  \*ABS\*
-00040500 R_MIPS_TLS_DTPMOD32  tlsvar_gd
-00040504 R_MIPS_TLS_DTPREL32  tlsvar_gd
-000404fc R_MIPS_TLS_TPREL32  tlsvar_ie
+000404d8 R_MIPS_TLS_DTPMOD32  \*ABS\*
+000404d0 R_MIPS_TLS_DTPMOD32  tlsvar_gd
+000404d4 R_MIPS_TLS_DTPREL32  tlsvar_gd
+000404cc R_MIPS_TLS_TPREL32  tlsvar_ie
 
 
 Contents of section .got:
- 404f0 00000000 80000000 000004c0 00000000  ................
- 40500 00000000 00000000 00000000 00000000  ................
+ 404c0 00000000 80000000 00000490 00000000  ................
+ 404d0 00000000 00000000 00000000 00000000  ................
diff --git a/ld/testsuite/ld-mips-elf/tlslib-o32.got b/ld/testsuite/ld-mips-elf/tlslib-o32.got
index 6ac910f7f07..ad90fb019ec 100644
--- a/ld/testsuite/ld-mips-elf/tlslib-o32.got
+++ b/ld/testsuite/ld-mips-elf/tlslib-o32.got
@@ -4,12 +4,12 @@ tmpdir/tlslib-o32.so:     file format elf32-tradbigmips
 DYNAMIC RELOCATION RECORDS
 OFFSET   TYPE              VALUE 
 00000000 R_MIPS_NONE       \*ABS\*
-00040468 R_MIPS_TLS_DTPMOD32  \*ABS\*
-00040460 R_MIPS_TLS_DTPMOD32  tlsvar_gd
-00040464 R_MIPS_TLS_DTPREL32  tlsvar_gd
-0004045c R_MIPS_TLS_TPREL32  tlsvar_ie
+00040448 R_MIPS_TLS_DTPMOD32  \*ABS\*
+00040440 R_MIPS_TLS_DTPMOD32  tlsvar_gd
+00040444 R_MIPS_TLS_DTPREL32  tlsvar_gd
+0004043c R_MIPS_TLS_TPREL32  tlsvar_ie
 
 
 Contents of section .got:
- 40450 00000000 80000000 00000420 00000000  ................
- 40460 00000000 00000000 00000000 00000000  ................
+ 40430 00000000 80000000 00000400 00000000  ................
+ 40440 00000000 00000000 00000000 00000000  ................