* ld-sh/tlsbin-1.d: Update.

	* ld-sh/tlspic-1.d: Likewise.
	* ld-sh/tlstpoff-1.d: Likewise.

4 files changed, 57 insertions, 51 deletions

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 2c8ea09..fd64725 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2006-10-20  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
+
+	* ld-sh/tlsbin-1.d: Update.
+	* ld-sh/tlspic-1.d: Likewise.
+	* ld-sh/tlstpoff-1.d: Likewise.
+
 2006-10-20  Richard Sandiford  <richard@codesourcery.com>
 
 	* ld-mips-elf/multi-got-1.d: Remove trailing R_MIPS_NONE entries.
diff --git a/ld/testsuite/ld-sh/tlsbin-1.d b/ld/testsuite/ld-sh/tlsbin-1.d
index e3f4834..9f5a086 100644
--- a/ld/testsuite/ld-sh/tlsbin-1.d
+++ b/ld/testsuite/ld-sh/tlsbin-1.d
@@ -14,14 +14,14 @@ Disassembly of section \.text:
   401002:	e6 2f       	mov\.l	r14,@-r15
   401004:	22 4f       	sts\.l	pr,@-r15
   401006:	5f c7       	mova	401184 <fn2\+0x184>,r0
-  401008:	5e dc       	mov\.l	401184 <fn2\+0x184>,r12	! 0x[0-9a-f]+
+  401008:	5e dc       	mov\.l	401184 <fn2\+0x184>,r12	! [0-9a-f]+
   40100a:	0c 3c       	add	r0,r12
   40100c:	f3 6e       	mov	r15,r14
   40100e:	09 00       	nop	
   401010:	09 00       	nop	
   401012:	09 00       	nop	
   401014:	09 00       	nop	
-  401016:	04 d0       	mov\.l	401028 <fn2\+0x28>,r0	! 0x1c .*
+  401016:	04 d0       	mov\.l	401028 <fn2\+0x28>,r0	! 1c .*
   401018:	12 04       	stc	gbr,r4
   40101a:	ce 00       	mov\.l	@\(r0,r12\),r0
   40101c:	4c 30       	add	r4,r0
@@ -38,7 +38,7 @@ Disassembly of section \.text:
   401032:	09 00       	nop	
   401034:	09 00       	nop	
   401036:	09 00       	nop	
-  401038:	03 d0       	mov\.l	401048 <fn2\+0x48>,r0	! 0x14 .*
+  401038:	03 d0       	mov\.l	401048 <fn2\+0x48>,r0	! 14 .*
   40103a:	12 04       	stc	gbr,r4
   40103c:	ce 00       	mov\.l	@\(r0,r12\),r0
   40103e:	4c 30       	add	r4,r0
@@ -54,7 +54,7 @@ Disassembly of section \.text:
   401052:	09 00       	nop	
   401054:	09 00       	nop	
   401056:	09 00       	nop	
-  401058:	03 d4       	mov\.l	401068 <fn2\+0x68>,r4	! 0x8 .*
+  401058:	03 d4       	mov\.l	401068 <fn2\+0x68>,r4	! 8 .*
   40105a:	12 00       	stc	gbr,r0
   40105c:	4c 30       	add	r4,r0
   40105e:	09 00       	nop	
@@ -70,7 +70,7 @@ Disassembly of section \.text:
   401072:	09 00       	nop	
   401074:	09 00       	nop	
   401076:	09 00       	nop	
-  401078:	03 d4       	mov\.l	401088 <fn2\+0x88>,r4	! 0x10 .*
+  401078:	03 d4       	mov\.l	401088 <fn2\+0x88>,r4	! 10 .*
   40107a:	12 00       	stc	gbr,r0
   40107c:	4c 30       	add	r4,r0
   40107e:	09 00       	nop	
@@ -86,7 +86,7 @@ Disassembly of section \.text:
   401092:	09 00       	nop	
   401094:	09 00       	nop	
   401096:	09 00       	nop	
