gas/

2003-04-30  H.J. Lu <hjl@gnu.org>

	* config/tc-ia64.c (md_section_align): Deleted.

	* config/tc-ia64.h (SUB_SEGMENT_ALIGN): New.
	(md_section_align): New.

gas/testsuite/

2003-04-29  H.J. Lu <hjl@gnu.org>

	* gas/ia64/ia64.exp: Add align.

	* gas/ia64/align.d: New file.
	* gas/ia64/align.s: Likewise.

	* ia64/dependency-1.d: Remove the padding.

ld/testsuite/

2003-04-29  H.J. Lu <hjl@gnu.org>

	* ld-ia64/tlsbin.dd: Updated.
	* ld-ia64/tlsbin.rd: Likewise.
	* ld-ia64/tlsbin.sd: Likewise.
	* ld-ia64/tlsbin.td: Likewise.
	* ld-ia64/tlspic.rd: Likewise.
	* ld-ia64/tlspic.sd: Likewise.
	* ld-ia64/tlspic.td: Likewise.

8 files changed, 92 insertions, 83 deletions

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 4bafd34..e163cd2 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,13 @@
+2003-04-29  H.J. Lu <hjl@gnu.org>
+
+	* ld-ia64/tlsbin.dd: Updated.
+	* ld-ia64/tlsbin.rd: Likewise.
+	* ld-ia64/tlsbin.sd: Likewise.
+	* ld-ia64/tlsbin.td: Likewise.
+	* ld-ia64/tlspic.rd: Likewise.
+	* ld-ia64/tlspic.sd: Likewise.
+	* ld-ia64/tlspic.td: Likewise.
+
 2003-04-29  J"orn Rennecke <joern.rennecke@superh.com>
 
 	* ld-selective/3.cc (start): New function.
diff --git a/ld/testsuite/ld-ia64/tlsbin.dd b/ld/testsuite/ld-ia64/tlsbin.dd
index 1778116..aa395e9 100644
--- a/ld/testsuite/ld-ia64/tlsbin.dd
+++ b/ld/testsuite/ld-ia64/tlsbin.dd
@@ -49,27 +49,26 @@ Disassembly of section .text:
 40+10c0:	11 00 00 00 01 00[ 	]+\[MIB\][ 	]+nop.m 0x0
 40+10c6:	00 08 05 80 03 80[ 	]+mov b0=r33
 40+10cc:	08 00 84 00[ 	]+br.ret.sptk.many b0;;
-#...
 
