This is the mail archive of the binutils@sourceware.org mailing list for the binutils project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: [PATCH] ld: Hide symbols defined by HIDDEN/PROVIDE_HIDDEN


On Mon, May 21, 2018 at 6:26 PM, Alan Modra <amodra@gmail.com> wrote:
> On Sun, May 20, 2018 at 09:02:24PM -0700, H.J. Lu wrote:
>> On Sun, May 20, 2018 at 7:11 PM, Alan Modra <amodra@gmail.com> wrote:
>> > FAIL: ld-i386/pr23194
>> >
>> > and a similar result for ld-x86-64/pr23194
>>
>> I can't reproduce it on native x86-64 nor i686.
>
> Hmm, the failures disappeared when testing with your latest patch.  I
> suppose it might have been fixed by one of the other x86 patches that
> have gone in recently.
>
>> Here is the updated patch which avoids making forced local symbol
>> dynamic.  There are no regressions on native x86-64 and i686 as
>> well as for cross ppc-linux and ppc64-linux.
>
> OK.  It still feels like a hack to me, but trying to run
> record_link_assignment earlier will probably have its own set of
> problems.
>

I am checking in my patch together with this patch to adjust tic6x tests
for removing local symbol, __c6xabi_DSBT_BASE, defined by
PROVIDE_HIDDEN in linker script from dynamic symbol table.


-- 
H.J.
From b7cd4f836fb98a2d5f5f12ec5be77e38f9797bf0 Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Mon, 21 May 2018 20:30:18 -0700
Subject: [PATCH] ld: Adjust tic6x tests

Adjust tic6x tests for removing local symbol, __c6xabi_DSBT_BASE, defined
by PROVIDE_HIDDEN in linker script from dynamic symbol table.

	PR ld/23201
	* testsuite/ld-tic6x/shlib-1.rd: Adjusted.
	* testsuite/ld-tic6x/shlib-1b.rd: Likewise.
	* testsuite/ld-tic6x/shlib-1r.rd: Likewise.
	* testsuite/ld-tic6x/shlib-1rb.rd: Likewise.
	* testsuite/ld-tic6x/shlib-app-1.rd: Likewise.
	* 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/shlib-noindex.rd: Likewise.
	* testsuite/ld-tic6x/static-app-1.rd: Likewise.
	* testsuite/ld-tic6x/static-app-1b.rd: Likewise.
	* testsuite/ld-tic6x/static-app-1r.rd: Likewise.
	* testsuite/ld-tic6x/static-app-1rb.rd: Likewise.
---
 ld/testsuite/ld-tic6x/shlib-1.rd        | 119 +++++++++++-----------
 ld/testsuite/ld-tic6x/shlib-1b.rd       | 119 +++++++++++-----------
 ld/testsuite/ld-tic6x/shlib-1r.rd       | 119 +++++++++++-----------
 ld/testsuite/ld-tic6x/shlib-1rb.rd      | 119 +++++++++++-----------
 ld/testsuite/ld-tic6x/shlib-app-1.rd    | 121 +++++++++++-----------
 ld/testsuite/ld-tic6x/shlib-app-1b.rd   | 121 +++++++++++-----------
 ld/testsuite/ld-tic6x/shlib-app-1r.rd   | 101 ++++++++++---------
 ld/testsuite/ld-tic6x/shlib-app-1rb.rd  | 101 ++++++++++---------
 ld/testsuite/ld-tic6x/shlib-noindex.rd  | 127 ++++++++++++------------
 ld/testsuite/ld-tic6x/static-app-1.rd   | 111 ++++++++++-----------
 ld/testsuite/ld-tic6x/static-app-1b.rd  | 111 ++++++++++-----------
 ld/testsuite/ld-tic6x/static-app-1r.rd  | 107 ++++++++++----------
 ld/testsuite/ld-tic6x/static-app-1rb.rd | 107 ++++++++++----------
 13 files changed, 735 insertions(+), 748 deletions(-)

diff --git a/ld/testsuite/ld-tic6x/shlib-1.rd b/ld/testsuite/ld-tic6x/shlib-1.rd
index 77ec3d739f..469bce9e34 100644
--- a/ld/testsuite/ld-tic6x/shlib-1.rd
+++ b/ld/testsuite/ld-tic6x/shlib-1.rd
@@ -3,12 +3,12 @@ There are 17 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 000048 04   A  2   0  4
-  \[ 2\] \.dynsym           DYNSYM          00008048 001048 0000d0 10   A  3   7  4
-  \[ 3\] \.dynstr           STRTAB          00008118 001118 000025 00   A  0   0  1
-  \[ 4\] \.rela\.got         RELA            00008140 001140 000024 0c  AI  2  10  4
-  \[ 5\] \.rela\.neardata    RELA            00008164 001164 000018 0c  AI  2  11  4
-  \[ 6\] \.dynamic          DYNAMIC         0000817c 00117c 0000a8 08  WA  3   0  4
+  \[ 1\] \.hash             HASH            00008000 001000 000044 04   A  2   0  4
+  \[ 2\] \.dynsym           DYNSYM          00008044 001044 0000c0 10   A  3   6  4
+  \[ 3\] \.dynstr           STRTAB          00008104 001104 000012 00   A  0   0  1
+  \[ 4\] \.rela\.got         RELA            00008118 001118 000024 0c  AI  2  10  4
+  \[ 5\] \.rela\.neardata    RELA            0000813c 00113c 000018 0c  AI  2  11  4
+  \[ 6\] \.dynamic          DYNAMIC         00008154 001154 0000a8 08  WA  3   0  4
   \[ 7\] \.rela\.plt         RELA            10000000 002000 000018 0c  AI  2  10  4
   \[ 8\] \.plt              PROGBITS        10000020 002020 000060 18  AX  0   0 32
   \[ 9\] \.text             PROGBITS        10000080 002080 000080 00  AX  0   0 32
