From 5b4293ba3c207ebdaea3631819b9459f0a10e761 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Mon, 4 Jan 2021 17:13:51 +1030 Subject: [PATCH] PR26822, How to prevent a STT_FILE with absolute path in the linked image bfd/ PR 26822 * elflink.c (elf_link_input_bfd): Use the file base name in linker generated STT_FILE symbols. ld/ PR 26822 * testsuite/ld-arm/non-contiguous-arm2.d: Adjust STT_FILE symbol match. * testsuite/ld-arm/non-contiguous-arm3.d: Likewise. * testsuite/ld-arm/non-contiguous-arm5.d: Likewise. * testsuite/ld-arm/non-contiguous-arm6.d: Likewise. * testsuite/ld-i386/tlsbin.rd: Likewise. * testsuite/ld-i386/tlsbin2.rd: Likewise. * testsuite/ld-i386/tlsbindesc.rd: Likewise. * testsuite/ld-i386/tlsdesc.rd: Likewise. * testsuite/ld-i386/tlsnopic.rd: Likewise. * testsuite/ld-i386/tlspic.rd: Likewise. * testsuite/ld-i386/tlspic2.rd: Likewise. * testsuite/ld-mips-elf/global-local-symtab-sort-n64.d: Likewise. * testsuite/ld-mips-elf/global-local-symtab-sort-n64t.d: Likewise. * testsuite/ld-mips-elf/global-local-symtab-sort-o32.d: Likewise. * testsuite/ld-mips-elf/global-local-symtab-sort-o32t.d: Likewise. * testsuite/ld-plugin/pr17973.d: Likewise. * testsuite/ld-tic6x/shlib-1.rd: Likewise. * 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. * testsuite/ld-x86-64/tlsbin.rd: Likewise. * testsuite/ld-x86-64/tlsbin2.rd: Likewise. * testsuite/ld-x86-64/tlsbindesc.rd: Likewise. * testsuite/ld-x86-64/tlsdesc.rd: Likewise. * testsuite/ld-x86-64/tlspic.rd: Likewise. * testsuite/ld-x86-64/tlspic2.rd: Likewise. * testsuite/ld-xtensa/tlsbin.rd: Likewise. * testsuite/ld-xtensa/tlspic.rd: Likewise. --- bfd/ChangeLog | 6 +++ bfd/elflink.c | 12 +++--- ld/ChangeLog | 41 +++++++++++++++++++ ld/testsuite/ld-arm/non-contiguous-arm2.d | 2 +- ld/testsuite/ld-arm/non-contiguous-arm3.d | 2 +- ld/testsuite/ld-arm/non-contiguous-arm5.d | 2 +- ld/testsuite/ld-arm/non-contiguous-arm6.d | 2 +- ld/testsuite/ld-i386/tlsbin.rd | 4 +- ld/testsuite/ld-i386/tlsbin2.rd | 4 +- ld/testsuite/ld-i386/tlsbindesc.rd | 4 +- ld/testsuite/ld-i386/tlsdesc.rd | 2 +- ld/testsuite/ld-i386/tlsnopic.rd | 2 +- ld/testsuite/ld-i386/tlspic.rd | 2 +- ld/testsuite/ld-i386/tlspic2.rd | 2 +- .../global-local-symtab-sort-n64.d | 2 +- .../global-local-symtab-sort-n64t.d | 2 +- .../global-local-symtab-sort-o32.d | 2 +- .../global-local-symtab-sort-o32t.d | 2 +- ld/testsuite/ld-plugin/pr17973.d | 2 +- ld/testsuite/ld-tic6x/shlib-1.rd | 6 +-- ld/testsuite/ld-tic6x/shlib-1b.rd | 6 +-- ld/testsuite/ld-tic6x/shlib-1r.rd | 6 +-- ld/testsuite/ld-tic6x/shlib-1rb.rd | 6 +-- ld/testsuite/ld-tic6x/shlib-app-1.rd | 6 +-- ld/testsuite/ld-tic6x/shlib-app-1b.rd | 6 +-- ld/testsuite/ld-tic6x/shlib-app-1r.rd | 6 +-- ld/testsuite/ld-tic6x/shlib-app-1rb.rd | 6 +-- ld/testsuite/ld-tic6x/shlib-noindex.rd | 6 +-- ld/testsuite/ld-tic6x/static-app-1.rd | 8 ++-- ld/testsuite/ld-tic6x/static-app-1b.rd | 8 ++-- ld/testsuite/ld-tic6x/static-app-1r.rd | 8 ++-- ld/testsuite/ld-tic6x/static-app-1rb.rd | 8 ++-- ld/testsuite/ld-x86-64/tlsbin.rd | 4 +- ld/testsuite/ld-x86-64/tlsbin2.rd | 4 +- ld/testsuite/ld-x86-64/tlsbindesc.rd | 4 +- ld/testsuite/ld-x86-64/tlsdesc.rd | 2 +- ld/testsuite/ld-x86-64/tlspic.rd | 2 +- ld/testsuite/ld-x86-64/tlspic2.rd | 2 +- ld/testsuite/ld-xtensa/tlsbin.rd | 2 +- ld/testsuite/ld-xtensa/tlspic.rd | 2 +- 40 files changed, 127 insertions(+), 78 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index a7cc3c8af3e..0a472e5ce2d 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2021-01-04 Alan Modra + + PR 26822 + * elflink.c (elf_link_input_bfd): Use the file base name in + linker generated STT_FILE symbols. + 2021-01-04 Nelson Chu * elfxx-riscv.c (riscv_compare_subsets): Removed static. diff --git a/bfd/elflink.c b/bfd/elflink.c index 1dfed2fdd15..448989a2827 100644 --- a/bfd/elflink.c +++ b/bfd/elflink.c @@ -10952,16 +10952,18 @@ elf_link_input_bfd (struct elf_final_link_info *flinfo, bfd *input_bfd) files lack such, so that their symbols won't be associated with a previous input file. It's not the source file, but the best we can do. */ + const char *filename; have_file_sym = TRUE; flinfo->filesym_count += 1; memset (&osym, 0, sizeof (osym)); osym.st_info = ELF_ST_INFO (STB_LOCAL, STT_FILE); osym.st_shndx = SHN_ABS; - if (!elf_link_output_symstrtab (flinfo, - (input_bfd->lto_output ? NULL - : bfd_get_filename (input_bfd)), - &osym, bfd_abs_section_ptr, - NULL)) + if (input_bfd->lto_output) + filename = NULL; + else + filename = lbasename (bfd_get_filename (input_bfd)); + if (!elf_link_output_symstrtab (flinfo, filename, &osym, + bfd_abs_section_ptr, NULL)) return FALSE; } diff --git a/ld/ChangeLog b/ld/ChangeLog index ab0db961e1d..8d45491dda8 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,44 @@ +2021-01-04 Alan Modra + + PR 26822 + * testsuite/ld-arm/non-contiguous-arm2.d: Adjust STT_FILE symbol match. + * testsuite/ld-arm/non-contiguous-arm3.d: Likewise. + * testsuite/ld-arm/non-contiguous-arm5.d: Likewise. + * testsuite/ld-arm/non-contiguous-arm6.d: Likewise. + * testsuite/ld-i386/tlsbin.rd: Likewise. + * testsuite/ld-i386/tlsbin2.rd: Likewise. + * testsuite/ld-i386/tlsbindesc.rd: Likewise. + * testsuite/ld-i386/tlsdesc.rd: Likewise. + * testsuite/ld-i386/tlsnopic.rd: Likewise. + * testsuite/ld-i386/tlspic.rd: Likewise. + * testsuite/ld-i386/tlspic2.rd: Likewise. + * testsuite/ld-mips-elf/global-local-symtab-sort-n64.d: Likewise. + * testsuite/ld-mips-elf/global-local-symtab-sort-n64t.d: Likewise. + * testsuite/ld-mips-elf/global-local-symtab-sort-o32.d: Likewise. + * testsuite/ld-mips-elf/global-local-symtab-sort-o32t.d: Likewise. + * testsuite/ld-plugin/pr17973.d: Likewise. + * testsuite/ld-tic6x/shlib-1.rd: Likewise. + * 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. + * testsuite/ld-x86-64/tlsbin.rd: Likewise. + * testsuite/ld-x86-64/tlsbin2.rd: Likewise. + * testsuite/ld-x86-64/tlsbindesc.rd: Likewise. + * testsuite/ld-x86-64/tlsdesc.rd: Likewise. + * testsuite/ld-x86-64/tlspic.rd: Likewise. + * testsuite/ld-x86-64/tlspic2.rd: Likewise. + * testsuite/ld-xtensa/tlsbin.rd: Likewise. + * testsuite/ld-xtensa/tlspic.rd: Likewise. + 2021-01-01 Nicolas Boulenguez * configure.tgt: Correct comment grammar. diff --git a/ld/testsuite/ld-arm/non-contiguous-arm2.d b/ld/testsuite/ld-arm/non-contiguous-arm2.d index af40e840e05..14aca4c7b21 100644 --- a/ld/testsuite/ld-arm/non-contiguous-arm2.d +++ b/ld/testsuite/ld-arm/non-contiguous-arm2.d @@ -21,7 +21,7 @@ SYMBOL TABLE: 20000000 l d .ramu 00000000 .ramu 20040000 l d .ramz 00000000 .ramz 00000000 l d .ARM.attributes 00000000 .ARM.attributes -00000000 l df \*ABS\* 00000000 .*/non-contiguous-arm.o +00000000 l df \*ABS\* 00000000 .*non-contiguous-arm.o 1fff0018 g .raml 00000000 _raml_end 20000000 g .ramu 00000000 _ramu_start 1fff000c g F .raml 00000000 code2 diff --git a/ld/testsuite/ld-arm/non-contiguous-arm3.d b/ld/testsuite/ld-arm/non-contiguous-arm3.d index 6373922ea1f..c500a29e467 100644 --- a/ld/testsuite/ld-arm/non-contiguous-arm3.d +++ b/ld/testsuite/ld-arm/non-contiguous-arm3.d @@ -22,7 +22,7 @@ SYMBOL TABLE: 20000000 l d .ramu 00000000 .ramu 30040000 l d .ramz 00000000 .ramz 00000000 l d .ARM.attributes 00000000 .ARM.attributes -00000000 l df \*ABS\* 00000000 .*/non-contiguous-arm.o +00000000 l df \*ABS\* 00000000 .*non-contiguous-arm.o 20000008 l F .ramu 00000008 __code4_veneer 1fff0018 g .raml 00000000 _raml_end 20000000 g .ramu 00000000 _ramu_start diff --git a/ld/testsuite/ld-arm/non-contiguous-arm5.d b/ld/testsuite/ld-arm/non-contiguous-arm5.d index dc85d1eaba9..60b6f56157c 100644 --- a/ld/testsuite/ld-arm/non-contiguous-arm5.d +++ b/ld/testsuite/ld-arm/non-contiguous-arm5.d @@ -21,7 +21,7 @@ SYMBOL TABLE: 20000000 l d .ramu 00000000 .ramu 20040000 l d .ramz 00000000 .ramz 00000000 l d .ARM.attributes 00000000 .ARM.attributes -00000000 l df \*ABS\* 00000000 .*/non-contiguous-arm.o +00000000 l df \*ABS\* 00000000 .*non-contiguous-arm.o 1fff000c g .raml 00000000 _raml_end 20000000 g .ramu 00000000 _ramu_start 20000000 g F .ramu 00000000 code2 diff --git a/ld/testsuite/ld-arm/non-contiguous-arm6.d b/ld/testsuite/ld-arm/non-contiguous-arm6.d index 605d846cfa0..da69f6b7c16 100644 --- a/ld/testsuite/ld-arm/non-contiguous-arm6.d +++ b/ld/testsuite/ld-arm/non-contiguous-arm6.d @@ -19,7 +19,7 @@ SYMBOL TABLE: 1fff0000 l d .raml 00000000 .raml 40040000 l d .ramz 00000000 .ramz 00000000 l d .ARM.attributes 00000000 .ARM.attributes -00000000 l df \*ABS\* 00000000 .*/non-contiguous-arm.o +00000000 l df \*ABS\* 00000000 .*non-contiguous-arm.o 1fff0020 l F .raml 00000008 __code4_veneer 1fff0028 g .raml 00000000 _raml_end 30000000 g .raml 00000000 _ramu_start diff --git a/ld/testsuite/ld-i386/tlsbin.rd b/ld/testsuite/ld-i386/tlsbin.rd index ee272f631e5..20e4c5ed361 100644 --- a/ld/testsuite/ld-i386/tlsbin.rd +++ b/ld/testsuite/ld-i386/tlsbin.rd @@ -97,7 +97,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 tmpdir/tlsbinpic.o +.* FILE +LOCAL +DEFAULT +ABS .*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 @@ -106,7 +106,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 tmpdir/tlsbin.o +.* FILE +LOCAL +DEFAULT +ABS .*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 diff --git a/ld/testsuite/ld-i386/tlsbin2.rd b/ld/testsuite/ld-i386/tlsbin2.rd index 5abf9ea6652..5177f4d30dd 100644 --- a/ld/testsuite/ld-i386/tlsbin2.rd +++ b/ld/testsuite/ld-i386/tlsbin2.rd @@ -90,7 +90,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 tmpdir/tlsbinpic2.o +.* FILE +LOCAL +DEFAULT +ABS .*tlsbinpic2.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 @@ -99,7 +99,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 tmpdir/tlsbin.o +.* FILE +LOCAL +DEFAULT +ABS .*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 diff --git a/ld/testsuite/ld-i386/tlsbindesc.rd b/ld/testsuite/ld-i386/tlsbindesc.rd index cd3c06e202d..1c9c4f2cb2a 100644 --- a/ld/testsuite/ld-i386/tlsbindesc.rd +++ b/ld/testsuite/ld-i386/tlsbindesc.rd @@ -88,7 +88,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 tmpdir/tlsbindesc.o +.* FILE +LOCAL +DEFAULT +ABS .*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 @@ -97,7 +97,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 tmpdir/tlsbin.o +.* FILE +LOCAL +DEFAULT +ABS .*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 diff --git a/ld/testsuite/ld-i386/tlsdesc.rd b/ld/testsuite/ld-i386/tlsdesc.rd index d47d2e94f2e..a5b4fb83c0e 100644 --- a/ld/testsuite/ld-i386/tlsdesc.rd +++ b/ld/testsuite/ld-i386/tlsdesc.rd @@ -103,7 +103,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 tmpdir/tlsdesc.o +.* FILE +LOCAL +DEFAULT +ABS .*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 diff --git a/ld/testsuite/ld-i386/tlsnopic.rd b/ld/testsuite/ld-i386/tlsnopic.rd index 4856c64f706..661f1c46c6b 100644 --- a/ld/testsuite/ld-i386/tlsnopic.rd +++ b/ld/testsuite/ld-i386/tlsnopic.rd @@ -89,7 +89,7 @@ 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 tmpdir/tlsnopic1.o +.* FILE +LOCAL +DEFAULT +ABS .*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 diff --git a/ld/testsuite/ld-i386/tlspic.rd b/ld/testsuite/ld-i386/tlspic.rd index ae920583a44..3425c951bd0 100644 --- a/ld/testsuite/ld-i386/tlspic.rd +++ b/ld/testsuite/ld-i386/tlspic.rd @@ -108,7 +108,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 tmpdir/tlspic1.o +.* FILE +LOCAL +DEFAULT +ABS .*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 diff --git a/ld/testsuite/ld-i386/tlspic2.rd b/ld/testsuite/ld-i386/tlspic2.rd index 59f1cdd187f..274445db842 100644 --- a/ld/testsuite/ld-i386/tlspic2.rd +++ b/ld/testsuite/ld-i386/tlspic2.rd @@ -101,7 +101,7 @@ Symbol table '\.symtab' contains [0-9]+ entries: +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +8 * +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +9 * +[0-9]+: [0-9a-f]+ +0 +SECTION +LOCAL +DEFAULT +10 * -.* FILE +LOCAL +DEFAULT +ABS tmpdir/tlspic3.o +.* FILE +LOCAL +DEFAULT +ABS .*tlspic3.o +[0-9]+: 0+20 +0 +TLS +LOCAL +DEFAULT +6 sl1 +[0-9]+: 0+24 +0 +TLS +LOCAL +DEFAULT +6 sl2 +[0-9]+: 0+28 +0 +TLS +LOCAL +DEFAULT +6 sl3 diff --git a/ld/testsuite/ld-mips-elf/global-local-symtab-sort-n64.d b/ld/testsuite/ld-mips-elf/global-local-symtab-sort-n64.d index 6491bca3b44..6abc5402ceb 100644 --- a/ld/testsuite/ld-mips-elf/global-local-symtab-sort-n64.d +++ b/ld/testsuite/ld-mips-elf/global-local-symtab-sort-n64.d @@ -8,6 +8,6 @@ Symbol table '\.symtab' contains 5 entries: Num: Value Size Type Bind Vis Ndx Name 0: 0000000000000000 0 NOTYPE LOCAL DEFAULT UND 1: 0000000000000000 0 SECTION LOCAL DEFAULT 1 \.data - 2: 0000000000000000 0 FILE LOCAL DEFAULT ABS tmpdir/global-local-symtab\.o + 2: 0000000000000000 0 FILE LOCAL DEFAULT ABS .*global-local-symtab\.o 3: 0000000000000004 4 OBJECT LOCAL DEFAULT 1 bar 4: 0000000000000000 4 OBJECT GLOBAL DEFAULT 1 foo diff --git a/ld/testsuite/ld-mips-elf/global-local-symtab-sort-n64t.d b/ld/testsuite/ld-mips-elf/global-local-symtab-sort-n64t.d index 90d37ec2c68..911cc242529 100644 --- a/ld/testsuite/ld-mips-elf/global-local-symtab-sort-n64t.d +++ b/ld/testsuite/ld-mips-elf/global-local-symtab-sort-n64t.d @@ -8,6 +8,6 @@ Symbol table '\.symtab' contains 5 entries: Num: Value Size Type Bind Vis Ndx Name 0: 0000000000000000 0 NOTYPE LOCAL DEFAULT UND 1: 0000000000000000 0 SECTION LOCAL DEFAULT 1 - 2: 0000000000000000 0 FILE LOCAL DEFAULT ABS tmpdir/global-local-symtab\.o + 2: 0000000000000000 0 FILE LOCAL DEFAULT ABS .*global-local-symtab\.o 3: 0000000000000004 4 OBJECT LOCAL DEFAULT 1 bar 4: 0000000000000000 4 OBJECT GLOBAL DEFAULT 1 foo diff --git a/ld/testsuite/ld-mips-elf/global-local-symtab-sort-o32.d b/ld/testsuite/ld-mips-elf/global-local-symtab-sort-o32.d index 1e6ff20c03d..7fec0a7c67a 100644 --- a/ld/testsuite/ld-mips-elf/global-local-symtab-sort-o32.d +++ b/ld/testsuite/ld-mips-elf/global-local-symtab-sort-o32.d @@ -8,6 +8,6 @@ Symbol table '\.symtab' contains 5 entries: Num: Value Size Type Bind Vis Ndx Name 0: 00000000 0 NOTYPE LOCAL DEFAULT UND 1: 00000000 0 SECTION LOCAL DEFAULT 1 \.data - 2: 00000000 0 FILE LOCAL DEFAULT ABS tmpdir/global-local-symtab\.o + 2: 00000000 0 FILE LOCAL DEFAULT ABS .*global-local-symtab\.o 3: 00000004 4 OBJECT LOCAL DEFAULT 1 bar 4: 00000000 4 OBJECT GLOBAL DEFAULT 1 foo diff --git a/ld/testsuite/ld-mips-elf/global-local-symtab-sort-o32t.d b/ld/testsuite/ld-mips-elf/global-local-symtab-sort-o32t.d index 9e7ceaa76e8..047f290a277 100644 --- a/ld/testsuite/ld-mips-elf/global-local-symtab-sort-o32t.d +++ b/ld/testsuite/ld-mips-elf/global-local-symtab-sort-o32t.d @@ -8,6 +8,6 @@ Symbol table '\.symtab' contains 5 entries: Num: Value Size Type Bind Vis Ndx Name 0: 00000000 0 NOTYPE LOCAL DEFAULT UND 1: 00000000 0 SECTION LOCAL DEFAULT 1 - 2: 00000000 0 FILE LOCAL DEFAULT ABS tmpdir/global-local-symtab\.o + 2: 00000000 0 FILE LOCAL DEFAULT ABS .*global-local-symtab\.o 3: 00000004 4 OBJECT LOCAL DEFAULT 1 bar 4: 00000000 4 OBJECT GLOBAL DEFAULT 1 foo diff --git a/ld/testsuite/ld-plugin/pr17973.d b/ld/testsuite/ld-plugin/pr17973.d index 85c849a595b..2bc0ac1b1af 100644 --- a/ld/testsuite/ld-plugin/pr17973.d +++ b/ld/testsuite/ld-plugin/pr17973.d @@ -1,4 +1,4 @@ #failif #... -.*0+ +FILE +LOCAL +DEFAULT +ABS tmpdir/pr17973.o +.*0+ +FILE +LOCAL +DEFAULT +ABS .*pr17973.o #... diff --git a/ld/testsuite/ld-tic6x/shlib-1.rd b/ld/testsuite/ld-tic6x/shlib-1.rd index af3815c16c7..a038baf6228 100644 --- a/ld/testsuite/ld-tic6x/shlib-1.rd +++ b/ld/testsuite/ld-tic6x/shlib-1.rd @@ -17,8 +17,8 @@ Section Headers: \[12\] \.bss NOBITS 10000130 002130 000004 00 WA 0 0 4 \[13\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 002130 000019 00 0 0 1 \[14\] \.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 + \[15\] \.strtab STRTAB .* + \[16\] \.shstrtab STRTAB .* Key to Flags: #... @@ -106,7 +106,7 @@ Symbol table '\.symtab' contains 27 entries: 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 + 14: 00000000 0 FILE LOCAL DEFAULT ABS .*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 diff --git a/ld/testsuite/ld-tic6x/shlib-1b.rd b/ld/testsuite/ld-tic6x/shlib-1b.rd index af3815c16c7..a038baf6228 100644 --- a/ld/testsuite/ld-tic6x/shlib-1b.rd +++ b/ld/testsuite/ld-tic6x/shlib-1b.rd @@ -17,8 +17,8 @@ Section Headers: \[12\] \.bss NOBITS 10000130 002130 000004 00 WA 0 0 4 \[13\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 002130 000019 00 0 0 1 \[14\] \.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 + \[15\] \.strtab STRTAB .* + \[16\] \.shstrtab STRTAB .* Key to Flags: #... @@ -106,7 +106,7 @@ Symbol table '\.symtab' contains 27 entries: 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 + 14: 00000000 0 FILE LOCAL DEFAULT ABS .*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 diff --git a/ld/testsuite/ld-tic6x/shlib-1r.rd b/ld/testsuite/ld-tic6x/shlib-1r.rd index af3815c16c7..a038baf6228 100644 --- a/ld/testsuite/ld-tic6x/shlib-1r.rd +++ b/ld/testsuite/ld-tic6x/shlib-1r.rd @@ -17,8 +17,8 @@ Section Headers: \[12\] \.bss NOBITS 10000130 002130 000004 00 WA 0 0 4 \[13\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 002130 000019 00 0 0 1 \[14\] \.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 + \[15\] \.strtab STRTAB .* + \[16\] \.shstrtab STRTAB .* Key to Flags: #... @@ -106,7 +106,7 @@ Symbol table '\.symtab' contains 27 entries: 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 + 14: 00000000 0 FILE LOCAL DEFAULT ABS .*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 diff --git a/ld/testsuite/ld-tic6x/shlib-1rb.rd b/ld/testsuite/ld-tic6x/shlib-1rb.rd index af3815c16c7..a038baf6228 100644 --- a/ld/testsuite/ld-tic6x/shlib-1rb.rd +++ b/ld/testsuite/ld-tic6x/shlib-1rb.rd @@ -17,8 +17,8 @@ Section Headers: \[12\] \.bss NOBITS 10000130 002130 000004 00 WA 0 0 4 \[13\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 002130 000019 00 0 0 1 \[14\] \.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 + \[15\] \.strtab STRTAB .* + \[16\] \.shstrtab STRTAB .* Key to Flags: #... @@ -106,7 +106,7 @@ Symbol table '\.symtab' contains 27 entries: 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 + 14: 00000000 0 FILE LOCAL DEFAULT ABS .*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 diff --git a/ld/testsuite/ld-tic6x/shlib-app-1.rd b/ld/testsuite/ld-tic6x/shlib-app-1.rd index 4725356d090..bf783a975c0 100644 --- a/ld/testsuite/ld-tic6x/shlib-app-1.rd +++ b/ld/testsuite/ld-tic6x/shlib-app-1.rd @@ -18,8 +18,8 @@ Section Headers: \[13\] \.bss NOBITS 100000cc 0020cc 000004 00 WA 0 0 4 \[14\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 0020cc 000019 00 0 0 1 \[15\] \.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 + \[16\] \.strtab STRTAB .* + \[17\] \.shstrtab STRTAB .* Key to Flags: #... @@ -111,7 +111,7 @@ Symbol table '\.symtab' contains 27 entries: 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 + 15: 00000000 0 FILE LOCAL DEFAULT ABS .*shlib-app-1\.o 16: 10000060 0 NOTYPE LOCAL DEFAULT 10 fish 17: 100000c4 8 OBJECT LOCAL DEFAULT 12 w 18: 00000000 0 FILE LOCAL DEFAULT ABS diff --git a/ld/testsuite/ld-tic6x/shlib-app-1b.rd b/ld/testsuite/ld-tic6x/shlib-app-1b.rd index 4564ffeecbe..771ad218050 100644 --- a/ld/testsuite/ld-tic6x/shlib-app-1b.rd +++ b/ld/testsuite/ld-tic6x/shlib-app-1b.rd @@ -18,8 +18,8 @@ Section Headers: \[13\] \.bss NOBITS 100000cc 0020cc 000004 00 WA 0 0 4 \[14\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 0020cc 000019 00 0 0 1 \[15\] \.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 + \[16\] \.strtab STRTAB .* + \[17\] \.shstrtab STRTAB .* Key to Flags: #... @@ -111,7 +111,7 @@ Symbol table '\.symtab' contains 27 entries: 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 + 15: 00000000 0 FILE LOCAL DEFAULT ABS .*shlib-app-1\.o 16: 10000060 0 NOTYPE LOCAL DEFAULT 10 fish 17: 100000c4 8 OBJECT LOCAL DEFAULT 12 w 18: 00000000 0 FILE LOCAL DEFAULT ABS diff --git a/ld/testsuite/ld-tic6x/shlib-app-1r.rd b/ld/testsuite/ld-tic6x/shlib-app-1r.rd index 797b8aad1c3..a98c752a0d4 100644 --- a/ld/testsuite/ld-tic6x/shlib-app-1r.rd +++ b/ld/testsuite/ld-tic6x/shlib-app-1r.rd @@ -17,8 +17,8 @@ Section Headers: \[12\] \.bss NOBITS 100000c4 0020c4 000004 00 WA 0 0 4 \[13\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 0020c4 000019 00 0 0 1 \[14\] \.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 + \[15\] \.strtab STRTAB .* + \[16\] \.shstrtab STRTAB .* Key to Flags: #... @@ -102,7 +102,7 @@ Symbol table '\.symtab' contains 23 entries: 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 + 14: 00000000 0 FILE LOCAL DEFAULT ABS .*shlib-app-1r\.o 15: 10000060 0 NOTYPE LOCAL DEFAULT 9 fish 16: 00000000 0 FILE LOCAL DEFAULT ABS 17: 0000810c 0 OBJECT LOCAL DEFAULT 6 _DYNAMIC diff --git a/ld/testsuite/ld-tic6x/shlib-app-1rb.rd b/ld/testsuite/ld-tic6x/shlib-app-1rb.rd index d23eb2aa280..6e795ffe643 100644 --- a/ld/testsuite/ld-tic6x/shlib-app-1rb.rd +++ b/ld/testsuite/ld-tic6x/shlib-app-1rb.rd @@ -17,8 +17,8 @@ Section Headers: \[12\] \.bss NOBITS 100000c4 0020c4 000004 00 WA 0 0 4 \[13\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 0020c4 000019 00 0 0 1 \[14\] \.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 + \[15\] \.strtab STRTAB .* + \[16\] \.shstrtab STRTAB .* Key to Flags: #... @@ -102,7 +102,7 @@ Symbol table '\.symtab' contains 23 entries: 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 + 14: 00000000 0 FILE LOCAL DEFAULT ABS .*shlib-app-1r\.o 15: 10000060 0 NOTYPE LOCAL DEFAULT 9 fish 16: 00000000 0 FILE LOCAL DEFAULT ABS 17: 0000810c 0 OBJECT LOCAL DEFAULT 6 _DYNAMIC diff --git a/ld/testsuite/ld-tic6x/shlib-noindex.rd b/ld/testsuite/ld-tic6x/shlib-noindex.rd index bca8810fa51..c9e60040c98 100644 --- a/ld/testsuite/ld-tic6x/shlib-noindex.rd +++ b/ld/testsuite/ld-tic6x/shlib-noindex.rd @@ -18,8 +18,8 @@ Section Headers: \[13\] \.bss NOBITS 10000130 002130 000004 00 WA 0 0 4 \[14\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 002130 000019 00 0 0 1 \[15\] \.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 + \[16\] \.strtab STRTAB .* + \[17\] \.shstrtab STRTAB .* Key to Flags: #... @@ -113,7 +113,7 @@ Symbol table '\.symtab' contains 28 entries: 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 + 15: 00000000 0 FILE LOCAL DEFAULT ABS .*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 diff --git a/ld/testsuite/ld-tic6x/static-app-1.rd b/ld/testsuite/ld-tic6x/static-app-1.rd index ba0006512ed..82e65b9497f 100644 --- a/ld/testsuite/ld-tic6x/static-app-1.rd +++ b/ld/testsuite/ld-tic6x/static-app-1.rd @@ -15,8 +15,8 @@ Section Headers: \[10\] \.bss NOBITS 100000f4 0020f4 000004 00 WA 0 0 4 \[11\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 0020f4 000019 00 0 0 1 \[12\] \.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 + \[13\] \.strtab STRTAB .* + \[14\] \.shstrtab STRTAB .* Key to Flags: #... @@ -93,9 +93,9 @@ Symbol table '\.symtab' contains 28 entries: 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 + 12: 00000000 0 FILE LOCAL DEFAULT ABS .*shlib-1\.o 13: 10000000 0 FUNC LOCAL HIDDEN 7 sub1 - 14: 00000000 0 FILE LOCAL DEFAULT ABS tmpdir/shlib-app-1\.o + 14: 00000000 0 FILE LOCAL DEFAULT ABS .*shlib-app-1\.o 15: 10000080 0 NOTYPE LOCAL DEFAULT 7 fish 16: 100000ec 8 OBJECT LOCAL DEFAULT 9 w 17: 00000000 0 FILE LOCAL DEFAULT ABS diff --git a/ld/testsuite/ld-tic6x/static-app-1b.rd b/ld/testsuite/ld-tic6x/static-app-1b.rd index ba0006512ed..82e65b9497f 100644 --- a/ld/testsuite/ld-tic6x/static-app-1b.rd +++ b/ld/testsuite/ld-tic6x/static-app-1b.rd @@ -15,8 +15,8 @@ Section Headers: \[10\] \.bss NOBITS 100000f4 0020f4 000004 00 WA 0 0 4 \[11\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 0020f4 000019 00 0 0 1 \[12\] \.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 + \[13\] \.strtab STRTAB .* + \[14\] \.shstrtab STRTAB .* Key to Flags: #... @@ -93,9 +93,9 @@ Symbol table '\.symtab' contains 28 entries: 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 + 12: 00000000 0 FILE LOCAL DEFAULT ABS .*shlib-1\.o 13: 10000000 0 FUNC LOCAL HIDDEN 7 sub1 - 14: 00000000 0 FILE LOCAL DEFAULT ABS tmpdir/shlib-app-1\.o + 14: 00000000 0 FILE LOCAL DEFAULT ABS .*shlib-app-1\.o 15: 10000080 0 NOTYPE LOCAL DEFAULT 7 fish 16: 100000ec 8 OBJECT LOCAL DEFAULT 9 w 17: 00000000 0 FILE LOCAL DEFAULT ABS diff --git a/ld/testsuite/ld-tic6x/static-app-1r.rd b/ld/testsuite/ld-tic6x/static-app-1r.rd index c0f934b9875..0d2fde87420 100644 --- a/ld/testsuite/ld-tic6x/static-app-1r.rd +++ b/ld/testsuite/ld-tic6x/static-app-1r.rd @@ -15,8 +15,8 @@ Section Headers: \[10\] \.bss NOBITS 100000ec 0020ec 000004 00 WA 0 0 4 \[11\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 0020ec 000019 00 0 0 1 \[12\] \.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 + \[13\] \.strtab STRTAB .* + \[14\] \.shstrtab STRTAB .* Key to Flags: #... @@ -91,9 +91,9 @@ Symbol table '\.symtab' contains 27 entries: 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 + 12: 00000000 0 FILE LOCAL DEFAULT ABS .*shlib-1\.o 13: 10000000 0 FUNC LOCAL HIDDEN 7 sub1 - 14: 00000000 0 FILE LOCAL DEFAULT ABS tmpdir/shlib-app-1r\.o + 14: 00000000 0 FILE LOCAL DEFAULT ABS .*shlib-app-1r\.o 15: 10000080 0 NOTYPE LOCAL DEFAULT 7 fish 16: 00000000 0 FILE LOCAL DEFAULT ABS 17: 00008110 0 OBJECT LOCAL DEFAULT 6 _DYNAMIC diff --git a/ld/testsuite/ld-tic6x/static-app-1rb.rd b/ld/testsuite/ld-tic6x/static-app-1rb.rd index c0f934b9875..0d2fde87420 100644 --- a/ld/testsuite/ld-tic6x/static-app-1rb.rd +++ b/ld/testsuite/ld-tic6x/static-app-1rb.rd @@ -15,8 +15,8 @@ Section Headers: \[10\] \.bss NOBITS 100000ec 0020ec 000004 00 WA 0 0 4 \[11\] \.c6xabi\.attributes C6000_ATTRIBUTES 00000000 0020ec 000019 00 0 0 1 \[12\] \.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 + \[13\] \.strtab STRTAB .* + \[14\] \.shstrtab STRTAB .* Key to Flags: #... @@ -91,9 +91,9 @@ Symbol table '\.symtab' contains 27 entries: 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 + 12: 00000000 0 FILE LOCAL DEFAULT ABS .*shlib-1\.o 13: 10000000 0 FUNC LOCAL HIDDEN 7 sub1 - 14: 00000000 0 FILE LOCAL DEFAULT ABS tmpdir/shlib-app-1r\.o + 14: 00000000 0 FILE LOCAL DEFAULT ABS .*shlib-app-1r\.o 15: 10000080 0 NOTYPE LOCAL DEFAULT 7 fish 16: 00000000 0 FILE LOCAL DEFAULT ABS 17: 00008110 0 OBJECT LOCAL DEFAULT 6 _DYNAMIC diff --git a/ld/testsuite/ld-x86-64/tlsbin.rd b/ld/testsuite/ld-x86-64/tlsbin.rd index 02b05d98a06..c535732b759 100644 --- a/ld/testsuite/ld-x86-64/tlsbin.rd +++ b/ld/testsuite/ld-x86-64/tlsbin.rd @@ -88,7 +88,7 @@ Symbol table '\.symtab' contains [0-9]+ entries: .* SECTION +LOCAL +DEFAULT +11 * .* SECTION +LOCAL +DEFAULT +12 * .* SECTION +LOCAL +DEFAULT +13 * -.* FILE +LOCAL +DEFAULT +ABS tmpdir/tlsbinpic.o +.* FILE +LOCAL +DEFAULT +ABS .*tlsbinpic.o .* TLS +LOCAL +DEFAULT +9 sl1 .* TLS +LOCAL +DEFAULT +9 sl2 .* TLS +LOCAL +DEFAULT +9 sl3 @@ -97,7 +97,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 tmpdir/tlsbin.o +.* FILE +LOCAL +DEFAULT +ABS .*tlsbin.o .* TLS +LOCAL +DEFAULT +10 bl1 .* TLS +LOCAL +DEFAULT +10 bl2 .* TLS +LOCAL +DEFAULT +10 bl3 diff --git a/ld/testsuite/ld-x86-64/tlsbin2.rd b/ld/testsuite/ld-x86-64/tlsbin2.rd index 26cce6aa7f9..b1205fe49a7 100644 --- a/ld/testsuite/ld-x86-64/tlsbin2.rd +++ b/ld/testsuite/ld-x86-64/tlsbin2.rd @@ -81,7 +81,7 @@ Symbol table '\.symtab' contains [0-9]+ entries: .* SECTION +LOCAL +DEFAULT +9 * .* SECTION +LOCAL +DEFAULT +10 * .* SECTION +LOCAL +DEFAULT +11 * -.* FILE +LOCAL +DEFAULT +ABS tmpdir/tlsbinpic2.o +.* FILE +LOCAL +DEFAULT +ABS .*tlsbinpic2.o .* TLS +LOCAL +DEFAULT +7 sl1 .* TLS +LOCAL +DEFAULT +7 sl2 .* TLS +LOCAL +DEFAULT +7 sl3 @@ -90,7 +90,7 @@ 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 tmpdir/tlsbin.o +.* FILE +LOCAL +DEFAULT +ABS .*tlsbin.o .* TLS +LOCAL +DEFAULT +8 bl1 .* TLS +LOCAL +DEFAULT +8 bl2 .* TLS +LOCAL +DEFAULT +8 bl3 diff --git a/ld/testsuite/ld-x86-64/tlsbindesc.rd b/ld/testsuite/ld-x86-64/tlsbindesc.rd index 13978b7b67b..9e46ca1d0fc 100644 --- a/ld/testsuite/ld-x86-64/tlsbindesc.rd +++ b/ld/testsuite/ld-x86-64/tlsbindesc.rd @@ -79,7 +79,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 tmpdir/tlsbindesc.o +.* FILE +LOCAL +DEFAULT +ABS .*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 @@ -88,7 +88,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 tmpdir/tlsbin.o +.* FILE +LOCAL +DEFAULT +ABS .*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 diff --git a/ld/testsuite/ld-x86-64/tlsdesc.rd b/ld/testsuite/ld-x86-64/tlsdesc.rd index 4fcd8826aec..a15c6e0f22a 100644 --- a/ld/testsuite/ld-x86-64/tlsdesc.rd +++ b/ld/testsuite/ld-x86-64/tlsdesc.rd @@ -112,7 +112,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 tmpdir/tlsdesc.o +.* FILE +LOCAL +DEFAULT +ABS .*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 diff --git a/ld/testsuite/ld-x86-64/tlspic.rd b/ld/testsuite/ld-x86-64/tlspic.rd index b3547eb9456..024e124e515 100644 --- a/ld/testsuite/ld-x86-64/tlspic.rd +++ b/ld/testsuite/ld-x86-64/tlspic.rd @@ -96,7 +96,7 @@ Symbol table '\.symtab' contains [0-9]+ entries: .* SECTION +LOCAL +DEFAULT +10 * .* SECTION +LOCAL +DEFAULT +11 * .* SECTION +LOCAL +DEFAULT +12 * -.* FILE +LOCAL +DEFAULT +ABS tmpdir/tlspic1.o +.* FILE +LOCAL +DEFAULT +ABS .*tlspic1.o .* TLS +LOCAL +DEFAULT +8 sl1 .* TLS +LOCAL +DEFAULT +8 sl2 .* TLS +LOCAL +DEFAULT +8 sl3 diff --git a/ld/testsuite/ld-x86-64/tlspic2.rd b/ld/testsuite/ld-x86-64/tlspic2.rd index e02c33a6ae9..a39a8fe0d0d 100644 --- a/ld/testsuite/ld-x86-64/tlspic2.rd +++ b/ld/testsuite/ld-x86-64/tlspic2.rd @@ -93,7 +93,7 @@ Symbol table '\.symtab' contains [0-9]+ entries: .* SECTION +LOCAL +DEFAULT +10 * .* SECTION +LOCAL +DEFAULT +11 * .* SECTION +LOCAL +DEFAULT +12 * -.* FILE +LOCAL +DEFAULT +ABS tmpdir/tlspic3.o +.* FILE +LOCAL +DEFAULT +ABS .*tlspic3.o .* TLS +LOCAL +DEFAULT +8 sl1 .* TLS +LOCAL +DEFAULT +8 sl2 .* TLS +LOCAL +DEFAULT +8 sl3 diff --git a/ld/testsuite/ld-xtensa/tlsbin.rd b/ld/testsuite/ld-xtensa/tlsbin.rd index dcd2b04bcfe..09c6b215692 100644 --- a/ld/testsuite/ld-xtensa/tlsbin.rd +++ b/ld/testsuite/ld-xtensa/tlsbin.rd @@ -82,7 +82,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 * - +[0-9]+: [0-9a-f]+ +0 +FILE +LOCAL +DEFAULT +ABS +tmpdir/tlsbin.o + +[0-9]+: [0-9a-f]+ +0 +FILE +LOCAL +DEFAULT +ABS .*tlsbin.o +[0-9]+: [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +8 sl1 +[0-9]+: [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +8 sl2 +[0-9]+: [0-9a-f]+ +0 +TLS +LOCAL +DEFAULT +8 sl3 diff --git a/ld/testsuite/ld-xtensa/tlspic.rd b/ld/testsuite/ld-xtensa/tlspic.rd index b6f7067f4ce..70d8ef43d41 100644 --- a/ld/testsuite/ld-xtensa/tlspic.rd +++ b/ld/testsuite/ld-xtensa/tlspic.rd @@ -100,7 +100,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 * - +[0-9]+: [0-9a-f]+ +0 +FILE +LOCAL +DEFAULT +ABS +tmpdir/tlspic1.o + +[0-9]+: [0-9a-f]+ +0 +FILE +LOCAL +DEFAULT +ABS .*tlspic1.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 -- 2.30.2