diff mbox series

Make is_relocatable_executable only affect dynamic section syms

Message ID ZdW3p+kiCZ/AZhVz@squeak.grove.modra.org
State Accepted
Headers
Series Make is_relocatable_executable only affect dynamic section syms |

Checks

Context Check Description
snail/binutils-gdb-check success Github commit url

Commit Message

Alan Modra Feb. 21, 2024, 8:43 a.m. UTC 
  I believe the only elflink.c specialties for is_relocatable_executable
needed by tic6x are those directly related to dynamic section symbols.
I might be wrong, the code in record_dynamic_symbol and
record_link_assignment predated the tic6x port, but I think these were
symbian specific hacks.

The shlib-app-1* testsuite changes aren't needed for this patch.  I
started making them when trying to remove is_relocatable_executable
completely, but figure it is worth keeping the more permissive address
matching for some future generic linker change.  The static-app-1*
changes also adjust to the fact that an unneeded "c" no longer appears
in the dynamic symbol table.

bfd/
	* elflink.c (bfd_elf_link_record_dynamic_symbol): Don't do anything
	special for is_relocatable_executable.
	(bfd_elf_record_link_assignment): Likewise.
ld/
	* testsuite/ld-tic6x/shlib-app-1.rd: Make some address matching
	more permissive.
	* testsuite/ld-tic6x/shlib-app-1b.rd: Likewise.
	* testsuite/ld-tic6x/shlib-app-1r.rd: Likewise.
	* testsuite/ld-tic6x/shlib-app-1rb.rd: Likewise.
	* testsuite/ld-tic6x/static-app-1.rd: Likewise, and adjust expected
	dynamic symbol table.
	* testsuite/ld-tic6x/static-app-1b.rd: Likewise.
	* testsuite/ld-tic6x/static-app-1r.rd: Likewise.
	* testsuite/ld-tic6x/static-app-1rb.rd: Likewise.
diff mbox series

Patch

diff --git a/bfd/elflink.c b/bfd/elflink.c
index c2494b3e12e..5a6cb07b2ce 100644
--- a/bfd/elflink.c
+++ b/bfd/elflink.c
@@ -530,15 +530,7 @@  bfd_elf_link_record_dynamic_symbol (struct bfd_link_info *info,
 	      && h->root.type != bfd_link_hash_undefweak)
 	    {
 	      h->forced_local = 1;
-	      if (!elf_hash_table (info)->is_relocatable_executable
-		  || ((h->root.type == bfd_link_hash_defined
-		       || h->root.type == bfd_link_hash_defweak)
-		      && h->root.u.def.section->owner != NULL
-		      && h->root.u.def.section->owner->no_export)
-		  || (h->root.type == bfd_link_hash_common
-		      && h->root.u.c.p->section->owner != NULL
-		      && h->root.u.c.p->section->owner->no_export))
-		return true;
+	      return true;
 	    }
 
 	default:
