This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
Re: [PATCH] PR ld/17975: Useless FILE entry in symbol table for linker generated symbols
- From: "H.J. Lu" <hjl dot tools at gmail dot com>
- To: Binutils <binutils at sourceware dot org>
- Date: Mon, 16 Feb 2015 08:39:49 -0800
- Subject: Re: [PATCH] PR ld/17975: Useless FILE entry in symbol table for linker generated symbols
- Authentication-results: sourceware.org; auth=none
- References: <20150215184602 dot GA25935 at gmail dot com> <20150216010455 dot GB4274 at bubble dot grove dot modra dot org> <CAMe9rOpZWO=VQFdaY1pDE5gnKk6ivAQ-OurH4DoOvPZnOVQ9Dw at mail dot gmail dot com> <20150216014744 dot GD4274 at bubble dot grove dot modra dot org> <CAMe9rOpjoW_ZFcLTHhik+oMhR2AUYROAH5FdeZ=xHzn3Dojm=g at mail dot gmail dot com> <20150216064203 dot GF4274 at bubble dot grove dot modra dot org> <CAMe9rOprf2Mc35EtSvm9xoeO4ynCv3GiPM18Ed_mVaHA8TtoqQ at mail dot gmail dot com>
On Mon, Feb 16, 2015 at 4:58 AM, H.J. Lu <hjl.tools@gmail.com> wrote:
> On Sun, Feb 15, 2015 at 10:42 PM, Alan Modra <amodra@gmail.com> wrote:
>> It turns out there is a complication in my proposal. When emitting a
>> relocation against a local symbol, we need to know the index of the
>> symbol in the output file. A similar difficulty occurs with group
>> signature local symbols. Delaying output of locals means we don't
>> know their indices. I think it would be possible to cope with this
>> but the amount of effort isn't worth the benefit.
>>
>> Go ahead with your patch.
>>
>
> Done. I will update testscases for this change. Please let me
> know if I miss any.
>
I checked in this.
--
H.J.
From 49bd1d6e875d4b9ab0cdb909ae6db2bfc95f364b Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Mon, 16 Feb 2015 08:35:17 -0800
Subject: [PATCH] Update more ld testcases after PR ld/17975 fix
* ld-alpha/tlspic.rd: Updated.
* ld-powerpc/tlsexe.r: Likewise.
* ld-powerpc/tlsexetoc.r: Likewise.
* ld-powerpc/tlsso.r: Likewise.
* ld-powerpc/tlstocso.r: Likewise.
* ld-s390/tlspic.rd: Likewise.
* ld-s390/tlspic_64.rd: Likewise.
* ld-sparc/gotop32.dd: Likewise.
* ld-sparc/gotop64.dd: Likewise.
* ld-sparc/tlssunnopic32.rd: Likewise.
* ld-sparc/tlssunnopic64.rd: Likewise.
* ld-sparc/tlssunpic32.rd: Likewise.
* ld-sparc/tlssunpic64.rd: Likewise.
* ld-tic6x/shlib-1.rd: Likewise.
* ld-tic6x/shlib-1b.rd: Likewise.
* ld-tic6x/shlib-1r.rd: Likewise.
* ld-tic6x/shlib-1rb.rd: Likewise.
* ld-tic6x/shlib-noindex.rd: Likewise.
---
ld/testsuite/ChangeLog | 18 ++++++++++++++++++
ld/testsuite/ld-alpha/tlspic.rd | 8 ++++----
ld/testsuite/ld-powerpc/tlsexe.r | 4 ++--
ld/testsuite/ld-powerpc/tlsexetoc.r | 4 ++--
ld/testsuite/ld-powerpc/tlsso.r | 4 ++--
ld/testsuite/ld-powerpc/tlstocso.r | 4 ++--
ld/testsuite/ld-s390/tlspic.rd | 6 +++---
ld/testsuite/ld-s390/tlspic_64.rd | 6 +++---
ld/testsuite/ld-sparc/gotop32.dd | 2 +-
ld/testsuite/ld-sparc/gotop64.dd | 2 +-
ld/testsuite/ld-sparc/tlssunnopic32.rd | 8 ++++----
ld/testsuite/ld-sparc/tlssunnopic64.rd | 8 ++++----
ld/testsuite/ld-sparc/tlssunpic32.rd | 8 ++++----
ld/testsuite/ld-sparc/tlssunpic64.rd | 8 ++++----
ld/testsuite/ld-tic6x/shlib-1.rd | 4 ++--
ld/testsuite/ld-tic6x/shlib-1b.rd | 4 ++--
ld/testsuite/ld-tic6x/shlib-1r.rd | 4 ++--
ld/testsuite/ld-tic6x/shlib-1rb.rd | 4 ++--
ld/testsuite/ld-tic6x/shlib-noindex.rd | 4 ++--
19 files changed, 64 insertions(+), 46 deletions(-)
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 85684ba..48919fb 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -19,6 +19,24 @@
* ld-x86-64/tlsdesc.rd: Likewise.
* ld-x86-64/tlspic-nacl.rd: Likewise.
* ld-x86-64/tlspic.rd: Likewise.
+ * ld-alpha/tlspic.rd: Likewise.
+ * ld-powerpc/tlsexe.r: Likewise.
+ * ld-powerpc/tlsexetoc.r: Likewise.
+ * ld-powerpc/tlsso.r: Likewise.
+ * ld-powerpc/tlstocso.r: Likewise.
+ * ld-s390/tlspic.rd: Likewise.
+ * ld-s390/tlspic_64.rd: Likewise.
+ * ld-sparc/gotop32.dd: Likewise.
+ * ld-sparc/gotop64.dd: Likewise.
+ * ld-sparc/tlssunnopic32.rd: Likewise.
+ * ld-sparc/tlssunnopic64.rd: Likewise.
+ * ld-sparc/tlssunpic32.rd: Likewise.
+ * ld-sparc/tlssunpic64.rd: Likewise.
+ * ld-tic6x/shlib-1.rd: Likewise.
+ * ld-tic6x/shlib-1b.rd: Likewise.
+ * ld-tic6x/shlib-1r.rd: Likewise.
+ * ld-tic6x/shlib-1rb.rd: Likewise.
+ * ld-tic6x/shlib-noindex.rd: Likewise.
2015-02-14 H.J. Lu <hongjiu.lu@intel.com>
diff --git a/ld/testsuite/ld-alpha/tlspic.rd b/ld/testsuite/ld-alpha/tlspic.rd
index 8117e55..cedd2d6 100644
--- a/ld/testsuite/ld-alpha/tlspic.rd
+++ b/ld/testsuite/ld-alpha/tlspic.rd
@@ -95,6 +95,10 @@ Symbol table '\.symtab' contains [0-9]+ entries:
.* [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +9 sl6
.* [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +9 sl7
.* [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +9 sl8
+.* FILE +LOCAL +DEFAULT +ABS
+.* [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +ABS _DYNAMIC
+.* [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
+.* [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
.* [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +10 sH1
.* [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +9 sh3
.* [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +10 sH2
@@ -111,10 +115,6 @@ Symbol table '\.symtab' contains [0-9]+ entries:
.* [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +9 sh1
.* [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +9 sh2
.* [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +9 sh6
-.* FILE +LOCAL +DEFAULT +ABS .*
-.* [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +ABS _DYNAMIC
-.* [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
-.* [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
.* [0-9a-f]+ +0 +TLS +GLOBAL +DEFAULT +9 sg8
.* [0-9a-f]+ +0 +TLS +GLOBAL +DEFAULT +9 sg3
.* [0-9a-f]+ +0 +TLS +GLOBAL +DEFAULT +9 sg4
diff --git a/ld/testsuite/ld-powerpc/tlsexe.r b/ld/testsuite/ld-powerpc/tlsexe.r
index 2ec65ab..9ce45e0 100644
--- a/ld/testsuite/ld-powerpc/tlsexe.r
+++ b/ld/testsuite/ld-powerpc/tlsexe.r
@@ -96,9 +96,9 @@ Symbol table '\.symtab' contains [0-9]+ entries:
.* TLS +LOCAL +DEFAULT +8 ie4
.* TLS +LOCAL +DEFAULT +8 le4
.* TLS +LOCAL +DEFAULT +8 le5
-.* (FUNC|NOTYPE) +LOCAL +DEFAULT +UND \.__tls_get_addr(|_opt)
-.* FILE +LOCAL +DEFAULT +ABS .*
+.* FILE +LOCAL +DEFAULT +ABS
.* OBJECT +LOCAL +DEFAULT +10 _DYNAMIC
+.* (FUNC|NOTYPE) +LOCAL +DEFAULT +UND \.__tls_get_addr(|_opt)
.* NOTYPE +LOCAL +DEFAULT +7 __glink_PLTresolve
.* NOTYPE +LOCAL +DEFAULT +7 .*\.plt_call\.__tls_get_addr(|_opt)
.* GLOBAL +DEFAULT +UND gd
diff --git a/ld/testsuite/ld-powerpc/tlsexetoc.r b/ld/testsuite/ld-powerpc/tlsexetoc.r
index d09aabe..eed4589 100644
--- a/ld/testsuite/ld-powerpc/tlsexetoc.r
+++ b/ld/testsuite/ld-powerpc/tlsexetoc.r
@@ -96,9 +96,9 @@ Symbol table '\.symtab' contains [0-9]+ entries:
.* TLS +LOCAL +DEFAULT +8 le4
.* TLS +LOCAL +DEFAULT +8 le5
.* NOTYPE +LOCAL +DEFAULT +12 \.Lie0
-.* (FUNC|NOTYPE) +LOCAL +DEFAULT +UND \.__tls_get_addr(|_opt)
-.* FILE +LOCAL +DEFAULT +ABS .*
+.* FILE +LOCAL +DEFAULT +ABS
.* OBJECT +LOCAL +DEFAULT +10 _DYNAMIC
+.* (FUNC|NOTYPE) +LOCAL +DEFAULT +UND \.__tls_get_addr(|_opt)
.* NOTYPE +LOCAL +DEFAULT +7 __glink_PLTresolve
.* NOTYPE +LOCAL +DEFAULT +7 .*\.plt_call\.__tls_get_addr(|_opt)
.* TLS +GLOBAL +DEFAULT +UND gd
diff --git a/ld/testsuite/ld-powerpc/tlsso.r b/ld/testsuite/ld-powerpc/tlsso.r
index 4043797..870bd0f 100644
--- a/ld/testsuite/ld-powerpc/tlsso.r
+++ b/ld/testsuite/ld-powerpc/tlsso.r
@@ -112,9 +112,9 @@ Symbol table '\.symtab' contains [0-9]+ entries:
.* TLS +LOCAL +DEFAULT +7 ie4
.* TLS +LOCAL +DEFAULT +7 le4
.* TLS +LOCAL +DEFAULT +7 le5
-.* NOTYPE +LOCAL +DEFAULT +UND \.__tls_get_addr
-.* FILE +LOCAL +DEFAULT +ABS .*
+.* FILE +LOCAL +DEFAULT +ABS
.* OBJECT +LOCAL +DEFAULT +9 _DYNAMIC
+.* NOTYPE +LOCAL +DEFAULT +UND \.__tls_get_addr
.* NOTYPE +LOCAL +DEFAULT +6 .*\.plt_call\.__tls_get_addr
.* NOTYPE +LOCAL +DEFAULT +6 __glink_PLTresolve
.* TLS +GLOBAL +DEFAULT +UND gd
diff --git a/ld/testsuite/ld-powerpc/tlstocso.r b/ld/testsuite/ld-powerpc/tlstocso.r
index a414151..1642327 100644
--- a/ld/testsuite/ld-powerpc/tlstocso.r
+++ b/ld/testsuite/ld-powerpc/tlstocso.r
@@ -108,9 +108,9 @@ Symbol table '\.symtab' contains [0-9]+ entries:
.* TLS +LOCAL +DEFAULT +7 le4
.* TLS +LOCAL +DEFAULT +7 le5
.* NOTYPE +LOCAL +DEFAULT +11 \.Lie0
-.* NOTYPE +LOCAL +DEFAULT +UND \.__tls_get_addr
-.* FILE +LOCAL +DEFAULT +ABS .*
+.* FILE +LOCAL +DEFAULT +ABS
.* OBJECT +LOCAL +DEFAULT +9 _DYNAMIC
+.* NOTYPE +LOCAL +DEFAULT +UND \.__tls_get_addr
.* NOTYPE +LOCAL +DEFAULT +6 .*\.plt_call\.__tls_get_addr
.* NOTYPE +LOCAL +DEFAULT +6 __glink_PLTresolve
.* TLS +GLOBAL +DEFAULT +UND gd
diff --git a/ld/testsuite/ld-s390/tlspic.rd b/ld/testsuite/ld-s390/tlspic.rd
index 5d27048..d1be919 100644
--- a/ld/testsuite/ld-s390/tlspic.rd
+++ b/ld/testsuite/ld-s390/tlspic.rd
@@ -110,6 +110,9 @@ Symbol table '\.symtab' contains [0-9]+ entries:
.* TLS +LOCAL +DEFAULT +8 sl6
.* TLS +LOCAL +DEFAULT +8 sl7
.* TLS +LOCAL +DEFAULT +8 sl8
+.* FILE +LOCAL +DEFAULT +ABS
+.* OBJECT +LOCAL +DEFAULT +ABS _DYNAMIC
+.* OBJECT +LOCAL +DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
.* TLS +LOCAL +DEFAULT +9 sH1
.* TLS +LOCAL +DEFAULT +8 sh3
.* TLS +LOCAL +DEFAULT +9 sH2
@@ -126,9 +129,6 @@ Symbol table '\.symtab' contains [0-9]+ entries:
.* TLS +LOCAL +DEFAULT +8 sh1
.* TLS +LOCAL +DEFAULT +8 sh2
.* TLS +LOCAL +DEFAULT +8 sh6
-.* FILE +LOCAL +DEFAULT +ABS .*
-.* OBJECT +LOCAL +DEFAULT +ABS _DYNAMIC
-.* OBJECT +LOCAL +DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
.* TLS +GLOBAL +DEFAULT +8 sg8
.* TLS +GLOBAL +DEFAULT +8 sg3
.* TLS +GLOBAL +DEFAULT +8 sg4
diff --git a/ld/testsuite/ld-s390/tlspic_64.rd b/ld/testsuite/ld-s390/tlspic_64.rd
index f4cce13..41124c5 100644
--- a/ld/testsuite/ld-s390/tlspic_64.rd
+++ b/ld/testsuite/ld-s390/tlspic_64.rd
@@ -110,6 +110,9 @@ Symbol table '\.symtab' contains [0-9]+ entries:
.* TLS +LOCAL +DEFAULT +8 sl6
.* TLS +LOCAL +DEFAULT +8 sl7
.* TLS +LOCAL +DEFAULT +8 sl8
+.* FILE +LOCAL +DEFAULT +ABS
+.* OBJECT +LOCAL +DEFAULT +ABS _DYNAMIC
+.* OBJECT +LOCAL +DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
.* TLS +LOCAL +DEFAULT +9 sH1
.* TLS +LOCAL +DEFAULT +8 sh3
.* TLS +LOCAL +DEFAULT +9 sH2
@@ -126,9 +129,6 @@ Symbol table '\.symtab' contains [0-9]+ entries:
.* TLS +LOCAL +DEFAULT +8 sh1
.* TLS +LOCAL +DEFAULT +8 sh2
.* TLS +LOCAL +DEFAULT +8 sh6
-.* FILE +LOCAL +DEFAULT +ABS .*
-.* OBJECT +LOCAL +DEFAULT +ABS _DYNAMIC
-.* OBJECT +LOCAL +DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
.* TLS +GLOBAL +DEFAULT +8 sg8
.* TLS +GLOBAL +DEFAULT +8 sg3
.* TLS +GLOBAL +DEFAULT +8 sg4
diff --git a/ld/testsuite/ld-sparc/gotop32.dd b/ld/testsuite/ld-sparc/gotop32.dd
index a599930..28dd942 100644
--- a/ld/testsuite/ld-sparc/gotop32.dd
+++ b/ld/testsuite/ld-sparc/gotop32.dd
@@ -14,7 +14,7 @@ Disassembly of section .text:
00001008 <foo>:
+1008: 9d e3 bf 98 save %sp, -104, %sp
+100c: 2f 00 00 44 sethi %hi\(0x11000\), %l7
- +1010: 7f ff ff fc call 1000 <_.*>
+ +1010: 7f ff ff fc call 1000 <foo-0x8>
+1014: ae 05 e0 60 add %l7, 0x60, %l7 ! 11060 <.*>
+1018: 01 00 00 00 nop *
+101c: 23 00 00 00 sethi %hi\(0\), %l1
diff --git a/ld/testsuite/ld-sparc/gotop64.dd b/ld/testsuite/ld-sparc/gotop64.dd
index d73fb18..e3c59c2 100644
--- a/ld/testsuite/ld-sparc/gotop64.dd
+++ b/ld/testsuite/ld-sparc/gotop64.dd
@@ -14,7 +14,7 @@ Disassembly of section .text:
0000000000001008 <foo>:
+1008: 9d e3 bf 60 save %sp, -160, %sp
+100c: 2f 00 04 04 sethi %hi\(0x101000\), %l7
- +1010: 7f ff ff fc call 1000 <_.*>
+ +1010: 7f ff ff fc call 1000 <foo-0x8>
+1014: ae 05 e0 d0 add %l7, 0xd0, %l7 ! 1010d0 <.*>
+1018: 01 00 00 00 nop *
+101c: 23 00 00 00 sethi %hi\(0\), %l1
diff --git a/ld/testsuite/ld-sparc/tlssunnopic32.rd b/ld/testsuite/ld-sparc/tlssunnopic32.rd
index 86fba1d..a04a8bc 100644
--- a/ld/testsuite/ld-sparc/tlssunnopic32.rd
+++ b/ld/testsuite/ld-sparc/tlssunnopic32.rd
@@ -79,14 +79,14 @@ Symbol table '\.symtab' contains [0-9]+ entries:
.* TLS +LOCAL +DEFAULT +6 bl3
.* TLS +LOCAL +DEFAULT +6 bl4
.* TLS +LOCAL +DEFAULT +6 bl5
+.* FILE +LOCAL +DEFAULT +ABS
+.* OBJECT +LOCAL +DEFAULT +ABS _DYNAMIC
+.* OBJECT +LOCAL +DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
+.* OBJECT +LOCAL +DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
.* TLS +LOCAL +DEFAULT +6 sh3
.* TLS +LOCAL +DEFAULT +6 sh4
.* TLS +LOCAL +DEFAULT +6 sh1
.* TLS +LOCAL +DEFAULT +6 sh2
-.* FILE +LOCAL +DEFAULT +ABS .*
-.* OBJECT +LOCAL +DEFAULT +ABS _DYNAMIC
-.* OBJECT +LOCAL +DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
-.* OBJECT +LOCAL +DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
.* FUNC +GLOBAL +DEFAULT +5 fn3
.* TLS +GLOBAL +DEFAULT +UND sg1
.* NOTYPE +GLOBAL +DEFAULT +8 __bss_start
diff --git a/ld/testsuite/ld-sparc/tlssunnopic64.rd b/ld/testsuite/ld-sparc/tlssunnopic64.rd
index 72555c1..370191a 100644
--- a/ld/testsuite/ld-sparc/tlssunnopic64.rd
+++ b/ld/testsuite/ld-sparc/tlssunnopic64.rd
@@ -81,14 +81,14 @@ Symbol table '\.symtab' contains [0-9]+ entries:
.* TLS +LOCAL +DEFAULT +6 bl3
.* TLS +LOCAL +DEFAULT +6 bl4
.* TLS +LOCAL +DEFAULT +6 bl5
+.* FILE +LOCAL +DEFAULT +ABS
+.* OBJECT +LOCAL +DEFAULT +ABS _DYNAMIC
+.* OBJECT +LOCAL +DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
+.* OBJECT +LOCAL +DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
.* TLS +LOCAL +DEFAULT +6 sh3
.* TLS +LOCAL +DEFAULT +6 sh4
.* TLS +LOCAL +DEFAULT +6 sh1
.* TLS +LOCAL +DEFAULT +6 sh2
-.* FILE +LOCAL +DEFAULT +ABS .*
-.* OBJECT +LOCAL +DEFAULT +ABS _DYNAMIC
-.* OBJECT +LOCAL +DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
-.* OBJECT +LOCAL +DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
.* FUNC +GLOBAL +DEFAULT +5 fn3
.* TLS +GLOBAL +DEFAULT +UND sg1
.* NOTYPE +GLOBAL +DEFAULT +8 __bss_start
diff --git a/ld/testsuite/ld-sparc/tlssunpic32.rd b/ld/testsuite/ld-sparc/tlssunpic32.rd
index eab1abe..d3b5621 100644
--- a/ld/testsuite/ld-sparc/tlssunpic32.rd
+++ b/ld/testsuite/ld-sparc/tlssunpic32.rd
@@ -102,6 +102,10 @@ Symbol table '\.symtab' contains [0-9]+ entries:
.* TLS +LOCAL +DEFAULT +7 sl6
.* TLS +LOCAL +DEFAULT +7 sl7
.* TLS +LOCAL +DEFAULT +7 sl8
+.* FILE +LOCAL +DEFAULT +ABS
+.* OBJECT +LOCAL +DEFAULT +ABS _DYNAMIC
+.* OBJECT +LOCAL +DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
+.* OBJECT +LOCAL +DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
.* TLS +LOCAL +DEFAULT +8 sH1
.* TLS +LOCAL +DEFAULT +7 sh3
.* TLS +LOCAL +DEFAULT +8 sH2
@@ -118,10 +122,6 @@ Symbol table '\.symtab' contains [0-9]+ entries:
.* TLS +LOCAL +DEFAULT +7 sh1
.* TLS +LOCAL +DEFAULT +7 sh2
.* TLS +LOCAL +DEFAULT +7 sh6
-.* FILE +LOCAL +DEFAULT +ABS .*
-.* OBJECT +LOCAL +DEFAULT +ABS _DYNAMIC
-.* OBJECT +LOCAL +DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
-.* OBJECT +LOCAL +DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
.* TLS +GLOBAL +DEFAULT +7 sg8
.* TLS +GLOBAL +DEFAULT +7 sg3
.* TLS +GLOBAL +DEFAULT +7 sg4
diff --git a/ld/testsuite/ld-sparc/tlssunpic64.rd b/ld/testsuite/ld-sparc/tlssunpic64.rd
index ca26b2d..107ee68 100644
--- a/ld/testsuite/ld-sparc/tlssunpic64.rd
+++ b/ld/testsuite/ld-sparc/tlssunpic64.rd
@@ -102,6 +102,10 @@ Symbol table '\.symtab' contains [0-9]+ entries:
.* TLS +LOCAL +DEFAULT +7 sl6
.* TLS +LOCAL +DEFAULT +7 sl7
.* TLS +LOCAL +DEFAULT +7 sl8
+.* FILE +LOCAL +DEFAULT +ABS
+.* OBJECT +LOCAL +DEFAULT +ABS _DYNAMIC
+.* OBJECT +LOCAL +DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
+.* OBJECT +LOCAL +DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
.* TLS +LOCAL +DEFAULT +8 sH1
.* TLS +LOCAL +DEFAULT +7 sh3
.* TLS +LOCAL +DEFAULT +8 sH2
@@ -118,10 +122,6 @@ Symbol table '\.symtab' contains [0-9]+ entries:
.* TLS +LOCAL +DEFAULT +7 sh1
.* TLS +LOCAL +DEFAULT +7 sh2
.* TLS +LOCAL +DEFAULT +7 sh6
-.* FILE +LOCAL +DEFAULT +ABS .*
-.* OBJECT +LOCAL +DEFAULT +ABS _DYNAMIC
-.* OBJECT +LOCAL +DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
-.* OBJECT +LOCAL +DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
.* TLS +GLOBAL +DEFAULT +7 sg8
.* TLS +GLOBAL +DEFAULT +7 sg3
.* TLS +GLOBAL +DEFAULT +7 sg4
diff --git a/ld/testsuite/ld-tic6x/shlib-1.rd b/ld/testsuite/ld-tic6x/shlib-1.rd
index 2e0c830..f19d749 100644
--- a/ld/testsuite/ld-tic6x/shlib-1.rd
+++ b/ld/testsuite/ld-tic6x/shlib-1.rd
@@ -111,10 +111,10 @@ Symbol table '\.symtab' contains [0-9]+ entries:
.* 00000000 0 SECTION LOCAL DEFAULT 13
.* 00000000 0 FILE LOCAL DEFAULT ABS .*
.* 10000080 0 FUNC LOCAL HIDDEN 9 sub1
-.* 10000130 4 OBJECT LOCAL DEFAULT 12 c
-.* 00000000 0 FILE LOCAL DEFAULT ABS .*
+.* 00000000 0 FILE LOCAL DEFAULT ABS
.* 0000817c 0 OBJECT LOCAL DEFAULT ABS _DYNAMIC
.* 1000010c 0 OBJECT LOCAL DEFAULT ABS _GLOBAL_OFFSET_TABLE_
+.* 10000130 4 OBJECT LOCAL DEFAULT 12 c
.* 10000100 0 NOTYPE LOCAL DEFAULT 10 __c6xabi_DSBT_BASE
.* 00000000 0 NOTYPE WEAK DEFAULT UND b
.* 00000000 0 NOTYPE WEAK DEFAULT UND g1
diff --git a/ld/testsuite/ld-tic6x/shlib-1b.rd b/ld/testsuite/ld-tic6x/shlib-1b.rd
index 2e0c830..f19d749 100644
--- a/ld/testsuite/ld-tic6x/shlib-1b.rd
+++ b/ld/testsuite/ld-tic6x/shlib-1b.rd
@@ -111,10 +111,10 @@ Symbol table '\.symtab' contains [0-9]+ entries:
.* 00000000 0 SECTION LOCAL DEFAULT 13
.* 00000000 0 FILE LOCAL DEFAULT ABS .*
.* 10000080 0 FUNC LOCAL HIDDEN 9 sub1
-.* 10000130 4 OBJECT LOCAL DEFAULT 12 c
-.* 00000000 0 FILE LOCAL DEFAULT ABS .*
+.* 00000000 0 FILE LOCAL DEFAULT ABS
.* 0000817c 0 OBJECT LOCAL DEFAULT ABS _DYNAMIC
.* 1000010c 0 OBJECT LOCAL DEFAULT ABS _GLOBAL_OFFSET_TABLE_
+.* 10000130 4 OBJECT LOCAL DEFAULT 12 c
.* 10000100 0 NOTYPE LOCAL DEFAULT 10 __c6xabi_DSBT_BASE
.* 00000000 0 NOTYPE WEAK DEFAULT UND b
.* 00000000 0 NOTYPE WEAK DEFAULT UND g1
diff --git a/ld/testsuite/ld-tic6x/shlib-1r.rd b/ld/testsuite/ld-tic6x/shlib-1r.rd
index 2e0c830..f19d749 100644
--- a/ld/testsuite/ld-tic6x/shlib-1r.rd
+++ b/ld/testsuite/ld-tic6x/shlib-1r.rd
@@ -111,10 +111,10 @@ Symbol table '\.symtab' contains [0-9]+ entries:
.* 00000000 0 SECTION LOCAL DEFAULT 13
.* 00000000 0 FILE LOCAL DEFAULT ABS .*
.* 10000080 0 FUNC LOCAL HIDDEN 9 sub1
-.* 10000130 4 OBJECT LOCAL DEFAULT 12 c
-.* 00000000 0 FILE LOCAL DEFAULT ABS .*
+.* 00000000 0 FILE LOCAL DEFAULT ABS
.* 0000817c 0 OBJECT LOCAL DEFAULT ABS _DYNAMIC
.* 1000010c 0 OBJECT LOCAL DEFAULT ABS _GLOBAL_OFFSET_TABLE_
+.* 10000130 4 OBJECT LOCAL DEFAULT 12 c
.* 10000100 0 NOTYPE LOCAL DEFAULT 10 __c6xabi_DSBT_BASE
.* 00000000 0 NOTYPE WEAK DEFAULT UND b
.* 00000000 0 NOTYPE WEAK DEFAULT UND g1
diff --git a/ld/testsuite/ld-tic6x/shlib-1rb.rd b/ld/testsuite/ld-tic6x/shlib-1rb.rd
index 2e0c830..f19d749 100644
--- a/ld/testsuite/ld-tic6x/shlib-1rb.rd
+++ b/ld/testsuite/ld-tic6x/shlib-1rb.rd
@@ -111,10 +111,10 @@ Symbol table '\.symtab' contains [0-9]+ entries:
.* 00000000 0 SECTION LOCAL DEFAULT 13
.* 00000000 0 FILE LOCAL DEFAULT ABS .*
.* 10000080 0 FUNC LOCAL HIDDEN 9 sub1
-.* 10000130 4 OBJECT LOCAL DEFAULT 12 c
-.* 00000000 0 FILE LOCAL DEFAULT ABS .*
+.* 00000000 0 FILE LOCAL DEFAULT ABS
.* 0000817c 0 OBJECT LOCAL DEFAULT ABS _DYNAMIC
.* 1000010c 0 OBJECT LOCAL DEFAULT ABS _GLOBAL_OFFSET_TABLE_
+.* 10000130 4 OBJECT LOCAL DEFAULT 12 c
.* 10000100 0 NOTYPE LOCAL DEFAULT 10 __c6xabi_DSBT_BASE
.* 00000000 0 NOTYPE WEAK DEFAULT UND b
.* 00000000 0 NOTYPE WEAK DEFAULT UND g1
diff --git a/ld/testsuite/ld-tic6x/shlib-noindex.rd b/ld/testsuite/ld-tic6x/shlib-noindex.rd
index 3575d4c..39d1513 100644
--- a/ld/testsuite/ld-tic6x/shlib-noindex.rd
+++ b/ld/testsuite/ld-tic6x/shlib-noindex.rd
@@ -118,10 +118,10 @@ Symbol table '\.symtab' contains [0-9]+ entries:
.* 00000000 0 SECTION LOCAL DEFAULT 14
.* 00000000 0 FILE LOCAL DEFAULT ABS .*
.* 10000080 0 FUNC LOCAL HIDDEN 10 sub1
-.* 10000130 4 OBJECT LOCAL DEFAULT 13 c
-.* 00000000 0 FILE LOCAL DEFAULT ABS .*
+.* 00000000 0 FILE LOCAL DEFAULT ABS
.* 00008188 0 OBJECT LOCAL DEFAULT ABS _DYNAMIC
.* 1000010c 0 OBJECT LOCAL DEFAULT ABS _GLOBAL_OFFSET_TABLE_
+.* 10000130 4 OBJECT LOCAL DEFAULT 13 c
.* 10000100 0 NOTYPE LOCAL DEFAULT 11 __c6xabi_DSBT_BASE
.* 00000000 0 NOTYPE WEAK DEFAULT UND b
.* 00000000 0 NOTYPE WEAK DEFAULT UND g1
--
2.1.0