-  401098:	03 d4       	mov\.l	4010a8 <fn2\+0xa8>,r4	! 0x18 .*
+  401098:	03 d4       	mov\.l	4010a8 <fn2\+0xa8>,r4	! 18 .*
   40109a:	12 00       	stc	gbr,r0
   40109c:	4c 30       	add	r4,r0
   40109e:	09 00       	nop	
@@ -116,11 +116,11 @@ Disassembly of section \.text:
   4010ce:	[0-9a-f]+ [0-9a-f]+       	.*[ 	]*.*
   4010d0:	09 00       	nop	
   4010d2:	09 00       	nop	
-  4010d4:	2c d1       	mov\.l	401188 <fn2\+0x188>,r1	! 0x10 .*
+  4010d4:	2c d1       	mov\.l	401188 <fn2\+0x188>,r1	! 10 .*
   4010d6:	0c 31       	add	r0,r1
   4010d8:	09 00       	nop	
   4010da:	09 00       	nop	
-  4010dc:	2b d2       	mov\.l	40118c <fn2\+0x18c>,r2	! 0x14 .*
+  4010dc:	2b d2       	mov\.l	40118c <fn2\+0x18c>,r2	! 14 .*
   4010de:	0c 32       	add	r0,r2
   4010e0:	09 00       	nop	
   4010e2:	09 00       	nop	
@@ -140,17 +140,17 @@ Disassembly of section \.text:
   4010fe:	[0-9a-f]+ [0-9a-f]+       	.*[ 	]*.*
   401100:	09 00       	nop	
   401102:	09 00       	nop	
-  401104:	22 d1       	mov\.l	401190 <fn2\+0x190>,r1	! 0x18 .*
+  401104:	22 d1       	mov\.l	401190 <fn2\+0x190>,r1	! 18 .*
   401106:	0c 31       	add	r0,r1
   401108:	09 00       	nop	
   40110a:	09 00       	nop	
-  40110c:	21 d2       	mov\.l	401194 <fn2\+0x194>,r2	! 0x1c .*
+  40110c:	21 d2       	mov\.l	401194 <fn2\+0x194>,r2	! 1c .*
   40110e:	0c 32       	add	r0,r2
   401110:	09 00       	nop	
   401112:	09 00       	nop	
   401114:	09 00       	nop	
   401116:	09 00       	nop	
-  401118:	02 d0       	mov\.l	401124 <fn2\+0x124>,r0	! 0x14 .*
+  401118:	02 d0       	mov\.l	401124 <fn2\+0x124>,r0	! 14 .*
   40111a:	12 01       	stc	gbr,r1
   40111c:	ce 00       	mov\.l	@\(r0,r12\),r0
   40111e:	03 a0       	bra	401128 <fn2\+0x128>
@@ -162,7 +162,7 @@ Disassembly of section \.text:
   40112a:	09 00       	nop	
   40112c:	09 00       	nop	
   40112e:	09 00       	nop	
-  401130:	02 d0       	mov\.l	40113c <fn2\+0x13c>,r0	! 0x18 .*
+  401130:	02 d0       	mov\.l	40113c <fn2\+0x13c>,r0	! 18 .*
   401132:	12 01       	stc	gbr,r1
   401134:	ce 00       	mov\.l	@\(r0,r12\),r0
   401136:	03 a0       	bra	401140 <fn2\+0x140>
@@ -174,7 +174,7 @@ Disassembly of section \.text:
   401142:	09 00       	nop	
   401144:	09 00       	nop	
   401146:	09 00       	nop	
-  401148:	02 d0       	mov\.l	401154 <fn2\+0x154>,r0	! 0x8 .*
+  401148:	02 d0       	mov\.l	401154 <fn2\+0x154>,r0	! 8 .*
   40114a:	12 01       	stc	gbr,r1
   40114c:	09 00       	nop	
   40114e:	03 a0       	bra	401158 <fn2\+0x158>
