From: Nick Clifton <nickc@redhat.com>
Date: Tue, 29 Jul 2003 06:26:23 +0000 (+0000)
Subject: Update expected output regexps to include .eh_frame section.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=10eafd9ffdf334449fee4c9168e883022cdd9a51;p=binutils-gdb.git

Update expected output regexps to include .eh_frame section.
---

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 692fc5fbcbd..04f72d4a895 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,15 @@
+2003-07-29  Nick Clifton  <nickc@redhat.com>
+
+	* ld-alpha/tlsbin.dd: Update to account for .eh_frame section.
+	* ld-alpha/tlsbin.rd: Likewise.
+	* ld-alpha/tlsbin.sd: Likewise.
+	* ld-alpha/tlsbinr.dd: Likewise.
+	* ld-alpha/tlsbinr.rd: Likewise.
+	* ld-alpha/tlsbinr.sd: Likewise.
+	* ld-alpha/tlspic.dd: Likewise.
+	* ld-alpha/tlspic.rd: Likewise.
+	* ld-alpha/tlspic.sd: Likewise.	
+
 2003-07-26  Alan Modra  <amodra@bigpond.net.au>
 
 	* ld-powerpc/tlsexe32.d: Update.
diff --git a/ld/testsuite/ld-alpha/tlsbin.dd b/ld/testsuite/ld-alpha/tlsbin.dd
index 8dfd97a6e9f..32df225733f 100644
--- a/ld/testsuite/ld-alpha/tlsbin.dd
+++ b/ld/testsuite/ld-alpha/tlsbin.dd
@@ -12,30 +12,30 @@ Disassembly of section \.text:
 
 0+120001000 <fn2>:
    120001000:	02 00 bb 27 	ldah	gp,2\(t12\)
-   120001004:	d0 91 bd 23 	lda	gp,-28208\(gp\)
+   120001004:	f8 91 bd 23 	lda	gp,-28168\(gp\)
    120001008:	3e 15 c2 43 	subq	sp,0x10,sp
    12000100c:	00 00 5e b7 	stq	ra,0\(sp\)
    120001010:	18 80 1d 22 	lda	a0,-32744\(gp\)
    120001014:	08 80 7d a7 	ldq	t12,-32760\(gp\)
    120001018:	00 40 5b 6b 	jsr	ra,\(t12\),12000101c <.*>
    12000101c:	02 00 ba 27 	ldah	gp,2\(ra\)
-   120001020:	b4 91 bd 23 	lda	gp,-28236\(gp\)
+   120001020:	dc 91 bd 23 	lda	gp,-28196\(gp\)
    120001024:	38 80 1d 22 	lda	a0,-32712\(gp\)
    120001028:	08 80 7d a7 	ldq	t12,-32760\(gp\)
    12000102c:	00 40 5b 6b 	jsr	ra,\(t12\),120001030 <.*>
    120001030:	02 00 ba 27 	ldah	gp,2\(ra\)
-   120001034:	a0 91 bd 23 	lda	gp,-28256\(gp\)
+   120001034:	c8 91 bd 23 	lda	gp,-28216\(gp\)
    120001038:	28 80 1d 22 	lda	a0,-32728\(gp\)
    12000103c:	08 80 7d a7 	ldq	t12,-32760\(gp\)
    120001040:	00 40 5b 6b 	jsr	ra,\(t12\),120001044 <.*>
    120001044:	02 00 ba 27 	ldah	gp,2\(ra\)
-   120001048:	8c 91 bd 23 	lda	gp,-28276\(gp\)
+   120001048:	b4 91 bd 23 	lda	gp,-28236\(gp\)
    12000104c:	21 00 20 20 	lda	t0,33\(v0\)
    120001050:	28 80 1d 22 	lda	a0,-32728\(gp\)
    120001054:	08 80 7d a7 	ldq	t12,-32760\(gp\)
    120001058:	00 40 5b 6b 	jsr	ra,\(t12\),12000105c <.*>
    12000105c:	02 00 ba 27 	ldah	gp,2\(ra\)
-   120001060:	74 91 bd 23 	lda	gp,-28300\(gp\)
+   120001060:	9c 91 bd 23 	lda	gp,-28260\(gp\)
    120001064:	40 00 20 20 	lda	t0,64\(v0\)
    120001068:	46 00 20 20 	lda	t0,70\(v0\)
    12000106c:	00 00 20 24 	ldah	t0,0\(v0\)
diff --git a/ld/testsuite/ld-alpha/tlsbin.rd b/ld/testsuite/ld-alpha/tlsbin.rd
index 25eb120bd9a..9b130b09cc5 100644
--- a/ld/testsuite/ld-alpha/tlsbin.rd
+++ b/ld/testsuite/ld-alpha/tlsbin.rd
@@ -6,7 +6,7 @@
 #readelf: -WSsrl
 #target: alpha*-*-*
 
-There are 19 section headers, starting at offset 0x[0-9a-f]+:
+There are [0-9]* section headers, starting at offset 0x[0-9a-f]+:
 
 Section Headers:
   \[Nr\] Name +Type +Address +Off +Size +ES Flg Lk Inf Al
@@ -17,18 +17,19 @@ Section Headers:
   \[ 4\] .dynstr +.*
   \[ 5\] .rela.dyn +.*
   \[ 6\] .rela.plt +.*
-  \[ 7\] .text +PROGBITS +0+120001000 0+1000 0+bc 00 +AX +0 +0 4096
+  \[ 7\] .text +PROGBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 00 +AX +0 +0 4096
   \[ 8\] .data +.*
