* gas/sh/basic.exp: Define ASFLAGS appropriately and don't do

	dsp test for sh64/sh5 targets.
	* gas/sh/sh64/crange1.s: Tidy up to match data alignment.
	* gas/sh/sh64/crange1-1.d: Update.
	* gas/sh/sh64/crange1-2.d: Likewise.
	* gas/sh/sh64/datal32-3.d: Likewise.
	* gas/sh/sh64/datal64-3.d: Likewise.
	* gas/sh/sh64/localcom-1.d: Likewise.

8 files changed, 38 insertions, 27 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 2f0c29e..1f86d49 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,14 @@
+2003-12-01  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
+
+	* gas/sh/basic.exp: Define ASFLAGS appropriately and don't do
+	dsp test for sh64/sh5 targets.
+	* gas/sh/sh64/crange1.s: Tidy up to match data alignment.
+	* gas/sh/sh64/crange1-1.d: Update.
+	* gas/sh/sh64/crange1-2.d: Likewise.
+	* gas/sh/sh64/datal32-3.d: Likewise.
+	* gas/sh/sh64/datal64-3.d: Likewise.
+	* gas/sh/sh64/localcom-1.d: Likewise.
+
 2003-11-27  Alexandre Oliva  <aoliva@redhat.com>
 
 	* gas/frv/reloc1.[sd]: Test references to external symbols and
diff --git a/gas/testsuite/gas/sh/basic.exp b/gas/testsuite/gas/sh/basic.exp
index 6b8ebae..cbb1bb9 100644
--- a/gas/testsuite/gas/sh/basic.exp
+++ b/gas/testsuite/gas/sh/basic.exp
@@ -23,7 +23,7 @@ if [istarget "sh*-*-linux-gnu"] {
     global ASFLAGS
     set ASFLAGS "$ASFLAGS -big"
 }