@@ -186,7 +186,7 @@ Disassembly of section \.text:
   40115a:	09 00       	nop	
   40115c:	09 00       	nop	
   40115e:	09 00       	nop	
-  401160:	02 d0       	mov\.l	40116c <fn2\+0x16c>,r0	! 0x18 .*
+  401160:	02 d0       	mov\.l	40116c <fn2\+0x16c>,r0	! 18 .*
   401162:	12 01       	stc	gbr,r1
   401164:	09 00       	nop	
   401166:	03 a0       	bra	401170 <fn2\+0x170>
@@ -220,13 +220,13 @@ Disassembly of section \.text:
   402002:	e6 2f       	mov\.l	r14,@-r15
   402004:	f3 6e       	mov	r15,r14
   402006:	27 c7       	mova	4020a4 <_start\+0xa4>,r0
-  402008:	26 dc       	mov\.l	4020a4 <_start\+0xa4>,r12	! 0x[0-9a-f]+
+  402008:	26 dc       	mov\.l	4020a4 <_start\+0xa4>,r12	! [0-9a-f]+
   40200a:	0c 3c       	add	r0,r12
   40200c:	09 00       	nop	
   40200e:	09 00       	nop	
   402010:	09 00       	nop	
   402012:	09 00       	nop	
-  402014:	02 d0       	mov\.l	402020 <_start\+0x20>,r0	! 0x10 .*
+  402014:	02 d0       	mov\.l	402020 <_start\+0x20>,r0	! 10 .*
   402016:	12 01       	stc	gbr,r1
   402018:	ce 00       	mov\.l	@\(r0,r12\),r0
   40201a:	03 a0       	bra	402024 <_start\+0x24>
@@ -238,7 +238,7 @@ Disassembly of section \.text:
   402026:	09 00       	nop	
   402028:	09 00       	nop	
   40202a:	09 00       	nop	
-  40202c:	02 d0       	mov\.l	402038 <_start\+0x38>,r0	! 0x20 .*
+  40202c:	02 d0       	mov\.l	402038 <_start\+0x38>,r0	! 20 .*
   40202e:	12 01       	stc	gbr,r1
   402030:	09 00       	nop	
   402032:	03 a0       	bra	40203c <_start\+0x3c>
@@ -250,7 +250,7 @@ Disassembly of section \.text:
   40203e:	09 00       	nop	
   402040:	09 00       	nop	
   402042:	09 00       	nop	
-  402044:	02 d0       	mov\.l	402050 <_start\+0x50>,r0	! 0x2c
+  402044:	02 d0       	mov\.l	402050 <_start\+0x50>,r0	! 2c
   402046:	12 01       	stc	gbr,r1
   402048:	09 00       	nop	
   40204a:	03 a0       	bra	402054 <_start\+0x54>
@@ -262,7 +262,7 @@ Disassembly of section \.text:
   402056:	09 00       	nop	
   402058:	09 00       	nop	
   40205a:	09 00       	nop	
-  40205c:	02 d0       	mov\.l	402068 <_start\+0x68>,r0	! 0x1c .*
+  40205c:	02 d0       	mov\.l	402068 <_start\+0x68>,r0	! 1c .*
   40205e:	12 01       	stc	gbr,r1
   402060:	09 00       	nop	
   402062:	03 a0       	bra	40206c <_start\+0x6c>
@@ -275,21 +275,21 @@ Disassembly of section \.text:
   402070:	09 00       	nop	
   402072:	09 00       	nop	
   402074:	12 01       	stc	gbr,r1
-  402076:	0c d0       	mov\.l	4020a8 <_start\+0xa8>,r0	! 0x8 .*
+  402076:	0c d0       	mov\.l	4020a8 <_start\+0xa8>,r0	! 8 .*
   402078:	1c 30       	add	r1,r0
   40207a:	09 00       	nop	
   40207c:	09 00       	nop	
   40207e:	09 00       	nop	
   402080:	09 00       	nop	
   402082:	12 01       	stc	gbr,r1
