bfd/

	* elf32-sh.c (sh_elf_plt_sym_val): New function.
	(elf_backend_plt_sym_val): Define.

opcodes/
	* sh-dis.c (print_insn_sh): Print the value in constant pool
	as a symbol if it looks like a symbol.

gas/testsuite/
	* gas/sh/pcrel2.d: Update.
	* gas/sh/tlsd.d: Update.
	* gas/sh/tlsnopic.d: Update.
	* gas/sh/tlspic.d: Update.

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

5 files changed, 19 insertions, 12 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index da75cc2277..d6643b2feb 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2004-04-22  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
+
+	* gas/sh/pcrel2.d: Update.
+	* gas/sh/tlsd.d: Update.
+	* gas/sh/tlsnopic.d: Update.
+	* gas/sh/tlspic.d: Update.
+
 2004-04-22  Mark Kettenis  <kettenis@gnu.org>
 
 	* lib/gas-defs.exp (is_elf_format): Add OpenBSD support.
diff --git a/gas/testsuite/gas/sh/pcrel2.d b/gas/testsuite/gas/sh/pcrel2.d
index 60a01df1cb..21df0aa7d2 100644
--- a/gas/testsuite/gas/sh/pcrel2.d
+++ b/gas/testsuite/gas/sh/pcrel2.d
@@ -8,8 +8,8 @@ Disassembly of section \.text:
 
 00000000 <code>:
    0:	8b 01       	bf	6 <foo>
-   2:	d0 02       	mov\.l	c <bar>,r0	! 0x6
-   4:	90 02       	mov\.w	c <bar>,r0	! 0x0
+   2:	d0 02       	mov\.l	c <bar>,r0	! 0x6 .*
+   4:	90 02       	mov\.w	c <bar>,r0	! 0x0 .*
 
 00000006 <foo>:
    6:	af fe       	bra	6 <foo>
diff --git a/gas/testsuite/gas/sh/tlsd.d b/gas/testsuite/gas/sh/tlsd.d
index 5ca4ef58db..b4d75974c8 100644
--- a/gas/testsuite/gas/sh/tlsd.d
+++ b/gas/testsuite/gas/sh/tlsd.d
@@ -11,12 +11,12 @@ Disassembly of section .text:
    2:	2f e6 [ 	]*mov\.l	r14,@-r15
    4:	4f 22 [ 	]*sts\.l	pr,@-r15
    6:	c7 14 [ 	]*mova	58 <fn\+0x58>,r0
-   8:	dc 13 [ 	]*mov\.l	58 <fn\+0x58>,r12[ 	]+! 0x0
+   8:	dc 13 [ 	]*mov\.l	58 <fn\+0x58>,r12[ 	]+! 0x0 .*
    a:	3c 0c [ 	]*add	r0,r12
    c:	6e f3 [ 	]*mov	r15,r14
-   e:	d4 04 [ 	]*mov\.l	20 <fn\+0x20>,r4[ 	]+! 0x0
+   e:	d4 04 [ 	]*mov\.l	20 <fn\+0x20>,r4[ 	]+! 0x0 .*
   10:	c7 04 [ 	]*mova	24 <fn\+0x24>,r0
-  12:	d1 04 [ 	]*mov\.l	24 <fn\+0x24>,r1[ 	]+! 0x0
+  12:	d1 04 [ 	]*mov\.l	24 <fn\+0x24>,r1[ 	]+! 0x0 .*
   14:	31 0c [ 	]*add	r0,r1
   16:	41 0b [ 	]*jsr	@r1
   18:	34 cc [ 	]*add	r12,r4
@@ -26,9 +26,9 @@ Disassembly of section .text:
 	\.\.\.
 [ 	]+20: R_SH_TLS_GD_32	foo
 [ 	]+24: R_SH_PLT32	__tls_get_addr
-  28:	d4 03 [ 	]*mov\.l	38 <fn\+0x38>,r4[ 	]+! 0x0
+  28:	d4 03 [ 	]*mov\.l	38 <fn\+0x38>,r4[ 	]+! 0x0 .*
   2a:	c7 04 [ 	]*mova	3c <fn\+0x3c>,r0