-40+2000 <_start>:
-40+2000:	0b 70 60 02 00 24[ 	]+\[MMI\][ 	]+addl r14=24,r1;;
-40+2006:	e0 00 38 30 20 00[ 	]+ld8 r14=\[r14\]
-40+200c:	00 00 04 00[ 	]+nop.i 0x0;;
-40+2010:	0b 70 38 1a 00 20[ 	]+\[MMI\][ 	]+add r14=r14,r13;;
-40+2016:	e0 c0 05 00 48 00[ 	]+addl r14=56,r1
-40+201c:	00 00 04 00[ 	]+nop.i 0x0;;
-40+2020:	0b 70 00 1c 18 10[ 	]+\[MMI\][ 	]+ld8 r14=\[r14\];;
-40+2026:	e0 70 34 00 40 00[ 	]+add r14=r14,r13
-40+202c:	00 00 04 00[ 	]+nop.i 0x0;;
-40+2030:	0b 10 00 1a 00 21[ 	]+\[MMI\][ 	]+mov r2=r13;;
-40+2036:	e0 80 08 00 48 e0[ 	]+addl r14=16,r2
-40+203c:	61 11 04 90[ 	]+addl r15=150,r2;;
-40+2040:	05 70 5c 1b 00 21[ 	]+\[MLX\][ 	]+adds r14=87,r13
-40+2046:	00 00 00 00 00 e0[ 	]+movl r15=0x95;;
-40+204c:	51 01 04 60 
-40+2050:	0a 78 3c 1a 00 20[ 	]+\[MMI\][ 	]+add r15=r15,r13;;
-40+2056:	00 00 00 02 00 00[ 	]+nop.m 0x0
-40+205c:	00 00 04 00[ 	]+nop.i 0x0
-40+2060:	1d 00 00 00 01 00[ 	]+\[MFB\][ 	]+nop.m 0x0
-40+2066:	00 00 00 02 00 80[ 	]+nop.f 0x0
-40+206c:	08 00 84 00[ 	]+br.ret.sptk.many b0;;
+40+10d0 <_start>:
+40+10d0:	0b 70 60 02 00 24[ 	]+\[MMI\][ 	]+addl r14=24,r1;;
+40+10d6:	e0 00 38 30 20 00[ 	]+ld8 r14=\[r14\]
+40+10dc:	00 00 04 00[ 	]+nop.i 0x0;;
+40+10e0:	0b 70 38 1a 00 20[ 	]+\[MMI\][ 	]+add r14=r14,r13;;
+40+10e6:	e0 c0 05 00 48 00[ 	]+addl r14=56,r1
+40+10ec:	00 00 04 00[ 	]+nop.i 0x0;;
+40+10f0:	0b 70 00 1c 18 10[ 	]+\[MMI\][ 	]+ld8 r14=\[r14\];;
+40+10f6:	e0 70 34 00 40 00[ 	]+add r14=r14,r13
+40+10fc:	00 00 04 00[ 	]+nop.i 0x0;;
+40+1100:	0b 10 00 1a 00 21[ 	]+\[MMI\][ 	]+mov r2=r13;;
+40+1106:	e0 80 08 00 48 e0[ 	]+addl r14=16,r2
+40+110c:	61 11 04 90[ 	]+addl r15=150,r2;;
+40+1110:	05 70 5c 1b 00 21[ 	]+\[MLX\][ 	]+adds r14=87,r13
+40+1116:	00 00 00 00 00 e0[ 	]+movl r15=0x95;;
+40+111c:	51 01 04 60 
+40+1120:	0a 78 3c 1a 00 20[ 	]+\[MMI\][ 	]+add r15=r15,r13;;
+40+1126:	00 00 00 02 00 00[ 	]+nop.m 0x0
+40+112c:	00 00 04 00[ 	]+nop.i 0x0
+40+1130:	1d 00 00 00 01 00[ 	]+\[MFB\][ 	]+nop.m 0x0
+40+1136:	00 00 00 02 00 80[ 	]+nop.f 0x0
+40+113c:	08 00 84 00[ 	]+br.ret.sptk.many b0;;
diff --git a/ld/testsuite/ld-ia64/tlsbin.rd b/ld/testsuite/ld-ia64/tlsbin.rd
index ef8b6d2..f93e7d3 100644
--- a/ld/testsuite/ld-ia64/tlsbin.rd
+++ b/ld/testsuite/ld-ia64/tlsbin.rd
@@ -17,14 +17,14 @@ Section Headers:
   \[ 5\] .rela.dyn +.*
   \[ 6\] .rela.IA_64.pltof +.*
   \[ 7\] .plt +.*
-  \[ 8\] .text +PROGBITS +40+1000 0+1000 0+1070 00 +AX +0 +0 4096
+  \[ 8\] .text +PROGBITS +40+1000 0+1000 0+140 00 +AX +0 +0 4096
   \[ 9\] .IA_64.unwind_inf +.*
   \[10\] .IA_64.unwind +.*
   \[11\] .data +.*
-  \[12\] .tdata +PROGBITS +60+3000 0+3000 0+60 00 WAT +0 +0 +4
-  \[13\] .tbss +NOBITS +60+3060 0+3060 0+40 00 WAT +0 +0 +1
-  \[14\] .dynamic +DYNAMIC +60+3060 0+3060 0+150 10 +WA +4 +0 +8
-  \[15\] .got +PROGBITS +60+31b0 0+31b0 0+48 00 WAp +0 +0 +8
+  \[12\] .tdata +PROGBITS +60+2000 0+2000 0+60 00 WAT +0 +0 +4
+  \[13\] .tbss +NOBITS +60+2060 0+2060 0+40 00 WAT +0 +0 +1
+  \[14\] .dynamic +DYNAMIC +60+2060 0+2060 0+150 10 +WA +4 +0 +8
+  \[15\] .got +PROGBITS +60+21b0 0+21b0 0+48 00 WAp +0 +0 +8
   \[16\] .IA_64.pltoff +.*
   \[17\] .sbss +.*
   \[18\] .bss +.*