-  402084:	09 d0       	mov\.l	4020ac <_start\+0xac>,r0	! 0x28
+  402084:	09 d0       	mov\.l	4020ac <_start\+0xac>,r0	! 28
   402086:	1c 30       	add	r1,r0
   402088:	09 00       	nop	
   40208a:	09 00       	nop	
   40208c:	09 00       	nop	
   40208e:	09 00       	nop	
   402090:	12 01       	stc	gbr,r1
-  402092:	07 d0       	mov\.l	4020b0 <_start\+0xb0>,r0	! 0x18 .*
+  402092:	07 d0       	mov\.l	4020b0 <_start\+0xb0>,r0	! 18 .*
   402094:	1c 30       	add	r1,r0
   402096:	09 00       	nop	
   402098:	09 00       	nop	
diff --git a/ld/testsuite/ld-sh/tlspic-1.d b/ld/testsuite/ld-sh/tlspic-1.d
index 5310cd0..6638eda 100644
--- a/ld/testsuite/ld-sh/tlspic-1.d
+++ b/ld/testsuite/ld-sh/tlspic-1.d
@@ -14,16 +14,16 @@ Disassembly of section \.text:
  [0-9a-f]+:	e6 2f       	mov\.l	r14,@-r15
  [0-9a-f]+:	22 4f       	sts\.l	pr,@-r15
  [0-9a-f]+:	83 c7       	mova	[0-9a-f]+ <fn1\+0x214>,r0
- [0-9a-f]+:	82 dc       	mov\.l	[0-9a-f]+ <fn1\+0x214>,r12	! 0x[0-9a-f]+
+ [0-9a-f]+:	82 dc       	mov\.l	[0-9a-f]+ <fn1\+0x214>,r12	! [0-9a-f]+
  [0-9a-f]+:	0c 3c       	add	r0,r12
  [0-9a-f]+:	f3 6e       	mov	r15,r14
  [0-9a-f]+:	09 00       	nop	
  [0-9a-f]+:	09 00       	nop	
  [0-9a-f]+:	09 00       	nop	
  [0-9a-f]+:	09 00       	nop	
- [0-9a-f]+:	04 d4       	mov\.l	[0-9a-f]+ <fn1\+0x28>,r4	! 0x30
+ [0-9a-f]+:	04 d4       	mov\.l	[0-9a-f]+ <fn1\+0x28>,r4	! 30
  [0-9a-f]+:	04 c7       	mova	[0-9a-f]+ <fn1\+0x2c>,r0
- [0-9a-f]+:	04 d1       	mov\.l	[0-9a-f]+ <fn1\+0x2c>,r1	! 0x[0-9a-f]+
+ [0-9a-f]+:	04 d1       	mov\.l	[0-9a-f]+ <fn1\+0x2c>,r1	! [0-9a-f]+
  [0-9a-f]+:	0c 31       	add	r0,r1
  [0-9a-f]+:	0b 41       	jsr	@r1
  [0-9a-f]+:	cc 34       	add	r12,r4
@@ -38,7 +38,7 @@ Disassembly of section \.text:
  [0-9a-f]+:	09 00       	nop	
  [0-9a-f]+:	09 00       	nop	
  [0-9a-f]+:	09 00       	nop	
- [0-9a-f]+:	03 d0       	mov\.l	[0-9a-f]+ <fn1\+0x48>,r0	! 0x38
+ [0-9a-f]+:	03 d0       	mov\.l	[0-9a-f]+ <fn1\+0x48>,r0	! 38
  [0-9a-f]+:	12 04       	stc	gbr,r4
  [0-9a-f]+:	ce 00       	mov\.l	@\(r0,r12\),r0
  [0-9a-f]+:	4c 30       	add	r4,r0
