From: Alan Modra <amodra@gmail.com>
Date: Wed, 6 Jun 2012 10:50:18 +0000 (+0000)
Subject: bfd/
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=ffbc01ccf0e0c923db2ffa3a6b3ca6b4f6d08ac5;hp=7b2fe205fd75672d5925fe63f3a0896fa3168aaf;p=deliverable%2Fbinutils-gdb.git

bfd/
	* elflink.c (elf_link_input_bfd): Provide a file symbol for
	each input file with local syms, if the input lacks such.
	(bfd_elf_final_link): Add a file symbol to mark end of locals
	for which we can associate with input files.
	(struct elf_final_link_info): Add filesym_count field.
	(struct elf_outext_info): Add need_second_pass and second_pass.
	(elf_link_output_extsym): Detect symbols defined in the output
	file, emit them on second pass over locals.
ld/testsuite/
Update to suit added STT_FILE symbols.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 9874ff1cf1..9744a8b9c2 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,14 @@
+2012-06-06  Alan Modra  <amodra@gmail.com>
+
+	* elflink.c (elf_link_input_bfd): Provide a file symbol for
+	each input file with local syms, if the input lacks such.
+	(bfd_elf_final_link): Add a file symbol to mark end of locals
+	for which we can associate with input files.
+	(struct elf_final_link_info): Add filesym_count field.
+	(struct elf_outext_info): Add need_second_pass and second_pass.
+	(elf_link_output_extsym): Detect symbols defined in the output
+	file, emit them on second pass over locals.
+
 2012-06-04  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	* bfd-in.h (bfd_elf_bfd_from_remote_memory): Make LEN argument
diff --git a/bfd/elflink.c b/bfd/elflink.c
index e715942841..a9d95bd1b0 100644
--- a/bfd/elflink.c
+++ b/bfd/elflink.c
@@ -7403,6 +7403,8 @@ struct elf_final_link_info
   size_t symbuf_size;
   /* And same for symshndxbuf.  */
   size_t shndxbuf_size;
+  /* Number of STT_FILE syms seen.  */
+  size_t filesym_count;
 };
 
 /* This struct is used to pass information to elf_link_output_extsym.  */
@@ -7411,6 +7413,8 @@ struct elf_outext_info
 {
   bfd_boolean failed;
   bfd_boolean localsyms;
+  bfd_boolean need_second_pass;
+  bfd_boolean second_pass;
   struct elf_final_link_info *flinfo;
 };
 
@@ -8605,6 +8609,11 @@ elf_link_output_extsym (struct bfd_hash_entry *bh, void *data)
     {
       if (!h->forced_local)
 	return TRUE;
+      if (eoinfo->second_pass
+	  && !((h->root.type == bfd_link_hash_defined
+		|| h->root.type == bfd_link_hash_defweak)
+	       && h->root.u.def.section->output_section != NULL))
+	return TRUE;
     }
   else
     {
@@ -8759,6 +8768,19 @@ elf_link_output_extsym (struct bfd_hash_entry *bh, void *data)
 	input_sec = h->root.u.def.section;
 	if (input_sec->output_section != NULL)
 	  {
+	    if (eoinfo->localsyms && flinfo->filesym_count == 1)
+	      {
+		bfd_boolean second_pass_sym
+		  = (input_sec->owner == flinfo->output_bfd
+		     || input_sec->owner == NULL
+		     || (input_sec->flags & SEC_LINKER_CREATED) != 0
+		     || (input_sec->owner->flags & BFD_LINKER_CREATED) != 0);
+
+		eoinfo->need_second_pass |= second_pass_sym;
+		if (eoinfo->second_pass != second_pass_sym)
+		  return TRUE;
+	      }
+
 	    sym.st_shndx =
 	      _bfd_elf_section_from_bfd_section (flinfo->output_bfd,
 						 input_sec->output_section);
@@ -9111,6 +9133,7 @@ elf_link_input_bfd (struct elf_final_link_info *flinfo, bfd *input_bfd)
   bfd_size_type address_size;
   bfd_vma r_type_mask;
   int r_sym_shift;
+  bfd_boolean have_file_sym = FALSE;
 
   output_bfd = flinfo->output_bfd;
   bed = get_elf_backend_data (output_bfd);
@@ -9246,6 +9269,29 @@ elf_link_input_bfd (struct elf_final_link_info *flinfo, bfd *input_bfd)
 	      && bfd_is_local_label_name (input_bfd, name)))
 	continue;
 
+      if (ELF_ST_TYPE (isym->st_info) == STT_FILE)
+	{
+	  have_file_sym = TRUE;
+	  flinfo->filesym_count += 1;
+	}
+      if (!have_file_sym)
+	{
+	  /* In the absence of debug info, bfd_find_nearest_line uses
+	     FILE symbols to determine the source file for local
+	     function symbols.  Provide a FILE symbol here if input
+	     files lack such, so that their symbols won't be
+	     associated with a previous input file.  It's not the
+	     source file, but the best we can do.  */
+	  have_file_sym = TRUE;
+	  flinfo->filesym_count += 1;
+	  memset (&osym, 0, sizeof (osym));
+	  osym.st_info = ELF_ST_INFO (STB_LOCAL, STT_FILE);
+	  osym.st_shndx = SHN_ABS;
+	  if (!elf_link_output_sym (flinfo, input_bfd->filename, &osym,
+				    bfd_abs_section_ptr, NULL))
+	    return FALSE;
+	}
+
       osym = *isym;
 
       /* Adjust the section index for the output file.  */
@@ -10318,6 +10364,7 @@ bfd_elf_final_link (bfd *abfd, struct bfd_link_info *info)
   flinfo.symshndxbuf = NULL;
   flinfo.symbuf_count = 0;
   flinfo.shndxbuf_size = 0;
+  flinfo.filesym_count = 0;
 
   /* The object attributes have been merged.  Remove the input
      sections from the link, and set the contents of the output
@@ -10792,6 +10839,17 @@ bfd_elf_final_link (bfd *abfd, struct bfd_link_info *info)
 	  }
     }
 
+  /* Output a FILE symbol so that following locals are not associated
+     with the wrong input file.  */
+  memset (&elfsym, 0, sizeof (elfsym));
+  elfsym.st_info = ELF_ST_INFO (STB_LOCAL, STT_FILE);
+  elfsym.st_shndx = SHN_ABS;
+
+  if (flinfo.filesym_count > 1
+      && !elf_link_output_sym (&flinfo, NULL, &elfsym,
+			       bfd_und_section_ptr, NULL))
+    return FALSE;
+
   /* Output any global symbols that got converted to local in a
      version script or due to symbol visibility.  We do this in a
      separate step since ELF requires all local symbols to appear
@@ -10801,10 +10859,25 @@ bfd_elf_final_link (bfd *abfd, struct bfd_link_info *info)
   eoinfo.failed = FALSE;
   eoinfo.flinfo = &flinfo;
   eoinfo.localsyms = TRUE;
+  eoinfo.need_second_pass = FALSE;
+  eoinfo.second_pass = FALSE;
   bfd_hash_traverse (&info->hash->table, elf_link_output_extsym, &eoinfo);
   if (eoinfo.failed)
     return FALSE;
 
+  if (flinfo.filesym_count == 1
+      && !elf_link_output_sym (&flinfo, NULL, &elfsym,
+			       bfd_und_section_ptr, NULL))
+    return FALSE;
+
+  if (eoinfo.need_second_pass)
+    {
+      eoinfo.second_pass = TRUE;
+      bfd_hash_traverse (&info->hash->table, elf_link_output_extsym, &eoinfo);
+      if (eoinfo.failed)
+	return FALSE;
+    }
+
   /* If backend needs to output some local symbols not present in the hash
      table, do it now.  */
   if (bed->elf_backend_output_arch_local_syms)
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 1bcd8dadc2..a37ddc1122 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,49 @@
+2012-06-06  Alan Modra  <amodra@gmail.com>
+
+	* ld-alpha/tlsbin.rd, * ld-alpha/tlsbinr.rd, * ld-alpha/tlspic.rd,
+	* ld-arm/script-type.sym, * ld-cris/hiddef1.d, * ld-cris/tls-e-20a.d,
+	* ld-cris/tls-e-tpoffcomm1.d, * ld-cris/tls-gc-76.d,
+	* ld-cris/tls-local-64.d, * ld-i386/pr12718.d, * ld-i386/pr12921.d,
+	* ld-i386/tlsbin.rd, * ld-i386/tlsbindesc.rd, * ld-i386/tlsdesc.rd,
+	* ld-i386/tlsnopic.rd, * ld-i386/tlspic.rd, * ld-ia64/tlsbin.rd,
+	* ld-ia64/tlspic.rd, * ld-mips-elf/reloc-merge-lo16.d,
+	* ld-mmix/bpo-1.d, * ld-mmix/bpo-10.d, * ld-mmix/bpo-11.d,
+	* ld-mmix/bpo-14.d, * ld-mmix/bpo-16.d, * ld-mmix/bpo-17.d,
+	* ld-mmix/bpo-18.d, * ld-mmix/bpo-2.d, * ld-mmix/bpo-22.d,
+	* ld-mmix/bpo-3.d, * ld-mmix/bpo-4.d, * ld-mmix/bpo-5.d,
+	* ld-mmix/bpo-9.d, * ld-mmix/greg-1.d, * ld-mmix/greg-19.d,
+	* ld-mmix/greg-2.d, * ld-mmix/greg-3.d, * ld-mmix/greg-4.d,
+	* ld-mmix/greg-5.d, * ld-mmix/greg-5s.d, * ld-mmix/greg-6.d,
+	* ld-mmix/greg-7.d, * ld-mmix/loc4.d, * ld-mmix/local1.d,
+	* ld-mmix/local3.d, * ld-mmix/local5.d, * ld-mmix/local7.d,
+	* ld-mmix/loct-1.d, * ld-mn10300/i135409-1.d, * ld-powerpc/tlsexe.r,
+	* ld-powerpc/tlsexe32.r, * ld-powerpc/tlsexetoc.r,
+	* ld-powerpc/tlsso.r, * ld-powerpc/tlsso32.r, * ld-powerpc/tlstocso.r,
+	* ld-powerpc/vxworks-relax-2.rd, * ld-s390/tlsbin.rd,
+	* ld-s390/tlspic.rd, * ld-s390/tlspic_64.rd, * ld-sh/sub2l-1.d,
+	* ld-sh/weak1.d, * ld-sh/sh64/abi32.xd, * ld-sh/sh64/abi64.xd,
+	* ld-sh/sh64/cmpct1.xd, * ld-sh/sh64/crange1.rd,
+	* ld-sh/sh64/crange2.rd, * ld-sh/sh64/crange3-cmpct.rd,
+	* ld-sh/sh64/crange3-media.rd, * ld-sh/sh64/crange3.rd,
+	* ld-sh/sh64/crangerel1.rd, * ld-sh/sh64/crangerel2.rd,
+	* ld-sh/sh64/mix1.xd, * ld-sh/sh64/mix2.xd, * ld-sh/sh64/shdl32.xd,
+	* ld-sh/sh64/shdl64.xd, * ld-sparc/gotop32.rd,
+	* ld-sparc/gotop64.rd, * ld-sparc/tlssunbin32.rd,
+	* ld-sparc/tlssunbin64.rd, * ld-sparc/tlssunnopic32.rd,
+	* ld-sparc/tlssunnopic64.rd, * ld-sparc/tlssunpic32.rd,
+	* ld-sparc/tlssunpic64.rd, * ld-tic6x/shlib-1.rd,
+	* ld-tic6x/shlib-1b.rd, * ld-tic6x/shlib-1r.rd, * ld-tic6x/shlib-1rb.rd,
+	* ld-tic6x/shlib-app-1.rd, * ld-tic6x/shlib-app-1b.rd,
+	* ld-tic6x/shlib-app-1r.rd, * ld-tic6x/shlib-app-1rb.rd,
+	* ld-tic6x/shlib-noindex.rd, * ld-tic6x/static-app-1.rd,
+	* ld-tic6x/static-app-1b.rd, * ld-tic6x/static-app-1r.rd,
+	* ld-tic6x/static-app-1rb.rd, * ld-x86-64/ilp32-4-nacl.d,
+	* ld-x86-64/ilp32-4.d, * ld-x86-64/pr12718.d, * ld-x86-64/pr12921.d,
+	* ld-x86-64/split-by-file-nacl.rd, * ld-x86-64/split-by-file.rd,
+	* ld-x86-64/tlsbin.rd, * ld-x86-64/tlsbindesc.rd,
+	* ld-x86-64/tlsdesc.rd, * ld-x86-64/tlspic.rd: Update to suit
+	added STT_FILE symbols.
+
 2012-06-06  Alan Modra  <amodra@gmail.com>
 
 	* ld-mmix/bpo-9.d: Update.
diff --git a/ld/testsuite/ld-alpha/tlsbin.rd b/ld/testsuite/ld-alpha/tlsbin.rd
index 44633ac43b..64c28f61d7 100644
--- a/ld/testsuite/ld-alpha/tlsbin.rd
+++ b/ld/testsuite/ld-alpha/tlsbin.rd
@@ -80,6 +80,7 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 [0-9 ]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +11 
 [0-9 ]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +12 
 [0-9 ]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +13 