@@ -34,7 +34,7 @@ Section Headers:
 #...
 
 Elf file type is EXEC \(Executable file\)
-Entry point 0x40+2000
+Entry point 0x40+10d0
 There are 7 program headers, starting at offset [0-9]+
 
 Program Headers:
@@ -42,33 +42,33 @@ Program Headers:
   PHDR +0x0+40 0x40+40 0x40+40 0x0+188 0x0+188 R E 0x8
   INTERP +0x0+1c8 0x40+1c8 0x40+1c8 0x[0-9a-f]+ 0x[0-9a-f]+ R +0x1
 .*Requesting program interpreter.*
-  LOAD +0x0+ 0x40+ 0x40+ 0x0+20a0 0x0+20a0 R E 0x10000
-  LOAD +0x0+3000 0x60+3000 0x60+3000 0x0+210 0x0+210 RW +0x10000
-  DYNAMIC +0x0+3060 0x60+3060 0x60+3060 0x0+150 0x0+150 RW +0x8
-  TLS +0x0+3000 0x60+3000 0x60+3000 0x0+60 0x0+a0 R +0x4
+  LOAD +0x0+ 0x40+ 0x40+ 0x0+1170 0x0+1170 R E 0x10000
+  LOAD +0x0+2000 0x60+2000 0x60+2000 0x0+210 0x0+210 RW +0x10000
+  DYNAMIC +0x0+2060 0x60+2060 0x60+2060 0x0+150 0x0+150 RW +0x8
+  TLS +0x0+2000 0x60+2000 0x60+2000 0x0+60 0x0+a0 R +0x4
   IA_64_UNWIND .* R +0x8
 #...
 
 Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 3 entries:
  +Offset +Info +Type +Symbol's Value  Symbol's Name \+ Addend
-60+31c8  0+200000097 R_IA64_TPREL64LSB +0+ sG2 \+ 0
-60+31d0  0+5000000a7 R_IA64_DTPMOD64LSB +0+ sG1 \+ 0
-60+31d8  0+5000000b7 R_IA64_DTPREL64LSB +0+ sG1 \+ 0
+60+21c8  0+200000097 R_IA64_TPREL64LSB +0+ sG2 \+ 0
+60+21d0  0+5000000a7 R_IA64_DTPMOD64LSB +0+ sG1 \+ 0
+60+21d8  0+5000000b7 R_IA64_DTPREL64LSB +0+ sG1 \+ 0
 
 Relocation section '.rela.IA_64.pltoff' at offset 0x[0-9a-f]+ contains 1 entries:
  +Offset +Info +Type +Symbol's Value  Symbol's Name \+ Addend
-60+3200  0+300000081 R_IA64_IPLTLSB +0+ __tls_get_addr \+ 0
+60+2200  0+300000081 R_IA64_IPLTLSB +0+ __tls_get_addr \+ 0
 
 Symbol table '.dynsym' contains 9 entries:
  +Num: +Value +Size Type +Bind +Vis +Ndx Name
  +0: 0+ +0 NOTYPE +LOCAL +DEFAULT +UND *
- +1: 60+3060 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
+ +1: 60+2060 +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: 60+31b0 +0 OBJECT +GLOBAL DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
+ +7: 60+21b0 +0 OBJECT +GLOBAL DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
  +8: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
 
 Symbol table '.symtab' contains 72 entries:
@@ -115,7 +115,7 @@ Symbol table '.symtab' contains 72 entries:
  +39: 0+7c +0 TLS +GLOBAL DEFAULT +13 bg8
  +40: 0+74 +0 TLS +GLOBAL DEFAULT +13 bg6
  +41: 0+68 +0 TLS +GLOBAL DEFAULT +13 bg3
- +42: 60+3060 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
+ +42: 60+2060 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
  +43: 0+8 +0 TLS +GLOBAL DEFAULT +12 sg3
  +44: 0+48 +0 TLS +GLOBAL HIDDEN +12 sh3
  +45: 0+ +0 TLS +GLOBAL DEFAULT +UND sG2
@@ -126,7 +126,7 @@ Symbol table '.symtab' contains 72 entries:
  +50: 0+58 +0 TLS +GLOBAL HIDDEN +12 sh7
  +51: 0+5c +0 TLS +GLOBAL HIDDEN +12 sh8
  +52: 0+ +0 TLS +GLOBAL DEFAULT +12 sg1