@@ -54,9 +54,9 @@ Disassembly of section \.text:
  [0-9a-f]+:	09 00       	nop	
  [0-9a-f]+:	09 00       	nop	
  [0-9a-f]+:	09 00       	nop	
- [0-9a-f]+:	03 d4       	mov\.l	[0-9a-f]+ <fn1\+0x68>,r4	! 0x10 .*
+ [0-9a-f]+:	03 d4       	mov\.l	[0-9a-f]+ <fn1\+0x68>,r4	! 10 .*
  [0-9a-f]+:	04 c7       	mova	[0-9a-f]+ <fn1\+0x6c>,r0
- [0-9a-f]+:	03 d1       	mov\.l	[0-9a-f]+ <fn1\+0x6c>,r1	! 0x[0-9a-f]+
+ [0-9a-f]+:	03 d1       	mov\.l	[0-9a-f]+ <fn1\+0x6c>,r1	! [0-9a-f]+
  [0-9a-f]+:	0c 31       	add	r0,r1
  [0-9a-f]+:	0b 41       	jsr	@r1
  [0-9a-f]+:	cc 34       	add	r12,r4
@@ -70,7 +70,7 @@ Disassembly of section \.text:
  [0-9a-f]+:	09 00       	nop	
  [0-9a-f]+:	09 00       	nop	
  [0-9a-f]+:	09 00       	nop	
- [0-9a-f]+:	03 d0       	mov\.l	[0-9a-f]+ <fn1\+0x88>,r0	! 0x18 .*
+ [0-9a-f]+:	03 d0       	mov\.l	[0-9a-f]+ <fn1\+0x88>,r0	! 18 .*
  [0-9a-f]+:	12 04       	stc	gbr,r4
  [0-9a-f]+:	ce 00       	mov\.l	@\(r0,r12\),r0
  [0-9a-f]+:	4c 30       	add	r4,r0
@@ -86,9 +86,9 @@ Disassembly of section \.text:
  [0-9a-f]+:	09 00       	nop	
  [0-9a-f]+:	09 00       	nop	
  [0-9a-f]+:	09 00       	nop	
- [0-9a-f]+:	03 d4       	mov\.l	[0-9a-f]+ <fn1\+0xa8>,r4	! 0x3c
+ [0-9a-f]+:	03 d4       	mov\.l	[0-9a-f]+ <fn1\+0xa8>,r4	! 3c
  [0-9a-f]+:	04 c7       	mova	[0-9a-f]+ <fn1\+0xac>,r0
- [0-9a-f]+:	03 d1       	mov\.l	[0-9a-f]+ <fn1\+0xac>,r1	! 0x[0-9a-f]+
+ [0-9a-f]+:	03 d1       	mov\.l	[0-9a-f]+ <fn1\+0xac>,r1	! [0-9a-f]+
  [0-9a-f]+:	0c 31       	add	r0,r1
  [0-9a-f]+:	0b 41       	jsr	@r1
  [0-9a-f]+:	cc 34       	add	r12,r4
@@ -102,7 +102,7 @@ Disassembly of section \.text:
  [0-9a-f]+:	09 00       	nop	
  [0-9a-f]+:	09 00       	nop	
  [0-9a-f]+:	09 00       	nop	
- [0-9a-f]+:	03 d0       	mov\.l	[0-9a-f]+ <fn1\+0xc8>,r0	! 0x44
+ [0-9a-f]+:	03 d0       	mov\.l	[0-9a-f]+ <fn1\+0xc8>,r0	! 44
  [0-9a-f]+:	12 04       	stc	gbr,r4
  [0-9a-f]+:	ce 00       	mov\.l	@\(r0,r12\),r0
  [0-9a-f]+:	4c 30       	add	r4,r0
@@ -118,9 +118,9 @@ Disassembly of section \.text:
  [0-9a-f]+:	09 00       	nop	
  [0-9a-f]+:	09 00       	nop	
  [0-9a-f]+:	09 00       	nop	
