bfd/

	* elf-bfd.h (struct elf_link_hash_table): Reorder.  Add
	text_index_section and data_index_section.
	(struct elf_backend_data): Add elf_backend_init_index_section.
	(_bfd_elf_init_1_index_section): Declare.
	(_bfd_elf_init_2_index_sections): Declare.
	* elfxx-target.h (elf_backend_init_index_section): Define.
	(elfNN_bed): Init new field.
	* elflink.c (_bfd_elf_link_omit_section_dynsym): Keep first tls
	section and text_index_section plus data_index_section.
	(_bfd_elf_link_renumber_dynsyms): Clear dynindx on omitted sections.
	(_bfd_elf_init_1_index_section): New function.
	(_bfd_elf_init_2_index_sections): New function.
	(bfd_elf_size_dynsym_hash_dynstr): Call elf_backend_init_index_section.
	(elf_link_input_bfd): When emitting relocs, use text_index_section
	and data_index_section for removed sections.
	* elf-m10300.c (elf_backend_omit_section_dynsym): Define.
	* elf32-i386.c: Likewise.
	* elf32-m32r.c: Likewise.
	* elf32-sh.c: Likewise.
	* elf32-xstormy16.c: Likewise.
	* elf32-xtensa.c: Likewise.
	* elf64-alpha.c: Likewise.
	* elf64-hppa.c: Likewise.
	* elf64-mmix.c: Likewise.
	* elf64-sh64.c: Likewise.
	* elfxx-ia64.c: Likewise.
	* elf32-arm.c (elf32_arm_final_link_relocate): Use text_index_section
	and data_index_section sym for relocs against sections with no dynamic
	section sym.
	(elf_backend_init_index_section): Define.
	* elf32-cris.c: Similarly.
	* elf32-hppa.c: Similarly.
	* elf32-i370.c: Similarly.
	* elf32-m68k.c: Similarly.
	* elf32-mips.c: Similarly.
	* elf32-ppc.c: Similarly.
	* elf32-s390.c: Similarly.
	* elf32-sparc.c: Similarly.
	* elf32-vax.c: Similarly.
	* elf64-mips.c: Similarly.
	* elf64-ppc.c: Similarly.
	* elf64-s390.c: Similarly.
	* elf64-sparc.c: Similarly.
	* elf64-x86-64.c: Similarly.
	* elfn32-mips.c: Similarly.
	* elfxx-mips.c: Similarly.
	* elfxx-sparc.c: Similarly.
	* linker.c (fix_syms): Base symbols in removed sections on
	previous section in preference to using absolute section.

ld/
	* ldlang.c (strip_excluded_output_sections): Do strip sections
	that define syms, but don't ignore them.
	* ld.texinfo (Output Section Discarding): Revise.
	* emultempl/armcoff.em (gld${EMULATION_NAME}_finish): Always call
	finish_default.

ld/testsuite/
	Update for section sym changes.

21 files changed, 178 insertions, 200 deletions

diff --git a/ld/testsuite/ld-mips-elf/eh-frame1-n32.d b/ld/testsuite/ld-mips-elf/eh-frame1-n32.d
index 4e3321951c..cda12b6a31 100644
--- a/ld/testsuite/ld-mips-elf/eh-frame1-n32.d
+++ b/ld/testsuite/ld-mips-elf/eh-frame1-n32.d
@@ -7,19 +7,19 @@
 
 Relocation section '\.rel\.dyn' .*:
  *Offset .*
-00000000  00000000 R_MIPS_NONE *
+00000000  [0-9a-f]+ R_MIPS_NONE *
 # Initial PCs for the FDEs attached to CIE 0xbc
-000300dc  00000003 R_MIPS_REL32 *
-000300f0  00000003 R_MIPS_REL32 *
+000300dc  [0-9a-f]+ R_MIPS_REL32 *
+000300f0  [0-9a-f]+ R_MIPS_REL32 *
 # Likewise CIE 0x220