@@ -16,9 +16,9 @@ Section Headers:
   \[11\] \.neardata         PROGBITS        10000128 002128 000008 00  WA  0   0  4
   \[12\] \.bss              NOBITS          10000130 002130 000004 00  WA  0   0  4
   \[13\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 002130 000019 00      0   0  1
-  \[14\] \.symtab           SYMTAB          00000000 [0-9a-f]+ [0-9a-f]+ 10     15  [0-9]+  4
-  \[15\] \.strtab           STRTAB          00000000 [0-9a-f]+ [0-9a-f]+ 00      0   0  1
-  \[16\] \.shstrtab         STRTAB          00000000 [0-9a-f]+ 00007b 00      0   0  1
+  \[14\] \.symtab           SYMTAB          00000000 00214c 0001b0 10     15  21  4
+  \[15\] \.strtab           STRTAB          00000000 0022fc 00005c 00      0   0  1
+  \[16\] \.shstrtab         STRTAB          00000000 002358 00007b 00      0   0  1
 Key to Flags:
 #...
 
@@ -28,9 +28,9 @@ There are 4 program headers, starting at offset 52
 
 Program Headers:
   Type           Offset   VirtAddr   PhysAddr   FileSiz MemSiz  Flg Align
-  LOAD           0x001000 0x00008000 0x00008000 0x00224 0x00224 RW  0x1000
+  LOAD           0x001000 0x00008000 0x00008000 0x001fc 0x001fc RW  0x1000
   LOAD           0x002000 0x10000000 0x10000000 0x00130 0x00134 RWE 0x1000
-  DYNAMIC        0x00117c 0x0000817c 0x0000817c 0x000a8 0x000a8 RW  0x4
+  DYNAMIC        0x001154 0x00008154 0x00008154 0x000a8 0x000a8 RW  0x4
   GNU_STACK      0x000000 0x00000000 0x00000000 0x00000 0x20000 RWE 0x8
 
  Section to Segment mapping:
@@ -40,12 +40,12 @@ Program Headers:
    02     \.dynamic 
    03     
 
-Dynamic section at offset 0x117c contains 16 entries:
+Dynamic section at offset 0x1154 contains 16 entries:
   Tag        Type                         Name/Value
  0x00000004 \(HASH\)                       0x8000
- 0x00000005 \(STRTAB\)                     0x8118
- 0x00000006 \(SYMTAB\)                     0x8048
- 0x0000000a \(STRSZ\)                      37 \(bytes\)
+ 0x00000005 \(STRTAB\)                     0x8104
+ 0x00000006 \(SYMTAB\)                     0x8044
+ 0x0000000a \(STRSZ\)                      18 \(bytes\)
  0x0000000b \(SYMENT\)                     16 \(bytes\)
  0x70000000 \(C6000_DSBT_BASE\)            0x10000100
  0x70000001 \(C6000_DSBT_SIZE\)            0x3
@@ -54,28 +54,28 @@ Dynamic section at offset 0x117c contains 16 entries:
  0x00000002 \(PLTRELSZ\)                   24 \(bytes\)
  0x00000014 \(PLTREL\)                     RELA
  0x00000017 \(JMPREL\)                     0x10000000
- 0x00000007 \(RELA\)                       0x8140
+ 0x00000007 \(RELA\)                       0x8118
  0x00000008 \(RELASZ\)                     84 \(bytes\)
  0x00000009 \(RELAENT\)                    12 \(bytes\)
  0x00000000 \(NULL\)                       0x0
 
-Relocation section '\.rela\.got' at offset 0x1140 contains 3 entries:
+Relocation section '\.rela\.got' at offset 0x1118 contains 3 entries:
  Offset     Info    Type                Sym\. Value  Symbol's Name \+ Addend
 10000120  00000501 R_C6000_ABS32          10000130   \.bss \+ 0
-1000011c  00000701 R_C6000_ABS32          00000000   b \+ 0
-10000124  00000b01 R_C6000_ABS32          10000128   a \+ 0
+1000011c  00000601 R_C6000_ABS32          00000000   b \+ 0
+10000124  00000a01 R_C6000_ABS32          10000128   a \+ 0
 
-Relocation section '\.rela\.neardata' at offset 0x1164 contains 2 entries:
+Relocation section '\.rela\.neardata' at offset 0x113c contains 2 entries:
  Offset     Info    Type                Sym\. Value  Symbol's Name \+ Addend
-10000128  00000a01 R_C6000_ABS32          10000088   sub0 \+ 0
-1000012c  00000801 R_C6000_ABS32          00000000   g1 \+ 0
+10000128  00000901 R_C6000_ABS32          10000088   sub0 \+ 0
+1000012c  00000701 R_C6000_ABS32          00000000   g1 \+ 0
 
 Relocation section '\.rela\.plt' at offset 0x2000 contains 2 entries:
  Offset     Info    Type                Sym\. Value  Symbol's Name \+ Addend
-10000114  00000a1b R_C6000_JUMP_SLOT      10000088   sub0 \+ 0
-10000118  00000c1b R_C6000_JUMP_SLOT      100000c0   sub \+ 0
+10000114  0000091b R_C6000_JUMP_SLOT      10000088   sub0 \+ 0
+10000118  00000b1b R_C6000_JUMP_SLOT      100000c0   sub \+ 0
 
-Symbol table '\.dynsym' contains 13 entries:
+Symbol table '\.dynsym' contains 12 entries:
    Num:    Value  Size Type    Bind   Vis      Ndx Name
      0: 00000000     0 NOTYPE  LOCAL  DEFAULT  UND 
      1: 10000020     0 SECTION LOCAL  DEFAULT    8 
@@ -83,40 +83,39 @@ Symbol table '\.dynsym' contains 13 entries:
      3: 10000100     0 SECTION LOCAL  DEFAULT   10 
      4: 10000128     0 SECTION LOCAL  DEFAULT   11 
      5: 10000130     0 SECTION LOCAL  DEFAULT   12 
-     6: 10000100     0 NOTYPE  LOCAL  DEFAULT   10 __c6xabi_DSBT_BASE
-     7: 00000000     0 NOTYPE  WEAK   DEFAULT  UND b
-     8: 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
-     9: 1000012c     4 OBJECT  GLOBAL DEFAULT   11 g2
-    10: 10000088    52 FUNC    GLOBAL DEFAULT    9 sub0
-    11: 10000128     4 OBJECT  GLOBAL DEFAULT   11 a
-    12: 100000c0    52 FUNC    GLOBAL DEFAULT    9 sub
+     6: 00000000     0 NOTYPE  WEAK   DEFAULT  UND b
+     7: 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
+     8: 1000012c     4 OBJECT  GLOBAL DEFAULT   11 g2
+     9: 10000088    52 FUNC    GLOBAL DEFAULT    9 sub0
+    10: 10000128     4 OBJECT  GLOBAL DEFAULT   11 a
+    11: 100000c0    52 FUNC    GLOBAL DEFAULT    9 sub
 
-Symbol table '\.symtab' contains [0-9]+ entries:
+Symbol table '\.symtab' contains 27 entries:
    Num:    Value  Size Type    Bind   Vis      Ndx Name
-.* 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
-.* 00000000     0 FILE    LOCAL  DEFAULT  ABS 
-.* 0000817c     0 OBJECT  LOCAL  DEFAULT  ABS _DYNAMIC
-.* 10000130     4 OBJECT  LOCAL  DEFAULT   12 c
-.* 1000010c     0 OBJECT  LOCAL  DEFAULT  ABS _GLOBAL_OFFSET_TABLE_
-.* 10000100     0 NOTYPE  LOCAL  DEFAULT   10 __c6xabi_DSBT_BASE
-.* 00000000     0 NOTYPE  WEAK   DEFAULT  UND b
-.* 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
+     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: 00008118     0 SECTION LOCAL  DEFAULT    4 
+     5: 0000813c     0 SECTION LOCAL  DEFAULT    5 
+     6: 00008154     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: 00000000     0 FILE    LOCAL  DEFAULT  ABS tmpdir/shlib-1\.o
+    15: 10000080     0 FUNC    LOCAL  HIDDEN     9 sub1
+    16: 00000000     0 FILE    LOCAL  DEFAULT  ABS 
+    17: 00008154     0 OBJECT  LOCAL  DEFAULT  ABS _DYNAMIC
+    18: 10000130     4 OBJECT  LOCAL  DEFAULT   12 c
+    19: 1000010c     0 OBJECT  LOCAL  DEFAULT  ABS _GLOBAL_OFFSET_TABLE_
+    20: 10000100     0 NOTYPE  LOCAL  DEFAULT   10 __c6xabi_DSBT_BASE
+    21: 00000000     0 NOTYPE  WEAK   DEFAULT  UND b
+    22: 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
+    23: 1000012c     4 OBJECT  GLOBAL DEFAULT   11 g2
+    24: 10000088    52 FUNC    GLOBAL DEFAULT    9 sub0
+    25: 10000128     4 OBJECT  GLOBAL DEFAULT   11 a
+    26: 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 77ec3d739f..469bce9e34 100644
--- a/ld/testsuite/ld-tic6x/shlib-1b.rd
+++ b/ld/testsuite/ld-tic6x/shlib-1b.rd
@@ -3,12 +3,12 @@ There are 17 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 000048 04   A  2   0  4
-  \[ 2\] \.dynsym           DYNSYM          00008048 001048 0000d0 10   A  3   7  4
-  \[ 3\] \.dynstr           STRTAB          00008118 001118 000025 00   A  0   0  1
-  \[ 4\] \.rela\.got         RELA            00008140 001140 000024 0c  AI  2  10  4
-  \[ 5\] \.rela\.neardata    RELA            00008164 001164 000018 0c  AI  2  11  4
-  \[ 6\] \.dynamic          DYNAMIC         0000817c 00117c 0000a8 08  WA  3   0  4
+  \[ 1\] \.hash             HASH            00008000 001000 000044 04   A  2   0  4
+  \[ 2\] \.dynsym           DYNSYM          00008044 001044 0000c0 10   A  3   6  4
+  \[ 3\] \.dynstr           STRTAB          00008104 001104 000012 00   A  0   0  1
+  \[ 4\] \.rela\.got         RELA            00008118 001118 000024 0c  AI  2  10  4
+  \[ 5\] \.rela\.neardata    RELA            0000813c 00113c 000018 0c  AI  2  11  4
+  \[ 6\] \.dynamic          DYNAMIC         00008154 001154 0000a8 08  WA  3   0  4
   \[ 7\] \.rela\.plt         RELA            10000000 002000 000018 0c  AI  2  10  4
   \[ 8\] \.plt              PROGBITS        10000020 002020 000060 18  AX  0   0 32
   \[ 9\] \.text             PROGBITS        10000080 002080 000080 00  AX  0   0 32
@@ -16,9 +16,9 @@ Section Headers:
   \[11\] \.neardata         PROGBITS        10000128 002128 000008 00  WA  0   0  4
   \[12\] \.bss              NOBITS          10000130 002130 000004 00  WA  0   0  4
   \[13\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 002130 000019 00      0   0  1
-  \[14\] \.symtab           SYMTAB          00000000 [0-9a-f]+ [0-9a-f]+ 10     15  [0-9]+  4
-  \[15\] \.strtab           STRTAB          00000000 [0-9a-f]+ [0-9a-f]+ 00      0   0  1
-  \[16\] \.shstrtab         STRTAB          00000000 [0-9a-f]+ 00007b 00      0   0  1
+  \[14\] \.symtab           SYMTAB          00000000 00214c 0001b0 10     15  21  4
+  \[15\] \.strtab           STRTAB          00000000 0022fc 00005c 00      0   0  1
+  \[16\] \.shstrtab         STRTAB          00000000 002358 00007b 00      0   0  1
 Key to Flags:
 #...
 
@@ -28,9 +28,9 @@ There are 4 program headers, starting at offset 52
 
 Program Headers:
   Type           Offset   VirtAddr   PhysAddr   FileSiz MemSiz  Flg Align
-  LOAD           0x001000 0x00008000 0x00008000 0x00224 0x00224 RW  0x1000
+  LOAD           0x001000 0x00008000 0x00008000 0x001fc 0x001fc RW  0x1000
   LOAD           0x002000 0x10000000 0x10000000 0x00130 0x00134 RWE 0x1000
-  DYNAMIC        0x00117c 0x0000817c 0x0000817c 0x000a8 0x000a8 RW  0x4
+  DYNAMIC        0x001154 0x00008154 0x00008154 0x000a8 0x000a8 RW  0x4
   GNU_STACK      0x000000 0x00000000 0x00000000 0x00000 0x20000 RWE 0x8
 
  Section to Segment mapping:
@@ -40,12 +40,12 @@ Program Headers:
    02     \.dynamic 
    03     
 
-Dynamic section at offset 0x117c contains 16 entries:
+Dynamic section at offset 0x1154 contains 16 entries:
   Tag        Type                         Name/Value
  0x00000004 \(HASH\)                       0x8000
- 0x00000005 \(STRTAB\)                     0x8118
- 0x00000006 \(SYMTAB\)                     0x8048
- 0x0000000a \(STRSZ\)                      37 \(bytes\)
+ 0x00000005 \(STRTAB\)                     0x8104
+ 0x00000006 \(SYMTAB\)                     0x8044
+ 0x0000000a \(STRSZ\)                      18 \(bytes\)
  0x0000000b \(SYMENT\)                     16 \(bytes\)
  0x70000000 \(C6000_DSBT_BASE\)            0x10000100
  0x70000001 \(C6000_DSBT_SIZE\)            0x3
@@ -54,28 +54,28 @@ Dynamic section at offset 0x117c contains 16 entries:
  0x00000002 \(PLTRELSZ\)                   24 \(bytes\)
  0x00000014 \(PLTREL\)                     RELA
  0x00000017 \(JMPREL\)                     0x10000000
- 0x00000007 \(RELA\)                       0x8140
+ 0x00000007 \(RELA\)                       0x8118
  0x00000008 \(RELASZ\)                     84 \(bytes\)
  0x00000009 \(RELAENT\)                    12 \(bytes\)
  0x00000000 \(NULL\)                       0x0
 
-Relocation section '\.rela\.got' at offset 0x1140 contains 3 entries:
+Relocation section '\.rela\.got' at offset 0x1118 contains 3 entries:
  Offset     Info    Type                Sym\. Value  Symbol's Name \+ Addend
 10000120  00000501 R_C6000_ABS32          10000130   \.bss \+ 0
-1000011c  00000701 R_C6000_ABS32          00000000   b \+ 0
-10000124  00000b01 R_C6000_ABS32          10000128   a \+ 0
+1000011c  00000601 R_C6000_ABS32          00000000   b \+ 0
+10000124  00000a01 R_C6000_ABS32          10000128   a \+ 0
 
-Relocation section '\.rela\.neardata' at offset 0x1164 contains 2 entries:
+Relocation section '\.rela\.neardata' at offset 0x113c contains 2 entries:
  Offset     Info    Type                Sym\. Value  Symbol's Name \+ Addend
-10000128  00000a01 R_C6000_ABS32          10000088   sub0 \+ 0
-1000012c  00000801 R_C6000_ABS32          00000000   g1 \+ 0
+10000128  00000901 R_C6000_ABS32          10000088   sub0 \+ 0
+1000012c  00000701 R_C6000_ABS32          00000000   g1 \+ 0
 
 Relocation section '\.rela\.plt' at offset 0x2000 contains 2 entries:
  Offset     Info    Type                Sym\. Value  Symbol's Name \+ Addend
-10000114  00000a1b R_C6000_JUMP_SLOT      10000088   sub0 \+ 0
-10000118  00000c1b R_C6000_JUMP_SLOT      100000c0   sub \+ 0
+10000114  0000091b R_C6000_JUMP_SLOT      10000088   sub0 \+ 0
+10000118  00000b1b R_C6000_JUMP_SLOT      100000c0   sub \+ 0
 
-Symbol table '\.dynsym' contains 13 entries:
+Symbol table '\.dynsym' contains 12 entries:
    Num:    Value  Size Type    Bind   Vis      Ndx Name
      0: 00000000     0 NOTYPE  LOCAL  DEFAULT  UND 
      1: 10000020     0 SECTION LOCAL  DEFAULT    8 
@@ -83,40 +83,39 @@ Symbol table '\.dynsym' contains 13 entries:
      3: 10000100     0 SECTION LOCAL  DEFAULT   10 
      4: 10000128     0 SECTION LOCAL  DEFAULT   11 
      5: 10000130     0 SECTION LOCAL  DEFAULT   12 
-     6: 10000100     0 NOTYPE  LOCAL  DEFAULT   10 __c6xabi_DSBT_BASE
-     7: 00000000     0 NOTYPE  WEAK   DEFAULT  UND b
-     8: 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
-     9: 1000012c     4 OBJECT  GLOBAL DEFAULT   11 g2
-    10: 10000088    52 FUNC    GLOBAL DEFAULT    9 sub0
-    11: 10000128     4 OBJECT  GLOBAL DEFAULT   11 a
-    12: 100000c0    52 FUNC    GLOBAL DEFAULT    9 sub
+     6: 00000000     0 NOTYPE  WEAK   DEFAULT  UND b
+     7: 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
+     8: 1000012c     4 OBJECT  GLOBAL DEFAULT   11 g2
+     9: 10000088    52 FUNC    GLOBAL DEFAULT    9 sub0
+    10: 10000128     4 OBJECT  GLOBAL DEFAULT   11 a
+    11: 100000c0    52 FUNC    GLOBAL DEFAULT    9 sub
 
-Symbol table '\.symtab' contains [0-9]+ entries:
+Symbol table '\.symtab' contains 27 entries:
    Num:    Value  Size Type    Bind   Vis      Ndx Name
-.* 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
-.* 00000000     0 FILE    LOCAL  DEFAULT  ABS 
-.* 0000817c     0 OBJECT  LOCAL  DEFAULT  ABS _DYNAMIC
-.* 10000130     4 OBJECT  LOCAL  DEFAULT   12 c
-.* 1000010c     0 OBJECT  LOCAL  DEFAULT  ABS _GLOBAL_OFFSET_TABLE_
-.* 10000100     0 NOTYPE  LOCAL  DEFAULT   10 __c6xabi_DSBT_BASE
-.* 00000000     0 NOTYPE  WEAK   DEFAULT  UND b
-.* 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
+     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: 00008118     0 SECTION LOCAL  DEFAULT    4 
+     5: 0000813c     0 SECTION LOCAL  DEFAULT    5 
+     6: 00008154     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: 00000000     0 FILE    LOCAL  DEFAULT  ABS tmpdir/shlib-1\.o
+    15: 10000080     0 FUNC    LOCAL  HIDDEN     9 sub1
+    16: 00000000     0 FILE    LOCAL  DEFAULT  ABS 
+    17: 00008154     0 OBJECT  LOCAL  DEFAULT  ABS _DYNAMIC
+    18: 10000130     4 OBJECT  LOCAL  DEFAULT   12 c
+    19: 1000010c     0 OBJECT  LOCAL  DEFAULT  ABS _GLOBAL_OFFSET_TABLE_
+    20: 10000100     0 NOTYPE  LOCAL  DEFAULT   10 __c6xabi_DSBT_BASE
+    21: 00000000     0 NOTYPE  WEAK   DEFAULT  UND b
+    22: 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
+    23: 1000012c     4 OBJECT  GLOBAL DEFAULT   11 g2
+    24: 10000088    52 FUNC    GLOBAL DEFAULT    9 sub0
+    25: 10000128     4 OBJECT  GLOBAL DEFAULT   11 a
+    26: 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 77ec3d739f..469bce9e34 100644
--- a/ld/testsuite/ld-tic6x/shlib-1r.rd
+++ b/ld/testsuite/ld-tic6x/shlib-1r.rd
@@ -3,12 +3,12 @@ There are 17 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 000048 04   A  2   0  4
-  \[ 2\] \.dynsym           DYNSYM          00008048 001048 0000d0 10   A  3   7  4
-  \[ 3\] \.dynstr           STRTAB          00008118 001118 000025 00   A  0   0  1
-  \[ 4\] \.rela\.got         RELA            00008140 001140 000024 0c  AI  2  10  4
-  \[ 5\] \.rela\.neardata    RELA            00008164 001164 000018 0c  AI  2  11  4
-  \[ 6\] \.dynamic          DYNAMIC         0000817c 00117c 0000a8 08  WA  3   0  4
+  \[ 1\] \.hash             HASH            00008000 001000 000044 04   A  2   0  4
+  \[ 2\] \.dynsym           DYNSYM          00008044 001044 0000c0 10   A  3   6  4
+  \[ 3\] \.dynstr           STRTAB          00008104 001104 000012 00   A  0   0  1
+  \[ 4\] \.rela\.got         RELA            00008118 001118 000024 0c  AI  2  10  4
+  \[ 5\] \.rela\.neardata    RELA            0000813c 00113c 000018 0c  AI  2  11  4
+  \[ 6\] \.dynamic          DYNAMIC         00008154 001154 0000a8 08  WA  3   0  4
   \[ 7\] \.rela\.plt         RELA            10000000 002000 000018 0c  AI  2  10  4
   \[ 8\] \.plt              PROGBITS        10000020 002020 000060 18  AX  0   0 32
   \[ 9\] \.text             PROGBITS        10000080 002080 000080 00  AX  0   0 32
@@ -16,9 +16,9 @@ Section Headers:
   \[11\] \.neardata         PROGBITS        10000128 002128 000008 00  WA  0   0  4
   \[12\] \.bss              NOBITS          10000130 002130 000004 00  WA  0   0  4
   \[13\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 002130 000019 00      0   0  1
-  \[14\] \.symtab           SYMTAB          00000000 [0-9a-f]+ [0-9a-f]+ 10     15  [0-9]+  4
-  \[15\] \.strtab           STRTAB          00000000 [0-9a-f]+ [0-9a-f]+ 00      0   0  1
-  \[16\] \.shstrtab         STRTAB          00000000 [0-9a-f]+ 00007b 00      0   0  1
+  \[14\] \.symtab           SYMTAB          00000000 00214c 0001b0 10     15  21  4
+  \[15\] \.strtab           STRTAB          00000000 0022fc 00005c 00      0   0  1
+  \[16\] \.shstrtab         STRTAB          00000000 002358 00007b 00      0   0  1
 Key to Flags:
 #...
 
@@ -28,9 +28,9 @@ There are 4 program headers, starting at offset 52
 
 Program Headers:
   Type           Offset   VirtAddr   PhysAddr   FileSiz MemSiz  Flg Align
-  LOAD           0x001000 0x00008000 0x00008000 0x00224 0x00224 RW  0x1000
+  LOAD           0x001000 0x00008000 0x00008000 0x001fc 0x001fc RW  0x1000
   LOAD           0x002000 0x10000000 0x10000000 0x00130 0x00134 RWE 0x1000
-  DYNAMIC        0x00117c 0x0000817c 0x0000817c 0x000a8 0x000a8 RW  0x4
+  DYNAMIC        0x001154 0x00008154 0x00008154 0x000a8 0x000a8 RW  0x4
   GNU_STACK      0x000000 0x00000000 0x00000000 0x00000 0x20000 RWE 0x8
 
  Section to Segment mapping:
@@ -40,12 +40,12 @@ Program Headers:
    02     \.dynamic 
    03     
 
-Dynamic section at offset 0x117c contains 16 entries:
+Dynamic section at offset 0x1154 contains 16 entries:
   Tag        Type                         Name/Value
  0x00000004 \(HASH\)                       0x8000
- 0x00000005 \(STRTAB\)                     0x8118
- 0x00000006 \(SYMTAB\)                     0x8048
- 0x0000000a \(STRSZ\)                      37 \(bytes\)
+ 0x00000005 \(STRTAB\)                     0x8104
+ 0x00000006 \(SYMTAB\)                     0x8044
+ 0x0000000a \(STRSZ\)                      18 \(bytes\)
  0x0000000b \(SYMENT\)                     16 \(bytes\)
  0x70000000 \(C6000_DSBT_BASE\)            0x10000100
  0x70000001 \(C6000_DSBT_SIZE\)            0x3
@@ -54,28 +54,28 @@ Dynamic section at offset 0x117c contains 16 entries:
  0x00000002 \(PLTRELSZ\)                   24 \(bytes\)
  0x00000014 \(PLTREL\)                     RELA
  0x00000017 \(JMPREL\)                     0x10000000
- 0x00000007 \(RELA\)                       0x8140
+ 0x00000007 \(RELA\)                       0x8118
  0x00000008 \(RELASZ\)                     84 \(bytes\)
  0x00000009 \(RELAENT\)                    12 \(bytes\)
  0x00000000 \(NULL\)                       0x0
 
-Relocation section '\.rela\.got' at offset 0x1140 contains 3 entries:
+Relocation section '\.rela\.got' at offset 0x1118 contains 3 entries:
  Offset     Info    Type                Sym\. Value  Symbol's Name \+ Addend
 10000120  00000501 R_C6000_ABS32          10000130   \.bss \+ 0
-1000011c  00000701 R_C6000_ABS32          00000000   b \+ 0
-10000124  00000b01 R_C6000_ABS32          10000128   a \+ 0
+1000011c  00000601 R_C6000_ABS32          00000000   b \+ 0
+10000124  00000a01 R_C6000_ABS32          10000128   a \+ 0
 
-Relocation section '\.rela\.neardata' at offset 0x1164 contains 2 entries:
+Relocation section '\.rela\.neardata' at offset 0x113c contains 2 entries:
  Offset     Info    Type                Sym\. Value  Symbol's Name \+ Addend
-10000128  00000a01 R_C6000_ABS32          10000088   sub0 \+ 0
-1000012c  00000801 R_C6000_ABS32          00000000   g1 \+ 0
+10000128  00000901 R_C6000_ABS32          10000088   sub0 \+ 0
+1000012c  00000701 R_C6000_ABS32          00000000   g1 \+ 0
 
 Relocation section '\.rela\.plt' at offset 0x2000 contains 2 entries:
  Offset     Info    Type                Sym\. Value  Symbol's Name \+ Addend
-10000114  00000a1b R_C6000_JUMP_SLOT      10000088   sub0 \+ 0
-10000118  00000c1b R_C6000_JUMP_SLOT      100000c0   sub \+ 0
+10000114  0000091b R_C6000_JUMP_SLOT      10000088   sub0 \+ 0
+10000118  00000b1b R_C6000_JUMP_SLOT      100000c0   sub \+ 0
 
-Symbol table '\.dynsym' contains 13 entries:
+Symbol table '\.dynsym' contains 12 entries:
    Num:    Value  Size Type    Bind   Vis      Ndx Name
      0: 00000000     0 NOTYPE  LOCAL  DEFAULT  UND 
      1: 10000020     0 SECTION LOCAL  DEFAULT    8 
@@ -83,40 +83,39 @@ Symbol table '\.dynsym' contains 13 entries:
      3: 10000100     0 SECTION LOCAL  DEFAULT   10 
      4: 10000128     0 SECTION LOCAL  DEFAULT   11 
      5: 10000130     0 SECTION LOCAL  DEFAULT   12 
-     6: 10000100     0 NOTYPE  LOCAL  DEFAULT   10 __c6xabi_DSBT_BASE
-     7: 00000000     0 NOTYPE  WEAK   DEFAULT  UND b
-     8: 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
-     9: 1000012c     4 OBJECT  GLOBAL DEFAULT   11 g2
-    10: 10000088    52 FUNC    GLOBAL DEFAULT    9 sub0
-    11: 10000128     4 OBJECT  GLOBAL DEFAULT   11 a
-    12: 100000c0    52 FUNC    GLOBAL DEFAULT    9 sub
+     6: 00000000     0 NOTYPE  WEAK   DEFAULT  UND b
+     7: 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
+     8: 1000012c     4 OBJECT  GLOBAL DEFAULT   11 g2
+     9: 10000088    52 FUNC    GLOBAL DEFAULT    9 sub0
+    10: 10000128     4 OBJECT  GLOBAL DEFAULT   11 a
+    11: 100000c0    52 FUNC    GLOBAL DEFAULT    9 sub
 
-Symbol table '\.symtab' contains [0-9]+ entries:
+Symbol table '\.symtab' contains 27 entries:
    Num:    Value  Size Type    Bind   Vis      Ndx Name
-.* 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
-.* 00000000     0 FILE    LOCAL  DEFAULT  ABS 
-.* 0000817c     0 OBJECT  LOCAL  DEFAULT  ABS _DYNAMIC
-.* 10000130     4 OBJECT  LOCAL  DEFAULT   12 c
-.* 1000010c     0 OBJECT  LOCAL  DEFAULT  ABS _GLOBAL_OFFSET_TABLE_
-.* 10000100     0 NOTYPE  LOCAL  DEFAULT   10 __c6xabi_DSBT_BASE
-.* 00000000     0 NOTYPE  WEAK   DEFAULT  UND b
-.* 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
+     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: 00008118     0 SECTION LOCAL  DEFAULT    4 
+     5: 0000813c     0 SECTION LOCAL  DEFAULT    5 
+     6: 00008154     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: 00000000     0 FILE    LOCAL  DEFAULT  ABS tmpdir/shlib-1\.o
+    15: 10000080     0 FUNC    LOCAL  HIDDEN     9 sub1
+    16: 00000000     0 FILE    LOCAL  DEFAULT  ABS 
+    17: 00008154     0 OBJECT  LOCAL  DEFAULT  ABS _DYNAMIC
+    18: 10000130     4 OBJECT  LOCAL  DEFAULT   12 c
+    19: 1000010c     0 OBJECT  LOCAL  DEFAULT  ABS _GLOBAL_OFFSET_TABLE_
+    20: 10000100     0 NOTYPE  LOCAL  DEFAULT   10 __c6xabi_DSBT_BASE
+    21: 00000000     0 NOTYPE  WEAK   DEFAULT  UND b
+    22: 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
+    23: 1000012c     4 OBJECT  GLOBAL DEFAULT   11 g2
+    24: 10000088    52 FUNC    GLOBAL DEFAULT    9 sub0
+    25: 10000128     4 OBJECT  GLOBAL DEFAULT   11 a
+    26: 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 77ec3d739f..469bce9e34 100644
--- a/ld/testsuite/ld-tic6x/shlib-1rb.rd
+++ b/ld/testsuite/ld-tic6x/shlib-1rb.rd
@@ -3,12 +3,12 @@ There are 17 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 000048 04   A  2   0  4
-  \[ 2\] \.dynsym           DYNSYM          00008048 001048 0000d0 10   A  3   7  4
-  \[ 3\] \.dynstr           STRTAB          00008118 001118 000025 00   A  0   0  1
-  \[ 4\] \.rela\.got         RELA            00008140 001140 000024 0c  AI  2  10  4
-  \[ 5\] \.rela\.neardata    RELA            00008164 001164 000018 0c  AI  2  11  4
-  \[ 6\] \.dynamic          DYNAMIC         0000817c 00117c 0000a8 08  WA  3   0  4
+  \[ 1\] \.hash             HASH            00008000 001000 000044 04   A  2   0  4
+  \[ 2\] \.dynsym           DYNSYM          00008044 001044 0000c0 10   A  3   6  4
+  \[ 3\] \.dynstr           STRTAB          00008104 001104 000012 00   A  0   0  1
+  \[ 4\] \.rela\.got         RELA            00008118 001118 000024 0c  AI  2  10  4
+  \[ 5\] \.rela\.neardata    RELA            0000813c 00113c 000018 0c  AI  2  11  4
+  \[ 6\] \.dynamic          DYNAMIC         00008154 001154 0000a8 08  WA  3   0  4
   \[ 7\] \.rela\.plt         RELA            10000000 002000 000018 0c  AI  2  10  4
   \[ 8\] \.plt              PROGBITS        10000020 002020 000060 18  AX  0   0 32
   \[ 9\] \.text             PROGBITS        10000080 002080 000080 00  AX  0   0 32
@@ -16,9 +16,9 @@ Section Headers:
   \[11\] \.neardata         PROGBITS        10000128 002128 000008 00  WA  0   0  4
   \[12\] \.bss              NOBITS          10000130 002130 000004 00  WA  0   0  4
   \[13\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 002130 000019 00      0   0  1
-  \[14\] \.symtab           SYMTAB          00000000 [0-9a-f]+ [0-9a-f]+ 10     15  [0-9]+  4
-  \[15\] \.strtab           STRTAB          00000000 [0-9a-f]+ [0-9a-f]+ 00      0   0  1
-  \[16\] \.shstrtab         STRTAB          00000000 [0-9a-f]+ 00007b 00      0   0  1
+  \[14\] \.symtab           SYMTAB          00000000 00214c 0001b0 10     15  21  4
+  \[15\] \.strtab           STRTAB          00000000 0022fc 00005c 00      0   0  1
+  \[16\] \.shstrtab         STRTAB          00000000 002358 00007b 00      0   0  1
 Key to Flags:
 #...
 
@@ -28,9 +28,9 @@ There are 4 program headers, starting at offset 52
 
 Program Headers:
   Type           Offset   VirtAddr   PhysAddr   FileSiz MemSiz  Flg Align
-  LOAD           0x001000 0x00008000 0x00008000 0x00224 0x00224 RW  0x1000
+  LOAD           0x001000 0x00008000 0x00008000 0x001fc 0x001fc RW  0x1000
   LOAD           0x002000 0x10000000 0x10000000 0x00130 0x00134 RWE 0x1000
-  DYNAMIC        0x00117c 0x0000817c 0x0000817c 0x000a8 0x000a8 RW  0x4
+  DYNAMIC        0x001154 0x00008154 0x00008154 0x000a8 0x000a8 RW  0x4
   GNU_STACK      0x000000 0x00000000 0x00000000 0x00000 0x20000 RWE 0x8
 
  Section to Segment mapping:
@@ -40,12 +40,12 @@ Program Headers:
    02     \.dynamic 
    03     
 
-Dynamic section at offset 0x117c contains 16 entries:
+Dynamic section at offset 0x1154 contains 16 entries:
   Tag        Type                         Name/Value
  0x00000004 \(HASH\)                       0x8000
- 0x00000005 \(STRTAB\)                     0x8118
- 0x00000006 \(SYMTAB\)                     0x8048
- 0x0000000a \(STRSZ\)                      37 \(bytes\)
+ 0x00000005 \(STRTAB\)                     0x8104
+ 0x00000006 \(SYMTAB\)                     0x8044
+ 0x0000000a \(STRSZ\)                      18 \(bytes\)
  0x0000000b \(SYMENT\)                     16 \(bytes\)
  0x70000000 \(C6000_DSBT_BASE\)            0x10000100
  0x70000001 \(C6000_DSBT_SIZE\)            0x3
@@ -54,28 +54,28 @@ Dynamic section at offset 0x117c contains 16 entries:
  0x00000002 \(PLTRELSZ\)                   24 \(bytes\)
  0x00000014 \(PLTREL\)                     RELA
  0x00000017 \(JMPREL\)                     0x10000000
- 0x00000007 \(RELA\)                       0x8140
+ 0x00000007 \(RELA\)                       0x8118
  0x00000008 \(RELASZ\)                     84 \(bytes\)
  0x00000009 \(RELAENT\)                    12 \(bytes\)
  0x00000000 \(NULL\)                       0x0
 
-Relocation section '\.rela\.got' at offset 0x1140 contains 3 entries:
+Relocation section '\.rela\.got' at offset 0x1118 contains 3 entries:
  Offset     Info    Type                Sym\. Value  Symbol's Name \+ Addend
 10000120  00000501 R_C6000_ABS32          10000130   \.bss \+ 0
-1000011c  00000701 R_C6000_ABS32          00000000   b \+ 0
-10000124  00000b01 R_C6000_ABS32          10000128   a \+ 0
+1000011c  00000601 R_C6000_ABS32          00000000   b \+ 0
+10000124  00000a01 R_C6000_ABS32          10000128   a \+ 0
 
-Relocation section '\.rela\.neardata' at offset 0x1164 contains 2 entries:
+Relocation section '\.rela\.neardata' at offset 0x113c contains 2 entries:
  Offset     Info    Type                Sym\. Value  Symbol's Name \+ Addend
-10000128  00000a01 R_C6000_ABS32          10000088   sub0 \+ 0
-1000012c  00000801 R_C6000_ABS32          00000000   g1 \+ 0
+10000128  00000901 R_C6000_ABS32          10000088   sub0 \+ 0
+1000012c  00000701 R_C6000_ABS32          00000000   g1 \+ 0
 
 Relocation section '\.rela\.plt' at offset 0x2000 contains 2 entries:
  Offset     Info    Type                Sym\. Value  Symbol's Name \+ Addend
-10000114  00000a1b R_C6000_JUMP_SLOT      10000088   sub0 \+ 0
-10000118  00000c1b R_C6000_JUMP_SLOT      100000c0   sub \+ 0
+10000114  0000091b R_C6000_JUMP_SLOT      10000088   sub0 \+ 0
+10000118  00000b1b R_C6000_JUMP_SLOT      100000c0   sub \+ 0
 
-Symbol table '\.dynsym' contains 13 entries:
+Symbol table '\.dynsym' contains 12 entries:
    Num:    Value  Size Type    Bind   Vis      Ndx Name
      0: 00000000     0 NOTYPE  LOCAL  DEFAULT  UND 
      1: 10000020     0 SECTION LOCAL  DEFAULT    8 
@@ -83,40 +83,39 @@ Symbol table '\.dynsym' contains 13 entries:
      3: 10000100     0 SECTION LOCAL  DEFAULT   10 
      4: 10000128     0 SECTION LOCAL  DEFAULT   11 
      5: 10000130     0 SECTION LOCAL  DEFAULT   12 
-     6: 10000100     0 NOTYPE  LOCAL  DEFAULT   10 __c6xabi_DSBT_BASE
-     7: 00000000     0 NOTYPE  WEAK   DEFAULT  UND b
-     8: 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
-     9: 1000012c     4 OBJECT  GLOBAL DEFAULT   11 g2
-    10: 10000088    52 FUNC    GLOBAL DEFAULT    9 sub0
-    11: 10000128     4 OBJECT  GLOBAL DEFAULT   11 a
-    12: 100000c0    52 FUNC    GLOBAL DEFAULT    9 sub
+     6: 00000000     0 NOTYPE  WEAK   DEFAULT  UND b
+     7: 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
+     8: 1000012c     4 OBJECT  GLOBAL DEFAULT   11 g2
+     9: 10000088    52 FUNC    GLOBAL DEFAULT    9 sub0
+    10: 10000128     4 OBJECT  GLOBAL DEFAULT   11 a
+    11: 100000c0    52 FUNC    GLOBAL DEFAULT    9 sub
 
-Symbol table '\.symtab' contains [0-9]+ entries:
+Symbol table '\.symtab' contains 27 entries:
    Num:    Value  Size Type    Bind   Vis      Ndx Name
-.* 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
-.* 00000000     0 FILE    LOCAL  DEFAULT  ABS 
-.* 0000817c     0 OBJECT  LOCAL  DEFAULT  ABS _DYNAMIC
-.* 10000130     4 OBJECT  LOCAL  DEFAULT   12 c
-.* 1000010c     0 OBJECT  LOCAL  DEFAULT  ABS _GLOBAL_OFFSET_TABLE_
-.* 10000100     0 NOTYPE  LOCAL  DEFAULT   10 __c6xabi_DSBT_BASE
-.* 00000000     0 NOTYPE  WEAK   DEFAULT  UND b
-.* 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
+     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: 00008118     0 SECTION LOCAL  DEFAULT    4 
+     5: 0000813c     0 SECTION LOCAL  DEFAULT    5 
+     6: 00008154     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: 00000000     0 FILE    LOCAL  DEFAULT  ABS tmpdir/shlib-1\.o
+    15: 10000080     0 FUNC    LOCAL  HIDDEN     9 sub1
+    16: 00000000     0 FILE    LOCAL  DEFAULT  ABS 
+    17: 00008154     0 OBJECT  LOCAL  DEFAULT  ABS _DYNAMIC
+    18: 10000130     4 OBJECT  LOCAL  DEFAULT   12 c
+    19: 1000010c     0 OBJECT  LOCAL  DEFAULT  ABS _GLOBAL_OFFSET_TABLE_
+    20: 10000100     0 NOTYPE  LOCAL  DEFAULT   10 __c6xabi_DSBT_BASE
+    21: 00000000     0 NOTYPE  WEAK   DEFAULT  UND b
+    22: 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
+    23: 1000012c     4 OBJECT  GLOBAL DEFAULT   11 g2
+    24: 10000088    52 FUNC    GLOBAL DEFAULT    9 sub0
+    25: 10000128     4 OBJECT  GLOBAL DEFAULT   11 a
+    26: 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 30086ed0cf..ad181eb036 100644
--- a/ld/testsuite/ld-tic6x/shlib-app-1.rd
+++ b/ld/testsuite/ld-tic6x/shlib-app-1.rd
@@ -3,13 +3,13 @@ There are 18 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 000044 04   A  2   0  4
-  \[ 2\] \.dynsym           DYNSYM          00008044 001044 0000c0 10   A  3   7  4
-  \[ 3\] \.dynstr           STRTAB          00008104 001104 000035 00   A  0   0  1
-  \[ 4\] \.rela\.got         RELA            0000813c 00113c 000018 0c  AI  2  11  4
-  \[ 5\] \.rela\.neardata    RELA            00008154 001154 000018 0c  AI  2  12  4
-  \[ 6\] \.rela\.bss         RELA            0000816c 00116c 00000c 0c  AI  2  13  4
-  \[ 7\] \.dynamic          DYNAMIC         00008178 001178 0000b8 08  WA  3   0  4
+  \[ 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
   \[ 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
@@ -17,9 +17,9 @@ Section Headers:
   \[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 [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
-  \[17\] \.shstrtab         STRTAB          00000000 [0-9a-f]+ 000080 00      0   0  1
+  \[15\] \.symtab           SYMTAB          00000000 0020e8 0001b0 10     16  22  4
+  \[16\] \.strtab           STRTAB          00000000 002298 00005e 00      0   0  1
+  \[17\] \.shstrtab         STRTAB          00000000 0022f6 000080 00      0   0  1
 Key to Flags:
 #...
 
@@ -29,9 +29,9 @@ There are 4 program headers, starting at offset 52
 
 Program Headers:
   Type           Offset   VirtAddr   PhysAddr   FileSiz MemSiz  Flg Align
-  LOAD           0x001000 0x00008000 0x00008000 0x00230 0x00230 RW  0x1000
+  LOAD           0x001000 0x00008000 0x00008000 0x00208 0x00208 RW  0x1000
   LOAD           0x002000 0x10000000 0x10000000 0x000cc 0x000d0 RWE 0x1000
-  DYNAMIC        0x001178 0x00008178 0x00008178 0x000b8 0x000b8 RW  0x4
+  DYNAMIC        0x001150 0x00008150 0x00008150 0x000b8 0x000b8 RW  0x4
   GNU_STACK      0x000000 0x00000000 0x00000000 0x00000 0x20000 RWE 0x8
 
  Section to Segment mapping:
@@ -41,13 +41,13 @@ Program Headers:
    02     \.dynamic 
    03     
 
-Dynamic section at offset 0x1178 contains 18 entries:
+Dynamic section at offset 0x1150 contains 18 entries:
   Tag        Type                         Name/Value
  0x00000001 \(NEEDED\)                     Shared library: \[tmpdir/libtest\.so\]
  0x00000004 \(HASH\)                       0x8000
- 0x00000005 \(STRTAB\)                     0x8104
- 0x00000006 \(SYMTAB\)                     0x8044
- 0x0000000a \(STRSZ\)                      53 \(bytes\)
+ 0x00000005 \(STRTAB\)                     0x80f0
+ 0x00000006 \(SYMTAB\)                     0x8040
+ 0x0000000a \(STRSZ\)                      34 \(bytes\)
  0x0000000b \(SYMENT\)                     16 \(bytes\)
  0x00000015 \(DEBUG\)                      0x0
  0x70000000 \(C6000_DSBT_BASE\)            0x100000a0
@@ -57,30 +57,30 @@ Dynamic section at offset 0x1178 contains 18 entries:
  0x00000002 \(PLTRELSZ\)                   12 \(bytes\)
  0x00000014 \(PLTREL\)                     RELA
  0x00000017 \(JMPREL\)                     0x10000000
- 0x00000007 \(RELA\)                       0x813c
+ 0x00000007 \(RELA\)                       0x8114
  0x00000008 \(RELASZ\)                     72 \(bytes\)
  0x00000009 \(RELAENT\)                    12 \(bytes\)
  0x00000000 \(NULL\)                       0x0
 
-Relocation section '\.rela\.got' at offset 0x113c contains 2 entries:
+Relocation section '\.rela\.got' at offset 0x1114 contains 2 entries:
  Offset     Info    Type                Sym\. Value  Symbol's Name \+ Addend
-100000b8  00000701 R_C6000_ABS32          100000c0   b \+ 0
-100000bc  00000b01 R_C6000_ABS32          100000cc   a \+ 0
+100000b8  00000601 R_C6000_ABS32          100000c0   b \+ 0
+100000bc  00000a01 R_C6000_ABS32          100000cc   a \+ 0
 
-Relocation section '\.rela\.neardata' at offset 0x1154 contains 2 entries:
+Relocation section '\.rela\.neardata' at offset 0x112c contains 2 entries:
  Offset     Info    Type                Sym\. Value  Symbol's Name \+ Addend
-100000c4  00000801 R_C6000_ABS32          00000000   g1 \+ 0
-100000c8  00000901 R_C6000_ABS32          00000000   g2 \+ 0
+100000c4  00000701 R_C6000_ABS32          00000000   g1 \+ 0
+100000c8  00000801 R_C6000_ABS32          00000000   g2 \+ 0
 
-Relocation section '\.rela\.bss' at offset 0x116c contains 1 entry:
+Relocation section '\.rela\.bss' at offset 0x1144 contains 1 entry:
  Offset     Info    Type                Sym\. Value  Symbol's Name \+ Addend
-100000cc  00000b1a R_C6000_COPY           100000cc   a \+ 0
+100000cc  00000a1a R_C6000_COPY           100000cc   a \+ 0
 
 Relocation section '\.rela\.plt' at offset 0x2000 contains 1 entry:
  Offset     Info    Type                Sym\. Value  Symbol's Name \+ Addend
-100000b4  00000a1b R_C6000_JUMP_SLOT      00000000   sub0 \+ 0
+100000b4  0000091b R_C6000_JUMP_SLOT      00000000   sub0 \+ 0
 
-Symbol table '\.dynsym' contains 12 entries:
+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 
@@ -88,39 +88,38 @@ Symbol table '\.dynsym' contains 12 entries:
      3: 100000a0     0 SECTION LOCAL  DEFAULT   11 
      4: 100000c0     0 SECTION LOCAL  DEFAULT   12 
      5: 100000cc     0 SECTION LOCAL  DEFAULT   13 
-     6: 100000a0     0 NOTYPE  LOCAL  DEFAULT   11 __c6xabi_DSBT_BASE
-     7: 100000c0     4 OBJECT  GLOBAL DEFAULT   12 b
-     8: 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
-     9: 00000000     0 OBJECT  WEAK   DEFAULT  UND g2
-    10: 00000000     0 FUNC    GLOBAL DEFAULT  UND sub0
-    11: 100000cc     4 OBJECT  GLOBAL DEFAULT   13 a
+     6: 100000c0     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
 
-Symbol table '\.symtab' contains [0-9]+ entries:
+Symbol table '\.symtab' contains 27 entries:
    Num:    Value  Size Type    Bind   Vis      Ndx Name
-.* 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   11 __c6xabi_DSBT_BASE
-.* 100000c0     4 OBJECT  GLOBAL DEFAULT   12 b
-.* 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
+     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 tmpdir/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
diff --git a/ld/testsuite/ld-tic6x/shlib-app-1b.rd b/ld/testsuite/ld-tic6x/shlib-app-1b.rd
index 3833b884d3..6390a5da8e 100644
--- a/ld/testsuite/ld-tic6x/shlib-app-1b.rd
+++ b/ld/testsuite/ld-tic6x/shlib-app-1b.rd
@@ -3,13 +3,13 @@ There are 18 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 000044 04   A  2   0  4
-  \[ 2\] \.dynsym           DYNSYM          00008044 001044 0000c0 10   A  3   7  4
-  \[ 3\] \.dynstr           STRTAB          00008104 001104 000036 00   A  0   0  1
-  \[ 4\] \.rela\.got         RELA            0000813c 00113c 000018 0c  AI  2  11  4
-  \[ 5\] \.rela\.neardata    RELA            00008154 001154 000018 0c  AI  2  12  4
-  \[ 6\] \.rela\.bss         RELA            0000816c 00116c 00000c 0c  AI  2  13  4
-  \[ 7\] \.dynamic          DYNAMIC         00008178 001178 0000b8 08  WA  3   0  4
+  \[ 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
   \[ 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
@@ -17,9 +17,9 @@ Section Headers:
   \[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 [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
-  \[17\] \.shstrtab         STRTAB          00000000 [0-9a-f]+ 000080 00      0   0  1
+  \[15\] \.symtab           SYMTAB          00000000 0020e8 0001b0 10     16  22  4
+  \[16\] \.strtab           STRTAB          00000000 002298 00005e 00      0   0  1
+  \[17\] \.shstrtab         STRTAB          00000000 0022f6 000080 00      0   0  1
 Key to Flags:
 #...
 
@@ -29,9 +29,9 @@ There are 4 program headers, starting at offset 52
 
 Program Headers:
   Type           Offset   VirtAddr   PhysAddr   FileSiz MemSiz  Flg Align
-  LOAD           0x001000 0x00008000 0x00008000 0x00230 0x00230 RW  0x1000
+  LOAD           0x001000 0x00008000 0x00008000 0x00208 0x00208 RW  0x1000
   LOAD           0x002000 0x10000000 0x10000000 0x000cc 0x000d0 RWE 0x1000
-  DYNAMIC        0x001178 0x00008178 0x00008178 0x000b8 0x000b8 RW  0x4
+  DYNAMIC        0x001150 0x00008150 0x00008150 0x000b8 0x000b8 RW  0x4
   GNU_STACK      0x000000 0x00000000 0x00000000 0x00000 0x20000 RWE 0x8
 
  Section to Segment mapping:
@@ -41,13 +41,13 @@ Program Headers:
    02     \.dynamic 
    03     
 
-Dynamic section at offset 0x1178 contains 18 entries:
+Dynamic section at offset 0x1150 contains 18 entries:
   Tag        Type                         Name/Value
  0x00000001 \(NEEDED\)                     Shared library: \[tmpdir/libtestb\.so\]
  0x00000004 \(HASH\)                       0x8000
- 0x00000005 \(STRTAB\)                     0x8104
- 0x00000006 \(SYMTAB\)                     0x8044
- 0x0000000a \(STRSZ\)                      54 \(bytes\)
+ 0x00000005 \(STRTAB\)                     0x80f0
+ 0x00000006 \(SYMTAB\)                     0x8040
+ 0x0000000a \(STRSZ\)                      35 \(bytes\)
  0x0000000b \(SYMENT\)                     16 \(bytes\)
  0x00000015 \(DEBUG\)                      0x0
  0x70000000 \(C6000_DSBT_BASE\)            0x100000a0
@@ -57,30 +57,30 @@ Dynamic section at offset 0x1178 contains 18 entries:
  0x00000002 \(PLTRELSZ\)                   12 \(bytes\)
  0x00000014 \(PLTREL\)                     RELA
  0x00000017 \(JMPREL\)                     0x10000000
- 0x00000007 \(RELA\)                       0x813c
+ 0x00000007 \(RELA\)                       0x8114
  0x00000008 \(RELASZ\)                     72 \(bytes\)
  0x00000009 \(RELAENT\)                    12 \(bytes\)
  0x00000000 \(NULL\)                       0x0
 
-Relocation section '\.rela\.got' at offset 0x113c contains 2 entries:
+Relocation section '\.rela\.got' at offset 0x1114 contains 2 entries:
  Offset     Info    Type                Sym\. Value  Symbol's Name \+ Addend
-100000b8  00000701 R_C6000_ABS32          100000c0   b \+ 0
-100000bc  00000b01 R_C6000_ABS32          100000cc   a \+ 0
+100000b8  00000601 R_C6000_ABS32          100000c0   b \+ 0
+100000bc  00000a01 R_C6000_ABS32          100000cc   a \+ 0
 
-Relocation section '\.rela\.neardata' at offset 0x1154 contains 2 entries:
+Relocation section '\.rela\.neardata' at offset 0x112c contains 2 entries:
  Offset     Info    Type                Sym\. Value  Symbol's Name \+ Addend
-100000c4  00000801 R_C6000_ABS32          00000000   g1 \+ 0
-100000c8  00000901 R_C6000_ABS32          00000000   g2 \+ 0
+100000c4  00000701 R_C6000_ABS32          00000000   g1 \+ 0
+100000c8  00000801 R_C6000_ABS32          00000000   g2 \+ 0
 
-Relocation section '\.rela\.bss' at offset 0x116c contains 1 entry:
+Relocation section '\.rela\.bss' at offset 0x1144 contains 1 entry:
  Offset     Info    Type                Sym\. Value  Symbol's Name \+ Addend
-100000cc  00000b1a R_C6000_COPY           100000cc   a \+ 0
+100000cc  00000a1a R_C6000_COPY           100000cc   a \+ 0
 
 Relocation section '\.rela\.plt' at offset 0x2000 contains 1 entry:
  Offset     Info    Type                Sym\. Value  Symbol's Name \+ Addend
-100000b4  00000a1b R_C6000_JUMP_SLOT      00000000   sub0 \+ 0
+100000b4  0000091b R_C6000_JUMP_SLOT      00000000   sub0 \+ 0
 
-Symbol table '\.dynsym' contains 12 entries:
+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 
@@ -88,39 +88,38 @@ Symbol table '\.dynsym' contains 12 entries:
      3: 100000a0     0 SECTION LOCAL  DEFAULT   11 
      4: 100000c0     0 SECTION LOCAL  DEFAULT   12 
      5: 100000cc     0 SECTION LOCAL  DEFAULT   13 
-     6: 100000a0     0 NOTYPE  LOCAL  DEFAULT   11 __c6xabi_DSBT_BASE
-     7: 100000c0     4 OBJECT  GLOBAL DEFAULT   12 b
-     8: 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
-     9: 00000000     0 OBJECT  WEAK   DEFAULT  UND g2
-    10: 00000000     0 FUNC    GLOBAL DEFAULT  UND sub0
-    11: 100000cc     4 OBJECT  GLOBAL DEFAULT   13 a
+     6: 100000c0     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
 
-Symbol table '\.symtab' contains [0-9]+ entries:
+Symbol table '\.symtab' contains 27 entries:
    Num:    Value  Size Type    Bind   Vis      Ndx Name
-.* 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   11 __c6xabi_DSBT_BASE
-.* 100000c0     4 OBJECT  GLOBAL DEFAULT   12 b
-.* 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
+     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 tmpdir/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
diff --git a/ld/testsuite/ld-tic6x/shlib-app-1r.rd b/ld/testsuite/ld-tic6x/shlib-app-1r.rd
index a952a32201..4a38da9dba 100644
--- a/ld/testsuite/ld-tic6x/shlib-app-1r.rd
+++ b/ld/testsuite/ld-tic6x/shlib-app-1r.rd
@@ -3,12 +3,12 @@ There are 17 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 00003c 04   A  2   0  4
-  \[ 2\] \.dynsym           DYNSYM          0000803c 00103c 0000a0 10   A  3   7  4
-  \[ 3\] \.dynstr           STRTAB          000080dc 0010dc 000030 00   A  0   0  1
-  \[ 4\] \.rela\.got         RELA            0000810c 00110c 000018 0c  AI  2  10  4
-  \[ 5\] \.rela\.bss         RELA            00008124 001124 00000c 0c  AI  2  12  4
-  \[ 6\] \.dynamic          DYNAMIC         00008130 001130 0000b8 08  WA  3   0  4
+  \[ 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
   \[ 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
@@ -16,9 +16,9 @@ Section Headers:
   \[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 [0-9a-f]+ [0-9a-f]+ 10     15  [0-9]+  4
-  \[15\] \.strtab           STRTAB          00000000 [0-9a-f]+ [0-9a-f]+ 00      0   0  1
-  \[16\] \.shstrtab         STRTAB          00000000 [0-9a-f]+ 00007b 00      0   0  1
+  \[14\] \.symtab           SYMTAB          00000000 0020e0 000170 10     15  20  4
+  \[15\] \.strtab           STRTAB          00000000 002250 000057 00      0   0  1
+  \[16\] \.shstrtab         STRTAB          00000000 0022a7 00007b 00      0   0  1
 Key to Flags:
 #...
 
@@ -28,9 +28,9 @@ There are 4 program headers, starting at offset 52
 
 Program Headers:
   Type           Offset   VirtAddr   PhysAddr   FileSiz MemSiz  Flg Align
-  LOAD           0x001000 0x00008000 0x00008000 0x001e8 0x001e8 RW  0x1000
+  LOAD           0x001000 0x00008000 0x00008000 0x001c4 0x001c4 RW  0x1000
   LOAD           0x002000 0x10000000 0x10000000 0x000c4 0x000c8 RWE 0x1000
-  DYNAMIC        0x001130 0x00008130 0x00008130 0x000b8 0x000b8 RW  0x4
+  DYNAMIC        0x00110c 0x0000810c 0x0000810c 0x000b8 0x000b8 RW  0x4
   GNU_STACK      0x000000 0x00000000 0x00000000 0x00000 0x20000 RWE 0x8
 
  Section to Segment mapping:
@@ -40,13 +40,13 @@ Program Headers:
    02     \.dynamic 
    03     
 
-Dynamic section at offset 0x1130 contains 18 entries:
+Dynamic section at offset 0x110c contains 18 entries:
   Tag        Type                         Name/Value
  0x00000001 \(NEEDED\)                     Shared library: \[tmpdir/libtestr\.so\]
  0x00000004 \(HASH\)                       0x8000
- 0x00000005 \(STRTAB\)                     0x80dc
- 0x00000006 \(SYMTAB\)                     0x803c
- 0x0000000a \(STRSZ\)                      48 \(bytes\)
+ 0x00000005 \(STRTAB\)                     0x80c8
+ 0x00000006 \(SYMTAB\)                     0x8038
+ 0x0000000a \(STRSZ\)                      29 \(bytes\)
  0x0000000b \(SYMENT\)                     16 \(bytes\)
  0x00000015 \(DEBUG\)                      0x0
  0x70000000 \(C6000_DSBT_BASE\)            0x100000a0
@@ -56,25 +56,25 @@ Dynamic section at offset 0x1130 contains 18 entries:
  0x00000002 \(PLTRELSZ\)                   12 \(bytes\)
  0x00000014 \(PLTREL\)                     RELA
  0x00000017 \(JMPREL\)                     0x10000000
- 0x00000007 \(RELA\)                       0x810c
+ 0x00000007 \(RELA\)                       0x80e8
  0x00000008 \(RELASZ\)                     48 \(bytes\)
  0x00000009 \(RELAENT\)                    12 \(bytes\)
  0x00000000 \(NULL\)                       0x0
 
-Relocation section '\.rela\.got' at offset 0x110c contains 2 entries:
+Relocation section '\.rela\.got' at offset 0x10e8 contains 2 entries:
  Offset     Info    Type                Sym\. Value  Symbol's Name \+ Addend
-100000b8  00000701 R_C6000_ABS32          100000c0   b \+ 0
-100000bc  00000901 R_C6000_ABS32          100000c4   a \+ 0
+100000b8  00000601 R_C6000_ABS32          100000c0   b \+ 0
+100000bc  00000801 R_C6000_ABS32          100000c4   a \+ 0
 
-Relocation section '\.rela\.bss' at offset 0x1124 contains 1 entry:
+Relocation section '\.rela\.bss' at offset 0x1100 contains 1 entry:
  Offset     Info    Type                Sym\. Value  Symbol's Name \+ Addend
-100000c4  0000091a R_C6000_COPY           100000c4   a \+ 0
+100000c4  0000081a 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  0000081b R_C6000_JUMP_SLOT      00000000   sub0 \+ 0
+100000b4  0000071b R_C6000_JUMP_SLOT      00000000   sub0 \+ 0
 
-Symbol table '\.dynsym' contains 10 entries:
+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 
@@ -82,33 +82,32 @@ Symbol table '\.dynsym' contains 10 entries:
      3: 100000a0     0 SECTION LOCAL  DEFAULT   10 
      4: 100000c0     0 SECTION LOCAL  DEFAULT   11 
      5: 100000c4     0 SECTION LOCAL  DEFAULT   12 
-     6: 100000a0     0 NOTYPE  LOCAL  DEFAULT   10 __c6xabi_DSBT_BASE
-     7: 100000c0     4 OBJECT  GLOBAL DEFAULT   11 b
-     8: 00000000     0 FUNC    GLOBAL DEFAULT  UND sub0
-     9: 100000c4     4 OBJECT  GLOBAL DEFAULT   12 a
+     6: 100000c0     4 OBJECT  GLOBAL DEFAULT   11 b
+     7: 00000000     0 FUNC    GLOBAL DEFAULT  UND sub0
+     8: 100000c4     4 OBJECT  GLOBAL DEFAULT   12 a
 
-Symbol table '\.symtab' contains [0-9]+ entries:
+Symbol table '\.symtab' contains 23 entries:
    Num:    Value  Size Type    Bind   Vis      Ndx Name
-.* 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   10 __c6xabi_DSBT_BASE
-.* 100000c0     4 OBJECT  GLOBAL DEFAULT   11 b
-.* 00000000     0 FUNC    GLOBAL DEFAULT  UND sub0
-.* 100000c4     4 OBJECT  GLOBAL DEFAULT   12 a
+     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 tmpdir/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
diff --git a/ld/testsuite/ld-tic6x/shlib-app-1rb.rd b/ld/testsuite/ld-tic6x/shlib-app-1rb.rd
index 0260d0e7d6..2ad86cb187 100644
--- a/ld/testsuite/ld-tic6x/shlib-app-1rb.rd
+++ b/ld/testsuite/ld-tic6x/shlib-app-1rb.rd
@@ -3,12 +3,12 @@ There are 17 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 00003c 04   A  2   0  4
-  \[ 2\] \.dynsym           DYNSYM          0000803c 00103c 0000a0 10   A  3   7  4
-  \[ 3\] \.dynstr           STRTAB          000080dc 0010dc 000031 00   A  0   0  1
-  \[ 4\] \.rela\.got         RELA            00008110 001110 000018 0c  AI  2  10  4
-  \[ 5\] \.rela\.bss         RELA            00008128 001128 00000c 0c  AI  2  12  4
-  \[ 6\] \.dynamic          DYNAMIC         00008134 001134 0000b8 08  WA  3   0  4
+  \[ 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
   \[ 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
@@ -16,9 +16,9 @@ Section Headers:
   \[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 [0-9a-f]+ [0-9a-f]+ 10     15  [0-9]+  4
-  \[15\] \.strtab           STRTAB          00000000 [0-9a-f]+ [0-9a-f]+ 00      0   0  1
-  \[16\] \.shstrtab         STRTAB          00000000 [0-9a-f]+ 00007b 00      0   0  1
+  \[14\] \.symtab           SYMTAB          00000000 0020e0 000170 10     15  20  4
+  \[15\] \.strtab           STRTAB          00000000 002250 000057 00      0   0  1
+  \[16\] \.shstrtab         STRTAB          00000000 0022a7 00007b 00      0   0  1
 Key to Flags:
 #...
 
@@ -28,9 +28,9 @@ There are 4 program headers, starting at offset 52
 
 Program Headers:
   Type           Offset   VirtAddr   PhysAddr   FileSiz MemSiz  Flg Align
-  LOAD           0x001000 0x00008000 0x00008000 0x001ec 0x001ec RW  0x1000
+  LOAD           0x001000 0x00008000 0x00008000 0x001c4 0x001c4 RW  0x1000
   LOAD           0x002000 0x10000000 0x10000000 0x000c4 0x000c8 RWE 0x1000
-  DYNAMIC        0x001134 0x00008134 0x00008134 0x000b8 0x000b8 RW  0x4
+  DYNAMIC        0x00110c 0x0000810c 0x0000810c 0x000b8 0x000b8 RW  0x4
   GNU_STACK      0x000000 0x00000000 0x00000000 0x00000 0x20000 RWE 0x8
 
  Section to Segment mapping:
@@ -40,13 +40,13 @@ Program Headers:
    02     \.dynamic 
    03     
 
-Dynamic section at offset 0x1134 contains 18 entries:
+Dynamic section at offset 0x110c contains 18 entries:
   Tag        Type                         Name/Value
  0x00000001 \(NEEDED\)                     Shared library: \[tmpdir/libtestrb\.so\]
  0x00000004 \(HASH\)                       0x8000
- 0x00000005 \(STRTAB\)                     0x80dc
- 0x00000006 \(SYMTAB\)                     0x803c
- 0x0000000a \(STRSZ\)                      49 \(bytes\)
+ 0x00000005 \(STRTAB\)                     0x80c8
+ 0x00000006 \(SYMTAB\)                     0x8038
+ 0x0000000a \(STRSZ\)                      30 \(bytes\)
  0x0000000b \(SYMENT\)                     16 \(bytes\)
  0x00000015 \(DEBUG\)                      0x0
  0x70000000 \(C6000_DSBT_BASE\)            0x100000a0
@@ -56,25 +56,25 @@ Dynamic section at offset 0x1134 contains 18 entries:
  0x00000002 \(PLTRELSZ\)                   12 \(bytes\)
  0x00000014 \(PLTREL\)                     RELA
  0x00000017 \(JMPREL\)                     0x10000000
- 0x00000007 \(RELA\)                       0x8110
+ 0x00000007 \(RELA\)                       0x80e8
  0x00000008 \(RELASZ\)                     48 \(bytes\)
  0x00000009 \(RELAENT\)                    12 \(bytes\)
  0x00000000 \(NULL\)                       0x0
 
-Relocation section '\.rela\.got' at offset 0x1110 contains 2 entries:
+Relocation section '\.rela\.got' at offset 0x10e8 contains 2 entries:
  Offset     Info    Type                Sym\. Value  Symbol's Name \+ Addend
-100000b8  00000701 R_C6000_ABS32          100000c0   b \+ 0
-100000bc  00000901 R_C6000_ABS32          100000c4   a \+ 0
+100000b8  00000601 R_C6000_ABS32          100000c0   b \+ 0
+100000bc  00000801 R_C6000_ABS32          100000c4   a \+ 0
 
-Relocation section '\.rela\.bss' at offset 0x1128 contains 1 entry:
+Relocation section '\.rela\.bss' at offset 0x1100 contains 1 entry:
  Offset     Info    Type                Sym\. Value  Symbol's Name \+ Addend
-100000c4  0000091a R_C6000_COPY           100000c4   a \+ 0
+100000c4  0000081a 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  0000081b R_C6000_JUMP_SLOT      00000000   sub0 \+ 0
+100000b4  0000071b R_C6000_JUMP_SLOT      00000000   sub0 \+ 0
 
-Symbol table '\.dynsym' contains 10 entries:
+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 
@@ -82,33 +82,32 @@ Symbol table '\.dynsym' contains 10 entries:
      3: 100000a0     0 SECTION LOCAL  DEFAULT   10 
      4: 100000c0     0 SECTION LOCAL  DEFAULT   11 
      5: 100000c4     0 SECTION LOCAL  DEFAULT   12 
-     6: 100000a0     0 NOTYPE  LOCAL  DEFAULT   10 __c6xabi_DSBT_BASE
-     7: 100000c0     4 OBJECT  GLOBAL DEFAULT   11 b
-     8: 00000000     0 FUNC    GLOBAL DEFAULT  UND sub0
-     9: 100000c4     4 OBJECT  GLOBAL DEFAULT   12 a
+     6: 100000c0     4 OBJECT  GLOBAL DEFAULT   11 b
+     7: 00000000     0 FUNC    GLOBAL DEFAULT  UND sub0
+     8: 100000c4     4 OBJECT  GLOBAL DEFAULT   12 a
 
-Symbol table '\.symtab' contains [0-9]+ entries:
+Symbol table '\.symtab' contains 23 entries:
    Num:    Value  Size Type    Bind   Vis      Ndx Name
-.* 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   10 __c6xabi_DSBT_BASE
-.* 100000c0     4 OBJECT  GLOBAL DEFAULT   11 b
-.* 00000000     0 FUNC    GLOBAL DEFAULT  UND sub0
-.* 100000c4     4 OBJECT  GLOBAL DEFAULT   12 a
+     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 tmpdir/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
diff --git a/ld/testsuite/ld-tic6x/shlib-noindex.rd b/ld/testsuite/ld-tic6x/shlib-noindex.rd
index be06125128..ea515be556 100644
--- a/ld/testsuite/ld-tic6x/shlib-noindex.rd
+++ b/ld/testsuite/ld-tic6x/shlib-noindex.rd
@@ -3,13 +3,13 @@ There are 18 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 000048 04   A  2   0  4
-  \[ 2\] \.dynsym           DYNSYM          00008048 001048 0000d0 10   A  3   7  4
-  \[ 3\] \.dynstr           STRTAB          00008118 001118 000025 00   A  0   0  1
-  \[ 4\] \.rela\.text        RELA            00008140 001140 00000c 0c  AI  2  10  4
-  \[ 5\] \.rela\.got         RELA            0000814c 00114c 000024 0c  AI  2  11  4
-  \[ 6\] \.rela\.neardata    RELA            00008170 001170 000018 0c  AI  2  12  4
-  \[ 7\] \.dynamic          DYNAMIC         00008188 001188 0000b0 08  WA  3   0  4
+  \[ 1\] \.hash             HASH            00008000 001000 000044 04   A  2   0  4
+  \[ 2\] \.dynsym           DYNSYM          00008044 001044 0000c0 10   A  3   6  4
+  \[ 3\] \.dynstr           STRTAB          00008104 001104 000012 00   A  0   0  1
+  \[ 4\] \.rela\.text        RELA            00008118 001118 00000c 0c  AI  2  10  4
+  \[ 5\] \.rela\.got         RELA            00008124 001124 000024 0c  AI  2  11  4
+  \[ 6\] \.rela\.neardata    RELA            00008148 001148 000018 0c  AI  2  12  4
+  \[ 7\] \.dynamic          DYNAMIC         00008160 001160 0000b0 08  WA  3   0  4
   \[ 8\] \.rela\.plt         RELA            10000000 002000 000018 0c  AI  2  11  4
   \[ 9\] \.plt              PROGBITS        10000020 002020 000060 18  AX  0   0 32
   \[10\] \.text             PROGBITS        10000080 002080 000080 00  AX  0   0 32
@@ -17,9 +17,9 @@ Section Headers:
   \[12\] \.neardata         PROGBITS        10000128 002128 000008 00  WA  0   0  4
   \[13\] \.bss              NOBITS          10000130 002130 000004 00  WA  0   0  4
   \[14\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 002130 000019 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
-  \[17\] \.shstrtab         STRTAB          00000000 [0-9a-f]+ 000080 00      0   0  1
+  \[15\] \.symtab           SYMTAB          00000000 00214c 0001c0 10     16  22  4
+  \[16\] \.strtab           STRTAB          00000000 00230c 00005c 00      0   0  1
+  \[17\] \.shstrtab         STRTAB          00000000 002368 000080 00      0   0  1
 Key to Flags:
 #...
 
@@ -29,9 +29,9 @@ There are 4 program headers, starting at offset 52
 
 Program Headers:
   Type           Offset   VirtAddr   PhysAddr   FileSiz MemSiz  Flg Align
-  LOAD           0x001000 0x00008000 0x00008000 0x00238 0x00238 RW  0x1000
+  LOAD           0x001000 0x00008000 0x00008000 0x00210 0x00210 RW  0x1000
   LOAD           0x002000 0x10000000 0x10000000 0x00130 0x00134 RWE 0x1000
-  DYNAMIC        0x001188 0x00008188 0x00008188 0x000b0 0x000b0 RW  0x4
+  DYNAMIC        0x001160 0x00008160 0x00008160 0x000b0 0x000b0 RW  0x4
   GNU_STACK      0x000000 0x00000000 0x00000000 0x00000 0x20000 RWE 0x8
 
  Section to Segment mapping:
@@ -41,12 +41,12 @@ Program Headers:
    02     \.dynamic 
    03     
 
-Dynamic section at offset 0x1188 contains 17 entries:
+Dynamic section at offset 0x1160 contains 17 entries:
   Tag        Type                         Name/Value
  0x00000004 \(HASH\)                       0x8000
- 0x00000005 \(STRTAB\)                     0x8118
- 0x00000006 \(SYMTAB\)                     0x8048
- 0x0000000a \(STRSZ\)                      37 \(bytes\)
+ 0x00000005 \(STRTAB\)                     0x8104
+ 0x00000006 \(SYMTAB\)                     0x8044
+ 0x0000000a \(STRSZ\)                      18 \(bytes\)
  0x0000000b \(SYMENT\)                     16 \(bytes\)
  0x70000000 \(C6000_DSBT_BASE\)            0x10000100
  0x70000001 \(C6000_DSBT_SIZE\)            0x3
@@ -55,33 +55,33 @@ Dynamic section at offset 0x1188 contains 17 entries:
  0x00000002 \(PLTRELSZ\)                   24 \(bytes\)
  0x00000014 \(PLTREL\)                     RELA
  0x00000017 \(JMPREL\)                     0x10000000
- 0x00000007 \(RELA\)                       0x8140
+ 0x00000007 \(RELA\)                       0x8118
  0x00000008 \(RELASZ\)                     96 \(bytes\)
  0x00000009 \(RELAENT\)                    12 \(bytes\)
  0x00000016 \(TEXTREL\)                    0x0
  0x00000000 \(NULL\)                       0x0
 
-Relocation section '\.rela\.text' at offset 0x1140 contains 1 entry:
+Relocation section '\.rela\.text' at offset 0x1118 contains 1 entry:
  Offset     Info    Type                Sym\. Value  Symbol's Name \+ Addend
-10000094  00000618 R_C6000_DSBT_INDEX     10000100   __c6xabi_DSBT_BASE \+ 0
+10000094  00000318 R_C6000_DSBT_INDEX     10000100   \.got - 10000100
 
-Relocation section '\.rela\.got' at offset 0x114c contains 3 entries:
+Relocation section '\.rela\.got' at offset 0x1124 contains 3 entries:
  Offset     Info    Type                Sym\. Value  Symbol's Name \+ Addend
 10000120  00000501 R_C6000_ABS32          10000130   \.bss \+ 0
-1000011c  00000701 R_C6000_ABS32          00000000   b \+ 0
-10000124  00000b01 R_C6000_ABS32          10000128   a \+ 0
+1000011c  00000601 R_C6000_ABS32          00000000   b \+ 0
+10000124  00000a01 R_C6000_ABS32          10000128   a \+ 0
 
-Relocation section '\.rela\.neardata' at offset 0x1170 contains 2 entries:
+Relocation section '\.rela\.neardata' at offset 0x1148 contains 2 entries:
  Offset     Info    Type                Sym\. Value  Symbol's Name \+ Addend
-10000128  00000a01 R_C6000_ABS32          10000088   sub0 \+ 0
-1000012c  00000801 R_C6000_ABS32          00000000   g1 \+ 0
+10000128  00000901 R_C6000_ABS32          10000088   sub0 \+ 0
+1000012c  00000701 R_C6000_ABS32          00000000   g1 \+ 0
 
 Relocation section '\.rela\.plt' at offset 0x2000 contains 2 entries:
  Offset     Info    Type                Sym\. Value  Symbol's Name \+ Addend
-10000114  00000a1b R_C6000_JUMP_SLOT      10000088   sub0 \+ 0
-10000118  00000c1b R_C6000_JUMP_SLOT      100000c0   sub \+ 0
+10000114  0000091b R_C6000_JUMP_SLOT      10000088   sub0 \+ 0
+10000118  00000b1b R_C6000_JUMP_SLOT      100000c0   sub \+ 0
 
-Symbol table '\.dynsym' contains 13 entries:
+Symbol table '\.dynsym' contains 12 entries:
    Num:    Value  Size Type    Bind   Vis      Ndx Name
      0: 00000000     0 NOTYPE  LOCAL  DEFAULT  UND 
      1: 10000020     0 SECTION LOCAL  DEFAULT    9 
@@ -89,41 +89,40 @@ Symbol table '\.dynsym' contains 13 entries:
      3: 10000100     0 SECTION LOCAL  DEFAULT   11 
      4: 10000128     0 SECTION LOCAL  DEFAULT   12 
      5: 10000130     0 SECTION LOCAL  DEFAULT   13 
-     6: 10000100     0 NOTYPE  LOCAL  DEFAULT   11 __c6xabi_DSBT_BASE
-     7: 00000000     0 NOTYPE  WEAK   DEFAULT  UND b
-     8: 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
-     9: 1000012c     4 OBJECT  GLOBAL DEFAULT   12 g2
-    10: 10000088    52 FUNC    GLOBAL DEFAULT   10 sub0
-    11: 10000128     4 OBJECT  GLOBAL DEFAULT   12 a
-    12: 100000c0    52 FUNC    GLOBAL DEFAULT   10 sub
+     6: 00000000     0 NOTYPE  WEAK   DEFAULT  UND b
+     7: 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
+     8: 1000012c     4 OBJECT  GLOBAL DEFAULT   12 g2
+     9: 10000088    52 FUNC    GLOBAL DEFAULT   10 sub0
+    10: 10000128     4 OBJECT  GLOBAL DEFAULT   12 a
+    11: 100000c0    52 FUNC    GLOBAL DEFAULT   10 sub
 
-Symbol table '\.symtab' contains [0-9]+ entries:
+Symbol table '\.symtab' contains 28 entries:
    Num:    Value  Size Type    Bind   Vis      Ndx Name
-.* 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
-.* 00000000     0 FILE    LOCAL  DEFAULT  ABS 
-.* 00008188     0 OBJECT  LOCAL  DEFAULT  ABS _DYNAMIC
-.* 10000130     4 OBJECT  LOCAL  DEFAULT   13 c
-.* 1000010c     0 OBJECT  LOCAL  DEFAULT  ABS _GLOBAL_OFFSET_TABLE_
-.* 10000100     0 NOTYPE  LOCAL  DEFAULT   11 __c6xabi_DSBT_BASE
-.* 00000000     0 NOTYPE  WEAK   DEFAULT  UND b
-.* 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
+     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: 00008118     0 SECTION LOCAL  DEFAULT    4 
+     5: 00008124     0 SECTION LOCAL  DEFAULT    5 
+     6: 00008148     0 SECTION LOCAL  DEFAULT    6 
+     7: 00008160     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: 00000000     0 FILE    LOCAL  DEFAULT  ABS tmpdir/shlib-1\.o
+    16: 10000080     0 FUNC    LOCAL  HIDDEN    10 sub1
+    17: 00000000     0 FILE    LOCAL  DEFAULT  ABS 
+    18: 00008160     0 OBJECT  LOCAL  DEFAULT  ABS _DYNAMIC
+    19: 10000130     4 OBJECT  LOCAL  DEFAULT   13 c
+    20: 1000010c     0 OBJECT  LOCAL  DEFAULT  ABS _GLOBAL_OFFSET_TABLE_
+    21: 10000100     0 NOTYPE  LOCAL  DEFAULT   11 __c6xabi_DSBT_BASE
+    22: 00000000     0 NOTYPE  WEAK   DEFAULT  UND b
+    23: 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
+    24: 1000012c     4 OBJECT  GLOBAL DEFAULT   12 g2
+    25: 10000088    52 FUNC    GLOBAL DEFAULT   10 sub0
+    26: 10000128     4 OBJECT  GLOBAL DEFAULT   12 a
+    27: 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 27d2d235f0..8fa34377e3 100644
--- a/ld/testsuite/ld-tic6x/static-app-1.rd
+++ b/ld/testsuite/ld-tic6x/static-app-1.rd
@@ -3,20 +3,20 @@ 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 00003c 04   A  2   0  4
-  \[ 2\] \.dynsym           DYNSYM          0000803c 00103c 0000a0 10   A  3   7  4
-  \[ 3\] \.dynstr           STRTAB          000080dc 0010dc 00001d 00   A  0   0  1
-  \[ 4\] \.rela\.got         RELA            000080fc 0010fc 000024 0c  AI  2   8  4
-  \[ 5\] \.rela\.neardata    RELA            00008120 001120 000030 0c  AI  2   9  4
-  \[ 6\] \.dynamic          DYNAMIC         00008150 001150 000090 08  WA  3   0  4
+  \[ 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
   \[ 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 [0-9a-f]+ [0-9a-f]+ 10     13  [0-9]+  4
-  \[13\] \.strtab           STRTAB          00000000 [0-9a-f]+ [0-9a-f]+ 00      0   0  1
-  \[14\] \.shstrtab         STRTAB          00000000 [0-9a-f]+ 000071 00      0   0  1
+  \[12\] \.symtab           SYMTAB          00000000 002110 0001c0 10     13  22  4
+  \[13\] \.strtab           STRTAB          00000000 0022d0 000078 00      0   0  1
+  \[14\] \.shstrtab         STRTAB          00000000 002348 000071 00      0   0  1
 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 0x001e0 0x001e0 RW  0x1000
+  LOAD           0x001000 0x00008000 0x00008000 0x001b8 0x001b8 RW  0x1000
   LOAD           0x002000 0x10000000 0x10000000 0x000f4 0x000f8 RWE 0x1000
-  DYNAMIC        0x001150 0x00008150 0x00008150 0x00090 0x00090 RW  0x4
+  DYNAMIC        0x001128 0x00008128 0x00008128 0x00090 0x00090 RW  0x4
   GNU_STACK      0x000000 0x00000000 0x00000000 0x00000 0x20000 RWE 0x8
 
  Section to Segment mapping:
@@ -38,36 +38,36 @@ Program Headers:
    02     \.dynamic 
    03     
 
-Dynamic section at offset 0x1150 contains 13 entries:
+Dynamic section at offset 0x1128 contains 13 entries:
   Tag        Type                         Name/Value
  0x00000004 \(HASH\)                       0x8000
- 0x00000005 \(STRTAB\)                     0x80dc
- 0x00000006 \(SYMTAB\)                     0x803c
- 0x0000000a \(STRSZ\)                      29 \(bytes\)
+ 0x00000005 \(STRTAB\)                     0x80c8
+ 0x00000006 \(SYMTAB\)                     0x8038
+ 0x0000000a \(STRSZ\)                      10 \(bytes\)
  0x0000000b \(SYMENT\)                     16 \(bytes\)
  0x00000015 \(DEBUG\)                      0x0
  0x70000000 \(C6000_DSBT_BASE\)            0x100000c0
  0x70000001 \(C6000_DSBT_SIZE\)            0x3
  0x70000003 \(C6000_DSBT_INDEX\)           0x0
- 0x00000007 \(RELA\)                       0x80fc
+ 0x00000007 \(RELA\)                       0x80d4
  0x00000008 \(RELASZ\)                     84 \(bytes\)
  0x00000009 \(RELAENT\)                    12 \(bytes\)
  0x00000000 \(NULL\)                       0x0
 
-Relocation section '\.rela\.got' at offset 0x10fc contains 3 entries:
+Relocation section '\.rela\.got' at offset 0x10d4 contains 3 entries:
  Offset     Info    Type                Sym\. Value  Symbol's Name \+ Addend
 100000d8  00000401 R_C6000_ABS32          100000f4   \.bss \+ 0
-100000d4  00000701 R_C6000_ABS32          100000e8   b \+ 0
-100000dc  00000901 R_C6000_ABS32          100000e0   a \+ 0
+100000d4  00000601 R_C6000_ABS32          100000e8   b \+ 0
+100000dc  00000801 R_C6000_ABS32          100000e0   a \+ 0
 
-Relocation section '\.rela\.neardata' at offset 0x1120 contains 4 entries:
+Relocation section '\.rela\.neardata' at offset 0x10f8 contains 4 entries:
  Offset     Info    Type                Sym\. Value  Symbol's Name \+ Addend
 100000e0  00000101 R_C6000_ABS32          10000000   \.text \+ 8
-100000e4  00000801 R_C6000_ABS32          00000000   g1 \+ 0
-100000ec  00000801 R_C6000_ABS32          00000000   g1 \+ 0
+100000e4  00000701 R_C6000_ABS32          00000000   g1 \+ 0
+100000ec  00000701 R_C6000_ABS32          00000000   g1 \+ 0
 100000f0  00000301 R_C6000_ABS32          100000e0   \.neardata \+ 4
 
-Symbol table '\.dynsym' contains 10 entries:
+Symbol table '\.dynsym' contains 9 entries:
    Num:    Value  Size Type    Bind   Vis      Ndx Name
      0: 00000000     0 NOTYPE  LOCAL  DEFAULT  UND 
      1: 10000000     0 SECTION LOCAL  DEFAULT    7 
@@ -75,38 +75,37 @@ Symbol table '\.dynsym' contains 10 entries:
      3: 100000e0     0 SECTION LOCAL  DEFAULT    9 
      4: 100000f4     0 SECTION LOCAL  DEFAULT   10 
      5: 100000f4     4 OBJECT  LOCAL  DEFAULT   10 c
-     6: 100000c0     0 NOTYPE  LOCAL  DEFAULT    8 __c6xabi_DSBT_BASE
-     7: 100000e8     4 OBJECT  GLOBAL DEFAULT    9 b
-     8: 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
-     9: 100000e0     4 OBJECT  GLOBAL DEFAULT    9 a
+     6: 100000e8     4 OBJECT  GLOBAL DEFAULT    9 b
+     7: 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
+     8: 100000e0     4 OBJECT  GLOBAL DEFAULT    9 a
 
-Symbol table '\.symtab' contains [0-9]+ entries:
+Symbol table '\.symtab' contains 28 entries:
    Num:    Value  Size Type    Bind   Vis      Ndx Name
-.* 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    8 __c6xabi_DSBT_BASE
-.* 100000e8     4 OBJECT  GLOBAL DEFAULT    9 b
-.* 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
+     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 tmpdir/shlib-1\.o
+    13: 10000000     0 FUNC    LOCAL  HIDDEN     7 sub1
+    14: 00000000     0 FILE    LOCAL  DEFAULT  ABS tmpdir/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
diff --git a/ld/testsuite/ld-tic6x/static-app-1b.rd b/ld/testsuite/ld-tic6x/static-app-1b.rd
index 27d2d235f0..8fa34377e3 100644
--- a/ld/testsuite/ld-tic6x/static-app-1b.rd
+++ b/ld/testsuite/ld-tic6x/static-app-1b.rd
@@ -3,20 +3,20 @@ 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 00003c 04   A  2   0  4
-  \[ 2\] \.dynsym           DYNSYM          0000803c 00103c 0000a0 10   A  3   7  4
-  \[ 3\] \.dynstr           STRTAB          000080dc 0010dc 00001d 00   A  0   0  1
-  \[ 4\] \.rela\.got         RELA            000080fc 0010fc 000024 0c  AI  2   8  4
-  \[ 5\] \.rela\.neardata    RELA            00008120 001120 000030 0c  AI  2   9  4
-  \[ 6\] \.dynamic          DYNAMIC         00008150 001150 000090 08  WA  3   0  4
+  \[ 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
   \[ 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 [0-9a-f]+ [0-9a-f]+ 10     13  [0-9]+  4
-  \[13\] \.strtab           STRTAB          00000000 [0-9a-f]+ [0-9a-f]+ 00      0   0  1
-  \[14\] \.shstrtab         STRTAB          00000000 [0-9a-f]+ 000071 00      0   0  1
+  \[12\] \.symtab           SYMTAB          00000000 002110 0001c0 10     13  22  4
+  \[13\] \.strtab           STRTAB          00000000 0022d0 000078 00      0   0  1
+  \[14\] \.shstrtab         STRTAB          00000000 002348 000071 00      0   0  1
 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 0x001e0 0x001e0 RW  0x1000
+  LOAD           0x001000 0x00008000 0x00008000 0x001b8 0x001b8 RW  0x1000
   LOAD           0x002000 0x10000000 0x10000000 0x000f4 0x000f8 RWE 0x1000
-  DYNAMIC        0x001150 0x00008150 0x00008150 0x00090 0x00090 RW  0x4
+  DYNAMIC        0x001128 0x00008128 0x00008128 0x00090 0x00090 RW  0x4
   GNU_STACK      0x000000 0x00000000 0x00000000 0x00000 0x20000 RWE 0x8
 
  Section to Segment mapping:
@@ -38,36 +38,36 @@ Program Headers:
    02     \.dynamic 
    03     
 
-Dynamic section at offset 0x1150 contains 13 entries:
+Dynamic section at offset 0x1128 contains 13 entries:
   Tag        Type                         Name/Value
  0x00000004 \(HASH\)                       0x8000
- 0x00000005 \(STRTAB\)                     0x80dc
- 0x00000006 \(SYMTAB\)                     0x803c
- 0x0000000a \(STRSZ\)                      29 \(bytes\)
+ 0x00000005 \(STRTAB\)                     0x80c8
+ 0x00000006 \(SYMTAB\)                     0x8038
+ 0x0000000a \(STRSZ\)                      10 \(bytes\)
  0x0000000b \(SYMENT\)                     16 \(bytes\)
  0x00000015 \(DEBUG\)                      0x0
  0x70000000 \(C6000_DSBT_BASE\)            0x100000c0
  0x70000001 \(C6000_DSBT_SIZE\)            0x3
  0x70000003 \(C6000_DSBT_INDEX\)           0x0
- 0x00000007 \(RELA\)                       0x80fc
+ 0x00000007 \(RELA\)                       0x80d4
  0x00000008 \(RELASZ\)                     84 \(bytes\)
  0x00000009 \(RELAENT\)                    12 \(bytes\)
  0x00000000 \(NULL\)                       0x0
 
-Relocation section '\.rela\.got' at offset 0x10fc contains 3 entries:
+Relocation section '\.rela\.got' at offset 0x10d4 contains 3 entries:
  Offset     Info    Type                Sym\. Value  Symbol's Name \+ Addend
 100000d8  00000401 R_C6000_ABS32          100000f4   \.bss \+ 0
-100000d4  00000701 R_C6000_ABS32          100000e8   b \+ 0
-100000dc  00000901 R_C6000_ABS32          100000e0   a \+ 0
+100000d4  00000601 R_C6000_ABS32          100000e8   b \+ 0
+100000dc  00000801 R_C6000_ABS32          100000e0   a \+ 0
 
-Relocation section '\.rela\.neardata' at offset 0x1120 contains 4 entries:
+Relocation section '\.rela\.neardata' at offset 0x10f8 contains 4 entries:
  Offset     Info    Type                Sym\. Value  Symbol's Name \+ Addend
 100000e0  00000101 R_C6000_ABS32          10000000   \.text \+ 8
-100000e4  00000801 R_C6000_ABS32          00000000   g1 \+ 0
-100000ec  00000801 R_C6000_ABS32          00000000   g1 \+ 0
+100000e4  00000701 R_C6000_ABS32          00000000   g1 \+ 0
+100000ec  00000701 R_C6000_ABS32          00000000   g1 \+ 0
 100000f0  00000301 R_C6000_ABS32          100000e0   \.neardata \+ 4
 
-Symbol table '\.dynsym' contains 10 entries:
+Symbol table '\.dynsym' contains 9 entries:
    Num:    Value  Size Type    Bind   Vis      Ndx Name
      0: 00000000     0 NOTYPE  LOCAL  DEFAULT  UND 
      1: 10000000     0 SECTION LOCAL  DEFAULT    7 
@@ -75,38 +75,37 @@ Symbol table '\.dynsym' contains 10 entries:
      3: 100000e0     0 SECTION LOCAL  DEFAULT    9 
      4: 100000f4     0 SECTION LOCAL  DEFAULT   10 
      5: 100000f4     4 OBJECT  LOCAL  DEFAULT   10 c
-     6: 100000c0     0 NOTYPE  LOCAL  DEFAULT    8 __c6xabi_DSBT_BASE
-     7: 100000e8     4 OBJECT  GLOBAL DEFAULT    9 b
-     8: 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
-     9: 100000e0     4 OBJECT  GLOBAL DEFAULT    9 a
+     6: 100000e8     4 OBJECT  GLOBAL DEFAULT    9 b
+     7: 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
+     8: 100000e0     4 OBJECT  GLOBAL DEFAULT    9 a
 
-Symbol table '\.symtab' contains [0-9]+ entries:
+Symbol table '\.symtab' contains 28 entries:
    Num:    Value  Size Type    Bind   Vis      Ndx Name
-.* 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    8 __c6xabi_DSBT_BASE
-.* 100000e8     4 OBJECT  GLOBAL DEFAULT    9 b
-.* 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
+     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 tmpdir/shlib-1\.o
+    13: 10000000     0 FUNC    LOCAL  HIDDEN     7 sub1
+    14: 00000000     0 FILE    LOCAL  DEFAULT  ABS tmpdir/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
diff --git a/ld/testsuite/ld-tic6x/static-app-1r.rd b/ld/testsuite/ld-tic6x/static-app-1r.rd
index 9f3ed9bae3..9b05b466ed 100644
--- a/ld/testsuite/ld-tic6x/static-app-1r.rd
+++ b/ld/testsuite/ld-tic6x/static-app-1r.rd
@@ -3,20 +3,20 @@ 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 00003c 04   A  2   0  4
-  \[ 2\] \.dynsym           DYNSYM          0000803c 00103c 0000a0 10   A  3   7  4
-  \[ 3\] \.dynstr           STRTAB          000080dc 0010dc 00001d 00   A  0   0  1
-  \[ 4\] \.rela\.got         RELA            000080fc 0010fc 000024 0c  AI  2   8  4
-  \[ 5\] \.rela\.neardata    RELA            00008120 001120 000018 0c  AI  2   9  4
-  \[ 6\] \.dynamic          DYNAMIC         00008138 001138 000090 08  WA  3   0  4
+  \[ 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
   \[ 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 [0-9a-f]+ [0-9a-f]+ 10     13  [0-9]+  4
-  \[13\] \.strtab           STRTAB          00000000 [0-9a-f]+ [0-9a-f]+ 00      0   0  1
-  \[14\] \.shstrtab         STRTAB          00000000 [0-9a-f]+ 000071 00      0   0  1
+  \[12\] \.symtab           SYMTAB          00000000 002108 0001b0 10     13  21  4
+  \[13\] \.strtab           STRTAB          00000000 0022b8 000077 00      0   0  1
+  \[14\] \.shstrtab         STRTAB          00000000 00232f 000071 00      0   0  1
 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 0x001c8 0x001c8 RW  0x1000
+  LOAD           0x001000 0x00008000 0x00008000 0x001a0 0x001a0 RW  0x1000
   LOAD           0x002000 0x10000000 0x10000000 0x000ec 0x000f0 RWE 0x1000
-  DYNAMIC        0x001138 0x00008138 0x00008138 0x00090 0x00090 RW  0x4
+  DYNAMIC        0x001110 0x00008110 0x00008110 0x00090 0x00090 RW  0x4
   GNU_STACK      0x000000 0x00000000 0x00000000 0x00000 0x20000 RWE 0x8
 
  Section to Segment mapping:
@@ -38,34 +38,34 @@ Program Headers:
    02     \.dynamic 
    03     
 
-Dynamic section at offset 0x1138 contains 13 entries:
+Dynamic section at offset 0x1110 contains 13 entries:
   Tag        Type                         Name/Value
  0x00000004 \(HASH\)                       0x8000
- 0x00000005 \(STRTAB\)                     0x80dc
- 0x00000006 \(SYMTAB\)                     0x803c
- 0x0000000a \(STRSZ\)                      29 \(bytes\)
+ 0x00000005 \(STRTAB\)                     0x80c8
+ 0x00000006 \(SYMTAB\)                     0x8038
+ 0x0000000a \(STRSZ\)                      10 \(bytes\)
  0x0000000b \(SYMENT\)                     16 \(bytes\)
  0x00000015 \(DEBUG\)                      0x0
  0x70000000 \(C6000_DSBT_BASE\)            0x100000c0
  0x70000001 \(C6000_DSBT_SIZE\)            0x3
  0x70000003 \(C6000_DSBT_INDEX\)           0x0
- 0x00000007 \(RELA\)                       0x80fc
+ 0x00000007 \(RELA\)                       0x80d4
  0x00000008 \(RELASZ\)                     60 \(bytes\)
  0x00000009 \(RELAENT\)                    12 \(bytes\)
  0x00000000 \(NULL\)                       0x0
 
-Relocation section '\.rela\.got' at offset 0x10fc contains 3 entries:
+Relocation section '\.rela\.got' at offset 0x10d4 contains 3 entries:
  Offset     Info    Type                Sym\. Value  Symbol's Name \+ Addend
 100000d8  00000401 R_C6000_ABS32          100000ec   \.bss \+ 0
-100000d4  00000701 R_C6000_ABS32          100000e8   b \+ 0
-100000dc  00000901 R_C6000_ABS32          100000e0   a \+ 0
+100000d4  00000601 R_C6000_ABS32          100000e8   b \+ 0
+100000dc  00000801 R_C6000_ABS32          100000e0   a \+ 0
 
-Relocation section '\.rela\.neardata' at offset 0x1120 contains 2 entries:
+Relocation section '\.rela\.neardata' at offset 0x10f8 contains 2 entries:
  Offset     Info    Type                Sym\. Value  Symbol's Name \+ Addend
 100000e0  00000101 R_C6000_ABS32          10000000   \.text \+ 8
-100000e4  00000801 R_C6000_ABS32          00000000   g1 \+ 0
+100000e4  00000701 R_C6000_ABS32          00000000   g1 \+ 0
 
-Symbol table '\.dynsym' contains 10 entries:
+Symbol table '\.dynsym' contains 9 entries:
    Num:    Value  Size Type    Bind   Vis      Ndx Name
      0: 00000000     0 NOTYPE  LOCAL  DEFAULT  UND 
      1: 10000000     0 SECTION LOCAL  DEFAULT    7 
@@ -73,37 +73,36 @@ Symbol table '\.dynsym' contains 10 entries:
      3: 100000e0     0 SECTION LOCAL  DEFAULT    9 
      4: 100000ec     0 SECTION LOCAL  DEFAULT   10 
      5: 100000ec     4 OBJECT  LOCAL  DEFAULT   10 c
-     6: 100000c0     0 NOTYPE  LOCAL  DEFAULT    8 __c6xabi_DSBT_BASE
-     7: 100000e8     4 OBJECT  GLOBAL DEFAULT    9 b
-     8: 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
-     9: 100000e0     4 OBJECT  GLOBAL DEFAULT    9 a
+     6: 100000e8     4 OBJECT  GLOBAL DEFAULT    9 b
+     7: 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
+     8: 100000e0     4 OBJECT  GLOBAL DEFAULT    9 a
 
-Symbol table '\.symtab' contains [0-9]+ entries:
+Symbol table '\.symtab' contains 27 entries:
    Num:    Value  Size Type    Bind   Vis      Ndx Name
-.* 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    8 __c6xabi_DSBT_BASE
-.* 100000e8     4 OBJECT  GLOBAL DEFAULT    9 b
-.* 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
+     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 tmpdir/shlib-1\.o
+    13: 10000000     0 FUNC    LOCAL  HIDDEN     7 sub1
+    14: 00000000     0 FILE    LOCAL  DEFAULT  ABS tmpdir/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
diff --git a/ld/testsuite/ld-tic6x/static-app-1rb.rd b/ld/testsuite/ld-tic6x/static-app-1rb.rd
index 9f3ed9bae3..9b05b466ed 100644
--- a/ld/testsuite/ld-tic6x/static-app-1rb.rd
+++ b/ld/testsuite/ld-tic6x/static-app-1rb.rd
@@ -3,20 +3,20 @@ 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 00003c 04   A  2   0  4
-  \[ 2\] \.dynsym           DYNSYM          0000803c 00103c 0000a0 10   A  3   7  4
-  \[ 3\] \.dynstr           STRTAB          000080dc 0010dc 00001d 00   A  0   0  1
-  \[ 4\] \.rela\.got         RELA            000080fc 0010fc 000024 0c  AI  2   8  4
-  \[ 5\] \.rela\.neardata    RELA            00008120 001120 000018 0c  AI  2   9  4
-  \[ 6\] \.dynamic          DYNAMIC         00008138 001138 000090 08  WA  3   0  4
+  \[ 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
   \[ 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 [0-9a-f]+ [0-9a-f]+ 10     13  [0-9]+  4
-  \[13\] \.strtab           STRTAB          00000000 [0-9a-f]+ [0-9a-f]+ 00      0   0  1
-  \[14\] \.shstrtab         STRTAB          00000000 [0-9a-f]+ 000071 00      0   0  1
+  \[12\] \.symtab           SYMTAB          00000000 002108 0001b0 10     13  21  4
+  \[13\] \.strtab           STRTAB          00000000 0022b8 000077 00      0   0  1
+  \[14\] \.shstrtab         STRTAB          00000000 00232f 000071 00      0   0  1
 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 0x001c8 0x001c8 RW  0x1000
+  LOAD           0x001000 0x00008000 0x00008000 0x001a0 0x001a0 RW  0x1000
   LOAD           0x002000 0x10000000 0x10000000 0x000ec 0x000f0 RWE 0x1000
-  DYNAMIC        0x001138 0x00008138 0x00008138 0x00090 0x00090 RW  0x4
+  DYNAMIC        0x001110 0x00008110 0x00008110 0x00090 0x00090 RW  0x4
   GNU_STACK      0x000000 0x00000000 0x00000000 0x00000 0x20000 RWE 0x8
 
  Section to Segment mapping:
@@ -38,34 +38,34 @@ Program Headers:
    02     \.dynamic 
    03     
 
-Dynamic section at offset 0x1138 contains 13 entries:
+Dynamic section at offset 0x1110 contains 13 entries:
   Tag        Type                         Name/Value
  0x00000004 \(HASH\)                       0x8000
- 0x00000005 \(STRTAB\)                     0x80dc
- 0x00000006 \(SYMTAB\)                     0x803c
- 0x0000000a \(STRSZ\)                      29 \(bytes\)
+ 0x00000005 \(STRTAB\)                     0x80c8
+ 0x00000006 \(SYMTAB\)                     0x8038
+ 0x0000000a \(STRSZ\)                      10 \(bytes\)
  0x0000000b \(SYMENT\)                     16 \(bytes\)
  0x00000015 \(DEBUG\)                      0x0
  0x70000000 \(C6000_DSBT_BASE\)            0x100000c0
  0x70000001 \(C6000_DSBT_SIZE\)            0x3
  0x70000003 \(C6000_DSBT_INDEX\)           0x0
- 0x00000007 \(RELA\)                       0x80fc
+ 0x00000007 \(RELA\)                       0x80d4
  0x00000008 \(RELASZ\)                     60 \(bytes\)
  0x00000009 \(RELAENT\)                    12 \(bytes\)
  0x00000000 \(NULL\)                       0x0
 
-Relocation section '\.rela\.got' at offset 0x10fc contains 3 entries:
+Relocation section '\.rela\.got' at offset 0x10d4 contains 3 entries:
  Offset     Info    Type                Sym\. Value  Symbol's Name \+ Addend
 100000d8  00000401 R_C6000_ABS32          100000ec   \.bss \+ 0
-100000d4  00000701 R_C6000_ABS32          100000e8   b \+ 0
-100000dc  00000901 R_C6000_ABS32          100000e0   a \+ 0
+100000d4  00000601 R_C6000_ABS32          100000e8   b \+ 0
+100000dc  00000801 R_C6000_ABS32          100000e0   a \+ 0
 
-Relocation section '\.rela\.neardata' at offset 0x1120 contains 2 entries:
+Relocation section '\.rela\.neardata' at offset 0x10f8 contains 2 entries:
  Offset     Info    Type                Sym\. Value  Symbol's Name \+ Addend
 100000e0  00000101 R_C6000_ABS32          10000000   \.text \+ 8
-100000e4  00000801 R_C6000_ABS32          00000000   g1 \+ 0
+100000e4  00000701 R_C6000_ABS32          00000000   g1 \+ 0
 
-Symbol table '\.dynsym' contains 10 entries:
+Symbol table '\.dynsym' contains 9 entries:
    Num:    Value  Size Type    Bind   Vis      Ndx Name
      0: 00000000     0 NOTYPE  LOCAL  DEFAULT  UND 
      1: 10000000     0 SECTION LOCAL  DEFAULT    7 
@@ -73,37 +73,36 @@ Symbol table '\.dynsym' contains 10 entries:
      3: 100000e0     0 SECTION LOCAL  DEFAULT    9 
      4: 100000ec     0 SECTION LOCAL  DEFAULT   10 
      5: 100000ec     4 OBJECT  LOCAL  DEFAULT   10 c
-     6: 100000c0     0 NOTYPE  LOCAL  DEFAULT    8 __c6xabi_DSBT_BASE
-     7: 100000e8     4 OBJECT  GLOBAL DEFAULT    9 b
-     8: 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
-     9: 100000e0     4 OBJECT  GLOBAL DEFAULT    9 a
+     6: 100000e8     4 OBJECT  GLOBAL DEFAULT    9 b
+     7: 00000000     0 NOTYPE  WEAK   DEFAULT  UND g1
+     8: 100000e0     4 OBJECT  GLOBAL DEFAULT    9 a
 
-Symbol table '\.symtab' contains [0-9]+ entries:
+Symbol table '\.symtab' contains 27 entries:
    Num:    Value  Size Type    Bind   Vis      Ndx Name
-.* 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    8 __c6xabi_DSBT_BASE
-.* 100000e8     4 OBJECT  GLOBAL DEFAULT    9 b
-.* 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
+     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 tmpdir/shlib-1\.o
+    13: 10000000     0 FUNC    LOCAL  HIDDEN     7 sub1
+    14: 00000000     0 FILE    LOCAL  DEFAULT  ABS tmpdir/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
-- 
2.17.0


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]