@@ -734,8 +726,7 @@  bfd_elf_record_link_assignment (bfd *output_bfd,
 
   if ((h->def_dynamic
        || h->ref_dynamic
-       || bfd_link_dll (info)
-       || elf_hash_table (info)->is_relocatable_executable)
+       || bfd_link_dll (info))
       && !h->forced_local
       && h->dynindx == -1)
     {
diff --git a/ld/testsuite/ld-tic6x/shlib-app-1.rd b/ld/testsuite/ld-tic6x/shlib-app-1.rd
index fb3a080f2c3..16f889e7213 100644
--- a/ld/testsuite/ld-tic6x/shlib-app-1.rd
+++ b/ld/testsuite/ld-tic6x/shlib-app-1.rd
@@ -4,20 +4,20 @@  Section Headers:
   \[Nr\] Name              Type            Addr     Off    Size   ES Flg Lk Inf Al
   \[ 0\]                   NULL            00000000 000000 000000 00      0   0  0
   \[ 1\] \.hash             HASH            00008000 001000 000040 04   A  2   0  4
-  \[ 2\] \.dynsym           DYNSYM          00008040 001040 0000b0 10   A  3   6  4
-  \[ 3\] \.dynstr           STRTAB          000080f0 0010f0 000022 00   A  0   0  1
-  \[ 4\] \.rela\.got         RELA            00008114 001114 000018 0c  AI  2  11  4
-  \[ 5\] \.rela\.neardata    RELA            0000812c 00112c 000018 0c  AI  2  12  4
-  \[ 6\] \.rela\.bss         RELA            00008144 001144 00000c 0c  AI  2  13  4
-  \[ 7\] \.dynamic          DYNAMIC         00008150 001150 0000b8 08  WA  3   0  4
+  \[ 2\] \.dynsym           DYNSYM          [0-9a-f]* [0-9a-f]* 0000b0 10   A  3   6  4
+  \[ 3\] \.dynstr           STRTAB          [0-9a-f]* [0-9a-f]* 000022 00   A  0   0  1
+  \[ 4\] \.rela\.got         RELA            [0-9a-f]* [0-9a-f]* 000018 0c  AI  2  11  4
+  \[ 5\] \.rela\.neardata    RELA            [0-9a-f]* [0-9a-f]* 000018 0c  AI  2  12  4
+  \[ 6\] \.rela\.bss         RELA            [0-9a-f]* [0-9a-f]* 00000c 0c  AI  2  13  4
+  \[ 7\] \.dynamic          DYNAMIC         [0-9a-f]* [0-9a-f]* 0000b8 08  WA  3   0  4
   \[ 8\] \.rela\.plt         RELA            10000000 002000 00000c 0c  AI  2  11  4
-  \[ 9\] \.plt              PROGBITS        10000020 002020 000040 18  AX  0   0 32
-  \[10\] \.text             PROGBITS        10000060 002060 000040 00  AX  0   0 32
-  \[11\] \.got              PROGBITS        100000a0 0020a0 000020 00  WA  0   0  4
-  \[12\] \.neardata         PROGBITS        100000c0 0020c0 00000c 00  WA  0   0  4
-  \[13\] \.bss              NOBITS          100000cc 0020cc 000004 00  WA  0   0  4
-  \[14\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 0020cc 000019 00      0   0  1
-  \[15\] \.symtab           SYMTAB          00000000 0020e8 0001b0 10     16  22  4
+  \[ 9\] \.plt              PROGBITS        [0-9a-f]* [0-9a-f]* 000040 18  AX  0   0 32
+  \[10\] \.text             PROGBITS        [0-9a-f]* [0-9a-f]* 000040 00  AX  0   0 32
+  \[11\] \.got              PROGBITS        [0-9a-f]* [0-9a-f]* 000020 00  WA  0   0  4
+  \[12\] \.neardata         PROGBITS        [0-9a-f]* [0-9a-f]* 00000c 00  WA  0   0  4
+  \[13\] \.bss              NOBITS          [0-9a-f]* [0-9a-f]* 000004 00  WA  0   0  4
+  \[14\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 [0-9a-f]* 000019 00      0   0  1
+  \[15\] \.symtab           SYMTAB          00000000 [0-9a-f]* 0001b0 10     16  22  4
   \[16\] \.strtab           STRTAB .*
   \[17\] \.shstrtab         STRTAB .*
 Key to Flags:
@@ -31,7 +31,7 @@  Program Headers:
   Type           Offset   VirtAddr   PhysAddr   FileSiz MemSiz  Flg Align
   LOAD           0x001000 0x00008000 0x00008000 0x00208 0x00208 RW  0x1000
   LOAD           0x002000 0x10000000 0x10000000 0x000cc 0x000d0 RWE 0x1000
-  DYNAMIC        0x001150 0x00008150 0x00008150 0x000b8 0x000b8 RW  0x4
+  DYNAMIC        0x[0-9a-f]* 0x[0-9a-f]* 0x[0-9a-f]* 0x000b8 0x000b8 RW  0x4
   GNU_STACK      0x000000 0x00000000 0x00000000 0x00000 0x20000 RW  0x8
 
  Section to Segment mapping:
@@ -41,12 +41,12 @@  Program Headers:
    02     \.dynamic 
    03     
 
-Dynamic section at offset 0x1150 contains 18 entries:
+Dynamic section at offset 0x[0-9a-f]* contains 18 entries:
   Tag        Type                         Name/Value
  0x00000001 \(NEEDED\)                     Shared library: \[tmpdir/libtest\.so\]
  0x00000004 \(HASH\)                       0x8000
- 0x00000005 \(STRTAB\)                     0x80f0
- 0x00000006 \(SYMTAB\)                     0x8040
+ 0x00000005 \(STRTAB\)                     0x[0-9a-f]*
+ 0x00000006 \(SYMTAB\)                     0x[0-9a-f]*
  0x0000000a \(STRSZ\)                      34 \(bytes\)
  0x0000000b \(SYMENT\)                     16 \(bytes\)
  0x00000015 \(DEBUG\)                      0x0
@@ -54,7 +54,7 @@  Dynamic section at offset 0x1150 contains 18 entries:
  0x00000002 \(PLTRELSZ\)                   12 \(bytes\)
  0x00000014 \(PLTREL\)                     RELA
  0x00000017 \(JMPREL\)                     0x10000000
- 0x00000007 \(RELA\)                       0x8114
+ 0x00000007 \(RELA\)                       0x[0-9a-f]*
  0x00000008 \(RELASZ\)                     72 \(bytes\)
  0x00000009 \(RELAENT\)                    12 \(bytes\)
  0x70000000 \(C6000_DSBT_BASE\)            0x100000a0
@@ -62,64 +62,64 @@  Dynamic section at offset 0x1150 contains 18 entries:
  0x70000003 \(C6000_DSBT_INDEX\)           0x0
  0x00000000 \(NULL\)                       0x0
 
-Relocation section '\.rela\.got' at offset 0x1114 contains 2 entries:
+Relocation section '\.rela\.got' at offset 0x[0-9a-f]* contains 2 entries:
  Offset     Info    Type                Sym\. Value  Symbol's Name \+ Addend
-100000b8  00000601 R_C6000_ABS32          100000c0   b \+ 0
-100000bc  00000a01 R_C6000_ABS32          100000cc   a \+ 0
+100000b8  [0-9a-f]* R_C6000_ABS32          100000c0   b \+ 0
+100000bc  [0-9a-f]* R_C6000_ABS32          100000cc   a \+ 0
 
-Relocation section '\.rela\.neardata' at offset 0x112c contains 2 entries:
+Relocation section '\.rela\.neardata' at offset 0x[0-9a-f]* contains 2 entries:
  Offset     Info    Type                Sym\. Value  Symbol's Name \+ Addend
-100000c4  00000701 R_C6000_ABS32          00000000   g1 \+ 0
-100000c8  00000801 R_C6000_ABS32          00000000   g2 \+ 0
+100000c4  [0-9a-f]* R_C6000_ABS32          00000000   g1 \+ 0
+100000c8  [0-9a-f]* R_C6000_ABS32          00000000   g2 \+ 0
 
-Relocation section '\.rela\.bss' at offset 0x1144 contains 1 entry:
+Relocation section '\.rela\.bss' at offset 0x[0-9a-f]* contains 1 entry:
  Offset     Info    Type                Sym\. Value  Symbol's Name \+ Addend
-100000cc  00000a1a R_C6000_COPY           100000cc   a \+ 0
+100000cc  [0-9a-f]* R_C6000_COPY           100000cc   a \+ 0
 
-Relocation section '\.rela\.plt' at offset 0x2000 contains 1 entry:
+Relocation section '\.rela\.plt' at offset 0x[0-9a-f]* contains 1 entry:
  Offset     Info    Type                Sym\. Value  Symbol's Name \+ Addend
-100000b4  0000091b R_C6000_JUMP_SLOT      00000000   sub0 \+ 0
+100000b4  [0-9a-f]* R_C6000_JUMP_SLOT      00000000   sub0 \+ 0
 
 Symbol table '\.dynsym' contains 11 entries:
    Num:    Value  Size Type    Bind   Vis      Ndx Name
      0: 00000000     0 NOTYPE  LOCAL  DEFAULT  UND 
-     1: 10000020     0 SECTION LOCAL  DEFAULT    9.*
-     2: 10000060     0 SECTION LOCAL  DEFAULT   10.*
-     3: 100000a0     0 SECTION LOCAL  DEFAULT   11.*
-     4: 100000c0     0 SECTION LOCAL  DEFAULT   12.*
-     5: 100000cc     0 SECTION LOCAL  DEFAULT   13.*
-     6: 100000c0     4 OBJECT  GLOBAL DEFAULT   12 b
+     1: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    9.*
+     2: [0-9a-f]*     0 SECTION LOCAL  DEFAULT   10.*
+     3: [0-9a-f]*     0 SECTION LOCAL  DEFAULT   11.*
+     4: [0-9a-f]*     0 SECTION LOCAL  DEFAULT   12.*
+     5: [0-9a-f]*     0 SECTION LOCAL  DEFAULT   13.*
+     6: [0-9a-f]*     4 OBJECT  GLOBAL DEFAULT   12 b
      7: 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
      8: 00000000     0 OBJECT  WEAK   DEFAULT  UND g2
      9: 00000000     0 FUNC    GLOBAL DEFAULT  UND sub0
-    10: 100000cc     4 OBJECT  GLOBAL DEFAULT   13 a
+    10: [0-9a-f]*     4 OBJECT  GLOBAL DEFAULT   13 a
 
 Symbol table '\.symtab' contains 27 entries:
    Num:    Value  Size Type    Bind   Vis      Ndx Name
      0: 00000000     0 NOTYPE  LOCAL  DEFAULT  UND 
-     1: 00008000     0 SECTION LOCAL  DEFAULT    1.*
-     2: 00008040     0 SECTION LOCAL  DEFAULT    2.*
-     3: 000080f0     0 SECTION LOCAL  DEFAULT    3.*
-     4: 00008114     0 SECTION LOCAL  DEFAULT    4.*
-     5: 0000812c     0 SECTION LOCAL  DEFAULT    5.*
-     6: 00008144     0 SECTION LOCAL  DEFAULT    6.*
-     7: 00008150     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: 00000000     0 FILE    LOCAL  DEFAULT  ABS .*shlib-app-1\.o
-    16: 10000060     0 NOTYPE  LOCAL  DEFAULT   10 fish
-    17: 100000c4     8 OBJECT  LOCAL  DEFAULT   12 w
-    18: 00000000     0 FILE    LOCAL  DEFAULT  ABS 
-    19: 00008150     0 OBJECT  LOCAL  DEFAULT    7 _DYNAMIC
-    20: 100000ac     0 OBJECT  LOCAL  DEFAULT   11 _GLOBAL_OFFSET_TABLE_
-    21: 100000a0     0 NOTYPE  LOCAL  DEFAULT   11 __c6xabi_DSBT_BASE
-    22: 100000c0     4 OBJECT  GLOBAL DEFAULT   12 b
-    23: 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
-    24: 00000000     0 OBJECT  WEAK   DEFAULT  UND g2
-    25: 00000000     0 FUNC    GLOBAL DEFAULT  UND sub0
-    26: 100000cc     4 OBJECT  GLOBAL DEFAULT   13 a
+     1: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    1.*
+     2: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    2.*
+     3: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    3.*
+     4: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    4.*
+     5: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    5.*
+     6: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    6.*
+     7: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    7.*
+     8: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    8.*
+     9: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    9.*
+    10: [0-9a-f]*     0 SECTION LOCAL  DEFAULT   10.*
+    11: [0-9a-f]*     0 SECTION LOCAL  DEFAULT   11.*
+    12: [0-9a-f]*     0 SECTION LOCAL  DEFAULT   12.*
+    13: [0-9a-f]*     0 SECTION LOCAL  DEFAULT   13.*
+    14: [0-9a-f]*     0 SECTION LOCAL  DEFAULT   14.*
+    15: [0-9a-f]*     0 FILE    LOCAL  DEFAULT  ABS .*shlib-app-1\.o
+    16: [0-9a-f]*     0 NOTYPE  LOCAL  DEFAULT   10 fish
+    17: [0-9a-f]*     8 OBJECT  LOCAL  DEFAULT   12 w
+    18: [0-9a-f]*     0 FILE    LOCAL  DEFAULT  ABS 
+    19: [0-9a-f]*     0 OBJECT  LOCAL  DEFAULT    7 _DYNAMIC
+    20: [0-9a-f]*     0 OBJECT  LOCAL  DEFAULT   11 _GLOBAL_OFFSET_TABLE_
+    21: [0-9a-f]*     0 NOTYPE  LOCAL  DEFAULT   11 __c6xabi_DSBT_BASE
+    22: [0-9a-f]*     4 OBJECT  GLOBAL DEFAULT   12 b
+    23: [0-9a-f]*     0 NOTYPE  WEAK   DEFAULT  UND g1
+    24: [0-9a-f]*     0 OBJECT  WEAK   DEFAULT  UND g2
+    25: [0-9a-f]*     0 FUNC    GLOBAL DEFAULT  UND sub0
+    26: [0-9a-f]*     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 3a5d2178301..78bb4da85b6 100644
--- a/ld/testsuite/ld-tic6x/shlib-app-1b.rd
+++ b/ld/testsuite/ld-tic6x/shlib-app-1b.rd
@@ -4,20 +4,20 @@  Section Headers:
   \[Nr\] Name              Type            Addr     Off    Size   ES Flg Lk Inf Al
   \[ 0\]                   NULL            00000000 000000 000000 00      0   0  0
   \[ 1\] \.hash             HASH            00008000 001000 000040 04   A  2   0  4
-  \[ 2\] \.dynsym           DYNSYM          00008040 001040 0000b0 10   A  3   6  4
-  \[ 3\] \.dynstr           STRTAB          000080f0 0010f0 000023 00   A  0   0  1
-  \[ 4\] \.rela\.got         RELA            00008114 001114 000018 0c  AI  2  11  4
-  \[ 5\] \.rela\.neardata    RELA            0000812c 00112c 000018 0c  AI  2  12  4
-  \[ 6\] \.rela\.bss         RELA            00008144 001144 00000c 0c  AI  2  13  4
-  \[ 7\] \.dynamic          DYNAMIC         00008150 001150 0000b8 08  WA  3   0  4
+  \[ 2\] \.dynsym           DYNSYM          [0-9a-f]* [0-9a-f]* 0000b0 10   A  3   6  4
+  \[ 3\] \.dynstr           STRTAB          [0-9a-f]* [0-9a-f]* 000023 00   A  0   0  1
+  \[ 4\] \.rela\.got         RELA            [0-9a-f]* [0-9a-f]* 000018 0c  AI  2  11  4
+  \[ 5\] \.rela\.neardata    RELA            [0-9a-f]* [0-9a-f]* 000018 0c  AI  2  12  4
+  \[ 6\] \.rela\.bss         RELA            [0-9a-f]* [0-9a-f]* 00000c 0c  AI  2  13  4
+  \[ 7\] \.dynamic          DYNAMIC         [0-9a-f]* [0-9a-f]* 0000b8 08  WA  3   0  4
   \[ 8\] \.rela\.plt         RELA            10000000 002000 00000c 0c  AI  2  11  4
-  \[ 9\] \.plt              PROGBITS        10000020 002020 000040 18  AX  0   0 32
-  \[10\] \.text             PROGBITS        10000060 002060 000040 00  AX  0   0 32
-  \[11\] \.got              PROGBITS        100000a0 0020a0 000020 00  WA  0   0  4
-  \[12\] \.neardata         PROGBITS        100000c0 0020c0 00000c 00  WA  0   0  4
-  \[13\] \.bss              NOBITS          100000cc 0020cc 000004 00  WA  0   0  4
-  \[14\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 0020cc 000019 00      0   0  1
-  \[15\] \.symtab           SYMTAB          00000000 0020e8 0001b0 10     16  22  4
+  \[ 9\] \.plt              PROGBITS        [0-9a-f]* [0-9a-f]* 000040 18  AX  0   0 32
+  \[10\] \.text             PROGBITS        [0-9a-f]* [0-9a-f]* 000040 00  AX  0   0 32
+  \[11\] \.got              PROGBITS        [0-9a-f]* [0-9a-f]* 000020 00  WA  0   0  4
+  \[12\] \.neardata         PROGBITS        [0-9a-f]* [0-9a-f]* 00000c 00  WA  0   0  4
+  \[13\] \.bss              NOBITS          [0-9a-f]* [0-9a-f]* 000004 00  WA  0   0  4
+  \[14\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 [0-9a-f]* 000019 00      0   0  1
+  \[15\] \.symtab           SYMTAB          00000000 [0-9a-f]* 0001b0 10     16  22  4
   \[16\] \.strtab           STRTAB .*
   \[17\] \.shstrtab         STRTAB .*
 Key to Flags:
@@ -31,7 +31,7 @@  Program Headers:
   Type           Offset   VirtAddr   PhysAddr   FileSiz MemSiz  Flg Align
   LOAD           0x001000 0x00008000 0x00008000 0x00208 0x00208 RW  0x1000
   LOAD           0x002000 0x10000000 0x10000000 0x000cc 0x000d0 RWE 0x1000
-  DYNAMIC        0x001150 0x00008150 0x00008150 0x000b8 0x000b8 RW  0x4
+  DYNAMIC        0x[0-9a-f]* 0x[0-9a-f]* 0x[0-9a-f]* 0x000b8 0x000b8 RW  0x4
   GNU_STACK      0x000000 0x00000000 0x00000000 0x00000 0x20000 RW  0x8
 
  Section to Segment mapping:
@@ -41,12 +41,12 @@  Program Headers:
    02     \.dynamic 
    03     
 
-Dynamic section at offset 0x1150 contains 18 entries:
+Dynamic section at offset 0x[0-9a-f]* contains 18 entries:
   Tag        Type                         Name/Value
  0x00000001 \(NEEDED\)                     Shared library: \[tmpdir/libtestb\.so\]
  0x00000004 \(HASH\)                       0x8000
- 0x00000005 \(STRTAB\)                     0x80f0
- 0x00000006 \(SYMTAB\)                     0x8040
+ 0x00000005 \(STRTAB\)                     0x[0-9a-f]*
+ 0x00000006 \(SYMTAB\)                     0x[0-9a-f]*
  0x0000000a \(STRSZ\)                      35 \(bytes\)
  0x0000000b \(SYMENT\)                     16 \(bytes\)
  0x00000015 \(DEBUG\)                      0x0
@@ -54,7 +54,7 @@  Dynamic section at offset 0x1150 contains 18 entries:
  0x00000002 \(PLTRELSZ\)                   12 \(bytes\)
  0x00000014 \(PLTREL\)                     RELA
  0x00000017 \(JMPREL\)                     0x10000000
- 0x00000007 \(RELA\)                       0x8114
+ 0x00000007 \(RELA\)                       0x[0-9a-f]*
  0x00000008 \(RELASZ\)                     72 \(bytes\)
  0x00000009 \(RELAENT\)                    12 \(bytes\)
  0x70000000 \(C6000_DSBT_BASE\)            0x100000a0
@@ -62,64 +62,64 @@  Dynamic section at offset 0x1150 contains 18 entries:
  0x70000003 \(C6000_DSBT_INDEX\)           0x0
  0x00000000 \(NULL\)                       0x0
 
-Relocation section '\.rela\.got' at offset 0x1114 contains 2 entries:
+Relocation section '\.rela\.got' at offset 0x[0-9a-f]* contains 2 entries:
  Offset     Info    Type                Sym\. Value  Symbol's Name \+ Addend
-100000b8  00000601 R_C6000_ABS32          100000c0   b \+ 0
-100000bc  00000a01 R_C6000_ABS32          100000cc   a \+ 0
+100000b8  [0-9a-f]* R_C6000_ABS32          100000c0   b \+ 0
+100000bc  [0-9a-f]* R_C6000_ABS32          100000cc   a \+ 0
 
-Relocation section '\.rela\.neardata' at offset 0x112c contains 2 entries:
+Relocation section '\.rela\.neardata' at offset 0x[0-9a-f]* contains 2 entries:
  Offset     Info    Type                Sym\. Value  Symbol's Name \+ Addend
-100000c4  00000701 R_C6000_ABS32          00000000   g1 \+ 0
-100000c8  00000801 R_C6000_ABS32          00000000   g2 \+ 0
+100000c4  [0-9a-f]* R_C6000_ABS32          00000000   g1 \+ 0
+100000c8  [0-9a-f]* R_C6000_ABS32          00000000   g2 \+ 0
 
-Relocation section '\.rela\.bss' at offset 0x1144 contains 1 entry:
+Relocation section '\.rela\.bss' at offset 0x[0-9a-f]* contains 1 entry:
  Offset     Info    Type                Sym\. Value  Symbol's Name \+ Addend
-100000cc  00000a1a R_C6000_COPY           100000cc   a \+ 0
+100000cc  [0-9a-f]* R_C6000_COPY           100000cc   a \+ 0
 
-Relocation section '\.rela\.plt' at offset 0x2000 contains 1 entry:
+Relocation section '\.rela\.plt' at offset 0x[0-9a-f]* contains 1 entry:
  Offset     Info    Type                Sym\. Value  Symbol's Name \+ Addend
-100000b4  0000091b R_C6000_JUMP_SLOT      00000000   sub0 \+ 0
+100000b4  [0-9a-f]* R_C6000_JUMP_SLOT      00000000   sub0 \+ 0
 
 Symbol table '\.dynsym' contains 11 entries:
    Num:    Value  Size Type    Bind   Vis      Ndx Name
      0: 00000000     0 NOTYPE  LOCAL  DEFAULT  UND 
-     1: 10000020     0 SECTION LOCAL  DEFAULT    9.*
-     2: 10000060     0 SECTION LOCAL  DEFAULT   10.*
-     3: 100000a0     0 SECTION LOCAL  DEFAULT   11.*
-     4: 100000c0     0 SECTION LOCAL  DEFAULT   12.*
-     5: 100000cc     0 SECTION LOCAL  DEFAULT   13.*
-     6: 100000c0     4 OBJECT  GLOBAL DEFAULT   12 b
+     1: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    9.*
+     2: [0-9a-f]*     0 SECTION LOCAL  DEFAULT   10.*
+     3: [0-9a-f]*     0 SECTION LOCAL  DEFAULT   11.*
+     4: [0-9a-f]*     0 SECTION LOCAL  DEFAULT   12.*
+     5: [0-9a-f]*     0 SECTION LOCAL  DEFAULT   13.*
+     6: [0-9a-f]*     4 OBJECT  GLOBAL DEFAULT   12 b
      7: 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
      8: 00000000     0 OBJECT  WEAK   DEFAULT  UND g2
      9: 00000000     0 FUNC    GLOBAL DEFAULT  UND sub0
-    10: 100000cc     4 OBJECT  GLOBAL DEFAULT   13 a
+    10: [0-9a-f]*     4 OBJECT  GLOBAL DEFAULT   13 a
 
 Symbol table '\.symtab' contains 27 entries:
    Num:    Value  Size Type    Bind   Vis      Ndx Name
      0: 00000000     0 NOTYPE  LOCAL  DEFAULT  UND 
-     1: 00008000     0 SECTION LOCAL  DEFAULT    1.*
-     2: 00008040     0 SECTION LOCAL  DEFAULT    2.*
-     3: 000080f0     0 SECTION LOCAL  DEFAULT    3.*
-     4: 00008114     0 SECTION LOCAL  DEFAULT    4.*
-     5: 0000812c     0 SECTION LOCAL  DEFAULT    5.*
-     6: 00008144     0 SECTION LOCAL  DEFAULT    6.*
-     7: 00008150     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: 00000000     0 FILE    LOCAL  DEFAULT  ABS .*shlib-app-1\.o
-    16: 10000060     0 NOTYPE  LOCAL  DEFAULT   10 fish
-    17: 100000c4     8 OBJECT  LOCAL  DEFAULT   12 w
-    18: 00000000     0 FILE    LOCAL  DEFAULT  ABS 
-    19: 00008150     0 OBJECT  LOCAL  DEFAULT    7 _DYNAMIC
-    20: 100000ac     0 OBJECT  LOCAL  DEFAULT   11 _GLOBAL_OFFSET_TABLE_
-    21: 100000a0     0 NOTYPE  LOCAL  DEFAULT   11 __c6xabi_DSBT_BASE
-    22: 100000c0     4 OBJECT  GLOBAL DEFAULT   12 b
-    23: 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
-    24: 00000000     0 OBJECT  WEAK   DEFAULT  UND g2
-    25: 00000000     0 FUNC    GLOBAL DEFAULT  UND sub0
-    26: 100000cc     4 OBJECT  GLOBAL DEFAULT   13 a
+     1: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    1.*
+     2: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    2.*
+     3: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    3.*
+     4: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    4.*
+     5: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    5.*
+     6: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    6.*
+     7: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    7.*
+     8: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    8.*
+     9: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    9.*
+    10: [0-9a-f]*     0 SECTION LOCAL  DEFAULT   10.*
+    11: [0-9a-f]*     0 SECTION LOCAL  DEFAULT   11.*
+    12: [0-9a-f]*     0 SECTION LOCAL  DEFAULT   12.*
+    13: [0-9a-f]*     0 SECTION LOCAL  DEFAULT   13.*
+    14: [0-9a-f]*     0 SECTION LOCAL  DEFAULT   14.*
+    15: [0-9a-f]*     0 FILE    LOCAL  DEFAULT  ABS .*shlib-app-1\.o
+    16: [0-9a-f]*     0 NOTYPE  LOCAL  DEFAULT   10 fish
+    17: [0-9a-f]*     8 OBJECT  LOCAL  DEFAULT   12 w
+    18: [0-9a-f]*     0 FILE    LOCAL  DEFAULT  ABS 
+    19: [0-9a-f]*     0 OBJECT  LOCAL  DEFAULT    7 _DYNAMIC
+    20: [0-9a-f]*     0 OBJECT  LOCAL  DEFAULT   11 _GLOBAL_OFFSET_TABLE_
+    21: [0-9a-f]*     0 NOTYPE  LOCAL  DEFAULT   11 __c6xabi_DSBT_BASE
+    22: [0-9a-f]*     4 OBJECT  GLOBAL DEFAULT   12 b
+    23: [0-9a-f]*     0 NOTYPE  WEAK   DEFAULT  UND g1
+    24: [0-9a-f]*     0 OBJECT  WEAK   DEFAULT  UND g2
+    25: [0-9a-f]*     0 FUNC    GLOBAL DEFAULT  UND sub0
+    26: [0-9a-f]*     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 288400b1bbc..d6cd5f39872 100644
--- a/ld/testsuite/ld-tic6x/shlib-app-1r.rd
+++ b/ld/testsuite/ld-tic6x/shlib-app-1r.rd
@@ -4,19 +4,19 @@  Section Headers:
   \[Nr\] Name              Type            Addr     Off    Size   ES Flg Lk Inf Al
   \[ 0\]                   NULL            00000000 000000 000000 00      0   0  0
   \[ 1\] \.hash             HASH            00008000 001000 000038 04   A  2   0  4
-  \[ 2\] \.dynsym           DYNSYM          00008038 001038 000090 10   A  3   6  4
-  \[ 3\] \.dynstr           STRTAB          000080c8 0010c8 00001d 00   A  0   0  1
-  \[ 4\] \.rela\.got         RELA            000080e8 0010e8 000018 0c  AI  2  10  4
-  \[ 5\] \.rela\.bss         RELA            00008100 001100 00000c 0c  AI  2  12  4
-  \[ 6\] \.dynamic          DYNAMIC         0000810c 00110c 0000b8 08  WA  3   0  4
+  \[ 2\] \.dynsym           DYNSYM          [0-9a-f]* [0-9a-f]* 000090 10   A  3   6  4
+  \[ 3\] \.dynstr           STRTAB          [0-9a-f]* [0-9a-f]* 00001d 00   A  0   0  1
+  \[ 4\] \.rela\.got         RELA            [0-9a-f]* [0-9a-f]* 000018 0c  AI  2  10  4
+  \[ 5\] \.rela\.bss         RELA            [0-9a-f]* [0-9a-f]* 00000c 0c  AI  2  12  4
+  \[ 6\] \.dynamic          DYNAMIC         [0-9a-f]* [0-9a-f]* 0000b8 08  WA  3   0  4
   \[ 7\] \.rela\.plt         RELA            10000000 002000 00000c 0c  AI  2  10  4
-  \[ 8\] \.plt              PROGBITS        10000020 002020 000040 18  AX  0   0 32
-  \[ 9\] \.text             PROGBITS        10000060 002060 000040 00  AX  0   0 32
-  \[10\] \.got              PROGBITS        100000a0 0020a0 000020 00  WA  0   0  4
-  \[11\] \.neardata         PROGBITS        100000c0 0020c0 000004 00  WA  0   0  4
-  \[12\] \.bss              NOBITS          100000c4 0020c4 000004 00  WA  0   0  4
-  \[13\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 0020c4 000019 00      0   0  1
-  \[14\] \.symtab           SYMTAB          00000000 0020e0 000170 10     15  20  4
+  \[ 8\] \.plt              PROGBITS        [0-9a-f]* [0-9a-f]* 000040 18  AX  0   0 32
+  \[ 9\] \.text             PROGBITS        [0-9a-f]* [0-9a-f]* 000040 00  AX  0   0 32
+  \[10\] \.got              PROGBITS        [0-9a-f]* [0-9a-f]* 000020 00  WA  0   0  4
+  \[11\] \.neardata         PROGBITS        [0-9a-f]* [0-9a-f]* 000004 00  WA  0   0  4
+  \[12\] \.bss              NOBITS          [0-9a-f]* [0-9a-f]* 000004 00  WA  0   0  4
+  \[13\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 [0-9a-f]* 000019 00      0   0  1
+  \[14\] \.symtab           SYMTAB          00000000 [0-9a-f]* 000170 10     15  20  4
   \[15\] \.strtab           STRTAB .*
   \[16\] \.shstrtab         STRTAB .*
 Key to Flags:
@@ -30,7 +30,7 @@  Program Headers:
   Type           Offset   VirtAddr   PhysAddr   FileSiz MemSiz  Flg Align
   LOAD           0x001000 0x00008000 0x00008000 0x001c4 0x001c4 RW  0x1000
   LOAD           0x002000 0x10000000 0x10000000 0x000c4 0x000c8 RWE 0x1000
-  DYNAMIC        0x00110c 0x0000810c 0x0000810c 0x000b8 0x000b8 RW  0x4
+  DYNAMIC        0x[0-9a-f]* 0x[0-9a-f]* 0x[0-9a-f]* 0x000b8 0x000b8 RW  0x4
   GNU_STACK      0x000000 0x00000000 0x00000000 0x00000 0x20000 RW  0x8
 
  Section to Segment mapping:
@@ -40,12 +40,12 @@  Program Headers:
    02     \.dynamic 
    03     
 
-Dynamic section at offset 0x110c contains 18 entries:
+Dynamic section at offset 0x[0-9a-f]* contains 18 entries:
   Tag        Type                         Name/Value
  0x00000001 \(NEEDED\)                     Shared library: \[tmpdir/libtestr\.so\]
  0x00000004 \(HASH\)                       0x8000
- 0x00000005 \(STRTAB\)                     0x80c8
- 0x00000006 \(SYMTAB\)                     0x8038
+ 0x00000005 \(STRTAB\)                     0x[0-9a-f]*
+ 0x00000006 \(SYMTAB\)                     0x[0-9a-f]*
  0x0000000a \(STRSZ\)                      29 \(bytes\)
  0x0000000b \(SYMENT\)                     16 \(bytes\)
  0x00000015 \(DEBUG\)                      0x0
@@ -53,7 +53,7 @@  Dynamic section at offset 0x110c contains 18 entries:
  0x00000002 \(PLTRELSZ\)                   12 \(bytes\)
  0x00000014 \(PLTREL\)                     RELA
  0x00000017 \(JMPREL\)                     0x10000000
- 0x00000007 \(RELA\)                       0x80e8
+ 0x00000007 \(RELA\)                       0x[0-9a-f]*
  0x00000008 \(RELASZ\)                     48 \(bytes\)
  0x00000009 \(RELAENT\)                    12 \(bytes\)
  0x70000000 \(C6000_DSBT_BASE\)            0x100000a0
@@ -61,53 +61,53 @@  Dynamic section at offset 0x110c contains 18 entries:
  0x70000003 \(C6000_DSBT_INDEX\)           0x0
  0x00000000 \(NULL\)                       0x0
 
-Relocation section '\.rela\.got' at offset 0x10e8 contains 2 entries:
+Relocation section '\.rela\.got' at offset 0x[0-9a-f]* contains 2 entries:
  Offset     Info    Type                Sym\. Value  Symbol's Name \+ Addend
-100000b8  00000601 R_C6000_ABS32          100000c0   b \+ 0
-100000bc  00000801 R_C6000_ABS32          100000c4   a \+ 0
+100000b8  [0-9a-f]* R_C6000_ABS32          100000c0   b \+ 0
+100000bc  [0-9a-f]* R_C6000_ABS32          100000c4   a \+ 0
 
-Relocation section '\.rela\.bss' at offset 0x1100 contains 1 entry:
+Relocation section '\.rela\.bss' at offset 0x[0-9a-f]* contains 1 entry:
  Offset     Info    Type                Sym\. Value  Symbol's Name \+ Addend
-100000c4  0000081a R_C6000_COPY           100000c4   a \+ 0
+100000c4  [0-9a-f]* R_C6000_COPY           100000c4   a \+ 0
 
 Relocation section '\.rela\.plt' at offset 0x2000 contains 1 entry:
  Offset     Info    Type                Sym\. Value  Symbol's Name \+ Addend
-100000b4  0000071b R_C6000_JUMP_SLOT      00000000   sub0 \+ 0
+100000b4  [0-9a-f]* R_C6000_JUMP_SLOT      00000000   sub0 \+ 0
 
 Symbol table '\.dynsym' contains 9 entries:
    Num:    Value  Size Type    Bind   Vis      Ndx Name
      0: 00000000     0 NOTYPE  LOCAL  DEFAULT  UND 
-     1: 10000020     0 SECTION LOCAL  DEFAULT    8.*
-     2: 10000060     0 SECTION LOCAL  DEFAULT    9.*
-     3: 100000a0     0 SECTION LOCAL  DEFAULT   10.*
-     4: 100000c0     0 SECTION LOCAL  DEFAULT   11.*
-     5: 100000c4     0 SECTION LOCAL  DEFAULT   12.*
-     6: 100000c0     4 OBJECT  GLOBAL DEFAULT   11 b
+     1: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    8.*
+     2: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    9.*
+     3: [0-9a-f]*     0 SECTION LOCAL  DEFAULT   10.*
+     4: [0-9a-f]*     0 SECTION LOCAL  DEFAULT   11.*
+     5: [0-9a-f]*     0 SECTION LOCAL  DEFAULT   12.*
+     6: [0-9a-f]*     4 OBJECT  GLOBAL DEFAULT   11 b
      7: 00000000     0 FUNC    GLOBAL DEFAULT  UND sub0
-     8: 100000c4     4 OBJECT  GLOBAL DEFAULT   12 a
+     8: [0-9a-f]*     4 OBJECT  GLOBAL DEFAULT   12 a
 
 Symbol table '\.symtab' contains 23 entries:
    Num:    Value  Size Type    Bind   Vis      Ndx Name
      0: 00000000     0 NOTYPE  LOCAL  DEFAULT  UND 
-     1: 00008000     0 SECTION LOCAL  DEFAULT    1.*
-     2: 00008038     0 SECTION LOCAL  DEFAULT    2.*
-     3: 000080c8     0 SECTION LOCAL  DEFAULT    3.*
-     4: 000080e8     0 SECTION LOCAL  DEFAULT    4.*
-     5: 00008100     0 SECTION LOCAL  DEFAULT    5.*
-     6: 0000810c     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: 00000000     0 FILE    LOCAL  DEFAULT  ABS .*shlib-app-1r\.o
-    15: 10000060     0 NOTYPE  LOCAL  DEFAULT    9 fish
-    16: 00000000     0 FILE    LOCAL  DEFAULT  ABS 
-    17: 0000810c     0 OBJECT  LOCAL  DEFAULT    6 _DYNAMIC
-    18: 100000ac     0 OBJECT  LOCAL  DEFAULT   10 _GLOBAL_OFFSET_TABLE_
-    19: 100000a0     0 NOTYPE  LOCAL  DEFAULT   10 __c6xabi_DSBT_BASE
-    20: 100000c0     4 OBJECT  GLOBAL DEFAULT   11 b
-    21: 00000000     0 FUNC    GLOBAL DEFAULT  UND sub0
-    22: 100000c4     4 OBJECT  GLOBAL DEFAULT   12 a
+     1: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    1.*
+     2: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    2.*
+     3: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    3.*
+     4: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    4.*
+     5: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    5.*
+     6: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    6.*
+     7: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    7.*
+     8: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    8.*
+     9: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    9.*
+    10: [0-9a-f]*     0 SECTION LOCAL  DEFAULT   10.*
+    11: [0-9a-f]*     0 SECTION LOCAL  DEFAULT   11.*
+    12: [0-9a-f]*     0 SECTION LOCAL  DEFAULT   12.*
+    13: [0-9a-f]*     0 SECTION LOCAL  DEFAULT   13.*
+    14: [0-9a-f]*     0 FILE    LOCAL  DEFAULT  ABS .*shlib-app-1r\.o
+    15: [0-9a-f]*     0 NOTYPE  LOCAL  DEFAULT    9 fish
+    16: [0-9a-f]*     0 FILE    LOCAL  DEFAULT  ABS 
+    17: [0-9a-f]*     0 OBJECT  LOCAL  DEFAULT    6 _DYNAMIC
+    18: [0-9a-f]*     0 OBJECT  LOCAL  DEFAULT   10 _GLOBAL_OFFSET_TABLE_
+    19: [0-9a-f]*     0 NOTYPE  LOCAL  DEFAULT   10 __c6xabi_DSBT_BASE
+    20: [0-9a-f]*     4 OBJECT  GLOBAL DEFAULT   11 b
+    21: [0-9a-f]*     0 FUNC    GLOBAL DEFAULT  UND sub0
+    22: [0-9a-f]*     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 058261db8ca..c3fb04002bb 100644
--- a/ld/testsuite/ld-tic6x/shlib-app-1rb.rd
+++ b/ld/testsuite/ld-tic6x/shlib-app-1rb.rd
@@ -4,19 +4,19 @@  Section Headers:
   \[Nr\] Name              Type            Addr     Off    Size   ES Flg Lk Inf Al
   \[ 0\]                   NULL            00000000 000000 000000 00      0   0  0
   \[ 1\] \.hash             HASH            00008000 001000 000038 04   A  2   0  4
-  \[ 2\] \.dynsym           DYNSYM          00008038 001038 000090 10   A  3   6  4
-  \[ 3\] \.dynstr           STRTAB          000080c8 0010c8 00001e 00   A  0   0  1
-  \[ 4\] \.rela\.got         RELA            000080e8 0010e8 000018 0c  AI  2  10  4
-  \[ 5\] \.rela\.bss         RELA            00008100 001100 00000c 0c  AI  2  12  4
-  \[ 6\] \.dynamic          DYNAMIC         0000810c 00110c 0000b8 08  WA  3   0  4
+  \[ 2\] \.dynsym           DYNSYM          [0-9a-f]* [0-9a-f]* 000090 10   A  3   6  4
+  \[ 3\] \.dynstr           STRTAB          [0-9a-f]* [0-9a-f]* 00001e 00   A  0   0  1
+  \[ 4\] \.rela\.got         RELA            [0-9a-f]* [0-9a-f]* 000018 0c  AI  2  10  4
+  \[ 5\] \.rela\.bss         RELA            [0-9a-f]* [0-9a-f]* 00000c 0c  AI  2  12  4
+  \[ 6\] \.dynamic          DYNAMIC         [0-9a-f]* [0-9a-f]* 0000b8 08  WA  3   0  4
   \[ 7\] \.rela\.plt         RELA            10000000 002000 00000c 0c  AI  2  10  4
-  \[ 8\] \.plt              PROGBITS        10000020 002020 000040 18  AX  0   0 32
-  \[ 9\] \.text             PROGBITS        10000060 002060 000040 00  AX  0   0 32
-  \[10\] \.got              PROGBITS        100000a0 0020a0 000020 00  WA  0   0  4
-  \[11\] \.neardata         PROGBITS        100000c0 0020c0 000004 00  WA  0   0  4
-  \[12\] \.bss              NOBITS          100000c4 0020c4 000004 00  WA  0   0  4
-  \[13\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 0020c4 000019 00      0   0  1
-  \[14\] \.symtab           SYMTAB          00000000 0020e0 000170 10     15  20  4
+  \[ 8\] \.plt              PROGBITS        [0-9a-f]* [0-9a-f]* 000040 18  AX  0   0 32
+  \[ 9\] \.text             PROGBITS        [0-9a-f]* [0-9a-f]* 000040 00  AX  0   0 32
+  \[10\] \.got              PROGBITS        [0-9a-f]* [0-9a-f]* 000020 00  WA  0   0  4
+  \[11\] \.neardata         PROGBITS        [0-9a-f]* [0-9a-f]* 000004 00  WA  0   0  4
+  \[12\] \.bss              NOBITS          [0-9a-f]* [0-9a-f]* 000004 00  WA  0   0  4
+  \[13\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 [0-9a-f]* 000019 00      0   0  1
+  \[14\] \.symtab           SYMTAB          00000000 [0-9a-f]* 000170 10     15  20  4
   \[15\] \.strtab           STRTAB .*
   \[16\] \.shstrtab         STRTAB .*
 Key to Flags:
@@ -30,7 +30,7 @@  Program Headers:
   Type           Offset   VirtAddr   PhysAddr   FileSiz MemSiz  Flg Align
   LOAD           0x001000 0x00008000 0x00008000 0x001c4 0x001c4 RW  0x1000
   LOAD           0x002000 0x10000000 0x10000000 0x000c4 0x000c8 RWE 0x1000
-  DYNAMIC        0x00110c 0x0000810c 0x0000810c 0x000b8 0x000b8 RW  0x4
+  DYNAMIC        0x[0-9a-f]* 0x[0-9a-f]* 0x[0-9a-f]* 0x000b8 0x000b8 RW  0x4
   GNU_STACK      0x000000 0x00000000 0x00000000 0x00000 0x20000 RW  0x8
 
  Section to Segment mapping:
@@ -40,12 +40,12 @@  Program Headers:
    02     \.dynamic 
    03     
 
-Dynamic section at offset 0x110c contains 18 entries:
+Dynamic section at offset 0x[0-9a-f]* contains 18 entries:
   Tag        Type                         Name/Value
  0x00000001 \(NEEDED\)                     Shared library: \[tmpdir/libtestrb\.so\]
  0x00000004 \(HASH\)                       0x8000
- 0x00000005 \(STRTAB\)                     0x80c8
- 0x00000006 \(SYMTAB\)                     0x8038
+ 0x00000005 \(STRTAB\)                     0x[0-9a-f]*
+ 0x00000006 \(SYMTAB\)                     0x[0-9a-f]*
  0x0000000a \(STRSZ\)                      30 \(bytes\)
  0x0000000b \(SYMENT\)                     16 \(bytes\)
  0x00000015 \(DEBUG\)                      0x0
@@ -53,7 +53,7 @@  Dynamic section at offset 0x110c contains 18 entries:
  0x00000002 \(PLTRELSZ\)                   12 \(bytes\)
  0x00000014 \(PLTREL\)                     RELA
  0x00000017 \(JMPREL\)                     0x10000000
- 0x00000007 \(RELA\)                       0x80e8
+ 0x00000007 \(RELA\)                       0x[0-9a-f]*
  0x00000008 \(RELASZ\)                     48 \(bytes\)
  0x00000009 \(RELAENT\)                    12 \(bytes\)
  0x70000000 \(C6000_DSBT_BASE\)            0x100000a0
@@ -61,53 +61,53 @@  Dynamic section at offset 0x110c contains 18 entries:
  0x70000003 \(C6000_DSBT_INDEX\)           0x0
  0x00000000 \(NULL\)                       0x0
 
-Relocation section '\.rela\.got' at offset 0x10e8 contains 2 entries:
+Relocation section '\.rela\.got' at offset 0x[0-9a-f]* contains 2 entries:
  Offset     Info    Type                Sym\. Value  Symbol's Name \+ Addend
-100000b8  00000601 R_C6000_ABS32          100000c0   b \+ 0
-100000bc  00000801 R_C6000_ABS32          100000c4   a \+ 0
+100000b8  [0-9a-f]* R_C6000_ABS32          100000c0   b \+ 0
+100000bc  [0-9a-f]* R_C6000_ABS32          100000c4   a \+ 0
 
-Relocation section '\.rela\.bss' at offset 0x1100 contains 1 entry:
+Relocation section '\.rela\.bss' at offset 0x[0-9a-f]* contains 1 entry:
  Offset     Info    Type                Sym\. Value  Symbol's Name \+ Addend
-100000c4  0000081a R_C6000_COPY           100000c4   a \+ 0
+100000c4  [0-9a-f]* R_C6000_COPY           100000c4   a \+ 0
 
 Relocation section '\.rela\.plt' at offset 0x2000 contains 1 entry:
  Offset     Info    Type                Sym\. Value  Symbol's Name \+ Addend
-100000b4  0000071b R_C6000_JUMP_SLOT      00000000   sub0 \+ 0
+100000b4  [0-9a-f]* R_C6000_JUMP_SLOT      00000000   sub0 \+ 0
 
 Symbol table '\.dynsym' contains 9 entries:
    Num:    Value  Size Type    Bind   Vis      Ndx Name
      0: 00000000     0 NOTYPE  LOCAL  DEFAULT  UND 
-     1: 10000020     0 SECTION LOCAL  DEFAULT    8.*
-     2: 10000060     0 SECTION LOCAL  DEFAULT    9.*
-     3: 100000a0     0 SECTION LOCAL  DEFAULT   10.*
-     4: 100000c0     0 SECTION LOCAL  DEFAULT   11.*
-     5: 100000c4     0 SECTION LOCAL  DEFAULT   12.*
-     6: 100000c0     4 OBJECT  GLOBAL DEFAULT   11 b
+     1: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    8.*
+     2: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    9.*
+     3: [0-9a-f]*     0 SECTION LOCAL  DEFAULT   10.*
+     4: [0-9a-f]*     0 SECTION LOCAL  DEFAULT   11.*
+     5: [0-9a-f]*     0 SECTION LOCAL  DEFAULT   12.*
+     6: [0-9a-f]*     4 OBJECT  GLOBAL DEFAULT   11 b
      7: 00000000     0 FUNC    GLOBAL DEFAULT  UND sub0
-     8: 100000c4     4 OBJECT  GLOBAL DEFAULT   12 a
+     8: [0-9a-f]*     4 OBJECT  GLOBAL DEFAULT   12 a
 
 Symbol table '\.symtab' contains 23 entries:
    Num:    Value  Size Type    Bind   Vis      Ndx Name
      0: 00000000     0 NOTYPE  LOCAL  DEFAULT  UND 
-     1: 00008000     0 SECTION LOCAL  DEFAULT    1.*
-     2: 00008038     0 SECTION LOCAL  DEFAULT    2.*
-     3: 000080c8     0 SECTION LOCAL  DEFAULT    3.*
-     4: 000080e8     0 SECTION LOCAL  DEFAULT    4.*
-     5: 00008100     0 SECTION LOCAL  DEFAULT    5.*
-     6: 0000810c     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: 00000000     0 FILE    LOCAL  DEFAULT  ABS .*shlib-app-1r\.o
-    15: 10000060     0 NOTYPE  LOCAL  DEFAULT    9 fish
-    16: 00000000     0 FILE    LOCAL  DEFAULT  ABS 
-    17: 0000810c     0 OBJECT  LOCAL  DEFAULT    6 _DYNAMIC
-    18: 100000ac     0 OBJECT  LOCAL  DEFAULT   10 _GLOBAL_OFFSET_TABLE_
-    19: 100000a0     0 NOTYPE  LOCAL  DEFAULT   10 __c6xabi_DSBT_BASE
-    20: 100000c0     4 OBJECT  GLOBAL DEFAULT   11 b
-    21: 00000000     0 FUNC    GLOBAL DEFAULT  UND sub0
-    22: 100000c4     4 OBJECT  GLOBAL DEFAULT   12 a
+     1: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    1.*
+     2: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    2.*
+     3: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    3.*
+     4: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    4.*
+     5: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    5.*
+     6: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    6.*
+     7: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    7.*
+     8: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    8.*
+     9: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    9.*
+    10: [0-9a-f]*     0 SECTION LOCAL  DEFAULT   10.*
+    11: [0-9a-f]*     0 SECTION LOCAL  DEFAULT   11.*
+    12: [0-9a-f]*     0 SECTION LOCAL  DEFAULT   12.*
+    13: [0-9a-f]*     0 SECTION LOCAL  DEFAULT   13.*
+    14: [0-9a-f]*     0 FILE    LOCAL  DEFAULT  ABS .*shlib-app-1r\.o
+    15: [0-9a-f]*     0 NOTYPE  LOCAL  DEFAULT    9 fish
+    16: [0-9a-f]*     0 FILE    LOCAL  DEFAULT  ABS 
+    17: [0-9a-f]*     0 OBJECT  LOCAL  DEFAULT    6 _DYNAMIC
+    18: [0-9a-f]*     0 OBJECT  LOCAL  DEFAULT   10 _GLOBAL_OFFSET_TABLE_
+    19: [0-9a-f]*     0 NOTYPE  LOCAL  DEFAULT   10 __c6xabi_DSBT_BASE
+    20: [0-9a-f]*     4 OBJECT  GLOBAL DEFAULT   11 b
+    21: [0-9a-f]*     0 FUNC    GLOBAL DEFAULT  UND sub0
+    22: [0-9a-f]*     4 OBJECT  GLOBAL DEFAULT   12 a
diff --git a/ld/testsuite/ld-tic6x/static-app-1.rd b/ld/testsuite/ld-tic6x/static-app-1.rd
index 6cb86cd4b75..cbb887c8114 100644
--- a/ld/testsuite/ld-tic6x/static-app-1.rd
+++ b/ld/testsuite/ld-tic6x/static-app-1.rd
@@ -3,18 +3,18 @@  There are 15 section headers, starting at offset .*:
 Section Headers:
   \[Nr\] Name              Type            Addr     Off    Size   ES Flg Lk Inf Al
   \[ 0\]                   NULL            00000000 000000 000000 00      0   0  0
-  \[ 1\] \.hash             HASH            00008000 001000 000038 04   A  2   0  4
-  \[ 2\] \.dynsym           DYNSYM          00008038 001038 000090 10   A  3   6  4
-  \[ 3\] \.dynstr           STRTAB          000080c8 0010c8 00000a 00   A  0   0  1
-  \[ 4\] \.rela\.got         RELA            000080d4 0010d4 000024 0c  AI  2   8  4
-  \[ 5\] \.rela\.neardata    RELA            000080f8 0010f8 000030 0c  AI  2   9  4
-  \[ 6\] \.dynamic          DYNAMIC         00008128 001128 000090 08  WA  3   0  4
+  \[ 1\] \.hash             HASH            00008000 001000 000034 04   A  2   0  4
+  \[ 2\] \.dynsym           DYNSYM          [0-9a-f]* [0-9a-f]* 000080 10   A  3   5  4
+  \[ 3\] \.dynstr           STRTAB          [0-9a-f]* [0-9a-f]* 000008 00   A  0   0  1
+  \[ 4\] \.rela\.got         RELA            [0-9a-f]* [0-9a-f]* 000024 0c  AI  2   8  4
+  \[ 5\] \.rela\.neardata    RELA            [0-9a-f]* [0-9a-f]* 000030 0c  AI  2   9  4
+  \[ 6\] \.dynamic          DYNAMIC         [0-9a-f]* [0-9a-f]* 000090 08  WA  3   0  4
   \[ 7\] \.text             PROGBITS        10000000 002000 0000c0 00  AX  0   0 32
-  \[ 8\] \.got              PROGBITS        100000c0 0020c0 000020 00  WA  0   0  4
-  \[ 9\] \.neardata         PROGBITS        100000e0 0020e0 000014 00  WA  0   0  4
-  \[10\] \.bss              NOBITS          100000f4 0020f4 000004 00  WA  0   0  4
-  \[11\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 0020f4 000019 00      0   0  1
-  \[12\] \.symtab           SYMTAB          00000000 002110 0001c0 10     13  22  4
+  \[ 8\] \.got              PROGBITS        [0-9a-f]* [0-9a-f]* 000020 00  WA  0   0  4
+  \[ 9\] \.neardata         PROGBITS        [0-9a-f]* [0-9a-f]* 000014 00  WA  0   0  4
+  \[10\] \.bss              NOBITS          [0-9a-f]* [0-9a-f]* 000004 00  WA  0   0  4
+  \[11\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 [0-9a-f]* 000019 00      0   0  1
+  \[12\] \.symtab           SYMTAB          00000000 [0-9a-f]* 0001c0 10     13  22  4
   \[13\] \.strtab           STRTAB .*
   \[14\] \.shstrtab         STRTAB .*
 Key to Flags:
@@ -26,9 +26,9 @@  There are 4 program headers, starting at offset 52
 
 Program Headers:
   Type           Offset   VirtAddr   PhysAddr   FileSiz MemSiz  Flg Align
-  LOAD           0x001000 0x00008000 0x00008000 0x001b8 0x001b8 RW  0x1000
+  LOAD           0x001000 0x00008000 0x00008000 0x001a0 0x001a0 RW  0x1000
   LOAD           0x002000 0x10000000 0x10000000 0x000f4 0x000f8 RWE 0x1000
-  DYNAMIC        0x001128 0x00008128 0x00008128 0x00090 0x00090 RW  0x4
+  DYNAMIC        0x[0-9a-f]* 0x[0-9a-f]* 0x[0-9a-f]* 0x00090 0x00090 RW  0x4
   GNU_STACK      0x000000 0x00000000 0x00000000 0x00000 0x20000 RW  0x8
 
  Section to Segment mapping:
@@ -38,15 +38,15 @@  Program Headers:
    02     \.dynamic 
    03     
 
-Dynamic section at offset 0x1128 contains 13 entries:
+Dynamic section at offset 0x[0-9a-f]* contains 13 entries:
   Tag        Type                         Name/Value
  0x00000004 \(HASH\)                       0x8000
- 0x00000005 \(STRTAB\)                     0x80c8
- 0x00000006 \(SYMTAB\)                     0x8038
- 0x0000000a \(STRSZ\)                      10 \(bytes\)
+ 0x00000005 \(STRTAB\)                     0x[0-9a-f]*
+ 0x00000006 \(SYMTAB\)                     0x[0-9a-f]*
+ 0x0000000a \(STRSZ\)                      8 \(bytes\)
  0x0000000b \(SYMENT\)                     16 \(bytes\)
  0x00000015 \(DEBUG\)                      0x0
- 0x00000007 \(RELA\)                       0x80d4
+ 0x00000007 \(RELA\)                       0x[0-9a-f]*
  0x00000008 \(RELASZ\)                     84 \(bytes\)
  0x00000009 \(RELAENT\)                    12 \(bytes\)
  0x70000000 \(C6000_DSBT_BASE\)            0x100000c0
@@ -54,58 +54,57 @@  Dynamic section at offset 0x1128 contains 13 entries:
  0x70000003 \(C6000_DSBT_INDEX\)           0x0
  0x00000000 \(NULL\)                       0x0
 
-Relocation section '\.rela\.got' at offset 0x10d4 contains 3 entries:
+Relocation section '\.rela\.got' at offset 0x[0-9a-f]* contains 3 entries:
  Offset     Info    Type                Sym\. Value  Symbol's Name \+ Addend
-100000d8  00000401 R_C6000_ABS32          100000f4   \.bss \+ 0
-100000d4  00000601 R_C6000_ABS32          100000e8   b \+ 0
-100000dc  00000801 R_C6000_ABS32          100000e0   a \+ 0
+100000d8  [0-9a-f]* R_C6000_ABS32          100000f4   \.bss \+ 0
+100000d4  [0-9a-f]* R_C6000_ABS32          100000e8   b \+ 0
+100000dc  [0-9a-f]* R_C6000_ABS32          100000e0   a \+ 0
 
-Relocation section '\.rela\.neardata' at offset 0x10f8 contains 4 entries:
+Relocation section '\.rela\.neardata' at offset 0x[0-9a-f]* contains 4 entries:
  Offset     Info    Type                Sym\. Value  Symbol's Name \+ Addend
-100000e0  00000101 R_C6000_ABS32          10000000   \.text \+ 8
-100000e4  00000701 R_C6000_ABS32          00000000   g1 \+ 0
-100000ec  00000701 R_C6000_ABS32          00000000   g1 \+ 0
-100000f0  00000301 R_C6000_ABS32          100000e0   \.neardata \+ 4
+100000e0  [0-9a-f]* R_C6000_ABS32          10000000   \.text \+ 8
+100000e4  [0-9a-f]* R_C6000_ABS32          00000000   g1 \+ 0
+100000ec  [0-9a-f]* R_C6000_ABS32          00000000   g1 \+ 0
+100000f0  [0-9a-f]* R_C6000_ABS32          100000e0   \.neardata \+ 4
 
-Symbol table '\.dynsym' contains 9 entries:
+Symbol table '\.dynsym' contains 8 entries:
    Num:    Value  Size Type    Bind   Vis      Ndx Name
      0: 00000000     0 NOTYPE  LOCAL  DEFAULT  UND 
-     1: 10000000     0 SECTION LOCAL  DEFAULT    7.*
-     2: 100000c0     0 SECTION LOCAL  DEFAULT    8.*
-     3: 100000e0     0 SECTION LOCAL  DEFAULT    9.*
-     4: 100000f4     0 SECTION LOCAL  DEFAULT   10.*
-     5: 100000f4     4 OBJECT  LOCAL  DEFAULT   10 c
-     6: 100000e8     4 OBJECT  GLOBAL DEFAULT    9 b
-     7: 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
-     8: 100000e0     4 OBJECT  GLOBAL DEFAULT    9 a
+     1: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    7.*
+     2: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    8.*
+     3: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    9.*
+     4: [0-9a-f]*     0 SECTION LOCAL  DEFAULT   10.*
+     5: [0-9a-f]*     4 OBJECT  GLOBAL DEFAULT    9 b
+     6: 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
+     7: [0-9a-f]*     4 OBJECT  GLOBAL DEFAULT    9 a
 
 Symbol table '\.symtab' contains 28 entries:
    Num:    Value  Size Type    Bind   Vis      Ndx Name
      0: 00000000     0 NOTYPE  LOCAL  DEFAULT  UND 
-     1: 00008000     0 SECTION LOCAL  DEFAULT    1.*
-     2: 00008038     0 SECTION LOCAL  DEFAULT    2.*
-     3: 000080c8     0 SECTION LOCAL  DEFAULT    3.*
-     4: 000080d4     0 SECTION LOCAL  DEFAULT    4.*
-     5: 000080f8     0 SECTION LOCAL  DEFAULT    5.*
-     6: 00008128     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: 00000000     0 FILE    LOCAL  DEFAULT  ABS .*shlib-1\.o
-    13: 10000000     0 FUNC    LOCAL  HIDDEN     7 sub1
-    14: 00000000     0 FILE    LOCAL  DEFAULT  ABS .*shlib-app-1\.o
-    15: 10000080     0 NOTYPE  LOCAL  DEFAULT    7 fish
-    16: 100000ec     8 OBJECT  LOCAL  DEFAULT    9 w
-    17: 00000000     0 FILE    LOCAL  DEFAULT  ABS 
-    18: 00008128     0 OBJECT  LOCAL  DEFAULT    6 _DYNAMIC
-    19: 100000f4     4 OBJECT  LOCAL  DEFAULT   10 c
-    20: 100000cc     0 OBJECT  LOCAL  DEFAULT    8 _GLOBAL_OFFSET_TABLE_
-    21: 100000c0     0 NOTYPE  LOCAL  DEFAULT    8 __c6xabi_DSBT_BASE
-    22: 100000e8     4 OBJECT  GLOBAL DEFAULT    9 b
-    23: 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
-    24: 100000e4     4 OBJECT  GLOBAL DEFAULT    9 g2
-    25: 10000008    52 FUNC    GLOBAL DEFAULT    7 sub0
-    26: 100000e0     4 OBJECT  GLOBAL DEFAULT    9 a
-    27: 10000040    52 FUNC    GLOBAL DEFAULT    7 sub
+     1: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    1.*
+     2: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    2.*
+     3: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    3.*
+     4: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    4.*
+     5: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    5.*
+     6: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    6.*
+     7: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    7.*
+     8: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    8.*
+     9: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    9.*
+    10: [0-9a-f]*     0 SECTION LOCAL  DEFAULT   10.*
+    11: [0-9a-f]*     0 SECTION LOCAL  DEFAULT   11.*
+    12: [0-9a-f]*     0 FILE    LOCAL  DEFAULT  ABS .*shlib-1\.o
+    13: [0-9a-f]*     0 FUNC    LOCAL  HIDDEN     7 sub1
+    14: [0-9a-f]*     0 FILE    LOCAL  DEFAULT  ABS .*shlib-app-1\.o
+    15: [0-9a-f]*     0 NOTYPE  LOCAL  DEFAULT    7 fish
+    16: [0-9a-f]*     8 OBJECT  LOCAL  DEFAULT    9 w
+    17: [0-9a-f]*     0 FILE    LOCAL  DEFAULT  ABS 
+    18: [0-9a-f]*     0 OBJECT  LOCAL  DEFAULT    6 _DYNAMIC
+    19: [0-9a-f]*     4 OBJECT  LOCAL  DEFAULT   10 c
+    20: [0-9a-f]*     0 OBJECT  LOCAL  DEFAULT    8 _GLOBAL_OFFSET_TABLE_
+    21: [0-9a-f]*     0 NOTYPE  LOCAL  DEFAULT    8 __c6xabi_DSBT_BASE
+    22: [0-9a-f]*     4 OBJECT  GLOBAL DEFAULT    9 b
+    23: [0-9a-f]*     0 NOTYPE  WEAK   DEFAULT  UND g1
+    24: [0-9a-f]*     4 OBJECT  GLOBAL DEFAULT    9 g2
+    25: [0-9a-f]*    52 FUNC    GLOBAL DEFAULT    7 sub0
+    26: [0-9a-f]*     4 OBJECT  GLOBAL DEFAULT    9 a
+    27: [0-9a-f]*    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 6cb86cd4b75..cbb887c8114 100644
--- a/ld/testsuite/ld-tic6x/static-app-1b.rd
+++ b/ld/testsuite/ld-tic6x/static-app-1b.rd
@@ -3,18 +3,18 @@  There are 15 section headers, starting at offset .*:
 Section Headers:
   \[Nr\] Name              Type            Addr     Off    Size   ES Flg Lk Inf Al
   \[ 0\]                   NULL            00000000 000000 000000 00      0   0  0
-  \[ 1\] \.hash             HASH            00008000 001000 000038 04   A  2   0  4
-  \[ 2\] \.dynsym           DYNSYM          00008038 001038 000090 10   A  3   6  4
-  \[ 3\] \.dynstr           STRTAB          000080c8 0010c8 00000a 00   A  0   0  1
-  \[ 4\] \.rela\.got         RELA            000080d4 0010d4 000024 0c  AI  2   8  4
-  \[ 5\] \.rela\.neardata    RELA            000080f8 0010f8 000030 0c  AI  2   9  4
-  \[ 6\] \.dynamic          DYNAMIC         00008128 001128 000090 08  WA  3   0  4
+  \[ 1\] \.hash             HASH            00008000 001000 000034 04   A  2   0  4
+  \[ 2\] \.dynsym           DYNSYM          [0-9a-f]* [0-9a-f]* 000080 10   A  3   5  4
+  \[ 3\] \.dynstr           STRTAB          [0-9a-f]* [0-9a-f]* 000008 00   A  0   0  1
+  \[ 4\] \.rela\.got         RELA            [0-9a-f]* [0-9a-f]* 000024 0c  AI  2   8  4
+  \[ 5\] \.rela\.neardata    RELA            [0-9a-f]* [0-9a-f]* 000030 0c  AI  2   9  4
+  \[ 6\] \.dynamic          DYNAMIC         [0-9a-f]* [0-9a-f]* 000090 08  WA  3   0  4
   \[ 7\] \.text             PROGBITS        10000000 002000 0000c0 00  AX  0   0 32
-  \[ 8\] \.got              PROGBITS        100000c0 0020c0 000020 00  WA  0   0  4
-  \[ 9\] \.neardata         PROGBITS        100000e0 0020e0 000014 00  WA  0   0  4
-  \[10\] \.bss              NOBITS          100000f4 0020f4 000004 00  WA  0   0  4
-  \[11\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 0020f4 000019 00      0   0  1
-  \[12\] \.symtab           SYMTAB          00000000 002110 0001c0 10     13  22  4
+  \[ 8\] \.got              PROGBITS        [0-9a-f]* [0-9a-f]* 000020 00  WA  0   0  4
+  \[ 9\] \.neardata         PROGBITS        [0-9a-f]* [0-9a-f]* 000014 00  WA  0   0  4
+  \[10\] \.bss              NOBITS          [0-9a-f]* [0-9a-f]* 000004 00  WA  0   0  4
+  \[11\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 [0-9a-f]* 000019 00      0   0  1
+  \[12\] \.symtab           SYMTAB          00000000 [0-9a-f]* 0001c0 10     13  22  4
   \[13\] \.strtab           STRTAB .*
   \[14\] \.shstrtab         STRTAB .*
 Key to Flags:
@@ -26,9 +26,9 @@  There are 4 program headers, starting at offset 52
 
 Program Headers:
   Type           Offset   VirtAddr   PhysAddr   FileSiz MemSiz  Flg Align
-  LOAD           0x001000 0x00008000 0x00008000 0x001b8 0x001b8 RW  0x1000
+  LOAD           0x001000 0x00008000 0x00008000 0x001a0 0x001a0 RW  0x1000
   LOAD           0x002000 0x10000000 0x10000000 0x000f4 0x000f8 RWE 0x1000
-  DYNAMIC        0x001128 0x00008128 0x00008128 0x00090 0x00090 RW  0x4
+  DYNAMIC        0x[0-9a-f]* 0x[0-9a-f]* 0x[0-9a-f]* 0x00090 0x00090 RW  0x4
   GNU_STACK      0x000000 0x00000000 0x00000000 0x00000 0x20000 RW  0x8
 
  Section to Segment mapping:
@@ -38,15 +38,15 @@  Program Headers:
    02     \.dynamic 
    03     
 
-Dynamic section at offset 0x1128 contains 13 entries:
+Dynamic section at offset 0x[0-9a-f]* contains 13 entries:
   Tag        Type                         Name/Value
  0x00000004 \(HASH\)                       0x8000
- 0x00000005 \(STRTAB\)                     0x80c8
- 0x00000006 \(SYMTAB\)                     0x8038
- 0x0000000a \(STRSZ\)                      10 \(bytes\)
+ 0x00000005 \(STRTAB\)                     0x[0-9a-f]*
+ 0x00000006 \(SYMTAB\)                     0x[0-9a-f]*
+ 0x0000000a \(STRSZ\)                      8 \(bytes\)
  0x0000000b \(SYMENT\)                     16 \(bytes\)
  0x00000015 \(DEBUG\)                      0x0
- 0x00000007 \(RELA\)                       0x80d4
+ 0x00000007 \(RELA\)                       0x[0-9a-f]*
  0x00000008 \(RELASZ\)                     84 \(bytes\)
  0x00000009 \(RELAENT\)                    12 \(bytes\)
  0x70000000 \(C6000_DSBT_BASE\)            0x100000c0
@@ -54,58 +54,57 @@  Dynamic section at offset 0x1128 contains 13 entries:
  0x70000003 \(C6000_DSBT_INDEX\)           0x0
  0x00000000 \(NULL\)                       0x0
 
-Relocation section '\.rela\.got' at offset 0x10d4 contains 3 entries:
+Relocation section '\.rela\.got' at offset 0x[0-9a-f]* contains 3 entries:
  Offset     Info    Type                Sym\. Value  Symbol's Name \+ Addend
-100000d8  00000401 R_C6000_ABS32          100000f4   \.bss \+ 0
-100000d4  00000601 R_C6000_ABS32          100000e8   b \+ 0
-100000dc  00000801 R_C6000_ABS32          100000e0   a \+ 0
+100000d8  [0-9a-f]* R_C6000_ABS32          100000f4   \.bss \+ 0
+100000d4  [0-9a-f]* R_C6000_ABS32          100000e8   b \+ 0
+100000dc  [0-9a-f]* R_C6000_ABS32          100000e0   a \+ 0
 
-Relocation section '\.rela\.neardata' at offset 0x10f8 contains 4 entries:
+Relocation section '\.rela\.neardata' at offset 0x[0-9a-f]* contains 4 entries:
  Offset     Info    Type                Sym\. Value  Symbol's Name \+ Addend
-100000e0  00000101 R_C6000_ABS32          10000000   \.text \+ 8
-100000e4  00000701 R_C6000_ABS32          00000000   g1 \+ 0
-100000ec  00000701 R_C6000_ABS32          00000000   g1 \+ 0
-100000f0  00000301 R_C6000_ABS32          100000e0   \.neardata \+ 4
+100000e0  [0-9a-f]* R_C6000_ABS32          10000000   \.text \+ 8
+100000e4  [0-9a-f]* R_C6000_ABS32          00000000   g1 \+ 0
+100000ec  [0-9a-f]* R_C6000_ABS32          00000000   g1 \+ 0
+100000f0  [0-9a-f]* R_C6000_ABS32          100000e0   \.neardata \+ 4
 
-Symbol table '\.dynsym' contains 9 entries:
+Symbol table '\.dynsym' contains 8 entries:
    Num:    Value  Size Type    Bind   Vis      Ndx Name
      0: 00000000     0 NOTYPE  LOCAL  DEFAULT  UND 
-     1: 10000000     0 SECTION LOCAL  DEFAULT    7.*
-     2: 100000c0     0 SECTION LOCAL  DEFAULT    8.*
-     3: 100000e0     0 SECTION LOCAL  DEFAULT    9.*
-     4: 100000f4     0 SECTION LOCAL  DEFAULT   10.*
-     5: 100000f4     4 OBJECT  LOCAL  DEFAULT   10 c
-     6: 100000e8     4 OBJECT  GLOBAL DEFAULT    9 b
-     7: 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
-     8: 100000e0     4 OBJECT  GLOBAL DEFAULT    9 a
+     1: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    7.*
+     2: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    8.*
+     3: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    9.*
+     4: [0-9a-f]*     0 SECTION LOCAL  DEFAULT   10.*
+     5: [0-9a-f]*     4 OBJECT  GLOBAL DEFAULT    9 b
+     6: 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
+     7: [0-9a-f]*     4 OBJECT  GLOBAL DEFAULT    9 a
 
 Symbol table '\.symtab' contains 28 entries:
    Num:    Value  Size Type    Bind   Vis      Ndx Name
      0: 00000000     0 NOTYPE  LOCAL  DEFAULT  UND 
-     1: 00008000     0 SECTION LOCAL  DEFAULT    1.*
-     2: 00008038     0 SECTION LOCAL  DEFAULT    2.*
-     3: 000080c8     0 SECTION LOCAL  DEFAULT    3.*
-     4: 000080d4     0 SECTION LOCAL  DEFAULT    4.*
-     5: 000080f8     0 SECTION LOCAL  DEFAULT    5.*
-     6: 00008128     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: 00000000     0 FILE    LOCAL  DEFAULT  ABS .*shlib-1\.o
-    13: 10000000     0 FUNC    LOCAL  HIDDEN     7 sub1
-    14: 00000000     0 FILE    LOCAL  DEFAULT  ABS .*shlib-app-1\.o
-    15: 10000080     0 NOTYPE  LOCAL  DEFAULT    7 fish
-    16: 100000ec     8 OBJECT  LOCAL  DEFAULT    9 w
-    17: 00000000     0 FILE    LOCAL  DEFAULT  ABS 
-    18: 00008128     0 OBJECT  LOCAL  DEFAULT    6 _DYNAMIC
-    19: 100000f4     4 OBJECT  LOCAL  DEFAULT   10 c
-    20: 100000cc     0 OBJECT  LOCAL  DEFAULT    8 _GLOBAL_OFFSET_TABLE_
-    21: 100000c0     0 NOTYPE  LOCAL  DEFAULT    8 __c6xabi_DSBT_BASE
-    22: 100000e8     4 OBJECT  GLOBAL DEFAULT    9 b
-    23: 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
-    24: 100000e4     4 OBJECT  GLOBAL DEFAULT    9 g2
-    25: 10000008    52 FUNC    GLOBAL DEFAULT    7 sub0
-    26: 100000e0     4 OBJECT  GLOBAL DEFAULT    9 a
-    27: 10000040    52 FUNC    GLOBAL DEFAULT    7 sub
+     1: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    1.*
+     2: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    2.*
+     3: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    3.*
+     4: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    4.*
+     5: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    5.*
+     6: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    6.*
+     7: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    7.*
+     8: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    8.*
+     9: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    9.*
+    10: [0-9a-f]*     0 SECTION LOCAL  DEFAULT   10.*
+    11: [0-9a-f]*     0 SECTION LOCAL  DEFAULT   11.*
+    12: [0-9a-f]*     0 FILE    LOCAL  DEFAULT  ABS .*shlib-1\.o
+    13: [0-9a-f]*     0 FUNC    LOCAL  HIDDEN     7 sub1
+    14: [0-9a-f]*     0 FILE    LOCAL  DEFAULT  ABS .*shlib-app-1\.o
+    15: [0-9a-f]*     0 NOTYPE  LOCAL  DEFAULT    7 fish
+    16: [0-9a-f]*     8 OBJECT  LOCAL  DEFAULT    9 w
+    17: [0-9a-f]*     0 FILE    LOCAL  DEFAULT  ABS 
+    18: [0-9a-f]*     0 OBJECT  LOCAL  DEFAULT    6 _DYNAMIC
+    19: [0-9a-f]*     4 OBJECT  LOCAL  DEFAULT   10 c
+    20: [0-9a-f]*     0 OBJECT  LOCAL  DEFAULT    8 _GLOBAL_OFFSET_TABLE_
+    21: [0-9a-f]*     0 NOTYPE  LOCAL  DEFAULT    8 __c6xabi_DSBT_BASE
+    22: [0-9a-f]*     4 OBJECT  GLOBAL DEFAULT    9 b
+    23: [0-9a-f]*     0 NOTYPE  WEAK   DEFAULT  UND g1
+    24: [0-9a-f]*     4 OBJECT  GLOBAL DEFAULT    9 g2
+    25: [0-9a-f]*    52 FUNC    GLOBAL DEFAULT    7 sub0
+    26: [0-9a-f]*     4 OBJECT  GLOBAL DEFAULT    9 a
+    27: [0-9a-f]*    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 8d9d11937b4..9b6d21169d1 100644
--- a/ld/testsuite/ld-tic6x/static-app-1r.rd
+++ b/ld/testsuite/ld-tic6x/static-app-1r.rd
@@ -3,18 +3,18 @@  There are 15 section headers, starting at offset .*:
 Section Headers:
   \[Nr\] Name              Type            Addr     Off    Size   ES Flg Lk Inf Al
   \[ 0\]                   NULL            00000000 000000 000000 00      0   0  0
-  \[ 1\] \.hash             HASH            00008000 001000 000038 04   A  2   0  4
-  \[ 2\] \.dynsym           DYNSYM          00008038 001038 000090 10   A  3   6  4
-  \[ 3\] \.dynstr           STRTAB          000080c8 0010c8 00000a 00   A  0   0  1
-  \[ 4\] \.rela\.got         RELA            000080d4 0010d4 000024 0c  AI  2   8  4
-  \[ 5\] \.rela\.neardata    RELA            000080f8 0010f8 000018 0c  AI  2   9  4
-  \[ 6\] \.dynamic          DYNAMIC         00008110 001110 000090 08  WA  3   0  4
+  \[ 1\] \.hash             HASH            00008000 001000 000034 04   A  2   0  4
+  \[ 2\] \.dynsym           DYNSYM          [0-9a-f]* [0-9a-f]* 000080 10   A  3   5  4
+  \[ 3\] \.dynstr           STRTAB          [0-9a-f]* [0-9a-f]* 000008 00   A  0   0  1
+  \[ 4\] \.rela\.got         RELA            [0-9a-f]* [0-9a-f]* 000024 0c  AI  2   8  4
+  \[ 5\] \.rela\.neardata    RELA            [0-9a-f]* [0-9a-f]* 000018 0c  AI  2   9  4
+  \[ 6\] \.dynamic          DYNAMIC         [0-9a-f]* [0-9a-f]* 000090 08  WA  3   0  4
   \[ 7\] \.text             PROGBITS        10000000 002000 0000c0 00  AX  0   0 32
-  \[ 8\] \.got              PROGBITS        100000c0 0020c0 000020 00  WA  0   0  4
-  \[ 9\] \.neardata         PROGBITS        100000e0 0020e0 00000c 00  WA  0   0  4
-  \[10\] \.bss              NOBITS          100000ec 0020ec 000004 00  WA  0   0  4
-  \[11\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 0020ec 000019 00      0   0  1
-  \[12\] \.symtab           SYMTAB          00000000 002108 0001b0 10     13  21  4
+  \[ 8\] \.got              PROGBITS        [0-9a-f]* [0-9a-f]* 000020 00  WA  0   0  4
+  \[ 9\] \.neardata         PROGBITS        [0-9a-f]* [0-9a-f]* 00000c 00  WA  0   0  4
+  \[10\] \.bss              NOBITS          [0-9a-f]* [0-9a-f]* 000004 00  WA  0   0  4
+  \[11\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 [0-9a-f]* 000019 00      0   0  1
+  \[12\] \.symtab           SYMTAB          00000000 [0-9a-f]* 0001b0 10     13  21  4
   \[13\] \.strtab           STRTAB .*
   \[14\] \.shstrtab         STRTAB .*
 Key to Flags:
@@ -26,9 +26,9 @@  There are 4 program headers, starting at offset 52
 
 Program Headers:
   Type           Offset   VirtAddr   PhysAddr   FileSiz MemSiz  Flg Align
-  LOAD           0x001000 0x00008000 0x00008000 0x001a0 0x001a0 RW  0x1000
+  LOAD           0x001000 0x00008000 0x00008000 0x00188 0x00188 RW  0x1000
   LOAD           0x002000 0x10000000 0x10000000 0x000ec 0x000f0 RWE 0x1000
-  DYNAMIC        0x001110 0x00008110 0x00008110 0x00090 0x00090 RW  0x4
+  DYNAMIC        0x[0-9a-f]* 0x[0-9a-f]* 0x[0-9a-f]* 0x00090 0x00090 RW  0x4
   GNU_STACK      0x000000 0x00000000 0x00000000 0x00000 0x20000 RW  0x8
 
  Section to Segment mapping:
@@ -38,15 +38,15 @@  Program Headers:
    02     \.dynamic 
    03     
 
-Dynamic section at offset 0x1110 contains 13 entries:
+Dynamic section at offset 0x[0-9a-f]* contains 13 entries:
   Tag        Type                         Name/Value
  0x00000004 \(HASH\)                       0x8000
- 0x00000005 \(STRTAB\)                     0x80c8
- 0x00000006 \(SYMTAB\)                     0x8038
- 0x0000000a \(STRSZ\)                      10 \(bytes\)
+ 0x00000005 \(STRTAB\)                     0x[0-9a-f]*
+ 0x00000006 \(SYMTAB\)                     0x[0-9a-f]*
+ 0x0000000a \(STRSZ\)                      8 \(bytes\)
  0x0000000b \(SYMENT\)                     16 \(bytes\)
  0x00000015 \(DEBUG\)                      0x0
- 0x00000007 \(RELA\)                       0x80d4
+ 0x00000007 \(RELA\)                       0x[0-9a-f]*
  0x00000008 \(RELASZ\)                     60 \(bytes\)
  0x00000009 \(RELAENT\)                    12 \(bytes\)
  0x70000000 \(C6000_DSBT_BASE\)            0x100000c0
@@ -54,55 +54,54 @@  Dynamic section at offset 0x1110 contains 13 entries:
  0x70000003 \(C6000_DSBT_INDEX\)           0x0
  0x00000000 \(NULL\)                       0x0
 
-Relocation section '\.rela\.got' at offset 0x10d4 contains 3 entries:
+Relocation section '\.rela\.got' at offset 0x[0-9a-f]* contains 3 entries:
  Offset     Info    Type                Sym\. Value  Symbol's Name \+ Addend
-100000d8  00000401 R_C6000_ABS32          100000ec   \.bss \+ 0
-100000d4  00000601 R_C6000_ABS32          100000e8   b \+ 0
-100000dc  00000801 R_C6000_ABS32          100000e0   a \+ 0
+100000d8  [0-9a-f]* R_C6000_ABS32          100000ec   \.bss \+ 0
+100000d4  [0-9a-f]* R_C6000_ABS32          100000e8   b \+ 0
+100000dc  [0-9a-f]* R_C6000_ABS32          100000e0   a \+ 0
 
-Relocation section '\.rela\.neardata' at offset 0x10f8 contains 2 entries:
+Relocation section '\.rela\.neardata' at offset 0x[0-9a-f]* contains 2 entries:
  Offset     Info    Type                Sym\. Value  Symbol's Name \+ Addend
-100000e0  00000101 R_C6000_ABS32          10000000   \.text \+ 8
-100000e4  00000701 R_C6000_ABS32          00000000   g1 \+ 0
+100000e0  [0-9a-f]* R_C6000_ABS32          10000000   \.text \+ 8
+100000e4  [0-9a-f]* R_C6000_ABS32          00000000   g1 \+ 0
 
-Symbol table '\.dynsym' contains 9 entries:
+Symbol table '\.dynsym' contains 8 entries:
    Num:    Value  Size Type    Bind   Vis      Ndx Name
      0: 00000000     0 NOTYPE  LOCAL  DEFAULT  UND 
-     1: 10000000     0 SECTION LOCAL  DEFAULT    7.*
-     2: 100000c0     0 SECTION LOCAL  DEFAULT    8.*
-     3: 100000e0     0 SECTION LOCAL  DEFAULT    9.*
-     4: 100000ec     0 SECTION LOCAL  DEFAULT   10.*
-     5: 100000ec     4 OBJECT  LOCAL  DEFAULT   10 c
-     6: 100000e8     4 OBJECT  GLOBAL DEFAULT    9 b
-     7: 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
-     8: 100000e0     4 OBJECT  GLOBAL DEFAULT    9 a
+     1: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    7.*
+     2: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    8.*
+     3: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    9.*
+     4: [0-9a-f]*     0 SECTION LOCAL  DEFAULT   10.*
+     5: [0-9a-f]*     4 OBJECT  GLOBAL DEFAULT    9 b
+     6: 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
+     7: [0-9a-f]*     4 OBJECT  GLOBAL DEFAULT    9 a
 
 Symbol table '\.symtab' contains 27 entries:
    Num:    Value  Size Type    Bind   Vis      Ndx Name
      0: 00000000     0 NOTYPE  LOCAL  DEFAULT  UND 
-     1: 00008000     0 SECTION LOCAL  DEFAULT    1.*
-     2: 00008038     0 SECTION LOCAL  DEFAULT    2.*
-     3: 000080c8     0 SECTION LOCAL  DEFAULT    3.*
-     4: 000080d4     0 SECTION LOCAL  DEFAULT    4.*
-     5: 000080f8     0 SECTION LOCAL  DEFAULT    5.*
-     6: 00008110     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: 00000000     0 FILE    LOCAL  DEFAULT  ABS .*shlib-1\.o
-    13: 10000000     0 FUNC    LOCAL  HIDDEN     7 sub1
-    14: 00000000     0 FILE    LOCAL  DEFAULT  ABS .*shlib-app-1r\.o
-    15: 10000080     0 NOTYPE  LOCAL  DEFAULT    7 fish
-    16: 00000000     0 FILE    LOCAL  DEFAULT  ABS 
-    17: 00008110     0 OBJECT  LOCAL  DEFAULT    6 _DYNAMIC
-    18: 100000ec     4 OBJECT  LOCAL  DEFAULT   10 c
-    19: 100000cc     0 OBJECT  LOCAL  DEFAULT    8 _GLOBAL_OFFSET_TABLE_
-    20: 100000c0     0 NOTYPE  LOCAL  DEFAULT    8 __c6xabi_DSBT_BASE
-    21: 100000e8     4 OBJECT  GLOBAL DEFAULT    9 b
-    22: 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
-    23: 100000e4     4 OBJECT  GLOBAL DEFAULT    9 g2
-    24: 10000008    52 FUNC    GLOBAL DEFAULT    7 sub0
-    25: 100000e0     4 OBJECT  GLOBAL DEFAULT    9 a
-    26: 10000040    52 FUNC    GLOBAL DEFAULT    7 sub
+     1: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    1.*
+     2: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    2.*
+     3: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    3.*
+     4: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    4.*
+     5: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    5.*
+     6: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    6.*
+     7: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    7.*
+     8: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    8.*
+     9: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    9.*
+    10: [0-9a-f]*     0 SECTION LOCAL  DEFAULT   10.*
+    11: [0-9a-f]*     0 SECTION LOCAL  DEFAULT   11.*
+    12: [0-9a-f]*     0 FILE    LOCAL  DEFAULT  ABS .*shlib-1\.o
+    13: [0-9a-f]*     0 FUNC    LOCAL  HIDDEN     7 sub1
+    14: [0-9a-f]*     0 FILE    LOCAL  DEFAULT  ABS .*shlib-app-1r\.o
+    15: [0-9a-f]*     0 NOTYPE  LOCAL  DEFAULT    7 fish
+    16: [0-9a-f]*     0 FILE    LOCAL  DEFAULT  ABS 
+    17: [0-9a-f]*     0 OBJECT  LOCAL  DEFAULT    6 _DYNAMIC
+    18: [0-9a-f]*     4 OBJECT  LOCAL  DEFAULT   10 c
+    19: [0-9a-f]*     0 OBJECT  LOCAL  DEFAULT    8 _GLOBAL_OFFSET_TABLE_
+    20: [0-9a-f]*     0 NOTYPE  LOCAL  DEFAULT    8 __c6xabi_DSBT_BASE
+    21: [0-9a-f]*     4 OBJECT  GLOBAL DEFAULT    9 b
+    22: [0-9a-f]*     0 NOTYPE  WEAK   DEFAULT  UND g1
+    23: [0-9a-f]*     4 OBJECT  GLOBAL DEFAULT    9 g2
+    24: [0-9a-f]*    52 FUNC    GLOBAL DEFAULT    7 sub0
+    25: [0-9a-f]*     4 OBJECT  GLOBAL DEFAULT    9 a
+    26: [0-9a-f]*    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 8d9d11937b4..9b6d21169d1 100644
--- a/ld/testsuite/ld-tic6x/static-app-1rb.rd
+++ b/ld/testsuite/ld-tic6x/static-app-1rb.rd
@@ -3,18 +3,18 @@  There are 15 section headers, starting at offset .*:
 Section Headers:
   \[Nr\] Name              Type            Addr     Off    Size   ES Flg Lk Inf Al
   \[ 0\]                   NULL            00000000 000000 000000 00      0   0  0
-  \[ 1\] \.hash             HASH            00008000 001000 000038 04   A  2   0  4
-  \[ 2\] \.dynsym           DYNSYM          00008038 001038 000090 10   A  3   6  4
-  \[ 3\] \.dynstr           STRTAB          000080c8 0010c8 00000a 00   A  0   0  1
-  \[ 4\] \.rela\.got         RELA            000080d4 0010d4 000024 0c  AI  2   8  4
-  \[ 5\] \.rela\.neardata    RELA            000080f8 0010f8 000018 0c  AI  2   9  4
-  \[ 6\] \.dynamic          DYNAMIC         00008110 001110 000090 08  WA  3   0  4
+  \[ 1\] \.hash             HASH            00008000 001000 000034 04   A  2   0  4
+  \[ 2\] \.dynsym           DYNSYM          [0-9a-f]* [0-9a-f]* 000080 10   A  3   5  4
+  \[ 3\] \.dynstr           STRTAB          [0-9a-f]* [0-9a-f]* 000008 00   A  0   0  1
+  \[ 4\] \.rela\.got         RELA            [0-9a-f]* [0-9a-f]* 000024 0c  AI  2   8  4
+  \[ 5\] \.rela\.neardata    RELA            [0-9a-f]* [0-9a-f]* 000018 0c  AI  2   9  4
+  \[ 6\] \.dynamic          DYNAMIC         [0-9a-f]* [0-9a-f]* 000090 08  WA  3   0  4
   \[ 7\] \.text             PROGBITS        10000000 002000 0000c0 00  AX  0   0 32
-  \[ 8\] \.got              PROGBITS        100000c0 0020c0 000020 00  WA  0   0  4
-  \[ 9\] \.neardata         PROGBITS        100000e0 0020e0 00000c 00  WA  0   0  4
-  \[10\] \.bss              NOBITS          100000ec 0020ec 000004 00  WA  0   0  4
-  \[11\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 0020ec 000019 00      0   0  1
-  \[12\] \.symtab           SYMTAB          00000000 002108 0001b0 10     13  21  4
+  \[ 8\] \.got              PROGBITS        [0-9a-f]* [0-9a-f]* 000020 00  WA  0   0  4
+  \[ 9\] \.neardata         PROGBITS        [0-9a-f]* [0-9a-f]* 00000c 00  WA  0   0  4
+  \[10\] \.bss              NOBITS          [0-9a-f]* [0-9a-f]* 000004 00  WA  0   0  4
+  \[11\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 [0-9a-f]* 000019 00      0   0  1
+  \[12\] \.symtab           SYMTAB          00000000 [0-9a-f]* 0001b0 10     13  21  4
   \[13\] \.strtab           STRTAB .*
   \[14\] \.shstrtab         STRTAB .*
 Key to Flags:
@@ -26,9 +26,9 @@  There are 4 program headers, starting at offset 52
 
 Program Headers:
   Type           Offset   VirtAddr   PhysAddr   FileSiz MemSiz  Flg Align
-  LOAD           0x001000 0x00008000 0x00008000 0x001a0 0x001a0 RW  0x1000
+  LOAD           0x001000 0x00008000 0x00008000 0x00188 0x00188 RW  0x1000
   LOAD           0x002000 0x10000000 0x10000000 0x000ec 0x000f0 RWE 0x1000
-  DYNAMIC        0x001110 0x00008110 0x00008110 0x00090 0x00090 RW  0x4
+  DYNAMIC        0x[0-9a-f]* 0x[0-9a-f]* 0x[0-9a-f]* 0x00090 0x00090 RW  0x4
   GNU_STACK      0x000000 0x00000000 0x00000000 0x00000 0x20000 RW  0x8
 
  Section to Segment mapping:
@@ -38,15 +38,15 @@  Program Headers:
    02     \.dynamic 
    03     
 
-Dynamic section at offset 0x1110 contains 13 entries:
+Dynamic section at offset 0x[0-9a-f]* contains 13 entries:
   Tag        Type                         Name/Value
  0x00000004 \(HASH\)                       0x8000
- 0x00000005 \(STRTAB\)                     0x80c8
- 0x00000006 \(SYMTAB\)                     0x8038
- 0x0000000a \(STRSZ\)                      10 \(bytes\)
+ 0x00000005 \(STRTAB\)                     0x[0-9a-f]*
+ 0x00000006 \(SYMTAB\)                     0x[0-9a-f]*
+ 0x0000000a \(STRSZ\)                      8 \(bytes\)
  0x0000000b \(SYMENT\)                     16 \(bytes\)
  0x00000015 \(DEBUG\)                      0x0
- 0x00000007 \(RELA\)                       0x80d4
+ 0x00000007 \(RELA\)                       0x[0-9a-f]*
  0x00000008 \(RELASZ\)                     60 \(bytes\)
  0x00000009 \(RELAENT\)                    12 \(bytes\)
  0x70000000 \(C6000_DSBT_BASE\)            0x100000c0
@@ -54,55 +54,54 @@  Dynamic section at offset 0x1110 contains 13 entries:
  0x70000003 \(C6000_DSBT_INDEX\)           0x0
  0x00000000 \(NULL\)                       0x0
 
-Relocation section '\.rela\.got' at offset 0x10d4 contains 3 entries:
+Relocation section '\.rela\.got' at offset 0x[0-9a-f]* contains 3 entries:
  Offset     Info    Type                Sym\. Value  Symbol's Name \+ Addend
-100000d8  00000401 R_C6000_ABS32          100000ec   \.bss \+ 0
-100000d4  00000601 R_C6000_ABS32          100000e8   b \+ 0
-100000dc  00000801 R_C6000_ABS32          100000e0   a \+ 0
+100000d8  [0-9a-f]* R_C6000_ABS32          100000ec   \.bss \+ 0
+100000d4  [0-9a-f]* R_C6000_ABS32          100000e8   b \+ 0
+100000dc  [0-9a-f]* R_C6000_ABS32          100000e0   a \+ 0
 
-Relocation section '\.rela\.neardata' at offset 0x10f8 contains 2 entries:
+Relocation section '\.rela\.neardata' at offset 0x[0-9a-f]* contains 2 entries:
  Offset     Info    Type                Sym\. Value  Symbol's Name \+ Addend
-100000e0  00000101 R_C6000_ABS32          10000000   \.text \+ 8
-100000e4  00000701 R_C6000_ABS32          00000000   g1 \+ 0
+100000e0  [0-9a-f]* R_C6000_ABS32          10000000   \.text \+ 8
+100000e4  [0-9a-f]* R_C6000_ABS32          00000000   g1 \+ 0
 
-Symbol table '\.dynsym' contains 9 entries:
+Symbol table '\.dynsym' contains 8 entries:
    Num:    Value  Size Type    Bind   Vis      Ndx Name
      0: 00000000     0 NOTYPE  LOCAL  DEFAULT  UND 
-     1: 10000000     0 SECTION LOCAL  DEFAULT    7.*
-     2: 100000c0     0 SECTION LOCAL  DEFAULT    8.*
-     3: 100000e0     0 SECTION LOCAL  DEFAULT    9.*
-     4: 100000ec     0 SECTION LOCAL  DEFAULT   10.*
-     5: 100000ec     4 OBJECT  LOCAL  DEFAULT   10 c
-     6: 100000e8     4 OBJECT  GLOBAL DEFAULT    9 b
-     7: 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
-     8: 100000e0     4 OBJECT  GLOBAL DEFAULT    9 a
+     1: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    7.*
+     2: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    8.*
+     3: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    9.*
+     4: [0-9a-f]*     0 SECTION LOCAL  DEFAULT   10.*
+     5: [0-9a-f]*     4 OBJECT  GLOBAL DEFAULT    9 b
+     6: 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
+     7: [0-9a-f]*     4 OBJECT  GLOBAL DEFAULT    9 a
 
 Symbol table '\.symtab' contains 27 entries:
    Num:    Value  Size Type    Bind   Vis      Ndx Name
      0: 00000000     0 NOTYPE  LOCAL  DEFAULT  UND 
-     1: 00008000     0 SECTION LOCAL  DEFAULT    1.*
-     2: 00008038     0 SECTION LOCAL  DEFAULT    2.*
-     3: 000080c8     0 SECTION LOCAL  DEFAULT    3.*
-     4: 000080d4     0 SECTION LOCAL  DEFAULT    4.*
-     5: 000080f8     0 SECTION LOCAL  DEFAULT    5.*
-     6: 00008110     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: 00000000     0 FILE    LOCAL  DEFAULT  ABS .*shlib-1\.o
-    13: 10000000     0 FUNC    LOCAL  HIDDEN     7 sub1
-    14: 00000000     0 FILE    LOCAL  DEFAULT  ABS .*shlib-app-1r\.o
-    15: 10000080     0 NOTYPE  LOCAL  DEFAULT    7 fish
-    16: 00000000     0 FILE    LOCAL  DEFAULT  ABS 
-    17: 00008110     0 OBJECT  LOCAL  DEFAULT    6 _DYNAMIC
-    18: 100000ec     4 OBJECT  LOCAL  DEFAULT   10 c
-    19: 100000cc     0 OBJECT  LOCAL  DEFAULT    8 _GLOBAL_OFFSET_TABLE_
-    20: 100000c0     0 NOTYPE  LOCAL  DEFAULT    8 __c6xabi_DSBT_BASE
-    21: 100000e8     4 OBJECT  GLOBAL DEFAULT    9 b
-    22: 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
-    23: 100000e4     4 OBJECT  GLOBAL DEFAULT    9 g2
-    24: 10000008    52 FUNC    GLOBAL DEFAULT    7 sub0
-    25: 100000e0     4 OBJECT  GLOBAL DEFAULT    9 a
-    26: 10000040    52 FUNC    GLOBAL DEFAULT    7 sub
+     1: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    1.*
+     2: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    2.*
+     3: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    3.*
+     4: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    4.*
+     5: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    5.*
+     6: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    6.*
+     7: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    7.*
+     8: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    8.*
+     9: [0-9a-f]*     0 SECTION LOCAL  DEFAULT    9.*
+    10: [0-9a-f]*     0 SECTION LOCAL  DEFAULT   10.*
+    11: [0-9a-f]*     0 SECTION LOCAL  DEFAULT   11.*
+    12: [0-9a-f]*     0 FILE    LOCAL  DEFAULT  ABS .*shlib-1\.o
+    13: [0-9a-f]*     0 FUNC    LOCAL  HIDDEN     7 sub1
+    14: [0-9a-f]*     0 FILE    LOCAL  DEFAULT  ABS .*shlib-app-1r\.o
+    15: [0-9a-f]*     0 NOTYPE  LOCAL  DEFAULT    7 fish
+    16: [0-9a-f]*     0 FILE    LOCAL  DEFAULT  ABS 
+    17: [0-9a-f]*     0 OBJECT  LOCAL  DEFAULT    6 _DYNAMIC
+    18: [0-9a-f]*     4 OBJECT  LOCAL  DEFAULT   10 c
+    19: [0-9a-f]*     0 OBJECT  LOCAL  DEFAULT    8 _GLOBAL_OFFSET_TABLE_
+    20: [0-9a-f]*     0 NOTYPE  LOCAL  DEFAULT    8 __c6xabi_DSBT_BASE
+    21: [0-9a-f]*     4 OBJECT  GLOBAL DEFAULT    9 b
+    22: [0-9a-f]*     0 NOTYPE  WEAK   DEFAULT  UND g1
+    23: [0-9a-f]*     4 OBJECT  GLOBAL DEFAULT    9 g2
+    24: [0-9a-f]*    52 FUNC    GLOBAL DEFAULT    7 sub0
+    25: [0-9a-f]*     4 OBJECT  GLOBAL DEFAULT    9 a
+    26: [0-9a-f]*    52 FUNC    GLOBAL DEFAULT    7 sub