- [0-9a-f]+:	03 d4       	mov\.l	[0-9a-f]+ <fn1\+0xe8>,r4	! 0x24
+ [0-9a-f]+:	03 d4       	mov\.l	[0-9a-f]+ <fn1\+0xe8>,r4	! 24
  [0-9a-f]+:	04 c7       	mova	[0-9a-f]+ <fn1\+0xec>,r0
- [0-9a-f]+:	03 d1       	mov\.l	[0-9a-f]+ <fn1\+0xec>,r1	! 0x[0-9a-f]+
+ [0-9a-f]+:	03 d1       	mov\.l	[0-9a-f]+ <fn1\+0xec>,r1	! [0-9a-f]+
  [0-9a-f]+:	0c 31       	add	r0,r1
  [0-9a-f]+:	0b 41       	jsr	@r1
  [0-9a-f]+:	cc 34       	add	r12,r4
@@ -134,7 +134,7 @@ Disassembly of section \.text:
  [0-9a-f]+:	09 00       	nop	
  [0-9a-f]+:	09 00       	nop	
  [0-9a-f]+:	09 00       	nop	
- [0-9a-f]+:	03 d0       	mov\.l	[0-9a-f]+ <fn1\+0x108>,r0	! 0x2c
+ [0-9a-f]+:	03 d0       	mov\.l	[0-9a-f]+ <fn1\+0x108>,r0	! 2c
  [0-9a-f]+:	12 04       	stc	gbr,r4
  [0-9a-f]+:	ce 00       	mov\.l	@\(r0,r12\),r0
  [0-9a-f]+:	4c 30       	add	r4,r0
@@ -150,9 +150,9 @@ Disassembly of section \.text:
  [0-9a-f]+:	09 00       	nop	
  [0-9a-f]+:	09 00       	nop	
  [0-9a-f]+:	09 00       	nop	
- [0-9a-f]+:	03 d4       	mov\.l	[0-9a-f]+ <fn1\+0x128>,r4	! 0x1c .*
+ [0-9a-f]+:	03 d4       	mov\.l	[0-9a-f]+ <fn1\+0x128>,r4	! 1c .*
  [0-9a-f]+:	04 c7       	mova	[0-9a-f]+ <fn1\+0x12c>,r0
- [0-9a-f]+:	03 d1       	mov\.l	[0-9a-f]+ <fn1\+0x12c>,r1	! 0x[0-9a-f]+
+ [0-9a-f]+:	03 d1       	mov\.l	[0-9a-f]+ <fn1\+0x12c>,r1	! [0-9a-f]+
  [0-9a-f]+:	0c 31       	add	r0,r1
  [0-9a-f]+:	0b 41       	jsr	@r1
  [0-9a-f]+:	cc 34       	add	r12,r4
@@ -164,11 +164,11 @@ Disassembly of section \.text:
  [0-9a-f]+:	[0-9a-f]+ [0-9a-f]+       	.*[ 	]*.*
  [0-9a-f]+:	09 00       	nop	
  [0-9a-f]+:	09 00       	nop	
- [0-9a-f]+:	38 d1       	mov\.l	[0-9a-f]+ <fn1\+0x218>,r1	! 0x8 .*
+ [0-9a-f]+:	38 d1       	mov\.l	[0-9a-f]+ <fn1\+0x218>,r1	! 8 .*
  [0-9a-f]+:	0c 31       	add	r0,r1
  [0-9a-f]+:	09 00       	nop	
  [0-9a-f]+:	09 00       	nop	
- [0-9a-f]+:	37 d2       	mov\.l	[0-9a-f]+ <fn1\+0x21c>,r2	! 0xc .*
+ [0-9a-f]+:	37 d2       	mov\.l	[0-9a-f]+ <fn1\+0x21c>,r2	! c .*
  [0-9a-f]+:	0c 32       	add	r0,r2
  [0-9a-f]+:	09 00       	nop	
  [0-9a-f]+:	09 00       	nop	
