From: H.J. Lu Date: Sun, 15 Feb 2015 04:17:28 +0000 (-0800) Subject: Properly place the NULL STT_FILE symbol X-Git-Tag: gdb-7.10-release~1606 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=35f82954b5e46ef5f56653d4f3aa0d1236f558da;p=external%2Fbinutils.git Properly place the NULL STT_FILE symbol We output a NULL STT_FILE symbol for forced local symbols so that they are not associated with the STT_FILE symbol for real local symbols. This patch makes sure that the NULL STT_FILE symbol is placed before forced local symbols. bfd/ PR ld/17975 * elflink.c (elf_link_output_extsym): Only check filesym_count when outputting a NULL FILE symbol. Set second_pass_sym to h->forced_local && !h->root.linker_def. ld/testsuite/ PR ld/17975 * ld-i386/tlsbin-nacl.rd: Likewise. * ld-i386/tlsbin.rd: Likewise. * ld-i386/tlsbindesc-nacl.rd: Likewise. * ld-i386/tlsbindesc.rd: Likewise. * ld-i386/tlsdesc-nacl.rd: Likewise. * ld-i386/tlsdesc.rd: Likewise. * ld-i386/tlsnopic-nacl.rd: Likewise. * ld-i386/tlsnopic.rd: Likewise. * ld-i386/tlspic-nacl.rd: Likewise. * ld-i386/tlspic.rd: Likewise. * ld-x86-64/tlsbin-nacl.rd: Likewise. * ld-x86-64/tlsbin.rd: Likewise. * ld-x86-64/tlsbindesc-nacl.rd: Likewise. * ld-x86-64/tlsbindesc.rd: Likewise. * ld-x86-64/tlsdesc-nacl.rd: Likewise. * ld-x86-64/tlsdesc.rd: Likewise. * ld-x86-64/tlspic-nacl.rd: Likewise. * ld-x86-64/tlspic.rd: Likewise. --- diff --git a/bfd/elflink.c b/bfd/elflink.c index bf28885..541129a 100644 --- a/bfd/elflink.c +++ b/bfd/elflink.c @@ -8827,9 +8827,7 @@ elf_link_output_extsym (struct bfd_hash_entry *bh, void *data) && h->root.u.def.section->output_section != NULL)) return TRUE; - if (!eoinfo->file_sym_done - && (eoinfo->second_pass ? eoinfo->flinfo->filesym_count == 1 - : eoinfo->flinfo->filesym_count > 1)) + if (!eoinfo->file_sym_done && eoinfo->flinfo->filesym_count) { /* Output a FILE symbol so that following locals are not associated with the wrong input file. */ @@ -9006,10 +9004,7 @@ elf_link_output_extsym (struct bfd_hash_entry *bh, void *data) if (eoinfo->localsyms && flinfo->filesym_count == 1) { bfd_boolean second_pass_sym - = (input_sec->owner == flinfo->output_bfd - || input_sec->owner == NULL - || (input_sec->flags & SEC_LINKER_CREATED) != 0 - || (input_sec->owner->flags & BFD_LINKER_CREATED) != 0); + = h->forced_local && !h->root.linker_def; eoinfo->need_second_pass |= second_pass_sym; if (eoinfo->second_pass != second_pass_sym) diff --git a/ld/testsuite/ld-i386/tlsbin-nacl.rd b/ld/testsuite/ld-i386/tlsbin-nacl.rd index 45358e6..8061ccc 100644 --- a/ld/testsuite/ld-i386/tlsbin-nacl.rd +++ b/ld/testsuite/ld-i386/tlsbin-nacl.rd @@ -104,7 +104,7 @@ Symbol table '\.symtab' contains [0-9]+ entries: +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +11 * +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +12 * +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +13 * -.* FILE +LOCAL +DEFAULT +ABS .* +.* FILE +LOCAL +DEFAULT +ABS tmpdir/tlsbinpic.o +[0-9]+: 00000020 +0 +TLS +LOCAL +DEFAULT +9 sl1 +[0-9]+: 00000024 +0 +TLS +LOCAL +DEFAULT +9 sl2 +[0-9]+: 00000028 +0 +TLS +LOCAL +DEFAULT +9 sl3 @@ -113,7 +113,7 @@ Symbol table '\.symtab' contains [0-9]+ entries: +[0-9]+: 00000034 +0 +TLS +LOCAL +DEFAULT +9 sl6 +[0-9]+: 00000038 +0 +TLS +LOCAL +DEFAULT +9 sl7 +[0-9]+: 0000003c +0 +TLS +LOCAL +DEFAULT +9 sl8 -.* FILE +LOCAL +DEFAULT +ABS .* +.* FILE +LOCAL +DEFAULT +ABS tmpdir/tlsbin.o +[0-9]+: 00000080 +0 +TLS +LOCAL +DEFAULT +10 bl1 +[0-9]+: 00000084 +0 +TLS +LOCAL +DEFAULT +10 bl2 +[0-9]+: 00000088 +0 +TLS +LOCAL +DEFAULT +10 bl3 @@ -122,7 +122,7 @@ Symbol table '\.symtab' contains [0-9]+ entries: +[0-9]+: 00000094 +0 +TLS +LOCAL +DEFAULT +10 bl6 +[0-9]+: 00000098 +0 +TLS +LOCAL +DEFAULT +10 bl7 +[0-9]+: 0000009c +0 +TLS +LOCAL +DEFAULT +10 bl8 -.* FILE +LOCAL +DEFAULT +ABS .* +.* FILE +LOCAL +DEFAULT +ABS +[0-9]+: 0*10031060 +0 +OBJECT +LOCAL +DEFAULT +11 _DYNAMIC +[0-9]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +13 _GLOBAL_OFFSET_TABLE_ +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG3 diff --git a/ld/testsuite/ld-i386/tlsbin.rd b/ld/testsuite/ld-i386/tlsbin.rd index 9a9e4aa..6a641dc 100644 --- a/ld/testsuite/ld-i386/tlsbin.rd +++ b/ld/testsuite/ld-i386/tlsbin.rd @@ -102,7 +102,7 @@ Symbol table '\.symtab' contains [0-9]+ entries: +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +11 * +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +12 * +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +13 * -.* FILE +LOCAL +DEFAULT +ABS .* +.* FILE +LOCAL +DEFAULT +ABS tmpdir/tlsbinpic.o +[0-9]+: 00000020 +0 +TLS +LOCAL +DEFAULT +9 sl1 +[0-9]+: 00000024 +0 +TLS +LOCAL +DEFAULT +9 sl2 +[0-9]+: 00000028 +0 +TLS +LOCAL +DEFAULT +9 sl3 @@ -111,7 +111,7 @@ Symbol table '\.symtab' contains [0-9]+ entries: +[0-9]+: 00000034 +0 +TLS +LOCAL +DEFAULT +9 sl6 +[0-9]+: 00000038 +0 +TLS +LOCAL +DEFAULT +9 sl7 +[0-9]+: 0000003c +0 +TLS +LOCAL +DEFAULT +9 sl8 -.* FILE +LOCAL +DEFAULT +ABS .* +.* FILE +LOCAL +DEFAULT +ABS tmpdir/tlsbin.o +[0-9]+: 00000080 +0 +TLS +LOCAL +DEFAULT +10 bl1 +[0-9]+: 00000084 +0 +TLS +LOCAL +DEFAULT +10 bl2 +[0-9]+: 00000088 +0 +TLS +LOCAL +DEFAULT +10 bl3 @@ -120,7 +120,7 @@ Symbol table '\.symtab' contains [0-9]+ entries: +[0-9]+: 00000094 +0 +TLS +LOCAL +DEFAULT +10 bl6 +[0-9]+: 00000098 +0 +TLS +LOCAL +DEFAULT +10 bl7 +[0-9]+: 0000009c +0 +TLS +LOCAL +DEFAULT +10 bl8 -.* FILE +LOCAL +DEFAULT +ABS .* +.* FILE +LOCAL +DEFAULT +ABS +[0-9]+: 0+804a060 +0 +OBJECT +LOCAL +DEFAULT +11 _DYNAMIC +[0-9]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +13 _GLOBAL_OFFSET_TABLE_ +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sG3 diff --git a/ld/testsuite/ld-i386/tlsbindesc-nacl.rd b/ld/testsuite/ld-i386/tlsbindesc-nacl.rd index 7399309..7d51f71 100644 --- a/ld/testsuite/ld-i386/tlsbindesc-nacl.rd +++ b/ld/testsuite/ld-i386/tlsbindesc-nacl.rd @@ -95,7 +95,7 @@ Symbol table '\.symtab' contains [0-9]+ entries: +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +9 * +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +10 * +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +11 * -.* FILE +LOCAL +DEFAULT +ABS .* +.* FILE +LOCAL +DEFAULT +ABS tmpdir/tlsbindesc.o +[0-9]+: 00000020 +0 +TLS +LOCAL +DEFAULT +7 sl1 +[0-9]+: 00000024 +0 +TLS +LOCAL +DEFAULT +7 sl2 +[0-9]+: 00000028 +0 +TLS +LOCAL +DEFAULT +7 sl3 @@ -104,7 +104,7 @@ Symbol table '\.symtab' contains [0-9]+ entries: +[0-9]+: 00000034 +0 +TLS +LOCAL +DEFAULT +7 sl6 +[0-9]+: 00000038 +0 +TLS +LOCAL +DEFAULT +7 sl7 +[0-9]+: 0000003c +0 +TLS +LOCAL +DEFAULT +7 sl8 -.* FILE +LOCAL +DEFAULT +ABS .* +.* FILE +LOCAL +DEFAULT +ABS tmpdir/tlsbin.o +[0-9]+: 00000080 +0 +TLS +LOCAL +DEFAULT +8 bl1 +[0-9]+: 00000084 +0 +TLS +LOCAL +DEFAULT +8 bl2 +[0-9]+: 00000088 +0 +TLS +LOCAL +DEFAULT +8 bl3 @@ -113,7 +113,7 @@ Symbol table '\.symtab' contains [0-9]+ entries: +[0-9]+: 00000094 +0 +TLS +LOCAL +DEFAULT +8 bl6 +[0-9]+: 00000098 +0 +TLS +LOCAL +DEFAULT +8 bl7 +[0-9]+: 0000009c +0 +TLS +LOCAL +DEFAULT +8 bl8 -.* FILE +LOCAL +DEFAULT +ABS .* +.* FILE +LOCAL +DEFAULT +ABS +[0-9]+: 00001000 +0 +TLS +LOCAL +DEFAULT +7 _TLS_MODULE_BASE_ +[0-9]+: 0*10031060 +0 +OBJECT +LOCAL +DEFAULT +9 _DYNAMIC +[0-9]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +11 _GLOBAL_OFFSET_TABLE_ diff --git a/ld/testsuite/ld-i386/tlsbindesc.rd b/ld/testsuite/ld-i386/tlsbindesc.rd index 894b202..3127de4 100644 --- a/ld/testsuite/ld-i386/tlsbindesc.rd +++ b/ld/testsuite/ld-i386/tlsbindesc.rd @@ -93,7 +93,7 @@ Symbol table '\.symtab' contains [0-9]+ entries: +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +9 * +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +10 * +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +11 * -.* FILE +LOCAL +DEFAULT +ABS .* +.* FILE +LOCAL +DEFAULT +ABS tmpdir/tlsbindesc.o +[0-9]+: 00000020 +0 +TLS +LOCAL +DEFAULT +7 sl1 +[0-9]+: 00000024 +0 +TLS +LOCAL +DEFAULT +7 sl2 +[0-9]+: 00000028 +0 +TLS +LOCAL +DEFAULT +7 sl3 @@ -102,7 +102,7 @@ Symbol table '\.symtab' contains [0-9]+ entries: +[0-9]+: 00000034 +0 +TLS +LOCAL +DEFAULT +7 sl6 +[0-9]+: 00000038 +0 +TLS +LOCAL +DEFAULT +7 sl7 +[0-9]+: 0000003c +0 +TLS +LOCAL +DEFAULT +7 sl8 -.* FILE +LOCAL +DEFAULT +ABS .* +.* FILE +LOCAL +DEFAULT +ABS tmpdir/tlsbin.o +[0-9]+: 00000080 +0 +TLS +LOCAL +DEFAULT +8 bl1 +[0-9]+: 00000084 +0 +TLS +LOCAL +DEFAULT +8 bl2 +[0-9]+: 00000088 +0 +TLS +LOCAL +DEFAULT +8 bl3 @@ -111,7 +111,7 @@ Symbol table '\.symtab' contains [0-9]+ entries: +[0-9]+: 00000094 +0 +TLS +LOCAL +DEFAULT +8 bl6 +[0-9]+: 00000098 +0 +TLS +LOCAL +DEFAULT +8 bl7 +[0-9]+: 0000009c +0 +TLS +LOCAL +DEFAULT +8 bl8 -.* FILE +LOCAL +DEFAULT +ABS .* +.* FILE +LOCAL +DEFAULT +ABS +[0-9]+: 00001000 +0 +TLS +LOCAL +DEFAULT +7 _TLS_MODULE_BASE_ +[0-9]+: 0+804a060 +0 +OBJECT +LOCAL +DEFAULT +9 _DYNAMIC +[0-9]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +11 _GLOBAL_OFFSET_TABLE_ diff --git a/ld/testsuite/ld-i386/tlsdesc-nacl.rd b/ld/testsuite/ld-i386/tlsdesc-nacl.rd index 9f40d02..6e6df1b 100644 --- a/ld/testsuite/ld-i386/tlsdesc-nacl.rd +++ b/ld/testsuite/ld-i386/tlsdesc-nacl.rd @@ -110,7 +110,7 @@ Symbol table '\.symtab' contains [0-9]+ entries: +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +9 * +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +10 * +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +11 * -.* FILE +LOCAL +DEFAULT +ABS .* +.* FILE +LOCAL +DEFAULT +ABS tmpdir/tlsdesc.o +[0-9]+: 0+20 +0 +TLS +LOCAL +DEFAULT +7 sl1 +[0-9]+: 0+24 +0 +TLS +LOCAL +DEFAULT +7 sl2 +[0-9]+: 0+28 +0 +TLS +LOCAL +DEFAULT +7 sl3 @@ -119,6 +119,10 @@ Symbol table '\.symtab' contains [0-9]+ entries: +[0-9]+: 0+34 +0 +TLS +LOCAL +DEFAULT +7 sl6 +[0-9]+: 0+38 +0 +TLS +LOCAL +DEFAULT +7 sl7 +[0-9]+: 0+3c +0 +TLS +LOCAL +DEFAULT +7 sl8 +.* FILE +LOCAL +DEFAULT +ABS + +[0-9]+: 0+ +0 +TLS +LOCAL +DEFAULT +7 _TLS_MODULE_BASE_ + +[0-9]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +9 _DYNAMIC + +[0-9]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +11 _GLOBAL_OFFSET_TABLE_ +[0-9]+: 0+60 +0 +TLS +LOCAL +DEFAULT +8 sH1 +[0-9]+: 0+48 +0 +TLS +LOCAL +DEFAULT +7 sh3 +[0-9]+: 0+64 +0 +TLS +LOCAL +DEFAULT +8 sH2 @@ -135,10 +139,6 @@ Symbol table '\.symtab' contains [0-9]+ entries: +[0-9]+: 0+40 +0 +TLS +LOCAL +DEFAULT +7 sh1 +[0-9]+: 0+44 +0 +TLS +LOCAL +DEFAULT +7 sh2 +[0-9]+: 0+54 +0 +TLS +LOCAL +DEFAULT +7 sh6 -.* FILE +LOCAL +DEFAULT +ABS .* - +[0-9]+: 0+ +0 +TLS +LOCAL +DEFAULT +7 _TLS_MODULE_BASE_ - +[0-9]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +9 _DYNAMIC - +[0-9]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +11 _GLOBAL_OFFSET_TABLE_ +[0-9]+: 0+1c +0 +TLS +GLOBAL +DEFAULT +7 sg8 +[0-9]+: 0+8 +0 +TLS +GLOBAL +DEFAULT +7 sg3 +[0-9]+: 0+c +0 +TLS +GLOBAL +DEFAULT +7 sg4 diff --git a/ld/testsuite/ld-i386/tlsdesc.rd b/ld/testsuite/ld-i386/tlsdesc.rd index 2b382a0..e57ec07 100644 --- a/ld/testsuite/ld-i386/tlsdesc.rd +++ b/ld/testsuite/ld-i386/tlsdesc.rd @@ -108,7 +108,7 @@ Symbol table '\.symtab' contains [0-9]+ entries: +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +9 * +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +10 * +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +11 * -.* FILE +LOCAL +DEFAULT +ABS .* +.* FILE +LOCAL +DEFAULT +ABS tmpdir/tlsdesc.o +[0-9]+: 0+20 +0 +TLS +LOCAL +DEFAULT +7 sl1 +[0-9]+: 0+24 +0 +TLS +LOCAL +DEFAULT +7 sl2 +[0-9]+: 0+28 +0 +TLS +LOCAL +DEFAULT +7 sl3 @@ -117,6 +117,10 @@ Symbol table '\.symtab' contains [0-9]+ entries: +[0-9]+: 0+34 +0 +TLS +LOCAL +DEFAULT +7 sl6 +[0-9]+: 0+38 +0 +TLS +LOCAL +DEFAULT +7 sl7 +[0-9]+: 0+3c +0 +TLS +LOCAL +DEFAULT +7 sl8 +.* FILE +LOCAL +DEFAULT +ABS + +[0-9]+: 0+ +0 +TLS +LOCAL +DEFAULT +7 _TLS_MODULE_BASE_ + +[0-9]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +9 _DYNAMIC + +[0-9]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +11 _GLOBAL_OFFSET_TABLE_ +[0-9]+: 0+60 +0 +TLS +LOCAL +DEFAULT +8 sH1 +[0-9]+: 0+48 +0 +TLS +LOCAL +DEFAULT +7 sh3 +[0-9]+: 0+64 +0 +TLS +LOCAL +DEFAULT +8 sH2 @@ -133,10 +137,6 @@ Symbol table '\.symtab' contains [0-9]+ entries: +[0-9]+: 0+40 +0 +TLS +LOCAL +DEFAULT +7 sh1 +[0-9]+: 0+44 +0 +TLS +LOCAL +DEFAULT +7 sh2 +[0-9]+: 0+54 +0 +TLS +LOCAL +DEFAULT +7 sh6 -.* FILE +LOCAL +DEFAULT +ABS .* - +[0-9]+: 0+ +0 +TLS +LOCAL +DEFAULT +7 _TLS_MODULE_BASE_ - +[0-9]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +9 _DYNAMIC - +[0-9]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +11 _GLOBAL_OFFSET_TABLE_ +[0-9]+: 0+1c +0 +TLS +GLOBAL +DEFAULT +7 sg8 +[0-9]+: 0+8 +0 +TLS +GLOBAL +DEFAULT +7 sg3 +[0-9]+: 0+c +0 +TLS +GLOBAL +DEFAULT +7 sg4 diff --git a/ld/testsuite/ld-i386/tlsnopic-nacl.rd b/ld/testsuite/ld-i386/tlsnopic-nacl.rd index dc85e7d..a458bb6 100644 --- a/ld/testsuite/ld-i386/tlsnopic-nacl.rd +++ b/ld/testsuite/ld-i386/tlsnopic-nacl.rd @@ -96,19 +96,19 @@ Symbol table '\.symtab' contains [0-9]+ entries: +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +7 * +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +8 * +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +9 * -.* FILE +LOCAL +DEFAULT +ABS .* +.* FILE +LOCAL +DEFAULT +ABS tmpdir/tlsnopic1.o +[0-9]+: 0+00 +0 +TLS +LOCAL +DEFAULT +6 bl1 +[0-9]+: 0+04 +0 +TLS +LOCAL +DEFAULT +6 bl2 +[0-9]+: 0+08 +0 +TLS +LOCAL +DEFAULT +6 bl3 +[0-9]+: 0+0c +0 +TLS +LOCAL +DEFAULT +6 bl4 +[0-9]+: 0+10 +0 +TLS +LOCAL +DEFAULT +6 bl5 +.* FILE +LOCAL +DEFAULT +ABS + +[0-9]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +7 _DYNAMIC + +[0-9]+: 0*1001031c +0 +OBJECT +LOCAL +DEFAULT +9 _GLOBAL_OFFSET_TABLE_ +[0-9]+: 0+1c +0 +TLS +LOCAL +DEFAULT +6 sh3 +[0-9]+: 0+20 +0 +TLS +LOCAL +DEFAULT +6 sh4 +[0-9]+: 0+14 +0 +TLS +LOCAL +DEFAULT +6 sh1 +[0-9]+: 0+18 +0 +TLS +LOCAL +DEFAULT +6 sh2 -.* FILE +LOCAL +DEFAULT +ABS .* - +[0-9]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +7 _DYNAMIC - +[0-9]+: 0*1001031c +0 +OBJECT +LOCAL +DEFAULT +9 _GLOBAL_OFFSET_TABLE_ +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sg3 +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sg4 +[0-9]+: 0+ +0 +FUNC +GLOBAL +DEFAULT +1 fn3 diff --git a/ld/testsuite/ld-i386/tlsnopic.rd b/ld/testsuite/ld-i386/tlsnopic.rd index 418a9f2..01edba9 100644 --- a/ld/testsuite/ld-i386/tlsnopic.rd +++ b/ld/testsuite/ld-i386/tlsnopic.rd @@ -94,19 +94,19 @@ Symbol table '\.symtab' contains [0-9]+ entries: +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +7 * +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +8 * +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +9 * -.* FILE +LOCAL +DEFAULT +ABS .* +.* FILE +LOCAL +DEFAULT +ABS tmpdir/tlsnopic1.o +[0-9]+: 0+00 +0 +TLS +LOCAL +DEFAULT +6 bl1 +[0-9]+: 0+04 +0 +TLS +LOCAL +DEFAULT +6 bl2 +[0-9]+: 0+08 +0 +TLS +LOCAL +DEFAULT +6 bl3 +[0-9]+: 0+0c +0 +TLS +LOCAL +DEFAULT +6 bl4 +[0-9]+: 0+10 +0 +TLS +LOCAL +DEFAULT +6 bl5 +.* FILE +LOCAL +DEFAULT +ABS + +[0-9]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +7 _DYNAMIC + +[0-9]+: 0+218c +0 +OBJECT +LOCAL +DEFAULT +9 _GLOBAL_OFFSET_TABLE_ +[0-9]+: 0+1c +0 +TLS +LOCAL +DEFAULT +6 sh3 +[0-9]+: 0+20 +0 +TLS +LOCAL +DEFAULT +6 sh4 +[0-9]+: 0+14 +0 +TLS +LOCAL +DEFAULT +6 sh1 +[0-9]+: 0+18 +0 +TLS +LOCAL +DEFAULT +6 sh2 -.* FILE +LOCAL +DEFAULT +ABS .* - +[0-9]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +7 _DYNAMIC - +[0-9]+: 0+218c +0 +OBJECT +LOCAL +DEFAULT +9 _GLOBAL_OFFSET_TABLE_ +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sg3 +[0-9]+: 0+ +0 +TLS +GLOBAL +DEFAULT +UND sg4 +[0-9]+: 0+1000 +0 +FUNC +GLOBAL +DEFAULT +5 fn3 diff --git a/ld/testsuite/ld-i386/tlspic-nacl.rd b/ld/testsuite/ld-i386/tlspic-nacl.rd index 328947c..4a8797f 100644 --- a/ld/testsuite/ld-i386/tlspic-nacl.rd +++ b/ld/testsuite/ld-i386/tlspic-nacl.rd @@ -115,7 +115,7 @@ Symbol table '\.symtab' contains [0-9]+ entries: +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +10 * +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +11 * +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +12 * -.* FILE +LOCAL +DEFAULT +ABS .* +.* FILE +LOCAL +DEFAULT +ABS tmpdir/tlspic1.o +[0-9]+: 0+20 +0 +TLS +LOCAL +DEFAULT +8 sl1 +[0-9]+: 0+24 +0 +TLS +LOCAL +DEFAULT +8 sl2 +[0-9]+: 0+28 +0 +TLS +LOCAL +DEFAULT +8 sl3 @@ -124,6 +124,9 @@ Symbol table '\.symtab' contains [0-9]+ entries: +[0-9]+: 0+34 +0 +TLS +LOCAL +DEFAULT +8 sl6 +[0-9]+: 0+38 +0 +TLS +LOCAL +DEFAULT +8 sl7 +[0-9]+: 0+3c +0 +TLS +LOCAL +DEFAULT +8 sl8 +.* FILE +LOCAL +DEFAULT +ABS + +[0-9]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +10 _DYNAMIC + +[0-9]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +12 _GLOBAL_OFFSET_TABLE_ +[0-9]+: 0+60 +0 +TLS +LOCAL +DEFAULT +9 sH1 +[0-9]+: 0+48 +0 +TLS +LOCAL +DEFAULT +8 sh3 +[0-9]+: 0+64 +0 +TLS +LOCAL +DEFAULT +9 sH2 @@ -140,9 +143,6 @@ Symbol table '\.symtab' contains [0-9]+ entries: +[0-9]+: 0+40 +0 +TLS +LOCAL +DEFAULT +8 sh1 +[0-9]+: 0+44 +0 +TLS +LOCAL +DEFAULT +8 sh2 +[0-9]+: 0+54 +0 +TLS +LOCAL +DEFAULT +8 sh6 -.* FILE +LOCAL +DEFAULT +ABS .* - +[0-9]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +10 _DYNAMIC - +[0-9]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +12 _GLOBAL_OFFSET_TABLE_ +[0-9]+: 0+1c +0 +TLS +GLOBAL +DEFAULT +8 sg8 +[0-9]+: 0+8 +0 +TLS +GLOBAL +DEFAULT +8 sg3 +[0-9]+: 0+c +0 +TLS +GLOBAL +DEFAULT +8 sg4 diff --git a/ld/testsuite/ld-i386/tlspic.rd b/ld/testsuite/ld-i386/tlspic.rd index 7d07cf5..68697fc 100644 --- a/ld/testsuite/ld-i386/tlspic.rd +++ b/ld/testsuite/ld-i386/tlspic.rd @@ -113,7 +113,7 @@ Symbol table '\.symtab' contains [0-9]+ entries: +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +10 * +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +11 * +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +12 * -.* FILE +LOCAL +DEFAULT +ABS .* +.* FILE +LOCAL +DEFAULT +ABS tmpdir/tlspic1.o +[0-9]+: 0+20 +0 +TLS +LOCAL +DEFAULT +8 sl1 +[0-9]+: 0+24 +0 +TLS +LOCAL +DEFAULT +8 sl2 +[0-9]+: 0+28 +0 +TLS +LOCAL +DEFAULT +8 sl3 @@ -122,6 +122,9 @@ Symbol table '\.symtab' contains [0-9]+ entries: +[0-9]+: 0+34 +0 +TLS +LOCAL +DEFAULT +8 sl6 +[0-9]+: 0+38 +0 +TLS +LOCAL +DEFAULT +8 sl7 +[0-9]+: 0+3c +0 +TLS +LOCAL +DEFAULT +8 sl8 +.* FILE +LOCAL +DEFAULT +ABS + +[0-9]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +10 _DYNAMIC + +[0-9]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +12 _GLOBAL_OFFSET_TABLE_ +[0-9]+: 0+60 +0 +TLS +LOCAL +DEFAULT +9 sH1 +[0-9]+: 0+48 +0 +TLS +LOCAL +DEFAULT +8 sh3 +[0-9]+: 0+64 +0 +TLS +LOCAL +DEFAULT +9 sH2 @@ -138,9 +141,6 @@ Symbol table '\.symtab' contains [0-9]+ entries: +[0-9]+: 0+40 +0 +TLS +LOCAL +DEFAULT +8 sh1 +[0-9]+: 0+44 +0 +TLS +LOCAL +DEFAULT +8 sh2 +[0-9]+: 0+54 +0 +TLS +LOCAL +DEFAULT +8 sh6 -.* FILE +LOCAL +DEFAULT +ABS .* - +[0-9]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +10 _DYNAMIC - +[0-9]+: [0-9a-f]+ +0 +OBJECT +LOCAL +DEFAULT +12 _GLOBAL_OFFSET_TABLE_ +[0-9]+: 0+1c +0 +TLS +GLOBAL +DEFAULT +8 sg8 +[0-9]+: 0+8 +0 +TLS +GLOBAL +DEFAULT +8 sg3 +[0-9]+: 0+c +0 +TLS +GLOBAL +DEFAULT +8 sg4 diff --git a/ld/testsuite/ld-x86-64/tlsbin-nacl.rd b/ld/testsuite/ld-x86-64/tlsbin-nacl.rd index 86f1fe1..94c14a0 100644 --- a/ld/testsuite/ld-x86-64/tlsbin-nacl.rd +++ b/ld/testsuite/ld-x86-64/tlsbin-nacl.rd @@ -95,7 +95,7 @@ Symbol table '\.symtab' contains [0-9]+ entries: .* SECTION +LOCAL +DEFAULT +11 * .* SECTION +LOCAL +DEFAULT +12 * .* SECTION +LOCAL +DEFAULT +13 * -.* FILE +LOCAL +DEFAULT +ABS .* +.* FILE +LOCAL +DEFAULT +ABS tmpdir/tlsbinpic.o .* TLS +LOCAL +DEFAULT +9 sl1 .* TLS +LOCAL +DEFAULT +9 sl2 .* TLS +LOCAL +DEFAULT +9 sl3 @@ -104,7 +104,7 @@ Symbol table '\.symtab' contains [0-9]+ entries: .* TLS +LOCAL +DEFAULT +9 sl6 .* TLS +LOCAL +DEFAULT +9 sl7 .* TLS +LOCAL +DEFAULT +9 sl8 -.* FILE +LOCAL +DEFAULT +ABS .* +.* FILE +LOCAL +DEFAULT +ABS tmpdir/tlsbin.o .* TLS +LOCAL +DEFAULT +10 bl1 .* TLS +LOCAL +DEFAULT +10 bl2 .* TLS +LOCAL +DEFAULT +10 bl3 @@ -113,7 +113,7 @@ Symbol table '\.symtab' contains [0-9]+ entries: .* TLS +LOCAL +DEFAULT +10 bl6 .* TLS +LOCAL +DEFAULT +10 bl7 .* TLS +LOCAL +DEFAULT +10 bl8 -.* FILE +LOCAL +DEFAULT +ABS .* +.* FILE +LOCAL +DEFAULT +ABS .* OBJECT +LOCAL +DEFAULT +11 _DYNAMIC .* OBJECT +LOCAL +DEFAULT +13 _GLOBAL_OFFSET_TABLE_ .* TLS +GLOBAL +DEFAULT +9 sg8 diff --git a/ld/testsuite/ld-x86-64/tlsbin.rd b/ld/testsuite/ld-x86-64/tlsbin.rd index df5e855..9aaddbf 100644 --- a/ld/testsuite/ld-x86-64/tlsbin.rd +++ b/ld/testsuite/ld-x86-64/tlsbin.rd @@ -93,7 +93,7 @@ Symbol table '\.symtab' contains [0-9]+ entries: .* SECTION +LOCAL +DEFAULT +11 * .* SECTION +LOCAL +DEFAULT +12 * .* SECTION +LOCAL +DEFAULT +13 * -.* FILE +LOCAL +DEFAULT +ABS .* +.* FILE +LOCAL +DEFAULT +ABS tmpdir/tlsbinpic.o .* TLS +LOCAL +DEFAULT +9 sl1 .* TLS +LOCAL +DEFAULT +9 sl2 .* TLS +LOCAL +DEFAULT +9 sl3 @@ -102,7 +102,7 @@ Symbol table '\.symtab' contains [0-9]+ entries: .* TLS +LOCAL +DEFAULT +9 sl6 .* TLS +LOCAL +DEFAULT +9 sl7 .* TLS +LOCAL +DEFAULT +9 sl8 -.* FILE +LOCAL +DEFAULT +ABS .* +.* FILE +LOCAL +DEFAULT +ABS tmpdir/tlsbin.o .* TLS +LOCAL +DEFAULT +10 bl1 .* TLS +LOCAL +DEFAULT +10 bl2 .* TLS +LOCAL +DEFAULT +10 bl3 @@ -111,7 +111,7 @@ Symbol table '\.symtab' contains [0-9]+ entries: .* TLS +LOCAL +DEFAULT +10 bl6 .* TLS +LOCAL +DEFAULT +10 bl7 .* TLS +LOCAL +DEFAULT +10 bl8 -.* FILE +LOCAL +DEFAULT +ABS .* +.* FILE +LOCAL +DEFAULT +ABS .* OBJECT +LOCAL +DEFAULT +11 _DYNAMIC .* OBJECT +LOCAL +DEFAULT +13 _GLOBAL_OFFSET_TABLE_ .* TLS +GLOBAL +DEFAULT +9 sg8 diff --git a/ld/testsuite/ld-x86-64/tlsbindesc-nacl.rd b/ld/testsuite/ld-x86-64/tlsbindesc-nacl.rd index 67f660b..6ae8daa 100644 --- a/ld/testsuite/ld-x86-64/tlsbindesc-nacl.rd +++ b/ld/testsuite/ld-x86-64/tlsbindesc-nacl.rd @@ -86,7 +86,7 @@ Symbol table '\.symtab' contains [0-9]+ entries: +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +9 * +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +10 * +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +11 * -.* FILE +LOCAL +DEFAULT +ABS .* +.* FILE +LOCAL +DEFAULT +ABS tmpdir/tlsbindesc.o +[0-9]+: 0+20 +0 +TLS +LOCAL +DEFAULT +7 sl1 +[0-9]+: 0+24 +0 +TLS +LOCAL +DEFAULT +7 sl2 +[0-9]+: 0+28 +0 +TLS +LOCAL +DEFAULT +7 sl3 @@ -95,7 +95,7 @@ Symbol table '\.symtab' contains [0-9]+ entries: +[0-9]+: 0+34 +0 +TLS +LOCAL +DEFAULT +7 sl6 +[0-9]+: 0+38 +0 +TLS +LOCAL +DEFAULT +7 sl7 +[0-9]+: 0+3c +0 +TLS +LOCAL +DEFAULT +7 sl8 -.* FILE +LOCAL +DEFAULT +ABS .* +.* FILE +LOCAL +DEFAULT +ABS tmpdir/tlsbin.o +[0-9]+: 0+80 +0 +TLS +LOCAL +DEFAULT +8 bl1 +[0-9]+: 0+84 +0 +TLS +LOCAL +DEFAULT +8 bl2 +[0-9]+: 0+88 +0 +TLS +LOCAL +DEFAULT +8 bl3 @@ -104,7 +104,7 @@ Symbol table '\.symtab' contains [0-9]+ entries: +[0-9]+: 0+94 +0 +TLS +LOCAL +DEFAULT +8 bl6 +[0-9]+: 0+98 +0 +TLS +LOCAL +DEFAULT +8 bl7 +[0-9]+: 0+9c +0 +TLS +LOCAL +DEFAULT +8 bl8 -.* FILE +LOCAL +DEFAULT +ABS .* +.* FILE +LOCAL +DEFAULT +ABS +[0-9]+: 0+a0 +0 +TLS +LOCAL +DEFAULT +7 _TLS_MODULE_BASE_ +[0-9]+: 0+100303d0 +0 +OBJECT +LOCAL +DEFAULT +9 _DYNAMIC +[0-9]+: 0+100304f0 +0 +OBJECT +LOCAL +DEFAULT +11 _GLOBAL_OFFSET_TABLE_ diff --git a/ld/testsuite/ld-x86-64/tlsbindesc.rd b/ld/testsuite/ld-x86-64/tlsbindesc.rd index 7a2c484..48bbdb9 100644 --- a/ld/testsuite/ld-x86-64/tlsbindesc.rd +++ b/ld/testsuite/ld-x86-64/tlsbindesc.rd @@ -84,7 +84,7 @@ Symbol table '\.symtab' contains [0-9]+ entries: +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +9 * +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +10 * +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +11 * -.* FILE +LOCAL +DEFAULT +ABS .* +.* FILE +LOCAL +DEFAULT +ABS tmpdir/tlsbindesc.o +[0-9]+: 0+20 +0 +TLS +LOCAL +DEFAULT +7 sl1 +[0-9]+: 0+24 +0 +TLS +LOCAL +DEFAULT +7 sl2 +[0-9]+: 0+28 +0 +TLS +LOCAL +DEFAULT +7 sl3 @@ -93,7 +93,7 @@ Symbol table '\.symtab' contains [0-9]+ entries: +[0-9]+: 0+34 +0 +TLS +LOCAL +DEFAULT +7 sl6 +[0-9]+: 0+38 +0 +TLS +LOCAL +DEFAULT +7 sl7 +[0-9]+: 0+3c +0 +TLS +LOCAL +DEFAULT +7 sl8 -.* FILE +LOCAL +DEFAULT +ABS .* +.* FILE +LOCAL +DEFAULT +ABS tmpdir/tlsbin.o +[0-9]+: 0+80 +0 +TLS +LOCAL +DEFAULT +8 bl1 +[0-9]+: 0+84 +0 +TLS +LOCAL +DEFAULT +8 bl2 +[0-9]+: 0+88 +0 +TLS +LOCAL +DEFAULT +8 bl3 @@ -102,7 +102,7 @@ Symbol table '\.symtab' contains [0-9]+ entries: +[0-9]+: 0+94 +0 +TLS +LOCAL +DEFAULT +8 bl6 +[0-9]+: 0+98 +0 +TLS +LOCAL +DEFAULT +8 bl7 +[0-9]+: 0+9c +0 +TLS +LOCAL +DEFAULT +8 bl8 -.* FILE +LOCAL +DEFAULT +ABS .* +.* FILE +LOCAL +DEFAULT +ABS +[0-9]+: 0+a0 +0 +TLS +LOCAL +DEFAULT +7 _TLS_MODULE_BASE_ +[0-9]+: 0+601260 +0 +OBJECT +LOCAL +DEFAULT +9 _DYNAMIC +[0-9]+: 0+601380 +0 +OBJECT +LOCAL +DEFAULT +11 _GLOBAL_OFFSET_TABLE_ diff --git a/ld/testsuite/ld-x86-64/tlsdesc-nacl.rd b/ld/testsuite/ld-x86-64/tlsdesc-nacl.rd index 2f318e0..d37f6b8 100644 --- a/ld/testsuite/ld-x86-64/tlsdesc-nacl.rd +++ b/ld/testsuite/ld-x86-64/tlsdesc-nacl.rd @@ -121,7 +121,7 @@ Symbol table '\.symtab' contains [0-9]+ entries: +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +10 * +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +11 * +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +12 * -.* FILE +LOCAL +DEFAULT +ABS .* +.* FILE +LOCAL +DEFAULT +ABS tmpdir/tlsdesc.o +[0-9]+: 0+20 +0 +TLS +LOCAL +DEFAULT +8 sl1 +[0-9]+: 0+24 +0 +TLS +LOCAL +DEFAULT +8 sl2 +[0-9]+: 0+28 +0 +TLS +LOCAL +DEFAULT +8 sl3 @@ -130,6 +130,10 @@ Symbol table '\.symtab' contains [0-9]+ entries: +[0-9]+: 0+34 +0 +TLS +LOCAL +DEFAULT +8 sl6 +[0-9]+: 0+38 +0 +TLS +LOCAL +DEFAULT +8 sl7 +[0-9]+: 0+3c +0 +TLS +LOCAL +DEFAULT +8 sl8 +.* FILE +LOCAL +DEFAULT +ABS + +[0-9]+: 0+ +0 +TLS +LOCAL +DEFAULT +8 _TLS_MODULE_BASE_ + +[0-9]+: 0+100104e8 +0 +OBJECT +LOCAL +DEFAULT +10 _DYNAMIC + +[0-9]+: 0+10010680 +0 +OBJECT +LOCAL +DEFAULT +12 _GLOBAL_OFFSET_TABLE_ +[0-9]+: 0+60 +0 +TLS +LOCAL +DEFAULT +9 sH1 +[0-9]+: 0+48 +0 +TLS +LOCAL +DEFAULT +8 sh3 +[0-9]+: 0+64 +0 +TLS +LOCAL +DEFAULT +9 sH2 @@ -146,10 +150,6 @@ Symbol table '\.symtab' contains [0-9]+ entries: +[0-9]+: 0+40 +0 +TLS +LOCAL +DEFAULT +8 sh1 +[0-9]+: 0+44 +0 +TLS +LOCAL +DEFAULT +8 sh2 +[0-9]+: 0+54 +0 +TLS +LOCAL +DEFAULT +8 sh6 -.* FILE +LOCAL +DEFAULT +ABS .* - +[0-9]+: 0+ +0 +TLS +LOCAL +DEFAULT +8 _TLS_MODULE_BASE_ - +[0-9]+: 0+100104e8 +0 +OBJECT +LOCAL +DEFAULT +10 _DYNAMIC - +[0-9]+: 0+10010680 +0 +OBJECT +LOCAL +DEFAULT +12 _GLOBAL_OFFSET_TABLE_ +[0-9]+: 0+1c +0 +TLS +GLOBAL +DEFAULT +8 sg8 +[0-9]+: 0+8 +0 +TLS +GLOBAL +DEFAULT +8 sg3 +[0-9]+: 0+c +0 +TLS +GLOBAL +DEFAULT +8 sg4 diff --git a/ld/testsuite/ld-x86-64/tlsdesc.rd b/ld/testsuite/ld-x86-64/tlsdesc.rd index ee43ee2..ebd25b1 100644 --- a/ld/testsuite/ld-x86-64/tlsdesc.rd +++ b/ld/testsuite/ld-x86-64/tlsdesc.rd @@ -119,7 +119,7 @@ Symbol table '\.symtab' contains [0-9]+ entries: +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +10 * +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +11 * +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +12 * -.* FILE +LOCAL +DEFAULT +ABS .* +.* FILE +LOCAL +DEFAULT +ABS tmpdir/tlsdesc.o +[0-9]+: 0+20 +0 +TLS +LOCAL +DEFAULT +8 sl1 +[0-9]+: 0+24 +0 +TLS +LOCAL +DEFAULT +8 sl2 +[0-9]+: 0+28 +0 +TLS +LOCAL +DEFAULT +8 sl3 @@ -128,6 +128,10 @@ Symbol table '\.symtab' contains [0-9]+ entries: +[0-9]+: 0+34 +0 +TLS +LOCAL +DEFAULT +8 sl6 +[0-9]+: 0+38 +0 +TLS +LOCAL +DEFAULT +8 sl7 +[0-9]+: 0+3c +0 +TLS +LOCAL +DEFAULT +8 sl8 +.* FILE +LOCAL +DEFAULT +ABS + +[0-9]+: 0+ +0 +TLS +LOCAL +DEFAULT +8 _TLS_MODULE_BASE_ + +[0-9]+: 0+2011b8 +0 +OBJECT +LOCAL +DEFAULT +10 _DYNAMIC + +[0-9]+: 0+201350 +0 +OBJECT +LOCAL +DEFAULT +12 _GLOBAL_OFFSET_TABLE_ +[0-9]+: 0+60 +0 +TLS +LOCAL +DEFAULT +9 sH1 +[0-9]+: 0+48 +0 +TLS +LOCAL +DEFAULT +8 sh3 +[0-9]+: 0+64 +0 +TLS +LOCAL +DEFAULT +9 sH2 @@ -144,10 +148,6 @@ Symbol table '\.symtab' contains [0-9]+ entries: +[0-9]+: 0+40 +0 +TLS +LOCAL +DEFAULT +8 sh1 +[0-9]+: 0+44 +0 +TLS +LOCAL +DEFAULT +8 sh2 +[0-9]+: 0+54 +0 +TLS +LOCAL +DEFAULT +8 sh6 -.* FILE +LOCAL +DEFAULT +ABS .* - +[0-9]+: 0+ +0 +TLS +LOCAL +DEFAULT +8 _TLS_MODULE_BASE_ - +[0-9]+: 0+2011b8 +0 +OBJECT +LOCAL +DEFAULT +10 _DYNAMIC - +[0-9]+: 0+201350 +0 +OBJECT +LOCAL +DEFAULT +12 _GLOBAL_OFFSET_TABLE_ +[0-9]+: 0+1c +0 +TLS +GLOBAL +DEFAULT +8 sg8 +[0-9]+: 0+8 +0 +TLS +GLOBAL +DEFAULT +8 sg3 +[0-9]+: 0+c +0 +TLS +GLOBAL +DEFAULT +8 sg4 diff --git a/ld/testsuite/ld-x86-64/tlspic-nacl.rd b/ld/testsuite/ld-x86-64/tlspic-nacl.rd index d2cf7ba..0cc7951 100644 --- a/ld/testsuite/ld-x86-64/tlspic-nacl.rd +++ b/ld/testsuite/ld-x86-64/tlspic-nacl.rd @@ -105,7 +105,7 @@ Symbol table '\.symtab' contains [0-9]+ entries: .* SECTION +LOCAL +DEFAULT +10 * .* SECTION +LOCAL +DEFAULT +11 * .* SECTION +LOCAL +DEFAULT +12 * -.* FILE +LOCAL +DEFAULT +ABS .* +.* FILE +LOCAL +DEFAULT +ABS tmpdir/tlspic1.o .* TLS +LOCAL +DEFAULT +8 sl1 .* TLS +LOCAL +DEFAULT +8 sl2 .* TLS +LOCAL +DEFAULT +8 sl3 @@ -114,6 +114,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 +10 _DYNAMIC +.* OBJECT +LOCAL +DEFAULT +12 _GLOBAL_OFFSET_TABLE_ .* TLS +LOCAL +DEFAULT +9 sH1 .* TLS +LOCAL +DEFAULT +8 sh3 .* TLS +LOCAL +DEFAULT +9 sH2 @@ -130,9 +133,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 +10 _DYNAMIC -.* OBJECT +LOCAL +DEFAULT +12 _GLOBAL_OFFSET_TABLE_ .* TLS +GLOBAL +DEFAULT +8 sg8 .* TLS +GLOBAL +DEFAULT +8 sg3 .* TLS +GLOBAL +DEFAULT +8 sg4 diff --git a/ld/testsuite/ld-x86-64/tlspic.rd b/ld/testsuite/ld-x86-64/tlspic.rd index 3caed27..57035a9 100644 --- a/ld/testsuite/ld-x86-64/tlspic.rd +++ b/ld/testsuite/ld-x86-64/tlspic.rd @@ -103,7 +103,7 @@ Symbol table '\.symtab' contains [0-9]+ entries: .* SECTION +LOCAL +DEFAULT +10 * .* SECTION +LOCAL +DEFAULT +11 * .* SECTION +LOCAL +DEFAULT +12 * -.* FILE +LOCAL +DEFAULT +ABS .* +.* FILE +LOCAL +DEFAULT +ABS tmpdir/tlspic1.o .* TLS +LOCAL +DEFAULT +8 sl1 .* TLS +LOCAL +DEFAULT +8 sl2 .* TLS +LOCAL +DEFAULT +8 sl3 @@ -112,6 +112,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 +10 _DYNAMIC +.* OBJECT +LOCAL +DEFAULT +12 _GLOBAL_OFFSET_TABLE_ .* TLS +LOCAL +DEFAULT +9 sH1 .* TLS +LOCAL +DEFAULT +8 sh3 .* TLS +LOCAL +DEFAULT +9 sH2 @@ -128,9 +131,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 +10 _DYNAMIC -.* OBJECT +LOCAL +DEFAULT +12 _GLOBAL_OFFSET_TABLE_ .* TLS +GLOBAL +DEFAULT +8 sg8 .* TLS +GLOBAL +DEFAULT +8 sg3 .* TLS +GLOBAL +DEFAULT +8 sg4