-00030240  00000003 R_MIPS_REL32 *
-00030254  00000003 R_MIPS_REL32 *
-0003008b  00000503 R_MIPS_REL32      00000000   foo
-000300d0  00000503 R_MIPS_REL32      00000000   foo
-0003010e  00000503 R_MIPS_REL32      00000000   foo
-000301ef  00000503 R_MIPS_REL32      00000000   foo
-00030234  00000503 R_MIPS_REL32      00000000   foo
-00030272  00000503 R_MIPS_REL32      00000000   foo
+00030240  [0-9a-f]+ R_MIPS_REL32 *
+00030254  [0-9a-f]+ R_MIPS_REL32 *
+0003008b  [0-9a-f]+ R_MIPS_REL32      00000000   foo
+000300d0  [0-9a-f]+ R_MIPS_REL32      00000000   foo
+0003010e  [0-9a-f]+ R_MIPS_REL32      00000000   foo
+000301ef  [0-9a-f]+ R_MIPS_REL32      00000000   foo
+00030234  [0-9a-f]+ R_MIPS_REL32      00000000   foo
+00030272  [0-9a-f]+ R_MIPS_REL32      00000000   foo
 #...
 The section \.eh_frame contains:
 
diff --git a/ld/testsuite/ld-mips-elf/eh-frame1-n64.d b/ld/testsuite/ld-mips-elf/eh-frame1-n64.d
index 2b175e051f..ccb77e1d67 100644
--- a/ld/testsuite/ld-mips-elf/eh-frame1-n64.d
+++ b/ld/testsuite/ld-mips-elf/eh-frame1-n64.d
@@ -7,39 +7,39 @@
 
 Relocation section '\.rel\.dyn' .*:
  *Offset .*
-000000000000  000000000000 R_MIPS_NONE *
+000000000000  [0-9a-f]+ R_MIPS_NONE *
  *Type2: R_MIPS_NONE *
  *Type3: R_MIPS_NONE *
 # Initial PCs for the FDEs attached to CIE 0x120
-000000030148  000000001203 R_MIPS_REL32 *
+000000030148  [0-9a-f]+ R_MIPS_REL32 *
  *Type2: R_MIPS_64 *
  *Type3: R_MIPS_NONE *
-000000030168  000000001203 R_MIPS_REL32 *
+000000030168  [0-9a-f]+ R_MIPS_REL32 *
  *Type2: R_MIPS_64 *
  *Type3: R_MIPS_NONE *
 # Likewise CIE 0x340
-000000030368  000000001203 R_MIPS_REL32 *
+000000030368  [0-9a-f]+ R_MIPS_REL32 *
  *Type2: R_MIPS_64 *
  *Type3: R_MIPS_NONE *
-000000030388  000000001203 R_MIPS_REL32 *
+000000030388  [0-9a-f]+ R_MIPS_REL32 *
  *Type2: R_MIPS_64 *
  *Type3: R_MIPS_NONE *
-0000000300cb  000500001203 R_MIPS_REL32      0000000000000000 foo
+0000000300cb  [0-9a-f]+ R_MIPS_REL32      0000000000000000 foo
  *Type2: R_MIPS_64 *
  *Type3: R_MIPS_NONE *
-000000030138  000500001203 R_MIPS_REL32      0000000000000000 foo
+000000030138  [0-9a-f]+ R_MIPS_REL32      0000000000000000 foo
  *Type2: R_MIPS_64 *
  *Type3: R_MIPS_NONE *
-000000030192  000500001203 R_MIPS_REL32      0000000000000000 foo
+000000030192  [0-9a-f]+ R_MIPS_REL32      0000000000000000 foo
  *Type2: R_MIPS_64 *
  *Type3: R_MIPS_NONE *
-0000000302eb  000500001203 R_MIPS_REL32      0000000000000000 foo
+0000000302eb  [0-9a-f]+ R_MIPS_REL32      0000000000000000 foo
  *Type2: R_MIPS_64 *
  *Type3: R_MIPS_NONE *
-000000030358  000500001203 R_MIPS_REL32      0000000000000000 foo
+000000030358  [0-9a-f]+ R_MIPS_REL32      0000000000000000 foo
  *Type2: R_MIPS_64 *
  *Type3: R_MIPS_NONE *
