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.

3 files changed, 101 insertions, 113 deletions

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