aboutsummaryrefslogtreecommitdiff
path: root/ld
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2005-03-16 21:52:48 +0000
committerH.J. Lu <hjl.tools@gmail.com>2005-03-16 21:52:48 +0000
commit57316bff0a1aebca7c9f92d125e5366014f0bb1a (patch)
tree4a49b5bee243f75a41d85143644c1e99f1ef271b /ld
parent199fea98c99205f0fd3d2d3fd1a2670bdfe8a326 (diff)
downloadgdb-57316bff0a1aebca7c9f92d125e5366014f0bb1a.zip
gdb-57316bff0a1aebca7c9f92d125e5366014f0bb1a.tar.gz
gdb-57316bff0a1aebca7c9f92d125e5366014f0bb1a.tar.bz2
bfd/
2005-03-16 H.J. Lu <hongjiu.lu@intel.com> * elflink.c (elf_mark_used_section): New. (bfd_elf_gc_sections): Call elf_gc_mark_section for non-relocatable link if we don't do GC. include/ 2005-03-16 H.J. Lu <hongjiu.lu@intel.com> * bfdlink.h (bfd_link_info): Add gc_sections. ld/ 2005-03-16 H.J. Lu <hongjiu.lu@intel.com> * emultempl/elf32.em (gld${EMULATION_NAME}_finish): Remove unused empty output sections for non-relocatable link. * ld.h (args_type): Remove gc_sections. * ldlang.c (lang_mark_used_section): New. (lang_gc_sections): Use link_info.gc_sections instead of command_line.gc_sections. * ldmain.c (main): Likewise. * lexsup.c (parse_args): Likewise. * ldlang.c (lang_process): Call lang_mark_used_section. * ldmain.c (main): Initialize link_info.gc_sections to FALSE. ld/testsuite/ 2005-03-16 H.J. Lu <hongjiu.lu@intel.com> * ld-alpha/tlsbin.rd: Updated for empty section removal. * ld-alpha/tlsbinr.rd: Likewise. * ld-alpha/tlspic.rd: Likewise. * ld-arm/mixed-lib.sym: Likewise. * ld-i386/tlsbin.rd: Likewise. * ld-i386/tlsnopic.rd: Likewise. * ld-i386/tlspic.rd: Likewise. * ld-ia64/tlsbin.rd: Likewise. * ld-ia64/tlspic.rd: Likewise. * ld-powerpc/apuinfo.rd: Likewise. * ld-powerpc/powerpc.exp: Likewise. * ld-powerpc/tlsexe32.r: Likewise. * ld-s390/tlsbin.rd: Likewise. * ld-s390/tlsbin_64.rd: Likewise. * ld-s390/tlspic.rd: Likewise. * ld-s390/tlspic_64.rd: Likewise. * ld-sh/tlsbin-2.d: Likewise. * ld-sh/tlspic-2.d: Likewise. * ld-sparc/tlssunbin32.rd: Likewise. * ld-sparc/tlssunnopic32.rd: Likewise. * ld-sparc/tlssunpic32.rd: Likewise. * ld-x86-64/tlsbin.rd: Likewise. * ld-x86-64/tlspic.rd: Likewise.
Diffstat (limited to 'ld')
-rw-r--r--ld/ChangeLog16
-rw-r--r--ld/emultempl/elf32.em30
-rw-r--r--ld/ld.h3
-rw-r--r--ld/ldlang.c14
-rw-r--r--ld/ldmain.c3
-rw-r--r--ld/lexsup.c4
-rw-r--r--ld/testsuite/ChangeLog26
-rw-r--r--ld/testsuite/ld-alpha/tlsbin.rd130
-rw-r--r--ld/testsuite/ld-alpha/tlsbinr.rd144
-rw-r--r--ld/testsuite/ld-alpha/tlspic.rd18
-rw-r--r--ld/testsuite/ld-arm/mixed-lib.sym2
-rw-r--r--ld/testsuite/ld-i386/tlsbin.rd14
-rw-r--r--ld/testsuite/ld-i386/tlsnopic.rd28
-rw-r--r--ld/testsuite/ld-i386/tlspic.rd16
-rw-r--r--ld/testsuite/ld-ia64/tlsbin.rd174
-rw-r--r--ld/testsuite/ld-ia64/tlspic.rd26
-rw-r--r--ld/testsuite/ld-powerpc/apuinfo.rd2
-rw-r--r--ld/testsuite/ld-powerpc/powerpc.exp2
-rw-r--r--ld/testsuite/ld-powerpc/tlsexe32.r110
-rw-r--r--ld/testsuite/ld-powerpc/tlsso32.r4
-rw-r--r--ld/testsuite/ld-s390/tlsbin.rd14
-rw-r--r--ld/testsuite/ld-s390/tlsbin_64.rd39
-rw-r--r--ld/testsuite/ld-s390/tlspic.rd18
-rw-r--r--ld/testsuite/ld-s390/tlspic_64.rd37
-rw-r--r--ld/testsuite/ld-sh/tlsbin-2.d2
-rw-r--r--ld/testsuite/ld-sh/tlspic-2.d4
-rw-r--r--ld/testsuite/ld-sparc/tlssunbin32.rd132
-rw-r--r--ld/testsuite/ld-sparc/tlssunnopic32.rd62
-rw-r--r--ld/testsuite/ld-sparc/tlssunpic32.rd20
-rw-r--r--ld/testsuite/ld-x86-64/tlsbin.rd24
-rw-r--r--ld/testsuite/ld-x86-64/tlspic.rd20
31 files changed, 562 insertions, 576 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog
index e47e8ca..49fb2e8 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,19 @@
+2005-03-16 H.J. Lu <hongjiu.lu@intel.com>
+
+ * emultempl/elf32.em (gld${EMULATION_NAME}_finish): Remove
+ unused empty output sections for non-relocatable link.
+
+ * ld.h (args_type): Remove gc_sections.
+
+ * ldlang.c (lang_mark_used_section): New.
+ (lang_gc_sections): Use link_info.gc_sections instead of
+ command_line.gc_sections.
+ * ldmain.c (main): Likewise.
+ * lexsup.c (parse_args): Likewise.
+ * ldlang.c (lang_process): Call lang_mark_used_section.
+
+ * ldmain.c (main): Initialize link_info.gc_sections to FALSE.
+
2005-03-16 Nick Clifton <nickc@redhat.com>
Ben Elliston <bje@au.ibm.com>
diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
index 0f90455..d830959 100644
--- a/ld/emultempl/elf32.em
+++ b/ld/emultempl/elf32.em
@@ -1441,6 +1441,36 @@ gld${EMULATION_NAME}_finish (void)
lang_do_assignments (stat_ptr->head, abs_output_section,
(fill_type *) 0, (bfd_vma) 0);
}
+
+ if (!link_info.relocatable)
+ {
+ lang_output_section_statement_type *os;
+
+ for (os = &lang_output_section_statement.head->output_section_statement;
+ os != NULL;
+ os = os->next)
+ {
+ asection *s;
+
+ if (os == abs_output_section || os->constraint == -1)
+ continue;
+ s = os->bfd_section;
+ if (s != NULL && s->size == 0 && (s->flags & SEC_KEEP) == 0)
+ {
+ asection **p;
+
+ os->bfd_section = NULL;
+
+ for (p = &output_bfd->sections; *p; p = &(*p)->next)
+ if (*p == s)
+ {
+ bfd_section_list_remove (output_bfd, p);
+ output_bfd->section_count--;
+ break;
+ }
+ }
+ }
+ }
}
EOF
fi
diff --git a/ld/ld.h b/ld/ld.h
index 616cdfa..70b7f8f 100644
--- a/ld/ld.h
+++ b/ld/ld.h
@@ -156,9 +156,6 @@ typedef struct {
files. */
bfd_boolean warn_mismatch;
- /* Remove unreferenced sections? */
- bfd_boolean gc_sections;
-
/* Name of shared object whose symbol table should be filtered with
this shared object. From the --filter option. */
char *filter_shlib;
diff --git a/ld/ldlang.c b/ld/ldlang.c
index 636dc7f..72545c2 100644
--- a/ld/ldlang.c
+++ b/ld/ldlang.c
@@ -4718,10 +4718,20 @@ lang_gc_sections (void)
}
}
- if (command_line.gc_sections)
+ if (link_info.gc_sections)
bfd_gc_sections (output_bfd, &link_info);
}
+static void
+lang_mark_used_section (void)
+{
+ unsigned int gc_sections = link_info.gc_sections;
+
+ link_info.gc_sections = 0;
+ bfd_gc_sections (output_bfd, &link_info);
+ link_info.gc_sections = gc_sections;
+}
+
void
lang_process (void)
{
@@ -4883,7 +4893,7 @@ lang_process (void)
lang_check_section_addresses ();
/* Final stuffs. */
-
+ lang_mark_used_section ();
ldemul_finish ();
lang_finish ();
}
diff --git a/ld/ldmain.c b/ld/ldmain.c
index 165ec0e..0fce8bf 100644
--- a/ld/ldmain.c
+++ b/ld/ldmain.c
@@ -312,6 +312,7 @@ main (int argc, char **argv)
link_info.flags_1 = 0;
link_info.need_relax_finalize = FALSE;
link_info.warn_shared_textrel = FALSE;
+ link_info.gc_sections = FALSE;
ldfile_add_arch ("");
@@ -335,7 +336,7 @@ main (int argc, char **argv)
if (link_info.relocatable)
{
- if (command_line.gc_sections)
+ if (link_info.gc_sections)
einfo ("%P%F: --gc-sections and -r may not be used together\n");
else if (command_line.relax)
einfo (_("%P%F: --relax and -r may not be used together\n"));
diff --git a/ld/lexsup.c b/ld/lexsup.c
index 459cff9..c3fb81e 100644
--- a/ld/lexsup.c
+++ b/ld/lexsup.c
@@ -809,7 +809,7 @@ parse_args (unsigned argc, char **argv)
/* Ignore. */
break;
case OPTION_GC_SECTIONS:
- command_line.gc_sections = TRUE;
+ link_info.gc_sections = TRUE;
break;
case OPTION_HELP:
help ();
@@ -852,7 +852,7 @@ parse_args (unsigned argc, char **argv)
demangling = FALSE;
break;
case OPTION_NO_GC_SECTIONS:
- command_line.gc_sections = FALSE;
+ link_info.gc_sections = FALSE;
break;
case OPTION_NO_KEEP_MEMORY:
link_info.keep_memory = FALSE;
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index ca567cf..f7ccacb 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,29 @@
+2005-03-16 H.J. Lu <hongjiu.lu@intel.com>
+
+ * ld-alpha/tlsbin.rd: Updated for empty section removal.
+ * ld-alpha/tlsbinr.rd: Likewise.
+ * ld-alpha/tlspic.rd: Likewise.
+ * ld-arm/mixed-lib.sym: Likewise.
+ * ld-i386/tlsbin.rd: Likewise.
+ * ld-i386/tlsnopic.rd: Likewise.
+ * ld-i386/tlspic.rd: Likewise.
+ * ld-ia64/tlsbin.rd: Likewise.
+ * ld-ia64/tlspic.rd: Likewise.
+ * ld-powerpc/apuinfo.rd: Likewise.
+ * ld-powerpc/powerpc.exp: Likewise.
+ * ld-powerpc/tlsexe32.r: Likewise.
+ * ld-s390/tlsbin.rd: Likewise.
+ * ld-s390/tlsbin_64.rd: Likewise.
+ * ld-s390/tlspic.rd: Likewise.
+ * ld-s390/tlspic_64.rd: Likewise.
+ * ld-sh/tlsbin-2.d: Likewise.
+ * ld-sh/tlspic-2.d: Likewise.
+ * ld-sparc/tlssunbin32.rd: Likewise.
+ * ld-sparc/tlssunnopic32.rd: Likewise.
+ * ld-sparc/tlssunpic32.rd: Likewise.
+ * ld-x86-64/tlsbin.rd: Likewise.
+ * ld-x86-64/tlspic.rd: Likewise.
+
2005-03-16 Alan Modra <amodra@bigpond.net.au>
* ld-powerpc/tlsexe32.d: Update.
diff --git a/ld/testsuite/ld-alpha/tlsbin.rd b/ld/testsuite/ld-alpha/tlsbin.rd
index f452b1d..26da7e5 100644
--- a/ld/testsuite/ld-alpha/tlsbin.rd
+++ b/ld/testsuite/ld-alpha/tlsbin.rd
@@ -23,13 +23,10 @@ Section Headers:
\[10\] .tbss +NOBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 00 WAT +0 +0 +1
\[11\] .dynamic +DYNAMIC +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 10 +WA +4 +0 +8
\[12\] .plt +.*
- \[13\] .data +.*
- \[14\] .got +PROGBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 00 +WA +0 +0 +8
- \[15\] .sbss +.*
- \[16\] .bss +.*
- \[17\] .shstrtab +.*
- \[18\] .symtab +.*
- \[19\] .strtab +.*
+ \[13\] .got +PROGBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 00 +WA +0 +0 +8
+ \[14\] .shstrtab +.*
+ \[15\] .symtab +.*
+ \[16\] .strtab +.*
#...
Elf file type is EXEC \(Executable file\)
@@ -82,64 +79,61 @@ Symbol table '.symtab' contains [0-9]+ entries:
+7: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +7
+8: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +8
+9: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +9
- +10: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +10
- +11: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +11
- +12: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +12
- +13: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +13
- +14: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +14
- +15: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +15
- +16: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +16
- +17: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +17
- +18: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +18
- +19: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +19
- +20: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 sl1
- +21: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 sl2
- +22: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 sl3
- +23: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 sl4
- +24: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 sl5
- +25: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 sl6
- +26: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 sl7
- +27: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 sl8
- +28: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +10 bl1
- +29: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +10 bl2
- +30: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +10 bl3
- +31: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +10 bl4
- +32: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +10 bl5
- +33: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +10 bl6
- +34: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +10 bl7
- +35: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +10 bl8
- +36: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 sg8
- +37: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +10 bg8
- +38: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +10 bg6
- +39: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +10 bg3
- +40: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
- +41: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 sg3
- +42: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +9 sh3
- +43: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +UND sG2
- +44: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 sg4
- +45: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 sg5
- +46: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
- +47: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +10 bg5
- +48: [0-9a-f]+ +4 FUNC +GLOBAL DEFAULT +UND __tls_get_addr
- +49: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +9 sh7
- +50: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +9 sh8
- +51: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 sg1
- +52: [0-9a-f]+ +52 FUNC +GLOBAL DEFAULT +7 _start
- +53: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +9 sh4
- +54: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +10 bg7
- +55: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +9 sh5
- +56: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
- +57: [0-9a-f]+ +136 FUNC +GLOBAL DEFAULT +7 fn2
- +58: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 sg2
- +59: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +UND sG1
- +60: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +9 sh1
- +61: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 sg6
- +62: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 sg7
- +63: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
- +64: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
- +65: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
- +66: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +9 sh2
- +67: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +9 sh6
- +68: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +10 bg2
- +69: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +10 bg1
- +70: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +10 bg4
+ +[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
+ +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +13
+ +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +14
+ +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +15
+ +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +16
+ +[0-9]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 sl1
+ +[0-9]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 sl2
+ +[0-9]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 sl3
+ +[0-9]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 sl4
+ +[0-9]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 sl5
+ +[0-9]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 sl6
+ +[0-9]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 sl7
+ +[0-9]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 sl8
+ +[0-9]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +10 bl1
+ +[0-9]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +10 bl2
+ +[0-9]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +10 bl3
+ +[0-9]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +10 bl4
+ +[0-9]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +10 bl5
+ +[0-9]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +10 bl6
+ +[0-9]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +10 bl7
+ +[0-9]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +10 bl8
+ +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 sg8
+ +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +10 bg8
+ +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +10 bg6
+ +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +10 bg3
+ +[0-9]+: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
+ +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 sg3
+ +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +9 sh3
+ +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +UND sG2
+ +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 sg4
+ +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 sg5
+ +[0-9]+: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
+ +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +10 bg5
+ +[0-9]+: [0-9a-f]+ +4 FUNC +GLOBAL DEFAULT +UND __tls_get_addr
+ +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +9 sh7
+ +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +9 sh8
+ +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 sg1
+ +[0-9]+: [0-9a-f]+ +52 FUNC +GLOBAL DEFAULT +7 _start
+ +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +9 sh4
+ +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +10 bg7
+ +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +9 sh5
+ +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+ +[0-9]+: [0-9a-f]+ +136 FUNC +GLOBAL DEFAULT +7 fn2
+ +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 sg2
+ +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +UND sG1
+ +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +9 sh1
+ +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 sg6
+ +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 sg7
+ +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
+ +[0-9]+: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
+ +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
+ +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +9 sh2
+ +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +9 sh6
+ +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +10 bg2
+ +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +10 bg1
+ +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +10 bg4
diff --git a/ld/testsuite/ld-alpha/tlsbinr.rd b/ld/testsuite/ld-alpha/tlsbinr.rd
index f381a46..0543e6d 100644
--- a/ld/testsuite/ld-alpha/tlsbinr.rd
+++ b/ld/testsuite/ld-alpha/tlsbinr.rd
@@ -16,20 +16,16 @@ Section Headers:
+\[ 3\] .dynsym +.*
+\[ 4\] .dynstr +.*
+\[ 5\] .rela.dyn +.*
- +\[ 6\] .rela.plt +.*
- +\[ 7\] .text +PROGBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 0+ +AX +0 +0 4096
- +\[ 8\] .eh_frame +PROGBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 00 +A +0 +0 +8
- +\[ 9\] .tdata +PROGBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 0+ WAT +0 +0 +4
- +\[10\] .tbss +NOBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 0+ WAT +0 +0 +1
- +\[11\] .dynamic +DYNAMIC +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 10 +WA +4 +0 +8
- +\[12\] .plt +PROGBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 0+ WAX +0 +0 +8
- +\[13\] .data +.*
- +\[14\] .got +PROGBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 0+ +WA +0 +0 +8
- +\[15\] .sbss +.*
- +\[16\] .bss +.*
- +\[17\] .shstrtab +.*
- +\[18\] .symtab +.*
- +\[19\] .strtab +.*
+ +\[ 6\] .text +PROGBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 0+ +AX +0 +0 4096
+ +\[ 7\] .eh_frame +PROGBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 00 +A +0 +0 +8
+ +\[ 8\] .tdata +PROGBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 0+ WAT +0 +0 +4
+ +\[ 9\] .tbss +NOBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 0+ WAT +0 +0 +1
+ +\[10\] .dynamic +DYNAMIC +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 10 +WA +4 +0 +8
+ +\[11\] .plt +PROGBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 0+ WAX +0 +0 +8
+ +\[12\] .got +PROGBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 0+ +WA +0 +0 +8
+ +\[13\] .shstrtab +.*
+ +\[14\] .symtab +.*
+ +\[15\] .strtab +.*
#...
Elf file type is EXEC \(Executable file\)
@@ -65,7 +61,7 @@ Symbol table '.dynsym' contains 10 entries:
+8: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
+9: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
-Symbol table '.symtab' contains 71 entries:
+Symbol table '.symtab' contains 67 entries:
+Num: +Value +Size Type +Bind +Vis +Ndx Name
+0: [0-9a-f]+ +0 NOTYPE +LOCAL +DEFAULT +UND
+1: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +1
@@ -77,64 +73,60 @@ Symbol table '.symtab' contains 71 entries:
+7: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +7
+8: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +8
+9: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +9
- +10: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +10
- +11: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +11
- +12: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +12
- +13: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +13
- +14: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +14
- +15: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +15
- +16: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +16
- +17: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +17
- +18: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +18
- +19: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +19
- +20: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 sl1
- +21: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 sl2
- +22: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 sl3
- +23: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 sl4
- +24: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 sl5
- +25: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 sl6
- +26: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 sl7
- +27: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 sl8
- +28: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +10 bl1
- +29: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +10 bl2
- +30: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +10 bl3
- +31: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +10 bl4
- +32: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +10 bl5
- +33: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +10 bl6
- +34: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +10 bl7
- +35: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +10 bl8
- +36: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 sg8
- +37: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +10 bg8
- +38: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +10 bg6
- +39: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +10 bg3
- +40: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
- +41: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 sg3
- +42: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +9 sh3
- +43: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +UND sG2
- +44: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 sg4
- +45: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 sg5
- +46: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
- +47: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +10 bg5
- +48: [0-9a-f]+ +4 FUNC +GLOBAL DEFAULT +UND __tls_get_addr
- +49: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +9 sh7
- +50: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +9 sh8
- +51: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 sg1
- +52: [0-9a-f]+ +52 FUNC +GLOBAL DEFAULT +7 _start
- +53: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +9 sh4
- +54: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +10 bg7
- +55: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +9 sh5
- +56: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
- +57: [0-9a-f]+ +136 FUNC +GLOBAL DEFAULT +7 fn2
- +58: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 sg2
- +59: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +UND sG1
- +60: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +9 sh1
- +61: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 sg6
- +62: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 sg7
- +63: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
- +64: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
- +65: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
- +66: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +9 sh2
- +67: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +9 sh6
- +68: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +10 bg2
- +69: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +10 bg1
- +70: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +10 bg4
+ +[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
+ +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +13
+ +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +14
+ +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +15
+ +[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
+ +[0-9]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +8 sl4
+ +[0-9]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +8 sl5
+ +[0-9]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +8 sl6
+ +[0-9]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +8 sl7
+ +[0-9]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +8 sl8
+ +[0-9]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 bl1
+ +[0-9]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 bl2
+ +[0-9]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 bl3
+ +[0-9]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 bl4
+ +[0-9]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 bl5
+ +[0-9]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 bl6
+ +[0-9]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 bl7
+ +[0-9]+: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +9 bl8
+ +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +8 sg8
+ +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 bg8
+ +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 bg6
+ +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 bg3
+ +[0-9]+: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
+ +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +8 sg3
+ +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +8 sh3
+ +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +UND sG2
+ +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +8 sg4
+ +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +8 sg5
+ +[0-9]+: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
+ +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 bg5
+ +[0-9]+: [0-9a-f]+ +4 FUNC +GLOBAL DEFAULT +UND __tls_get_addr
+ +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +8 sh7
+ +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +8 sh8
+ +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +8 sg1
+ +[0-9]+: [0-9a-f]+ +52 FUNC +GLOBAL DEFAULT +6 _start
+ +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +8 sh4
+ +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 bg7
+ +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +8 sh5
+ +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+ +[0-9]+: [0-9a-f]+ +136 FUNC +GLOBAL DEFAULT +6 fn2
+ +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +8 sg2
+ +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +UND sG1
+ +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +8 sh1
+ +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +8 sg6
+ +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +8 sg7
+ +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
+ +[0-9]+: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
+ +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
+ +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +8 sh2
+ +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL HIDDEN +8 sh6
+ +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 bg2
+ +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 bg1
+ +[0-9]+: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +9 bg4
diff --git a/ld/testsuite/ld-alpha/tlspic.rd b/ld/testsuite/ld-alpha/tlspic.rd
index dfa03b4..65b599b 100644
--- a/ld/testsuite/ld-alpha/tlspic.rd
+++ b/ld/testsuite/ld-alpha/tlspic.rd
@@ -22,13 +22,10 @@ Section Headers:
+\[ 9\] .tbss +NOBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 0+ WAT +0 +0 +1
+\[10\] .dynamic +DYNAMIC +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 10 +WA +3 +0 +8
+\[11\] .plt +.*
- +\[12\] .data +.*
- +\[13\] .got +PROGBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 0+ +WA +0 +0 +8
- +\[14\] .sbss +.*
- +\[15\] .bss +.*
- +\[16\] .shstrtab +.*
- +\[17\] .symtab +.*
- +\[18\] .strtab +.*
+ +\[12\] .got +PROGBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 0+ +WA +0 +0 +8
+ +\[13\] .shstrtab +.*
+ +\[14\] .symtab +.*
+ +\[15\] .strtab +.*
#...
Elf file type is DYN \(Shared object file\)
@@ -64,8 +61,8 @@ Symbol table '.dynsym' contains [0-9]+ entries:
.* [0-9a-f]+ 0 SECTION LOCAL DEFAULT 7
.* [0-9a-f]+ 0 SECTION LOCAL DEFAULT 8
.* [0-9a-f]+ 0 SECTION LOCAL DEFAULT 9
-.* [0-9a-f]+ 0 SECTION LOCAL DEFAULT 12
-.* [0-9a-f]+ 0 SECTION LOCAL DEFAULT 15
+.* [0-9a-f]+ 0 NOTYPE LOCAL DEFAULT UND
+.* [0-9a-f]+ 0 NOTYPE LOCAL DEFAULT UND
.* [0-9a-f]+ 0 TLS GLOBAL DEFAULT 8 sg8
.* [0-9a-f]+ 0 OBJECT GLOBAL DEFAULT ABS _DYNAMIC
.* [0-9a-f]+ 0 TLS GLOBAL DEFAULT 8 sg3
@@ -101,9 +98,6 @@ Symbol table '.symtab' contains [0-9]+ entries:
.* [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +13
.* [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +14
.* [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +15
-.* [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +16
-.* [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +17
-.* [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +18
.* [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +8 sl1
.* [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +8 sl2
.* [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +8 sl3
diff --git a/ld/testsuite/ld-arm/mixed-lib.sym b/ld/testsuite/ld-arm/mixed-lib.sym
index f4b5f24..3327923 100644
--- a/ld/testsuite/ld-arm/mixed-lib.sym
+++ b/ld/testsuite/ld-arm/mixed-lib.sym
@@ -7,7 +7,7 @@ Symbol table for image:
.. ..: ........ 0 NOTYPE GLOBAL DEFAULT ABS _bss_end__
.. ..: ........ 0 OBJECT GLOBAL DEFAULT ABS _DYNAMIC
.. ..: ........ 0 NOTYPE GLOBAL DEFAULT ABS __bss_end__
- .. ..: ........ 0 NOTYPE GLOBAL DEFAULT 11 _stack
+ .. ..: ........ 0 NOTYPE GLOBAL DEFAULT 10 _stack
.. ..: ........ 4 OBJECT GLOBAL DEFAULT 9 data_obj
.. ..: ........ 0 NOTYPE GLOBAL DEFAULT ABS __bss_start__
.. ..: ........ 0 NOTYPE GLOBAL DEFAULT ABS __bss_start
diff --git a/ld/testsuite/ld-i386/tlsbin.rd b/ld/testsuite/ld-i386/tlsbin.rd
index b848944..5af0515 100644
--- a/ld/testsuite/ld-i386/tlsbin.rd
+++ b/ld/testsuite/ld-i386/tlsbin.rd
@@ -5,7 +5,7 @@
#readelf: -Ssrl
#target: i?86-*-*
-There are 19 section headers, starting at offset 0x[0-9a-f]+:
+There are 17 section headers, starting at offset 0x[0-9a-f]+:
Section Headers:
\[Nr\] Name +Type +Addr +Off +Size +ES Flg Lk Inf Al
@@ -23,11 +23,9 @@ Section Headers:
\[11\] \.dynamic +DYNAMIC +0+804a060 .*
\[12\] \.got +PROGBITS +0+804a100 .*
\[13\] \.got\.plt +PROGBITS +0+804a124 .*
- \[14\] \.data +.*
- \[15\] \.bss +.*
- \[16\] \.shstrtab +.*
- \[17\] \.symtab +.*
- \[18\] \.strtab +.*
+ \[14\] \.shstrtab +.*
+ \[15\] \.symtab +.*
+ \[16\] \.strtab +.*
Key to Flags:
.*
.*
@@ -89,7 +87,7 @@ Symbol table '.dynsym' contains 14 entries:
+[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT UND sG8
+[0-9]+: [0-9a-f]+ +0 FUNC +GLOBAL DEFAULT UND ___tls_get_addr
-Symbol table '.symtab' contains 75 entries:
+Symbol table '.symtab' contains 73 entries:
+Num: +Value Size Type +Bind +Vis +Ndx Name
+[0-9]+: 0+ +0 NOTYPE LOCAL DEFAULT UND *
+[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +1 *
@@ -108,8 +106,6 @@ Symbol table '.symtab' contains 75 entries:
+[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +14 *
+[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +15 *
+[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +16 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +17 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +18 *
+[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
diff --git a/ld/testsuite/ld-i386/tlsnopic.rd b/ld/testsuite/ld-i386/tlsnopic.rd
index b626854..aefad02 100644
--- a/ld/testsuite/ld-i386/tlsnopic.rd
+++ b/ld/testsuite/ld-i386/tlsnopic.rd
@@ -5,7 +5,7 @@
#readelf: -Ssrl
#target: i?86-*-*
-There are 16 section headers, starting at offset 0x[0-9a-f]+:
+There are 13 section headers, starting at offset 0x[0-9a-f]+:
Section Headers:
\[Nr\] Name +Type +Addr +Off +Size +ES Flg Lk Inf Al
@@ -16,15 +16,12 @@ Section Headers:
\[ 4\] \.rel.dyn +.*
\[ 5\] \.text +PROGBITS +0+1000 .*
\[ 6\] \.tbss +NOBITS +[0-9a-f]+ [0-9a-f]+ 000024 00 WAT 0 0 1
- \[ 7\] \.data.rel.ro +PROGBITS +.*
- \[ 8\] \.dynamic +DYNAMIC +0+2000 .*
- \[ 9\] \.got +PROGBITS +0+2080 .*
- \[10\] \.got.plt +PROGBITS +0+2098 .*
- \[11\] \.data +.*
- \[12\] \.bss +.*
- \[13\] \.shstrtab +.*
- \[14\] \.symtab +.*
- \[15\] \.strtab +.*
+ \[ 7\] \.dynamic +DYNAMIC +0+2000 .*
+ \[ 8\] \.got +PROGBITS +0+2080 .*
+ \[ 9\] \.got.plt +PROGBITS +0+2098 .*
+ \[10\] \.shstrtab +.*
+ \[11\] \.symtab +.*
+ \[12\] \.strtab +.*
Key to Flags:
.*
.*
@@ -77,9 +74,9 @@ Symbol table '.dynsym' contains 16 entries:
+[0-9]+: 0+ +0 NOTYPE LOCAL DEFAULT UND *
+[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +5 *
+[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +6 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +7 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +11 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +12 *
+ +[0-9]+: 0+ +0 NOTYPE LOCAL DEFAULT UND *
+ +[0-9]+: 0+ +0 NOTYPE LOCAL DEFAULT UND *
+ +[0-9]+: 0+ +0 NOTYPE LOCAL DEFAULT UND *
+[0-9]+: [0-9a-f]+ +0 OBJECT GLOBAL DEFAULT ABS _DYNAMIC
+[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT UND sg3
+[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT UND sg4
@@ -91,7 +88,7 @@ Symbol table '.dynsym' contains 16 entries:
+[0-9]+: [0-9a-f]+ +0 NOTYPE GLOBAL DEFAULT ABS _edata
+[0-9]+: [0-9a-f]+ +0 NOTYPE GLOBAL DEFAULT ABS _end
-Symbol table '.symtab' contains 36 entries:
+Symbol table '.symtab' contains 33 entries:
+Num: +Value Size Type +Bind +Vis +Ndx Name
+[0-9]+: 0+ +0 NOTYPE LOCAL DEFAULT UND *
+[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +1 *
@@ -106,9 +103,6 @@ Symbol table '.symtab' contains 36 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 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +13 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +14 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +15 *
+[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 6508329..b0719d8 100644
--- a/ld/testsuite/ld-i386/tlspic.rd
+++ b/ld/testsuite/ld-i386/tlspic.rd
@@ -22,11 +22,9 @@ Section Headers:
\[10\] \.dynamic +.*
\[11\] \.got +.*
\[12\] \.got.plt +.*
- \[13\] \.data +.*
- \[14\] \.bss +.*
- \[15\] \.shstrtab +.*
- \[16\] \.symtab +.*
- \[17\] \.strtab +.*
+ \[13\] \.shstrtab +.*
+ \[14\] \.symtab +.*
+ \[15\] \.strtab +.*
Key to Flags:
.*
.*
@@ -89,8 +87,8 @@ Symbol table '.dynsym' contains 20 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 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +13 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +14 *
+ +[0-9]+: 0+ +0 NOTYPE LOCAL DEFAULT UND *
+ +[0-9]+: 0+ +0 NOTYPE LOCAL DEFAULT UND *
+[0-9]+: 0+1c +0 TLS +GLOBAL DEFAULT +8 sg8
+[0-9]+: [0-9a-f]+ +0 OBJECT GLOBAL DEFAULT ABS _DYNAMIC
+[0-9]+: 0+8 +0 TLS +GLOBAL DEFAULT +8 sg3
@@ -106,7 +104,7 @@ Symbol table '.dynsym' contains 20 entries:
+[0-9]+: [0-9a-f]+ +0 NOTYPE GLOBAL DEFAULT ABS _end
+[0-9]+: 0+ +0 NOTYPE GLOBAL DEFAULT UND ___tls_get_addr
-Symbol table '.symtab' contains 57 entries:
+Symbol table '.symtab' contains 55 entries:
+Num: +Value Size Type +Bind +Vis +Ndx Name
+[0-9]+: 0+ +0 NOTYPE LOCAL DEFAULT UND *
+[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +1 *
@@ -124,8 +122,6 @@ Symbol table '.symtab' contains 57 entries:
+[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +13 *
+[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +14 *
+[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +15 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +16 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +17 *
+[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-ia64/tlsbin.rd b/ld/testsuite/ld-ia64/tlsbin.rd
index a826274..e66777d 100644
--- a/ld/testsuite/ld-ia64/tlsbin.rd
+++ b/ld/testsuite/ld-ia64/tlsbin.rd
@@ -5,7 +5,7 @@
#readelf: -WSsrl
#target: ia64-*-*
-There are 22 section headers, starting at offset 0x[0-9a-f]+:
+There are 19 section headers, starting at offset 0x[0-9a-f]+:
Section Headers:
\[Nr\] Name +Type +Address +Off +Size +ES Flg Lk Inf Al
@@ -23,14 +23,11 @@ Section Headers:
\[11\] .tdata +PROGBITS +60+1[0-9a-f]+ 0+1[0-9a-f]+ 0+60 00 WAT +0 +0 +4
\[12\] .tbss +NOBITS +60+1[0-9a-f]+ 0+1[0-9a-f]+ 0+40 00 WAT +0 +0 +1
\[13\] .dynamic +DYNAMIC +60+1[0-9a-f]+ 0+1[0-9a-f]+ 0+150 10 +WA +4 +0 +8
- \[14\] .data +.*
- \[15\] .got +PROGBITS +60+2000 0+2000 0+48 00 WAp +0 +0 +8
- \[16\] .IA_64.pltoff +.*
- \[17\] .sbss +.*
- \[18\] .bss +.*
- \[19\] .shstrtab +.*
- \[20\] .symtab +.*
- \[21\] .strtab +.*
+ \[14\] .got +PROGBITS +60+2000 0+2000 0+48 00 WAp +0 +0 +8
+ \[15\] .IA_64.pltoff +.*
+ \[16\] .shstrtab +.*
+ \[17\] .symtab +.*
+ \[18\] .strtab +.*
#...
Elf file type is EXEC \(Executable file\)
@@ -61,86 +58,83 @@ Relocation section '.rela.IA_64.pltoff' at offset 0x[0-9a-f]+ contains 1 entries
Symbol table '.dynsym' contains 8 entries:
+Num: +Value +Size Type +Bind +Vis +Ndx Name
- +0: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND *
- +1: 60+1[0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
- +2: 0+ +0 TLS +GLOBAL DEFAULT +UND sG2
- +3: 0+ +16 FUNC +GLOBAL DEFAULT +UND __tls_get_addr
- +4: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
- +5: 0+ +0 TLS +GLOBAL DEFAULT +UND sG1
- +6: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
- +7: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
+ +[0-9]+: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND *
+ +[0-9]+: 60+1[0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
+ +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND sG2
+ +[0-9]+: 0+ +16 FUNC +GLOBAL DEFAULT +UND __tls_get_addr
+ +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+ +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND sG1
+ +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
+ +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
-Symbol table '.symtab' contains 72 entries:
+Symbol table '.symtab' contains 69 entries:
+Num: +Value +Size Type +Bind +Vis +Ndx Name
- +0: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND *
- +1: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +1 *
- +2: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +2 *
- +3: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +3 *
- +4: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +4 *
- +5: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +5 *
- +6: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +6 *
- +7: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +7 *
- +8: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +8 *
- +9: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +9 *
- +10: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +10 *
- +11: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +11 *
- +12: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +12 *
- +13: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +13 *
- +14: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +14 *
- +15: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +15 *
- +16: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +16 *
- +17: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +17 *
- +18: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +18 *
- +19: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +19 *
- +20: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +20 *
- +21: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +21 *
- +22: 0+20 +0 TLS +LOCAL +DEFAULT +11 sl1
- +23: 0+24 +0 TLS +LOCAL +DEFAULT +11 sl2
- +24: 0+28 +0 TLS +LOCAL +DEFAULT +11 sl3
- +25: 0+2c +0 TLS +LOCAL +DEFAULT +11 sl4
- +26: 0+30 +0 TLS +LOCAL +DEFAULT +11 sl5
- +27: 0+34 +0 TLS +LOCAL +DEFAULT +11 sl6
- +28: 0+38 +0 TLS +LOCAL +DEFAULT +11 sl7
- +29: 0+3c +0 TLS +LOCAL +DEFAULT +11 sl8
- +30: 0+80 +0 TLS +LOCAL +DEFAULT +12 bl1
- +31: 0+84 +0 TLS +LOCAL +DEFAULT +12 bl2
- +32: 0+88 +0 TLS +LOCAL +DEFAULT +12 bl3
- +33: 0+8c +0 TLS +LOCAL +DEFAULT +12 bl4
- +34: 0+90 +0 TLS +LOCAL +DEFAULT +12 bl5
- +35: 0+94 +0 TLS +LOCAL +DEFAULT +12 bl6
- +36: 0+98 +0 TLS +LOCAL +DEFAULT +12 bl7
- +37: 0+9c +0 TLS +LOCAL +DEFAULT +12 bl8
- +38: 0+1c +0 TLS +GLOBAL DEFAULT +11 sg8
- +39: 0+7c +0 TLS +GLOBAL DEFAULT +12 bg8
- +40: 0+74 +0 TLS +GLOBAL DEFAULT +12 bg6
- +41: 0+68 +0 TLS +GLOBAL DEFAULT +12 bg3
- +42: 60+1[0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
- +43: 0+8 +0 TLS +GLOBAL DEFAULT +11 sg3
- +44: 0+48 +0 TLS +GLOBAL HIDDEN +11 sh3
- +45: 0+ +0 TLS +GLOBAL DEFAULT +UND sG2
- +46: 0+c +0 TLS +GLOBAL DEFAULT +11 sg4
- +47: 0+10 +0 TLS +GLOBAL DEFAULT +11 sg5
- +48: 0+70 +0 TLS +GLOBAL DEFAULT +12 bg5
- +49: 0+ +16 FUNC +GLOBAL DEFAULT +UND __tls_get_addr
- +50: 0+58 +0 TLS +GLOBAL HIDDEN +11 sh7
- +51: 0+5c +0 TLS +GLOBAL HIDDEN +11 sh8
- +52: 0+ +0 TLS +GLOBAL DEFAULT +11 sg1
- +53: 40+10d0 +112 FUNC +GLOBAL DEFAULT +8 _start
- +54: 0+4c +0 TLS +GLOBAL HIDDEN +11 sh4
- +55: 0+78 +0 TLS +GLOBAL DEFAULT +12 bg7
- +56: 0+50 +0 TLS +GLOBAL HIDDEN +11 sh5
- +57: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
- +58: 40+1000 +208 FUNC +GLOBAL DEFAULT +8 fn2
- +59: 0+4 +0 TLS +GLOBAL DEFAULT +11 sg2
- +60: 0+ +0 TLS +GLOBAL DEFAULT +UND sG1
- +61: 0+40 +0 TLS +GLOBAL HIDDEN +11 sh1
- +62: 0+14 +0 TLS +GLOBAL DEFAULT +11 sg6
- +63: 0+18 +0 TLS +GLOBAL DEFAULT +11 sg7
- +64: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
- +65: [0-9a-f]+ +0 OBJECT +GLOBAL HIDDEN +15 _GLOBAL_OFFSET_TABLE_
- +66: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
- +67: 0+44 +0 TLS +GLOBAL HIDDEN +11 sh2
- +68: 0+54 +0 TLS +GLOBAL HIDDEN +11 sh6
- +69: 0+64 +0 TLS +GLOBAL DEFAULT +12 bg2
- +70: 0+60 +0 TLS +GLOBAL DEFAULT +12 bg1
- +71: 0+6c +0 TLS +GLOBAL DEFAULT +12 bg4
+ +[0-9]+: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND *
+ +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +1 *
+ +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +2 *
+ +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +3 *
+ +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +4 *
+ +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +5 *
+ +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +6 *
+ +[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 *
+ +[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 *
+ +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +13 *
+ +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +14 *
+ +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +15 *
+ +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +16 *
+ +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +17 *
+ +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +18 *
+ +[0-9]+: 0+20 +0 TLS +LOCAL +DEFAULT +11 sl1
+ +[0-9]+: 0+24 +0 TLS +LOCAL +DEFAULT +11 sl2
+ +[0-9]+: 0+28 +0 TLS +LOCAL +DEFAULT +11 sl3
+ +[0-9]+: 0+2c +0 TLS +LOCAL +DEFAULT +11 sl4
+ +[0-9]+: 0+30 +0 TLS +LOCAL +DEFAULT +11 sl5
+ +[0-9]+: 0+34 +0 TLS +LOCAL +DEFAULT +11 sl6
+ +[0-9]+: 0+38 +0 TLS +LOCAL +DEFAULT +11 sl7
+ +[0-9]+: 0+3c +0 TLS +LOCAL +DEFAULT +11 sl8
+ +[0-9]+: 0+80 +0 TLS +LOCAL +DEFAULT +12 bl1
+ +[0-9]+: 0+84 +0 TLS +LOCAL +DEFAULT +12 bl2
+ +[0-9]+: 0+88 +0 TLS +LOCAL +DEFAULT +12 bl3
+ +[0-9]+: 0+8c +0 TLS +LOCAL +DEFAULT +12 bl4
+ +[0-9]+: 0+90 +0 TLS +LOCAL +DEFAULT +12 bl5
+ +[0-9]+: 0+94 +0 TLS +LOCAL +DEFAULT +12 bl6
+ +[0-9]+: 0+98 +0 TLS +LOCAL +DEFAULT +12 bl7
+ +[0-9]+: 0+9c +0 TLS +LOCAL +DEFAULT +12 bl8
+ +[0-9]+: 0+1c +0 TLS +GLOBAL DEFAULT +11 sg8
+ +[0-9]+: 0+7c +0 TLS +GLOBAL DEFAULT +12 bg8
+ +[0-9]+: 0+74 +0 TLS +GLOBAL DEFAULT +12 bg6
+ +[0-9]+: 0+68 +0 TLS +GLOBAL DEFAULT +12 bg3
+ +[0-9]+: 60+1[0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
+ +[0-9]+: 0+8 +0 TLS +GLOBAL DEFAULT +11 sg3
+ +[0-9]+: 0+48 +0 TLS +GLOBAL HIDDEN +11 sh3
+ +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND sG2
+ +[0-9]+: 0+c +0 TLS +GLOBAL DEFAULT +11 sg4
+ +[0-9]+: 0+10 +0 TLS +GLOBAL DEFAULT +11 sg5
+ +[0-9]+: 0+70 +0 TLS +GLOBAL DEFAULT +12 bg5
+ +[0-9]+: 0+ +16 FUNC +GLOBAL DEFAULT +UND __tls_get_addr
+ +[0-9]+: 0+58 +0 TLS +GLOBAL HIDDEN +11 sh7
+ +[0-9]+: 0+5c +0 TLS +GLOBAL HIDDEN +11 sh8
+ +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +11 sg1
+ +[0-9]+: 40+10d0 +112 FUNC +GLOBAL DEFAULT +8 _start
+ +[0-9]+: 0+4c +0 TLS +GLOBAL HIDDEN +11 sh4
+ +[0-9]+: 0+78 +0 TLS +GLOBAL DEFAULT +12 bg7
+ +[0-9]+: 0+50 +0 TLS +GLOBAL HIDDEN +11 sh5
+ +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+ +[0-9]+: 40+1000 +208 FUNC +GLOBAL DEFAULT +8 fn2
+ +[0-9]+: 0+4 +0 TLS +GLOBAL DEFAULT +11 sg2
+ +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND sG1
+ +[0-9]+: 0+40 +0 TLS +GLOBAL HIDDEN +11 sh1
+ +[0-9]+: 0+14 +0 TLS +GLOBAL DEFAULT +11 sg6
+ +[0-9]+: 0+18 +0 TLS +GLOBAL DEFAULT +11 sg7
+ +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
+ +[0-9]+: [0-9a-f]+ +0 OBJECT +GLOBAL HIDDEN +14 _GLOBAL_OFFSET_TABLE_
+ +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
+ +[0-9]+: 0+44 +0 TLS +GLOBAL HIDDEN +11 sh2
+ +[0-9]+: 0+54 +0 TLS +GLOBAL HIDDEN +11 sh6
+ +[0-9]+: 0+64 +0 TLS +GLOBAL DEFAULT +12 bg2
+ +[0-9]+: 0+60 +0 TLS +GLOBAL DEFAULT +12 bg1
+ +[0-9]+: 0+6c +0 TLS +GLOBAL DEFAULT +12 bg4
diff --git a/ld/testsuite/ld-ia64/tlspic.rd b/ld/testsuite/ld-ia64/tlspic.rd
index 355d6ff..a5a3370 100644
--- a/ld/testsuite/ld-ia64/tlspic.rd
+++ b/ld/testsuite/ld-ia64/tlspic.rd
@@ -5,7 +5,7 @@
#readelf: -WSsrl
#target: ia64-*-*
-There are 21 section headers, starting at offset 0x[0-9a-f]+:
+There are 18 section headers, starting at offset 0x[0-9a-f]+:
Section Headers:
\[Nr\] Name +Type +Address +Off +Size +ES Flg Lk Inf Al
@@ -22,14 +22,11 @@ Section Headers:
\[10\] .tdata +PROGBITS +0+11[0-9a-f]+ 0+1[0-9a-f]+ 0+60 00 WAT +0 +0 +4
\[11\] .tbss +NOBITS +0+11[0-9a-f]+ 0+1[0-9a-f]+ 0+20 00 WAT +0 +0 +1
\[12\] .dynamic +DYNAMIC +0+11[0-9a-f]+ 0+1[0-9a-f]+ 0+140 10 +WA +3 +0 +8
- \[13\] .data +.*
- \[14\] .got +PROGBITS +0+12000 0+2000 0+50 00 WAp +0 +0 +8
- \[15\] .IA_64.pltoff +.*
- \[16\] .sbss +.*
- \[17\] .bss +.*
- \[18\] .shstrtab +.*
- \[19\] .symtab +.*
- \[20\] .strtab +.*
+ \[13\] .got +PROGBITS +0+12000 0+2000 0+50 00 WAp +0 +0 +8
+ \[14\] .IA_64.pltoff +.*
+ \[15\] .shstrtab +.*
+ \[16\] .symtab +.*
+ \[17\] .strtab +.*
Key to Flags:
#...
@@ -67,9 +64,9 @@ Symbol table '.dynsym' contains 23 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 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +13 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +15 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +17 *
+ +[0-9]+: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND *
+ +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +14 *
+ +[0-9]+: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND *
+[0-9]+: 0+1c +0 TLS +GLOBAL DEFAULT +10 sg8
+[0-9]+: 0+11[0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
+[0-9]+: 0+8 +0 TLS +GLOBAL DEFAULT +10 sg3
@@ -85,7 +82,7 @@ Symbol table '.dynsym' contains 23 entries:
+[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
+[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
-Symbol table '.symtab' contains 60 entries:
+Symbol table '.symtab' contains 57 entries:
+Num: +Value +Size Type +Bind +Vis +Ndx Name
+[0-9]+: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND *
+[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +1 *
@@ -105,9 +102,6 @@ Symbol table '.symtab' contains 60 entries:
+[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +15 *
+[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +16 *
+[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +17 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +18 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +19 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +20 *
+[0-9]+: 0+20 +0 TLS +LOCAL +DEFAULT +10 sl1
+[0-9]+: 0+24 +0 TLS +LOCAL +DEFAULT +10 sl2
+[0-9]+: 0+28 +0 TLS +LOCAL +DEFAULT +10 sl3
diff --git a/ld/testsuite/ld-powerpc/apuinfo.rd b/ld/testsuite/ld-powerpc/apuinfo.rd
index 5f70cbe..e6321cd 100644
--- a/ld/testsuite/ld-powerpc/apuinfo.rd
+++ b/ld/testsuite/ld-powerpc/apuinfo.rd
@@ -1,7 +1,7 @@
#source: apuinfo1.s
#source: apuinfo2.s
#as: -me500
-#readelf: -x5
+#readelf: -x2
#target: powerpc-eabi*
Hex dump of section '.PPC.EMB.apuinfo':
diff --git a/ld/testsuite/ld-powerpc/powerpc.exp b/ld/testsuite/ld-powerpc/powerpc.exp
index 56dc593..81a28fb 100644
--- a/ld/testsuite/ld-powerpc/powerpc.exp
+++ b/ld/testsuite/ld-powerpc/powerpc.exp
@@ -54,7 +54,7 @@ set ppcelftests {
{{objdump -hw reloc.d}} "reloc.so"}
{"APUinfo section processing" "-melf32ppc"
"-a32 -me500" {apuinfo1.s apuinfo2.s}
- {{readelf -x5 apuinfo.rd}} "apuinfo"}
+ {{readelf -x2 apuinfo.rd}} "apuinfo"}
{"TLS32 static exec" "-melf32ppc" "-a32" {tls32.s tlslib32.s}
{{objdump -dr tls32.d} {objdump -sj.got tls32.g}
{objdump -sj.tdata tls32.t}}
diff --git a/ld/testsuite/ld-powerpc/tlsexe32.r b/ld/testsuite/ld-powerpc/tlsexe32.r
index 1ee352b..f5c280e 100644
--- a/ld/testsuite/ld-powerpc/tlsexe32.r
+++ b/ld/testsuite/ld-powerpc/tlsexe32.r
@@ -5,7 +5,7 @@
#readelf: -WSsrl
#target: powerpc*-*-*
-There are 21 section headers.*
+There are 18 section headers.*
Section Headers:
+\[Nr\] Name +Type +Addr +Off +Size +ES Flg Lk Inf Al
@@ -21,15 +21,12 @@ Section Headers:
+\[ 9\] \.tdata +PROGBITS +018102b4 0002b4 00001c 00 WAT +0 +0 +4
+\[10\] \.tbss +NOBITS +018102d0 0002d0 00001c 00 WAT +0 +0 +4
+\[11\] \.dynamic +DYNAMIC +018102d0 0002d0 0000a0 08 +WA +4 +0 +4
- +\[12\] \.data +PROGBITS +01810370 000370 000000 00 +WA +0 +0 +1
- +\[13\] \.got +PROGBITS +01810370 000370 00001c 04 WAX +0 +0 +4
- +\[14\] \.sdata +PROGBITS +0181038c 00038c 000000 00 +WA +0 +0 +4
- +\[15\] \.sbss +NOBITS +0181038c 00038c 000000 00 +WA +0 +0 +1
- +\[16\] \.plt +NOBITS +.*
- +\[17\] \.bss +NOBITS +.*
- +\[18\] \.shstrtab +STRTAB +.*
- +\[19\] \.symtab +SYMTAB +.*
- +\[20\] \.strtab +STRTAB +.*
+ +\[12\] \.got +PROGBITS +01810370 000370 00001c 04 WAX +0 +0 +4
+ +\[13\] \.sdata +PROGBITS +0181038c 00038c 000000 00 +WA +0 +0 +4
+ +\[14\] \.plt +NOBITS +.*
+ +\[15\] \.shstrtab +STRTAB +.*
+ +\[16\] \.symtab +SYMTAB +.*
+ +\[17\] \.strtab +STRTAB +.*
#...
Elf file type is EXEC \(Executable file\)
@@ -76,52 +73,49 @@ Symbol table '\.dynsym' contains 9 entries:
+7: 0181038c +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
+8: 018103e0 +0 NOTYPE +GLOBAL DEFAULT +ABS _end
-Symbol table '\.symtab' contains 47 entries:
+Symbol table '\.symtab' contains 44 entries:
+Num: +Value +Size Type +Bind +Vis +Ndx Name
- +0: 00000000 +0 NOTYPE +LOCAL +DEFAULT +UND
- +1: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +1
- +2: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +2
- +3: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +3
- +4: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +4
- +5: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +5
- +6: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +6
- +7: 01800244 +0 SECTION LOCAL +DEFAULT +7
- +8: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +8
- +9: 018102b4 +0 SECTION LOCAL +DEFAULT +9
- +10: 018102d0 +0 SECTION LOCAL +DEFAULT +10
- +11: 018102d0 +0 SECTION LOCAL +DEFAULT +11
- +12: 01810370 +0 SECTION LOCAL +DEFAULT +12
- +13: 01810370 +0 SECTION LOCAL +DEFAULT +13
- +14: 0181038c +0 SECTION LOCAL +DEFAULT +14
- +15: 0181038c +0 SECTION LOCAL +DEFAULT +15
- +16: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +16
- +17: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +17
- +18: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +18
- +19: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +19
- +20: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +20
- +21: 00000000 +0 TLS +LOCAL +DEFAULT +9 gd4
- +22: 00000004 +0 TLS +LOCAL +DEFAULT +9 ld4
- +23: 00000008 +0 TLS +LOCAL +DEFAULT +9 ld5
- +24: 0000000c +0 TLS +LOCAL +DEFAULT +9 ld6
- +25: 00000010 +0 TLS +LOCAL +DEFAULT +9 ie4
- +26: 00000014 +0 TLS +LOCAL +DEFAULT +9 le4
- +27: 00000018 +0 TLS +LOCAL +DEFAULT +9 le5
- +28: 018102d0 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
- +29: 00000000 +0 TLS +GLOBAL DEFAULT +UND gd
- +30: 00000030 +0 TLS +GLOBAL DEFAULT +10 le0
- +31: [0-9a-f]+ +0 FUNC +GLOBAL DEFAULT +UND __tls_get_addr
- +32: 00000020 +0 TLS +GLOBAL DEFAULT +10 ld0
- +33: 00000034 +0 TLS +GLOBAL DEFAULT +10 le1
- +34: 00000000 +0 TLS +GLOBAL DEFAULT +UND ld
- +35: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +7 _start
- +36: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __end
- +37: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +14 _SDA_BASE_
- +38: 00000028 +0 TLS +GLOBAL DEFAULT +10 ld2
- +39: 00000024 +0 TLS +GLOBAL DEFAULT +10 ld1
- +40: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
- +41: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
- +42: 01810374 +0 OBJECT +GLOBAL +HIDDEN +13 _GLOBAL_OFFSET_TABLE_
- +43: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
- +44: 0000001c +0 TLS +GLOBAL DEFAULT +10 gd0
- +45: 0000002c +0 TLS +GLOBAL DEFAULT +10 ie0
- +46: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +8 _SDA2_BASE_
+ +[0-9]+: 00000000 +0 NOTYPE +LOCAL +DEFAULT +UND
+ +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +1
+ +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +2
+ +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +3
+ +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +4
+ +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +5
+ +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +6
+ +[0-9]+: 01800244 +0 SECTION LOCAL +DEFAULT +7
+ +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +8
+ +[0-9]+: 018102b4 +0 SECTION LOCAL +DEFAULT +9
+ +[0-9]+: 018102d0 +0 SECTION LOCAL +DEFAULT +10
+ +[0-9]+: 018102d0 +0 SECTION LOCAL +DEFAULT +11
+ +[0-9]+: 01810370 +0 SECTION LOCAL +DEFAULT +12
+ +[0-9]+: 0181038c +0 SECTION LOCAL +DEFAULT +13
+ +[0-9]+: 0181038c +0 SECTION LOCAL +DEFAULT +14
+ +[0-9]+: 00000000 +0 SECTION LOCAL +DEFAULT +15
+ +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +16
+ +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +17
+ +[0-9]+: 00000000 +0 TLS +LOCAL +DEFAULT +9 gd4
+ +[0-9]+: 00000004 +0 TLS +LOCAL +DEFAULT +9 ld4
+ +[0-9]+: 00000008 +0 TLS +LOCAL +DEFAULT +9 ld5
+ +[0-9]+: 0000000c +0 TLS +LOCAL +DEFAULT +9 ld6
+ +[0-9]+: 00000010 +0 TLS +LOCAL +DEFAULT +9 ie4
+ +[0-9]+: 00000014 +0 TLS +LOCAL +DEFAULT +9 le4
+ +[0-9]+: 00000018 +0 TLS +LOCAL +DEFAULT +9 le5
+ +[0-9]+: 018102d0 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
+ +[0-9]+: 00000000 +0 TLS +GLOBAL DEFAULT +UND gd
+ +[0-9]+: 00000030 +0 TLS +GLOBAL DEFAULT +10 le0
+ +[0-9]+: [0-9a-f]+ +0 FUNC +GLOBAL DEFAULT +UND __tls_get_addr
+ +[0-9]+: 00000020 +0 TLS +GLOBAL DEFAULT +10 ld0
+ +[0-9]+: 00000034 +0 TLS +GLOBAL DEFAULT +10 le1
+ +[0-9]+: 00000000 +0 TLS +GLOBAL DEFAULT +UND ld
+ +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +7 _start
+ +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __end
+ +[0-9]+: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +13 _SDA_BASE_
+ +[0-9]+: 00000028 +0 TLS +GLOBAL DEFAULT +10 ld2
+ +[0-9]+: 00000024 +0 TLS +GLOBAL DEFAULT +10 ld1
+ +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+ +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
+ +[0-9]+: 01810374 +0 OBJECT +GLOBAL +HIDDEN +12 _GLOBAL_OFFSET_TABLE_
+ +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
+ +[0-9]+: 0000001c +0 TLS +GLOBAL DEFAULT +10 gd0
+ +[0-9]+: 0000002c +0 TLS +GLOBAL DEFAULT +10 ie0
+ +[0-9]+: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +8 _SDA2_BASE_
diff --git a/ld/testsuite/ld-powerpc/tlsso32.r b/ld/testsuite/ld-powerpc/tlsso32.r
index eaa486c..90813fc 100644
--- a/ld/testsuite/ld-powerpc/tlsso32.r
+++ b/ld/testsuite/ld-powerpc/tlsso32.r
@@ -4,7 +4,7 @@
#readelf: -WSsrl
#target: powerpc*-*-*
-There are 19 section headers.*
+There are 17 section headers.*
Section Headers:
+\[Nr\] Name +Type +Addr +Off +Size +ES Flg Lk Inf Al
@@ -147,4 +147,4 @@ Symbol table '\.symtab' contains 45 entries:
+[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
+[0-9]+: 0+1c +0 TLS +GLOBAL DEFAULT +8 gd0
+[0-9]+: 0+2c +0 TLS +GLOBAL DEFAULT +8 ie0
- +[0-9]+: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +12 _SDA2_BASE_
+ +[0-9]+: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +11 _SDA2_BASE_
diff --git a/ld/testsuite/ld-s390/tlsbin.rd b/ld/testsuite/ld-s390/tlsbin.rd
index 3cf093b..a9a4267 100644
--- a/ld/testsuite/ld-s390/tlsbin.rd
+++ b/ld/testsuite/ld-s390/tlsbin.rd
@@ -5,7 +5,7 @@
#readelf: -Ssrl
#target: s390-*-*
-There are 18 section headers, starting at offset 0x[0-9a-f]+:
+There are 16 section headers, starting at offset 0x[0-9a-f]+:
Section Headers:
\[Nr\] Name +Type +Addr +Off +Size +ES Flg Lk Inf Al
@@ -22,11 +22,9 @@ Section Headers:
\[10\] .tbss +NOBITS +0+4014e0 0+4e0 0+40 00 WAT +0 +0 +1
\[11\] .dynamic +DYNAMIC +0+4014e0 0+4e0 0+a0 08 +WA +4 +0 +4
\[12\] .got +PROGBITS +0+401580 0+580 0+2c 04 +WA +0 +0 +4
- \[13\] .data +.*
- \[14\] .bss +.*
- \[15\] .shstrtab +.*
- \[16\] .symtab +.*
- \[17\] .strtab +.*
+ \[13\] .shstrtab +.*
+ \[14\] .symtab +.*
+ \[15\] .strtab +.*
Key to Flags:
.*
.*
@@ -79,7 +77,7 @@ Symbol table '.dynsym' contains 10 entries:
+[0-9]+: [0-9a-f]+ +0 NOTYPE GLOBAL DEFAULT ABS _edata
+[0-9]+: [0-9a-f]+ +0 NOTYPE GLOBAL DEFAULT ABS _end
-Symbol table '.symtab' contains 70 entries:
+Symbol table '.symtab' contains 68 entries:
+Num: +Value Size Type +Bind +Vis +Ndx Name
+[0-9]+: 0+ +0 NOTYPE LOCAL DEFAULT UND
+[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +1
@@ -97,8 +95,6 @@ Symbol table '.symtab' contains 70 entries:
+[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +13
+[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +14
+[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +15
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +16
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +17
+[0-9]+: 0+20 +0 TLS +LOCAL DEFAULT +9 sl1
+[0-9]+: 0+24 +0 TLS +LOCAL DEFAULT +9 sl2
+[0-9]+: 0+28 +0 TLS +LOCAL DEFAULT +9 sl3
diff --git a/ld/testsuite/ld-s390/tlsbin_64.rd b/ld/testsuite/ld-s390/tlsbin_64.rd
index 5ce09fd..4855b81 100644
--- a/ld/testsuite/ld-s390/tlsbin_64.rd
+++ b/ld/testsuite/ld-s390/tlsbin_64.rd
@@ -5,7 +5,7 @@
#readelf: -Ssrl
#target: s390x-*-*
-There are 18 section headers, starting at offset 0x[0-9a-f]+:
+There are 16 section headers, starting at offset 0x[0-9a-f]+:
Section Headers:
\[Nr\] Name +Type +Address +Off +Size +ES Flg Lk Inf Al
@@ -18,15 +18,13 @@ Section Headers:
\[ 6\] .rela.plt +.*
\[ 7\] .plt +.*
\[ 8\] .text +PROGBITS +.*
- \[ 9\] .tdata +PROGBITS +0+80001720 0+720 0+60 00 WAT +0 +0 +32
- \[10\] .tbss +NOBITS +0+80001780 0+780 0+40 00 WAT +0 +0 +1
- \[11\] .dynamic +DYNAMIC +0+80001780 0+780 0+140 10 +WA +4 +0 +8
- \[12\] .got +PROGBITS +0+800018c0 0+8c0 0+78 08 +WA +0 +0 +8
- \[13\] .data +.*
- \[14\] .bss +.*
- \[15\] .shstrtab +.*
- \[16\] .symtab +.*
- \[17\] .strtab +.*
+ \[ 9\] .tdata +PROGBITS +0+800016e0 0+6e0 0+60 00 WAT +0 +0 +32
+ \[10\] .tbss +NOBITS +0+80001740 0+740 0+40 00 WAT +0 +0 +1
+ \[11\] .dynamic +DYNAMIC +0+80001740 0+740 0+140 10 +WA +4 +0 +8
+ \[12\] .got +PROGBITS +0+80001880 0+880 0+78 08 +WA +0 +0 +8
+ \[13\] .shstrtab +.*
+ \[14\] .symtab +.*
+ \[15\] .strtab +.*
Key to Flags:
.*
.*
@@ -41,10 +39,10 @@ Program Headers:
PHDR +0x0+40 0x0+80000040 0x0+80000040 0x0+150 0x0+150 R E 0x8
INTERP +0x0+190 0x0+80000190 0x0+80000190 0x0+11 0x0+11 R +0x1
.*Requesting program interpreter.*
- LOAD +0x0+ 0x0+80000000 0x0+80000000 0x0+720 0x0+720 R E 0x1000
- LOAD +0x0+720 0x0+80001720 0x0+80001720 0x0+218 0x0+218 RW 0x1000
- DYNAMIC +0x0+780 0x0+80001780 0x0+80001780 0x0+140 0x0+140 RW 0x8
- TLS +0x0+720 0x0+80001720 0x0+80001720 0x0+60 0x0+a0 R +0x20
+ LOAD +0x0+ 0x0+80000000 0x0+80000000 0x0+6e0 0x0+6e0 R E 0x1000
+ LOAD +0x0+6e0 0x0+800016e0 0x0+800016e0 0x0+218 0x0+218 RW 0x1000
+ DYNAMIC +0x0+740 0x0+80001740 0x0+80001740 0x0+140 0x0+140 RW 0x8
+ TLS +0x0+6e0 0x0+800016e0 0x0+800016e0 0x0+60 0x0+a0 R +0x20
Section to Segment mapping:
Segment Sections...
@@ -62,11 +60,11 @@ Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 4 entries:
[0-9a-f]+ +0+60+38 R_390_TLS_TPOFF +0+ sG6 \+ 0
[0-9a-f]+ +0+70+38 R_390_TLS_TPOFF +0+ sG1 \+ 0
-Relocation section '.rela.plt' at offset 0x40+ contains 1 entries:
+Relocation section '.rela.plt' at offset 0x[0-9a-f]+ contains 1 entries:
+Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
-[0-9a-f]+ +0+40+b R_390_JMP_SLOT +0+80+438 __tls_get_offset \+ 0
+[0-9a-f]+ +0+40+b R_390_JMP_SLOT +0+80+408 __tls_get_offset \+ 0
-Symbol table '.dynsym' contains 11 entries:
+Symbol table '.dynsym' contains 10 entries:
+Num: +Value +Size Type +Bind +Vis +Ndx Name
+[0-9]+: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND
+[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND sG3
@@ -77,10 +75,9 @@ Symbol table '.dynsym' contains 11 entries:
+[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND sG6
+[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND sG1
+[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
- +[0-9]+: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
+[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
-Symbol table '.symtab' contains 70 entries:
+Symbol table '.symtab' contains 68 entries:
+Num: +Value +Size Type +Bind +Vis +Ndx Name
+[0-9]+: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND
+[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +1
@@ -98,8 +95,6 @@ Symbol table '.symtab' contains 70 entries:
+[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +13
+[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +14
+[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +15
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +16
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +17
+[0-9]+: 0+20 +0 TLS +LOCAL +DEFAULT +9 sl1
+[0-9]+: 0+24 +0 TLS +LOCAL +DEFAULT +9 sl2
+[0-9]+: 0+28 +0 TLS +LOCAL +DEFAULT +9 sl3
@@ -145,7 +140,7 @@ Symbol table '.symtab' contains 70 entries:
+[0-9]+: 0+14 +0 TLS +GLOBAL DEFAULT +9 sg6
+[0-9]+: 0+18 +0 TLS +GLOBAL DEFAULT +9 sg7
+[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
- +[0-9]+: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
+ +[0-9]+: [0-9a-f]+ +0 OBJECT +GLOBAL HIDDEN +12 _GLOBAL_OFFSET_TABLE_
+[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
+[0-9]+: 0+44 +0 TLS +GLOBAL HIDDEN +9 sh2
+[0-9]+: 0+54 +0 TLS +GLOBAL HIDDEN +9 sh6
diff --git a/ld/testsuite/ld-s390/tlspic.rd b/ld/testsuite/ld-s390/tlspic.rd
index 4a9ed17..fd0a5aa 100644
--- a/ld/testsuite/ld-s390/tlspic.rd
+++ b/ld/testsuite/ld-s390/tlspic.rd
@@ -5,7 +5,7 @@
#readelf: -Ssrl
#target: s390-*-*
-There are 17 section headers, starting at offset 0x[0-9a-f]+:
+There are 15 section headers, starting at offset 0x[0-9a-f]+:
Section Headers:
\[Nr\] Name +Type +Addr +Off +Size +ES Flg Lk Inf Al
@@ -21,11 +21,9 @@ Section Headers:
\[ 9\] .tbss +NOBITS +0+1620 0+620 0+20 00 WAT 0 +0 1
\[10\] .dynamic +DYNAMIC +0+1620 0+620 0+98 08 WA 3 +0 4
\[11\] .got +PROGBITS +0+16b8 0+6b8 0+58 04 WA 0 +0 4
- \[12\] .data +.*
- \[13\] .bss +.*
- \[14\] .shstrtab +.*
- \[15\] .symtab +.*
- \[16\] .strtab +.*
+ \[12\] .shstrtab +.*
+ \[13\] .symtab +.*
+ \[14\] .strtab +.*
Key to Flags:
.*
.*
@@ -76,8 +74,8 @@ Symbol table '.dynsym' contains 20 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
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +12
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +13
+ +[0-9]+: 0+ +0 NOTYPE LOCAL DEFAULT UND
+ +[0-9]+: 0+ +0 NOTYPE LOCAL DEFAULT UND
+[0-9]+: 0+1c +0 TLS +GLOBAL DEFAULT +8 sg8
+[0-9]+: [0-9a-f]+ +0 OBJECT GLOBAL DEFAULT ABS _DYNAMIC
+[0-9]+: 0+8 +0 TLS +GLOBAL DEFAULT +8 sg3
@@ -93,7 +91,7 @@ Symbol table '.dynsym' contains 20 entries:
+[0-9]+: [0-9a-f]+ +0 NOTYPE GLOBAL DEFAULT ABS _edata
+[0-9]+: [0-9a-f]+ +0 NOTYPE GLOBAL DEFAULT ABS _end
-Symbol table '.symtab' contains 56 entries:
+Symbol table '.symtab' contains 54 entries:
+Num: +Value Size Type +Bind +Vis +Ndx Name
+[0-9]+: 0+ +0 NOTYPE LOCAL DEFAULT UND
+[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +1
@@ -110,8 +108,6 @@ Symbol table '.symtab' contains 56 entries:
+[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 SECTION LOCAL DEFAULT +14
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +15
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +16
+[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-s390/tlspic_64.rd b/ld/testsuite/ld-s390/tlspic_64.rd
index ac8b87a..6d7cbd8 100644
--- a/ld/testsuite/ld-s390/tlspic_64.rd
+++ b/ld/testsuite/ld-s390/tlspic_64.rd
@@ -5,7 +5,7 @@
#readelf: -WSsrl
#target: s390x-*-*
-There are 17 section headers, starting at offset 0x[0-9a-f]+:
+There are 15 section headers, starting at offset 0x[0-9a-f]+:
Section Headers:
\[Nr\] Name +Type +Address +Off +Size +ES Flg Lk Inf Al
@@ -17,15 +17,13 @@ Section Headers:
\[ 5\] .rela.plt +.*
\[ 6\] .plt +.*
\[ 7\] .text +PROGBITS +.*
- \[ 8\] .tdata +PROGBITS +0+1900 0+900 0+60 00 WAT +0 +0 +32
- \[ 9\] .tbss +NOBITS +0+1960 0+960 0+20 00 WAT +0 +0 +1
- \[10\] .dynamic +DYNAMIC +0+1960 0+960 0+130 10 +WA +3 +0 +8
- \[11\] .got +PROGBITS +0+1a90 0+a90 0+b0 08 +WA +0 +0 +8
- \[12\] .data +.*
- \[13\] .bss +.*
- \[14\] .shstrtab +.*
- \[15\] .symtab +.*
- \[16\] .strtab +.*
+ \[ 8\] .tdata +PROGBITS +0+18c0 0+8c0 0+60 00 WAT +0 +0 +32
+ \[ 9\] .tbss +NOBITS +0+1920 0+920 0+20 00 WAT +0 +0 +1
+ \[10\] .dynamic +DYNAMIC +0+1920 0+920 0+130 10 +WA +3 +0 +8
+ \[11\] .got +PROGBITS +0+1a50 0+a50 0+b0 08 +WA +0 +0 +8
+ \[12\] .shstrtab +.*
+ \[13\] .symtab +.*
+ \[14\] .strtab +.*
Key to Flags:
.*
.*
@@ -38,9 +36,9 @@ There are 4 program headers, starting at offset [0-9]+
Program Headers:
Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align
LOAD +0x0+ 0x0+ 0x0+ 0x[0-9a-f]+ 0x[0-9a-f]+ R E 0x1000
- LOAD +0x0+900 0x0+1900 0x0+1900 0x0+240 0x0+240 RW +0x1000
- DYNAMIC +0x0+960 0x0+1960 0x0+1960 0x0+130 0x0+130 RW +0x8
- TLS +0x0+900 0x0+1900 0x0+1900 0x0+60 0x0+80 R +0x20
+ LOAD +0x0+8c0 0x0+18c0 0x0+18c0 0x0+240 0x0+240 RW +0x1000
+ DYNAMIC +0x0+920 0x0+1920 0x0+1920 0x0+130 0x0+130 RW +0x8
+ TLS +0x0+8c0 0x0+18c0 0x0+18c0 0x0+60 0x0+80 R +0x20
Section to Segment mapping:
Segment Sections...
@@ -70,14 +68,14 @@ Relocation section '.rela.plt' at offset 0x[0-9a-f]+ contains 1 entries:
+Offset +Info +Type +Symbol's Value Symbol's Name \+ Addend
[0-9a-f]+ 0+b0+b R_390_JMP_SLOT +0+ __tls_get_offset \+ 0
-Symbol table '.dynsym' contains 21 entries:
+Symbol table '.dynsym' contains 20 entries:
+Num: +Value +Size Type +Bind +Vis +Ndx Name
+[0-9]+: 0+ +0 NOTYPE LOCAL DEFAULT UND
+[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
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +12
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +13
+ +[0-9]+: 0+ +0 NOTYPE LOCAL DEFAULT UND
+ +[0-9]+: 0+ +0 NOTYPE LOCAL DEFAULT UND
+[0-9]+: 0+1c +0 TLS +GLOBAL DEFAULT +8 sg8
+[0-9]+: [0-9a-f]+ +0 OBJECT GLOBAL DEFAULT ABS _DYNAMIC
+[0-9]+: 0+8 +0 TLS +GLOBAL DEFAULT +8 sg3
@@ -91,10 +89,9 @@ Symbol table '.dynsym' contains 21 entries:
+[0-9]+: 0+14 +0 TLS +GLOBAL DEFAULT +8 sg6
+[0-9]+: 0+18 +0 TLS +GLOBAL DEFAULT +8 sg7
+[0-9]+: [0-9a-f]+ +0 NOTYPE GLOBAL DEFAULT ABS _edata
- +[0-9]+: [0-9a-f]+ +0 OBJECT GLOBAL DEFAULT ABS _GLOBAL_OFFSET_TABLE_
+[0-9]+: [0-9a-f]+ +0 NOTYPE GLOBAL DEFAULT ABS _end
-Symbol table '.symtab' contains 56 entries:
+Symbol table '.symtab' contains 54 entries:
+Num: +Value +Size Type +Bind +Vis +Ndx Name
+[0-9]+: 0+ +0 NOTYPE LOCAL DEFAULT UND
+[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +1
@@ -111,8 +108,6 @@ Symbol table '.symtab' contains 56 entries:
+[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 SECTION LOCAL DEFAULT +14
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +15
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +16
+[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
@@ -135,6 +130,7 @@ Symbol table '.symtab' contains 56 entries:
+[0-9]+: 0+74 +0 TLS +LOCAL HIDDEN +9 sH6
+[0-9]+: 0+7c +0 TLS +LOCAL HIDDEN +9 sH8
+[0-9]+: 0+40 +0 TLS +LOCAL HIDDEN +8 sh1
+ +[0-9]+: [0-9a-f]+ +0 OBJECT LOCAL HIDDEN ABS _GLOBAL_OFFSET_TABLE_
+[0-9]+: 0+44 +0 TLS +LOCAL HIDDEN +8 sh2
+[0-9]+: 0+54 +0 TLS +LOCAL HIDDEN +8 sh6
+[0-9]+: 0+1c +0 TLS +GLOBAL DEFAULT +8 sg8
@@ -150,5 +146,4 @@ Symbol table '.symtab' contains 56 entries:
+[0-9]+: 0+14 +0 TLS +GLOBAL DEFAULT +8 sg6
+[0-9]+: 0+18 +0 TLS +GLOBAL DEFAULT +8 sg7
+[0-9]+: [0-9a-f]+ +0 NOTYPE GLOBAL DEFAULT ABS _edata
- +[0-9]+: [0-9a-f]+ +0 OBJECT GLOBAL DEFAULT ABS _GLOBAL_OFFSET_TABLE_
+[0-9]+: [0-9a-f]+ +0 NOTYPE GLOBAL DEFAULT ABS _end
diff --git a/ld/testsuite/ld-sh/tlsbin-2.d b/ld/testsuite/ld-sh/tlsbin-2.d
index 3cb56f9..04b91e3 100644
--- a/ld/testsuite/ld-sh/tlsbin-2.d
+++ b/ld/testsuite/ld-sh/tlsbin-2.d
@@ -22,8 +22,6 @@ Section Headers:
\[10\] \.tbss +NOBITS +0+413018 [0-9a-f]+ 0+010 00 WAT 0 0 1
#...
\[[0-9a-f]+\] \.got +PROGBITS +0+414000 .*
- \[[0-9a-f]+\] \.sbss +.*
- \[[0-9a-f]+\] \.bss +.*
#...
\[[0-9a-f]+\] \.shstrtab +.*
\[[0-9a-f]+\] \.symtab +.*
diff --git a/ld/testsuite/ld-sh/tlspic-2.d b/ld/testsuite/ld-sh/tlspic-2.d
index bbdbc4e..c95f401 100644
--- a/ld/testsuite/ld-sh/tlspic-2.d
+++ b/ld/testsuite/ld-sh/tlspic-2.d
@@ -21,8 +21,6 @@ Section Headers:
\[ 9\] \.tbss +NOBITS +0+[0-9a-f]+ [0-9a-f]+ 0+008 00 WAT 0 0 1
#...
\[[0-9a-f]+\] \.got +PROGBITS +0+[0-9a-f]+ .*
- \[[0-9a-f]+\] \.sbss +.*
- \[[0-9a-f]+\] \.bss +.*
#...
\[[0-9a-f]+\] \.shstrtab +.*
\[[0-9a-f]+\] \.symtab +.*
@@ -74,7 +72,7 @@ Symbol table '\.dynsym' contains [0-9]+ entries:
+2: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +8 *
+3: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +9 *
+4: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +[0-9]+ *
- +5: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +[0-9]+ *
+ +5: 0+ +0 NOTYPE +LOCAL +DEFAULT UND *
+6: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
+[0-9a-f]+: [0-9a-f]+ +0 NOTYPE GLOBAL DEFAULT UND __tls_get_addr
+[0-9a-f]+: 0+00 +0 TLS +GLOBAL DEFAULT +8 sg1
diff --git a/ld/testsuite/ld-sparc/tlssunbin32.rd b/ld/testsuite/ld-sparc/tlssunbin32.rd
index f0dfd48..073bd16 100644
--- a/ld/testsuite/ld-sparc/tlssunbin32.rd
+++ b/ld/testsuite/ld-sparc/tlssunbin32.rd
@@ -4,7 +4,7 @@
#readelf: -WSsrl
#target: sparc*-*-*
-There are 17 section headers, starting at offset 0x[0-9a-f]+:
+There are 15 section headers, starting at offset 0x[0-9a-f]+:
Section Headers:
+\[Nr\] Name +Type +Addr +Off +Size +ES Flg Lk Inf Al
@@ -20,11 +20,9 @@ Section Headers:
+\[ 9\] .dynamic +DYNAMIC +0+231f8 0+31f8 0+80 08 +WA +4 +0 +4
+\[10\] .got +PROGBITS +0+23278 0+3278 0+14 04 +WA +0 +0 +4
+\[11\] .plt +.*
- +\[12\] .data +.*
- +\[13\] .bss +.*
- +\[14\] .shstrtab +.*
- +\[15\] .symtab +.*
- +\[16\] .strtab +.*
+ +\[12\] .shstrtab +.*
+ +\[13\] .symtab +.*
+ +\[14\] .strtab +.*
#...
Elf file type is EXEC \(Executable file\)
@@ -37,7 +35,7 @@ Program Headers:
+INTERP +0x0+f4 0x0+100f4 0x0+100f4 0x0+11 0x0+11 R +0x1
.*Requesting program interpreter.*
+LOAD +0x0+ 0x0+10000 0x0+10000 0x0+2194 0x0+2194 R E 0x10000
- +LOAD +0x0+2194 0x0+22194 0x0+22194 0x0+1e6c 0x0+1e6c RWE 0x10000
+ +LOAD +0x0+2194 0x0+22194 0x0+22194 0x0+10f8 0x0+10f8 RWE 0x10000
+DYNAMIC +0x0+31f8 0x0+231f8 0x0+231f8 0x0+80 0x0+80 RW +0x4
+TLS +0x0+2194 0x0+22194 0x0+22194 0x0+1060 0x0+10a0 R +0x4
#...
@@ -63,7 +61,7 @@ Symbol table '.dynsym' contains 11 entries:
+9: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
+10: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
-Symbol table '.symtab' contains 70 entries:
+Symbol table '.symtab' contains 68 entries:
+Num: +Value +Size Type +Bind +Vis +Ndx Name
+0: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND *
+1: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +1 *
@@ -75,63 +73,61 @@ Symbol table '.symtab' contains 70 entries:
+7: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +7 *
+8: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +8 *
+9: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +9 *
- +10: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +10 *
- +11: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +11 *
- +12: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +12 *
- +13: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +13 *
- +14: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +14 *
- +15: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +15 *
- +16: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +16 *
- +17: 0+1020 +0 TLS +LOCAL +DEFAULT +7 sl1
- +18: 0+1024 +0 TLS +LOCAL +DEFAULT +7 sl2
- +19: 0+1028 +0 TLS +LOCAL +DEFAULT +7 sl3
- +20: 0+102c +0 TLS +LOCAL +DEFAULT +7 sl4
- +21: 0+1030 +0 TLS +LOCAL +DEFAULT +7 sl5
- +22: 0+1034 +0 TLS +LOCAL +DEFAULT +7 sl6
- +23: 0+1038 +0 TLS +LOCAL +DEFAULT +7 sl7
- +24: 0+103c +0 TLS +LOCAL +DEFAULT +7 sl8
- +25: 0+1080 +0 TLS +LOCAL +DEFAULT +8 bl1
- +26: 0+1084 +0 TLS +LOCAL +DEFAULT +8 bl2
- +27: 0+1088 +0 TLS +LOCAL +DEFAULT +8 bl3
- +28: 0+108c +0 TLS +LOCAL +DEFAULT +8 bl4
- +29: 0+1090 +0 TLS +LOCAL +DEFAULT +8 bl5
- +30: 0+1094 +0 TLS +LOCAL +DEFAULT +8 bl6
- +31: 0+1098 +0 TLS +LOCAL +DEFAULT +8 bl7
- +32: 0+109c +0 TLS +LOCAL +DEFAULT +8 bl8
- +33: 0+101c +0 TLS +GLOBAL DEFAULT +7 sg8
- +34: 0+107c +0 TLS +GLOBAL DEFAULT +8 bg8
- +35: 0+1074 +0 TLS +GLOBAL DEFAULT +8 bg6
- +36: 0+ +0 TLS +GLOBAL DEFAULT +UND sG5
- +37: 0+1068 +0 TLS +GLOBAL DEFAULT +8 bg3
- +38: 0+231f8 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
- +39: 0+1008 +0 TLS +GLOBAL DEFAULT +7 sg3
- +40: 0+1048 +0 TLS +GLOBAL HIDDEN +7 sh3
- +41: 0+ +0 TLS +GLOBAL DEFAULT +UND sG2
- +42: 0+100c +0 TLS +GLOBAL DEFAULT +7 sg4
- +43: 0+1010 +0 TLS +GLOBAL DEFAULT +7 sg5
- +44: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
- +45: 0+1070 +0 TLS +GLOBAL DEFAULT +8 bg5
- +46: 0+ +0 FUNC +GLOBAL DEFAULT +UND __tls_get_addr
- +47: 0+1058 +0 TLS +GLOBAL HIDDEN +7 sh7
- +48: 0+105c +0 TLS +GLOBAL HIDDEN +7 sh8
- +49: 0+ +0 TLS +GLOBAL DEFAULT +7 sg1
- +50: 0+12000 +0 FUNC +GLOBAL DEFAULT +6 _start
- +51: 0+104c +0 TLS +GLOBAL HIDDEN +7 sh4
- +52: 0+1078 +0 TLS +GLOBAL DEFAULT +8 bg7
- +53: 0+1050 +0 TLS +GLOBAL HIDDEN +7 sh5
- +54: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
- +55: 0+ +0 TLS +GLOBAL DEFAULT +UND sG6
- +56: 0+11008 +0 FUNC +GLOBAL DEFAULT +6 fn2
- +57: 0+1004 +0 TLS +GLOBAL DEFAULT +7 sg2
- +58: 0+ +0 TLS +GLOBAL DEFAULT +UND sG1
- +59: 0+1040 +0 TLS +GLOBAL HIDDEN +7 sh1
- +60: 0+1014 +0 TLS +GLOBAL DEFAULT +7 sg6
- +61: 0+1018 +0 TLS +GLOBAL DEFAULT +7 sg7
- +62: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
- +63: 0+23278 +0 OBJECT +GLOBAL +HIDDEN +10 _GLOBAL_OFFSET_TABLE_
- +64: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
- +65: 0+1044 +0 TLS +GLOBAL HIDDEN +7 sh2
- +66: 0+1054 +0 TLS +GLOBAL HIDDEN +7 sh6
- +67: 0+1064 +0 TLS +GLOBAL DEFAULT +8 bg2
- +68: 0+1060 +0 TLS +GLOBAL DEFAULT +8 bg1
- +69: 0+106c +0 TLS +GLOBAL DEFAULT +8 bg4
+ +[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 *
+ +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +13 *
+ +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +14 *
+ +[0-9]+: 0+1020 +0 TLS +LOCAL +DEFAULT +7 sl1
+ +[0-9]+: 0+1024 +0 TLS +LOCAL +DEFAULT +7 sl2
+ +[0-9]+: 0+1028 +0 TLS +LOCAL +DEFAULT +7 sl3
+ +[0-9]+: 0+102c +0 TLS +LOCAL +DEFAULT +7 sl4
+ +[0-9]+: 0+1030 +0 TLS +LOCAL +DEFAULT +7 sl5
+ +[0-9]+: 0+1034 +0 TLS +LOCAL +DEFAULT +7 sl6
+ +[0-9]+: 0+1038 +0 TLS +LOCAL +DEFAULT +7 sl7
+ +[0-9]+: 0+103c +0 TLS +LOCAL +DEFAULT +7 sl8
+ +[0-9]+: 0+1080 +0 TLS +LOCAL +DEFAULT +8 bl1
+ +[0-9]+: 0+1084 +0 TLS +LOCAL +DEFAULT +8 bl2
+ +[0-9]+: 0+1088 +0 TLS +LOCAL +DEFAULT +8 bl3
+ +[0-9]+: 0+108c +0 TLS +LOCAL +DEFAULT +8 bl4
+ +[0-9]+: 0+1090 +0 TLS +LOCAL +DEFAULT +8 bl5
+ +[0-9]+: 0+1094 +0 TLS +LOCAL +DEFAULT +8 bl6
+ +[0-9]+: 0+1098 +0 TLS +LOCAL +DEFAULT +8 bl7
+ +[0-9]+: 0+109c +0 TLS +LOCAL +DEFAULT +8 bl8
+ +[0-9]+: 0+101c +0 TLS +GLOBAL DEFAULT +7 sg8
+ +[0-9]+: 0+107c +0 TLS +GLOBAL DEFAULT +8 bg8
+ +[0-9]+: 0+1074 +0 TLS +GLOBAL DEFAULT +8 bg6
+ +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND sG5
+ +[0-9]+: 0+1068 +0 TLS +GLOBAL DEFAULT +8 bg3
+ +[0-9]+: 0+231f8 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
+ +[0-9]+: 0+1008 +0 TLS +GLOBAL DEFAULT +7 sg3
+ +[0-9]+: 0+1048 +0 TLS +GLOBAL HIDDEN +7 sh3
+ +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND sG2
+ +[0-9]+: 0+100c +0 TLS +GLOBAL DEFAULT +7 sg4
+ +[0-9]+: 0+1010 +0 TLS +GLOBAL DEFAULT +7 sg5
+ +[0-9]+: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
+ +[0-9]+: 0+1070 +0 TLS +GLOBAL DEFAULT +8 bg5
+ +[0-9]+: 0+ +0 FUNC +GLOBAL DEFAULT +UND __tls_get_addr
+ +[0-9]+: 0+1058 +0 TLS +GLOBAL HIDDEN +7 sh7
+ +[0-9]+: 0+105c +0 TLS +GLOBAL HIDDEN +7 sh8
+ +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +7 sg1
+ +[0-9]+: 0+12000 +0 FUNC +GLOBAL DEFAULT +6 _start
+ +[0-9]+: 0+104c +0 TLS +GLOBAL HIDDEN +7 sh4
+ +[0-9]+: 0+1078 +0 TLS +GLOBAL DEFAULT +8 bg7
+ +[0-9]+: 0+1050 +0 TLS +GLOBAL HIDDEN +7 sh5
+ +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+ +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND sG6
+ +[0-9]+: 0+11008 +0 FUNC +GLOBAL DEFAULT +6 fn2
+ +[0-9]+: 0+1004 +0 TLS +GLOBAL DEFAULT +7 sg2
+ +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND sG1
+ +[0-9]+: 0+1040 +0 TLS +GLOBAL HIDDEN +7 sh1
+ +[0-9]+: 0+1014 +0 TLS +GLOBAL DEFAULT +7 sg6
+ +[0-9]+: 0+1018 +0 TLS +GLOBAL DEFAULT +7 sg7
+ +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
+ +[0-9]+: 0+23278 +0 OBJECT +GLOBAL +HIDDEN +10 _GLOBAL_OFFSET_TABLE_
+ +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
+ +[0-9]+: 0+1044 +0 TLS +GLOBAL HIDDEN +7 sh2
+ +[0-9]+: 0+1054 +0 TLS +GLOBAL HIDDEN +7 sh6
+ +[0-9]+: 0+1064 +0 TLS +GLOBAL DEFAULT +8 bg2
+ +[0-9]+: 0+1060 +0 TLS +GLOBAL DEFAULT +8 bg1
+ +[0-9]+: 0+106c +0 TLS +GLOBAL DEFAULT +8 bg4
diff --git a/ld/testsuite/ld-sparc/tlssunnopic32.rd b/ld/testsuite/ld-sparc/tlssunnopic32.rd
index 1d227db..9ffcbd2 100644
--- a/ld/testsuite/ld-sparc/tlssunnopic32.rd
+++ b/ld/testsuite/ld-sparc/tlssunnopic32.rd
@@ -5,7 +5,7 @@
#readelf: -WSsrl
#target: sparc-*-*
-There are 15 section headers, starting at offset 0x[0-9a-f]+:
+There are 13 section headers, starting at offset 0x[0-9a-f]+:
Section Headers:
+\[Nr\] Name +Type +Addr +Off +Size +ES Flg Lk Inf Al
@@ -19,11 +19,9 @@ Section Headers:
+\[ 7\] .dynamic +DYNAMIC +0+12000 0+2000 0+80 08 +WA +3 +0 +4
+\[ 8\] .got +PROGBITS +0+12080 0+2080 0+1c 04 +WA +0 +0 +4
+\[ 9\] .plt +.*
- +\[10\] .data +PROGBITS +0+13000 0+3000 0+ 0+ +WA +0 +0 4096
- +\[11\] .bss +.*
- +\[12\] .shstrtab +.*
- +\[13\] .symtab +.*
- +\[14\] .strtab +.*
+ +\[10\] .shstrtab +.*
+ +\[11\] .symtab +.*
+ +\[12\] .strtab +.*
#...
Elf file type is DYN \(Shared object file\)
Entry point 0x1000
@@ -32,7 +30,7 @@ There are 4 program headers, starting at offset [0-9a-f]+
Program Headers:
+Type +Offset +VirtAddr +PhysAddr +FileSiz MemSiz +Flg Align
+LOAD +0x0+ 0x0+ 0x0+ 0x0+2000 0x0+2000 R E 0x10000
- +LOAD +0x0+2000 0x0+12000 0x0+12000 0x0+1000 0x0+1000 RWE 0x10000
+ +LOAD +0x0+2000 0x0+12000 0x0+12000 0x0+9c 0x0+9c RWE 0x10000
+DYNAMIC +0x0+2000 0x0+12000 0x0+12000 0x0+80 0x0+80 RW +0x4
+TLS +0x0+2000 0x0+12000 0x0+12000 0x0+ 0x0+24 R +0x4
#...
@@ -58,8 +56,8 @@ Symbol table '.dynsym' contains 14 entries:
+1: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +5 *
+2: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +6 *
+3: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +8 *
- +4: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +10 *
- +5: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +11 *
+ +4: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND *
+ +5: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND *
+6: 0+12000 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
+7: 0+1000 +0 FUNC +GLOBAL DEFAULT +5 fn3
+8: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
@@ -69,7 +67,7 @@ Symbol table '.dynsym' contains 14 entries:
+12: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
+13: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
-Symbol table '.symtab' contains 33 entries:
+Symbol table '.symtab' contains 31 entries:
+Num: +Value +Size Type +Bind +Vis +Ndx Name
+0: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND *
+1: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +1 *
@@ -81,26 +79,24 @@ Symbol table '.symtab' contains 33 entries:
+7: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +7 *
+8: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +8 *
+9: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +9 *
- +10: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +10 *
- +11: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +11 *
- +12: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +12 *
- +13: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +13 *
- +14: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +14 *
- +15: 0+ +0 TLS +LOCAL +DEFAULT +6 bl1
- +16: 0+4 +0 TLS +LOCAL +DEFAULT +6 bl2
- +17: 0+8 +0 TLS +LOCAL +DEFAULT +6 bl3
- +18: 0+c +0 TLS +LOCAL +DEFAULT +6 bl4
- +19: 0+10 +0 TLS +LOCAL +DEFAULT +6 bl5
- +20: 0+1c +0 TLS +LOCAL +HIDDEN +6 sh3
- +21: 0+20 +0 TLS +LOCAL +HIDDEN +6 sh4
- +22: 0+14 +0 TLS +LOCAL +HIDDEN +6 sh1
- +23: 0+12080 +0 OBJECT +LOCAL +HIDDEN +ABS _GLOBAL_OFFSET_TABLE_
- +24: 0+18 +0 TLS +LOCAL +HIDDEN +6 sh2
- +25: 0+12000 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
- +26: 0+1000 +0 FUNC +GLOBAL DEFAULT +5 fn3
- +27: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
- +28: 0+ +0 TLS +GLOBAL DEFAULT +UND sg1
- +29: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
- +30: 0+ +0 TLS +GLOBAL DEFAULT +UND sg2
- +31: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
- +32: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
+ +[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 *
+ +[0-9]+: 0+ +0 TLS +LOCAL +DEFAULT +6 bl1
+ +[0-9]+: 0+4 +0 TLS +LOCAL +DEFAULT +6 bl2
+ +[0-9]+: 0+8 +0 TLS +LOCAL +DEFAULT +6 bl3
+ +[0-9]+: 0+c +0 TLS +LOCAL +DEFAULT +6 bl4
+ +[0-9]+: 0+10 +0 TLS +LOCAL +DEFAULT +6 bl5
+ +[0-9]+: 0+1c +0 TLS +LOCAL +HIDDEN +6 sh3
+ +[0-9]+: 0+20 +0 TLS +LOCAL +HIDDEN +6 sh4
+ +[0-9]+: 0+14 +0 TLS +LOCAL +HIDDEN +6 sh1
+ +[0-9]+: 0+12080 +0 OBJECT +LOCAL +HIDDEN +ABS _GLOBAL_OFFSET_TABLE_
+ +[0-9]+: 0+18 +0 TLS +LOCAL +HIDDEN +6 sh2
+ +[0-9]+: 0+12000 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
+ +[0-9]+: 0+1000 +0 FUNC +GLOBAL DEFAULT +5 fn3
+ +[0-9]+: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
+ +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND sg1
+ +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+ +[0-9]+: 0+ +0 TLS +GLOBAL DEFAULT +UND sg2
+ +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
+ +[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
diff --git a/ld/testsuite/ld-sparc/tlssunpic32.rd b/ld/testsuite/ld-sparc/tlssunpic32.rd
index a082527..80d2873 100644
--- a/ld/testsuite/ld-sparc/tlssunpic32.rd
+++ b/ld/testsuite/ld-sparc/tlssunpic32.rd
@@ -5,7 +5,7 @@
#readelf: -WSsrl
#target: sparc*-*-*
-There are 17 section headers, starting at offset 0x[0-9a-f]+:
+There are 15 section headers, starting at offset 0x[0-9a-f]+:
Section Headers:
+\[Nr\] Name +Type +Addr +Off +Size +ES Flg Lk Inf Al
@@ -21,11 +21,9 @@ Section Headers:
+\[ 9\] .dynamic +DYNAMIC +0+12060 0+2060 0+98 08 +WA +3 +0 +4
+\[10\] .got +PROGBITS +0+120f8 0+20f8 0+4c 04 +WA +0 +0 +4
+\[11\] .plt +.*
- +\[12\] .data +PROGBITS +0+13000 0+3000 0+ 0+ +WA +0 +0 4096
- +\[13\] .bss +.*
- +\[14\] .shstrtab +.*
- +\[15\] .symtab +.*
- +\[16\] .strtab +.*
+ +\[12\] .shstrtab +.*
+ +\[13\] .symtab +.*
+ +\[14\] .strtab +.*
#...
Elf file type is DYN \(Shared object file\)
@@ -35,7 +33,7 @@ There are 4 program headers, starting at offset [0-9]+
Program Headers:
+Type +Offset +VirtAddr +PhysAddr +FileSiz MemSiz +Flg Align
+LOAD +0x0+ 0x0+ 0x0+ 0x0+2000 0x0+2000 R E 0x10000
- +LOAD +0x0+2000 0x0+12000 0x0+12000 0x0+1000 0x0+1000 RWE 0x10000
+ +LOAD +0x0+2000 0x0+12000 0x0+12000 0x0+184 0x0+184 RWE 0x10000
+DYNAMIC +0x0+2060 0x0+12060 0x0+12060 0x0+98 0x0+98 RW +0x4
+TLS +0x0+2000 0x0+12000 0x0+12000 0x0+60 0x0+80 R +0x4
#...
@@ -68,8 +66,8 @@ Symbol table '.dynsym' contains 22 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 +10 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +12 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +13 *
+ +[0-9]+: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND *
+ +[0-9]+: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND *
+[0-9]+: 0+1c +0 TLS +GLOBAL DEFAULT +7 sg8
+[0-9]+: 0+12060 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
+[0-9]+: 0+8 +0 TLS +GLOBAL DEFAULT +7 sg3
@@ -86,7 +84,7 @@ Symbol table '.dynsym' contains 22 entries:
+[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
+[0-9]+: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
-Symbol table '.symtab' contains 57 entries:
+Symbol table '.symtab' contains 55 entries:
+Num: +Value +Size Type +Bind +Vis +Ndx Name
+0: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND *
+[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +1 *
@@ -103,8 +101,6 @@ Symbol table '.symtab' contains 57 entries:
+[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 SECTION LOCAL +DEFAULT +14 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +15 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +16 *
+[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-x86-64/tlsbin.rd b/ld/testsuite/ld-x86-64/tlsbin.rd
index ccebb79..2960ae4 100644
--- a/ld/testsuite/ld-x86-64/tlsbin.rd
+++ b/ld/testsuite/ld-x86-64/tlsbin.rd
@@ -5,7 +5,7 @@
#readelf: -WSsrl
#target: x86_64-*-*
-There are 19 section headers, starting at offset 0x[0-9a-f]+:
+There are 17 section headers, starting at offset 0x[0-9a-f]+:
Section Headers:
\[Nr\] Name +Type +Address +Off +Size +ES Flg Lk Inf Al
@@ -23,11 +23,9 @@ Section Headers:
\[11\] .dynamic +DYNAMIC +0+501290 0+1290 0+140 10 +WA +4 +0 +8
\[12\] .got +PROGBITS +0+5013d0 0+13d0 0+20 08 +WA +0 +0 +8
\[13\] .got.plt +PROGBITS +0+5013f0 0+13f0 0+20 08 +WA +0 +0 +8
- \[14\] .data +.*
- \[15\] .bss +.*
- \[16\] .shstrtab +.*
- \[17\] .symtab +.*
- \[18\] .strtab +.*
+ \[14\] .shstrtab +.*
+ \[15\] .symtab +.*
+ \[16\] .strtab +.*
Key to Flags:
.*
.*
@@ -39,11 +37,11 @@ There are 6 program headers, starting at offset [0-9]+
Program Headers:
Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align
- PHDR +0x0+40 0x0+400040 0x0+400040 0x0+150 0x0+150 R E 0x8
- INTERP +0x0+190 0x0+400190 0x0+400190 0x0+f 0x0+f R +0x1
+ PHDR.*
+ INTERP.*
.*Requesting program interpreter.*
LOAD +0x0+ 0x0+400000 0x0+400000 0x0+122a 0x0+122a R E 0x100000
- LOAD +0x0+122a 0x0+50122a 0x0+50122a 0x0+dd6 0x0+dd6 RW 0x100000
+ LOAD +0x0+122a 0x0+50122a 0x0+50122a 0x0+1e6 0x0+1e6 RW 0x100000
DYNAMIC +0x0+1290 0x0+501290 0x0+501290 0x0+140 0x0+140 RW 0x8
TLS +0x0+122a 0x0+50122a 0x0+50122a 0x0+60 0x0+a0 R +0x1
@@ -56,14 +54,14 @@ Program Headers:
04 +.dynamic *
05 +.tdata .tbss *
-Relocation section '.rela.dyn' at offset 0x328 contains 4 entries:
+Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 4 entries:
+Offset +Info +Type +Symbol's Value Symbol's Name \+ Addend
0+5013d0 0+100000012 R_X86_64_TPOFF64 +0+ sG5 \+ 0
0+5013d8 0+300000012 R_X86_64_TPOFF64 +0+ sG2 \+ 0
0+5013e0 0+600000012 R_X86_64_TPOFF64 +0+ sG6 \+ 0
0+5013e8 0+700000012 R_X86_64_TPOFF64 +0+ sG1 \+ 0
-Relocation section '.rela.plt' at offset 0x388 contains 1 entries:
+Relocation section '.rela.plt' at offset 0x[0-9a-f]+ contains 1 entries:
+Offset +Info +Type +Symbol's Value Symbol's Name \+ Addend
0+[0-9a-f]+ 0+400000007 R_X86_64_JUMP_SLOT +0+[0-9a-f]+ __tls_get_addr \+ 0
@@ -80,7 +78,7 @@ Symbol table '.dynsym' contains 10 entries:
+[0-9]+: 0+[0-9a-f]+ +0 NOTYPE GLOBAL DEFAULT ABS _edata
+[0-9]+: 0+[0-9a-f]+ +0 NOTYPE GLOBAL DEFAULT ABS _end
-Symbol table '.symtab' contains 71 entries:
+Symbol table '.symtab' contains 69 entries:
+Num: +Value +Size Type +Bind +Vis +Ndx Name
+[0-9]+: 0+ +0 NOTYPE LOCAL DEFAULT UND *
+[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +1 *
@@ -99,8 +97,6 @@ Symbol table '.symtab' contains 71 entries:
+[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +14 *
+[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +15 *
+[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +16 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +17 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +18 *
+[0-9]+: 0+20 +0 TLS +LOCAL DEFAULT +9 sl1
+[0-9]+: 0+24 +0 TLS +LOCAL DEFAULT +9 sl2
+[0-9]+: 0+28 +0 TLS +LOCAL DEFAULT +9 sl3
diff --git a/ld/testsuite/ld-x86-64/tlspic.rd b/ld/testsuite/ld-x86-64/tlspic.rd
index d946295..7a4e615 100644
--- a/ld/testsuite/ld-x86-64/tlspic.rd
+++ b/ld/testsuite/ld-x86-64/tlspic.rd
@@ -5,7 +5,7 @@
#readelf: -WSsrl
#target: x86_64-*-*
-There are 18 section headers, starting at offset 0x[0-9a-f]+:
+There are 16 section headers, starting at offset 0x[0-9a-f]+:
Section Headers:
\[Nr\] Name +Type +Address +Off +Size +ES Flg Lk Inf Al
@@ -22,11 +22,9 @@ Section Headers:
\[10\] .dynamic +DYNAMIC +0+101210 0+1210 0+130 10 +WA +3 +0 +8
\[11\] .got +PROGBITS +0+101340 0+1340 0+90 08 +WA +0 +0 +8
\[12\] .got.plt +PROGBITS +0+1013d0 0+13d0 0+20 08 +WA +0 +0 +8
- \[13\] .data +.*
- \[14\] .bss +.*
- \[15\] .shstrtab +.*
- \[16\] .symtab +.*
- \[17\] .strtab +.*
+ \[13\] .shstrtab +.*
+ \[14\] .symtab +.*
+ \[15\] .strtab +.*
Key to Flags:
.*
.*
@@ -39,7 +37,7 @@ There are 4 program headers, starting at offset [0-9]+
Program Headers:
Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align
LOAD +0x0+ 0x0+ 0x0+ 0x[0-9a-f]+ 0x[0-9a-f]+ R E 0x100000
- LOAD +0x0+11ac 0x0+1011ac 0x0+1011ac 0x0+e54 0x0+e54 RW +0x100000
+ LOAD +0x0+11ac 0x0+1011ac 0x0+1011ac 0x0+244 0x0+244 RW +0x100000
DYNAMIC +0x0+1210 0x0+101210 0x0+101210 0x0+130 0x0+130 RW +0x8
TLS +0x0+11ac 0x0+1011ac 0x0+1011ac 0x0+60 0x0+80 R +0x1
@@ -77,8 +75,8 @@ Symbol table '.dynsym' contains 20 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 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +13 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +14 *
+ +[0-9]+: 0+ +0 NOTYPE LOCAL DEFAULT UND *
+ +[0-9]+: 0+ +0 NOTYPE LOCAL DEFAULT UND *
+[0-9]+: 0+1c +0 TLS +GLOBAL DEFAULT +8 sg8
+[0-9]+: 0+101210 +0 OBJECT GLOBAL DEFAULT ABS _DYNAMIC
+[0-9]+: 0+8 +0 TLS +GLOBAL DEFAULT +8 sg3
@@ -94,7 +92,7 @@ Symbol table '.dynsym' contains 20 entries:
+[0-9]+: [0-9a-f]+ +0 NOTYPE GLOBAL DEFAULT ABS _edata
+[0-9]+: [0-9a-f]+ +0 NOTYPE GLOBAL DEFAULT ABS _end
-Symbol table '.symtab' contains 57 entries:
+Symbol table '.symtab' contains 55 entries:
+Num: +Value +Size Type +Bind +Vis +Ndx Name
+[0-9]+: 0+ +0 NOTYPE LOCAL DEFAULT UND *
+[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +1 *
@@ -112,8 +110,6 @@ Symbol table '.symtab' contains 57 entries:
+[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +13 *
+[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +14 *
+[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +15 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +16 *
- +[0-9]+: [0-9a-f]+ +0 SECTION LOCAL DEFAULT +17 *
+[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