-if [istarget "sh64*-*-linux*"] {
+if {[istarget "sh64*-*-*"] || [istarget "sh5*-*-*"]} then {
     global ASFLAGS
 
     set old_ASFLAGS $ASFLAGS
@@ -130,7 +130,7 @@ if [istarget sh*-*-*] then {
     # dumped as sh4.
     if {[istarget sh*-*coff] || [istarget sh*-pe*] || [istarget sh*-rtems]} then {
 	run_dump_test "pcrel-coff"
-    } elseif {![istarget sh64*-*-linux*]} {
+    } elseif {![istarget sh64*-*-*] && ![istarget sh5*-*-*] } {
 	# Test DSP instructions
 	run_dump_test "dsp"
 
diff --git a/gas/testsuite/gas/sh/sh64/crange1-1.d b/gas/testsuite/gas/sh/sh64/crange1-1.d
index 8c38663..3e97b9a 100644
--- a/gas/testsuite/gas/sh/sh64/crange1-1.d
+++ b/gas/testsuite/gas/sh/sh64/crange1-1.d
@@ -35,9 +35,9 @@ Contents of section \.cranges:
  0020 001c0000 00200001 00000000 00000024  .*
  0030 00030000 00240000 00280001 0000004c  .*
  0040 000000e8 00020000 01340000 002c0003  .*
- 0050 00000160 0000001a 00010000 00080000  .*
+ 0050 00000160 0000001c 00010000 00080000  .*
  0060 000c0001 00000018 0000000e 00020000  .*
- 0070 003c0000 007e0002 0000017a 00000156  .*
+ 0070 003c0000 00800002 0000017c 00000154  .*
  0080 0002                                 .*
 Contents of section \.text\.codemix:
  0000 cc00aad0 6ff0fff0 6ff0fff0 cc0062e0  .*
@@ -47,7 +47,7 @@ Contents of section \.text\.codemixconst:
  0000 6ff0fff0 cc00aad0 6ff0fff0 6ff0fff0  .*
  0010 cc00e2e0 6ff0fff0 6ff0fff0 6ff0fff0  .*
  0020 6ff0fff0 6ff00000 0000fff0 6ff0fff0  .*
- 0030 6ff0fff0 00000000 000000b1 0009e02b  .*
+ 0030 6ff0fff0 00000000 000000b3 0009e02b  .*
  0040 00090009 89020009 00090009 00090000  .*
  0050 00000000 00000000 00000000 00000000  .*
  0060 00000000 00000000 00000000 00000000  .*
@@ -55,7 +55,7 @@ Contents of section \.text\.codemixconst:
  0080 00000000 00000000 00000000 00000000  .*
  0090 00000000 00000000 00000000 00000000  .*
  00a0 00000000 00000000 00000000 00000000  .*
- 00b0 00000000 00000000 007c               .*
+ 00b0 00000000 00000000 0000007e           .*
 Contents of section \.text\.codemixconst2:
  0000 6ff0fff0 cc00aad0 6ff0fff0 6ff0fff0  .*
  0010 6ff0fff0 6ff0fff0 6ff0fff0 6ff0fff0  .*
@@ -78,11 +78,11 @@ Contents of section \.text\.codemixconst2:
  0120 00000000 00000000 00000000 00000000  .*
  0130 000000e6 6ff0fff0 cc00aed0 6ff0fff0  .*
  0140 6ff0fff0 6ff0fff0 6ff0fff0 6ff0fff0  .*
- 0150 6ff0fff0 6ff0fff0 6ff0fff0 cc010ae0  .*
+ 0150 6ff0fff0 6ff0fff0 6ff0fff0 cc0112e0  .*
  0160 6ff0fff0 00000000 00000000 00000000  .*
- 0170 00000000 00000000 00420009 e00e0009  .*
- 0180 0009890a 00090009 00090009 00090009  .*
- 0190 00090009 00090009 00090009 00000000  .*
+ 0170 00000000 00000000 00000044 0009e00e  .*
+ 0180 00090009 890a0009 00090009 00090009  .*
+ 0190 00090009 00090009 00090009 00090000  .*
  01a0 00000000 00000000 00000000 00000000  .*
  01b0 00000000 00000000 00000000 00000000  .*
  01c0 00000000 00000000 00000000 00000000  .*
@@ -101,4 +101,4 @@ Contents of section \.text\.codemixconst2:
  0290 00000000 00000000 00000000 00000000  .*
  02a0 00000000 00000000 00000000 00000000  .*
  02b0 00000000 00000000 00000000 00000000  .*
- 02c0 00000000 00000000 00000000 00000154  .*
+ 02c0 00000000 00000000 00000000 00000152  .*
diff --git a/gas/testsuite/gas/sh/sh64/crange1-2.d b/gas/testsuite/gas/sh/sh64/crange1-2.d
index 595ed39..1bd8321 100644
--- a/gas/testsuite/gas/sh/sh64/crange1-2.d
+++ b/gas/testsuite/gas/sh/sh64/crange1-2.d
@@ -39,10 +39,10 @@ Contents of section \.cranges:
  0030 00020000 00000000 00240003 00000024  .*
  0040 00000028 00010000 004c0000 00160002  .*
  0050 00000062 000000d2 00010000 01340000  .*
- 0060 002c0003 00000160 0000001a 00010000  .*
- 0070 017a0000 00220002 00000008 0000000c  .*
+ 0060 002c0003 00000160 0000001c 00010000  .*
+ 0070 017c0000 00220002 00000008 0000000c  .*
  0080 00010000 00180000 000e0002 0000004e  .*
- 0090 0000006c 00010000 019c0000 01340001  .*
+ 0090 0000006e 00010000 019e0000 01320001  .*
 Contents of section \.text\.codemix:
  0000 cc00aad0 6ff0fff0 6ff0fff0 cc0062e0  .*
  0010 6ff0fff0 6ff0fff0 0009e028 00090009  .*
@@ -51,7 +51,7 @@ Contents of section \.text\.codemixconst:
  0000 6ff0fff0 cc00aad0 6ff0fff0 6ff0fff0  .*
  0010 cc00e2e0 6ff0fff0 6ff0fff0 6ff0fff0  .*
  0020 6ff0fff0 6ff00000 0000fff0 6ff0fff0  .*
- 0030 6ff0fff0 00000000 000000b1 0009e02b  .*
+ 0030 6ff0fff0 00000000 000000b3 0009e02b  .*
  0040 00090009 89020009 00090009 00090000  .*
  0050 00000000 00000000 00000000 00000000  .*
  0060 00000000 00000000 00000000 00000000  .*
@@ -59,7 +59,7 @@ Contents of section \.text\.codemixconst:
  0080 00000000 00000000 00000000 00000000  .*
  0090 00000000 00000000 00000000 00000000  .*
  00a0 00000000 00000000 00000000 00000000  .*
- 00b0 00000000 00000000 007c               .*
+ 00b0 00000000 00000000 0000007e           .*
 Contents of section \.text\.codemixconst2:
  0000 6ff0fff0 cc00aad0 6ff0fff0 6ff0fff0  .*
  0010 6ff0fff0 6ff0fff0 6ff0fff0 6ff0fff0  .*
@@ -82,11 +82,11 @@ Contents of section \.text\.codemixconst2:
  0120 00000000 00000000 00000000 00000000  .*
  0130 000000e6 6ff0fff0 cc00aed0 6ff0fff0  .*
  0140 6ff0fff0 6ff0fff0 6ff0fff0 6ff0fff0  .*
- 0150 6ff0fff0 6ff0fff0 6ff0fff0 cc010ae0  .*
+ 0150 6ff0fff0 6ff0fff0 6ff0fff0 cc0112e0  .*
  0160 6ff0fff0 00000000 00000000 00000000  .*
- 0170 00000000 00000000 00420009 e00e0009  .*
- 0180 0009890a 00090009 00090009 00090009  .*
- 0190 00090009 00090009 00090009 00000000  .*
+ 0170 00000000 00000000 00000044 0009e00e  .*
+ 0180 00090009 890a0009 00090009 00090009  .*
+ 0190 00090009 00090009 00090009 00090000  .*
  01a0 00000000 00000000 00000000 00000000  .*
  01b0 00000000 00000000 00000000 00000000  .*
  01c0 00000000 00000000 00000000 00000000  .*
@@ -105,4 +105,4 @@ Contents of section \.text\.codemixconst2:
  0290 00000000 00000000 00000000 00000000  .*
  02a0 00000000 00000000 00000000 00000000  .*
  02b0 00000000 00000000 00000000 00000000  .*
- 02c0 00000000 00000000 00000000 00000154  .*
+ 02c0 00000000 00000000 00000000 00000152  .*
diff --git a/gas/testsuite/gas/sh/sh64/crange1.s b/gas/testsuite/gas/sh/sh64/crange1.s
index e654bb2..bbd4012 100644
--- a/gas/testsuite/gas/sh/sh64/crange1.s
+++ b/gas/testsuite/gas/sh/sh64/crange1.s
@@ -108,7 +108,7 @@ compact2:
 	nop
 compactend2:
 	nop
-	.space 100,0
+	.space 102,0
 	.long 0
 mediapoollabel2:
 	.long mediapoolend2-compact2
@@ -177,7 +177,7 @@ shmedia_compact_code4:
 	nop
 	movi shmedia_compact_code_end4-shmedia_compact_code4,r46
 	.long 0x6ff0fff0
-	.space 18,0
+	.space 20,0
 mediapoollabel4a:
 	.long mediapoolend4a-shmedia_compact_code4
 mediapoolend4a:
@@ -203,7 +203,7 @@ compact4:
 	nop
 compactend4:
 	nop
-	.space 300,0
+	.space 298,0
 	.long 0
 mediapoollabel4:
 	.long mediapoolend4-compact4
diff --git a/gas/testsuite/gas/sh/sh64/datal32-3.d b/gas/testsuite/gas/sh/sh64/datal32-3.d
index ca46631..159ed41 100644
--- a/gas/testsuite/gas/sh/sh64/datal32-3.d
+++ b/gas/testsuite/gas/sh/sh64/datal32-3.d
@@ -21,7 +21,7 @@ Idx Name          Size      VMA       LMA       File off  Algn
                   CONTENTS, ALLOC, LOAD, DATA
   2 \.bss          0+  0+  0+  0+a0  2\*\*0
                   ALLOC
-  3 \.rodata       0+10  0+  0+  0+a0  2\*\*0
+  3 \.rodata       0+10  0+  0+  0+a0  2\*\*2
                   CONTENTS, ALLOC, LOAD, RELOC, READONLY, DATA
 SYMBOL TABLE:
 0+ l    d  \.text	0+ 
diff --git a/gas/testsuite/gas/sh/sh64/datal64-3.d b/gas/testsuite/gas/sh/sh64/datal64-3.d
index 7a5ddad..8a056cf 100644
--- a/gas/testsuite/gas/sh/sh64/datal64-3.d
+++ b/gas/testsuite/gas/sh/sh64/datal64-3.d
@@ -21,7 +21,7 @@ Idx Name          Size      VMA               LMA               File off  Algn
                   CONTENTS, ALLOC, LOAD, DATA
   2 \.bss          0+  0+  0+  0+104  2\*\*0
                   ALLOC
-  3 \.rodata       0+10  0+  0+  0+104  2\*\*0
+  3 \.rodata       0+10  0+  0+  0+104  2\*\*2
                   CONTENTS, ALLOC, LOAD, RELOC, READONLY, DATA
 SYMBOL TABLE:
 0+ l    d  \.text	0+ 
diff --git a/gas/testsuite/gas/sh/sh64/localcom-1.d b/gas/testsuite/gas/sh/sh64/localcom-1.d
index 9c717a1..8698d5e 100644
--- a/gas/testsuite/gas/sh/sh64/localcom-1.d
+++ b/gas/testsuite/gas/sh/sh64/localcom-1.d
@@ -26,5 +26,5 @@ OFFSET  *TYPE  *VALUE
 
 Contents of section \.text:
  0000 00090009 00090009 00090009 00090009  .*
- 0010 00000004 00000004 0000000c 1234      .*
+ 0010 00000004 00000004 0000000c 12340009  .*