* ld-sh/rd-sh.exp: Add -isa=SHcompact to ASFLAGS for SH-5.

	* ld-sh/tlsbin-1.d: Handle GOT_BIAS appropriately for SH-5.
	* ld-sh/tlspic-1.d: Likewise.
	* ld-sh/tlspic-2.d: Likewise.
	* ld-sh/tlsbin-2.d: Likewise. Make it robust for the symbols
	defined by the linker scripts.

5 files changed, 14 insertions, 6 deletions

diff --git a/ld/testsuite/ld-sh/rd-sh.exp b/ld/testsuite/ld-sh/rd-sh.exp
index 7060d02..41fad92 100644
--- a/ld/testsuite/ld-sh/rd-sh.exp
+++ b/ld/testsuite/ld-sh/rd-sh.exp
@@ -28,6 +28,12 @@ if ![istarget sh*-*-*] {
     return
 }
 
+if {[istarget sh64*-*-*] || [istarget sh5*-*-*]} then {
+    global ASFLAGS
+    set asflags_save "$ASFLAGS"
+    set ASFLAGS "$ASFLAGS -isa=SHcompact"
+}
+
 set rd_test_list [lsort [glob -nocomplain $srcdir/$subdir/*.d]]
 foreach shtest $rd_test_list {
     # We need to strip the ".d", but can leave the dirname.
@@ -44,3 +50,4 @@ foreach shtest $rd_test_list {
 	# FIXME: What if it fails?  Need we do something?
     }
 }
+set ASFLAGS "$asflags_save"
diff --git a/ld/testsuite/ld-sh/tlsbin-1.d b/ld/testsuite/ld-sh/tlsbin-1.d
index a6f60c2a..58acf5c 100644
--- a/ld/testsuite/ld-sh/tlsbin-1.d
+++ b/ld/testsuite/ld-sh/tlsbin-1.d
@@ -204,7 +204,7 @@ Disassembly of section \.text:
   40117e:	0b 00       	rts	
   401180:	f6 6c       	mov\.l	@r15\+,r12
   401182:	09 00       	nop	
-  401184:	3c 1f       	.*[ 	]*.*
+  401184:	[0-9a-f]+ [0-9a-f]+       	.*[ 	]*.*
   401186:	01 00       	.*[ 	]*.*
 	\.\.\.
 
@@ -291,6 +291,6 @@ Disassembly of section \.text:
   40209e:	e3 6f       	mov	r14,r15
   4020a0:	0b 00       	rts	
   4020a2:	f6 6e       	mov\.l	@r15\+,r14
-  4020a4:	1c 10       	.*[ 	]*.*
+  4020a4:	[0-9a-f]+ [0-9a-f]+       	.*[ 	]*.*
   4020a6:	01 00       	.*[ 	]*.*
 	\.\.\.
diff --git a/ld/testsuite/ld-sh/tlsbin-2.d b/ld/testsuite/ld-sh/tlsbin-2.d
index bde8440..a010ea9 100644
--- a/ld/testsuite/ld-sh/tlsbin-2.d
+++ b/ld/testsuite/ld-sh/tlsbin-2.d
@@ -82,7 +82,7 @@ Relocation section '\.rela\.dyn' at offset 0x[0-9a-f]+ contains 19 entries:
 
 Relocation section '\.rela\.plt' at offset 0x[0-9a-f]+ contains 1 entries:
  Offset +Info +Type +Sym\.Value +Sym\. Name \+ Addend
-0+4130cc  000005a4 R_SH_JMP_SLOT +[0-9a-f]+ +__tls_get_addr \+ 0
+0+4130cc  000005a4 R_SH_JMP_SLOT +[0-9a-f]+ +__tls_get_addr \+ [0-9a-f]+
 
 Symbol table '\.dynsym' contains [0-9]+ entries:
  +Num: +Value +Size Type +Bind +Vis +Ndx Name
@@ -141,5 +141,6 @@ Symbol table '\.symtab' contains [0-9]+ entries:
  +[0-9]+: 00000014 +0 TLS +GLOBAL HIDDEN +10 sh2
  +[0-9]+: 0000001c +0 TLS +GLOBAL DEFAULT +11 bg2
  +[0-9]+: 00000018 +0 TLS +GLOBAL DEFAULT +11 bg1
- +[0-9]+: [0-9a-f]+ +0 NOTYPE  GLOBAL DEFAULT +9 __data_start
+#...
+ +[0-9]+: .*
 #pass
diff --git a/ld/testsuite/ld-sh/tlspic-1.d b/ld/testsuite/ld-sh/tlspic-1.d
index decb161..bca0853 100644
--- a/ld/testsuite/ld-sh/tlspic-1.d
+++ b/ld/testsuite/ld-sh/tlspic-1.d
@@ -276,7 +276,7 @@ Disassembly of section \.text:
  [0-9a-f]+:	0b 00       	rts	
  [0-9a-f]+:	f6 6c       	mov\.l	@r15\+,r12
  [0-9a-f]+:	09 00       	nop	
- [0-9a-f]+:	cc 00       	.*[ 	]*.*
+ [0-9a-f]+:	[0-9a-f]+ [0-9a-f]+       	.*[ 	]*.*
  [0-9a-f]+:	01 00       	.*[ 	]*.*
  [0-9a-f]+:	08 00       	.*[ 	]*.*
  [0-9a-f]+:	00 00       	.*[ 	]*.*
diff --git a/ld/testsuite/ld-sh/tlspic-2.d b/ld/testsuite/ld-sh/tlspic-2.d
index 66199e0..3a99d22 100644
--- a/ld/testsuite/ld-sh/tlspic-2.d
+++ b/ld/testsuite/ld-sh/tlspic-2.d
@@ -67,7 +67,7 @@ Relocation section '\.rela\.dyn' at offset 0x[0-9a-f]+ contains 10 entries:
 
 Relocation section '\.rela\.plt' at offset 0x[0-9a-f]+ contains 1 entries:
  Offset +Info +Type +Sym\.Value +Sym\. Name \+ Addend
-0+[0-9a-f]+  0000[0-9a-f]+a4 R_SH_JMP_SLOT +[0-9a-f]+ +__tls_get_addr \+ 0
+0+[0-9a-f]+  0000[0-9a-f]+a4 R_SH_JMP_SLOT +[0-9a-f]+ +__tls_get_addr \+ [0-9a-f]+
 
 Symbol table '\.dynsym' contains [0-9]+ entries:
  +Num: +Value +Size Type +Bind +Vis +Ndx Name