-0000000303b2  000500001203 R_MIPS_REL32      0000000000000000 foo
+0000000303b2  [0-9a-f]+ R_MIPS_REL32      0000000000000000 foo
  *Type2: R_MIPS_64 *
  *Type3: R_MIPS_NONE *
 #...
diff --git a/ld/testsuite/ld-mips-elf/eh-frame2-n32.d b/ld/testsuite/ld-mips-elf/eh-frame2-n32.d
index 1345658623..160b7a8fe7 100644
--- a/ld/testsuite/ld-mips-elf/eh-frame2-n32.d
+++ b/ld/testsuite/ld-mips-elf/eh-frame2-n32.d
@@ -7,19 +7,19 @@
 
 Relocation section '\.rel\.dyn' .*:
  *Offset .*
-00000000  00000000 R_MIPS_NONE *
+00000000  [0-9a-f]+ R_MIPS_NONE *
 # Initial PCs for the FDEs attached to CIE 0xb8
-000300d8  00000003 R_MIPS_REL32 *
-000300ec  00000003 R_MIPS_REL32 *
+000300d8  [0-9a-f]+ R_MIPS_REL32 *
+000300ec  [0-9a-f]+ R_MIPS_REL32 *
 # Likewise CIE 0x218
-00030238  00000003 R_MIPS_REL32 *
-0003024c  00000003 R_MIPS_REL32 *
-0003008b  00000503 R_MIPS_REL32      00000000   foo
-000300cc  00000503 R_MIPS_REL32      00000000   foo
-0003010a  00000503 R_MIPS_REL32      00000000   foo
-000301eb  00000503 R_MIPS_REL32      00000000   foo
-0003022c  00000503 R_MIPS_REL32      00000000   foo
-0003026a  00000503 R_MIPS_REL32      00000000   foo
+00030238  [0-9a-f]+ R_MIPS_REL32 *
+0003024c  [0-9a-f]+ R_MIPS_REL32 *
+0003008b  [0-9a-f]+ R_MIPS_REL32      00000000   foo
+000300cc  [0-9a-f]+ R_MIPS_REL32      00000000   foo
+0003010a  [0-9a-f]+ R_MIPS_REL32      00000000   foo
+000301eb  [0-9a-f]+ R_MIPS_REL32      00000000   foo
+0003022c  [0-9a-f]+ R_MIPS_REL32      00000000   foo
+0003026a  [0-9a-f]+ R_MIPS_REL32      00000000   foo
 #...
 The section \.eh_frame contains:
 
diff --git a/ld/testsuite/ld-mips-elf/eh-frame2-n64.d b/ld/testsuite/ld-mips-elf/eh-frame2-n64.d
index b817bbc67e..9bc490eb9d 100644
--- a/ld/testsuite/ld-mips-elf/eh-frame2-n64.d
+++ b/ld/testsuite/ld-mips-elf/eh-frame2-n64.d
@@ -7,39 +7,39 @@
 
 Relocation section '\.rel\.dyn' .*:
  *Offset .*
-000000000000  000000000000 R_MIPS_NONE *
+000000000000  [0-9a-f]+ R_MIPS_NONE *
  *Type2: R_MIPS_NONE *
  *Type3: R_MIPS_NONE *
 # Initial PCs for the FDEs attached to CIE 0x118
-000000030140  000000001203 R_MIPS_REL32 *
+000000030140  [0-9a-f]+ R_MIPS_REL32 *
  *Type2: R_MIPS_64 *
  *Type3: R_MIPS_NONE *
-000000030160  000000001203 R_MIPS_REL32 *
+000000030160  [0-9a-f]+ R_MIPS_REL32 *
  *Type2: R_MIPS_64 *
  *Type3: R_MIPS_NONE *
 # Likewise CIE 0x330
-000000030358  000000001203 R_MIPS_REL32 *
+000000030358  [0-9a-f]+ R_MIPS_REL32 *
  *Type2: R_MIPS_64 *
  *Type3: R_MIPS_NONE *