- +53: 40+2000 +112 FUNC +GLOBAL DEFAULT +8 _start
+ +53: 40+10d0 +112 FUNC +GLOBAL DEFAULT +8 _start
  +54: 0+4c +0 TLS +GLOBAL HIDDEN +12 sh4
  +55: 0+78 +0 TLS +GLOBAL DEFAULT +13 bg7
  +56: 0+50 +0 TLS +GLOBAL HIDDEN +12 sh5
diff --git a/ld/testsuite/ld-ia64/tlsbin.sd b/ld/testsuite/ld-ia64/tlsbin.sd
index c5ecf9f..f5a8aae 100644
--- a/ld/testsuite/ld-ia64/tlsbin.sd
+++ b/ld/testsuite/ld-ia64/tlsbin.sd
@@ -8,8 +8,8 @@
 .*: +file format elf64-ia64-little
 
 Contents of section .got:
- (60+)?31b0 0+ 0+ 0+ 0+  .*
- (60+)?31c0 0+ 0+ 0+ 0+  .*
- (60+)?31d0 0+ 0+ 0+ 0+  .*
- (60+)?31e0 01000000 0+ 90000000 0+  .*
- (60+)?31f0 24000000 0+  .*
+ (60+)?21b0 0+ 0+ 0+ 0+  .*
+ (60+)?21c0 0+ 0+ 0+ 0+  .*
+ (60+)?21d0 0+ 0+ 0+ 0+  .*
+ (60+)?21e0 01000000 0+ 90000000 0+  .*
+ (60+)?21f0 24000000 0+  .*
diff --git a/ld/testsuite/ld-ia64/tlsbin.td b/ld/testsuite/ld-ia64/tlsbin.td
index 33bebc3..b78798a 100644
--- a/ld/testsuite/ld-ia64/tlsbin.td
+++ b/ld/testsuite/ld-ia64/tlsbin.td
@@ -8,9 +8,9 @@
 .*: +file format elf64-ia64-little
 
 Contents of section .tdata:
- (60+)?3000 11000000 12000000 13000000 14000000  .*
- (60+)?3010 15000000 16000000 17000000 18000000  .*
- (60+)?3020 41000000 42000000 43000000 44000000  .*
- (60+)?3030 45000000 46000000 47000000 48000000  .*
- (60+)?3040 01010000 02010000 03010000 04010000  .*
- (60+)?3050 05010000 06010000 07010000 08010000  .*
+ (60+)?2000 11000000 12000000 13000000 14000000  .*
+ (60+)?2010 15000000 16000000 17000000 18000000  .*
+ (60+)?2020 41000000 42000000 43000000 44000000  .*
+ (60+)?2030 45000000 46000000 47000000 48000000  .*
+ (60+)?2040 01010000 02010000 03010000 04010000  .*
+ (60+)?2050 05010000 06010000 07010000 08010000  .*
diff --git a/ld/testsuite/ld-ia64/tlspic.rd b/ld/testsuite/ld-ia64/tlspic.rd
index ed29af6..87c5de5 100644
--- a/ld/testsuite/ld-ia64/tlspic.rd
+++ b/ld/testsuite/ld-ia64/tlspic.rd
@@ -16,14 +16,14 @@ Section Headers:
   \[ 4\] .rela.dyn +.*
   \[ 5\] .rela.IA_64.pltof +.*
   \[ 6\] .plt +.*
-  \[ 7\] .text +PROGBITS +0+1000 0+1000 0+1000 00 +AX +0 +0 4096
+  \[ 7\] .text +PROGBITS +0+1000 0+1000 0+110 00 +AX +0 +0 4096
   \[ 8\] .IA_64.unwind_inf +.*
   \[ 9\] .IA_64.unwind +.*
   \[10\] .data +.*