@@ -188,19 +188,19 @@ Disassembly of section \.text:
  [0-9a-f]+:	[0-9a-f]+ [0-9a-f]+       	.*[ 	]*.*
  [0-9a-f]+:	09 00       	nop	
  [0-9a-f]+:	09 00       	nop	
- [0-9a-f]+:	2e d1       	mov\.l	[0-9a-f]+ <fn1\+0x220>,r1	! 0x10 .*
+ [0-9a-f]+:	2e d1       	mov\.l	[0-9a-f]+ <fn1\+0x220>,r1	! 10 .*
  [0-9a-f]+:	0c 31       	add	r0,r1
  [0-9a-f]+:	09 00       	nop	
  [0-9a-f]+:	09 00       	nop	
- [0-9a-f]+:	2d d2       	mov\.l	[0-9a-f]+ <fn1\+0x224>,r2	! 0x14 .*
+ [0-9a-f]+:	2d d2       	mov\.l	[0-9a-f]+ <fn1\+0x224>,r2	! 14 .*
  [0-9a-f]+:	0c 32       	add	r0,r2
  [0-9a-f]+:	09 00       	nop	
  [0-9a-f]+:	09 00       	nop	
  [0-9a-f]+:	09 00       	nop	
  [0-9a-f]+:	09 00       	nop	
- [0-9a-f]+:	03 d4       	mov\.l	[0-9a-f]+ <fn1\+0x188>,r4	! 0x1c .*
+ [0-9a-f]+:	03 d4       	mov\.l	[0-9a-f]+ <fn1\+0x188>,r4	! 1c .*
  [0-9a-f]+:	04 c7       	mova	[0-9a-f]+ <fn1\+0x18c>,r0
- [0-9a-f]+:	03 d1       	mov\.l	[0-9a-f]+ <fn1\+0x18c>,r1	! 0x[0-9a-f]+
+ [0-9a-f]+:	03 d1       	mov\.l	[0-9a-f]+ <fn1\+0x18c>,r1	! [0-9a-f]+
  [0-9a-f]+:	0c 31       	add	r0,r1
  [0-9a-f]+:	0b 41       	jsr	@r1
  [0-9a-f]+:	cc 34       	add	r12,r4
@@ -212,17 +212,17 @@ Disassembly of section \.text:
  [0-9a-f]+:	[0-9a-f]+ [0-9a-f]+       	.*[ 	]*.*
  [0-9a-f]+:	09 00       	nop	
  [0-9a-f]+:	09 00       	nop	
- [0-9a-f]+:	24 d1       	mov\.l	[0-9a-f]+ <fn1\+0x228>,r1	! 0x18 .*
+ [0-9a-f]+:	24 d1       	mov\.l	[0-9a-f]+ <fn1\+0x228>,r1	! 18 .*
  [0-9a-f]+:	0c 31       	add	r0,r1
  [0-9a-f]+:	09 00       	nop	
  [0-9a-f]+:	09 00       	nop	
- [0-9a-f]+:	23 d2       	mov\.l	[0-9a-f]+ <fn1\+0x22c>,r2	! 0x1c .*
+ [0-9a-f]+:	23 d2       	mov\.l	[0-9a-f]+ <fn1\+0x22c>,r2	! 1c .*
  [0-9a-f]+:	0c 32       	add	r0,r2
  [0-9a-f]+:	09 00       	nop	
  [0-9a-f]+:	09 00       	nop	
  [0-9a-f]+:	09 00       	nop	
  [0-9a-f]+:	09 00       	nop	
- [0-9a-f]+:	02 d0       	mov\.l	[0-9a-f]+ <fn1\+0x1b4>,r0	! 0x38
+ [0-9a-f]+:	02 d0       	mov\.l	[0-9a-f]+ <fn1\+0x1b4>,r0	! 38
  [0-9a-f]+:	12 01       	stc	gbr,r1
  [0-9a-f]+:	ce 00       	mov\.l	@\(r0,r12\),r0
  [0-9a-f]+:	03 a0       	bra	[0-9a-f]+ <fn1\+0x1b8>
