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.

13 files changed, 398 insertions, 368 deletions

diff --git a/ld/testsuite/ld-tic6x/shlib-1.rd b/ld/testsuite/ld-tic6x/shlib-1.rd
index a0232cd..a5ad39b 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 a0232cd..a5ad39b 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 a0232cd..a5ad39b 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 a0232cd..a5ad39b 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 e1809af..bd317a8 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 95547b0..3366a64 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 566f2f9..a37c4e1 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 be163d9..4a726a5 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 e9b57c7..fc323b2 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 cec76d4..ae2daa1 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 cec76d4..ae2daa1 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 cd8bc4c..62c7b69 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 cd8bc4c..62c7b69 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