-  \[11\] .tdata +PROGBITS +0+13000 0+3000 0+60 00 WAT +0 +0 +4
-  \[12\] .tbss +NOBITS +0+13060 0+3060 0+20 00 WAT +0 +0 +1
-  \[13\] .dynamic +DYNAMIC +0+13060 0+3060 0+140 10 +WA +3 +0 +8
-  \[14\] .got +PROGBITS +0+131a0 0+31a0 0+50 00 WAp +0 +0 +8
+  \[11\] .tdata +PROGBITS +0+12000 0+2000 0+60 00 WAT +0 +0 +4
+  \[12\] .tbss +NOBITS +0+12060 0+2060 0+20 00 WAT +0 +0 +1
+  \[13\] .dynamic +DYNAMIC +0+12060 0+2060 0+140 10 +WA +3 +0 +8
+  \[14\] .got +PROGBITS +0+121a0 0+21a0 0+50 00 WAp +0 +0 +8
   \[15\] .IA_64.pltoff +.*
   \[16\] .sbss +.*
   \[17\] .bss +.*
@@ -39,21 +39,21 @@ There are 5 program headers, starting at offset [0-9]+
 
 Program Headers:
   Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg Align
-  LOAD +0x0+ 0x0+ 0x0+ 0x0+2030 0x0+2030 R E 0x10000
-  LOAD +0x0+3000 0x0+13000 0x0+13000 0x0+200 0x0+200 RW +0x10000
-  DYNAMIC +0x0+3060 0x0+13060 0x0+13060 0x0+140 0x0+140 RW +0x8
-  TLS +0x0+3000 0x0+13000 0x0+13000 0x0+60 0x0+80 R +0x4
-  IA_64_UNWIND +0x0+2018 0x0+2018 0x0+2018 0x0+18 0x0+18 R +0x8
+  LOAD +0x0+ 0x0+ 0x0+ 0x0+1140 0x0+1140 R E 0x10000
+  LOAD +0x0+2000 0x0+12000 0x0+12000 0x0+200 0x0+200 RW +0x10000
+  DYNAMIC +0x0+2060 0x0+12060 0x0+12060 0x0+140 0x0+140 RW +0x8
+  TLS +0x0+2000 0x0+12000 0x0+12000 0x0+60 0x0+80 R +0x4
+  IA_64_UNWIND +0x0+1128 0x0+1128 0x0+1128 0x0+18 0x0+18 R +0x8
 #...
 
 Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 6 entries:
  +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
-0+131b8 +0+18000000a7 R_IA64_DTPMOD64LSB +0+ sg1 \+ 0
-0+131c0 +0+18000000b7 R_IA64_DTPREL64LSB +0+ sg1 \+ 0
-0+131c8 +0+1b00000097 R_IA64_TPREL64LSB +0+4 sg2 \+ 0
-0+131d0 +0+a7 R_IA64_DTPMOD64LSB +0+
-0+131d8 +0+97 R_IA64_TPREL64LSB +0+44
-0+131e8 +0+97 R_IA64_TPREL64LSB +0+24
+0+121b8 +0+18000000a7 R_IA64_DTPMOD64LSB +0+ sg1 \+ 0
+0+121c0 +0+18000000b7 R_IA64_DTPREL64LSB +0+ sg1 \+ 0
+0+121c8 +0+1b00000097 R_IA64_TPREL64LSB +0+4 sg2 \+ 0
+0+121d0 +0+a7 R_IA64_DTPMOD64LSB +0+
+0+121d8 +0+97 R_IA64_TPREL64LSB +0+44
+0+121e8 +0+97 R_IA64_TPREL64LSB +0+24
 
 Relocation section '.rela.IA_64.pltoff' at offset 0x[0-9a-f]+ contains 1 entries:
  +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
@@ -80,7 +80,7 @@ Symbol table '.dynsym' contains 33 entries:
  +16: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +16 *
  +17: [0-9a-f]+ +0 SECTION LOCAL +DEFAULT +17 *
  +18: 0+1c +0 TLS +GLOBAL DEFAULT +11 sg8
- +19: 0+13060 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
+ +19: 0+12060 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
  +20: 0+8 +0 TLS +GLOBAL DEFAULT +11 sg3
  +21: 0+c +0 TLS +GLOBAL DEFAULT +11 sg4
  +22: 0+10 +0 TLS +GLOBAL DEFAULT +11 sg5
@@ -92,7 +92,7 @@ Symbol table '.dynsym' contains 33 entries:
  +28: 0+14 +0 TLS +GLOBAL DEFAULT +11 sg6
  +29: 0+18 +0 TLS +GLOBAL DEFAULT +11 sg7
  +30: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