@@ -234,7 +234,7 @@ Disassembly of section \.text:
  [0-9a-f]+:	09 00       	nop	
  [0-9a-f]+:	09 00       	nop	
  [0-9a-f]+:	09 00       	nop	
- [0-9a-f]+:	02 d0       	mov\.l	[0-9a-f]+ <fn1\+0x1cc>,r0	! 0x18 .*
+ [0-9a-f]+:	02 d0       	mov\.l	[0-9a-f]+ <fn1\+0x1cc>,r0	! 18 .*
  [0-9a-f]+:	12 01       	stc	gbr,r1
  [0-9a-f]+:	ce 00       	mov\.l	@\(r0,r12\),r0
  [0-9a-f]+:	03 a0       	bra	[0-9a-f]+ <fn1\+0x1d0>
@@ -246,7 +246,7 @@ Disassembly of section \.text:
  [0-9a-f]+:	09 00       	nop	
  [0-9a-f]+:	09 00       	nop	
  [0-9a-f]+:	09 00       	nop	
- [0-9a-f]+:	02 d0       	mov\.l	[0-9a-f]+ <fn1\+0x1e4>,r0	! 0x44
+ [0-9a-f]+:	02 d0       	mov\.l	[0-9a-f]+ <fn1\+0x1e4>,r0	! 44
  [0-9a-f]+:	12 01       	stc	gbr,r1
  [0-9a-f]+:	ce 00       	mov\.l	@\(r0,r12\),r0
  [0-9a-f]+:	03 a0       	bra	[0-9a-f]+ <fn1\+0x1e8>
@@ -258,7 +258,7 @@ Disassembly of section \.text:
  [0-9a-f]+:	09 00       	nop	
  [0-9a-f]+:	09 00       	nop	
  [0-9a-f]+:	09 00       	nop	
- [0-9a-f]+:	02 d0       	mov\.l	[0-9a-f]+ <fn1\+0x1fc>,r0	! 0x2c
+ [0-9a-f]+:	02 d0       	mov\.l	[0-9a-f]+ <fn1\+0x1fc>,r0	! 2c
  [0-9a-f]+:	12 01       	stc	gbr,r1
  [0-9a-f]+:	ce 00       	mov\.l	@\(r0,r12\),r0
  [0-9a-f]+:	03 a0       	bra	[0-9a-f]+ <fn1\+0x200>
diff --git a/ld/testsuite/ld-sh/tlstpoff-1.d b/ld/testsuite/ld-sh/tlstpoff-1.d
index 25de25b..a678596 100644
--- a/ld/testsuite/ld-sh/tlstpoff-1.d
+++ b/ld/testsuite/ld-sh/tlstpoff-1.d
@@ -12,9 +12,9 @@ Disassembly of section \.text:
 [0-9a-f]+ <foo>:
   [0-9a-f]+:	c6 2f       	mov.l	r12,@-r15
   [0-9a-f]+:	07 c7       	mova	[0-9a-f]+ <foo\+0x20>,r0
-  [0-9a-f]+:	06 dc       	mov.l	[0-9a-f]+ <foo\+0x20>,r12	! 0x[0-9a-f]+
+  [0-9a-f]+:	06 dc       	mov.l	[0-9a-f]+ <foo\+0x20>,r12	! [0-9a-f]+
   [0-9a-f]+:	0c 3c       	add	r0,r12
-  [0-9a-f]+:	02 d0       	mov.l	[0-9a-f]+ <foo\+0x14>,r0	! 0xc
+  [0-9a-f]+:	02 d0       	mov.l	[0-9a-f]+ <foo\+0x14>,r0	! c
   [0-9a-f]+:	12 01       	stc	gbr,r1
   [0-9a-f]+:	09 00       	nop	
   [0-9a-f]+:	03 a0       	bra	[0-9a-f]+ <foo\+0x18>