-  \[ 9\] .tdata +PROGBITS +0+120012000 0+2000 0+60 00 WAT +0 +0 +4
-  \[10\] .tbss +NOBITS +0+120012060 0+2060 0+40 00 WAT +0 +0 +1
-  \[11\] .dynamic +DYNAMIC +0+120012060 0+2060 0+140 10 +WA +4 +0 +8
-  \[12\] .plt +.*
-  \[13\] .got +PROGBITS +0+1200121d0 0+21d0 0+58 00 +WA +0 +0 +8
-  \[14\] .sbss +.*
-  \[15\] .bss +.*
-  \[16\] .shstrtab +.*
-  \[17\] .symtab +.*
-  \[18\] .strtab +.*
+  \[ 9\] .tdata +PROGBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 00 WAT +0 +0 +4
+  \[10\] .tbss +NOBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 00 WAT +0 +0 +1
+  \[11\] .eh_frame +PROGBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 00 +A +0 +0 +8
+  \[12\] .dynamic +DYNAMIC +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 10 +WA +4 +0 +8
+  \[13\] .plt +.*
+  \[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 +.*
 #...
 
 Elf file type is EXEC \(Executable file\)
@@ -37,39 +38,39 @@ There are 6 program headers, starting at offset [0-9]+
 
 Program Headers:
   Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align
-  PHDR +0x0+40 0x0+120000040 0x0+120000040 0x0+150 0x0+150 R E 0x8
-  INTERP +0x0+190 0x0+120000190 0x0+120000190 0x[0-9a-f]+ 0x[0-9a-f]+ R +0x1
+  PHDR +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x0+150 R E 0x8
+  INTERP +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ R +0x1
 .*Requesting program interpreter.*
-  LOAD +0x0+ 0x0+120000000 0x0+120000000 0x0+10bc 0x0+10bc R E 0x10000
-  LOAD +0x0+2000 0x0+120012000 0x0+120012000 0x0+228 0x0+228 RWE 0x10000
-  DYNAMIC +0x0+2060 0x0+120012060 0x0+120012060 0x0+140 0x0+140 RW +0x8
-  TLS +0x0+2000 0x0+120012000 0x0+120012000 0x0+60 0x0+a0 R +0x4
+  LOAD +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ R E 0x10000
+  LOAD +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RWE 0x10000
+  DYNAMIC +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RW +0x8
+  TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ R +0x4
 #...
 
 Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 3 entries:
  +Offset +Info +Type +Symbol's Value  Symbol's Name \+ Addend
-0+1200121d0  0+200000026 R_ALPHA_TPREL64 +0+ sG2 \+ 0
-0+1200121e8  0+60000001f R_ALPHA_DTPMOD64 +0+ sG1 \+ 0
-0+1200121f0  0+600000021 R_ALPHA_DTPREL64 +0+ sG1 \+ 0
+[0-9a-f]+  [0-9a-f]+ R_ALPHA_TPREL64 +0+ sG2 \+ 0
+[0-9a-f]+  [0-9a-f]+ R_ALPHA_DTPMOD64 +0+ sG1 \+ 0
+[0-9a-f]+  [0-9a-f]+ R_ALPHA_DTPREL64 +0+ sG1 \+ 0
 
 Relocation section '.rela.plt' at offset 0x[0-9a-f]+ contains 1 entries:
  +Offset +Info +Type +Symbol's Value  Symbol's Name \+ Addend
-0+1200121d8  0+40000001a R_ALPHA_JMP_SLOT +0+1200121c0 __tls_get_addr \+ 0
+[0-9a-f]+  [0-9a-f]+ R_ALPHA_JMP_SLOT +[0-9a-f]+ __tls_get_addr \+ 0
 
-Symbol table '.dynsym' contains 10 entries:
+Symbol table '.dynsym' contains [0-9]+ entries:
  +Num: +Value +Size Type +Bind +Vis +Ndx Name
- +0: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND *
- +1: 0+120012060 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
- +2: 0+ +0 TLS +GLOBAL DEFAULT +UND sG2
- +3: 0+1200121a0 +0 OBJECT +GLOBAL DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
- +4: 0+1200121c0 +4 FUNC +GLOBAL DEFAULT +UND __tls_get_addr
- +5: 0+120012228 +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
- +6: 0+ +0 TLS +GLOBAL DEFAULT +UND sG1
- +7: 0+120012228 +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
- +8: 0+1200121d0 +0 OBJECT +GLOBAL DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
- +9: 0+120012228 +0 NOTYPE +GLOBAL DEFAULT +ABS _end
+ +0: [0-9a-f]+ +0 NOTYPE +LOCAL +DEFAULT +UND *
+ +1: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
+ +2: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +UND sG2
+ +3: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
+ +4: [0-9a-f]+ +4 FUNC +GLOBAL DEFAULT +UND __tls_get_addr
+ +5: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+ +6: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +UND sG1
+ +7: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
+ +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 70 entries:
+Symbol table '.symtab' contains [0-9]+ 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 
@@ -78,66 +79,67 @@ Symbol table '.symtab' contains 70 entries:
  +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+120001000 +0 SECTION LOCAL +DEFAULT +7 
- +8: 0+120012000 +0 SECTION LOCAL +DEFAULT +8 
- +9: 0+120012000 +0 SECTION LOCAL +DEFAULT +9 
- +10: 0+120012060 +0 SECTION LOCAL +DEFAULT +10 
- +11: 0+120012060 +0 SECTION LOCAL +DEFAULT +11 
- +12: 0+1200121a0 +0 SECTION LOCAL +DEFAULT +12 
- +13: 0+1200121d0 +0 SECTION LOCAL +DEFAULT +13 
+ +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+ +0 SECTION LOCAL +DEFAULT +16 
- +17: 0+ +0 SECTION LOCAL +DEFAULT +17 
- +18: 0+ +0 SECTION LOCAL +DEFAULT +18 
- +19: 0+20 +0 TLS +LOCAL +DEFAULT +9 sl1
- +20: 0+24 +0 TLS +LOCAL +DEFAULT +9 sl2
- +21: 0+28 +0 TLS +LOCAL +DEFAULT +9 sl3
- +22: 0+2c +0 TLS +LOCAL +DEFAULT +9 sl4
- +23: 0+30 +0 TLS +LOCAL +DEFAULT +9 sl5
- +24: 0+34 +0 TLS +LOCAL +DEFAULT +9 sl6
- +25: 0+38 +0 TLS +LOCAL +DEFAULT +9 sl7
- +26: 0+3c +0 TLS +LOCAL +DEFAULT +9 sl8
- +27: 0+80 +0 TLS +LOCAL +DEFAULT +10 bl1
- +28: 0+84 +0 TLS +LOCAL +DEFAULT +10 bl2
- +29: 0+88 +0 TLS +LOCAL +DEFAULT +10 bl3
- +30: 0+8c +0 TLS +LOCAL +DEFAULT +10 bl4
- +31: 0+90 +0 TLS +LOCAL +DEFAULT +10 bl5
- +32: 0+94 +0 TLS +LOCAL +DEFAULT +10 bl6
- +33: 0+98 +0 TLS +LOCAL +DEFAULT +10 bl7
- +34: 0+9c +0 TLS +LOCAL +DEFAULT +10 bl8
- +35: 0+1c +0 TLS +GLOBAL DEFAULT +9 sg8
- +36: 0+7c +0 TLS +GLOBAL DEFAULT +10 bg8
- +37: 0+74 +0 TLS +GLOBAL DEFAULT +10 bg6
- +38: 0+68 +0 TLS +GLOBAL DEFAULT +10 bg3
- +39: 0+120012060 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
- +40: 0+8 +0 TLS +GLOBAL DEFAULT +9 sg3
- +41: 0+48 +0 TLS +GLOBAL HIDDEN +9 sh3
- +42: 0+ +0 TLS +GLOBAL DEFAULT +UND sG2
- +43: 0+c +0 TLS +GLOBAL DEFAULT +9 sg4
- +44: 0+10 +0 TLS +GLOBAL DEFAULT +9 sg5
- +45: 0+1200121a0 +0 OBJECT +GLOBAL DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
- +46: 0+70 +0 TLS +GLOBAL DEFAULT +10 bg5
- +47: 0+1200121c0 +4 FUNC +GLOBAL DEFAULT +UND __tls_get_addr
- +48: 0+58 +0 TLS +GLOBAL HIDDEN +9 sh7
- +49: 0+5c +0 TLS +GLOBAL HIDDEN +9 sh8
- +50: 0+ +0 TLS +GLOBAL DEFAULT +9 sg1
- +51: 0+120001088 +52 FUNC +GLOBAL DEFAULT +7 _start
- +52: 0+4c +0 TLS +GLOBAL HIDDEN +9 sh4
- +53: 0+78 +0 TLS +GLOBAL DEFAULT +10 bg7
- +54: 0+50 +0 TLS +GLOBAL HIDDEN +9 sh5
- +55: 0+120012228 +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
- +56: 0+120001000 +136 FUNC +GLOBAL DEFAULT +7 fn2
- +57: 0+4 +0 TLS +GLOBAL DEFAULT +9 sg2
- +58: 0+ +0 TLS +GLOBAL DEFAULT +UND sG1
- +59: 0+40 +0 TLS +GLOBAL HIDDEN +9 sh1
- +60: 0+14 +0 TLS +GLOBAL DEFAULT +9 sg6
- +61: 0+18 +0 TLS +GLOBAL DEFAULT +9 sg7
- +62: 0+120012228 +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
- +63: 0+1200121d0 +0 OBJECT +GLOBAL DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
- +64: 0+120012228 +0 NOTYPE +GLOBAL DEFAULT +ABS _end
- +65: 0+44 +0 TLS +GLOBAL HIDDEN +9 sh2
- +66: 0+54 +0 TLS +GLOBAL HIDDEN +9 sh6
- +67: 0+64 +0 TLS +GLOBAL DEFAULT +10 bg2
- +68: 0+60 +0 TLS +GLOBAL DEFAULT +10 bg1
- +69: 0+6c +0 TLS +GLOBAL DEFAULT +10 bg4
+ +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
diff --git a/ld/testsuite/ld-alpha/tlsbin.sd b/ld/testsuite/ld-alpha/tlsbin.sd
index bca40152f5d..765bfe1088c 100644
--- a/ld/testsuite/ld-alpha/tlsbin.sd
+++ b/ld/testsuite/ld-alpha/tlsbin.sd
@@ -9,9 +9,9 @@
 .*: +file format elf64-alpha
 
 Contents of section .got:
- 1?200121d0 00000000 00000000 c0210120 01000000  .*
- 1?200121e0 56000000 00000000 00000000 00000000  .*
- 1?200121f0 00000000 00000000 01000000 00000000  .*
- 1?20012200 00000000 00000000 01000000 00000000  .*
- 1?20012210 24000000 00000000 90000000 00000000  .*
- 1?20012220 98000000 00000000                    .*
+ [0-9a-f]+ 00000000 00000000 e8210120 01000000  .*
+ [0-9a-f]+ 56000000 00000000 00000000 00000000  .*
+ [0-9a-f]+ 00000000 00000000 01000000 00000000  .*
+ [0-9a-f]+ 00000000 00000000 01000000 00000000  .*
+ [0-9a-f]+ 24000000 00000000 90000000 00000000  .*
+ [0-9a-f]+ 98000000 00000000                    .*
diff --git a/ld/testsuite/ld-alpha/tlsbinr.dd b/ld/testsuite/ld-alpha/tlsbinr.dd
index 6bba77d30b6..a58d96fb5ed 100644
--- a/ld/testsuite/ld-alpha/tlsbinr.dd
+++ b/ld/testsuite/ld-alpha/tlsbinr.dd
@@ -12,7 +12,7 @@ Disassembly of section \.text:
 
 0+120001000 <fn2>:
    120001000:	02 00 bb 27 	ldah	gp,2\(t12\)
-   120001004:	a0 91 bd 23 	lda	gp,-28256\(gp\)
+   120001004:	c8 91 bd 23 	lda	gp,-28216\(gp\)
    120001008:	3e 15 c2 43 	subq	sp,0x10,sp
    12000100c:	00 00 5e b7 	stq	ra,0\(sp\)
    120001010:	08 80 1d a6 	ldq	a0,-32760\(gp\)
diff --git a/ld/testsuite/ld-alpha/tlsbinr.rd b/ld/testsuite/ld-alpha/tlsbinr.rd
index 1ba3dbb5b94..9b96914b312 100644
--- a/ld/testsuite/ld-alpha/tlsbinr.rd
+++ b/ld/testsuite/ld-alpha/tlsbinr.rd
@@ -6,7 +6,7 @@
 #readelf: -WSsrl
 #target: alpha*-*-*
 
-There are 19 section headers, starting at offset 0x[0-9a-f]+:
+There are [0-9]+ section headers, starting at offset 0x[0-9a-f]+:
 
 Section Headers:
  +\[Nr\] Name +Type +Address +Off +Size +ES Flg Lk Inf Al
@@ -17,18 +17,19 @@ Section Headers:
  +\[ 4\] .dynstr +.*
  +\[ 5\] .rela.dyn +.*
  +\[ 6\] .rela.plt +.*
- +\[ 7\] .text +PROGBITS +0+120001000 0+1000 0+bc 0+ +AX +0 +0 4096
+ +\[ 7\] .text +PROGBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 0+ +AX +0 +0 4096
  +\[ 8\] .data +.*
- +\[ 9\] .tdata +PROGBITS +0+120012000 0+2000 0+60 0+ WAT +0 +0 +4
- +\[10\] .tbss +NOBITS +0+120012060 0+2060 0+40 0+ WAT +0 +0 +1
- +\[11\] .dynamic +DYNAMIC +0+120012060 0+2060 0+140 10 +WA +4 +0 +8
- +\[12\] .plt +PROGBITS +0+1200121a0 0+21a0 0+ 0+ WAX +0 +0 +8
- +\[13\] .got +PROGBITS +0+1200121a0 0+21a0 0+10 0+ +WA +0 +0 +8
- +\[14\] .sbss +.*
- +\[15\] .bss +.*
- +\[16\] .shstrtab +.*
- +\[17\] .symtab +.*
- +\[18\] .strtab +.*
+ +\[ 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\] .eh_frame +PROGBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 00 +A +0 +0 +8
+ +\[12\] .dynamic +DYNAMIC +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 10 +WA +4 +0 +8
+ +\[13\] .plt +PROGBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 0+ WAX +0 +0 +8
+ +\[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 +.*
 #...
 
 Elf file type is EXEC \(Executable file\)
@@ -37,102 +38,103 @@ There are 6 program headers, starting at offset [0-9]+
 
 Program Headers:
  +Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align
- +PHDR +0x0+40 0x0+120000040 0x0+120000040 0x0+150 0x0+150 R E 0x8
- +INTERP +0x0+190 0x0+120000190 0x0+120000190 0x[0-9a-f]+ 0x[0-9a-f]+ R +0x1
+ +PHDR +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ R E 0x8
+ +INTERP +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ R +0x1
 .*Requesting program interpreter.*
- +LOAD +0x0+ 0x0+120000000 0x0+120000000 0x0+10bc 0x0+10bc R E 0x10000
- +LOAD +0x0+2000 0x0+120012000 0x0+120012000 0x0+1b0 0x0+1b0 RWE 0x10000
- +DYNAMIC +0x0+2060 0x0+120012060 0x0+120012060 0x0+140 0x0+140 RW +0x8
- +TLS +0x0+2000 0x0+120012000 0x0+120012000 0x0+60 0x0+a0 R +0x4
+ +LOAD +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ R E 0x10000
+ +LOAD +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RWE 0x10000
+ +DYNAMIC +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RW +0x8
+ +TLS +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ R +0x4
 #...
 
 Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 2 entries:
  +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
-0+1200121a0 +0+200000026 R_ALPHA_TPREL64 +0+ sG2 \+ 0
-0+1200121a8 +0+600000026 R_ALPHA_TPREL64 +0+ sG1 \+ 0
+[0-9a-f]+ +0+200000026 R_ALPHA_TPREL64 +0+ sG2 \+ 0
+[0-9a-f]+ +0+600000026 R_ALPHA_TPREL64 +0+ sG1 \+ 0
 
 Symbol table '.dynsym' contains 10 entries:
  +Num: +Value +Size Type +Bind +Vis +Ndx Name
  +0: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND 
- +1: 0+120012060 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
+ +1: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
  +2: 0+ +0 TLS +GLOBAL DEFAULT +UND sG2
- +3: 0+1200121a0 +0 OBJECT +GLOBAL DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
+ +3: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
  +4: 0+ +4 FUNC +GLOBAL DEFAULT +UND __tls_get_addr
- +5: 0+1200121b0 +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+ +5: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
  +6: 0+ +0 TLS +GLOBAL DEFAULT +UND sG1
- +7: 0+1200121b0 +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
- +8: 0+1200121a0 +0 OBJECT +GLOBAL DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
- +9: 0+1200121b0 +0 NOTYPE +GLOBAL DEFAULT +ABS _end
+ +7: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
+ +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 70 entries:
+Symbol table '.symtab' contains 71 entries:
  +Num: +Value +Size Type +Bind +Vis +Ndx Name
- +0: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND 
+ +0: [0-9a-f]+ +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+120001000 +0 SECTION LOCAL +DEFAULT +7 
- +8: 0+120012000 +0 SECTION LOCAL +DEFAULT +8 
- +9: 0+120012000 +0 SECTION LOCAL +DEFAULT +9 
- +10: 0+120012060 +0 SECTION LOCAL +DEFAULT +10 
- +11: 0+120012060 +0 SECTION LOCAL +DEFAULT +11 
- +12: 0+1200121a0 +0 SECTION LOCAL +DEFAULT +12 
- +13: 0+1200121a0 +0 SECTION LOCAL +DEFAULT +13 
+ +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+ +0 SECTION LOCAL +DEFAULT +16 
- +17: 0+ +0 SECTION LOCAL +DEFAULT +17 
- +18: 0+ +0 SECTION LOCAL +DEFAULT +18 
- +19: 0+20 +0 TLS +LOCAL +DEFAULT +9 sl1
- +20: 0+24 +0 TLS +LOCAL +DEFAULT +9 sl2
- +21: 0+28 +0 TLS +LOCAL +DEFAULT +9 sl3
- +22: 0+2c +0 TLS +LOCAL +DEFAULT +9 sl4
- +23: 0+30 +0 TLS +LOCAL +DEFAULT +9 sl5
- +24: 0+34 +0 TLS +LOCAL +DEFAULT +9 sl6
- +25: 0+38 +0 TLS +LOCAL +DEFAULT +9 sl7
- +26: 0+3c +0 TLS +LOCAL +DEFAULT +9 sl8
- +27: 0+80 +0 TLS +LOCAL +DEFAULT +10 bl1
- +28: 0+84 +0 TLS +LOCAL +DEFAULT +10 bl2
- +29: 0+88 +0 TLS +LOCAL +DEFAULT +10 bl3
- +30: 0+8c +0 TLS +LOCAL +DEFAULT +10 bl4
- +31: 0+90 +0 TLS +LOCAL +DEFAULT +10 bl5
- +32: 0+94 +0 TLS +LOCAL +DEFAULT +10 bl6
- +33: 0+98 +0 TLS +LOCAL +DEFAULT +10 bl7
- +34: 0+9c +0 TLS +LOCAL +DEFAULT +10 bl8
- +35: 0+1c +0 TLS +GLOBAL DEFAULT +9 sg8
- +36: 0+7c +0 TLS +GLOBAL DEFAULT +10 bg8
- +37: 0+74 +0 TLS +GLOBAL DEFAULT +10 bg6
- +38: 0+68 +0 TLS +GLOBAL DEFAULT +10 bg3
- +39: 0+120012060 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
- +40: 0+8 +0 TLS +GLOBAL DEFAULT +9 sg3
- +41: 0+48 +0 TLS +GLOBAL HIDDEN +9 sh3
- +42: 0+ +0 TLS +GLOBAL DEFAULT +UND sG2
- +43: 0+c +0 TLS +GLOBAL DEFAULT +9 sg4
- +44: 0+10 +0 TLS +GLOBAL DEFAULT +9 sg5
- +45: 0+1200121a0 +0 OBJECT +GLOBAL DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
- +46: 0+70 +0 TLS +GLOBAL DEFAULT +10 bg5
- +47: 0+ +4 FUNC +GLOBAL DEFAULT +UND __tls_get_addr
- +48: 0+58 +0 TLS +GLOBAL HIDDEN +9 sh7
- +49: 0+5c +0 TLS +GLOBAL HIDDEN +9 sh8
- +50: 0+ +0 TLS +GLOBAL DEFAULT +9 sg1
- +51: 0+120001088 +52 FUNC +GLOBAL DEFAULT +7 _start
- +52: 0+4c +0 TLS +GLOBAL HIDDEN +9 sh4
- +53: 0+78 +0 TLS +GLOBAL DEFAULT +10 bg7
- +54: 0+50 +0 TLS +GLOBAL HIDDEN +9 sh5
- +55: 0+1200121b0 +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
- +56: 0+120001000 +136 FUNC +GLOBAL DEFAULT +7 fn2
- +57: 0+4 +0 TLS +GLOBAL DEFAULT +9 sg2
- +58: 0+ +0 TLS +GLOBAL DEFAULT +UND sG1
- +59: 0+40 +0 TLS +GLOBAL HIDDEN +9 sh1
- +60: 0+14 +0 TLS +GLOBAL DEFAULT +9 sg6
- +61: 0+18 +0 TLS +GLOBAL DEFAULT +9 sg7
- +62: 0+1200121b0 +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
- +63: 0+1200121a0 +0 OBJECT +GLOBAL DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
- +64: 0+1200121b0 +0 NOTYPE +GLOBAL DEFAULT +ABS _end
- +65: 0+44 +0 TLS +GLOBAL HIDDEN +9 sh2
- +66: 0+54 +0 TLS +GLOBAL HIDDEN +9 sh6
- +67: 0+64 +0 TLS +GLOBAL DEFAULT +10 bg2
- +68: 0+60 +0 TLS +GLOBAL DEFAULT +10 bg1
- +69: 0+6c +0 TLS +GLOBAL DEFAULT +10 bg4
+ +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
diff --git a/ld/testsuite/ld-alpha/tlsbinr.sd b/ld/testsuite/ld-alpha/tlsbinr.sd
index 7a8d6b2777a..59e9449de2a 100644
--- a/ld/testsuite/ld-alpha/tlsbinr.sd
+++ b/ld/testsuite/ld-alpha/tlsbinr.sd
@@ -9,4 +9,4 @@
 .*: +file format elf64-alpha
 
 Contents of section .got:
- 1?200121a0 00000000 00000000 00000000 00000000  .*
+ [0-9a-f]+ 00000000 00000000 00000000 00000000  .*
diff --git a/ld/testsuite/ld-alpha/tlspic.dd b/ld/testsuite/ld-alpha/tlspic.dd
index 0af92f94b1c..2f0a0bdbfc3 100644
--- a/ld/testsuite/ld-alpha/tlspic.dd
+++ b/ld/testsuite/ld-alpha/tlspic.dd
@@ -12,7 +12,7 @@ Disassembly of section .text:
 
 0+1000 <fn1>:
     1000:	02 00 bb 27 	ldah	gp,2\(t12\)
-    1004:	c0 91 bd 23 	lda	gp,-28224\(gp\)
+    1004:	e8 91 bd 23 	lda	gp,-28184\(gp\)
     1008:	3e 15 c2 43 	subq	sp,0x10,sp
     100c:	00 00 5e b7 	stq	ra,0\(sp\)
     1010:	08 00 3e b5 	stq	s0,8\(sp\)
@@ -22,23 +22,23 @@ Disassembly of section .text:
     1020:	00 80 7d a7 	ldq	t12,-32768\(gp\)
     1024:	00 40 5b 6b 	jsr	ra,\(t12\),1028 <.*>
     1028:	02 00 ba 27 	ldah	gp,2\(ra\)
-    102c:	98 91 bd 23 	lda	gp,-28264\(gp\)
+    102c:	c0 91 bd 23 	lda	gp,-28224\(gp\)
     1030:	30 80 1d 22 	lda	a0,-32720\(gp\)
     1034:	00 80 7d a7 	ldq	t12,-32768\(gp\)
     1038:	00 40 5b 6b 	jsr	ra,\(t12\),103c <.*>
     103c:	02 00 ba 27 	ldah	gp,2\(ra\)
-    1040:	84 91 bd 23 	lda	gp,-28284\(gp\)
+    1040:	ac 91 bd 23 	lda	gp,-28244\(gp\)
     1044:	40 80 1d 22 	lda	a0,-32704\(gp\)
     1048:	00 80 7d a7 	ldq	t12,-32768\(gp\)
     104c:	00 40 5b 6b 	jsr	ra,\(t12\),1050 <.*>
     1050:	02 00 ba 27 	ldah	gp,2\(ra\)
-    1054:	70 91 bd 23 	lda	gp,-28304\(gp\)
+    1054:	98 91 bd 23 	lda	gp,-28264\(gp\)
     1058:	21 00 20 20 	lda	t0,33\(v0\)
     105c:	40 80 1d 22 	lda	a0,-32704\(gp\)
     1060:	00 80 7d a7 	ldq	t12,-32768\(gp\)
     1064:	00 40 5b 6b 	jsr	ra,\(t12\),1068 <.*>
     1068:	02 00 ba 27 	ldah	gp,2\(ra\)
-    106c:	58 91 bd 23 	lda	gp,-28328\(gp\)
+    106c:	80 91 bd 23 	lda	gp,-28288\(gp\)
     1070:	40 00 20 20 	lda	t0,64\(v0\)
     1074:	62 00 20 20 	lda	t0,98\(v0\)
     1078:	00 00 20 24 	ldah	t0,0\(v0\)
diff --git a/ld/testsuite/ld-alpha/tlspic.rd b/ld/testsuite/ld-alpha/tlspic.rd
index d0250dde1a6..8c4a9a3e5b3 100644
--- a/ld/testsuite/ld-alpha/tlspic.rd
+++ b/ld/testsuite/ld-alpha/tlspic.rd
@@ -6,7 +6,7 @@
 #readelf: -WSsrl
 #target: alpha*-*-*
 
-There are 18 section headers, starting at offset 0x[0-9a-f]+:
+There are [0-9]* section headers, starting at offset 0x[0-9a-f]+:
 
 Section Headers:
  +\[Nr\] Name +Type +Address +Off +Size +ES Flg Lk Inf Al
@@ -18,16 +18,17 @@ Section Headers:
  +\[ 5\] .rela.plt +.*
  +\[ 6\] .text +PROGBITS +0+1000 0+1000 0+ac 0+ +AX +0 +0 4096
  +\[ 7\] .data +.*
- +\[ 8\] .tdata +PROGBITS +0+12000 0+2000 0+60 0+ WAT +0 +0 +4
- +\[ 9\] .tbss +NOBITS +0+12060 0+2060 0+20 0+ WAT +0 +0 +1
- +\[10\] .dynamic +DYNAMIC +0+12060 0+2060 0+130 10 +WA +3 +0 +8
- +\[11\] .plt +.*
- +\[12\] .got +PROGBITS +0+121c0 0+21c0 0+58 0+ +WA +0 +0 +8
- +\[13\] .sbss +.*
- +\[14\] .bss +.*
- +\[15\] .shstrtab +.*
- +\[16\] .symtab +.*
- +\[17\] .strtab +.*
+ +\[ 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\] .eh_frame +PROGBITS +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 00 +A +0 +0 +8
+ +\[11\] .dynamic +DYNAMIC +[0-9a-f]+ [0-9a-f]+ [0-9a-f]+ 10 +WA +3 +0 +8
+ +\[12\] .plt +.*
+ +\[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 +.*
 #...
 
 Elf file type is DYN \(Shared object file\)
@@ -36,117 +37,119 @@ 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+10ac 0x0+10ac R E 0x10000
- +LOAD +0x0+2000 0x0+12000 0x0+12000 0x0+218 0x0+218 RWE 0x10000
- +DYNAMIC +0x0+2060 0x0+12060 0x0+12060 0x0+130 0x0+130 RW +0x8
+ +LOAD +0x0+ 0x0+ 0x0+ 0x[0-9a-f]+ 0x[0-9a-f]+ R E 0x10000
+ +LOAD +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RWE 0x10000
+ +DYNAMIC +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ RW +0x8
  +TLS +0x0+2000 0x0+12000 0x0+12000 0x0+60 0x0+80 R +0x4
 #...
 
 Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 7 entries:
  +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
-0+121c8 +0+160000001f R_ALPHA_DTPMOD64 +0+ sg1 \+ 0
-0+121d0 +0+1600000021 R_ALPHA_DTPREL64 +0+ sg1 \+ 0
-0+121e0 +0+1900000026 R_ALPHA_TPREL64 +0+4 sg2 \+ 0
-0+121e8 +0+26 R_ALPHA_TPREL64 +0+44
-0+121f0 +0+1f R_ALPHA_DTPMOD64 +0+
-0+12200 +0+1f R_ALPHA_DTPMOD64 +0+
-0+12210 +0+26 R_ALPHA_TPREL64 +0+24
+[0-9a-f]+ +[0-9a-f]+ R_ALPHA_DTPMOD64 +0+ sg1 \+ 0
+[0-9a-f]+ +[0-9a-f]+ R_ALPHA_DTPREL64 +0+ sg1 \+ 0
+[0-9a-f]+ +[0-9a-f]+ R_ALPHA_TPREL64 +0+4 sg2 \+ 0
+[0-9a-f]+ +[0-9a-f]+ R_ALPHA_TPREL64 +0+44
+[0-9a-f]+ +[0-9a-f]+ R_ALPHA_DTPMOD64 +0+
+[0-9a-f]+ +[0-9a-f]+ R_ALPHA_DTPMOD64 +0+
+[0-9a-f]+ +[0-9a-f]+ R_ALPHA_TPREL64 +0+24
 
 Relocation section '.rela.plt' at offset 0x[0-9a-f]+ contains 1 entries:
  +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
-0+121c0 +0+150000001a R_ALPHA_JMP_SLOT +0+ __tls_get_addr \+ 0
+[0-9a-f]+ +[0-9a-f]+ R_ALPHA_JMP_SLOT +0+ __tls_get_addr \+ 0
 
-Symbol table '.dynsym' contains 31 entries:
+Symbol table '.dynsym' contains [0-9]+ entries:
    Num:    Value          Size Type    Bind   Vis      Ndx Name
-     0: 0+     0 NOTYPE  LOCAL  DEFAULT  UND 
-     1: 0+120     0 SECTION LOCAL  DEFAULT    1 
-     2: 0+2b0     0 SECTION LOCAL  DEFAULT    2 
-     3: 0+598     0 SECTION LOCAL  DEFAULT    3 
-     4: 0+620     0 SECTION LOCAL  DEFAULT    4 
-     5: 0+6c8     0 SECTION LOCAL  DEFAULT    5 
-     6: 0+1000     0 SECTION LOCAL  DEFAULT    6 
-     7: 0+12000     0 SECTION LOCAL  DEFAULT    7 
-     8: 0+12000     0 SECTION LOCAL  DEFAULT    8 
-     9: 0+12060     0 SECTION LOCAL  DEFAULT    9 
-    10: 0+12060     0 SECTION LOCAL  DEFAULT   10 
-    11: 0+12190     0 SECTION LOCAL  DEFAULT   11 
-    12: 0+121c0     0 SECTION LOCAL  DEFAULT   12 
-    13: 0+12218     0 SECTION LOCAL  DEFAULT   13 
-    14: 0+12218     0 SECTION LOCAL  DEFAULT   14 
-    15: 0+1c     0 TLS     GLOBAL DEFAULT    8 sg8
-    16: 0+12060     0 OBJECT  GLOBAL DEFAULT  ABS _DYNAMIC
-    17: 0+8     0 TLS     GLOBAL DEFAULT    8 sg3
-    18: 0+c     0 TLS     GLOBAL DEFAULT    8 sg4
-    19: 0+10     0 TLS     GLOBAL DEFAULT    8 sg5
-    20: 0+12190     0 OBJECT  GLOBAL DEFAULT  ABS _PROCEDURE_LINKAGE_TABLE_
-    21: 0+     0 NOTYPE  GLOBAL DEFAULT  UND __tls_get_addr
-    22: 0+     0 TLS     GLOBAL DEFAULT    8 sg1
-    23: 0+1000   172 FUNC    GLOBAL DEFAULT    6 fn1
-    24: 0+12218     0 NOTYPE  GLOBAL DEFAULT  ABS __bss_start
-    25: 0+4     0 TLS     GLOBAL DEFAULT    8 sg2
-    26: 0+14     0 TLS     GLOBAL DEFAULT    8 sg6
-    27: 0+18     0 TLS     GLOBAL DEFAULT    8 sg7
-    28: 0+12218     0 NOTYPE  GLOBAL DEFAULT  ABS _edata
-    29: 0+121c0     0 OBJECT  GLOBAL DEFAULT  ABS _GLOBAL_OFFSET_TABLE_
-    30: 0+12218     0 NOTYPE  GLOBAL DEFAULT  ABS _end
+     0: [0-9a-f]+     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 TLS     GLOBAL DEFAULT    8 sg8
+    17: [0-9a-f]+     0 OBJECT  GLOBAL DEFAULT  ABS _DYNAMIC
+    18: [0-9a-f]+     0 TLS     GLOBAL DEFAULT    8 sg3
+    19: [0-9a-f]+     0 TLS     GLOBAL DEFAULT    8 sg4
+    20: [0-9a-f]+     0 TLS     GLOBAL DEFAULT    8 sg5
+    21: [0-9a-f]+     0 OBJECT  GLOBAL DEFAULT  ABS _PROCEDURE_LINKAGE_TABLE_
+    22: [0-9a-f]+     0 NOTYPE  GLOBAL DEFAULT  UND __tls_get_addr
+    23: [0-9a-f]+     0 TLS     GLOBAL DEFAULT    8 sg1
+    24: [0-9a-f]+   172 FUNC    GLOBAL DEFAULT    6 fn1
+    25: [0-9a-f]+     0 NOTYPE  GLOBAL DEFAULT  ABS __bss_start
+    26: [0-9a-f]+     0 TLS     GLOBAL DEFAULT    8 sg2
+    27: [0-9a-f]+     0 TLS     GLOBAL DEFAULT    8 sg6
+    28: [0-9a-f]+     0 TLS     GLOBAL DEFAULT    8 sg7
+    29: [0-9a-f]+     0 NOTYPE  GLOBAL DEFAULT  ABS _edata
+    30: [0-9a-f]+     0 OBJECT  GLOBAL DEFAULT  ABS _GLOBAL_OFFSET_TABLE_
+    31: [0-9a-f]+     0 NOTYPE  GLOBAL DEFAULT  ABS _end
 
-Symbol table '.symtab' contains 58 entries:
+Symbol table '.symtab' contains [0-9]+ entries:
  +Num: +Value +Size Type +Bind +Vis +Ndx Name
- +0: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND 
- +1: 0+[0-9a-f]+ +0 SECTION LOCAL +DEFAULT +1 
- +2: 0+[0-9a-f]+ +0 SECTION LOCAL +DEFAULT +2 
- +3: 0+[0-9a-f]+ +0 SECTION LOCAL +DEFAULT +3 
- +4: 0+[0-9a-f]+ +0 SECTION LOCAL +DEFAULT +4 
- +5: 0+[0-9a-f]+ +0 SECTION LOCAL +DEFAULT +5 
- +6: 0+1000 +0 SECTION LOCAL +DEFAULT +6 
- +7: 0+12000 +0 SECTION LOCAL +DEFAULT +7 
- +8: 0+12000 +0 SECTION LOCAL +DEFAULT +8 
- +9: 0+12060 +0 SECTION LOCAL +DEFAULT +9 
- +10: 0+12060 +0 SECTION LOCAL +DEFAULT +10 
- +11: 0+12190 +0 SECTION LOCAL +DEFAULT +11 
- +12: 0+121c0 +0 SECTION LOCAL +DEFAULT +12 
- +13: 0+[0-9a-f]+ +0 SECTION LOCAL +DEFAULT +13 
- +14: 0+[0-9a-f]+ +0 SECTION LOCAL +DEFAULT +14 
- +15: 0+ +0 SECTION LOCAL +DEFAULT +15 
- +16: 0+ +0 SECTION LOCAL +DEFAULT +16 
- +17: 0+ +0 SECTION LOCAL +DEFAULT +17 
- +18: 0+20 +0 TLS +LOCAL +DEFAULT +8 sl1
- +19: 0+24 +0 TLS +LOCAL +DEFAULT +8 sl2
- +20: 0+28 +0 TLS +LOCAL +DEFAULT +8 sl3
- +21: 0+2c +0 TLS +LOCAL +DEFAULT +8 sl4
- +22: 0+30 +0 TLS +LOCAL +DEFAULT +8 sl5
- +23: 0+34 +0 TLS +LOCAL +DEFAULT +8 sl6
- +24: 0+38 +0 TLS +LOCAL +DEFAULT +8 sl7
- +25: 0+3c +0 TLS +LOCAL +DEFAULT +8 sl8
- +26: 0+60 +0 TLS +LOCAL +HIDDEN +9 sH1
- +27: 0+48 +0 TLS +LOCAL +HIDDEN +8 sh3
- +28: 0+64 +0 TLS +LOCAL +HIDDEN +9 sH2
- +29: 0+78 +0 TLS +LOCAL +HIDDEN +9 sH7
- +30: 0+58 +0 TLS +LOCAL +HIDDEN +8 sh7
- +31: 0+5c +0 TLS +LOCAL +HIDDEN +8 sh8
- +32: 0+6c +0 TLS +LOCAL +HIDDEN +9 sH4
- +33: 0+4c +0 TLS +LOCAL +HIDDEN +8 sh4
- +34: 0+68 +0 TLS +LOCAL +HIDDEN +9 sH3
- +35: 0+50 +0 TLS +LOCAL +HIDDEN +8 sh5
- +36: 0+70 +0 TLS +LOCAL +HIDDEN +9 sH5
- +37: 0+74 +0 TLS +LOCAL +HIDDEN +9 sH6
- +38: 0+7c +0 TLS +LOCAL +HIDDEN +9 sH8
- +39: 0+40 +0 TLS +LOCAL +HIDDEN +8 sh1
- +40: 0+44 +0 TLS +LOCAL +HIDDEN +8 sh2
- +41: 0+54 +0 TLS +LOCAL +HIDDEN +8 sh6
- +42: 0+1c +0 TLS +GLOBAL DEFAULT +8 sg8
- +43: 0+12060 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
- +44: 0+8 +0 TLS +GLOBAL DEFAULT +8 sg3
- +45: 0+c +0 TLS +GLOBAL DEFAULT +8 sg4
- +46: 0+10 +0 TLS +GLOBAL DEFAULT +8 sg5
- +47: 0+12190 +0 OBJECT +GLOBAL DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
- +48: 0+ +0 NOTYPE +GLOBAL DEFAULT +UND __tls_get_addr
- +49: 0+ +0 TLS +GLOBAL DEFAULT +8 sg1
- +50: 0+1000 +172 FUNC +GLOBAL DEFAULT +6 fn1
- +51: 0+[0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
- +52: 0+4 +0 TLS +GLOBAL DEFAULT +8 sg2
- +53: 0+14 +0 TLS +GLOBAL DEFAULT +8 sg6
- +54: 0+18 +0 TLS +GLOBAL DEFAULT +8 sg7
- +55: 0+[0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
- +56: 0+121c0 +0 OBJECT +GLOBAL DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
- +57: 0+[0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
+ +0: [0-9a-f]+ +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 TLS +LOCAL +DEFAULT +8 sl1
+ +20: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +8 sl2
+ +21: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +8 sl3
+ +22: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +8 sl4
+ +23: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +8 sl5
+ +24: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +8 sl6
+ +25: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +8 sl7
+ +26: [0-9a-f]+ +0 TLS +LOCAL +DEFAULT +8 sl8
+ +27: [0-9a-f]+ +0 TLS +LOCAL +HIDDEN +9 sH1
+ +28: [0-9a-f]+ +0 TLS +LOCAL +HIDDEN +8 sh3
+ +29: [0-9a-f]+ +0 TLS +LOCAL +HIDDEN +9 sH2
+ +30: [0-9a-f]+ +0 TLS +LOCAL +HIDDEN +9 sH7
+ +31: [0-9a-f]+ +0 TLS +LOCAL +HIDDEN +8 sh7
+ +32: [0-9a-f]+ +0 TLS +LOCAL +HIDDEN +8 sh8
+ +33: [0-9a-f]+ +0 TLS +LOCAL +HIDDEN +9 sH4
+ +34: [0-9a-f]+ +0 TLS +LOCAL +HIDDEN +8 sh4
+ +35: [0-9a-f]+ +0 TLS +LOCAL +HIDDEN +9 sH3
+ +36: [0-9a-f]+ +0 TLS +LOCAL +HIDDEN +8 sh5
+ +37: [0-9a-f]+ +0 TLS +LOCAL +HIDDEN +9 sH5
+ +38: [0-9a-f]+ +0 TLS +LOCAL +HIDDEN +9 sH6
+ +39: [0-9a-f]+ +0 TLS +LOCAL +HIDDEN +9 sH8
+ +40: [0-9a-f]+ +0 TLS +LOCAL +HIDDEN +8 sh1
+ +41: [0-9a-f]+ +0 TLS +LOCAL +HIDDEN +8 sh2
+ +42: [0-9a-f]+ +0 TLS +LOCAL +HIDDEN +8 sh6
+ +43: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +8 sg8
+ +44: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
+ +45: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +8 sg3
+ +46: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +8 sg4
+ +47: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +8 sg5
+ +48: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _PROCEDURE_LINKAGE_TABLE_
+ +49: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +UND __tls_get_addr
+ +50: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +8 sg1
+ +51: [0-9a-f]+ +172 FUNC +GLOBAL DEFAULT +6 fn1
+ +52: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS __bss_start
+ +53: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +8 sg2
+ +54: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +8 sg6
+ +55: [0-9a-f]+ +0 TLS +GLOBAL DEFAULT +8 sg7
+ +56: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
+ +57: [0-9a-f]+ +0 OBJECT +GLOBAL DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
+ +58: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
diff --git a/ld/testsuite/ld-alpha/tlspic.sd b/ld/testsuite/ld-alpha/tlspic.sd
index 23a0857cbda..987e428be07 100644
--- a/ld/testsuite/ld-alpha/tlspic.sd
+++ b/ld/testsuite/ld-alpha/tlspic.sd
@@ -9,9 +9,9 @@
 .*: +file format elf64-alpha
 
 Contents of section .got:
- 121c0 b0210100 00000000 00000000 00000000  .*
- 121d0 00000000 00000000 71000000 00000000  .*
- 121e0 00000000 00000000 00000000 00000000  .*
- 121f0 00000000 00000000 44000000 00000000  .*
- 12200 00000000 00000000 00000000 00000000  .*
- 12210 00000000 00000000                    .*
+ 121e8 d8210100 00000000 00000000 00000000  .*
+ 121f8 00000000 00000000 71000000 00000000  .*
+ 12208 00000000 00000000 00000000 00000000  .*
+ 12218 00000000 00000000 44000000 00000000  .*
+ 12228 00000000 00000000 00000000 00000000  .*
+ 12238 00000000 00000000                    .*