- +31: 0+131a0 +0 OBJECT +GLOBAL DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
+ +31: 0+121a0 +0 OBJECT +GLOBAL DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
  +32: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
 
 Symbol table '.symtab' contains 60 entries:
@@ -143,7 +143,7 @@ Symbol table '.symtab' contains 60 entries:
  +43: 0+44 +0 TLS +LOCAL +HIDDEN +11 sh2
  +44: 0+54 +0 TLS +LOCAL +HIDDEN +11 sh6
  +45: 0+1c +0 TLS +GLOBAL DEFAULT +11 sg8
- +46: 0+13060 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
+ +46: 0+12060 +0 OBJECT +GLOBAL DEFAULT +ABS _DYNAMIC
  +47: 0+8 +0 TLS +GLOBAL DEFAULT +11 sg3
  +48: 0+c +0 TLS +GLOBAL DEFAULT +11 sg4
  +49: 0+10 +0 TLS +GLOBAL DEFAULT +11 sg5
@@ -155,5 +155,5 @@ Symbol table '.symtab' contains 60 entries:
  +55: 0+14 +0 TLS +GLOBAL DEFAULT +11 sg6
  +56: 0+18 +0 TLS +GLOBAL DEFAULT +11 sg7
  +57: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _edata
- +58: 0+131a0 +0 OBJECT +GLOBAL DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
+ +58: 0+121a0 +0 OBJECT +GLOBAL DEFAULT +ABS _GLOBAL_OFFSET_TABLE_
  +59: [0-9a-f]+ +0 NOTYPE +GLOBAL DEFAULT +ABS _end
diff --git a/ld/testsuite/ld-ia64/tlspic.sd b/ld/testsuite/ld-ia64/tlspic.sd
index af45ad9..01486fe 100644
--- a/ld/testsuite/ld-ia64/tlspic.sd
+++ b/ld/testsuite/ld-ia64/tlspic.sd
@@ -8,8 +8,8 @@
 .*: +file format elf64-ia64-little
 
 Contents of section .got:
- 131a0 0+ 0+ 0+ 0+  .*
- 131b0 0+ 0+ [0-9a-f]+ [0-9a-f]+  .*
- 131c0 [0-9a-f]+ [0-9a-f]+ [0-9a-f]+ [0-9a-f]+  .*
- 131d0 [0-9a-f]+ [0-9a-f]+ [0-9a-f]+ [0-9a-f]+  .*
- 131e0 440+ 0+ [0-9a-f]+ [0-9a-f]+  .*
+ 121a0 0+ 0+ 0+ 0+  .*
+ 121b0 0+ 0+ [0-9a-f]+ [0-9a-f]+  .*
+ 121c0 [0-9a-f]+ [0-9a-f]+ [0-9a-f]+ [0-9a-f]+  .*
+ 121d0 [0-9a-f]+ [0-9a-f]+ [0-9a-f]+ [0-9a-f]+  .*
+ 121e0 440+ 0+ [0-9a-f]+ [0-9a-f]+  .*
diff --git a/ld/testsuite/ld-ia64/tlspic.td b/ld/testsuite/ld-ia64/tlspic.td
index d16c6b7..67debe6 100644
--- a/ld/testsuite/ld-ia64/tlspic.td
+++ b/ld/testsuite/ld-ia64/tlspic.td
@@ -8,9 +8,9 @@
 .*: +file format elf64-ia64-little
 
 Contents of section .tdata:
- 13000 11000000 12000000 13000000 14000000  .*
- 13010 15000000 16000000 17000000 18000000  .*
- 13020 41000000 42000000 43000000 44000000  .*
- 13030 45000000 46000000 47000000 48000000  .*
- 13040 01010000 02010000 03010000 04010000  .*
- 13050 05010000 06010000 07010000 08010000  .*
+ 12000 11000000 12000000 13000000 14000000  .*
+ 12010 15000000 16000000 17000000 18000000  .*
+ 12020 41000000 42000000 43000000 44000000  .*
+ 12030 45000000 46000000 47000000 48000000  .*
+ 12040 01010000 02010000 03010000 04010000  .*
+ 12050 05010000 06010000 07010000 08010000  .*