+.* FILE +LOCAL +DEFAULT +ABS .*
 [0-9 ]+: [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +9 sl1
 [0-9 ]+: [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +9 sl2
 [0-9 ]+: [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +9 sl3
@@ -88,6 +89,7 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 [0-9 ]+: [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +9 sl6
 [0-9 ]+: [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +9 sl7
 [0-9 ]+: [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +9 sl8
+.* FILE +LOCAL +DEFAULT +ABS .*
 [0-9 ]+: [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +10 bl1
 [0-9 ]+: [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +10 bl2
 [0-9 ]+: [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +10 bl3
@@ -96,6 +98,7 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 [0-9 ]+: [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +10 bl6
 [0-9 ]+: [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +10 bl7
 [0-9 ]+: [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +10 bl8
+.* FILE +LOCAL +DEFAULT +ABS .*
 [0-9 ]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +11 _DYNAMIC
 [0-9 ]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +12 _PROCEDURE_LINKAGE_TABLE_
 [0-9 ]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +13 _GLOBAL_OFFSET_TABLE_
diff --git a/ld/testsuite/ld-alpha/tlsbinr.rd b/ld/testsuite/ld-alpha/tlsbinr.rd
index 247957d5ea..78229c464c 100644
--- a/ld/testsuite/ld-alpha/tlsbinr.rd
+++ b/ld/testsuite/ld-alpha/tlsbinr.rd
@@ -75,6 +75,7 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 [0-9 ]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +11 
 [0-9 ]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +12 
 [0-9 ]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +13 
+.* FILE +LOCAL +DEFAULT +ABS .*
 [0-9 ]+: [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +9 sl1
 [0-9 ]+: [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +9 sl2
 [0-9 ]+: [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +9 sl3
@@ -83,6 +84,7 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 [0-9 ]+: [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +9 sl6
 [0-9 ]+: [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +9 sl7
 [0-9 ]+: [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +9 sl8
+.* FILE +LOCAL +DEFAULT +ABS .*
 [0-9 ]+: [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +10 bl1
 [0-9 ]+: [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +10 bl2
 [0-9 ]+: [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +10 bl3
@@ -91,6 +93,7 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 [0-9 ]+: [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +10 bl6
 [0-9 ]+: [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +10 bl7
 [0-9 ]+: [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +10 bl8
+.* FILE +LOCAL +DEFAULT +ABS .*
 [0-9 ]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +11 _DYNAMIC
 [0-9 ]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +12 _PROCEDURE_LINKAGE_TABLE_
 [0-9 ]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +13 _GLOBAL_OFFSET_TABLE_
diff --git a/ld/testsuite/ld-alpha/tlspic.rd b/ld/testsuite/ld-alpha/tlspic.rd
index 9a992b4276..58de2d070e 100644
--- a/ld/testsuite/ld-alpha/tlspic.rd
+++ b/ld/testsuite/ld-alpha/tlspic.rd
@@ -86,6 +86,7 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .* [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +10 
 .* [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +11 
 .* [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +12 
+.* FILE +LOCAL +DEFAULT +ABS .*
 .* [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +8 sl1
 .* [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +8 sl2
 .* [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +8 sl3
@@ -95,11 +96,9 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .* [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +8 sl7
 .* [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +8 sl8
 .* [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +9 sH1
-.* [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +ABS _DYNAMIC
 .* [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +8 sh3
 .* [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +9 sH2
 .* [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +9 sH7
-.* [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
 .* [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +8 sh7
 .* [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +8 sh8
 .* [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +9 sH4
@@ -110,9 +109,12 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .* [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +9 sH6
 .* [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +9 sH8
 .* [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +8 sh1
-.* [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
 .* [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +8 sh2
 .* [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +8 sh6
+.* FILE +LOCAL +DEFAULT +ABS .*
+.* [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +ABS _DYNAMIC
+.* [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
+.* [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
 .* [0-9a-f]+ +0 +TLS +GLOBAL +DEFAULT +8 sg8
 .* [0-9a-f]+ +0 +TLS +GLOBAL +DEFAULT +8 sg3
 .* [0-9a-f]+ +0 +TLS +GLOBAL +DEFAULT +8 sg4
diff --git a/ld/testsuite/ld-arm/script-type.sym b/ld/testsuite/ld-arm/script-type.sym
index d319d5c3b0..4b54dd639c 100644
--- a/ld/testsuite/ld-arm/script-type.sym
+++ b/ld/testsuite/ld-arm/script-type.sym
@@ -1,16 +1,18 @@
 
-Symbol table '.symtab' contains 13 entries:
-   Num:    Value  Size Type    Bind   Vis      Ndx Name
-     0: 00000000     0 NOTYPE  LOCAL  DEFAULT  UND 
-     1: 00000000     0 SECTION LOCAL  DEFAULT    1 
-     2: 00000000     0 SECTION LOCAL  DEFAULT    2 
-     3: 00000000     0 NOTYPE  LOCAL  DEFAULT    1 \$a
-     4: 00000010     0 NOTYPE  LOCAL  DEFAULT    1 \$d
-     5: 00000014     0 NOTYPE  LOCAL  DEFAULT    1 \$a
-     6: 00000020     0 NOTYPE  LOCAL  DEFAULT    1 \$t
-     7: 00000010     0 OBJECT  GLOBAL DEFAULT    1 bar_o
-     8: 00000021     0 FUNC    GLOBAL DEFAULT    1 bar_t
-     9: 00000000     0 FUNC    GLOBAL DEFAULT    1 foo_a
-    10: 00000021     0 FUNC    GLOBAL DEFAULT    1 foo_t
-    11: 00000010     0 OBJECT  GLOBAL DEFAULT    1 foo_o
-    12: 00000000     0 FUNC    GLOBAL DEFAULT    1 bar_a
+Symbol table '.symtab' contains [0-9]+ entries:
+ +Num: +Value +Size Type +Bind +Vis +Ndx Name
+.* 0+ +0 NOTYPE +LOCAL +DEFAULT +UND 
+.* 0+ +0 SECTION LOCAL +DEFAULT +1 
+.* 0+ +0 SECTION LOCAL +DEFAULT +2 
+.* 0+ +0 FILE +LOCAL +DEFAULT +ABS .*
+.* 0+ +0 NOTYPE +LOCAL +DEFAULT +1 \$a
+.* 0+10 +0 NOTYPE +LOCAL +DEFAULT +1 \$d
+.* 0+14 +0 NOTYPE +LOCAL +DEFAULT +1 \$a
+.* 0+20 +0 NOTYPE +LOCAL +DEFAULT +1 \$t
+.* 0+ +0 FILE +LOCAL +DEFAULT +ABS .*
+.* 0+10 +0 OBJECT +GLOBAL DEFAULT +1 bar_o
+.* 0+21 +0 FUNC +GLOBAL DEFAULT +1 bar_t
+.* 0+ +0 FUNC +GLOBAL DEFAULT +1 foo_a
+.* 0+21 +0 FUNC +GLOBAL DEFAULT +1 foo_t
+.* 0+10 +0 OBJECT +GLOBAL DEFAULT +1 foo_o
+.* 0+ +0 FUNC +GLOBAL DEFAULT +1 bar_a
diff --git a/ld/testsuite/ld-cris/hiddef1.d b/ld/testsuite/ld-cris/hiddef1.d
index 1a1cc186bd..0be90a1fae 100644
--- a/ld/testsuite/ld-cris/hiddef1.d
+++ b/ld/testsuite/ld-cris/hiddef1.d
@@ -24,5 +24,5 @@ Relocation section '\.rela\.dyn' at offset 0x[0-9a-f]+ contains 1 entries:
 #...
 Symbol table '\.dynsym' contains 6 entries:
 #...
-Symbol table '\.symtab' contains 16 entries:
+Symbol table '\.symtab' contains 18 entries:
 #pass
diff --git a/ld/testsuite/ld-cris/tls-e-20a.d b/ld/testsuite/ld-cris/tls-e-20a.d
index 5f52881603..834bd2499a 100644
--- a/ld/testsuite/ld-cris/tls-e-20a.d
+++ b/ld/testsuite/ld-cris/tls-e-20a.d
@@ -40,7 +40,9 @@ SYMBOL TABLE:
 0+820dc l    d  \.tdata	0+ \.tdata
 0+82168 l    d  \.got	0+ \.got
 0+821a4 l    d  \.data	0+ \.data
+0+ l    df \*ABS\*	0+ .*
 0+ l       \.tdata	0+80 tls128
+0+ l    df \*ABS\*	0+ .*
 0+82168 l     O \.got	0+ _GLOBAL_OFFSET_TABLE_
 0+80 g       \.tdata	0+4 \.hidden x
 0+800c4 g     F \.text	0+6 tlsdsofn2
diff --git a/ld/testsuite/ld-cris/tls-e-tpoffcomm1.d b/ld/testsuite/ld-cris/tls-e-tpoffcomm1.d
index 23d52ee06d..48a52ea42d 100644
--- a/ld/testsuite/ld-cris/tls-e-tpoffcomm1.d
+++ b/ld/testsuite/ld-cris/tls-e-tpoffcomm1.d
@@ -25,7 +25,9 @@ Idx Name          Size      VMA       LMA       File off  Algn
 SYMBOL TABLE:
 0+80074 l    d  .text	0+ .text
 0+82084 l    d  .tbss	0+ .tbss
+0+ l    df \*ABS\*	0+ .*
 0+80078 l     F .text	0+c do_test
+0+ l    df \*ABS\*	0+ .*
 0+80074 g       .text	0+ _start
 0+82084 g       \*ABS\*	0+ __bss_start
 0+ g       .tbss	0+4 foo
diff --git a/ld/testsuite/ld-cris/tls-gc-76.d b/ld/testsuite/ld-cris/tls-gc-76.d
index 52387275e2..8f3dcc114e 100644
--- a/ld/testsuite/ld-cris/tls-gc-76.d
+++ b/ld/testsuite/ld-cris/tls-gc-76.d
@@ -22,7 +22,9 @@ SYMBOL TABLE:
 0+80074 l    d  .text	0+ .text
 0+82080 l    d  .got	0+ .got
 0+82090 l    d  .data	0+ .data
+0+ l    df \*ABS\*	0+ .*
 0+82090 l     O .data	0+4 gc76var
+0+ l    df \*ABS\*	0+ .*
 0+82094 l       \*ABS\*	0+ __bss_start
 0+82094 l       \*ABS\*	0+ _edata
 0+82080 l     O .got	0+ _GLOBAL_OFFSET_TABLE_
diff --git a/ld/testsuite/ld-cris/tls-local-64.d b/ld/testsuite/ld-cris/tls-local-64.d
index 1ed741c15d..8fb44ee970 100644
--- a/ld/testsuite/ld-cris/tls-local-64.d
+++ b/ld/testsuite/ld-cris/tls-local-64.d
@@ -19,7 +19,7 @@ The decoding of unwind sections for machine type Axis Communications 32-bit embe
 Symbol table '.dynsym' contains 7 entries:
    Num:    Value  Size Type    Bind   Vis      Ndx Name
 #...
-Symbol table '.symtab' contains 17 entries:
+Symbol table '.symtab' contains [0-9]+ entries:
 #...
     ..: 00000080 +4 +TLS +LOCAL +DEFAULT +6 x
 #...
diff --git a/ld/testsuite/ld-i386/pr12718.d b/ld/testsuite/ld-i386/pr12718.d
index 5980aee2a3..61634c8aad 100644
--- a/ld/testsuite/ld-i386/pr12718.d
+++ b/ld/testsuite/ld-i386/pr12718.d
@@ -10,7 +10,7 @@ Section Headers:
  +\[ 0\] +NULL +0+ +0+ +0+ +0+ +0 +0 +0
  +\[ 1\] +.text +PROGBITS +[0-9a-f]+ +[0-9a-f]+ +000006 00 +AX +0 +0 +4
  +\[ 2\] +.shstrtab +STRTAB +0+ +[0-9a-f]+ +[0-9a-f]+ +0+ +0 +0 +1
- +\[ 3\] +.symtab +SYMTAB +0+ +[0-9a-f]+ +[0-9a-f]+ 10 +4 +2 +4
+ +\[ 3\] +.symtab +SYMTAB +0+ +[0-9a-f]+ +[0-9a-f]+ 10 +4 +[0-9] +4
  +\[ 4\] +.strtab +STRTAB +0+ +[0-9a-f]+ +[0-9a-f]+ 00 +0 +0 +1
 Key to Flags:
   W \(write\), A \(alloc\), X \(execute\), M \(merge\), S \(strings\)
diff --git a/ld/testsuite/ld-i386/pr12921.d b/ld/testsuite/ld-i386/pr12921.d
index 269c9f9aa7..891db8b41d 100644
--- a/ld/testsuite/ld-i386/pr12921.d
+++ b/ld/testsuite/ld-i386/pr12921.d
@@ -12,8 +12,8 @@ Section Headers:
  +\[ 2\] .data +PROGBITS +[0-9a-f]+ +[0-9a-f]+000 +0+20 +00 +WA +0 +0 +4096
  +\[ 3\] .bss +NOBITS +[0-9a-f]+ +[0-9a-f]+020 +0+10000 +00 +WA +0 +0 +4096
  +\[ 4\] .shstrtab +STRTAB +0+ +[0-9a-f]+ +0+2c +00 +0 +0 +1
- +\[ 5\] .symtab +SYMTAB +0+ +[0-9a-f]+ +0+c0 +10 +6 +6 +4
- +\[ 6\] .strtab +STRTAB +0+ +[0-9a-f]+ +0+37 +00 +0 +0 +1
+ +\[ 5\] .symtab +SYMTAB +0+ +[0-9a-f]+ +[0-9a-f]+ +10 +6 +[0-9] +4
+ +\[ 6\] .strtab +STRTAB +0+ +[0-9a-f]+ +[0-9a-f]+ +00 +0 +0 +1
 Key to Flags:
   W \(write\), A \(alloc\), X \(execute\), M \(merge\), S \(strings\)
   I \(info\), L \(link order\), G \(group\), T \(TLS\), E \(exclude\), x \(unknown\)
diff --git a/ld/testsuite/ld-i386/tlsbin.rd b/ld/testsuite/ld-i386/tlsbin.rd
index 5579334614..81f8ac0bd8 100644
--- a/ld/testsuite/ld-i386/tlsbin.rd
+++ b/ld/testsuite/ld-i386/tlsbin.rd
@@ -102,6 +102,7 @@ Symbol table '\.symtab' contains [0-9]+ entries:
  +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +11 *
  +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +12 *
  +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +13 *
+.* FILE +LOCAL +DEFAULT +ABS .*
  +[0-9]+: 00000020 +0 +TLS +LOCAL +DEFAULT +9 sl1
  +[0-9]+: 00000024 +0 +TLS +LOCAL +DEFAULT +9 sl2
  +[0-9]+: 00000028 +0 +TLS +LOCAL +DEFAULT +9 sl3
@@ -110,6 +111,7 @@ Symbol table '\.symtab' contains [0-9]+ entries:
  +[0-9]+: 00000034 +0 +TLS +LOCAL +DEFAULT +9 sl6
  +[0-9]+: 00000038 +0 +TLS +LOCAL +DEFAULT +9 sl7
  +[0-9]+: 0000003c +0 +TLS +LOCAL +DEFAULT +9 sl8
+.* FILE +LOCAL +DEFAULT +ABS .*
  +[0-9]+: 00000080 +0 +TLS +LOCAL +DEFAULT +10 bl1
  +[0-9]+: 00000084 +0 +TLS +LOCAL +DEFAULT +10 bl2
  +[0-9]+: 00000088 +0 +TLS +LOCAL +DEFAULT +10 bl3
@@ -118,6 +120,7 @@ Symbol table '\.symtab' contains [0-9]+ entries:
  +[0-9]+: 00000094 +0 +TLS +LOCAL +DEFAULT +10 bl6
  +[0-9]+: 00000098 +0 +TLS +LOCAL +DEFAULT +10 bl7
  +[0-9]+: 0000009c +0 +TLS +LOCAL +DEFAULT +10 bl8
+.* FILE +LOCAL +DEFAULT +ABS .*
  +[0-9]+: 0+804a060 +0 +OBJECT +LOCAL +DEFAULT +11 _DYNAMIC
  +[0-9]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +13 _GLOBAL_OFFSET_TABLE_
  +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG3
diff --git a/ld/testsuite/ld-i386/tlsbindesc.rd b/ld/testsuite/ld-i386/tlsbindesc.rd
index a334e5617b..a64a508baf 100644
--- a/ld/testsuite/ld-i386/tlsbindesc.rd
+++ b/ld/testsuite/ld-i386/tlsbindesc.rd
@@ -93,6 +93,7 @@ Symbol table '\.symtab' contains [0-9]+ entries:
  +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +9 *
  +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +10 *
  +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +11 *
+.* FILE +LOCAL +DEFAULT +ABS .*
  +[0-9]+: 00000020 +0 +TLS +LOCAL +DEFAULT +7 sl1
  +[0-9]+: 00000024 +0 +TLS +LOCAL +DEFAULT +7 sl2
  +[0-9]+: 00000028 +0 +TLS +LOCAL +DEFAULT +7 sl3
@@ -101,6 +102,7 @@ Symbol table '\.symtab' contains [0-9]+ entries:
  +[0-9]+: 00000034 +0 +TLS +LOCAL +DEFAULT +7 sl6
  +[0-9]+: 00000038 +0 +TLS +LOCAL +DEFAULT +7 sl7
  +[0-9]+: 0000003c +0 +TLS +LOCAL +DEFAULT +7 sl8
+.* FILE +LOCAL +DEFAULT +ABS .*
  +[0-9]+: 00000080 +0 +TLS +LOCAL +DEFAULT +8 bl1
  +[0-9]+: 00000084 +0 +TLS +LOCAL +DEFAULT +8 bl2
  +[0-9]+: 00000088 +0 +TLS +LOCAL +DEFAULT +8 bl3
@@ -109,6 +111,7 @@ Symbol table '\.symtab' contains [0-9]+ entries:
  +[0-9]+: 00000094 +0 +TLS +LOCAL +DEFAULT +8 bl6
  +[0-9]+: 00000098 +0 +TLS +LOCAL +DEFAULT +8 bl7
  +[0-9]+: 0000009c +0 +TLS +LOCAL +DEFAULT +8 bl8
+.* FILE +LOCAL +DEFAULT +ABS .*
  +[0-9]+: 00001000 +0 +TLS +LOCAL +DEFAULT +7 _TLS_MODULE_BASE_
  +[0-9]+: 0+804a060 +0 +OBJECT +LOCAL +DEFAULT +9 _DYNAMIC
  +[0-9]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +11 _GLOBAL_OFFSET_TABLE_
diff --git a/ld/testsuite/ld-i386/tlsdesc.rd b/ld/testsuite/ld-i386/tlsdesc.rd
index afe9f4fd9e..0bba12aaa3 100644
--- a/ld/testsuite/ld-i386/tlsdesc.rd
+++ b/ld/testsuite/ld-i386/tlsdesc.rd
@@ -108,6 +108,7 @@ Symbol table '\.symtab' contains [0-9]+ entries:
  +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +9 *
  +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +10 *
  +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +11 *
+.* FILE +LOCAL +DEFAULT +ABS .*
  +[0-9]+: 0+20 +0 +TLS +LOCAL +DEFAULT +7 sl1
  +[0-9]+: 0+24 +0 +TLS +LOCAL +DEFAULT +7 sl2
  +[0-9]+: 0+28 +0 +TLS +LOCAL +DEFAULT +7 sl3
@@ -117,8 +118,6 @@ Symbol table '\.symtab' contains [0-9]+ entries:
  +[0-9]+: 0+38 +0 +TLS +LOCAL +DEFAULT +7 sl7
  +[0-9]+: 0+3c +0 +TLS +LOCAL +DEFAULT +7 sl8
  +[0-9]+: 0+60 +0 +TLS +LOCAL +DEFAULT +8 sH1
- +[0-9]+: 0+ +0 +TLS +LOCAL +DEFAULT +7 _TLS_MODULE_BASE_
- +[0-9]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +9 _DYNAMIC
  +[0-9]+: 0+48 +0 +TLS +LOCAL +DEFAULT +7 sh3
  +[0-9]+: 0+64 +0 +TLS +LOCAL +DEFAULT +8 sH2
  +[0-9]+: 0+78 +0 +TLS +LOCAL +DEFAULT +8 sH7
@@ -132,9 +131,12 @@ Symbol table '\.symtab' contains [0-9]+ entries:
  +[0-9]+: 0+74 +0 +TLS +LOCAL +DEFAULT +8 sH6
  +[0-9]+: 0+7c +0 +TLS +LOCAL +DEFAULT +8 sH8
  +[0-9]+: 0+40 +0 +TLS +LOCAL +DEFAULT +7 sh1
- +[0-9]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +11 _GLOBAL_OFFSET_TABLE_
  +[0-9]+: 0+44 +0 +TLS +LOCAL +DEFAULT +7 sh2
  +[0-9]+: 0+54 +0 +TLS +LOCAL +DEFAULT +7 sh6
+.* FILE +LOCAL +DEFAULT +ABS .*
+ +[0-9]+: 0+ +0 +TLS +LOCAL +DEFAULT +7 _TLS_MODULE_BASE_
+ +[0-9]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +9 _DYNAMIC
+ +[0-9]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +11 _GLOBAL_OFFSET_TABLE_
  +[0-9]+: 0+1c +0 +TLS +GLOBAL +DEFAULT +7 sg8
  +[0-9]+: 0+8 +0 +TLS +GLOBAL +DEFAULT +7 sg3
  +[0-9]+: 0+c +0 +TLS +GLOBAL +DEFAULT +7 sg4
diff --git a/ld/testsuite/ld-i386/tlsnopic.rd b/ld/testsuite/ld-i386/tlsnopic.rd
index da725b9dcc..5ea99ef3fa 100644
--- a/ld/testsuite/ld-i386/tlsnopic.rd
+++ b/ld/testsuite/ld-i386/tlsnopic.rd
@@ -94,17 +94,19 @@ Symbol table '\.symtab' contains [0-9]+ entries:
  +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +7 *
  +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +8 *
  +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +9 *
+.* FILE +LOCAL +DEFAULT +ABS .*
  +[0-9]+: 0+00 +0 +TLS +LOCAL +DEFAULT +6 bl1
  +[0-9]+: 0+04 +0 +TLS +LOCAL +DEFAULT +6 bl2
  +[0-9]+: 0+08 +0 +TLS +LOCAL +DEFAULT +6 bl3
  +[0-9]+: 0+0c +0 +TLS +LOCAL +DEFAULT +6 bl4
  +[0-9]+: 0+10 +0 +TLS +LOCAL +DEFAULT +6 bl5
- +[0-9]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +7 _DYNAMIC
  +[0-9]+: 0+1c +0 +TLS +LOCAL +DEFAULT +6 sh3
  +[0-9]+: 0+20 +0 +TLS +LOCAL +DEFAULT +6 sh4
  +[0-9]+: 0+14 +0 +TLS +LOCAL +DEFAULT +6 sh1
- +[0-9]+: 0+218c +0 +OBJECT +LOCAL +DEFAULT +9 _GLOBAL_OFFSET_TABLE_
  +[0-9]+: 0+18 +0 +TLS +LOCAL +DEFAULT +6 sh2
+.* FILE +LOCAL +DEFAULT +ABS .*
+ +[0-9]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +7 _DYNAMIC
+ +[0-9]+: 0+218c +0 +OBJECT +LOCAL +DEFAULT +9 _GLOBAL_OFFSET_TABLE_
  +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sg3
  +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sg4
  +[0-9]+: 0+1000 +0 +FUNC +GLOBAL +DEFAULT +5 fn3
diff --git a/ld/testsuite/ld-i386/tlspic.rd b/ld/testsuite/ld-i386/tlspic.rd
index 3594fd9a78..e9702fba86 100644
--- a/ld/testsuite/ld-i386/tlspic.rd
+++ b/ld/testsuite/ld-i386/tlspic.rd
@@ -113,6 +113,7 @@ Symbol table '\.symtab' contains [0-9]+ entries:
  +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +10 *
  +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +11 *
  +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +12 *
+.* FILE +LOCAL +DEFAULT +ABS .*
  +[0-9]+: 0+20 +0 +TLS +LOCAL +DEFAULT +8 sl1
  +[0-9]+: 0+24 +0 +TLS +LOCAL +DEFAULT +8 sl2
  +[0-9]+: 0+28 +0 +TLS +LOCAL +DEFAULT +8 sl3
@@ -122,7 +123,6 @@ Symbol table '\.symtab' contains [0-9]+ entries:
  +[0-9]+: 0+38 +0 +TLS +LOCAL +DEFAULT +8 sl7
  +[0-9]+: 0+3c +0 +TLS +LOCAL +DEFAULT +8 sl8
  +[0-9]+: 0+60 +0 +TLS +LOCAL +DEFAULT +9 sH1
- +[0-9]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +10 _DYNAMIC
  +[0-9]+: 0+48 +0 +TLS +LOCAL +DEFAULT +8 sh3
  +[0-9]+: 0+64 +0 +TLS +LOCAL +DEFAULT +9 sH2
  +[0-9]+: 0+78 +0 +TLS +LOCAL +DEFAULT +9 sH7
@@ -136,9 +136,11 @@ Symbol table '\.symtab' contains [0-9]+ entries:
  +[0-9]+: 0+74 +0 +TLS +LOCAL +DEFAULT +9 sH6
  +[0-9]+: 0+7c +0 +TLS +LOCAL +DEFAULT +9 sH8
  +[0-9]+: 0+40 +0 +TLS +LOCAL +DEFAULT +8 sh1
- +[0-9]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +12 _GLOBAL_OFFSET_TABLE_
  +[0-9]+: 0+44 +0 +TLS +LOCAL +DEFAULT +8 sh2
  +[0-9]+: 0+54 +0 +TLS +LOCAL +DEFAULT +8 sh6
+.* FILE +LOCAL +DEFAULT +ABS .*
+ +[0-9]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +10 _DYNAMIC
+ +[0-9]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +12 _GLOBAL_OFFSET_TABLE_
  +[0-9]+: 0+1c +0 +TLS +GLOBAL +DEFAULT +8 sg8
  +[0-9]+: 0+8 +0 +TLS +GLOBAL +DEFAULT +8 sg3
  +[0-9]+: 0+c +0 +TLS +GLOBAL +DEFAULT +8 sg4
diff --git a/ld/testsuite/ld-ia64/tlsbin.rd b/ld/testsuite/ld-ia64/tlsbin.rd
index 0ad3a77b25..0462e50764 100644
--- a/ld/testsuite/ld-ia64/tlsbin.rd
+++ b/ld/testsuite/ld-ia64/tlsbin.rd
@@ -84,6 +84,7 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .* SECTION +LOCAL +DEFAULT +13 *
 .* SECTION +LOCAL +DEFAULT +14 *
 .* SECTION +LOCAL +DEFAULT +15 *
+.* FILE +LOCAL +DEFAULT +ABS .*
 .* TLS +LOCAL +DEFAULT +11 sl1
 .* TLS +LOCAL +DEFAULT +11 sl2
 .* TLS +LOCAL +DEFAULT +11 sl3
@@ -92,6 +93,7 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .* TLS +LOCAL +DEFAULT +11 sl6
 .* TLS +LOCAL +DEFAULT +11 sl7
 .* TLS +LOCAL +DEFAULT +11 sl8
+.* FILE +LOCAL +DEFAULT +ABS .*
 .* TLS +LOCAL +DEFAULT +12 bl1
 .* TLS +LOCAL +DEFAULT +12 bl2
 .* TLS +LOCAL +DEFAULT +12 bl3
@@ -100,6 +102,7 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .* TLS +LOCAL +DEFAULT +12 bl6
 .* TLS +LOCAL +DEFAULT +12 bl7
 .* TLS +LOCAL +DEFAULT +12 bl8
+.* FILE +LOCAL +DEFAULT +ABS .*
 .* OBJECT +LOCAL +DEFAULT +13 _DYNAMIC
 .* OBJECT +LOCAL +DEFAULT +14 _GLOBAL_OFFSET_TABLE_
 .* TLS +GLOBAL +DEFAULT +11 sg8
diff --git a/ld/testsuite/ld-ia64/tlspic.rd b/ld/testsuite/ld-ia64/tlspic.rd
index bb2c8dadf0..8ebd46aa10 100644
--- a/ld/testsuite/ld-ia64/tlspic.rd
+++ b/ld/testsuite/ld-ia64/tlspic.rd
@@ -90,6 +90,7 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .* SECTION +LOCAL +DEFAULT +12 *
 .* SECTION +LOCAL +DEFAULT +13 *
 .* SECTION +LOCAL +DEFAULT +14 *
+.* FILE +LOCAL +DEFAULT +ABS .*
 .* TLS +LOCAL +DEFAULT +10 sl1
 .* TLS +LOCAL +DEFAULT +10 sl2
 .* TLS +LOCAL +DEFAULT +10 sl3
@@ -99,7 +100,6 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .* TLS +LOCAL +DEFAULT +10 sl7
 .* TLS +LOCAL +DEFAULT +10 sl8
 .* TLS +LOCAL +DEFAULT +11 sH1
-.* OBJECT +LOCAL +DEFAULT +ABS _DYNAMIC
 .* TLS +LOCAL +DEFAULT +10 sh3
 .* TLS +LOCAL +DEFAULT +11 sH2
 .* TLS +LOCAL +DEFAULT +11 sH7
@@ -113,9 +113,11 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .* TLS +LOCAL +DEFAULT +11 sH6
 .* TLS +LOCAL +DEFAULT +11 sH8
 .* TLS +LOCAL +DEFAULT +10 sh1
-.* OBJECT +LOCAL +DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
 .* TLS +LOCAL +DEFAULT +10 sh2
 .* TLS +LOCAL +DEFAULT +10 sh6
+.* FILE +LOCAL +DEFAULT +ABS .*
+.* OBJECT +LOCAL +DEFAULT +ABS _DYNAMIC
+.* OBJECT +LOCAL +DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
 .* TLS +GLOBAL +DEFAULT +10 sg8
 .* TLS +GLOBAL +DEFAULT +10 sg3
 .* TLS +GLOBAL +DEFAULT +10 sg4
diff --git a/ld/testsuite/ld-mips-elf/reloc-merge-lo16.d b/ld/testsuite/ld-mips-elf/reloc-merge-lo16.d
index 7cb3cfefce..8297c8ff20 100644
--- a/ld/testsuite/ld-mips-elf/reloc-merge-lo16.d
+++ b/ld/testsuite/ld-mips-elf/reloc-merge-lo16.d
@@ -8,6 +8,7 @@
 .*: +file format .*mips.*
 #...
 0+80fe70 l       .rodata	0+000000 g
+#...
 0+400000 g     F .text	0+00000c __start
 #...
 0+400000 <[^>]*> 3c020081 	lui	v0,0x81
diff --git a/ld/testsuite/ld-mmix/bpo-1.d b/ld/testsuite/ld-mmix/bpo-1.d
index 97bc33d969..3701804a83 100644
--- a/ld/testsuite/ld-mmix/bpo-1.d
+++ b/ld/testsuite/ld-mmix/bpo-1.d
@@ -11,7 +11,9 @@
 SYMBOL TABLE:
 0000000000000000 l    d  \.text	0+ (|\.text)
 0+7f0 l    d  \.MMIX\.reg_contents	0+ (|\.MMIX\.reg_contents)
+#...
 0+4 l       \.text	0+ x
+#...
 0+ g       \.text	0+ _start
 #...
 
diff --git a/ld/testsuite/ld-mmix/bpo-10.d b/ld/testsuite/ld-mmix/bpo-10.d
index 931ed24902..576ce98591 100644
--- a/ld/testsuite/ld-mmix/bpo-10.d
+++ b/ld/testsuite/ld-mmix/bpo-10.d
@@ -12,7 +12,9 @@
 SYMBOL TABLE:
 0+ l    d  \.init	0+ (|\.init)
 0+7f8 l +d  \.MMIX.reg_contents	0+ (|\.MMIX\.reg_contents)
+0+ l    df \*ABS\*	0+ .*
 0+ l       \.init	0+ _start
+0+ l    df \*ABS\*	0+ .*
 2000000000000000 l       \*ABS\*	0+ __bss_start
 2000000000000000 l       \*ABS\*	0+ _edata
 2000000000000000 l       \*ABS\*	0+ _end
diff --git a/ld/testsuite/ld-mmix/bpo-11.d b/ld/testsuite/ld-mmix/bpo-11.d
index d926905f9c..ce4d80df22 100644
--- a/ld/testsuite/ld-mmix/bpo-11.d
+++ b/ld/testsuite/ld-mmix/bpo-11.d
@@ -14,7 +14,9 @@ SYMBOL TABLE:
 0+ l    d  \.init	0+ (|\.init)
 0+10 l    d  \.text	0+ (|\.text)
 0+7e8 l    d  \.MMIX\.reg_contents	0+ (|\.MMIX\.reg_contents)
+0+ l    df \*ABS\*	0+ .*
 0+ l       \.init	0+ _start
+0+ l    df \*ABS\*	0+ .*
 2000000000000000 l       \*ABS\*	0+ __bss_start
 2000000000000000 l       \*ABS\*	0+ _edata
 2000000000000000 l       \*ABS\*	0+ _end
diff --git a/ld/testsuite/ld-mmix/bpo-14.d b/ld/testsuite/ld-mmix/bpo-14.d
index e19e4a8528..c78a08ed70 100644
--- a/ld/testsuite/ld-mmix/bpo-14.d
+++ b/ld/testsuite/ld-mmix/bpo-14.d
@@ -12,6 +12,7 @@
 SYMBOL TABLE:
 0+ l    d  \.text	0+ (|\.text)
 0+7f0 l    d  \.MMIX\.reg_contents	0+ (|\.MMIX\.reg_contents)
+#...
 0+ g       \.text	0+ _start
 0+8 g       \.text	0+ areg
 #...
diff --git a/ld/testsuite/ld-mmix/bpo-16.d b/ld/testsuite/ld-mmix/bpo-16.d
index d7e372c75f..02f6ba7c62 100644
--- a/ld/testsuite/ld-mmix/bpo-16.d
+++ b/ld/testsuite/ld-mmix/bpo-16.d
@@ -13,6 +13,7 @@
 SYMBOL TABLE:
 0+ l    d  \.text	0+ (|\.text)
 0+7f0 l    d  \.MMIX\.reg_contents	0+ (|\.MMIX\.reg_contents)
+#...
 0+ g       \.text	0+ _start
 0+c g       \.text	0+ areg
 #...
diff --git a/ld/testsuite/ld-mmix/bpo-17.d b/ld/testsuite/ld-mmix/bpo-17.d
index f70b852339..1dc75ce2ff 100644
--- a/ld/testsuite/ld-mmix/bpo-17.d
+++ b/ld/testsuite/ld-mmix/bpo-17.d
@@ -12,6 +12,7 @@
 SYMBOL TABLE:
 0+ l    d  \.text	0+ (|\.text)
 0+7f0 l    d  \.MMIX\.reg_contents	0+ (|\.MMIX\.reg_contents)
+#...
 0+ g       \.text	0+ _start
 0+10 g       \.text	0+ areg
 #...
diff --git a/ld/testsuite/ld-mmix/bpo-18.d b/ld/testsuite/ld-mmix/bpo-18.d
index 3d1d2f11a9..7e06fae5fc 100644
--- a/ld/testsuite/ld-mmix/bpo-18.d
+++ b/ld/testsuite/ld-mmix/bpo-18.d
@@ -13,7 +13,9 @@ SYMBOL TABLE:
 0+100 l    d  \.text	0+ (|\.text)
 4000000000001060 l    d  \.text\.away	0+ (|\.text\.away)
 0+7e0 l    d  \.MMIX\.reg_contents	0+ (|\.MMIX\.reg_contents)
+0+ l    df \*ABS\*	0+ .*
 4000000000001064 l       \.text\.away	0+ x
+0+ l    df \*ABS\*	0+ .*
 0+100 g       \.text	0+ x
 4000000000001060 g       \.text\.away	0+ Main
 0+104 g       \.text	0+ x2
diff --git a/ld/testsuite/ld-mmix/bpo-2.d b/ld/testsuite/ld-mmix/bpo-2.d
index 7206cab267..0cd00a3cee 100644
--- a/ld/testsuite/ld-mmix/bpo-2.d
+++ b/ld/testsuite/ld-mmix/bpo-2.d
@@ -12,7 +12,9 @@
 SYMBOL TABLE:
 0+ l    d  \.text	0+ (|\.text)
 0+7e8 l    d  \.MMIX\.reg_contents	0+ (|\.MMIX\.reg_contents)
+#...
 0+4 l       \.text	0+ x
+#...
 0+ g       \.text	0+ _start
 0+fe g       \*REG\*	0+ areg
 #...
diff --git a/ld/testsuite/ld-mmix/bpo-22.d b/ld/testsuite/ld-mmix/bpo-22.d
index c6a1314558..127b489b54 100644
--- a/ld/testsuite/ld-mmix/bpo-22.d
+++ b/ld/testsuite/ld-mmix/bpo-22.d
@@ -12,7 +12,9 @@
 SYMBOL TABLE:
 0000000000000000 l    d  \.text	0+ (|\.text)
 0+7f0 l    d  \.MMIX\.reg_contents	0+ (|\.MMIX\.reg_contents)
+0+ l    df \*ABS\*	0+ .*
 0+4 l       \.text	0+ x
+0+ l    df \*ABS\*	0+ .*
 0+ g       \.text	0+ Main
 0+ g       \.text	0+ _start
 
diff --git a/ld/testsuite/ld-mmix/bpo-3.d b/ld/testsuite/ld-mmix/bpo-3.d
index e1435ef35e..410d508229 100644
--- a/ld/testsuite/ld-mmix/bpo-3.d
+++ b/ld/testsuite/ld-mmix/bpo-3.d
@@ -12,7 +12,9 @@
 SYMBOL TABLE:
 0+ l    d  \.text	0+ (|\.text)
 0+7f0 l    d  \.MMIX\.reg_contents	0+ (|\.MMIX\.reg_contents)
+#...
 0+4 l       \.text	0+ x
+#...
 0+ g       \.text	0+ _start
 #...
 0+8 g       \.text	0+ y
diff --git a/ld/testsuite/ld-mmix/bpo-4.d b/ld/testsuite/ld-mmix/bpo-4.d
index 372e7e6acb..40b4210d15 100644
--- a/ld/testsuite/ld-mmix/bpo-4.d
+++ b/ld/testsuite/ld-mmix/bpo-4.d
@@ -13,7 +13,9 @@
 SYMBOL TABLE:
 0+ l    d  \.text	0+ (|\.text)
 0+7e0 l    d  \.MMIX\.reg_contents	0+ (|\.MMIX\.reg_contents)
+#...
 0+8 l       \.text	0+ x
+#...
 0+ g       \.text	0+ _start
 0+fe g       \*REG\*	0+ areg
 #...
diff --git a/ld/testsuite/ld-mmix/bpo-5.d b/ld/testsuite/ld-mmix/bpo-5.d
index a1a192d616..5e988eab9d 100644
--- a/ld/testsuite/ld-mmix/bpo-5.d
+++ b/ld/testsuite/ld-mmix/bpo-5.d
@@ -13,7 +13,9 @@
 SYMBOL TABLE:
 0+ l    d  \.text	0+ (|\.text)
 0+7e8 l    d  \.MMIX\.reg_contents	0+ (|\.MMIX\.reg_contents)
+#...
 0+4 l       \.text	0+ x
+#...
 0+ g       \.text	0+ _start
 #...
 0+c g       \.text	0+ y
diff --git a/ld/testsuite/ld-mmix/bpo-9.d b/ld/testsuite/ld-mmix/bpo-9.d
index 4273f3479b..773943e3eb 100644
--- a/ld/testsuite/ld-mmix/bpo-9.d
+++ b/ld/testsuite/ld-mmix/bpo-9.d
@@ -13,6 +13,7 @@ SYMBOL TABLE:
 0+ l    d  \.init	0+ (|\.init)
 0+10 l    d  \.text	0+ (|\.text)
 0+7e8 l    d  \.MMIX\.reg_contents	0+ (|\.MMIX\.reg_contents)
+#...
 0+ l       \.init	0+ _start
 #...
 0+14 g       \.text	0+ x
diff --git a/ld/testsuite/ld-mmix/greg-1.d b/ld/testsuite/ld-mmix/greg-1.d
index d64ce0a684..a40a9a148c 100644
--- a/ld/testsuite/ld-mmix/greg-1.d
+++ b/ld/testsuite/ld-mmix/greg-1.d
@@ -12,6 +12,7 @@
 SYMBOL TABLE:
 0+ l    d  \.text	0+ (|\.text)
 0+7f0 l    d  \.MMIX\.reg_contents	0+ (|\.MMIX\.reg_contents)
+#...
 0+c g       \.text	0+ _start
 0+fe g       \*REG\*	0+ areg
 #...
diff --git a/ld/testsuite/ld-mmix/greg-19.d b/ld/testsuite/ld-mmix/greg-19.d
index 4468161737..fe58c2e3cb 100644
--- a/ld/testsuite/ld-mmix/greg-19.d
+++ b/ld/testsuite/ld-mmix/greg-19.d
@@ -9,6 +9,7 @@
 SYMBOL TABLE:
 0+ l    d  \.text	0+ (|\.text)
 0+7f0 l    d  \.MMIX\.reg_contents	0+ (|\.MMIX\.reg_contents)
+#...
 0+ g     F \.text	0+ Main
 0+ g       \.text	0+ _start
 0+fe g       \*REG\*	0+ areg
diff --git a/ld/testsuite/ld-mmix/greg-2.d b/ld/testsuite/ld-mmix/greg-2.d
index ab8fbb2a8f..dbc1423a08 100644
--- a/ld/testsuite/ld-mmix/greg-2.d
+++ b/ld/testsuite/ld-mmix/greg-2.d
@@ -16,6 +16,7 @@
 SYMBOL TABLE:
 0+ l    d  \.text	0+ (|\.text)
 0+7e0 l    d  \.MMIX\.reg_contents	0+ (|\.MMIX\.reg_contents)
+#...
 0+fe g       \*REG\*	0+ b
 0+20 g       \.text	0+ _start
 0+fc g       \*REG\*	0+ areg
diff --git a/ld/testsuite/ld-mmix/greg-3.d b/ld/testsuite/ld-mmix/greg-3.d
index 25189c22da..ff39e72a42 100644
--- a/ld/testsuite/ld-mmix/greg-3.d
+++ b/ld/testsuite/ld-mmix/greg-3.d
@@ -16,6 +16,7 @@
 SYMBOL TABLE:
 0+ l    d  \.text	0+ (|\.text)
 0+7f0 l    d  \.MMIX\.reg_contents	0+ (|\.MMIX\.reg_contents)
+#...
 0+10 g       \.text	0+ _start
 0+fe g       \*REG\*	0+ areg
 #...
diff --git a/ld/testsuite/ld-mmix/greg-4.d b/ld/testsuite/ld-mmix/greg-4.d
index 8b882c1f6a..b60fe80448 100644
--- a/ld/testsuite/ld-mmix/greg-4.d
+++ b/ld/testsuite/ld-mmix/greg-4.d
@@ -13,6 +13,7 @@
 SYMBOL TABLE:
 0+ l    d  \.text	0+ (|\.text)
 0+7f0 l    d  \.MMIX\.reg_contents	0+ (|\.MMIX\.reg_contents)
+#...
 0+18 g       \.text	0+ _start
 0+fe g       \*REG\*	0+ areg
 #...
diff --git a/ld/testsuite/ld-mmix/greg-5.d b/ld/testsuite/ld-mmix/greg-5.d
index 67e50d295d..56b45b4056 100644
--- a/ld/testsuite/ld-mmix/greg-5.d
+++ b/ld/testsuite/ld-mmix/greg-5.d
@@ -13,6 +13,7 @@
 SYMBOL TABLE:
 0+ l    d  \.text	0+ (|\.text)
 0+7f0 l    d  \.MMIX\.reg_contents	0+ (|\.MMIX\.reg_contents)
+#...
 0+14 g       \.text	0+ _start
 0+fe g       \*REG\*	0+ areg
 #...
diff --git a/ld/testsuite/ld-mmix/greg-5s.d b/ld/testsuite/ld-mmix/greg-5s.d
index 84f59517bb..4ed8173c8e 100644
--- a/ld/testsuite/ld-mmix/greg-5s.d
+++ b/ld/testsuite/ld-mmix/greg-5s.d
@@ -12,6 +12,7 @@
 SYMBOL TABLE:
 0+ l    d  \.text	0+ (|\.text)
 0+7f0 l    d  \.MMIX\.reg_contents	0+ (|\.MMIX\.reg_contents)
+#...
 0+4 g       \.text	0+ _start
 0+fe g       \*REG\*	0+ areg
 #...
diff --git a/ld/testsuite/ld-mmix/greg-6.d b/ld/testsuite/ld-mmix/greg-6.d
index e4df905a1d..35046d8158 100644
--- a/ld/testsuite/ld-mmix/greg-6.d
+++ b/ld/testsuite/ld-mmix/greg-6.d
@@ -41,6 +41,7 @@
 SYMBOL TABLE:
 0+0 l    d  \.text	0+ (|\.text)
 0+100 l    d  \.MMIX\.reg_contents	0+ (|\.MMIX\.reg_contents)
+0+ l    df \*ABS\*	0+ .*
 0+20 l       \*REG\*	0+ P
 0+21 l       \*REG\*	0+ O
 0+22 l       \*REG\*	0+ N
@@ -57,6 +58,7 @@ SYMBOL TABLE:
 0+2d l       \*REG\*	0+ C
 0+2e l       \*REG\*	0+ B
 0+2f l       \*REG\*	0+ A
+0+ l    df \*ABS\*	0+ .*
 0+30 l       \*REG\*	0+ P
 0+31 l       \*REG\*	0+ O
 0+32 l       \*REG\*	0+ N
@@ -73,6 +75,7 @@ SYMBOL TABLE:
 0+3d l       \*REG\*	0+ C
 0+3e l       \*REG\*	0+ B
 0+3f l       \*REG\*	0+ A
+0+ l    df \*ABS\*	0+ .*
 0+40 l       \*REG\*	0+ P
 0+41 l       \*REG\*	0+ O
 0+42 l       \*REG\*	0+ N
@@ -89,6 +92,7 @@ SYMBOL TABLE:
 0+4d l       \*REG\*	0+ C
 0+4e l       \*REG\*	0+ B
 0+4f l       \*REG\*	0+ A
+0+ l    df \*ABS\*	0+ .*
 0+50 l       \*REG\*	0+ P
 0+51 l       \*REG\*	0+ O
 0+52 l       \*REG\*	0+ N
@@ -105,6 +109,7 @@ SYMBOL TABLE:
 0+5d l       \*REG\*	0+ C
 0+5e l       \*REG\*	0+ B
 0+5f l       \*REG\*	0+ A
+0+ l    df \*ABS\*	0+ .*
 0+60 l       \*REG\*	0+ P
 0+61 l       \*REG\*	0+ O
 0+62 l       \*REG\*	0+ N
@@ -121,6 +126,7 @@ SYMBOL TABLE:
 0+6d l       \*REG\*	0+ C
 0+6e l       \*REG\*	0+ B
 0+6f l       \*REG\*	0+ A
+0+ l    df \*ABS\*	0+ .*
 0+70 l       \*REG\*	0+ P
 0+71 l       \*REG\*	0+ O
 0+72 l       \*REG\*	0+ N
@@ -137,6 +143,7 @@ SYMBOL TABLE:
 0+7d l       \*REG\*	0+ C
 0+7e l       \*REG\*	0+ B
 0+7f l       \*REG\*	0+ A
+0+ l    df \*ABS\*	0+ .*
 0+80 l       \*REG\*	0+ P
 0+81 l       \*REG\*	0+ O
 0+82 l       \*REG\*	0+ N
@@ -153,6 +160,7 @@ SYMBOL TABLE:
 0+8d l       \*REG\*	0+ C
 0+8e l       \*REG\*	0+ B
 0+8f l       \*REG\*	0+ A
+0+ l    df \*ABS\*	0+ .*
 0+90 l       \*REG\*	0+ P
 0+91 l       \*REG\*	0+ O
 0+92 l       \*REG\*	0+ N
@@ -169,6 +177,7 @@ SYMBOL TABLE:
 0+9d l       \*REG\*	0+ C
 0+9e l       \*REG\*	0+ B
 0+9f l       \*REG\*	0+ A
+0+ l    df \*ABS\*	0+ .*
 0+a0 l       \*REG\*	0+ P
 0+a1 l       \*REG\*	0+ O
 0+a2 l       \*REG\*	0+ N
@@ -185,6 +194,7 @@ SYMBOL TABLE:
 0+ad l       \*REG\*	0+ C
 0+ae l       \*REG\*	0+ B
 0+af l       \*REG\*	0+ A
+0+ l    df \*ABS\*	0+ .*
 0+b0 l       \*REG\*	0+ P
 0+b1 l       \*REG\*	0+ O
 0+b2 l       \*REG\*	0+ N
@@ -201,6 +211,7 @@ SYMBOL TABLE:
 0+bd l       \*REG\*	0+ C
 0+be l       \*REG\*	0+ B
 0+bf l       \*REG\*	0+ A
+0+ l    df \*ABS\*	0+ .*
 0+c0 l       \*REG\*	0+ P
 0+c1 l       \*REG\*	0+ O
 0+c2 l       \*REG\*	0+ N
@@ -217,6 +228,7 @@ SYMBOL TABLE:
 0+cd l       \*REG\*	0+ C
 0+ce l       \*REG\*	0+ B
 0+cf l       \*REG\*	0+ A
+0+ l    df \*ABS\*	0+ .*
 0+d0 l       \*REG\*	0+ P
 0+d1 l       \*REG\*	0+ O
 0+d2 l       \*REG\*	0+ N
@@ -233,6 +245,7 @@ SYMBOL TABLE:
 0+dd l       \*REG\*	0+ C
 0+de l       \*REG\*	0+ B
 0+df l       \*REG\*	0+ A
+0+ l    df \*ABS\*	0+ .*
 0+e0 l       \*REG\*	0+ P
 0+e1 l       \*REG\*	0+ O
 0+e2 l       \*REG\*	0+ N
@@ -249,20 +262,35 @@ SYMBOL TABLE:
 0+ed l       \*REG\*	0+ C
 0+ee l       \*REG\*	0+ B
 0+ef l       \*REG\*	0+ A
+0+ l    df \*ABS\*	0+ .*
 0+f0 l       \*REG\*	0+ lsym
+0+ l    df \*ABS\*	0+ .*
 0+f1 l       \*REG\*	0+ lsym
+0+ l    df \*ABS\*	0+ .*
 0+f2 l       \*REG\*	0+ lsym
+0+ l    df \*ABS\*	0+ .*
 0+f3 l       \*REG\*	0+ lsym
+0+ l    df \*ABS\*	0+ .*
 0+f4 l       \*REG\*	0+ lsym
+0+ l    df \*ABS\*	0+ .*
 0+f5 l       \*REG\*	0+ lsym
+0+ l    df \*ABS\*	0+ .*
 0+f6 l       \*REG\*	0+ lsym
+0+ l    df \*ABS\*	0+ .*
 0+f7 l       \*REG\*	0+ lsym
+0+ l    df \*ABS\*	0+ .*
 0+f8 l       \*REG\*	0+ lsym
+0+ l    df \*ABS\*	0+ .*
 0+f9 l       \*REG\*	0+ lsym
+0+ l    df \*ABS\*	0+ .*
 0+fa l       \*REG\*	0+ lsym
+0+ l    df \*ABS\*	0+ .*
 0+fb l       \*REG\*	0+ lsym
+0+ l    df \*ABS\*	0+ .*
 0+fc l       \*REG\*	0+ lsym
+0+ l    df \*ABS\*	0+ .*
 0+fd l       \*REG\*	0+ lsym
+0+ l    df \*ABS\*	0+ .*
 0+14 g       \.text	0+ _start
 0+fe g       \*REG\*	0+ areg
 2000000000000000 g       \*ABS\*	0+ __bss_start
diff --git a/ld/testsuite/ld-mmix/greg-7.d b/ld/testsuite/ld-mmix/greg-7.d
index a5d1692e95..4b1433ef1d 100644
--- a/ld/testsuite/ld-mmix/greg-7.d
+++ b/ld/testsuite/ld-mmix/greg-7.d
@@ -41,6 +41,7 @@
 SYMBOL TABLE:
 0+ l    d  \.text	0+ (|\.text)
 0+100 l    d  \.MMIX\.reg_contents	0+ (|\.MMIX\.reg_contents)
+0+ l    df \*ABS\*	0+ .*
 0+21 l       \*REG\*	0+ P
 0+22 l       \*REG\*	0+ O
 0+23 l       \*REG\*	0+ N
@@ -57,6 +58,7 @@ SYMBOL TABLE:
 0+2e l       \*REG\*	0+ C
 0+2f l       \*REG\*	0+ B
 0+30 l       \*REG\*	0+ A
+0+ l    df \*ABS\*	0+ .*
 0+31 l       \*REG\*	0+ P
 0+32 l       \*REG\*	0+ O
 0+33 l       \*REG\*	0+ N
@@ -73,6 +75,7 @@ SYMBOL TABLE:
 0+3e l       \*REG\*	0+ C
 0+3f l       \*REG\*	0+ B
 0+40 l       \*REG\*	0+ A
+0+ l    df \*ABS\*	0+ .*
 0+41 l       \*REG\*	0+ P
 0+42 l       \*REG\*	0+ O
 0+43 l       \*REG\*	0+ N
@@ -89,6 +92,7 @@ SYMBOL TABLE:
 0+4e l       \*REG\*	0+ C
 0+4f l       \*REG\*	0+ B
 0+50 l       \*REG\*	0+ A
+0+ l    df \*ABS\*	0+ .*
 0+51 l       \*REG\*	0+ P
 0+52 l       \*REG\*	0+ O
 0+53 l       \*REG\*	0+ N
@@ -105,6 +109,7 @@ SYMBOL TABLE:
 0+5e l       \*REG\*	0+ C
 0+5f l       \*REG\*	0+ B
 0+60 l       \*REG\*	0+ A
+0+ l    df \*ABS\*	0+ .*
 0+61 l       \*REG\*	0+ P
 0+62 l       \*REG\*	0+ O
 0+63 l       \*REG\*	0+ N
@@ -121,6 +126,7 @@ SYMBOL TABLE:
 0+6e l       \*REG\*	0+ C
 0+6f l       \*REG\*	0+ B
 0+70 l       \*REG\*	0+ A
+0+ l    df \*ABS\*	0+ .*
 0+71 l       \*REG\*	0+ P
 0+72 l       \*REG\*	0+ O
 0+73 l       \*REG\*	0+ N
@@ -137,6 +143,7 @@ SYMBOL TABLE:
 0+7e l       \*REG\*	0+ C
 0+7f l       \*REG\*	0+ B
 0+80 l       \*REG\*	0+ A
+0+ l    df \*ABS\*	0+ .*
 0+81 l       \*REG\*	0+ P
 0+82 l       \*REG\*	0+ O
 0+83 l       \*REG\*	0+ N
@@ -153,6 +160,7 @@ SYMBOL TABLE:
 0+8e l       \*REG\*	0+ C
 0+8f l       \*REG\*	0+ B
 0+90 l       \*REG\*	0+ A
+0+ l    df \*ABS\*	0+ .*
 0+91 l       \*REG\*	0+ P
 0+92 l       \*REG\*	0+ O
 0+93 l       \*REG\*	0+ N
@@ -169,6 +177,7 @@ SYMBOL TABLE:
 0+9e l       \*REG\*	0+ C
 0+9f l       \*REG\*	0+ B
 0+a0 l       \*REG\*	0+ A
+0+ l    df \*ABS\*	0+ .*
 0+a1 l       \*REG\*	0+ P
 0+a2 l       \*REG\*	0+ O
 0+a3 l       \*REG\*	0+ N
@@ -185,6 +194,7 @@ SYMBOL TABLE:
 0+ae l       \*REG\*	0+ C
 0+af l       \*REG\*	0+ B
 0+b0 l       \*REG\*	0+ A
+0+ l    df \*ABS\*	0+ .*
 0+b1 l       \*REG\*	0+ P
 0+b2 l       \*REG\*	0+ O
 0+b3 l       \*REG\*	0+ N
@@ -201,6 +211,7 @@ SYMBOL TABLE:
 0+be l       \*REG\*	0+ C
 0+bf l       \*REG\*	0+ B
 0+c0 l       \*REG\*	0+ A
+0+ l    df \*ABS\*	0+ .*
 0+c1 l       \*REG\*	0+ P
 0+c2 l       \*REG\*	0+ O
 0+c3 l       \*REG\*	0+ N
@@ -217,6 +228,7 @@ SYMBOL TABLE:
 0+ce l       \*REG\*	0+ C
 0+cf l       \*REG\*	0+ B
 0+d0 l       \*REG\*	0+ A
+0+ l    df \*ABS\*	0+ .*
 0+d1 l       \*REG\*	0+ P
 0+d2 l       \*REG\*	0+ O
 0+d3 l       \*REG\*	0+ N
@@ -233,6 +245,7 @@ SYMBOL TABLE:
 0+de l       \*REG\*	0+ C
 0+df l       \*REG\*	0+ B
 0+e0 l       \*REG\*	0+ A
+0+ l    df \*ABS\*	0+ .*
 0+e1 l       \*REG\*	0+ P
 0+e2 l       \*REG\*	0+ O
 0+e3 l       \*REG\*	0+ N
@@ -249,20 +262,35 @@ SYMBOL TABLE:
 0+ee l       \*REG\*	0+ C
 0+ef l       \*REG\*	0+ B
 0+f0 l       \*REG\*	0+ A
+0+ l    df \*ABS\*	0+ .*
 0+f1 l       \*REG\*	0+ lsym
+0+ l    df \*ABS\*	0+ .*
 0+f2 l       \*REG\*	0+ lsym
+0+ l    df \*ABS\*	0+ .*
 0+f3 l       \*REG\*	0+ lsym
+0+ l    df \*ABS\*	0+ .*
 0+f4 l       \*REG\*	0+ lsym
+0+ l    df \*ABS\*	0+ .*
 0+f5 l       \*REG\*	0+ lsym
+0+ l    df \*ABS\*	0+ .*
 0+f6 l       \*REG\*	0+ lsym
+0+ l    df \*ABS\*	0+ .*
 0+f7 l       \*REG\*	0+ lsym
+0+ l    df \*ABS\*	0+ .*
 0+f8 l       \*REG\*	0+ lsym
+0+ l    df \*ABS\*	0+ .*
 0+f9 l       \*REG\*	0+ lsym
+0+ l    df \*ABS\*	0+ .*
 0+fa l       \*REG\*	0+ lsym
+0+ l    df \*ABS\*	0+ .*
 0+fb l       \*REG\*	0+ lsym
+0+ l    df \*ABS\*	0+ .*
 0+fc l       \*REG\*	0+ lsym
+0+ l    df \*ABS\*	0+ .*
 0+fd l       \*REG\*	0+ lsym
+0+ l    df \*ABS\*	0+ .*
 0+fe l       \*REG\*	0+ lsym
+0+ l    df \*ABS\*	0+ .*
 0+14 g       \.text	0+ _start
 0+20 g       \*REG\*	0+ areg
 2000000000000000 g       \*ABS\*	0+ __bss_start
diff --git a/ld/testsuite/ld-mmix/loc4.d b/ld/testsuite/ld-mmix/loc4.d
index 34428a9845..e0c42473ae 100644
--- a/ld/testsuite/ld-mmix/loc4.d
+++ b/ld/testsuite/ld-mmix/loc4.d
@@ -11,7 +11,9 @@
 SYMBOL TABLE:
 0+1000 l    d  \.text	0+ (|\.text)
 2000000000000000 l    d  \.data	0+ (|\.data)
+0+ l    df \*ABS\*	0+ .*
 2000000000000000 l       \.data	0+ xx
+0+ l    df \*ABS\*	0+ .*
 0+1004 g     F \.text	0+ Main
 2000000000000000 g       \*ABS\*	0+ __\.MMIX\.start\.\.data
 0+1004 g       \.text	0+ _start
diff --git a/ld/testsuite/ld-mmix/local1.d b/ld/testsuite/ld-mmix/local1.d
index 3899f747d7..82529718e3 100644
--- a/ld/testsuite/ld-mmix/local1.d
+++ b/ld/testsuite/ld-mmix/local1.d
@@ -23,22 +23,25 @@ Section Headers:
  +0+10 +0+ +W +0 +0 +1
  +\[ 3\] \.shstrtab +STRTAB +0+ +0+90
  +0+34 +0+ +0 +0 +1
- +\[ 4\] \.symtab +SYMTAB +0+ +0+248
- +0+108 +0+18 +5 +5 +8
- +\[ 5\] \.strtab +STRTAB +0+ +0+350
- +0+32 +0+ +0 +0 +1
+ +\[ 4\] \.symtab +SYMTAB +0+ +[0-9a-f]+
+ +[0-9a-f]+ +0+18 +5 +[0-9] +8
+ +\[ 5\] \.strtab +STRTAB +0+ +[0-9a-f]+
+ +[0-9a-f]+ +0+ +0 +0 +1
 Key to Flags:
 #...
 
-Symbol table '\.symtab' contains 11 entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
  +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
- +0: 0+ +0 +NOTYPE +LOCAL +DEFAULT +UND 
- +1: 0+ +0 +SECTION +LOCAL +DEFAULT +1 
- +2: 0+7e8 +0 +SECTION +LOCAL +DEFAULT +2 
- +3: 0+fd +0 +NOTYPE +LOCAL +DEFAULT +PRC\[0xff00\] lsym
- +4: 0+fe +0 +NOTYPE +LOCAL +DEFAULT +PRC\[0xff00\] lsym
- +5: 0+fc +0 +NOTYPE +GLOBAL +DEFAULT +PRC\[0xff00\] ext1
- +6: 0+4 +0 +NOTYPE +GLOBAL +DEFAULT +1 _start
+.* 0+ +0 +NOTYPE +LOCAL +DEFAULT +UND 
+.* 0+ +0 +SECTION +LOCAL +DEFAULT +1 
+.* 0+7e8 +0 +SECTION +LOCAL +DEFAULT +2 
+.* 0+ +0 +FILE +LOCAL +DEFAULT +ABS .*
+.* 0+fd +0 +NOTYPE +LOCAL +DEFAULT +PRC\[0xff00\] lsym
+.* 0+ +0 +FILE +LOCAL +DEFAULT +ABS .*
+.* 0+fe +0 +NOTYPE +LOCAL +DEFAULT +PRC\[0xff00\] lsym
+.* 0+ +0 +FILE +LOCAL +DEFAULT +ABS .*
+.* 0+fc +0 +NOTYPE +GLOBAL +DEFAULT +PRC\[0xff00\] ext1
+.* 0+4 +0 +NOTYPE +GLOBAL +DEFAULT +1 _start
 #...
 
 Hex dump of section '\.text':
diff --git a/ld/testsuite/ld-mmix/local3.d b/ld/testsuite/ld-mmix/local3.d
index cebdf09a4d..c559ec2781 100644
--- a/ld/testsuite/ld-mmix/local3.d
+++ b/ld/testsuite/ld-mmix/local3.d
@@ -21,22 +21,25 @@ Section Headers:
  +0+10 +0+ +W +0 +0 +1
  +\[ 3\] \.shstrtab +STRTAB +0+ +0+90
  +0+34 +0+ +0 +0 +1
- +\[ 4\] \.symtab +SYMTAB +0+ +0+248
- +0+108 +0+18 +5 +5 +8
- +\[ 5\] \.strtab +STRTAB +0+ +0+350
- +0+32 +0+ +0 +0 +1
+ +\[ 4\] \.symtab +SYMTAB +0+ +[0-9a-f]+
+ +[0-9a-f]+ +0+18 +5 +[0-9] +8
+ +\[ 5\] \.strtab +STRTAB +0+ +[0-9a-f]+
+ +[0-9a-f]+ +0+ +0 +0 +1
 Key to Flags:
 #...
 
-Symbol table '\.symtab' contains 11 entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
  +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
- +0: 0+ +0 +NOTYPE +LOCAL +DEFAULT +UND 
- +1: 0+ +0 +SECTION +LOCAL +DEFAULT +1 
- +2: 0+7e8 +0 +SECTION +LOCAL +DEFAULT +2 
- +3: 0+fd +0 +NOTYPE +LOCAL +DEFAULT +PRC\[0xff00\] lsym
- +4: 0+fe +0 +NOTYPE +LOCAL +DEFAULT +PRC\[0xff00\] lsym
- +5: 0+fc +0 +NOTYPE +GLOBAL +DEFAULT +ABS ext1
- +6: 0+4 +0 +NOTYPE +GLOBAL +DEFAULT +1 _start
+.* 0+ +0 +NOTYPE +LOCAL +DEFAULT +UND 
+.* 0+ +0 +SECTION +LOCAL +DEFAULT +1 
+.* 0+7e8 +0 +SECTION +LOCAL +DEFAULT +2 
+.* 0+ +0 +FILE +LOCAL +DEFAULT +ABS .*
+.* 0+fd +0 +NOTYPE +LOCAL +DEFAULT +PRC\[0xff00\] lsym
+.* 0+ +0 +FILE +LOCAL +DEFAULT +ABS .*
+.* 0+fe +0 +NOTYPE +LOCAL +DEFAULT +PRC\[0xff00\] lsym
+.* 0+ +0 +FILE +LOCAL +DEFAULT +ABS .*
+.* 0+fc +0 +NOTYPE +GLOBAL +DEFAULT +ABS ext1
+.* 0+4 +0 +NOTYPE +GLOBAL +DEFAULT +1 _start
 #...
 
 Hex dump of section '\.text':
diff --git a/ld/testsuite/ld-mmix/local5.d b/ld/testsuite/ld-mmix/local5.d
index ee60297e20..802f28257c 100644
--- a/ld/testsuite/ld-mmix/local5.d
+++ b/ld/testsuite/ld-mmix/local5.d
@@ -22,22 +22,25 @@ Section Headers:
  +0+10 +0+ +W +0 +0 +1
  +\[ 3\] \.shstrtab +STRTAB +0+ +0+94
  +0+34 +0+ +0 +0 +1
- +\[ 4\] \.symtab +SYMTAB +0+ +0+248
- +0+108 +0+18 +5 +5 +8
- +\[ 5\] \.strtab +STRTAB +0+ +0+350
- +0+32 +0+ +0 +0 +1
+ +\[ 4\] \.symtab +SYMTAB +0+ +[0-9a-f]+
+ +[0-9a-f]+ +0+18 +5 +[0-9] +8
+ +\[ 5\] \.strtab +STRTAB +0+ +[0-9a-f]+
+ +[0-9a-f]+ +0+ +0 +0 +1
 Key to Flags:
 #...
 
-Symbol table '\.symtab' contains 11 entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
  +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
- +0: 0+ +0 +NOTYPE +LOCAL +DEFAULT +UND 
- +1: 0+ +0 +SECTION +LOCAL +DEFAULT +1 
- +2: 0+7e8 +0 +SECTION +LOCAL +DEFAULT +2 
- +3: 0+fd +0 +NOTYPE +LOCAL +DEFAULT +PRC\[0xff00\] lsym
- +4: 0+fe +0 +NOTYPE +LOCAL +DEFAULT +PRC\[0xff00\] lsym
- +5: 0+fc +0 +NOTYPE +GLOBAL +DEFAULT +PRC\[0xff00\] ext1
- +6: 0+8 +0 +NOTYPE +GLOBAL +DEFAULT +1 _start
+.* 0+ +0 +NOTYPE +LOCAL +DEFAULT +UND 
+.* 0+ +0 +SECTION +LOCAL +DEFAULT +1 
+.* 0+7e8 +0 +SECTION +LOCAL +DEFAULT +2 
+.* 0+ +0 +FILE +LOCAL +DEFAULT +ABS .*
+.* 0+fd +0 +NOTYPE +LOCAL +DEFAULT +PRC\[0xff00\] lsym
+.* 0+ +0 +FILE +LOCAL +DEFAULT +ABS .*
+.* 0+fe +0 +NOTYPE +LOCAL +DEFAULT +PRC\[0xff00\] lsym
+.* 0+ +0 +FILE +LOCAL +DEFAULT +ABS .*
+.* 0+fc +0 +NOTYPE +GLOBAL +DEFAULT +PRC\[0xff00\] ext1
+.* 0+8 +0 +NOTYPE +GLOBAL +DEFAULT +1 _start
 #...
 
 Hex dump of section '\.text':
diff --git a/ld/testsuite/ld-mmix/local7.d b/ld/testsuite/ld-mmix/local7.d
index bc2cd6c87d..7a5847bee5 100644
--- a/ld/testsuite/ld-mmix/local7.d
+++ b/ld/testsuite/ld-mmix/local7.d
@@ -23,22 +23,25 @@ Section Headers:
  +0+10 +0+ +W +0 +0 +1
  +\[ 3\] \.shstrtab +STRTAB +0+ +0+94
  +0+34 +0+ +0 +0 +1
- +\[ 4\] \.symtab +SYMTAB +0+ +0+248
- +0+108 +0+18 +5 +5 +8
- +\[ 5\] \.strtab +STRTAB +0+ +0+350
- +0+32 +0+ +0 +0 +1
+ +\[ 4\] \.symtab +SYMTAB +0+ +[0-9a-f]+
+ +[0-9a-f]+ +0+18 +5 +[0-9] +8
+ +\[ 5\] \.strtab +STRTAB +0+ +[0-9a-f]+
+ +[0-9a-f]+ +0+ +0 +0 +1
 Key to Flags:
 #...
 
-Symbol table '\.symtab' contains 11 entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
  +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
- +0: 0+ +0 +NOTYPE +LOCAL +DEFAULT +UND 
- +1: 0+ +0 +SECTION +LOCAL +DEFAULT +1 
- +2: 0+7e8 +0 +SECTION +LOCAL +DEFAULT +2 
- +3: 0+fd +0 +NOTYPE +LOCAL +DEFAULT +PRC\[0xff00\] lsym
- +4: 0+fe +0 +NOTYPE +LOCAL +DEFAULT +PRC\[0xff00\] lsym
- +5: 0+fc +0 +NOTYPE +GLOBAL +DEFAULT +ABS ext1
- +6: 0+8 +0 +NOTYPE +GLOBAL +DEFAULT +1 _start
+.* 0+ +0 +NOTYPE +LOCAL +DEFAULT +UND 
+.* 0+ +0 +SECTION +LOCAL +DEFAULT +1 
+.* 0+7e8 +0 +SECTION +LOCAL +DEFAULT +2 
+.* 0+ +0 +FILE +LOCAL +DEFAULT +ABS .*
+.* 0+fd +0 +NOTYPE +LOCAL +DEFAULT +PRC\[0xff00\] lsym
+.* 0+ +0 +FILE +LOCAL +DEFAULT +ABS .*
+.* 0+fe +0 +NOTYPE +LOCAL +DEFAULT +PRC\[0xff00\] lsym
+.* 0+ +0 +FILE +LOCAL +DEFAULT +ABS .*
+.* 0+fc +0 +NOTYPE +GLOBAL +DEFAULT +ABS ext1
+.* 0+8 +0 +NOTYPE +GLOBAL +DEFAULT +1 _start
 #...
 
 Hex dump of section '\.text':
diff --git a/ld/testsuite/ld-mmix/loct-1.d b/ld/testsuite/ld-mmix/loct-1.d
index 24f4112de6..fb81819e91 100644
--- a/ld/testsuite/ld-mmix/loct-1.d
+++ b/ld/testsuite/ld-mmix/loct-1.d
@@ -7,7 +7,9 @@
 
 SYMBOL TABLE:
 0+1004 l    d  \.text	0+ (|\.text)
+0+ l    df \*ABS\*	0+ .*
 0+1004 l       \.text	0+ t
+0+ l    df \*ABS\*	0+ .*
 0+100c g       \.text	0+ _start
 0+1004 g       \*ABS\*	0+ __\.MMIX\.start\.\.text
 2000000000000000 g       \*ABS\*	0+ __bss_start
diff --git a/ld/testsuite/ld-mn10300/i135409-1.d b/ld/testsuite/ld-mn10300/i135409-1.d
index 7fa868a8e3..9fe686b2ce 100644
--- a/ld/testsuite/ld-mn10300/i135409-1.d
+++ b/ld/testsuite/ld-mn10300/i135409-1.d
@@ -5,6 +5,7 @@ Symbol table '.symtab' contains .. entries:
  +..: 0[0-9a-f]+ +7 +FUNC +LOCAL +DEFAULT +. _func
 #...
  +..: 0[0-9a-f]+ +0 +NOTYPE +LOCAL +DEFAULT +. A
+#...
  +..: 0[0-9a-f]+ +7 +FUNC +GLOBAL +DEFAULT +. _func2
 #...
  +..: 0[0-9a-f]+ +0 +NOTYPE +GLOBAL +DEFAULT +. BOTTOM
diff --git a/ld/testsuite/ld-powerpc/tlsexe.r b/ld/testsuite/ld-powerpc/tlsexe.r
index fa67483b47..2df7c9d77e 100644
--- a/ld/testsuite/ld-powerpc/tlsexe.r
+++ b/ld/testsuite/ld-powerpc/tlsexe.r
@@ -86,6 +86,7 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .* SECTION +LOCAL +DEFAULT +10 
 .* SECTION +LOCAL +DEFAULT +11 
 .* SECTION +LOCAL +DEFAULT +12 
+.* FILE +LOCAL +DEFAULT +ABS .*
 .* TLS +LOCAL +DEFAULT +8 gd4
 .* TLS +LOCAL +DEFAULT +8 ld4
 .* TLS +LOCAL +DEFAULT +8 ld5
@@ -93,10 +94,11 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .* TLS +LOCAL +DEFAULT +8 ie4
 .* TLS +LOCAL +DEFAULT +8 le4
 .* TLS +LOCAL +DEFAULT +8 le5
+.* (FUNC|NOTYPE) +LOCAL +DEFAULT +UND \.__tls_get_addr(|_opt)
+.* FILE +LOCAL +DEFAULT +ABS .*
 .* OBJECT +LOCAL +DEFAULT +10 _DYNAMIC
-.* (NOTYPE +LOCAL +DEFAULT +7 00000010\.plt_call\.__tls_get_addr(|_opt)\+0|(FUNC|NOTYPE) +LOCAL +DEFAULT +UND \.__tls_get_addr(|_opt))
-.* (NOTYPE +LOCAL +DEFAULT +7 __glink_PLTresolve|NOTYPE +LOCAL +DEFAULT +7 00000010\.plt_call\.__tls_get_addr(|_opt)\+0)
-.* ((FUNC|NOTYPE) +LOCAL +DEFAULT +UND \.__tls_get_addr(|_opt)|NOTYPE +LOCAL +DEFAULT +7 __glink_PLTresolve)
+.* NOTYPE +LOCAL +DEFAULT +7 00000010\.plt_call\.__tls_get_addr(|_opt)\+0
+.* NOTYPE +LOCAL +DEFAULT +7 __glink_PLTresolve
 .* GLOBAL +DEFAULT +UND gd
 .* GLOBAL +DEFAULT +9 le0
 .* GLOBAL +DEFAULT +9 ld0
diff --git a/ld/testsuite/ld-powerpc/tlsexe32.r b/ld/testsuite/ld-powerpc/tlsexe32.r
index 6983b0809b..22ce088c35 100644
--- a/ld/testsuite/ld-powerpc/tlsexe32.r
+++ b/ld/testsuite/ld-powerpc/tlsexe32.r
@@ -85,6 +85,7 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .* SECTION +LOCAL +DEFAULT +10 
 .* SECTION +LOCAL +DEFAULT +11 
 .* SECTION +LOCAL +DEFAULT +12 
+.* FILE +LOCAL +DEFAULT +ABS .*
 .* TLS +LOCAL +DEFAULT +8 gd4
 .* TLS +LOCAL +DEFAULT +8 ld4
 .* TLS +LOCAL +DEFAULT +8 ld5
@@ -92,6 +93,7 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .* TLS +LOCAL +DEFAULT +8 ie4
 .* TLS +LOCAL +DEFAULT +8 le4
 .* TLS +LOCAL +DEFAULT +8 le5
+.* FILE +LOCAL +DEFAULT +ABS .*
 .* OBJECT +LOCAL +DEFAULT +10 _DYNAMIC
 .* OBJECT +LOCAL +DEFAULT +11 _GLOBAL_OFFSET_TABLE_
 .* TLS +GLOBAL +DEFAULT +UND gd
diff --git a/ld/testsuite/ld-powerpc/tlsexetoc.r b/ld/testsuite/ld-powerpc/tlsexetoc.r
index 6af3e98da2..0b6492048e 100644
--- a/ld/testsuite/ld-powerpc/tlsexetoc.r
+++ b/ld/testsuite/ld-powerpc/tlsexetoc.r
@@ -85,6 +85,7 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .* SECTION +LOCAL +DEFAULT +10 
 .* SECTION +LOCAL +DEFAULT +11 
 .* SECTION +LOCAL +DEFAULT +12 
+.* FILE +LOCAL +DEFAULT +ABS .*
 .* TLS +LOCAL +DEFAULT +8 gd4
 .* TLS +LOCAL +DEFAULT +8 ld4
 .* TLS +LOCAL +DEFAULT +8 ld5
@@ -93,10 +94,11 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .* TLS +LOCAL +DEFAULT +8 le4
 .* TLS +LOCAL +DEFAULT +8 le5
 .* NOTYPE +LOCAL +DEFAULT +11 \.Lie0
+.* (FUNC|NOTYPE) +LOCAL +DEFAULT +UND \.__tls_get_addr(|_opt)
+.* FILE +LOCAL +DEFAULT +ABS .*
 .* OBJECT +LOCAL +DEFAULT +10 _DYNAMIC
-.* (NOTYPE +LOCAL +DEFAULT +7 00000010\.plt_call\.__tls_get_addr(|_opt)\+0|(FUNC|NOTYPE) +LOCAL +DEFAULT +UND \.__tls_get_addr(|_opt))
-.* (NOTYPE +LOCAL +DEFAULT +7 __glink_PLTresolve|NOTYPE +LOCAL +DEFAULT +7 00000010\.plt_call\.__tls_get_addr(|_opt)\+0)
-.* ((FUNC|NOTYPE) +LOCAL +DEFAULT +UND \.__tls_get_addr(|_opt)|NOTYPE +LOCAL +DEFAULT +7 __glink_PLTresolve)
+.* NOTYPE +LOCAL +DEFAULT +7 00000010\.plt_call\.__tls_get_addr(|_opt)\+0
+.* NOTYPE +LOCAL +DEFAULT +7 __glink_PLTresolve
 .* TLS +GLOBAL +DEFAULT +UND gd
 .* TLS +GLOBAL +DEFAULT +9 le0
 .* TLS +GLOBAL +DEFAULT +9 ld0
diff --git a/ld/testsuite/ld-powerpc/tlsso.r b/ld/testsuite/ld-powerpc/tlsso.r
index c417dbb89b..78ed143058 100644
--- a/ld/testsuite/ld-powerpc/tlsso.r
+++ b/ld/testsuite/ld-powerpc/tlsso.r
@@ -100,6 +100,7 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .* SECTION +LOCAL +DEFAULT +9 
 .* SECTION +LOCAL +DEFAULT +10 
 .* SECTION +LOCAL +DEFAULT +11 
+.* FILE +LOCAL +DEFAULT +ABS .*
 .* TLS +LOCAL +DEFAULT +7 gd4
 .* TLS +LOCAL +DEFAULT +7 ld4
 .* TLS +LOCAL +DEFAULT +7 ld5
@@ -107,10 +108,11 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .* TLS +LOCAL +DEFAULT +7 ie4
 .* TLS +LOCAL +DEFAULT +7 le4
 .* TLS +LOCAL +DEFAULT +7 le5
+.* NOTYPE +LOCAL +DEFAULT +UND \.__tls_get_addr
+.* FILE +LOCAL +DEFAULT +ABS .*
 .* OBJECT +LOCAL +DEFAULT +9 _DYNAMIC
 .* NOTYPE +LOCAL +DEFAULT +6 00000010\.plt_call\.__tls_get_addr\+0
 .* NOTYPE +LOCAL +DEFAULT +6 __glink_PLTresolve
-.* NOTYPE +LOCAL +DEFAULT +UND \.__tls_get_addr
 .* TLS +GLOBAL +DEFAULT +UND gd
 .* TLS +GLOBAL +DEFAULT +8 le0
 .* NOTYPE +GLOBAL +DEFAULT +UND __tls_get_addr
diff --git a/ld/testsuite/ld-powerpc/tlsso32.r b/ld/testsuite/ld-powerpc/tlsso32.r
index 0eb4a3c3d3..02d8e84677 100644
--- a/ld/testsuite/ld-powerpc/tlsso32.r
+++ b/ld/testsuite/ld-powerpc/tlsso32.r
@@ -103,6 +103,7 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .* SECTION +LOCAL +DEFAULT +9 
 .* SECTION +LOCAL +DEFAULT +10 
 .* SECTION +LOCAL +DEFAULT +11 
+.* FILE +LOCAL +DEFAULT +ABS .*
 .* TLS +LOCAL +DEFAULT +7 gd4
 .* TLS +LOCAL +DEFAULT +7 ld4
 .* TLS +LOCAL +DEFAULT +7 ld5
@@ -110,6 +111,7 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .* TLS +LOCAL +DEFAULT +7 ie4
 .* TLS +LOCAL +DEFAULT +7 le4
 .* TLS +LOCAL +DEFAULT +7 le5
+.* FILE +LOCAL +DEFAULT +ABS .*
 .* OBJECT +LOCAL +DEFAULT +9 _DYNAMIC
 .* OBJECT +LOCAL +DEFAULT +10 _GLOBAL_OFFSET_TABLE_
 .* TLS +GLOBAL +DEFAULT +UND gd
diff --git a/ld/testsuite/ld-powerpc/tlstocso.r b/ld/testsuite/ld-powerpc/tlstocso.r
index 211a260546..dc9f930206 100644
--- a/ld/testsuite/ld-powerpc/tlstocso.r
+++ b/ld/testsuite/ld-powerpc/tlstocso.r
@@ -95,6 +95,7 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .* SECTION +LOCAL +DEFAULT +9 
 .* SECTION +LOCAL +DEFAULT +10 
 .* SECTION +LOCAL +DEFAULT +11 
+.* FILE +LOCAL +DEFAULT +ABS .*
 .* TLS +LOCAL +DEFAULT +7 gd4
 .* TLS +LOCAL +DEFAULT +7 ld4
 .* TLS +LOCAL +DEFAULT +7 ld5
@@ -103,10 +104,11 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .* TLS +LOCAL +DEFAULT +7 le4
 .* TLS +LOCAL +DEFAULT +7 le5
 .* NOTYPE +LOCAL +DEFAULT +10 \.Lie0
+.* NOTYPE +LOCAL +DEFAULT +UND \.__tls_get_addr
+.* FILE +LOCAL +DEFAULT +ABS .*
 .* OBJECT +LOCAL +DEFAULT +9 _DYNAMIC
 .* NOTYPE +LOCAL +DEFAULT +6 00000010\.plt_call\.__tls_get_addr\+0
 .* NOTYPE +LOCAL +DEFAULT +6 __glink_PLTresolve
-.* NOTYPE +LOCAL +DEFAULT +UND \.__tls_get_addr
 .* TLS +GLOBAL +DEFAULT +UND gd
 .* TLS +GLOBAL +DEFAULT +8 le0
 .* NOTYPE +GLOBAL +DEFAULT +UND __tls_get_addr
diff --git a/ld/testsuite/ld-powerpc/vxworks-relax-2.rd b/ld/testsuite/ld-powerpc/vxworks-relax-2.rd
index 02eb964f41..4d36109212 100644
--- a/ld/testsuite/ld-powerpc/vxworks-relax-2.rd
+++ b/ld/testsuite/ld-powerpc/vxworks-relax-2.rd
@@ -1,11 +1,11 @@
 
 Relocation section '.rela.text' at offset 0x[0-9a-f]+ contains 8 entries:
- Offset     Info    Type            Sym.Value  Sym. Name \+ Addend
-00000016  00000106 R_PPC_ADDR16_HA   00000000   .text \+ 4000034
-0000001a  00000104 R_PPC_ADDR16_LO   00000000   .text \+ 4000034
-00000006  00000106 R_PPC_ADDR16_HA   00000000   .text \+ 4000034
-0000000a  00000104 R_PPC_ADDR16_LO   00000000   .text \+ 4000034
-00000026  00000506 R_PPC_ADDR16_HA   00000000   undefined \+ 0
-0000002a  00000504 R_PPC_ADDR16_LO   00000000   undefined \+ 0
-0400003e  00000606 R_PPC_ADDR16_HA   00000000   _start \+ 0
-04000042  00000604 R_PPC_ADDR16_LO   00000000   _start \+ 0
+ Offset +Info +Type +Sym.Value +Sym. Name \+ Addend
+0+16 +[0-9a-f]+ R_PPC_ADDR16_HA +0+ +.text \+ 4000034
+0+1a +[0-9a-f]+ R_PPC_ADDR16_LO +0+ +.text \+ 4000034
+0+6 +[0-9a-f]+ R_PPC_ADDR16_HA +0+ +.text \+ 4000034
+0+a +[0-9a-f]+ R_PPC_ADDR16_LO +0+ +.text \+ 4000034
+0+26 +[0-9a-f]+ R_PPC_ADDR16_HA +0+ +undefined \+ 0
+0+2a +[0-9a-f]+ R_PPC_ADDR16_LO +0+ +undefined \+ 0
+0+400003e +[0-9a-f]+ R_PPC_ADDR16_HA +0+ +_start \+ 0
+0+4000042 +[0-9a-f]+ R_PPC_ADDR16_LO +0+ +_start \+ 0
diff --git a/ld/testsuite/ld-s390/tlsbin.rd b/ld/testsuite/ld-s390/tlsbin.rd
index 678d92cfe0..e842038897 100644
--- a/ld/testsuite/ld-s390/tlsbin.rd
+++ b/ld/testsuite/ld-s390/tlsbin.rd
@@ -91,6 +91,7 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .* SECTION +LOCAL +DEFAULT +10 
 .* SECTION +LOCAL +DEFAULT +11 
 .* SECTION +LOCAL +DEFAULT +12 
+.* FILE +LOCAL +DEFAULT +ABS .*
 .* TLS +LOCAL +DEFAULT +9 sl1
 .* TLS +LOCAL +DEFAULT +9 sl2
 .* TLS +LOCAL +DEFAULT +9 sl3
@@ -99,6 +100,7 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .* TLS +LOCAL +DEFAULT +9 sl6
 .* TLS +LOCAL +DEFAULT +9 sl7
 .* TLS +LOCAL +DEFAULT +9 sl8
+.* FILE +LOCAL +DEFAULT +ABS .*
 .* TLS +LOCAL +DEFAULT +10 bl1
 .* TLS +LOCAL +DEFAULT +10 bl2
 .* TLS +LOCAL +DEFAULT +10 bl3
@@ -107,6 +109,7 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .* TLS +LOCAL +DEFAULT +10 bl6
 .* TLS +LOCAL +DEFAULT +10 bl7
 .* TLS +LOCAL +DEFAULT +10 bl8
+.* FILE +LOCAL +DEFAULT +ABS .*
 .* OBJECT +LOCAL +DEFAULT +11 _DYNAMIC
 .* OBJECT +LOCAL +DEFAULT +12 _GLOBAL_OFFSET_TABLE_
 .* TLS +GLOBAL +DEFAULT +UND sG3
diff --git a/ld/testsuite/ld-s390/tlspic.rd b/ld/testsuite/ld-s390/tlspic.rd
index e118e3fce2..8da987c813 100644
--- a/ld/testsuite/ld-s390/tlspic.rd
+++ b/ld/testsuite/ld-s390/tlspic.rd
@@ -101,6 +101,7 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .* SECTION +LOCAL +DEFAULT +9 
 .* SECTION +LOCAL +DEFAULT +10 
 .* SECTION +LOCAL +DEFAULT +11 
+.* FILE +LOCAL +DEFAULT +ABS .*
 .* TLS +LOCAL +DEFAULT +8 sl1
 .* TLS +LOCAL +DEFAULT +8 sl2
 .* TLS +LOCAL +DEFAULT +8 sl3
@@ -110,7 +111,6 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .* TLS +LOCAL +DEFAULT +8 sl7
 .* TLS +LOCAL +DEFAULT +8 sl8
 .* TLS +LOCAL +DEFAULT +9 sH1
-.* OBJECT +LOCAL +DEFAULT +ABS _DYNAMIC
 .* TLS +LOCAL +DEFAULT +8 sh3
 .* TLS +LOCAL +DEFAULT +9 sH2
 .* TLS +LOCAL +DEFAULT +9 sH7
@@ -124,9 +124,11 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .* TLS +LOCAL +DEFAULT +9 sH6
 .* TLS +LOCAL +DEFAULT +9 sH8
 .* TLS +LOCAL +DEFAULT +8 sh1
-.* OBJECT +LOCAL +DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
 .* TLS +LOCAL +DEFAULT +8 sh2
 .* TLS +LOCAL +DEFAULT +8 sh6
+.* FILE +LOCAL +DEFAULT +ABS .*
+.* OBJECT +LOCAL +DEFAULT +ABS _DYNAMIC
+.* OBJECT +LOCAL +DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
 .* TLS +GLOBAL +DEFAULT +8 sg8
 .* TLS +GLOBAL +DEFAULT +8 sg3
 .* TLS +GLOBAL +DEFAULT +8 sg4
diff --git a/ld/testsuite/ld-s390/tlspic_64.rd b/ld/testsuite/ld-s390/tlspic_64.rd
index 9a0c74b22a..709a6c584c 100644
--- a/ld/testsuite/ld-s390/tlspic_64.rd
+++ b/ld/testsuite/ld-s390/tlspic_64.rd
@@ -101,6 +101,7 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .* SECTION +LOCAL +DEFAULT +9 
 .* SECTION +LOCAL +DEFAULT +10 
 .* SECTION +LOCAL +DEFAULT +11 
+.* FILE +LOCAL +DEFAULT +ABS .*
 .* TLS +LOCAL +DEFAULT +8 sl1
 .* TLS +LOCAL +DEFAULT +8 sl2
 .* TLS +LOCAL +DEFAULT +8 sl3
@@ -110,7 +111,6 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .* TLS +LOCAL +DEFAULT +8 sl7
 .* TLS +LOCAL +DEFAULT +8 sl8
 .* TLS +LOCAL +DEFAULT +9 sH1
-.* OBJECT +LOCAL +DEFAULT +ABS _DYNAMIC
 .* TLS +LOCAL +DEFAULT +8 sh3
 .* TLS +LOCAL +DEFAULT +9 sH2
 .* TLS +LOCAL +DEFAULT +9 sH7
@@ -124,9 +124,11 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .* TLS +LOCAL +DEFAULT +9 sH6
 .* TLS +LOCAL +DEFAULT +9 sH8
 .* TLS +LOCAL +DEFAULT +8 sh1
-.* OBJECT +LOCAL +DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
 .* TLS +LOCAL +DEFAULT +8 sh2
 .* TLS +LOCAL +DEFAULT +8 sh6
+.* FILE +LOCAL +DEFAULT +ABS .*
+.* OBJECT +LOCAL +DEFAULT +ABS _DYNAMIC
+.* OBJECT +LOCAL +DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
 .* TLS +GLOBAL +DEFAULT +8 sg8
 .* TLS +GLOBAL +DEFAULT +8 sg3
 .* TLS +GLOBAL +DEFAULT +8 sg4
diff --git a/ld/testsuite/ld-sh/sh64/abi32.xd b/ld/testsuite/ld-sh/sh64/abi32.xd
index 94b1014b8d..34bf961654 100644
--- a/ld/testsuite/ld-sh/sh64/abi32.xd
+++ b/ld/testsuite/ld-sh/sh64/abi32.xd
@@ -25,9 +25,12 @@ SYMBOL TABLE:
 0+1000 l    d  \.text	0+ (|\.text)
 0+10e8 l    d  \.data	0+ (|\.data)
 0+80000 l    d  \.stack	0+ (|\.stack)
+0+ l    df \*ABS\*	0+ .*
 0+10f4 l       \.data	0+ foobar
+0+ l    df \*ABS\*	0+ .*
 0+10fc l       \.data	0+ foobar2
 0+1060 l       \.text	0+ 0x04 plugh
+0+ l    df \*ABS\*	0+ .*
 0+10f8 g       \.data	0+ foobar
 0+10e8 g       \.data	0+ baz
 0+10e8 g       .*	0+ ___dtors
diff --git a/ld/testsuite/ld-sh/sh64/abi64.xd b/ld/testsuite/ld-sh/sh64/abi64.xd
index 9af5b4719a..12fdc5ae9c 100644
--- a/ld/testsuite/ld-sh/sh64/abi64.xd
+++ b/ld/testsuite/ld-sh/sh64/abi64.xd
@@ -24,9 +24,12 @@ SYMBOL TABLE:
 0000000000001000 l    d  \.text	0000000000000000 (|\.text)
 0000000000001130 l    d  \.data	0000000000000000 (|\.data)
 0000000000080000 l    d  \.stack	0000000000000000 (|\.stack)
+0000000000000000 l    df \*ABS\*	0000000000000000 .*
 000000000000113c l       \.data	0000000000000000 foobar
+0000000000000000 l    df \*ABS\*	0000000000000000 .*
 0000000000001144 l       \.data	0000000000000000 foobar2
 00000000000010a8 l       \.text	0000000000000000 0x04 plugh
+0000000000000000 l    df \*ABS\*	0000000000000000 .*
 0000000000001140 g       \.data	0000000000000000 foobar
 0000000000001130 g       \.data	0000000000000000 baz
 0000000000001130 g       .*	0000000000000000 ___dtors
diff --git a/ld/testsuite/ld-sh/sh64/cmpct1.xd b/ld/testsuite/ld-sh/sh64/cmpct1.xd
index 41f898ed74..317d044d05 100644
--- a/ld/testsuite/ld-sh/sh64/cmpct1.xd
+++ b/ld/testsuite/ld-sh/sh64/cmpct1.xd
@@ -23,8 +23,10 @@ SYMBOL TABLE:
 0+1000 l    d  \.text	0+ (|\.text)
 0+1008 l    d  \.rodata	0+ (|\.rodata)
 0+80000 l    d  \.stack	0+ (|\.stack)
+0+ l    df \*ABS\*	0+ .*
 0+1004 l       \.text	0+ next
 0+100c l       \.rodata	0+ here
+0+ l    df \*ABS\*	0+ .*
 0+1098 g       .*	0+ ___dtors
 0+1098 g       \*ABS\*	0+ __bss_start
 0+1098 g       .*	0+ ___ctors_end
diff --git a/ld/testsuite/ld-sh/sh64/crange1.rd b/ld/testsuite/ld-sh/sh64/crange1.rd
index 2d2e69ce1b..2546130ff7 100644
--- a/ld/testsuite/ld-sh/sh64/crange1.rd
+++ b/ld/testsuite/ld-sh/sh64/crange1.rd
@@ -22,7 +22,9 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .*: 00001004 +0 +SECTION +LOCAL +DEFAULT +2 
 .*: 00080000 +0 +SECTION +LOCAL +DEFAULT +3 
 .*: 00000000 +0 +SECTION +LOCAL +DEFAULT +4 
+.* FILE +LOCAL +DEFAULT +ABS .*
 .*: 00001004 +0 +NOTYPE +LOCAL +DEFAULT +\[<other>: 4\] +2 start2
+.* FILE +LOCAL +DEFAULT +ABS .*
 .*: 000010a0 +0 +NOTYPE +GLOBAL +DEFAULT +.* ___dtors
 .*: 000010a0 +0 +NOTYPE +GLOBAL +DEFAULT +ABS __bss_start
 .*: 000010a0 +0 +NOTYPE +GLOBAL +DEFAULT +.* ___ctors_end
diff --git a/ld/testsuite/ld-sh/sh64/crange2.rd b/ld/testsuite/ld-sh/sh64/crange2.rd
index 3ee4dbb63a..5bff4c3f60 100644
--- a/ld/testsuite/ld-sh/sh64/crange2.rd
+++ b/ld/testsuite/ld-sh/sh64/crange2.rd
@@ -22,11 +22,14 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .*: 00001004 +0 +SECTION +LOCAL +DEFAULT +2 
 .*: 00080000 +0 +SECTION +LOCAL +DEFAULT +3 
 .*: 00000000 +0 +SECTION +LOCAL +DEFAULT +4 
+.* FILE +LOCAL +DEFAULT +ABS .*
 .*: 00001004 +0 +NOTYPE +LOCAL +DEFAULT +\[<other>: 4\] +2 start2
+.* FILE +LOCAL +DEFAULT +ABS .*
 .*: 0000101c +0 +NOTYPE +LOCAL +DEFAULT +\[<other>: 4\] +2 sec1
 .*: 0000102c +0 +NOTYPE +LOCAL +DEFAULT +\[<other>: 4\] +2 sec2
 .*: 00001040 +0 +NOTYPE +LOCAL +DEFAULT +2 sec3
 .*: 00001048 +0 +NOTYPE +LOCAL +DEFAULT +2 sec4
+.* FILE +LOCAL +DEFAULT +ABS .*
 .*: 000010e0 +0 +NOTYPE +GLOBAL +DEFAULT +.* ___dtors
 .*: 000010e0 +0 +NOTYPE +GLOBAL +DEFAULT +ABS __bss_start
 .*: 000010e0 +0 +NOTYPE +GLOBAL +DEFAULT +.* ___ctors_end
diff --git a/ld/testsuite/ld-sh/sh64/crange3-cmpct.rd b/ld/testsuite/ld-sh/sh64/crange3-cmpct.rd
index 21f5ec2f68..65b3dfad89 100644
--- a/ld/testsuite/ld-sh/sh64/crange3-cmpct.rd
+++ b/ld/testsuite/ld-sh/sh64/crange3-cmpct.rd
@@ -39,9 +39,13 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .*: 00001004 +0 +SECTION +LOCAL +DEFAULT +2 
 .*: 00080000 +0 +SECTION +LOCAL +DEFAULT +3 
 .*: 00000000 +0 +SECTION +LOCAL +DEFAULT +4 
+.*: 00000000 +0 +FILE +LOCAL +DEFAULT +ABS .*
 .*: 00001004 +0 +NOTYPE +LOCAL +DEFAULT +2 sec4
+.*: 00000000 +0 +FILE +LOCAL +DEFAULT +ABS .*
 .*: 000010a4 +0 +NOTYPE +LOCAL +DEFAULT +\[<other>: 4\] +2 start2
+.*: 00000000 +0 +FILE +LOCAL +DEFAULT +ABS .*
 .*: 000010bc +0 +NOTYPE +LOCAL +DEFAULT +2 sec3
+.*: 00000000 +0 +FILE +LOCAL +DEFAULT +ABS .*
 .*: 000010c4 +0 +NOTYPE +GLOBAL +DEFAULT +\[<other>: 4\] +2 diversion
 .*: 00001160 +0 +NOTYPE +GLOBAL +DEFAULT +.* ___dtors
 .*: 00001160 +0 +NOTYPE +GLOBAL +DEFAULT +ABS __bss_start
diff --git a/ld/testsuite/ld-sh/sh64/crange3-media.rd b/ld/testsuite/ld-sh/sh64/crange3-media.rd
index 18ce30e3c8..e443ad90cf 100644
--- a/ld/testsuite/ld-sh/sh64/crange3-media.rd
+++ b/ld/testsuite/ld-sh/sh64/crange3-media.rd
@@ -39,9 +39,13 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .*: 00001004 +0 +SECTION +LOCAL +DEFAULT +2 
 .*: 00080000 +0 +SECTION +LOCAL +DEFAULT +3 
 .*: 00000000 +0 +SECTION +LOCAL +DEFAULT +4 
+.*: 00000000 +0 +FILE +LOCAL +DEFAULT +ABS .*
 .*: 00001004 +0 +NOTYPE +LOCAL +DEFAULT +2 sec4
+.*: 00000000 +0 +FILE +LOCAL +DEFAULT +ABS .*
 .*: 000010a4 +0 +NOTYPE +LOCAL +DEFAULT +\[<other>: 4\] +2 start2
+.*: 00000000 +0 +FILE +LOCAL +DEFAULT +ABS .*
 .*: 000010bc +0 +NOTYPE +LOCAL +DEFAULT +2 sec3
+.*: 00000000 +0 +FILE +LOCAL +DEFAULT +ABS .*
 .*: 000010c4 +0 +NOTYPE +GLOBAL +DEFAULT +\[<other>: 4\] +2 diversion
 .*: 00001160 +0 +NOTYPE +GLOBAL +DEFAULT +.* ___dtors
 .*: 00001160 +0 +NOTYPE +GLOBAL +DEFAULT +ABS __bss_start
diff --git a/ld/testsuite/ld-sh/sh64/crange3.rd b/ld/testsuite/ld-sh/sh64/crange3.rd
index 1a0b7a5556..58f511c0d0 100644
--- a/ld/testsuite/ld-sh/sh64/crange3.rd
+++ b/ld/testsuite/ld-sh/sh64/crange3.rd
@@ -20,9 +20,13 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .*: 00001004 +0 +SECTION +LOCAL +DEFAULT +2 
 .*: 00080000 +0 +SECTION +LOCAL +DEFAULT +3 
 .*: 00000000 +0 +SECTION +LOCAL +DEFAULT +4 
+.*: 00000000 +0 +FILE +LOCAL +DEFAULT +ABS .*
 .*: 00001004 +0 +NOTYPE +LOCAL +DEFAULT +2 sec4
+.*: 00000000 +0 +FILE +LOCAL +DEFAULT +ABS .*
 .*: 000010a4 +0 +NOTYPE +LOCAL +DEFAULT +\[<other>: 4\] +2 start2
+.*: 00000000 +0 +FILE +LOCAL +DEFAULT +ABS .*
 .*: 000010bc +0 +NOTYPE +LOCAL +DEFAULT +2 sec3
+.*: 00000000 +0 +FILE +LOCAL +DEFAULT +ABS .*
 .*: 000010c4 +0 +NOTYPE +GLOBAL +DEFAULT +\[<other>: 4\] +2 diversion
 .*: 00001160 +0 +NOTYPE +GLOBAL +DEFAULT +.* ___dtors
 .*: 00001160 +0 +NOTYPE +GLOBAL +DEFAULT +ABS __bss_start
diff --git a/ld/testsuite/ld-sh/sh64/crangerel1.rd b/ld/testsuite/ld-sh/sh64/crangerel1.rd
index 0100b10b13..8dd642ef17 100644
--- a/ld/testsuite/ld-sh/sh64/crangerel1.rd
+++ b/ld/testsuite/ld-sh/sh64/crangerel1.rd
@@ -11,8 +11,8 @@ Section Headers:
  +\[ 6\] \.cranges +PROGBITS +00000000 000050 00001e 00 +W +0 +0 +1
  +\[ 7\] \.rela\.cranges +RELA +00000000 000274 000024 0c +9 +6 +4
  +\[ 8\] \.shstrtab +STRTAB +00000000 00006e 00004d 00 +0 +0 +1
- +\[ 9\] \.symtab +SYMTAB +00000000 000298 000090 10 +10 +8 +4
- +\[10\] \.strtab +STRTAB +00000000 000328 000013 00 +0 +0 +1
+ +\[ 9\] \.symtab +SYMTAB .*
+ +\[10\] \.strtab +STRTAB .*
 Key to Flags:
 #...
 
@@ -22,17 +22,19 @@ Relocation section '\.rela\.cranges' at offset 0x[0-9a-f]+ contains 3 entries:
 0*0000000a +0+0201 R_SH_DIR32 +00000000 +\.text\.mixed +\+ 0
 0*00000014 +0+0201 R_SH_DIR32 +00000000 +\.text\.mixed +\+ 0
 
-Symbol table '\.symtab' contains 9 entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
  +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
- +0: 00000000 +0 +NOTYPE +LOCAL +DEFAULT +UND 
- +1: 00000000 +0 +SECTION +LOCAL +DEFAULT +1 
- +2: 00000000 +0 +SECTION +LOCAL +DEFAULT +2 
- +3: 00000000 +0 +SECTION +LOCAL +DEFAULT +3 
- +4: 00000000 +0 +SECTION +LOCAL +DEFAULT +4 
- +5: 00000000 +0 +SECTION +LOCAL +DEFAULT +5 
- +6: 00000000 +0 +SECTION +LOCAL +DEFAULT +6 
- +7: 00000000 +0 +NOTYPE +LOCAL +DEFAULT +\[<other>: 4\] +2 start2
- +8: 00000000 +0 +NOTYPE +GLOBAL +DEFAULT +2 diversion2
+.* 00000000 +0 +NOTYPE +LOCAL +DEFAULT +UND 
+.* 00000000 +0 +SECTION +LOCAL +DEFAULT +1 
+.* 00000000 +0 +SECTION +LOCAL +DEFAULT +2 
+.* 00000000 +0 +SECTION +LOCAL +DEFAULT +3 
+.* 00000000 +0 +SECTION +LOCAL +DEFAULT +4 
+.* 00000000 +0 +SECTION +LOCAL +DEFAULT +5 
+.* 00000000 +0 +SECTION +LOCAL +DEFAULT +6 
+.* 00000000 +0 +FILE +LOCAL +DEFAULT +ABS .*
+.* 00000000 +0 +NOTYPE +LOCAL +DEFAULT +\[<other>: 4\] +2 start2
+.* 00000000 +0 +FILE +LOCAL +DEFAULT +ABS .*
+.* 00000000 +0 +NOTYPE +GLOBAL +DEFAULT +2 diversion2
 
 Hex dump of section '\.text\.mixed':
   0x00000000 6ff0fff0 6ff0fff0 6ff0fff0 0000002a .*
diff --git a/ld/testsuite/ld-sh/sh64/crangerel2.rd b/ld/testsuite/ld-sh/sh64/crangerel2.rd
index 4f8a9cdb57..5b3227b110 100644
--- a/ld/testsuite/ld-sh/sh64/crangerel2.rd
+++ b/ld/testsuite/ld-sh/sh64/crangerel2.rd
@@ -11,8 +11,8 @@ Section Headers:
  +\[ 6\] \.cranges +PROGBITS +00000000 000094 000046 00 +W +0 +0 +1
  +\[ 7\] \.rela\.cranges +RELA +00000000 0002e0 000054 0c +9 +6 +4
  +\[ 8\] \.shstrtab +STRTAB +00000000 0000da 00004d 00 +0 +0 +1
- +\[ 9\] \.symtab +SYMTAB +00000000 000334 0000d0 10 +10 +12 +4
- +\[10\] \.strtab +STRTAB +00000000 000404 000027 00 +0 +0 +1
+ +\[ 9\] \.symtab +SYMTAB +00000000 [0-9a-f]+ [0-9a-f]+ 10 +10 +[0-9]+ +4
+ +\[10\] \.strtab +STRTAB +00000000 [0-9a-f]+ [0-9a-f]+ 00 +0 +0 +1
 Key to Flags:
 #...
 
@@ -26,21 +26,26 @@ Relocation section '\.rela\.cranges' at offset 0x[0-9a-f]+ contains 7 entries:
 0*00000032 +0+0201 R_SH_DIR32 +00000000 +\.text\.mixed +\+ 0
 0*0000003c +0+0201 R_SH_DIR32 +00000000 +\.text\.mixed +\+ 0
 
-Symbol table '\.symtab' contains 13 entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
  +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
- +0: 00000000 +0 +NOTYPE +LOCAL +DEFAULT +UND 
- +1: 00000000 +0 +SECTION +LOCAL +DEFAULT +1 
- +2: 00000000 +0 +SECTION +LOCAL +DEFAULT +2 
- +3: 00000000 +0 +SECTION +LOCAL +DEFAULT +3 
- +4: 00000000 +0 +SECTION +LOCAL +DEFAULT +4 
- +5: 00000000 +0 +SECTION +LOCAL +DEFAULT +5 
- +6: 00000000 +0 +SECTION +LOCAL +DEFAULT +6 
- +7: 00000000 +0 +NOTYPE +LOCAL +DEFAULT +\[<other>: 4\] +2 start2
- +8: 00000018 +0 +NOTYPE +LOCAL +DEFAULT +\[<other>: 4\] +2 sec1
- +9: 00000028 +0 +NOTYPE +LOCAL +DEFAULT +\[<other>: 4\] +2 sec2
- +10: 0000003c +0 +NOTYPE +LOCAL +DEFAULT +2 sec3
- +11: 00000044 +0 +NOTYPE +LOCAL +DEFAULT +2 sec4
- +12: 00000000 +0 +NOTYPE +GLOBAL +DEFAULT +2 diversion2
+.* 00000000 +0 +NOTYPE +LOCAL +DEFAULT +UND 
+.* 00000000 +0 +SECTION +LOCAL +DEFAULT +1 
+.* 00000000 +0 +SECTION +LOCAL +DEFAULT +2 
+.* 00000000 +0 +SECTION +LOCAL +DEFAULT +3 
+.* 00000000 +0 +SECTION +LOCAL +DEFAULT +4 
+.* 00000000 +0 +SECTION +LOCAL +DEFAULT +5 
+.* 00000000 +0 +SECTION +LOCAL +DEFAULT +6 
+.* 00000000 +0 +FILE +LOCAL +DEFAULT +ABS .*
+.* 00000000 +0 +NOTYPE +LOCAL +DEFAULT +\[<other>: 4\] +2 start2
+.* 00000000 +0 +FILE +LOCAL +DEFAULT +ABS .*
+.* 00000018 +0 +NOTYPE +LOCAL +DEFAULT +\[<other>: 4\] +2 sec1
+.* 00000028 +0 +NOTYPE +LOCAL +DEFAULT +\[<other>: 4\] +2 sec2
+.* 00000000 +0 +FILE +LOCAL +DEFAULT +ABS .*
+.* 0000003c +0 +NOTYPE +LOCAL +DEFAULT +2 sec3
+.* 00000000 +0 +FILE +LOCAL +DEFAULT +ABS .*
+.* 00000044 +0 +NOTYPE +LOCAL +DEFAULT +2 sec4
+.* 00000000 +0 +FILE +LOCAL +DEFAULT +ABS .*
+.* 00000000 +0 +NOTYPE +GLOBAL +DEFAULT +2 diversion2
 
 Hex dump of section '\.text\.mixed':
   0x00000000 6ff0fff0 6ff0fff0 6ff0fff0 0000002a .*
diff --git a/ld/testsuite/ld-sh/sh64/mix1.xd b/ld/testsuite/ld-sh/sh64/mix1.xd
index de72ce0ef9..8015f23f7d 100644
--- a/ld/testsuite/ld-sh/sh64/mix1.xd
+++ b/ld/testsuite/ld-sh/sh64/mix1.xd
@@ -27,10 +27,12 @@ SYMBOL TABLE:
 0+10c8 l    d  \.data	0+ (|\.data)
 0+80000 l    d  \.stack	0+ (|\.stack)
 0+ l    d  \.cranges	0+ (|\.cranges)
+0+ l    df \*ABS\*	0+ .*
 0+1008 l       \.text	0+ forw
 0+1004 l       \.text	0+ start2
 0+1030 l       \.text	0+ 0x04 mediacode2
 0+1018 l       \.text	0+ 0x04 mediacode
+0+ l    df \*ABS\*	0+ .*
 0+10c8 g       .*	0+ ___dtors
 0+10d8 g       \*ABS\*	0+ __bss_start
 0+10c8 g       .*	0+ ___ctors_end
diff --git a/ld/testsuite/ld-sh/sh64/mix2.xd b/ld/testsuite/ld-sh/sh64/mix2.xd
index 5c72763c07..0bece0939e 100644
--- a/ld/testsuite/ld-sh/sh64/mix2.xd
+++ b/ld/testsuite/ld-sh/sh64/mix2.xd
@@ -31,7 +31,9 @@ SYMBOL TABLE:
 0+10c8 l    d  \.data	0+ (|\.data)
 0+80000 l    d  \.stack	0+ (|\.stack)
 0+ l    d  \.cranges	0+ (|\.cranges)
+0+ l    df \*ABS\*	0+ .*
 0+1020 l       \.text	0+ locallabel
+0+ l    df \*ABS\*	0+ .*
 0+1040 g       \.rodata	0+ compactlabel4
 0+101c g       \.text	0+ 0x04 medialabel2
 0+1038 g       \.rodata	0+ medialabel3
diff --git a/ld/testsuite/ld-sh/sh64/shdl32.xd b/ld/testsuite/ld-sh/sh64/shdl32.xd
index 56773e3cfb..94a2c2b840 100644
--- a/ld/testsuite/ld-sh/sh64/shdl32.xd
+++ b/ld/testsuite/ld-sh/sh64/shdl32.xd
@@ -27,7 +27,9 @@ SYMBOL TABLE:
 0+1204 l    d  \.rodata	0+ (|\.rodata)
 0+13c8 l    d  \.data	0+ (|\.data)
 0+80000 l    d  \.stack	0+ (|\.stack)
+0+ l    df \*ABS\*	0+ .*
 0+1150 l       \.text	0+ 0x04 part2
+0+ l    df \*ABS\*	0+ .*
 0+13f8 g       \.data	0+ dfoo_otherboth2
 0+1178 g       \.text	0+ 0x04 bar_otherwithout
 0+11b4 g       \.text	0+ 0x04 bazwithout
diff --git a/ld/testsuite/ld-sh/sh64/shdl64.xd b/ld/testsuite/ld-sh/sh64/shdl64.xd
index 142ca968cd..aa97cb7996 100644
--- a/ld/testsuite/ld-sh/sh64/shdl64.xd
+++ b/ld/testsuite/ld-sh/sh64/shdl64.xd
@@ -27,7 +27,9 @@ SYMBOL TABLE:
 0+1204 l    d  \.rodata	0+ (|\.rodata)
 0+13c8 l    d  \.data	0+ (|\.data)
 0+80000 l    d  \.stack	0+ (|\.stack)
+0+ l    df \*ABS\*	0+ .*
 0+1150 l       \.text	0+ 0x04 part2
+0+ l    df \*ABS\*	0+ .*
 0+13f8 g       \.data	0+ dfoo_otherboth2
 0+1178 g       \.text	0+ 0x04 bar_otherwithout
 0+11b4 g       \.text	0+ 0x04 bazwithout
diff --git a/ld/testsuite/ld-sh/sub2l-1.d b/ld/testsuite/ld-sh/sub2l-1.d
index 40d4e0887b..735e4b996b 100644
--- a/ld/testsuite/ld-sh/sub2l-1.d
+++ b/ld/testsuite/ld-sh/sub2l-1.d
@@ -11,6 +11,7 @@ SYMBOL TABLE:
 0+1000 l       .text	00000000 f
 0+1002 l       .text	00000000 f2
 0+1028 l       .text	00000000 L
+#...
 0+1020 g       .text	00000000 ff
 #...
 
diff --git a/ld/testsuite/ld-sh/weak1.d b/ld/testsuite/ld-sh/weak1.d
index d248bb9d69..d450a2b3e3 100644
--- a/ld/testsuite/ld-sh/weak1.d
+++ b/ld/testsuite/ld-sh/weak1.d
@@ -10,6 +10,7 @@ SYMBOL TABLE:
 #...
 0+10a0 l       .data	0+ d0
 0+1000 l       .text	0+ f
+#...
 0+10a4  w      .data	0+ w0
 #...
 
diff --git a/ld/testsuite/ld-sparc/gotop32.rd b/ld/testsuite/ld-sparc/gotop32.rd
index 1cecad8c46..3778a218cb 100644
--- a/ld/testsuite/ld-sparc/gotop32.rd
+++ b/ld/testsuite/ld-sparc/gotop32.rd
@@ -59,7 +59,9 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .* SECTION +LOCAL +DEFAULT +6 *
 .* SECTION +LOCAL +DEFAULT +7 *
 .* SECTION +LOCAL +DEFAULT +8 *
+.* FILE +LOCAL +DEFAULT +ABS .*
 .* NOTYPE +LOCAL +DEFAULT +8 local_sym
+.* FILE +LOCAL +DEFAULT +ABS .*
 .* OBJECT +LOCAL +DEFAULT +ABS _DYNAMIC
 .* OBJECT +LOCAL +DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
 .* OBJECT +LOCAL +DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
diff --git a/ld/testsuite/ld-sparc/gotop64.rd b/ld/testsuite/ld-sparc/gotop64.rd
index 509c8f8989..ebcd18cea5 100644
--- a/ld/testsuite/ld-sparc/gotop64.rd
+++ b/ld/testsuite/ld-sparc/gotop64.rd
@@ -59,7 +59,9 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .* SECTION +LOCAL +DEFAULT +6 *
 .* SECTION +LOCAL +DEFAULT +7 *
 .* SECTION +LOCAL +DEFAULT +8 *
+.* FILE +LOCAL +DEFAULT +ABS .*
 .* NOTYPE +LOCAL +DEFAULT +8 local_sym
+.* FILE +LOCAL +DEFAULT +ABS .*
 .* OBJECT +LOCAL +DEFAULT +ABS _DYNAMIC
 .* OBJECT +LOCAL +DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
 .* OBJECT +LOCAL +DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
diff --git a/ld/testsuite/ld-sparc/tlssunbin32.rd b/ld/testsuite/ld-sparc/tlssunbin32.rd
index 69a0317735..09512fca75 100644
--- a/ld/testsuite/ld-sparc/tlssunbin32.rd
+++ b/ld/testsuite/ld-sparc/tlssunbin32.rd
@@ -71,6 +71,7 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .* SECTION +LOCAL +DEFAULT +8 *
 .* SECTION +LOCAL +DEFAULT +9 *
 .* SECTION +LOCAL +DEFAULT +10 *
+.* FILE +LOCAL +DEFAULT +ABS .*
 .* TLS +LOCAL +DEFAULT +7 sl1
 .* TLS +LOCAL +DEFAULT +7 sl2
 .* TLS +LOCAL +DEFAULT +7 sl3
@@ -79,6 +80,7 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .* TLS +LOCAL +DEFAULT +7 sl6
 .* TLS +LOCAL +DEFAULT +7 sl7
 .* TLS +LOCAL +DEFAULT +7 sl8
+.* FILE +LOCAL +DEFAULT +ABS .*
 .* TLS +LOCAL +DEFAULT +8 bl1
 .* TLS +LOCAL +DEFAULT +8 bl2
 .* TLS +LOCAL +DEFAULT +8 bl3
@@ -87,6 +89,7 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .* TLS +LOCAL +DEFAULT +8 bl6
 .* TLS +LOCAL +DEFAULT +8 bl7
 .* TLS +LOCAL +DEFAULT +8 bl8
+.* FILE +LOCAL +DEFAULT +ABS .*
 .* OBJECT +LOCAL +DEFAULT +9 _DYNAMIC
 .* OBJECT +LOCAL +DEFAULT +10 _PROCEDURE_LINKAGE_TABLE_
 .* OBJECT +LOCAL +DEFAULT +10 _GLOBAL_OFFSET_TABLE_
diff --git a/ld/testsuite/ld-sparc/tlssunbin64.rd b/ld/testsuite/ld-sparc/tlssunbin64.rd
index 483a9cf798..cd69288f4e 100644
--- a/ld/testsuite/ld-sparc/tlssunbin64.rd
+++ b/ld/testsuite/ld-sparc/tlssunbin64.rd
@@ -71,6 +71,7 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .* SECTION +LOCAL +DEFAULT +8 *
 .* SECTION +LOCAL +DEFAULT +9 *
 .* SECTION +LOCAL +DEFAULT +10 *
+.* FILE +LOCAL +DEFAULT +ABS .*
 .* TLS +LOCAL +DEFAULT +7 sl1
 .* TLS +LOCAL +DEFAULT +7 sl2
 .* TLS +LOCAL +DEFAULT +7 sl3
@@ -79,6 +80,7 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .* TLS +LOCAL +DEFAULT +7 sl6
 .* TLS +LOCAL +DEFAULT +7 sl7
 .* TLS +LOCAL +DEFAULT +7 sl8
+.* FILE +LOCAL +DEFAULT +ABS .*
 .* TLS +LOCAL +DEFAULT +8 bl1
 .* TLS +LOCAL +DEFAULT +8 bl2
 .* TLS +LOCAL +DEFAULT +8 bl3
@@ -87,6 +89,7 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .* TLS +LOCAL +DEFAULT +8 bl6
 .* TLS +LOCAL +DEFAULT +8 bl7
 .* TLS +LOCAL +DEFAULT +8 bl8
+.* FILE +LOCAL +DEFAULT +ABS .*
 .* OBJECT +LOCAL +DEFAULT +9 _DYNAMIC
 .* OBJECT +LOCAL +DEFAULT +10 _PROCEDURE_LINKAGE_TABLE_
 .* OBJECT +LOCAL +DEFAULT +10 _GLOBAL_OFFSET_TABLE_
diff --git a/ld/testsuite/ld-sparc/tlssunnopic32.rd b/ld/testsuite/ld-sparc/tlssunnopic32.rd
index f2f26e73b2..5051a4b07f 100644
--- a/ld/testsuite/ld-sparc/tlssunnopic32.rd
+++ b/ld/testsuite/ld-sparc/tlssunnopic32.rd
@@ -73,18 +73,20 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .* SECTION +LOCAL +DEFAULT +6 *
 .* SECTION +LOCAL +DEFAULT +7 *
 .* SECTION +LOCAL +DEFAULT +8 *
+.* FILE +LOCAL +DEFAULT +ABS .*
 .* TLS +LOCAL +DEFAULT +6 bl1
 .* TLS +LOCAL +DEFAULT +6 bl2
 .* TLS +LOCAL +DEFAULT +6 bl3
 .* TLS +LOCAL +DEFAULT +6 bl4
 .* TLS +LOCAL +DEFAULT +6 bl5
-.* OBJECT +LOCAL +DEFAULT +ABS _DYNAMIC
 .* TLS +LOCAL +DEFAULT +6 sh3
-.* OBJECT +LOCAL +DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
 .* TLS +LOCAL +DEFAULT +6 sh4
 .* TLS +LOCAL +DEFAULT +6 sh1
-.* OBJECT +LOCAL +DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
 .* TLS +LOCAL +DEFAULT +6 sh2
+.* FILE +LOCAL +DEFAULT +ABS .*
+.* OBJECT +LOCAL +DEFAULT +ABS _DYNAMIC
+.* OBJECT +LOCAL +DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
+.* OBJECT +LOCAL +DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
 .* FUNC +GLOBAL +DEFAULT +5 fn3
 .* TLS +GLOBAL +DEFAULT +UND sg1
 .* NOTYPE +GLOBAL +DEFAULT +ABS __bss_start
diff --git a/ld/testsuite/ld-sparc/tlssunnopic64.rd b/ld/testsuite/ld-sparc/tlssunnopic64.rd
index 9f7ff7b6e6..e3e22e018f 100644
--- a/ld/testsuite/ld-sparc/tlssunnopic64.rd
+++ b/ld/testsuite/ld-sparc/tlssunnopic64.rd
@@ -75,18 +75,20 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .* SECTION +LOCAL +DEFAULT +6 *
 .* SECTION +LOCAL +DEFAULT +7 *
 .* SECTION +LOCAL +DEFAULT +8 *
+.* FILE +LOCAL +DEFAULT +ABS .*
 .* TLS +LOCAL +DEFAULT +6 bl1
 .* TLS +LOCAL +DEFAULT +6 bl2
 .* TLS +LOCAL +DEFAULT +6 bl3
 .* TLS +LOCAL +DEFAULT +6 bl4
 .* TLS +LOCAL +DEFAULT +6 bl5
-.* OBJECT +LOCAL +DEFAULT +ABS _DYNAMIC
 .* TLS +LOCAL +DEFAULT +6 sh3
-.* OBJECT +LOCAL +DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
 .* TLS +LOCAL +DEFAULT +6 sh4
 .* TLS +LOCAL +DEFAULT +6 sh1
-.* OBJECT +LOCAL +DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
 .* TLS +LOCAL +DEFAULT +6 sh2
+.* FILE +LOCAL +DEFAULT +ABS .*
+.* OBJECT +LOCAL +DEFAULT +ABS _DYNAMIC
+.* OBJECT +LOCAL +DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
+.* OBJECT +LOCAL +DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
 .* FUNC +GLOBAL +DEFAULT +5 fn3
 .* TLS +GLOBAL +DEFAULT +UND sg1
 .* NOTYPE +GLOBAL +DEFAULT +ABS __bss_start
diff --git a/ld/testsuite/ld-sparc/tlssunpic32.rd b/ld/testsuite/ld-sparc/tlssunpic32.rd
index e6a793a28b..8fa8099fe9 100644
--- a/ld/testsuite/ld-sparc/tlssunpic32.rd
+++ b/ld/testsuite/ld-sparc/tlssunpic32.rd
@@ -93,6 +93,7 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .* SECTION +LOCAL +DEFAULT +9 *
 .* SECTION +LOCAL +DEFAULT +10 *
 .* SECTION +LOCAL +DEFAULT +11 *
+.* FILE +LOCAL +DEFAULT +ABS .*
 .* TLS +LOCAL +DEFAULT +7 sl1
 .* TLS +LOCAL +DEFAULT +7 sl2
 .* TLS +LOCAL +DEFAULT +7 sl3
@@ -102,11 +103,9 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .* TLS +LOCAL +DEFAULT +7 sl7
 .* TLS +LOCAL +DEFAULT +7 sl8
 .* TLS +LOCAL +DEFAULT +8 sH1
-.* OBJECT +LOCAL +DEFAULT +ABS _DYNAMIC
 .* TLS +LOCAL +DEFAULT +7 sh3
 .* TLS +LOCAL +DEFAULT +8 sH2
 .* TLS +LOCAL +DEFAULT +8 sH7
-.* OBJECT +LOCAL +DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
 .* TLS +LOCAL +DEFAULT +7 sh7
 .* TLS +LOCAL +DEFAULT +7 sh8
 .* TLS +LOCAL +DEFAULT +8 sH4
@@ -117,9 +116,12 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .* TLS +LOCAL +DEFAULT +8 sH6
 .* TLS +LOCAL +DEFAULT +8 sH8
 .* TLS +LOCAL +DEFAULT +7 sh1
-.* OBJECT +LOCAL +DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
 .* TLS +LOCAL +DEFAULT +7 sh2
 .* TLS +LOCAL +DEFAULT +7 sh6
+.* FILE +LOCAL +DEFAULT +ABS .*
+.* OBJECT +LOCAL +DEFAULT +ABS _DYNAMIC
+.* OBJECT +LOCAL +DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
+.* OBJECT +LOCAL +DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
 .* TLS +GLOBAL +DEFAULT +7 sg8
 .* TLS +GLOBAL +DEFAULT +7 sg3
 .* TLS +GLOBAL +DEFAULT +7 sg4
diff --git a/ld/testsuite/ld-sparc/tlssunpic64.rd b/ld/testsuite/ld-sparc/tlssunpic64.rd
index 0ba98dd879..535ef8487a 100644
--- a/ld/testsuite/ld-sparc/tlssunpic64.rd
+++ b/ld/testsuite/ld-sparc/tlssunpic64.rd
@@ -93,6 +93,7 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .* SECTION +LOCAL +DEFAULT +9 *
 .* SECTION +LOCAL +DEFAULT +10 *
 .* SECTION +LOCAL +DEFAULT +11 *
+.* FILE +LOCAL +DEFAULT +ABS .*
 .* TLS +LOCAL +DEFAULT +7 sl1
 .* TLS +LOCAL +DEFAULT +7 sl2
 .* TLS +LOCAL +DEFAULT +7 sl3
@@ -102,11 +103,9 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .* TLS +LOCAL +DEFAULT +7 sl7
 .* TLS +LOCAL +DEFAULT +7 sl8
 .* TLS +LOCAL +DEFAULT +8 sH1
-.* OBJECT +LOCAL +DEFAULT +ABS _DYNAMIC
 .* TLS +LOCAL +DEFAULT +7 sh3
 .* TLS +LOCAL +DEFAULT +8 sH2
 .* TLS +LOCAL +DEFAULT +8 sH7
-.* OBJECT +LOCAL +DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
 .* TLS +LOCAL +DEFAULT +7 sh7
 .* TLS +LOCAL +DEFAULT +7 sh8
 .* TLS +LOCAL +DEFAULT +8 sH4
@@ -117,9 +116,12 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .* TLS +LOCAL +DEFAULT +8 sH6
 .* TLS +LOCAL +DEFAULT +8 sH8
 .* TLS +LOCAL +DEFAULT +7 sh1
-.* OBJECT +LOCAL +DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
 .* TLS +LOCAL +DEFAULT +7 sh2
 .* TLS +LOCAL +DEFAULT +7 sh6
+.* FILE +LOCAL +DEFAULT +ABS .*
+.* OBJECT +LOCAL +DEFAULT +ABS _DYNAMIC
+.* OBJECT +LOCAL +DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
+.* OBJECT +LOCAL +DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
 .* TLS +GLOBAL +DEFAULT +7 sg8
 .* TLS +GLOBAL +DEFAULT +7 sg3
 .* TLS +GLOBAL +DEFAULT +7 sg4
diff --git a/ld/testsuite/ld-tic6x/shlib-1.rd b/ld/testsuite/ld-tic6x/shlib-1.rd
index a0232cdfb6..a5ad39be70 100644
--- a/ld/testsuite/ld-tic6x/shlib-1.rd
+++ b/ld/testsuite/ld-tic6x/shlib-1.rd
@@ -17,8 +17,8 @@ Section Headers:
   \[12\] \.bss              NOBITS          10000130 002130 000004 00  WA  0   0  4
   \[13\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 002130 000019 00      0   0  1
   \[14\] \.shstrtab         STRTAB          00000000 002149 00007b 00      0   0  1
-  \[15\] \.symtab           SYMTAB          00000000 00246c 0001a0 10     16  19  4
-  \[16\] \.strtab           STRTAB          00000000 00260c 000059 00      0   0  1
+  \[15\] \.symtab           SYMTAB          00000000 [0-9a-f]+ [0-9a-f]+ 10     16  [0-9]+  4
+  \[16\] \.strtab           STRTAB          00000000 [0-9a-f]+ [0-9a-f]+ 00      0   0  1
 Key to Flags:
   W \(write\), A \(alloc\), X \(execute\), M \(merge\), S \(strings\)
   I \(info\), L \(link order\), G \(group\), T \(TLS\), E \(exclude\), x \(unknown\)
@@ -93,31 +93,33 @@ Symbol table '\.dynsym' contains 13 entries:
     11: 10000128     4 OBJECT  GLOBAL DEFAULT   11 a
     12: 100000c0    52 FUNC    GLOBAL DEFAULT    9 sub
 
-Symbol table '\.symtab' contains 26 entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
    Num:    Value  Size Type    Bind   Vis      Ndx Name
-     0: 00000000     0 NOTYPE  LOCAL  DEFAULT  UND 
-     1: 00008000     0 SECTION LOCAL  DEFAULT    1 
-     2: 00008048     0 SECTION LOCAL  DEFAULT    2 
-     3: 00008118     0 SECTION LOCAL  DEFAULT    3 
-     4: 00008140     0 SECTION LOCAL  DEFAULT    4 
-     5: 00008164     0 SECTION LOCAL  DEFAULT    5 
-     6: 0000817c     0 SECTION LOCAL  DEFAULT    6 
-     7: 10000000     0 SECTION LOCAL  DEFAULT    7 
-     8: 10000020     0 SECTION LOCAL  DEFAULT    8 
-     9: 10000080     0 SECTION LOCAL  DEFAULT    9 
-    10: 10000100     0 SECTION LOCAL  DEFAULT   10 
-    11: 10000128     0 SECTION LOCAL  DEFAULT   11 
-    12: 10000130     0 SECTION LOCAL  DEFAULT   12 
-    13: 00000000     0 SECTION LOCAL  DEFAULT   13 
-    14: 10000080     0 FUNC    LOCAL  HIDDEN     9 sub1
-    15: 0000817c     0 OBJECT  LOCAL  DEFAULT  ABS _DYNAMIC
-    16: 10000130     4 OBJECT  LOCAL  DEFAULT   12 c
-    17: 1000010c     0 OBJECT  LOCAL  DEFAULT  ABS _GLOBAL_OFFSET_TABLE_
-    18: 10000100     0 NOTYPE  LOCAL  DEFAULT  ABS __c6xabi_DSBT_BASE
-    19: 00000000     0 NOTYPE  WEAK   DEFAULT  UND b
-    20: 00020000     0 OBJECT  GLOBAL DEFAULT  ABS __stacksize
-    21: 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
-    22: 1000012c     4 OBJECT  GLOBAL DEFAULT   11 g2
-    23: 10000088    52 FUNC    GLOBAL DEFAULT    9 sub0
-    24: 10000128     4 OBJECT  GLOBAL DEFAULT   11 a
-    25: 100000c0    52 FUNC    GLOBAL DEFAULT    9 sub
+.* 00000000     0 NOTYPE  LOCAL  DEFAULT  UND 
+.* 00008000     0 SECTION LOCAL  DEFAULT    1 
+.* 00008048     0 SECTION LOCAL  DEFAULT    2 
+.* 00008118     0 SECTION LOCAL  DEFAULT    3 
+.* 00008140     0 SECTION LOCAL  DEFAULT    4 
+.* 00008164     0 SECTION LOCAL  DEFAULT    5 
+.* 0000817c     0 SECTION LOCAL  DEFAULT    6 
+.* 10000000     0 SECTION LOCAL  DEFAULT    7 
+.* 10000020     0 SECTION LOCAL  DEFAULT    8 
+.* 10000080     0 SECTION LOCAL  DEFAULT    9 
+.* 10000100     0 SECTION LOCAL  DEFAULT   10 
+.* 10000128     0 SECTION LOCAL  DEFAULT   11 
+.* 10000130     0 SECTION LOCAL  DEFAULT   12 
+.* 00000000     0 SECTION LOCAL  DEFAULT   13 
+.* 00000000     0 FILE    LOCAL  DEFAULT  ABS .*
+.* 10000080     0 FUNC    LOCAL  HIDDEN     9 sub1
+.* 10000130     4 OBJECT  LOCAL  DEFAULT   12 c
+.* 00000000     0 FILE    LOCAL  DEFAULT  ABS .*
+.* 0000817c     0 OBJECT  LOCAL  DEFAULT  ABS _DYNAMIC
+.* 1000010c     0 OBJECT  LOCAL  DEFAULT  ABS _GLOBAL_OFFSET_TABLE_
+.* 10000100     0 NOTYPE  LOCAL  DEFAULT  ABS __c6xabi_DSBT_BASE
+.* 00000000     0 NOTYPE  WEAK   DEFAULT  UND b
+.* 00020000     0 OBJECT  GLOBAL DEFAULT  ABS __stacksize
+.* 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
+.* 1000012c     4 OBJECT  GLOBAL DEFAULT   11 g2
+.* 10000088    52 FUNC    GLOBAL DEFAULT    9 sub0
+.* 10000128     4 OBJECT  GLOBAL DEFAULT   11 a
+.* 100000c0    52 FUNC    GLOBAL DEFAULT    9 sub
diff --git a/ld/testsuite/ld-tic6x/shlib-1b.rd b/ld/testsuite/ld-tic6x/shlib-1b.rd
index a0232cdfb6..a5ad39be70 100644
--- a/ld/testsuite/ld-tic6x/shlib-1b.rd
+++ b/ld/testsuite/ld-tic6x/shlib-1b.rd
@@ -17,8 +17,8 @@ Section Headers:
   \[12\] \.bss              NOBITS          10000130 002130 000004 00  WA  0   0  4
   \[13\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 002130 000019 00      0   0  1
   \[14\] \.shstrtab         STRTAB          00000000 002149 00007b 00      0   0  1
-  \[15\] \.symtab           SYMTAB          00000000 00246c 0001a0 10     16  19  4
-  \[16\] \.strtab           STRTAB          00000000 00260c 000059 00      0   0  1
+  \[15\] \.symtab           SYMTAB          00000000 [0-9a-f]+ [0-9a-f]+ 10     16  [0-9]+  4
+  \[16\] \.strtab           STRTAB          00000000 [0-9a-f]+ [0-9a-f]+ 00      0   0  1
 Key to Flags:
   W \(write\), A \(alloc\), X \(execute\), M \(merge\), S \(strings\)
   I \(info\), L \(link order\), G \(group\), T \(TLS\), E \(exclude\), x \(unknown\)
@@ -93,31 +93,33 @@ Symbol table '\.dynsym' contains 13 entries:
     11: 10000128     4 OBJECT  GLOBAL DEFAULT   11 a
     12: 100000c0    52 FUNC    GLOBAL DEFAULT    9 sub
 
-Symbol table '\.symtab' contains 26 entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
    Num:    Value  Size Type    Bind   Vis      Ndx Name
-     0: 00000000     0 NOTYPE  LOCAL  DEFAULT  UND 
-     1: 00008000     0 SECTION LOCAL  DEFAULT    1 
-     2: 00008048     0 SECTION LOCAL  DEFAULT    2 
-     3: 00008118     0 SECTION LOCAL  DEFAULT    3 
-     4: 00008140     0 SECTION LOCAL  DEFAULT    4 
-     5: 00008164     0 SECTION LOCAL  DEFAULT    5 
-     6: 0000817c     0 SECTION LOCAL  DEFAULT    6 
-     7: 10000000     0 SECTION LOCAL  DEFAULT    7 
-     8: 10000020     0 SECTION LOCAL  DEFAULT    8 
-     9: 10000080     0 SECTION LOCAL  DEFAULT    9 
-    10: 10000100     0 SECTION LOCAL  DEFAULT   10 
-    11: 10000128     0 SECTION LOCAL  DEFAULT   11 
-    12: 10000130     0 SECTION LOCAL  DEFAULT   12 
-    13: 00000000     0 SECTION LOCAL  DEFAULT   13 
-    14: 10000080     0 FUNC    LOCAL  HIDDEN     9 sub1
-    15: 0000817c     0 OBJECT  LOCAL  DEFAULT  ABS _DYNAMIC
-    16: 10000130     4 OBJECT  LOCAL  DEFAULT   12 c
-    17: 1000010c     0 OBJECT  LOCAL  DEFAULT  ABS _GLOBAL_OFFSET_TABLE_
-    18: 10000100     0 NOTYPE  LOCAL  DEFAULT  ABS __c6xabi_DSBT_BASE
-    19: 00000000     0 NOTYPE  WEAK   DEFAULT  UND b
-    20: 00020000     0 OBJECT  GLOBAL DEFAULT  ABS __stacksize
-    21: 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
-    22: 1000012c     4 OBJECT  GLOBAL DEFAULT   11 g2
-    23: 10000088    52 FUNC    GLOBAL DEFAULT    9 sub0
-    24: 10000128     4 OBJECT  GLOBAL DEFAULT   11 a
-    25: 100000c0    52 FUNC    GLOBAL DEFAULT    9 sub
+.* 00000000     0 NOTYPE  LOCAL  DEFAULT  UND 
+.* 00008000     0 SECTION LOCAL  DEFAULT    1 
+.* 00008048     0 SECTION LOCAL  DEFAULT    2 
+.* 00008118     0 SECTION LOCAL  DEFAULT    3 
+.* 00008140     0 SECTION LOCAL  DEFAULT    4 
+.* 00008164     0 SECTION LOCAL  DEFAULT    5 
+.* 0000817c     0 SECTION LOCAL  DEFAULT    6 
+.* 10000000     0 SECTION LOCAL  DEFAULT    7 
+.* 10000020     0 SECTION LOCAL  DEFAULT    8 
+.* 10000080     0 SECTION LOCAL  DEFAULT    9 
+.* 10000100     0 SECTION LOCAL  DEFAULT   10 
+.* 10000128     0 SECTION LOCAL  DEFAULT   11 
+.* 10000130     0 SECTION LOCAL  DEFAULT   12 
+.* 00000000     0 SECTION LOCAL  DEFAULT   13 
+.* 00000000     0 FILE    LOCAL  DEFAULT  ABS .*
+.* 10000080     0 FUNC    LOCAL  HIDDEN     9 sub1
+.* 10000130     4 OBJECT  LOCAL  DEFAULT   12 c
+.* 00000000     0 FILE    LOCAL  DEFAULT  ABS .*
+.* 0000817c     0 OBJECT  LOCAL  DEFAULT  ABS _DYNAMIC
+.* 1000010c     0 OBJECT  LOCAL  DEFAULT  ABS _GLOBAL_OFFSET_TABLE_
+.* 10000100     0 NOTYPE  LOCAL  DEFAULT  ABS __c6xabi_DSBT_BASE
+.* 00000000     0 NOTYPE  WEAK   DEFAULT  UND b
+.* 00020000     0 OBJECT  GLOBAL DEFAULT  ABS __stacksize
+.* 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
+.* 1000012c     4 OBJECT  GLOBAL DEFAULT   11 g2
+.* 10000088    52 FUNC    GLOBAL DEFAULT    9 sub0
+.* 10000128     4 OBJECT  GLOBAL DEFAULT   11 a
+.* 100000c0    52 FUNC    GLOBAL DEFAULT    9 sub
diff --git a/ld/testsuite/ld-tic6x/shlib-1r.rd b/ld/testsuite/ld-tic6x/shlib-1r.rd
index a0232cdfb6..a5ad39be70 100644
--- a/ld/testsuite/ld-tic6x/shlib-1r.rd
+++ b/ld/testsuite/ld-tic6x/shlib-1r.rd
@@ -17,8 +17,8 @@ Section Headers:
   \[12\] \.bss              NOBITS          10000130 002130 000004 00  WA  0   0  4
   \[13\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 002130 000019 00      0   0  1
   \[14\] \.shstrtab         STRTAB          00000000 002149 00007b 00      0   0  1
-  \[15\] \.symtab           SYMTAB          00000000 00246c 0001a0 10     16  19  4
-  \[16\] \.strtab           STRTAB          00000000 00260c 000059 00      0   0  1
+  \[15\] \.symtab           SYMTAB          00000000 [0-9a-f]+ [0-9a-f]+ 10     16  [0-9]+  4
+  \[16\] \.strtab           STRTAB          00000000 [0-9a-f]+ [0-9a-f]+ 00      0   0  1
 Key to Flags:
   W \(write\), A \(alloc\), X \(execute\), M \(merge\), S \(strings\)
   I \(info\), L \(link order\), G \(group\), T \(TLS\), E \(exclude\), x \(unknown\)
@@ -93,31 +93,33 @@ Symbol table '\.dynsym' contains 13 entries:
     11: 10000128     4 OBJECT  GLOBAL DEFAULT   11 a
     12: 100000c0    52 FUNC    GLOBAL DEFAULT    9 sub
 
-Symbol table '\.symtab' contains 26 entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
    Num:    Value  Size Type    Bind   Vis      Ndx Name
-     0: 00000000     0 NOTYPE  LOCAL  DEFAULT  UND 
-     1: 00008000     0 SECTION LOCAL  DEFAULT    1 
-     2: 00008048     0 SECTION LOCAL  DEFAULT    2 
-     3: 00008118     0 SECTION LOCAL  DEFAULT    3 
-     4: 00008140     0 SECTION LOCAL  DEFAULT    4 
-     5: 00008164     0 SECTION LOCAL  DEFAULT    5 
-     6: 0000817c     0 SECTION LOCAL  DEFAULT    6 
-     7: 10000000     0 SECTION LOCAL  DEFAULT    7 
-     8: 10000020     0 SECTION LOCAL  DEFAULT    8 
-     9: 10000080     0 SECTION LOCAL  DEFAULT    9 
-    10: 10000100     0 SECTION LOCAL  DEFAULT   10 
-    11: 10000128     0 SECTION LOCAL  DEFAULT   11 
-    12: 10000130     0 SECTION LOCAL  DEFAULT   12 
-    13: 00000000     0 SECTION LOCAL  DEFAULT   13 
-    14: 10000080     0 FUNC    LOCAL  HIDDEN     9 sub1
-    15: 0000817c     0 OBJECT  LOCAL  DEFAULT  ABS _DYNAMIC
-    16: 10000130     4 OBJECT  LOCAL  DEFAULT   12 c
-    17: 1000010c     0 OBJECT  LOCAL  DEFAULT  ABS _GLOBAL_OFFSET_TABLE_
-    18: 10000100     0 NOTYPE  LOCAL  DEFAULT  ABS __c6xabi_DSBT_BASE
-    19: 00000000     0 NOTYPE  WEAK   DEFAULT  UND b
-    20: 00020000     0 OBJECT  GLOBAL DEFAULT  ABS __stacksize
-    21: 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
-    22: 1000012c     4 OBJECT  GLOBAL DEFAULT   11 g2
-    23: 10000088    52 FUNC    GLOBAL DEFAULT    9 sub0
-    24: 10000128     4 OBJECT  GLOBAL DEFAULT   11 a
-    25: 100000c0    52 FUNC    GLOBAL DEFAULT    9 sub
+.* 00000000     0 NOTYPE  LOCAL  DEFAULT  UND 
+.* 00008000     0 SECTION LOCAL  DEFAULT    1 
+.* 00008048     0 SECTION LOCAL  DEFAULT    2 
+.* 00008118     0 SECTION LOCAL  DEFAULT    3 
+.* 00008140     0 SECTION LOCAL  DEFAULT    4 
+.* 00008164     0 SECTION LOCAL  DEFAULT    5 
+.* 0000817c     0 SECTION LOCAL  DEFAULT    6 
+.* 10000000     0 SECTION LOCAL  DEFAULT    7 
+.* 10000020     0 SECTION LOCAL  DEFAULT    8 
+.* 10000080     0 SECTION LOCAL  DEFAULT    9 
+.* 10000100     0 SECTION LOCAL  DEFAULT   10 
+.* 10000128     0 SECTION LOCAL  DEFAULT   11 
+.* 10000130     0 SECTION LOCAL  DEFAULT   12 
+.* 00000000     0 SECTION LOCAL  DEFAULT   13 
+.* 00000000     0 FILE    LOCAL  DEFAULT  ABS .*
+.* 10000080     0 FUNC    LOCAL  HIDDEN     9 sub1
+.* 10000130     4 OBJECT  LOCAL  DEFAULT   12 c
+.* 00000000     0 FILE    LOCAL  DEFAULT  ABS .*
+.* 0000817c     0 OBJECT  LOCAL  DEFAULT  ABS _DYNAMIC
+.* 1000010c     0 OBJECT  LOCAL  DEFAULT  ABS _GLOBAL_OFFSET_TABLE_
+.* 10000100     0 NOTYPE  LOCAL  DEFAULT  ABS __c6xabi_DSBT_BASE
+.* 00000000     0 NOTYPE  WEAK   DEFAULT  UND b
+.* 00020000     0 OBJECT  GLOBAL DEFAULT  ABS __stacksize
+.* 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
+.* 1000012c     4 OBJECT  GLOBAL DEFAULT   11 g2
+.* 10000088    52 FUNC    GLOBAL DEFAULT    9 sub0
+.* 10000128     4 OBJECT  GLOBAL DEFAULT   11 a
+.* 100000c0    52 FUNC    GLOBAL DEFAULT    9 sub
diff --git a/ld/testsuite/ld-tic6x/shlib-1rb.rd b/ld/testsuite/ld-tic6x/shlib-1rb.rd
index a0232cdfb6..a5ad39be70 100644
--- a/ld/testsuite/ld-tic6x/shlib-1rb.rd
+++ b/ld/testsuite/ld-tic6x/shlib-1rb.rd
@@ -17,8 +17,8 @@ Section Headers:
   \[12\] \.bss              NOBITS          10000130 002130 000004 00  WA  0   0  4
   \[13\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 002130 000019 00      0   0  1
   \[14\] \.shstrtab         STRTAB          00000000 002149 00007b 00      0   0  1
-  \[15\] \.symtab           SYMTAB          00000000 00246c 0001a0 10     16  19  4
-  \[16\] \.strtab           STRTAB          00000000 00260c 000059 00      0   0  1
+  \[15\] \.symtab           SYMTAB          00000000 [0-9a-f]+ [0-9a-f]+ 10     16  [0-9]+  4
+  \[16\] \.strtab           STRTAB          00000000 [0-9a-f]+ [0-9a-f]+ 00      0   0  1
 Key to Flags:
   W \(write\), A \(alloc\), X \(execute\), M \(merge\), S \(strings\)
   I \(info\), L \(link order\), G \(group\), T \(TLS\), E \(exclude\), x \(unknown\)
@@ -93,31 +93,33 @@ Symbol table '\.dynsym' contains 13 entries:
     11: 10000128     4 OBJECT  GLOBAL DEFAULT   11 a
     12: 100000c0    52 FUNC    GLOBAL DEFAULT    9 sub
 
-Symbol table '\.symtab' contains 26 entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
    Num:    Value  Size Type    Bind   Vis      Ndx Name
-     0: 00000000     0 NOTYPE  LOCAL  DEFAULT  UND 
-     1: 00008000     0 SECTION LOCAL  DEFAULT    1 
-     2: 00008048     0 SECTION LOCAL  DEFAULT    2 
-     3: 00008118     0 SECTION LOCAL  DEFAULT    3 
-     4: 00008140     0 SECTION LOCAL  DEFAULT    4 
-     5: 00008164     0 SECTION LOCAL  DEFAULT    5 
-     6: 0000817c     0 SECTION LOCAL  DEFAULT    6 
-     7: 10000000     0 SECTION LOCAL  DEFAULT    7 
-     8: 10000020     0 SECTION LOCAL  DEFAULT    8 
-     9: 10000080     0 SECTION LOCAL  DEFAULT    9 
-    10: 10000100     0 SECTION LOCAL  DEFAULT   10 
-    11: 10000128     0 SECTION LOCAL  DEFAULT   11 
-    12: 10000130     0 SECTION LOCAL  DEFAULT   12 
-    13: 00000000     0 SECTION LOCAL  DEFAULT   13 
-    14: 10000080     0 FUNC    LOCAL  HIDDEN     9 sub1
-    15: 0000817c     0 OBJECT  LOCAL  DEFAULT  ABS _DYNAMIC
-    16: 10000130     4 OBJECT  LOCAL  DEFAULT   12 c
-    17: 1000010c     0 OBJECT  LOCAL  DEFAULT  ABS _GLOBAL_OFFSET_TABLE_
-    18: 10000100     0 NOTYPE  LOCAL  DEFAULT  ABS __c6xabi_DSBT_BASE
-    19: 00000000     0 NOTYPE  WEAK   DEFAULT  UND b
-    20: 00020000     0 OBJECT  GLOBAL DEFAULT  ABS __stacksize
-    21: 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
-    22: 1000012c     4 OBJECT  GLOBAL DEFAULT   11 g2
-    23: 10000088    52 FUNC    GLOBAL DEFAULT    9 sub0
-    24: 10000128     4 OBJECT  GLOBAL DEFAULT   11 a
-    25: 100000c0    52 FUNC    GLOBAL DEFAULT    9 sub
+.* 00000000     0 NOTYPE  LOCAL  DEFAULT  UND 
+.* 00008000     0 SECTION LOCAL  DEFAULT    1 
+.* 00008048     0 SECTION LOCAL  DEFAULT    2 
+.* 00008118     0 SECTION LOCAL  DEFAULT    3 
+.* 00008140     0 SECTION LOCAL  DEFAULT    4 
+.* 00008164     0 SECTION LOCAL  DEFAULT    5 
+.* 0000817c     0 SECTION LOCAL  DEFAULT    6 
+.* 10000000     0 SECTION LOCAL  DEFAULT    7 
+.* 10000020     0 SECTION LOCAL  DEFAULT    8 
+.* 10000080     0 SECTION LOCAL  DEFAULT    9 
+.* 10000100     0 SECTION LOCAL  DEFAULT   10 
+.* 10000128     0 SECTION LOCAL  DEFAULT   11 
+.* 10000130     0 SECTION LOCAL  DEFAULT   12 
+.* 00000000     0 SECTION LOCAL  DEFAULT   13 
+.* 00000000     0 FILE    LOCAL  DEFAULT  ABS .*
+.* 10000080     0 FUNC    LOCAL  HIDDEN     9 sub1
+.* 10000130     4 OBJECT  LOCAL  DEFAULT   12 c
+.* 00000000     0 FILE    LOCAL  DEFAULT  ABS .*
+.* 0000817c     0 OBJECT  LOCAL  DEFAULT  ABS _DYNAMIC
+.* 1000010c     0 OBJECT  LOCAL  DEFAULT  ABS _GLOBAL_OFFSET_TABLE_
+.* 10000100     0 NOTYPE  LOCAL  DEFAULT  ABS __c6xabi_DSBT_BASE
+.* 00000000     0 NOTYPE  WEAK   DEFAULT  UND b
+.* 00020000     0 OBJECT  GLOBAL DEFAULT  ABS __stacksize
+.* 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
+.* 1000012c     4 OBJECT  GLOBAL DEFAULT   11 g2
+.* 10000088    52 FUNC    GLOBAL DEFAULT    9 sub0
+.* 10000128     4 OBJECT  GLOBAL DEFAULT   11 a
+.* 100000c0    52 FUNC    GLOBAL DEFAULT    9 sub
diff --git a/ld/testsuite/ld-tic6x/shlib-app-1.rd b/ld/testsuite/ld-tic6x/shlib-app-1.rd
index e1809afdf2..bd317a8475 100644
--- a/ld/testsuite/ld-tic6x/shlib-app-1.rd
+++ b/ld/testsuite/ld-tic6x/shlib-app-1.rd
@@ -18,8 +18,8 @@ Section Headers:
   \[13\] \.bss              NOBITS          100000cc 0020cc 000004 00  WA  0   0  4
   \[14\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 0020cc 000019 00      0   0  1
   \[15\] \.shstrtab         STRTAB          00000000 0020e5 000080 00      0   0  1
-  \[16\] \.symtab           SYMTAB          00000000 002438 0001a0 10     17  20  4
-  \[17\] \.strtab           STRTAB          00000000 0025d8 000055 00      0   0  1
+  \[16\] \.symtab           SYMTAB          00000000 [0-9a-f]+ [0-9a-f]+ 10     17  [0-9]+  4
+  \[17\] \.strtab           STRTAB          00000000 [0-9a-f]+ [0-9a-f]+ 00      0   0  1
 Key to Flags:
   W \(write\), A \(alloc\), X \(execute\), M \(merge\), S \(strings\)
   I \(info\), L \(link order\), G \(group\), T \(TLS\), E \(exclude\), x \(unknown\)
@@ -97,31 +97,33 @@ Symbol table '\.dynsym' contains 12 entries:
     10: 00000000     0 FUNC    GLOBAL DEFAULT  UND sub0
     11: 100000cc     4 OBJECT  GLOBAL DEFAULT   13 a
 
-Symbol table '\.symtab' contains 26 entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
    Num:    Value  Size Type    Bind   Vis      Ndx Name
-     0: 00000000     0 NOTYPE  LOCAL  DEFAULT  UND 
-     1: 00008000     0 SECTION LOCAL  DEFAULT    1 
-     2: 00008044     0 SECTION LOCAL  DEFAULT    2 
-     3: 00008104     0 SECTION LOCAL  DEFAULT    3 
-     4: 0000813c     0 SECTION LOCAL  DEFAULT    4 
-     5: 00008154     0 SECTION LOCAL  DEFAULT    5 
-     6: 0000816c     0 SECTION LOCAL  DEFAULT    6 
-     7: 00008178     0 SECTION LOCAL  DEFAULT    7 
-     8: 10000000     0 SECTION LOCAL  DEFAULT    8 
-     9: 10000020     0 SECTION LOCAL  DEFAULT    9 
-    10: 10000060     0 SECTION LOCAL  DEFAULT   10 
-    11: 100000a0     0 SECTION LOCAL  DEFAULT   11 
-    12: 100000c0     0 SECTION LOCAL  DEFAULT   12 
-    13: 100000cc     0 SECTION LOCAL  DEFAULT   13 
-    14: 00000000     0 SECTION LOCAL  DEFAULT   14 
-    15: 10000060     0 NOTYPE  LOCAL  DEFAULT   10 fish
-    16: 100000c4     8 OBJECT  LOCAL  DEFAULT   12 w
-    17: 00008178     0 OBJECT  LOCAL  DEFAULT    7 _DYNAMIC
-    18: 100000ac     0 OBJECT  LOCAL  DEFAULT   11 _GLOBAL_OFFSET_TABLE_
-    19: 100000a0     0 NOTYPE  LOCAL  DEFAULT  ABS __c6xabi_DSBT_BASE
-    20: 100000c0     4 OBJECT  GLOBAL DEFAULT   12 b
-    21: 00020000     0 OBJECT  GLOBAL DEFAULT  ABS __stacksize
-    22: 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
-    23: 00000000     0 OBJECT  WEAK   DEFAULT  UND g2
-    24: 00000000     0 FUNC    GLOBAL DEFAULT  UND sub0
-    25: 100000cc     4 OBJECT  GLOBAL DEFAULT   13 a
+.* 00000000     0 NOTYPE  LOCAL  DEFAULT  UND 
+.* 00008000     0 SECTION LOCAL  DEFAULT    1 
+.* 00008044     0 SECTION LOCAL  DEFAULT    2 
+.* 00008104     0 SECTION LOCAL  DEFAULT    3 
+.* 0000813c     0 SECTION LOCAL  DEFAULT    4 
+.* 00008154     0 SECTION LOCAL  DEFAULT    5 
+.* 0000816c     0 SECTION LOCAL  DEFAULT    6 
+.* 00008178     0 SECTION LOCAL  DEFAULT    7 
+.* 10000000     0 SECTION LOCAL  DEFAULT    8 
+.* 10000020     0 SECTION LOCAL  DEFAULT    9 
+.* 10000060     0 SECTION LOCAL  DEFAULT   10 
+.* 100000a0     0 SECTION LOCAL  DEFAULT   11 
+.* 100000c0     0 SECTION LOCAL  DEFAULT   12 
+.* 100000cc     0 SECTION LOCAL  DEFAULT   13 
+.* 00000000     0 SECTION LOCAL  DEFAULT   14 
+.* 00000000     0 FILE    LOCAL  DEFAULT  ABS .*
+.* 10000060     0 NOTYPE  LOCAL  DEFAULT   10 fish
+.* 100000c4     8 OBJECT  LOCAL  DEFAULT   12 w
+.* 00000000     0 FILE    LOCAL  DEFAULT  ABS .*
+.* 00008178     0 OBJECT  LOCAL  DEFAULT    7 _DYNAMIC
+.* 100000ac     0 OBJECT  LOCAL  DEFAULT   11 _GLOBAL_OFFSET_TABLE_
+.* 100000a0     0 NOTYPE  LOCAL  DEFAULT  ABS __c6xabi_DSBT_BASE
+.* 100000c0     4 OBJECT  GLOBAL DEFAULT   12 b
+.* 00020000     0 OBJECT  GLOBAL DEFAULT  ABS __stacksize
+.* 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
+.* 00000000     0 OBJECT  WEAK   DEFAULT  UND g2
+.* 00000000     0 FUNC    GLOBAL DEFAULT  UND sub0
+.* 100000cc     4 OBJECT  GLOBAL DEFAULT   13 a
diff --git a/ld/testsuite/ld-tic6x/shlib-app-1b.rd b/ld/testsuite/ld-tic6x/shlib-app-1b.rd
index 95547b01a7..3366a6453c 100644
--- a/ld/testsuite/ld-tic6x/shlib-app-1b.rd
+++ b/ld/testsuite/ld-tic6x/shlib-app-1b.rd
@@ -18,8 +18,8 @@ Section Headers:
   \[13\] \.bss              NOBITS          100000cc 0020cc 000004 00  WA  0   0  4
   \[14\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 0020cc 000019 00      0   0  1
   \[15\] \.shstrtab         STRTAB          00000000 0020e5 000080 00      0   0  1
-  \[16\] \.symtab           SYMTAB          00000000 002438 0001a0 10     17  20  4
-  \[17\] \.strtab           STRTAB          00000000 0025d8 000055 00      0   0  1
+  \[16\] \.symtab           SYMTAB          00000000 [0-9a-f]+ [0-9a-f]+ 10     17  [0-9]+  4
+  \[17\] \.strtab           STRTAB          00000000 [0-9a-f]+ [0-9a-f]+ 00      0   0  1
 Key to Flags:
   W \(write\), A \(alloc\), X \(execute\), M \(merge\), S \(strings\)
   I \(info\), L \(link order\), G \(group\), T \(TLS\), E \(exclude\), x \(unknown\)
@@ -97,31 +97,33 @@ Symbol table '\.dynsym' contains 12 entries:
     10: 00000000     0 FUNC    GLOBAL DEFAULT  UND sub0
     11: 100000cc     4 OBJECT  GLOBAL DEFAULT   13 a
 
-Symbol table '\.symtab' contains 26 entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
    Num:    Value  Size Type    Bind   Vis      Ndx Name
-     0: 00000000     0 NOTYPE  LOCAL  DEFAULT  UND 
-     1: 00008000     0 SECTION LOCAL  DEFAULT    1 
-     2: 00008044     0 SECTION LOCAL  DEFAULT    2 
-     3: 00008104     0 SECTION LOCAL  DEFAULT    3 
-     4: 0000813c     0 SECTION LOCAL  DEFAULT    4 
-     5: 00008154     0 SECTION LOCAL  DEFAULT    5 
-     6: 0000816c     0 SECTION LOCAL  DEFAULT    6 
-     7: 00008178     0 SECTION LOCAL  DEFAULT    7 
-     8: 10000000     0 SECTION LOCAL  DEFAULT    8 
-     9: 10000020     0 SECTION LOCAL  DEFAULT    9 
-    10: 10000060     0 SECTION LOCAL  DEFAULT   10 
-    11: 100000a0     0 SECTION LOCAL  DEFAULT   11 
-    12: 100000c0     0 SECTION LOCAL  DEFAULT   12 
-    13: 100000cc     0 SECTION LOCAL  DEFAULT   13 
-    14: 00000000     0 SECTION LOCAL  DEFAULT   14 
-    15: 10000060     0 NOTYPE  LOCAL  DEFAULT   10 fish
-    16: 100000c4     8 OBJECT  LOCAL  DEFAULT   12 w
-    17: 00008178     0 OBJECT  LOCAL  DEFAULT    7 _DYNAMIC
-    18: 100000ac     0 OBJECT  LOCAL  DEFAULT   11 _GLOBAL_OFFSET_TABLE_
-    19: 100000a0     0 NOTYPE  LOCAL  DEFAULT  ABS __c6xabi_DSBT_BASE
-    20: 100000c0     4 OBJECT  GLOBAL DEFAULT   12 b
-    21: 00020000     0 OBJECT  GLOBAL DEFAULT  ABS __stacksize
-    22: 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
-    23: 00000000     0 OBJECT  WEAK   DEFAULT  UND g2
-    24: 00000000     0 FUNC    GLOBAL DEFAULT  UND sub0
-    25: 100000cc     4 OBJECT  GLOBAL DEFAULT   13 a
+.* 00000000     0 NOTYPE  LOCAL  DEFAULT  UND 
+.* 00008000     0 SECTION LOCAL  DEFAULT    1 
+.* 00008044     0 SECTION LOCAL  DEFAULT    2 
+.* 00008104     0 SECTION LOCAL  DEFAULT    3 
+.* 0000813c     0 SECTION LOCAL  DEFAULT    4 
+.* 00008154     0 SECTION LOCAL  DEFAULT    5 
+.* 0000816c     0 SECTION LOCAL  DEFAULT    6 
+.* 00008178     0 SECTION LOCAL  DEFAULT    7 
+.* 10000000     0 SECTION LOCAL  DEFAULT    8 
+.* 10000020     0 SECTION LOCAL  DEFAULT    9 
+.* 10000060     0 SECTION LOCAL  DEFAULT   10 
+.* 100000a0     0 SECTION LOCAL  DEFAULT   11 
+.* 100000c0     0 SECTION LOCAL  DEFAULT   12 
+.* 100000cc     0 SECTION LOCAL  DEFAULT   13 
+.* 00000000     0 SECTION LOCAL  DEFAULT   14 
+.* 00000000     0 FILE    LOCAL  DEFAULT  ABS .*
+.* 10000060     0 NOTYPE  LOCAL  DEFAULT   10 fish
+.* 100000c4     8 OBJECT  LOCAL  DEFAULT   12 w
+.* 00000000     0 FILE    LOCAL  DEFAULT  ABS .*
+.* 00008178     0 OBJECT  LOCAL  DEFAULT    7 _DYNAMIC
+.* 100000ac     0 OBJECT  LOCAL  DEFAULT   11 _GLOBAL_OFFSET_TABLE_
+.* 100000a0     0 NOTYPE  LOCAL  DEFAULT  ABS __c6xabi_DSBT_BASE
+.* 100000c0     4 OBJECT  GLOBAL DEFAULT   12 b
+.* 00020000     0 OBJECT  GLOBAL DEFAULT  ABS __stacksize
+.* 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
+.* 00000000     0 OBJECT  WEAK   DEFAULT  UND g2
+.* 00000000     0 FUNC    GLOBAL DEFAULT  UND sub0
+.* 100000cc     4 OBJECT  GLOBAL DEFAULT   13 a
diff --git a/ld/testsuite/ld-tic6x/shlib-app-1r.rd b/ld/testsuite/ld-tic6x/shlib-app-1r.rd
index 566f2f911c..a37c4e15ab 100644
--- a/ld/testsuite/ld-tic6x/shlib-app-1r.rd
+++ b/ld/testsuite/ld-tic6x/shlib-app-1r.rd
@@ -17,8 +17,8 @@ Section Headers:
   \[12\] \.bss              NOBITS          100000c4 0020c4 000004 00  WA  0   0  4
   \[13\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 0020c4 000019 00      0   0  1
   \[14\] \.shstrtab         STRTAB          00000000 0020dd 00007b 00      0   0  1
-  \[15\] \.symtab           SYMTAB          00000000 002400 000160 10     16  18  4
-  \[16\] \.strtab           STRTAB          00000000 002560 00004d 00      0   0  1
+  \[15\] \.symtab           SYMTAB          00000000 [0-9a-f]+ [0-9a-f]+ 10     16  [0-9]+  4
+  \[16\] \.strtab           STRTAB          00000000 [0-9a-f]+ [0-9a-f]+ 00      0   0  1
 Key to Flags:
   W \(write\), A \(alloc\), X \(execute\), M \(merge\), S \(strings\)
   I \(info\), L \(link order\), G \(group\), T \(TLS\), E \(exclude\), x \(unknown\)
@@ -89,27 +89,29 @@ Symbol table '\.dynsym' contains 10 entries:
      8: 00000000     0 FUNC    GLOBAL DEFAULT  UND sub0
      9: 100000c4     4 OBJECT  GLOBAL DEFAULT   12 a
 
-Symbol table '\.symtab' contains 22 entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
    Num:    Value  Size Type    Bind   Vis      Ndx Name
-     0: 00000000     0 NOTYPE  LOCAL  DEFAULT  UND 
-     1: 00008000     0 SECTION LOCAL  DEFAULT    1 
-     2: 0000803c     0 SECTION LOCAL  DEFAULT    2 
-     3: 000080dc     0 SECTION LOCAL  DEFAULT    3 
-     4: 0000810c     0 SECTION LOCAL  DEFAULT    4 
-     5: 00008124     0 SECTION LOCAL  DEFAULT    5 
-     6: 00008130     0 SECTION LOCAL  DEFAULT    6 
-     7: 10000000     0 SECTION LOCAL  DEFAULT    7 
-     8: 10000020     0 SECTION LOCAL  DEFAULT    8 
-     9: 10000060     0 SECTION LOCAL  DEFAULT    9 
-    10: 100000a0     0 SECTION LOCAL  DEFAULT   10 
-    11: 100000c0     0 SECTION LOCAL  DEFAULT   11 
-    12: 100000c4     0 SECTION LOCAL  DEFAULT   12 
-    13: 00000000     0 SECTION LOCAL  DEFAULT   13 
-    14: 10000060     0 NOTYPE  LOCAL  DEFAULT    9 fish
-    15: 00008130     0 OBJECT  LOCAL  DEFAULT    6 _DYNAMIC
-    16: 100000ac     0 OBJECT  LOCAL  DEFAULT   10 _GLOBAL_OFFSET_TABLE_
-    17: 100000a0     0 NOTYPE  LOCAL  DEFAULT  ABS __c6xabi_DSBT_BASE
-    18: 100000c0     4 OBJECT  GLOBAL DEFAULT   11 b
-    19: 00020000     0 OBJECT  GLOBAL DEFAULT  ABS __stacksize
-    20: 00000000     0 FUNC    GLOBAL DEFAULT  UND sub0
-    21: 100000c4     4 OBJECT  GLOBAL DEFAULT   12 a
+.* 00000000     0 NOTYPE  LOCAL  DEFAULT  UND 
+.* 00008000     0 SECTION LOCAL  DEFAULT    1 
+.* 0000803c     0 SECTION LOCAL  DEFAULT    2 
+.* 000080dc     0 SECTION LOCAL  DEFAULT    3 
+.* 0000810c     0 SECTION LOCAL  DEFAULT    4 
+.* 00008124     0 SECTION LOCAL  DEFAULT    5 
+.* 00008130     0 SECTION LOCAL  DEFAULT    6 
+.* 10000000     0 SECTION LOCAL  DEFAULT    7 
+.* 10000020     0 SECTION LOCAL  DEFAULT    8 
+.* 10000060     0 SECTION LOCAL  DEFAULT    9 
+.* 100000a0     0 SECTION LOCAL  DEFAULT   10 
+.* 100000c0     0 SECTION LOCAL  DEFAULT   11 
+.* 100000c4     0 SECTION LOCAL  DEFAULT   12 
+.* 00000000     0 SECTION LOCAL  DEFAULT   13 
+.* 00000000     0 FILE    LOCAL  DEFAULT  ABS .*
+.* 10000060     0 NOTYPE  LOCAL  DEFAULT    9 fish
+.* 00000000     0 FILE    LOCAL  DEFAULT  ABS .*
+.* 00008130     0 OBJECT  LOCAL  DEFAULT    6 _DYNAMIC
+.* 100000ac     0 OBJECT  LOCAL  DEFAULT   10 _GLOBAL_OFFSET_TABLE_
+.* 100000a0     0 NOTYPE  LOCAL  DEFAULT  ABS __c6xabi_DSBT_BASE
+.* 100000c0     4 OBJECT  GLOBAL DEFAULT   11 b
+.* 00020000     0 OBJECT  GLOBAL DEFAULT  ABS __stacksize
+.* 00000000     0 FUNC    GLOBAL DEFAULT  UND sub0
+.* 100000c4     4 OBJECT  GLOBAL DEFAULT   12 a
diff --git a/ld/testsuite/ld-tic6x/shlib-app-1rb.rd b/ld/testsuite/ld-tic6x/shlib-app-1rb.rd
index be163d94c0..4a726a54c6 100644
--- a/ld/testsuite/ld-tic6x/shlib-app-1rb.rd
+++ b/ld/testsuite/ld-tic6x/shlib-app-1rb.rd
@@ -17,8 +17,8 @@ Section Headers:
   \[12\] \.bss              NOBITS          100000c4 0020c4 000004 00  WA  0   0  4
   \[13\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 0020c4 000019 00      0   0  1
   \[14\] \.shstrtab         STRTAB          00000000 0020dd 00007b 00      0   0  1
-  \[15\] \.symtab           SYMTAB          00000000 002400 000160 10     16  18  4
-  \[16\] \.strtab           STRTAB          00000000 002560 00004d 00      0   0  1
+  \[15\] \.symtab           SYMTAB          00000000 [0-9a-f]+ [0-9a-f]+ 10     16  [0-9]+  4
+  \[16\] \.strtab           STRTAB          00000000 [0-9a-f]+ [0-9a-f]+ 00      0   0  1
 Key to Flags:
   W \(write\), A \(alloc\), X \(execute\), M \(merge\), S \(strings\)
   I \(info\), L \(link order\), G \(group\), T \(TLS\), E \(exclude\), x \(unknown\)
@@ -89,27 +89,29 @@ Symbol table '\.dynsym' contains 10 entries:
      8: 00000000     0 FUNC    GLOBAL DEFAULT  UND sub0
      9: 100000c4     4 OBJECT  GLOBAL DEFAULT   12 a
 
-Symbol table '\.symtab' contains 22 entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
    Num:    Value  Size Type    Bind   Vis      Ndx Name
-     0: 00000000     0 NOTYPE  LOCAL  DEFAULT  UND 
-     1: 00008000     0 SECTION LOCAL  DEFAULT    1 
-     2: 0000803c     0 SECTION LOCAL  DEFAULT    2 
-     3: 000080dc     0 SECTION LOCAL  DEFAULT    3 
-     4: 00008110     0 SECTION LOCAL  DEFAULT    4 
-     5: 00008128     0 SECTION LOCAL  DEFAULT    5 
-     6: 00008134     0 SECTION LOCAL  DEFAULT    6 
-     7: 10000000     0 SECTION LOCAL  DEFAULT    7 
-     8: 10000020     0 SECTION LOCAL  DEFAULT    8 
-     9: 10000060     0 SECTION LOCAL  DEFAULT    9 
-    10: 100000a0     0 SECTION LOCAL  DEFAULT   10 
-    11: 100000c0     0 SECTION LOCAL  DEFAULT   11 
-    12: 100000c4     0 SECTION LOCAL  DEFAULT   12 
-    13: 00000000     0 SECTION LOCAL  DEFAULT   13 
-    14: 10000060     0 NOTYPE  LOCAL  DEFAULT    9 fish
-    15: 00008134     0 OBJECT  LOCAL  DEFAULT    6 _DYNAMIC
-    16: 100000ac     0 OBJECT  LOCAL  DEFAULT   10 _GLOBAL_OFFSET_TABLE_
-    17: 100000a0     0 NOTYPE  LOCAL  DEFAULT  ABS __c6xabi_DSBT_BASE
-    18: 100000c0     4 OBJECT  GLOBAL DEFAULT   11 b
-    19: 00020000     0 OBJECT  GLOBAL DEFAULT  ABS __stacksize
-    20: 00000000     0 FUNC    GLOBAL DEFAULT  UND sub0
-    21: 100000c4     4 OBJECT  GLOBAL DEFAULT   12 a
+.* 00000000     0 NOTYPE  LOCAL  DEFAULT  UND 
+.* 00008000     0 SECTION LOCAL  DEFAULT    1 
+.* 0000803c     0 SECTION LOCAL  DEFAULT    2 
+.* 000080dc     0 SECTION LOCAL  DEFAULT    3 
+.* 00008110     0 SECTION LOCAL  DEFAULT    4 
+.* 00008128     0 SECTION LOCAL  DEFAULT    5 
+.* 00008134     0 SECTION LOCAL  DEFAULT    6 
+.* 10000000     0 SECTION LOCAL  DEFAULT    7 
+.* 10000020     0 SECTION LOCAL  DEFAULT    8 
+.* 10000060     0 SECTION LOCAL  DEFAULT    9 
+.* 100000a0     0 SECTION LOCAL  DEFAULT   10 
+.* 100000c0     0 SECTION LOCAL  DEFAULT   11 
+.* 100000c4     0 SECTION LOCAL  DEFAULT   12 
+.* 00000000     0 SECTION LOCAL  DEFAULT   13 
+.* 00000000     0 FILE    LOCAL  DEFAULT  ABS .*
+.* 10000060     0 NOTYPE  LOCAL  DEFAULT    9 fish
+.* 00000000     0 FILE    LOCAL  DEFAULT  ABS .*
+.* 00008134     0 OBJECT  LOCAL  DEFAULT    6 _DYNAMIC
+.* 100000ac     0 OBJECT  LOCAL  DEFAULT   10 _GLOBAL_OFFSET_TABLE_
+.* 100000a0     0 NOTYPE  LOCAL  DEFAULT  ABS __c6xabi_DSBT_BASE
+.* 100000c0     4 OBJECT  GLOBAL DEFAULT   11 b
+.* 00020000     0 OBJECT  GLOBAL DEFAULT  ABS __stacksize
+.* 00000000     0 FUNC    GLOBAL DEFAULT  UND sub0
+.* 100000c4     4 OBJECT  GLOBAL DEFAULT   12 a
diff --git a/ld/testsuite/ld-tic6x/shlib-noindex.rd b/ld/testsuite/ld-tic6x/shlib-noindex.rd
index e9b57c7a41..fc323b2262 100644
--- a/ld/testsuite/ld-tic6x/shlib-noindex.rd
+++ b/ld/testsuite/ld-tic6x/shlib-noindex.rd
@@ -18,8 +18,8 @@ Section Headers:
   \[13\] \.bss              NOBITS          10000130 002130 000004 00  WA  0   0  4
   \[14\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 002130 000019 00      0   0  1
   \[15\] \.shstrtab         STRTAB          00000000 002149 000080 00      0   0  1
-  \[16\] \.symtab           SYMTAB          00000000 00249c 0001b0 10     17  20  4
-  \[17\] \.strtab           STRTAB          00000000 00264c 000059 00      0   0  1
+  \[16\] \.symtab           SYMTAB          00000000 [0-9a-f]+ [0-9a-f]+ 10     17  [0-9]+  4
+  \[17\] \.strtab           STRTAB          00000000 [0-9a-f]+ [0-9a-f]+ 00      0   0  1
 Key to Flags:
   W \(write\), A \(alloc\), X \(execute\), M \(merge\), S \(strings\)
   I \(info\), L \(link order\), G \(group\), T \(TLS\), E \(exclude\), x \(unknown\)
@@ -99,32 +99,34 @@ Symbol table '\.dynsym' contains 13 entries:
     11: 10000128     4 OBJECT  GLOBAL DEFAULT   12 a
     12: 100000c0    52 FUNC    GLOBAL DEFAULT   10 sub
 
-Symbol table '\.symtab' contains 27 entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
    Num:    Value  Size Type    Bind   Vis      Ndx Name
-     0: 00000000     0 NOTYPE  LOCAL  DEFAULT  UND 
-     1: 00008000     0 SECTION LOCAL  DEFAULT    1 
-     2: 00008048     0 SECTION LOCAL  DEFAULT    2 
-     3: 00008118     0 SECTION LOCAL  DEFAULT    3 
-     4: 00008140     0 SECTION LOCAL  DEFAULT    4 
-     5: 0000814c     0 SECTION LOCAL  DEFAULT    5 
-     6: 00008170     0 SECTION LOCAL  DEFAULT    6 
-     7: 00008188     0 SECTION LOCAL  DEFAULT    7 
-     8: 10000000     0 SECTION LOCAL  DEFAULT    8 
-     9: 10000020     0 SECTION LOCAL  DEFAULT    9 
-    10: 10000080     0 SECTION LOCAL  DEFAULT   10 
-    11: 10000100     0 SECTION LOCAL  DEFAULT   11 
-    12: 10000128     0 SECTION LOCAL  DEFAULT   12 
-    13: 10000130     0 SECTION LOCAL  DEFAULT   13 
-    14: 00000000     0 SECTION LOCAL  DEFAULT   14 
-    15: 10000080     0 FUNC    LOCAL  HIDDEN    10 sub1
-    16: 00008188     0 OBJECT  LOCAL  DEFAULT  ABS _DYNAMIC
-    17: 10000130     4 OBJECT  LOCAL  DEFAULT   13 c
-    18: 1000010c     0 OBJECT  LOCAL  DEFAULT  ABS _GLOBAL_OFFSET_TABLE_
-    19: 10000100     0 NOTYPE  LOCAL  DEFAULT  ABS __c6xabi_DSBT_BASE
-    20: 00000000     0 NOTYPE  WEAK   DEFAULT  UND b
-    21: 00020000     0 OBJECT  GLOBAL DEFAULT  ABS __stacksize
-    22: 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
-    23: 1000012c     4 OBJECT  GLOBAL DEFAULT   12 g2
-    24: 10000088    52 FUNC    GLOBAL DEFAULT   10 sub0
-    25: 10000128     4 OBJECT  GLOBAL DEFAULT   12 a
-    26: 100000c0    52 FUNC    GLOBAL DEFAULT   10 sub
+.* 00000000     0 NOTYPE  LOCAL  DEFAULT  UND 
+.* 00008000     0 SECTION LOCAL  DEFAULT    1 
+.* 00008048     0 SECTION LOCAL  DEFAULT    2 
+.* 00008118     0 SECTION LOCAL  DEFAULT    3 
+.* 00008140     0 SECTION LOCAL  DEFAULT    4 
+.* 0000814c     0 SECTION LOCAL  DEFAULT    5 
+.* 00008170     0 SECTION LOCAL  DEFAULT    6 
+.* 00008188     0 SECTION LOCAL  DEFAULT    7 
+.* 10000000     0 SECTION LOCAL  DEFAULT    8 
+.* 10000020     0 SECTION LOCAL  DEFAULT    9 
+.* 10000080     0 SECTION LOCAL  DEFAULT   10 
+.* 10000100     0 SECTION LOCAL  DEFAULT   11 
+.* 10000128     0 SECTION LOCAL  DEFAULT   12 
+.* 10000130     0 SECTION LOCAL  DEFAULT   13 
+.* 00000000     0 SECTION LOCAL  DEFAULT   14 
+.* 00000000     0 FILE    LOCAL  DEFAULT  ABS .*
+.* 10000080     0 FUNC    LOCAL  HIDDEN    10 sub1
+.* 10000130     4 OBJECT  LOCAL  DEFAULT   13 c
+.* 00000000     0 FILE    LOCAL  DEFAULT  ABS .*
+.* 00008188     0 OBJECT  LOCAL  DEFAULT  ABS _DYNAMIC
+.* 1000010c     0 OBJECT  LOCAL  DEFAULT  ABS _GLOBAL_OFFSET_TABLE_
+.* 10000100     0 NOTYPE  LOCAL  DEFAULT  ABS __c6xabi_DSBT_BASE
+.* 00000000     0 NOTYPE  WEAK   DEFAULT  UND b
+.* 00020000     0 OBJECT  GLOBAL DEFAULT  ABS __stacksize
+.* 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
+.* 1000012c     4 OBJECT  GLOBAL DEFAULT   12 g2
+.* 10000088    52 FUNC    GLOBAL DEFAULT   10 sub0
+.* 10000128     4 OBJECT  GLOBAL DEFAULT   12 a
+.* 100000c0    52 FUNC    GLOBAL DEFAULT   10 sub
diff --git a/ld/testsuite/ld-tic6x/static-app-1.rd b/ld/testsuite/ld-tic6x/static-app-1.rd
index cec76d4558..ae2daa10b8 100644
--- a/ld/testsuite/ld-tic6x/static-app-1.rd
+++ b/ld/testsuite/ld-tic6x/static-app-1.rd
@@ -15,8 +15,8 @@ Section Headers:
   \[10\] \.bss              NOBITS          100000f4 0020f4 000004 00  WA  0   0  4
   \[11\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 0020f4 000019 00      0   0  1
   \[12\] \.shstrtab         STRTAB          00000000 00210d 000071 00      0   0  1
-  \[13\] \.symtab           SYMTAB          00000000 0023d8 0001a0 10     14  19  4
-  \[14\] \.strtab           STRTAB          00000000 002578 000060 00      0   0  1
+  \[13\] \.symtab           SYMTAB          00000000 [0-9a-f]+ [0-9a-f]+ 10     14  [0-9]+  4
+  \[14\] \.strtab           STRTAB          00000000 [0-9a-f]+ [0-9a-f]+ 00      0   0  1
 Key to Flags:
   W \(write\), A \(alloc\), X \(execute\), M \(merge\), S \(strings\)
   I \(info\), L \(link order\), G \(group\), T \(TLS\), E \(exclude\), x \(unknown\)
@@ -82,31 +82,34 @@ Symbol table '\.dynsym' contains 10 entries:
      8: 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
      9: 100000e0     4 OBJECT  GLOBAL DEFAULT    9 a
 
-Symbol table '\.symtab' contains 26 entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
    Num:    Value  Size Type    Bind   Vis      Ndx Name
-     0: 00000000     0 NOTYPE  LOCAL  DEFAULT  UND 
-     1: 00008000     0 SECTION LOCAL  DEFAULT    1 
-     2: 0000803c     0 SECTION LOCAL  DEFAULT    2 
-     3: 000080dc     0 SECTION LOCAL  DEFAULT    3 
-     4: 000080fc     0 SECTION LOCAL  DEFAULT    4 
-     5: 00008120     0 SECTION LOCAL  DEFAULT    5 
-     6: 00008150     0 SECTION LOCAL  DEFAULT    6 
-     7: 10000000     0 SECTION LOCAL  DEFAULT    7 
-     8: 100000c0     0 SECTION LOCAL  DEFAULT    8 
-     9: 100000e0     0 SECTION LOCAL  DEFAULT    9 
-    10: 100000f4     0 SECTION LOCAL  DEFAULT   10 
-    11: 00000000     0 SECTION LOCAL  DEFAULT   11 
-    12: 10000000     0 FUNC    LOCAL  HIDDEN     7 sub1
-    13: 10000080     0 NOTYPE  LOCAL  DEFAULT    7 fish
-    14: 100000ec     8 OBJECT  LOCAL  DEFAULT    9 w
-    15: 00008150     0 OBJECT  LOCAL  DEFAULT    6 _DYNAMIC
-    16: 100000f4     4 OBJECT  LOCAL  DEFAULT   10 c
-    17: 100000cc     0 OBJECT  LOCAL  DEFAULT    8 _GLOBAL_OFFSET_TABLE_
-    18: 100000c0     0 NOTYPE  LOCAL  DEFAULT  ABS __c6xabi_DSBT_BASE
-    19: 100000e8     4 OBJECT  GLOBAL DEFAULT    9 b
-    20: 00020000     0 OBJECT  GLOBAL DEFAULT  ABS __stacksize
-    21: 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
-    22: 100000e4     4 OBJECT  GLOBAL DEFAULT    9 g2
-    23: 10000008    52 FUNC    GLOBAL DEFAULT    7 sub0
-    24: 100000e0     4 OBJECT  GLOBAL DEFAULT    9 a
-    25: 10000040    52 FUNC    GLOBAL DEFAULT    7 sub
+.* 00000000     0 NOTYPE  LOCAL  DEFAULT  UND 
+.* 00008000     0 SECTION LOCAL  DEFAULT    1 
+.* 0000803c     0 SECTION LOCAL  DEFAULT    2 
+.* 000080dc     0 SECTION LOCAL  DEFAULT    3 
+.* 000080fc     0 SECTION LOCAL  DEFAULT    4 
+.* 00008120     0 SECTION LOCAL  DEFAULT    5 
+.* 00008150     0 SECTION LOCAL  DEFAULT    6 
+.* 10000000     0 SECTION LOCAL  DEFAULT    7 
+.* 100000c0     0 SECTION LOCAL  DEFAULT    8 
+.* 100000e0     0 SECTION LOCAL  DEFAULT    9 
+.* 100000f4     0 SECTION LOCAL  DEFAULT   10 
+.* 00000000     0 SECTION LOCAL  DEFAULT   11 
+.* 00000000     0 FILE    LOCAL  DEFAULT  ABS .*
+.* 10000000     0 FUNC    LOCAL  HIDDEN     7 sub1
+.* 00000000     0 FILE    LOCAL  DEFAULT  ABS .*
+.* 10000080     0 NOTYPE  LOCAL  DEFAULT    7 fish
+.* 100000ec     8 OBJECT  LOCAL  DEFAULT    9 w
+.* 00000000     0 FILE    LOCAL  DEFAULT  ABS .*
+.* 00008150     0 OBJECT  LOCAL  DEFAULT    6 _DYNAMIC
+.* 100000f4     4 OBJECT  LOCAL  DEFAULT   10 c
+.* 100000cc     0 OBJECT  LOCAL  DEFAULT    8 _GLOBAL_OFFSET_TABLE_
+.* 100000c0     0 NOTYPE  LOCAL  DEFAULT  ABS __c6xabi_DSBT_BASE
+.* 100000e8     4 OBJECT  GLOBAL DEFAULT    9 b
+.* 00020000     0 OBJECT  GLOBAL DEFAULT  ABS __stacksize
+.* 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
+.* 100000e4     4 OBJECT  GLOBAL DEFAULT    9 g2
+.* 10000008    52 FUNC    GLOBAL DEFAULT    7 sub0
+.* 100000e0     4 OBJECT  GLOBAL DEFAULT    9 a
+.* 10000040    52 FUNC    GLOBAL DEFAULT    7 sub
diff --git a/ld/testsuite/ld-tic6x/static-app-1b.rd b/ld/testsuite/ld-tic6x/static-app-1b.rd
index cec76d4558..ae2daa10b8 100644
--- a/ld/testsuite/ld-tic6x/static-app-1b.rd
+++ b/ld/testsuite/ld-tic6x/static-app-1b.rd
@@ -15,8 +15,8 @@ Section Headers:
   \[10\] \.bss              NOBITS          100000f4 0020f4 000004 00  WA  0   0  4
   \[11\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 0020f4 000019 00      0   0  1
   \[12\] \.shstrtab         STRTAB          00000000 00210d 000071 00      0   0  1
-  \[13\] \.symtab           SYMTAB          00000000 0023d8 0001a0 10     14  19  4
-  \[14\] \.strtab           STRTAB          00000000 002578 000060 00      0   0  1
+  \[13\] \.symtab           SYMTAB          00000000 [0-9a-f]+ [0-9a-f]+ 10     14  [0-9]+  4
+  \[14\] \.strtab           STRTAB          00000000 [0-9a-f]+ [0-9a-f]+ 00      0   0  1
 Key to Flags:
   W \(write\), A \(alloc\), X \(execute\), M \(merge\), S \(strings\)
   I \(info\), L \(link order\), G \(group\), T \(TLS\), E \(exclude\), x \(unknown\)
@@ -82,31 +82,34 @@ Symbol table '\.dynsym' contains 10 entries:
      8: 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
      9: 100000e0     4 OBJECT  GLOBAL DEFAULT    9 a
 
-Symbol table '\.symtab' contains 26 entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
    Num:    Value  Size Type    Bind   Vis      Ndx Name
-     0: 00000000     0 NOTYPE  LOCAL  DEFAULT  UND 
-     1: 00008000     0 SECTION LOCAL  DEFAULT    1 
-     2: 0000803c     0 SECTION LOCAL  DEFAULT    2 
-     3: 000080dc     0 SECTION LOCAL  DEFAULT    3 
-     4: 000080fc     0 SECTION LOCAL  DEFAULT    4 
-     5: 00008120     0 SECTION LOCAL  DEFAULT    5 
-     6: 00008150     0 SECTION LOCAL  DEFAULT    6 
-     7: 10000000     0 SECTION LOCAL  DEFAULT    7 
-     8: 100000c0     0 SECTION LOCAL  DEFAULT    8 
-     9: 100000e0     0 SECTION LOCAL  DEFAULT    9 
-    10: 100000f4     0 SECTION LOCAL  DEFAULT   10 
-    11: 00000000     0 SECTION LOCAL  DEFAULT   11 
-    12: 10000000     0 FUNC    LOCAL  HIDDEN     7 sub1
-    13: 10000080     0 NOTYPE  LOCAL  DEFAULT    7 fish
-    14: 100000ec     8 OBJECT  LOCAL  DEFAULT    9 w
-    15: 00008150     0 OBJECT  LOCAL  DEFAULT    6 _DYNAMIC
-    16: 100000f4     4 OBJECT  LOCAL  DEFAULT   10 c
-    17: 100000cc     0 OBJECT  LOCAL  DEFAULT    8 _GLOBAL_OFFSET_TABLE_
-    18: 100000c0     0 NOTYPE  LOCAL  DEFAULT  ABS __c6xabi_DSBT_BASE
-    19: 100000e8     4 OBJECT  GLOBAL DEFAULT    9 b
-    20: 00020000     0 OBJECT  GLOBAL DEFAULT  ABS __stacksize
-    21: 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
-    22: 100000e4     4 OBJECT  GLOBAL DEFAULT    9 g2
-    23: 10000008    52 FUNC    GLOBAL DEFAULT    7 sub0
-    24: 100000e0     4 OBJECT  GLOBAL DEFAULT    9 a
-    25: 10000040    52 FUNC    GLOBAL DEFAULT    7 sub
+.* 00000000     0 NOTYPE  LOCAL  DEFAULT  UND 
+.* 00008000     0 SECTION LOCAL  DEFAULT    1 
+.* 0000803c     0 SECTION LOCAL  DEFAULT    2 
+.* 000080dc     0 SECTION LOCAL  DEFAULT    3 
+.* 000080fc     0 SECTION LOCAL  DEFAULT    4 
+.* 00008120     0 SECTION LOCAL  DEFAULT    5 
+.* 00008150     0 SECTION LOCAL  DEFAULT    6 
+.* 10000000     0 SECTION LOCAL  DEFAULT    7 
+.* 100000c0     0 SECTION LOCAL  DEFAULT    8 
+.* 100000e0     0 SECTION LOCAL  DEFAULT    9 
+.* 100000f4     0 SECTION LOCAL  DEFAULT   10 
+.* 00000000     0 SECTION LOCAL  DEFAULT   11 
+.* 00000000     0 FILE    LOCAL  DEFAULT  ABS .*
+.* 10000000     0 FUNC    LOCAL  HIDDEN     7 sub1
+.* 00000000     0 FILE    LOCAL  DEFAULT  ABS .*
+.* 10000080     0 NOTYPE  LOCAL  DEFAULT    7 fish
+.* 100000ec     8 OBJECT  LOCAL  DEFAULT    9 w
+.* 00000000     0 FILE    LOCAL  DEFAULT  ABS .*
+.* 00008150     0 OBJECT  LOCAL  DEFAULT    6 _DYNAMIC
+.* 100000f4     4 OBJECT  LOCAL  DEFAULT   10 c
+.* 100000cc     0 OBJECT  LOCAL  DEFAULT    8 _GLOBAL_OFFSET_TABLE_
+.* 100000c0     0 NOTYPE  LOCAL  DEFAULT  ABS __c6xabi_DSBT_BASE
+.* 100000e8     4 OBJECT  GLOBAL DEFAULT    9 b
+.* 00020000     0 OBJECT  GLOBAL DEFAULT  ABS __stacksize
+.* 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
+.* 100000e4     4 OBJECT  GLOBAL DEFAULT    9 g2
+.* 10000008    52 FUNC    GLOBAL DEFAULT    7 sub0
+.* 100000e0     4 OBJECT  GLOBAL DEFAULT    9 a
+.* 10000040    52 FUNC    GLOBAL DEFAULT    7 sub
diff --git a/ld/testsuite/ld-tic6x/static-app-1r.rd b/ld/testsuite/ld-tic6x/static-app-1r.rd
index cd8bc4c9d4..62c7b69be1 100644
--- a/ld/testsuite/ld-tic6x/static-app-1r.rd
+++ b/ld/testsuite/ld-tic6x/static-app-1r.rd
@@ -15,8 +15,8 @@ Section Headers:
   \[10\] \.bss              NOBITS          100000ec 0020ec 000004 00  WA  0   0  4
   \[11\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 0020ec 000019 00      0   0  1
   \[12\] \.shstrtab         STRTAB          00000000 002105 000071 00      0   0  1
-  \[13\] \.symtab           SYMTAB          00000000 0023d0 000190 10     14  18  4
-  \[14\] \.strtab           STRTAB          00000000 002560 00005e 00      0   0  1
+  \[13\] \.symtab           SYMTAB          00000000 [0-9a-f]+ [0-9a-f]+ 10     14  [0-9]+  4
+  \[14\] \.strtab           STRTAB          00000000 [0-9a-f]+ [0-9a-f]+ 00      0   0  1
 Key to Flags:
   W \(write\), A \(alloc\), X \(execute\), M \(merge\), S \(strings\)
   I \(info\), L \(link order\), G \(group\), T \(TLS\), E \(exclude\), x \(unknown\)
@@ -80,30 +80,33 @@ Symbol table '\.dynsym' contains 10 entries:
      8: 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
      9: 100000e0     4 OBJECT  GLOBAL DEFAULT    9 a
 
-Symbol table '\.symtab' contains 25 entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
    Num:    Value  Size Type    Bind   Vis      Ndx Name
-     0: 00000000     0 NOTYPE  LOCAL  DEFAULT  UND 
-     1: 00008000     0 SECTION LOCAL  DEFAULT    1 
-     2: 0000803c     0 SECTION LOCAL  DEFAULT    2 
-     3: 000080dc     0 SECTION LOCAL  DEFAULT    3 
-     4: 000080fc     0 SECTION LOCAL  DEFAULT    4 
-     5: 00008120     0 SECTION LOCAL  DEFAULT    5 
-     6: 00008138     0 SECTION LOCAL  DEFAULT    6 
-     7: 10000000     0 SECTION LOCAL  DEFAULT    7 
-     8: 100000c0     0 SECTION LOCAL  DEFAULT    8 
-     9: 100000e0     0 SECTION LOCAL  DEFAULT    9 
-    10: 100000ec     0 SECTION LOCAL  DEFAULT   10 
-    11: 00000000     0 SECTION LOCAL  DEFAULT   11 
-    12: 10000000     0 FUNC    LOCAL  HIDDEN     7 sub1
-    13: 10000080     0 NOTYPE  LOCAL  DEFAULT    7 fish
-    14: 00008138     0 OBJECT  LOCAL  DEFAULT    6 _DYNAMIC
-    15: 100000ec     4 OBJECT  LOCAL  DEFAULT   10 c
-    16: 100000cc     0 OBJECT  LOCAL  DEFAULT    8 _GLOBAL_OFFSET_TABLE_
-    17: 100000c0     0 NOTYPE  LOCAL  DEFAULT  ABS __c6xabi_DSBT_BASE
-    18: 100000e8     4 OBJECT  GLOBAL DEFAULT    9 b
-    19: 00020000     0 OBJECT  GLOBAL DEFAULT  ABS __stacksize
-    20: 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
-    21: 100000e4     4 OBJECT  GLOBAL DEFAULT    9 g2
-    22: 10000008    52 FUNC    GLOBAL DEFAULT    7 sub0
-    23: 100000e0     4 OBJECT  GLOBAL DEFAULT    9 a
-    24: 10000040    52 FUNC    GLOBAL DEFAULT    7 sub
+.* 00000000     0 NOTYPE  LOCAL  DEFAULT  UND 
+.* 00008000     0 SECTION LOCAL  DEFAULT    1 
+.* 0000803c     0 SECTION LOCAL  DEFAULT    2 
+.* 000080dc     0 SECTION LOCAL  DEFAULT    3 
+.* 000080fc     0 SECTION LOCAL  DEFAULT    4 
+.* 00008120     0 SECTION LOCAL  DEFAULT    5 
+.* 00008138     0 SECTION LOCAL  DEFAULT    6 
+.* 10000000     0 SECTION LOCAL  DEFAULT    7 
+.* 100000c0     0 SECTION LOCAL  DEFAULT    8 
+.* 100000e0     0 SECTION LOCAL  DEFAULT    9 
+.* 100000ec     0 SECTION LOCAL  DEFAULT   10 
+.* 00000000     0 SECTION LOCAL  DEFAULT   11 
+.* 00000000     0 FILE    LOCAL  DEFAULT  ABS .*
+.* 10000000     0 FUNC    LOCAL  HIDDEN     7 sub1
+.* 00000000     0 FILE    LOCAL  DEFAULT  ABS .*
+.* 10000080     0 NOTYPE  LOCAL  DEFAULT    7 fish
+.* 00000000     0 FILE    LOCAL  DEFAULT  ABS .*
+.* 00008138     0 OBJECT  LOCAL  DEFAULT    6 _DYNAMIC
+.* 100000ec     4 OBJECT  LOCAL  DEFAULT   10 c
+.* 100000cc     0 OBJECT  LOCAL  DEFAULT    8 _GLOBAL_OFFSET_TABLE_
+.* 100000c0     0 NOTYPE  LOCAL  DEFAULT  ABS __c6xabi_DSBT_BASE
+.* 100000e8     4 OBJECT  GLOBAL DEFAULT    9 b
+.* 00020000     0 OBJECT  GLOBAL DEFAULT  ABS __stacksize
+.* 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
+.* 100000e4     4 OBJECT  GLOBAL DEFAULT    9 g2
+.* 10000008    52 FUNC    GLOBAL DEFAULT    7 sub0
+.* 100000e0     4 OBJECT  GLOBAL DEFAULT    9 a
+.* 10000040    52 FUNC    GLOBAL DEFAULT    7 sub
diff --git a/ld/testsuite/ld-tic6x/static-app-1rb.rd b/ld/testsuite/ld-tic6x/static-app-1rb.rd
index cd8bc4c9d4..62c7b69be1 100644
--- a/ld/testsuite/ld-tic6x/static-app-1rb.rd
+++ b/ld/testsuite/ld-tic6x/static-app-1rb.rd
@@ -15,8 +15,8 @@ Section Headers:
   \[10\] \.bss              NOBITS          100000ec 0020ec 000004 00  WA  0   0  4
   \[11\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 0020ec 000019 00      0   0  1
   \[12\] \.shstrtab         STRTAB          00000000 002105 000071 00      0   0  1
-  \[13\] \.symtab           SYMTAB          00000000 0023d0 000190 10     14  18  4
-  \[14\] \.strtab           STRTAB          00000000 002560 00005e 00      0   0  1
+  \[13\] \.symtab           SYMTAB          00000000 [0-9a-f]+ [0-9a-f]+ 10     14  [0-9]+  4
+  \[14\] \.strtab           STRTAB          00000000 [0-9a-f]+ [0-9a-f]+ 00      0   0  1
 Key to Flags:
   W \(write\), A \(alloc\), X \(execute\), M \(merge\), S \(strings\)
   I \(info\), L \(link order\), G \(group\), T \(TLS\), E \(exclude\), x \(unknown\)
@@ -80,30 +80,33 @@ Symbol table '\.dynsym' contains 10 entries:
      8: 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
      9: 100000e0     4 OBJECT  GLOBAL DEFAULT    9 a
 
-Symbol table '\.symtab' contains 25 entries:
+Symbol table '\.symtab' contains [0-9]+ entries:
    Num:    Value  Size Type    Bind   Vis      Ndx Name
-     0: 00000000     0 NOTYPE  LOCAL  DEFAULT  UND 
-     1: 00008000     0 SECTION LOCAL  DEFAULT    1 
-     2: 0000803c     0 SECTION LOCAL  DEFAULT    2 
-     3: 000080dc     0 SECTION LOCAL  DEFAULT    3 
-     4: 000080fc     0 SECTION LOCAL  DEFAULT    4 
-     5: 00008120     0 SECTION LOCAL  DEFAULT    5 
-     6: 00008138     0 SECTION LOCAL  DEFAULT    6 
-     7: 10000000     0 SECTION LOCAL  DEFAULT    7 
-     8: 100000c0     0 SECTION LOCAL  DEFAULT    8 
-     9: 100000e0     0 SECTION LOCAL  DEFAULT    9 
-    10: 100000ec     0 SECTION LOCAL  DEFAULT   10 
-    11: 00000000     0 SECTION LOCAL  DEFAULT   11 
-    12: 10000000     0 FUNC    LOCAL  HIDDEN     7 sub1
-    13: 10000080     0 NOTYPE  LOCAL  DEFAULT    7 fish
-    14: 00008138     0 OBJECT  LOCAL  DEFAULT    6 _DYNAMIC
-    15: 100000ec     4 OBJECT  LOCAL  DEFAULT   10 c
-    16: 100000cc     0 OBJECT  LOCAL  DEFAULT    8 _GLOBAL_OFFSET_TABLE_
-    17: 100000c0     0 NOTYPE  LOCAL  DEFAULT  ABS __c6xabi_DSBT_BASE
-    18: 100000e8     4 OBJECT  GLOBAL DEFAULT    9 b
-    19: 00020000     0 OBJECT  GLOBAL DEFAULT  ABS __stacksize
-    20: 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
-    21: 100000e4     4 OBJECT  GLOBAL DEFAULT    9 g2
-    22: 10000008    52 FUNC    GLOBAL DEFAULT    7 sub0
-    23: 100000e0     4 OBJECT  GLOBAL DEFAULT    9 a
-    24: 10000040    52 FUNC    GLOBAL DEFAULT    7 sub
+.* 00000000     0 NOTYPE  LOCAL  DEFAULT  UND 
+.* 00008000     0 SECTION LOCAL  DEFAULT    1 
+.* 0000803c     0 SECTION LOCAL  DEFAULT    2 
+.* 000080dc     0 SECTION LOCAL  DEFAULT    3 
+.* 000080fc     0 SECTION LOCAL  DEFAULT    4 
+.* 00008120     0 SECTION LOCAL  DEFAULT    5 
+.* 00008138     0 SECTION LOCAL  DEFAULT    6 
+.* 10000000     0 SECTION LOCAL  DEFAULT    7 
+.* 100000c0     0 SECTION LOCAL  DEFAULT    8 
+.* 100000e0     0 SECTION LOCAL  DEFAULT    9 
+.* 100000ec     0 SECTION LOCAL  DEFAULT   10 
+.* 00000000     0 SECTION LOCAL  DEFAULT   11 
+.* 00000000     0 FILE    LOCAL  DEFAULT  ABS .*
+.* 10000000     0 FUNC    LOCAL  HIDDEN     7 sub1
+.* 00000000     0 FILE    LOCAL  DEFAULT  ABS .*
+.* 10000080     0 NOTYPE  LOCAL  DEFAULT    7 fish
+.* 00000000     0 FILE    LOCAL  DEFAULT  ABS .*
+.* 00008138     0 OBJECT  LOCAL  DEFAULT    6 _DYNAMIC
+.* 100000ec     4 OBJECT  LOCAL  DEFAULT   10 c
+.* 100000cc     0 OBJECT  LOCAL  DEFAULT    8 _GLOBAL_OFFSET_TABLE_
+.* 100000c0     0 NOTYPE  LOCAL  DEFAULT  ABS __c6xabi_DSBT_BASE
+.* 100000e8     4 OBJECT  GLOBAL DEFAULT    9 b
+.* 00020000     0 OBJECT  GLOBAL DEFAULT  ABS __stacksize
+.* 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
+.* 100000e4     4 OBJECT  GLOBAL DEFAULT    9 g2
+.* 10000008    52 FUNC    GLOBAL DEFAULT    7 sub0
+.* 100000e0     4 OBJECT  GLOBAL DEFAULT    9 a
+.* 10000040    52 FUNC    GLOBAL DEFAULT    7 sub
diff --git a/ld/testsuite/ld-x86-64/ilp32-4-nacl.d b/ld/testsuite/ld-x86-64/ilp32-4-nacl.d
index 4de7e6651a..56188afee0 100644
--- a/ld/testsuite/ld-x86-64/ilp32-4-nacl.d
+++ b/ld/testsuite/ld-x86-64/ilp32-4-nacl.d
@@ -15,8 +15,8 @@ Section Headers:
  +\[ 4\] \.dynstr +STRTAB +10000140 +0+140 +0+19 +00 +A +0 +0 +1
  +\[ 5\] \.dynamic +DYNAMIC +1001015c +0+15c +0+58 +08 +WA +4 +0 +4
  +\[ 6\] \.shstrtab +STRTAB +0+ +0+10001 +0+40 +00 +0 +0 +1
- +\[ 7\] \.symtab +SYMTAB +0+0 +0+101ac +0+c0 +10 +8 +8 +4
- +\[ 8\] \.strtab +STRTAB +0+ 0+1026c 0+3f +00 +0 +0 +1
+ +\[ 7\] \.symtab +SYMTAB +0+0 +[0-9a-f]+ +[0-9a-f]+ +10 +8 +[0-9] +4
+ +\[ 8\] \.strtab +STRTAB +0+ +[0-9a-f]+ +[0-9a-f]+ +00 +0 +0 +1
 Key to Flags:
   W \(write\), A \(alloc\), X \(execute\), M \(merge\), S \(strings\), l \(large\)
   I \(info\), L \(link order\), G \(group\), T \(TLS\), E \(exclude\), x \(unknown\)
diff --git a/ld/testsuite/ld-x86-64/ilp32-4.d b/ld/testsuite/ld-x86-64/ilp32-4.d
index 8c2d22cfa0..54041f1992 100644
--- a/ld/testsuite/ld-x86-64/ilp32-4.d
+++ b/ld/testsuite/ld-x86-64/ilp32-4.d
@@ -14,8 +14,8 @@ Section Headers:
   \[ 4\] .text             PROGBITS        0000013c 00013c 000001 00  AX  0   0  4
   \[ 5\] .dynamic          DYNAMIC         00200140 000140 000058 08  WA  3   0  4
   \[ 6\] .shstrtab         STRTAB          00000000 000198 000040 00      0   0  1
-  \[ 7\] .symtab           SYMTAB          00000000 000340 0000c0 10      8   8  4
-  \[ 8\] .strtab           STRTAB          00000000 000400 00003f 00      0   0  1
+  \[ 7\] .symtab           SYMTAB          00000000 [0-9a-f]+ [0-9a-f]+ 10      8   [0-9]  4
+  \[ 8\] .strtab           STRTAB          00000000 [0-9a-f]+ [0-9a-f]+ 00      0   0  1
 Key to Flags:
   W \(write\), A \(alloc\), X \(execute\), M \(merge\), S \(strings\), l \(large\)
   I \(info\), L \(link order\), G \(group\), T \(TLS\), E \(exclude\), x \(unknown\)
diff --git a/ld/testsuite/ld-x86-64/pr12718.d b/ld/testsuite/ld-x86-64/pr12718.d
index a5e904e84f..1f1a16ebae 100644
--- a/ld/testsuite/ld-x86-64/pr12718.d
+++ b/ld/testsuite/ld-x86-64/pr12718.d
@@ -10,7 +10,7 @@ Section Headers:
  +\[ 0\] +NULL +0+ +0+ +0+ +0+ +0 +0 +0
  +\[ 1\] +.text +PROGBITS +[0-9a-f]+ +[0-9a-f]+ +000006 00 +AX +0 +0 +4
  +\[ 2\] +.shstrtab +STRTAB +0+ +[0-9a-f]+ +[0-9a-f]+ +0+ +0 +0 +1
- +\[ 3\] +.symtab +SYMTAB +0+ +[0-9a-f]+ +[0-9a-f]+ 18 +4 +2 +8
+ +\[ 3\] +.symtab +SYMTAB +0+ +[0-9a-f]+ +[0-9a-f]+ 18 +4 +[0-9] +8
  +\[ 4\] +.strtab +STRTAB +0+ +[0-9a-f]+ +[0-9a-f]+ 00 +0 +0 +1
 Key to Flags:
   W \(write\), A \(alloc\), X \(execute\), M \(merge\), S \(strings\), l \(large\)
diff --git a/ld/testsuite/ld-x86-64/pr12921.d b/ld/testsuite/ld-x86-64/pr12921.d
index 5c9537b30f..61939e410d 100644
--- a/ld/testsuite/ld-x86-64/pr12921.d
+++ b/ld/testsuite/ld-x86-64/pr12921.d
@@ -12,8 +12,8 @@ Section Headers:
  +\[ 2\] .data +PROGBITS +[0-9a-f]+ +[0-9a-f]+000 +0+28 +00 +WA +0 +0 +4096
  +\[ 3\] .bss +NOBITS +[0-9a-f]+ +[0-9a-f]+028 +0+10000 +00 +WA +0 +0 +4096
  +\[ 4\] .shstrtab +STRTAB +0+ +[0-9a-f]+ +0+2c +00 +0 +0 +1
- +\[ 5\] .symtab +SYMTAB +0+ +[0-9a-f]+ +0+120 +18 +6 +6 +8
- +\[ 6\] .strtab +STRTAB +0+ +[0-9a-f]+ +0+37 +00 +0 +0 +1
+ +\[ 5\] .symtab +SYMTAB +0+ +[0-9a-f]+ +[0-9a-f]+ +18 +6 +[0-9] +8
+ +\[ 6\] .strtab +STRTAB +0+ +[0-9a-f]+ +[0-9a-f]+ +00 +0 +0 +1
 Key to Flags:
   W \(write\), A \(alloc\), X \(execute\), M \(merge\), S \(strings\), l \(large\)
   I \(info\), L \(link order\), G \(group\), T \(TLS\), E \(exclude\), x \(unknown\)
diff --git a/ld/testsuite/ld-x86-64/split-by-file-nacl.rd b/ld/testsuite/ld-x86-64/split-by-file-nacl.rd
index 7c63aaa1a6..897ab0f806 100644
--- a/ld/testsuite/ld-x86-64/split-by-file-nacl.rd
+++ b/ld/testsuite/ld-x86-64/split-by-file-nacl.rd
@@ -9,8 +9,8 @@ Section Headers:
   \[ 4\] .bss              NOBITS          0000000000000000 000044 000000 00  WA  0   0  4
   \[ 5\] .foo.0            PROGBITS        0000000000000003 000044 000003 00 AXl  0   0  1
   \[ 6\] .shstrtab         STRTAB          0000000000000000 000047 000038 00      0   0  1
-  \[ 7\] .symtab           SYMTAB          0000000000000000 0002c0 0000d8 18      8   6  8
-  \[ 8\] .strtab           STRTAB          0000000000000000 000398 000016 00      0   0  1
+  \[ 7\] .symtab           SYMTAB          0000000000000000 [0-9a-f]+ [0-9a-f]+ 18      8   [0-9]  8
+  \[ 8\] .strtab           STRTAB          0000000000000000 [0-9a-f]+ [0-9a-f]+ 00      0   0  1
 Key to Flags:
   W \(write\), A \(alloc\), X \(execute\), M \(merge\), S \(strings\), l \(large\)
   I \(info\), L \(link order\), G \(group\), T \(TLS\), E \(exclude\), x \(unknown\)
diff --git a/ld/testsuite/ld-x86-64/split-by-file.rd b/ld/testsuite/ld-x86-64/split-by-file.rd
index 7c63aaa1a6..897ab0f806 100644
--- a/ld/testsuite/ld-x86-64/split-by-file.rd
+++ b/ld/testsuite/ld-x86-64/split-by-file.rd
@@ -9,8 +9,8 @@ Section Headers:
   \[ 4\] .bss              NOBITS          0000000000000000 000044 000000 00  WA  0   0  4
   \[ 5\] .foo.0            PROGBITS        0000000000000003 000044 000003 00 AXl  0   0  1
   \[ 6\] .shstrtab         STRTAB          0000000000000000 000047 000038 00      0   0  1
-  \[ 7\] .symtab           SYMTAB          0000000000000000 0002c0 0000d8 18      8   6  8
-  \[ 8\] .strtab           STRTAB          0000000000000000 000398 000016 00      0   0  1
+  \[ 7\] .symtab           SYMTAB          0000000000000000 [0-9a-f]+ [0-9a-f]+ 18      8   [0-9]  8
+  \[ 8\] .strtab           STRTAB          0000000000000000 [0-9a-f]+ [0-9a-f]+ 00      0   0  1
 Key to Flags:
   W \(write\), A \(alloc\), X \(execute\), M \(merge\), S \(strings\), l \(large\)
   I \(info\), L \(link order\), G \(group\), T \(TLS\), E \(exclude\), x \(unknown\)
diff --git a/ld/testsuite/ld-x86-64/tlsbin.rd b/ld/testsuite/ld-x86-64/tlsbin.rd
index 9bfa3ccfc0..a246a35b01 100644
--- a/ld/testsuite/ld-x86-64/tlsbin.rd
+++ b/ld/testsuite/ld-x86-64/tlsbin.rd
@@ -93,6 +93,7 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .* SECTION +LOCAL +DEFAULT +11 *
 .* SECTION +LOCAL +DEFAULT +12 *
 .* SECTION +LOCAL +DEFAULT +13 *
+.* FILE +LOCAL +DEFAULT +ABS .*
 .* TLS +LOCAL +DEFAULT +9 sl1
 .* TLS +LOCAL +DEFAULT +9 sl2
 .* TLS +LOCAL +DEFAULT +9 sl3
@@ -101,6 +102,7 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .* TLS +LOCAL +DEFAULT +9 sl6
 .* TLS +LOCAL +DEFAULT +9 sl7
 .* TLS +LOCAL +DEFAULT +9 sl8
+.* FILE +LOCAL +DEFAULT +ABS .*
 .* TLS +LOCAL +DEFAULT +10 bl1
 .* TLS +LOCAL +DEFAULT +10 bl2
 .* TLS +LOCAL +DEFAULT +10 bl3
@@ -109,6 +111,7 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .* TLS +LOCAL +DEFAULT +10 bl6
 .* TLS +LOCAL +DEFAULT +10 bl7
 .* TLS +LOCAL +DEFAULT +10 bl8
+.* FILE +LOCAL +DEFAULT +ABS .*
 .* OBJECT +LOCAL +DEFAULT +11 _DYNAMIC
 .* OBJECT +LOCAL +DEFAULT +13 _GLOBAL_OFFSET_TABLE_
 .* TLS +GLOBAL +DEFAULT +9 sg8
diff --git a/ld/testsuite/ld-x86-64/tlsbindesc.rd b/ld/testsuite/ld-x86-64/tlsbindesc.rd
index 3527495c95..633690eaba 100644
--- a/ld/testsuite/ld-x86-64/tlsbindesc.rd
+++ b/ld/testsuite/ld-x86-64/tlsbindesc.rd
@@ -84,6 +84,7 @@ Symbol table '\.symtab' contains [0-9]+ entries:
  +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +9 *
  +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +10 *
  +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +11 *
+.* FILE +LOCAL +DEFAULT +ABS .*
  +[0-9]+: 0+20 +0 +TLS +LOCAL +DEFAULT +7 sl1
  +[0-9]+: 0+24 +0 +TLS +LOCAL +DEFAULT +7 sl2
  +[0-9]+: 0+28 +0 +TLS +LOCAL +DEFAULT +7 sl3
@@ -92,6 +93,7 @@ Symbol table '\.symtab' contains [0-9]+ entries:
  +[0-9]+: 0+34 +0 +TLS +LOCAL +DEFAULT +7 sl6
  +[0-9]+: 0+38 +0 +TLS +LOCAL +DEFAULT +7 sl7
  +[0-9]+: 0+3c +0 +TLS +LOCAL +DEFAULT +7 sl8
+.* FILE +LOCAL +DEFAULT +ABS .*
  +[0-9]+: 0+80 +0 +TLS +LOCAL +DEFAULT +8 bl1
  +[0-9]+: 0+84 +0 +TLS +LOCAL +DEFAULT +8 bl2
  +[0-9]+: 0+88 +0 +TLS +LOCAL +DEFAULT +8 bl3
@@ -100,6 +102,7 @@ Symbol table '\.symtab' contains [0-9]+ entries:
  +[0-9]+: 0+94 +0 +TLS +LOCAL +DEFAULT +8 bl6
  +[0-9]+: 0+98 +0 +TLS +LOCAL +DEFAULT +8 bl7
  +[0-9]+: 0+9c +0 +TLS +LOCAL +DEFAULT +8 bl8
+.* FILE +LOCAL +DEFAULT +ABS .*
  +[0-9]+: 0+a0 +0 +TLS +LOCAL +DEFAULT +7 _TLS_MODULE_BASE_
  +[0-9]+: 0+601260 +0 +OBJECT +LOCAL +DEFAULT +9 _DYNAMIC
  +[0-9]+: 0+601380 +0 +OBJECT +LOCAL +DEFAULT +11 _GLOBAL_OFFSET_TABLE_
diff --git a/ld/testsuite/ld-x86-64/tlsdesc.rd b/ld/testsuite/ld-x86-64/tlsdesc.rd
index ba5c9d94da..f9497de079 100644
--- a/ld/testsuite/ld-x86-64/tlsdesc.rd
+++ b/ld/testsuite/ld-x86-64/tlsdesc.rd
@@ -119,6 +119,7 @@ Symbol table '\.symtab' contains [0-9]+ entries:
  +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +10 *
  +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +11 *
  +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +12 *
+.* FILE +LOCAL +DEFAULT +ABS .*
  +[0-9]+: 0+20 +0 +TLS +LOCAL +DEFAULT +8 sl1
  +[0-9]+: 0+24 +0 +TLS +LOCAL +DEFAULT +8 sl2
  +[0-9]+: 0+28 +0 +TLS +LOCAL +DEFAULT +8 sl3
@@ -128,8 +129,6 @@ Symbol table '\.symtab' contains [0-9]+ entries:
  +[0-9]+: 0+38 +0 +TLS +LOCAL +DEFAULT +8 sl7
  +[0-9]+: 0+3c +0 +TLS +LOCAL +DEFAULT +8 sl8
  +[0-9]+: 0+60 +0 +TLS +LOCAL +DEFAULT +9 sH1
- +[0-9]+: 0+ +0 +TLS +LOCAL +DEFAULT +8 _TLS_MODULE_BASE_
- +[0-9]+: 0+2011b8 +0 +OBJECT +LOCAL +DEFAULT +10 _DYNAMIC
  +[0-9]+: 0+48 +0 +TLS +LOCAL +DEFAULT +8 sh3
  +[0-9]+: 0+64 +0 +TLS +LOCAL +DEFAULT +9 sH2
  +[0-9]+: 0+78 +0 +TLS +LOCAL +DEFAULT +9 sH7
@@ -143,9 +142,12 @@ Symbol table '\.symtab' contains [0-9]+ entries:
  +[0-9]+: 0+74 +0 +TLS +LOCAL +DEFAULT +9 sH6
  +[0-9]+: 0+7c +0 +TLS +LOCAL +DEFAULT +9 sH8
  +[0-9]+: 0+40 +0 +TLS +LOCAL +DEFAULT +8 sh1
- +[0-9]+: 0+201350 +0 +OBJECT +LOCAL +DEFAULT +12 _GLOBAL_OFFSET_TABLE_
  +[0-9]+: 0+44 +0 +TLS +LOCAL +DEFAULT +8 sh2
  +[0-9]+: 0+54 +0 +TLS +LOCAL +DEFAULT +8 sh6
+.* FILE +LOCAL +DEFAULT +ABS .*
+ +[0-9]+: 0+ +0 +TLS +LOCAL +DEFAULT +8 _TLS_MODULE_BASE_
+ +[0-9]+: 0+2011b8 +0 +OBJECT +LOCAL +DEFAULT +10 _DYNAMIC
+ +[0-9]+: 0+201350 +0 +OBJECT +LOCAL +DEFAULT +12 _GLOBAL_OFFSET_TABLE_
  +[0-9]+: 0+1c +0 +TLS +GLOBAL +DEFAULT +8 sg8
  +[0-9]+: 0+8 +0 +TLS +GLOBAL +DEFAULT +8 sg3
  +[0-9]+: 0+c +0 +TLS +GLOBAL +DEFAULT +8 sg4
diff --git a/ld/testsuite/ld-x86-64/tlspic.rd b/ld/testsuite/ld-x86-64/tlspic.rd
index 72c66bf644..f2cd8e8dbc 100644
--- a/ld/testsuite/ld-x86-64/tlspic.rd
+++ b/ld/testsuite/ld-x86-64/tlspic.rd
@@ -103,6 +103,7 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .* SECTION +LOCAL +DEFAULT +10 *
 .* SECTION +LOCAL +DEFAULT +11 *
 .* SECTION +LOCAL +DEFAULT +12 *
+.* FILE +LOCAL +DEFAULT +ABS .*
 .* TLS +LOCAL +DEFAULT +8 sl1
 .* TLS +LOCAL +DEFAULT +8 sl2
 .* TLS +LOCAL +DEFAULT +8 sl3
@@ -112,7 +113,6 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .* TLS +LOCAL +DEFAULT +8 sl7
 .* TLS +LOCAL +DEFAULT +8 sl8
 .* TLS +LOCAL +DEFAULT +9 sH1
-.* OBJECT +LOCAL +DEFAULT +10 _DYNAMIC
 .* TLS +LOCAL +DEFAULT +8 sh3
 .* TLS +LOCAL +DEFAULT +9 sH2
 .* TLS +LOCAL +DEFAULT +9 sH7
@@ -126,9 +126,11 @@ Symbol table '\.symtab' contains [0-9]+ entries:
 .* TLS +LOCAL +DEFAULT +9 sH6
 .* TLS +LOCAL +DEFAULT +9 sH8
 .* TLS +LOCAL +DEFAULT +8 sh1
-.* OBJECT +LOCAL +DEFAULT +12 _GLOBAL_OFFSET_TABLE_
 .* TLS +LOCAL +DEFAULT +8 sh2
 .* TLS +LOCAL +DEFAULT +8 sh6
+.* FILE +LOCAL +DEFAULT +ABS .*
+.* OBJECT +LOCAL +DEFAULT +10 _DYNAMIC
+.* OBJECT +LOCAL +DEFAULT +12 _GLOBAL_OFFSET_TABLE_
 .* TLS +GLOBAL +DEFAULT +8 sg8
 .* TLS +GLOBAL +DEFAULT +8 sg3
 .* TLS +GLOBAL +DEFAULT +8 sg4