-000000030378  000000001203 R_MIPS_REL32 *
+000000030378  [0-9a-f]+ R_MIPS_REL32 *
  *Type2: R_MIPS_64 *
  *Type3: R_MIPS_NONE *
-0000000300cb  000500001203 R_MIPS_REL32      0000000000000000 foo
+0000000300cb  [0-9a-f]+ R_MIPS_REL32      0000000000000000 foo
  *Type2: R_MIPS_64 *
  *Type3: R_MIPS_NONE *
-000000030130  000500001203 R_MIPS_REL32      0000000000000000 foo
+000000030130  [0-9a-f]+ R_MIPS_REL32      0000000000000000 foo
  *Type2: R_MIPS_64 *
  *Type3: R_MIPS_NONE *
-00000003018a  000500001203 R_MIPS_REL32      0000000000000000 foo
+00000003018a  [0-9a-f]+ R_MIPS_REL32      0000000000000000 foo
  *Type2: R_MIPS_64 *
  *Type3: R_MIPS_NONE *
-0000000302e3  000500001203 R_MIPS_REL32      0000000000000000 foo
+0000000302e3  [0-9a-f]+ R_MIPS_REL32      0000000000000000 foo
  *Type2: R_MIPS_64 *
  *Type3: R_MIPS_NONE *
-000000030348  000500001203 R_MIPS_REL32      0000000000000000 foo
+000000030348  [0-9a-f]+ R_MIPS_REL32      0000000000000000 foo
  *Type2: R_MIPS_64 *
  *Type3: R_MIPS_NONE *
-0000000303a2  000500001203 R_MIPS_REL32      0000000000000000 foo
+0000000303a2  [0-9a-f]+ R_MIPS_REL32      0000000000000000 foo
  *Type2: R_MIPS_64 *
  *Type3: R_MIPS_NONE *
 #...