-  2c:	d1 03 [ 	]*mov\.l	3c <fn\+0x3c>,r1[ 	]+! 0x0
+  2c:	d1 03 [ 	]*mov\.l	3c <fn\+0x3c>,r1[ 	]+! 0x0 .*
   2e:	31 0c [ 	]*add	r0,r1
   30:	41 0b [ 	]*jsr	@r1
   32:	34 cc [ 	]*add	r12,r4
@@ -38,10 +38,10 @@ Disassembly of section .text:
 [ 	]+38: R_SH_TLS_LD_32	bar
 [ 	]+3c: R_SH_PLT32	__tls_get_addr
   40:	e2 01 [ 	]*mov	#1,r2
-  42:	d1 06 [ 	]*mov\.l	5c <fn\+0x5c>,r1[ 	]+! 0x0
+  42:	d1 06 [ 	]*mov\.l	5c <fn\+0x5c>,r1[ 	]+! 0x0 .*
   44:	30 1c [ 	]*add	r1,r0
   46:	20 22 [ 	]*mov\.l	r2,@r0
-  48:	d1 05 [ 	]*mov\.l	60 <fn\+0x60>,r1[ 	]+! 0x0
+  48:	d1 05 [ 	]*mov\.l	60 <fn\+0x60>,r1[ 	]+! 0x0 .*
   4a:	30 1c [ 	]*add	r1,r0
   4c:	6f e3 [ 	]*mov	r14,r15
   4e:	4f 26 [ 	]*lds\.l	@r15\+,pr
diff --git a/gas/testsuite/gas/sh/tlsnopic.d b/gas/testsuite/gas/sh/tlsnopic.d
index c987939c41..69131276cc 100644
--- a/gas/testsuite/gas/sh/tlsnopic.d
+++ b/gas/testsuite/gas/sh/tlsnopic.d
@@ -10,7 +10,7 @@ Disassembly of section .text:
    0:	2f e6 [ 	]*mov\.l	r14,@-r15
    2:	6e f3 [ 	]*mov	r15,r14
    4:	01 12 [ 	]*stc	gbr,r1
-   6:	d0 02 [ 	]*mov\.l	10 <fn\+0x10>,r0[ 	]+! 0x0
+   6:	d0 02 [ 	]*mov\.l	10 <fn\+0x10>,r0[ 	]+! 0x0 .*
    8:	30 1c [ 	]*add	r1,r0
    a:	6f e3 [ 	]*mov	r14,r15
    c:	00 0b [ 	]*rts	
diff --git a/gas/testsuite/gas/sh/tlspic.d b/gas/testsuite/gas/sh/tlspic.d
index b15e063185..207ab1a2f4 100644
--- a/gas/testsuite/gas/sh/tlspic.d
+++ b/gas/testsuite/gas/sh/tlspic.d
@@ -11,9 +11,9 @@ Disassembly of section .text:
    2:	2f e6 [ 	]*mov\.l	r14,@-r15
    4:	6e f3 [ 	]*mov	r15,r14
    6:	c7 08 [ 	]*mova	28 <fn\+0x28>,r0
-   8:	dc 07 [ 	]*mov\.l	28 <fn\+0x28>,r12[ 	]+! 0x0
+   8:	dc 07 [ 	]*mov\.l	28 <fn\+0x28>,r12[ 	]+! 0x0 .*
    a:	3c 0c [ 	]*add	r0,r12
-   c:	d0 02 [ 	]*mov\.l	18 <fn\+0x18>,r0[ 	]+! 0x0
+   c:	d0 02 [ 	]*mov\.l	18 <fn\+0x18>,r0[ 	]+! 0x0 .*
    e:	01 12 [ 	]*stc	gbr,r1
   10:	00 ce [ 	]*mov\.l	@\(r0,r12\),r0
   12:	a0 03 [ 	]*bra	1c <fn\+0x1c>