diff --git a/ld/testsuite/ld-mips-elf/mips-elf.exp b/ld/testsuite/ld-mips-elf/mips-elf.exp
index 773211a437..f3d47075c8 100644
--- a/ld/testsuite/ld-mips-elf/mips-elf.exp
+++ b/ld/testsuite/ld-mips-elf/mips-elf.exp
@@ -147,14 +147,13 @@ run_dump_test "hash1c"
 
 if {[istarget mips*-*-linux*]} {
      # The number of symbols that are always included in the symbol table
-     # for these tests.  The 5 are:
+     # for these tests.  The 4 are:
      #
      #     the null symbol entry
      #     the .MIPS.stubs section symbol
-     #     the .text section symbol
      #     _gp
      #     _GLOBAL_OFFSET_TABLE_
-     set base_syms 5
+     set base_syms 4
      foreach dynsym { 7fff 8000 fff0 10000 2fe80 } {
 	 run_ld_link_tests \
 	     [list [list \
diff --git a/ld/testsuite/ld-mips-elf/rel32-n32.d b/ld/testsuite/ld-mips-elf/rel32-n32.d
index c071c0170c..3b3572f338 100644
--- a/ld/testsuite/ld-mips-elf/rel32-n32.d
+++ b/ld/testsuite/ld-mips-elf/rel32-n32.d
@@ -6,10 +6,10 @@
 
 Relocation section '.rel.dyn' at offset .* contains 2 entries:
  Offset     Info    Type            Sym.Value  Sym. Name
-00000000  00000000 R_MIPS_NONE      
-000002d0  00000003 R_MIPS_REL32     
+[0-9a-f ]+R_MIPS_NONE      
+[0-9a-f ]+R_MIPS_REL32     
 
 Hex dump of section '.text':
-  0x000002c0 00000000 00000000 00000000 00000000 ................
-  0x000002d0 000002d0 00000000 00000000 00000000 ................
-  0x000002e0 00000000 00000000 00000000 00000000 ................
+  0x000002b0 00000000 00000000 00000000 00000000 ................
+  0x000002c0 000002c0 00000000 00000000 00000000 ................
+  0x000002d0 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 d98bf21159..d2d932e5a7 100644
--- a/ld/testsuite/ld-mips-elf/rel32-o32.d
+++ b/ld/testsuite/ld-mips-elf/rel32-o32.d
@@ -6,10 +6,10 @@
 
 Relocation section '.rel.dyn' at offset .* contains 2 entries:
  Offset     Info    Type            Sym.Value  Sym. Name
-00000000  00000000 R_MIPS_NONE      
-000002f0  00000003 R_MIPS_REL32     
+[0-9a-f ]+R_MIPS_NONE      
+[0-9a-f ]+R_MIPS_REL32     
 
 Hex dump of section '.text':
+  0x000002c0 00000000 00000000 00000000 00000000 ................
+  0x000002d0 000002d0 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 61fbf879a5..34b3b45f00 100644
--- a/ld/testsuite/ld-mips-elf/rel64.d
+++ b/ld/testsuite/ld-mips-elf/rel64.d
@@ -6,14 +6,14 @@
 
 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      
-000000000450  000000001203 R_MIPS_REL32     
-                    Type2: R_MIPS_64        
-                    Type3: R_MIPS_NONE      
+[0-9a-f ]+R_MIPS_NONE      
+ +Type2: R_MIPS_NONE      
+ +Type3: R_MIPS_NONE      
+[0-9a-f ]+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 ................
+  0x00000430 00000000 00000000 00000000 00000000 ................
+  0x00000440 00000000 00000440 00000000 00000000 ................
+  0x00000450 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 5732701fb7..7e113d67d5 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\*
-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
-00143f7c R_MIPS_REL32      sym_1_9526
+001495c0 R_MIPS_TLS_DTPMOD32  \*ABS\*
+0013f938 R_MIPS_TLS_DTPMOD32  \*ABS\*
+001495cc R_MIPS_TLS_DTPMOD32  tlsvar_gd
+001495d0 R_MIPS_TLS_DTPREL32  tlsvar_gd
+0013f944 R_MIPS_TLS_DTPMOD32  tlsvar_gd
+0013f948 R_MIPS_TLS_DTPREL32  tlsvar_gd
+001495c8 R_MIPS_TLS_TPREL32  tlsvar_ie
+0013f940 R_MIPS_TLS_TPREL32  tlsvar_ie
+00143f6c R_MIPS_REL32      sym_1_9526
 #...
-00139bd0 R_MIPS_REL32      sym_2_8654
+00139bc0 R_MIPS_REL32      sym_2_8654
 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:
- 122420 00000000 80000000 00000000 00000000  ................
- 122430 00000000 00000000 00000000 00000000  ................
- 122440 00000000 00000000 00000000 00000000  ................
- 122450 00000000 000d8048 000d66a4 000d2054  .......H..f... T
+ 122410 00000000 80000000 00000000 00000000  .*
+ 122420 00000000 00000000 00000000 00000000  .*
+ 122430 00000000 00000000 00000000 00000000  .*
+ 122440 00000000 000d8038 000d6694 000d2044  .*
 #...
- 13f930 00000000 00000000 00000000 00000000  ................
- 13f940 00000000 00000000 00000000 00000000  ................
- 13f950 00000000 00000000 00000000 00000000  ................
- 13f960 80000000 00000000 00000000 00000000  ................
+ 13f920 00000000 00000000 00000000 00000000  .*
+ 13f930 00000000 00000000 00000000 00000000  .*
+ 13f940 00000000 00000000 00000000 00000000  .*
+ 13f950 80000000 00000000 00000000 00000000  .*
 #...
- 1495a0 00000000 00000000 00000000 00000000  ................
- 1495b0 00000000 00000000 00000000 00000000  ................
- 1495c0 00000000 00000000 00000000 00000000  ................
- 1495d0 00000000 00000000 00000000 00000000  ................
- 1495e0 00000000                             ....            
+ 149590 00000000 00000000 00000000 00000000  .*
+ 1495a0 00000000 00000000 00000000 00000000  .*
+ 1495b0 00000000 00000000 00000000 00000000  .*
+ 1495c0 00000000 00000000 00000000 00000000  .*
+ 1495d0 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 c6280c25d8..51f3ab1870 100644
--- a/ld/testsuite/ld-mips-elf/tls-multi-got-1.r
+++ b/ld/testsuite/ld-mips-elf/tls-multi-got-1.r
@@ -2,60 +2,39 @@
 Dynamic section at offset 0xec contains 19 entries:
   Tag        Type                         Name/Value
  0x00000004 \(HASH\)                       0x1ac
- 0x00000005 \(STRTAB\)                     0x71db8
- 0x00000006 \(SYMTAB\)                     0x23ad8
+ 0x00000005 \(STRTAB\).*
+ 0x00000006 \(SYMTAB\).*
  0x0000000a \(STRSZ\)                      220091 \(bytes\)
  0x0000000b \(SYMENT\)                     16 \(bytes\)
  0x00000015 \(DEBUG\)                      0x0
- 0x00000003 \(PLTGOT\)                     0x122420
- 0x00000011 \(REL\)                        0xa7974
+ 0x00000003 \(PLTGOT\)                     0x122410
+ 0x00000011 \(REL\)                        0xa7960
  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\)              20014
+ 0x70000011 \(MIPS_SYMTABNO\)              20013
  0x70000012 \(MIPS_UNREFEXTNO\)            11
- 0x70000013 \(MIPS_GOTSYM\)                0xe
+ 0x70000013 \(MIPS_GOTSYM\)                0xd
  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      
-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  00000b2f R_MIPS_TLS_TPREL3 00000004   tlsvar_ie
-0013f950  00000b2f R_MIPS_TLS_TPREL3 00000004   tlsvar_ie
-00143f7c  00000e03 R_MIPS_REL32      000d8048   sym_1_9526
-00143768  00000f03 R_MIPS_REL32      000d66a4   sym_1_7885
+[0-9a-f ]+R_MIPS_NONE      
+[0-9a-f ]+R_MIPS_TLS_DTPMOD
+[0-9a-f ]+R_MIPS_TLS_DTPMOD
+[0-9a-f ]+R_MIPS_TLS_DTPMOD 00000000   tlsvar_gd
+[0-9a-f ]+R_MIPS_TLS_DTPREL 00000000   tlsvar_gd
+[0-9a-f ]+R_MIPS_TLS_DTPMOD 00000000   tlsvar_gd
+[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      000d8038   sym_1_9526
+[0-9a-f ]+R_MIPS_REL32      000d6694   sym_1_7885
+#...
+[0-9a-f ]+R_MIPS_REL32      000cf2a4   sym_1_0465
+[0-9a-f ]+R_MIPS_REL32      000e0ee8   sym_2_8654
 #...
-0014070c  004e2c03 R_MIPS_REL32      000cf2b4   sym_1_0465
-00139bd0  004e2d03 R_MIPS_REL32      000e0ef8   sym_2_8654
-00000000  00000000 R_MIPS_NONE      
-00000000  00000000 R_MIPS_NONE      
-00000000  00000000 R_MIPS_NONE      
-00000000  00000000 R_MIPS_NONE      
-00000000  00000000 R_MIPS_NONE      
-00000000  00000000 R_MIPS_NONE      
-00000000  00000000 R_MIPS_NONE      
-00000000  00000000 R_MIPS_NONE      
-00000000  00000000 R_MIPS_NONE      
-00000000  00000000 R_MIPS_NONE      
-00000000  00000000 R_MIPS_NONE      
-00000000  00000000 R_MIPS_NONE      
-00000000  00000000 R_MIPS_NONE      
-00000000  00000000 R_MIPS_NONE      
-00000000  00000000 R_MIPS_NONE      
-00000000  00000000 R_MIPS_NONE      
-00000000  00000000 R_MIPS_NONE      
-00000000  00000000 R_MIPS_NONE      
-00000000  00000000 R_MIPS_NONE      
-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 80da24763f..d416a872cb 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
-  .*:	279c7b70 	addiu	gp,gp,31600
+  .*:	279c7ba0 	addiu	gp,gp,31648
   .*:	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
-  .*:	279c7ab0 	addiu	gp,gp,31408
+  .*:	279c7ae0 	addiu	gp,gp,31456
   .*:	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 8f5084fb51..f19d77343a 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\*
-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
+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
 
 
 Contents of section .got:
- 10000010 00000000 80000000 00000000 00000000  ................
- 10000020 00000000 00000000 00000000 0040053c  .............@..
- 10000030 00000001 00000000 00000000 00000000  ................
- 10000040 00000000 00000000 00000000 00000000  ................
+ 10000020 00000000 80000000 00000000 00000000  ................
+ 10000030 00000000 00000000 00000000 0040051c  .............@..
+ 10000040 00000001 00000000 00000000 00000000  ................
+ 10000050 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 00965208dc..44730abaa3 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
-  .*:	279c7b70 	addiu	gp,gp,31600
+  .*:	279c7ba0 	addiu	gp,gp,31648
   .*:	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
-  .*:	279c7ab0 	addiu	gp,gp,31408
+  .*:	279c7ae0 	addiu	gp,gp,31456
   .*:	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 9f8b3ba1cf..8ceef73ac8 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\*
-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
+10000058 R_MIPS_TLS_DTPMOD32  tlsbin_gd
+1000005c R_MIPS_TLS_DTPREL32  tlsbin_gd
+1000004c R_MIPS_TLS_DTPMOD32  tlsvar_gd
+10000050 R_MIPS_TLS_DTPREL32  tlsvar_gd
+10000054 R_MIPS_TLS_TPREL32  tlsvar_ie
+10000060 R_MIPS_TLS_TPREL32  tlsbin_ie
 
 
 Contents of section .got:
- 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  ................
+ 10000020 00000000 80000000 00000000 00000000  .*
+ 10000030 00000000 00000000 00000000 00000000  .*
+ 10000040 0040051c 00000001 00000000 00000000  .*
+ 10000050 00000000 00000000 00000000 00000000  .*
+ 10000060 00000000 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 ae671e8d27..d254c94562 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
-  .*:	279c7b70 	addiu	gp,gp,31600
+  .*:	279c7ba0 	addiu	gp,gp,31648
   .*:	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
-  .*:	279c7ac0 	addiu	gp,gp,31424
+  .*:	279c7af0 	addiu	gp,gp,31472
   .*:	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 7342952361..89c9961d59 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\*
-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
+10000058 R_MIPS_TLS_DTPMOD32  tlsbin_gd
+1000005c R_MIPS_TLS_DTPREL32  tlsbin_gd
+1000004c R_MIPS_TLS_DTPMOD32  tlsvar_gd
+10000050 R_MIPS_TLS_DTPREL32  tlsvar_gd
+10000054 R_MIPS_TLS_TPREL32  tlsvar_ie
+10000060 R_MIPS_TLS_TPREL32  tlsbin_ie
 
 
 Contents of section .got:
- 10000010 00000000 80000000 00000000 00000000  ................
- 10000020 00000000 00000000 00000000 00000000  ................
- 10000030 004005ec 00000001 00000000 00000000  .@..............
- 10000040 00000000 00000000 00000000 00000000  ................
+ 10000020 00000000 80000000 00000000 00000000  ................
+ 10000030 00000000 00000000 00000000 00000000  ................
+ 10000040 004005cc 00000001 00000000 00000000  .@..............
  10000050 00000000 00000000 00000000 00000000  ................
+ 10000060 00000000 00000000 00000000 00000000  ................
diff --git a/ld/testsuite/ld-mips-elf/tlsdyn-o32.d b/ld/testsuite/ld-mips-elf/tlsdyn-o32.d
index 5fb13a09d5..d1f383d3eb 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
-  .*:	279c7bb0 	addiu	gp,gp,31664
+  .*:	279c7bc0 	addiu	gp,gp,31680
   .*:	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 206fd24198..633fc395c4 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\*
-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
+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
 
 
 Contents of section .got:
- 10000010 00000000 80000000 00000000 00000000  ................
- 10000020 00000000 00000000 00000000 004004fc  ................
- 10000030 00000001 00000000 00000000 00000000  ................
- 10000040 00000000 00000000 00000000 00000000  ................
+ 10000020 00000000 80000000 00000000 00000000  ................
+ 10000030 00000000 00000000 00000000 004004fc  ................
+ 10000040 00000001 00000000 00000000 00000000  ................
+ 10000050 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 a897ec462e..e1d64e0048 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\*
-000403fc R_MIPS_TLS_DTPMOD32  \*ABS\*
-000403f4 R_MIPS_TLS_DTPMOD32  \*ABS\*
-000403f0 R_MIPS_TLS_TPREL32  \*ABS\*
+000403cc R_MIPS_TLS_DTPMOD32  \*ABS\*
+000403c4 R_MIPS_TLS_DTPMOD32  \*ABS\*
+000403c0 R_MIPS_TLS_TPREL32  \*ABS\*
 
 
 Contents of section .got:
- 403d0 00000000 80000000 00000000 00000000  ................
- 403e0 00000000 00000000 00000000 000003a0  ................
- 403f0 00000008 00000000 00000000 00000000  ................
- 40400 ffff8004                             ....            
+ 403a0 00000000 80000000 00000000 00000000  ................
+ 403b0 00000000 00000000 00000000 00000370  ................
+ 403c0 00000008 00000000 00000000 00000000  ................
+ 403d0 ffff8004                             ....            
diff --git a/ld/testsuite/ld-mips-elf/tlslib-o32-ver.got b/ld/testsuite/ld-mips-elf/tlslib-o32-ver.got
index 1ec2551131..f039886708 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\*
-00040544 R_MIPS_TLS_DTPMOD32  \*ABS\*
-0004054c R_MIPS_TLS_DTPMOD32  tlsvar_gd
-00040550 R_MIPS_TLS_DTPREL32  tlsvar_gd
-00040540 R_MIPS_TLS_TPREL32  tlsvar_ie
+00040514 R_MIPS_TLS_DTPMOD32  \*ABS\*
+0004051c R_MIPS_TLS_DTPMOD32  tlsvar_gd
+00040520 R_MIPS_TLS_DTPREL32  tlsvar_gd
+00040510 R_MIPS_TLS_TPREL32  tlsvar_ie
 
 
 Contents of section .got:
- 40520 00000000 80000000 00000000 00000000  ................
- 40530 00000000 00000000 00000000 000004f0  ................
- 40540 00000000 00000000 00000000 00000000  ................
- 40550 00000000                             ....            
+ 404f0 00000000 80000000 00000000 00000000  ................
+ 40500 00000000 00000000 00000000 000004c0  ................
+ 40510 00000000 00000000 00000000 00000000  ................
+ 40520 00000000                             ....            
diff --git a/ld/testsuite/ld-mips-elf/tlslib-o32.got b/ld/testsuite/ld-mips-elf/tlslib-o32.got
index a0f3600e67..9a93aade40 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\*
-000404a4 R_MIPS_TLS_DTPMOD32  \*ABS\*
-000404ac R_MIPS_TLS_DTPMOD32  tlsvar_gd
-000404b0 R_MIPS_TLS_DTPREL32  tlsvar_gd
-000404a0 R_MIPS_TLS_TPREL32  tlsvar_ie
+00040474 R_MIPS_TLS_DTPMOD32  \*ABS\*
+0004047c R_MIPS_TLS_DTPMOD32  tlsvar_gd
+00040480 R_MIPS_TLS_DTPREL32  tlsvar_gd
+00040470 R_MIPS_TLS_TPREL32  tlsvar_ie
 
 
 Contents of section .got:
- 40480 00000000 80000000 00000000 00000000  ................
- 40490 00000000 00000000 00000000 00000450  ................
- 404a0 00000000 00000000 00000000 00000000  ................
- 404b0 00000000                             ....            
+ 40450 00000000 80000000 00000000 00000000  ................
+ 40460 00000000 00000000 00000000 00000420  ................
+ 40470 00000000 00000000 00000000 00000000  ................
+ 40480 00000000                             ....