[gas/testsuite]

	* gas/sh/basic.exp: Don't do sh2a test for sh5.
	* gas/sh/sh2a.d: Match elf32-sh* format too.

[ld/testsuite]
	* ld-sh/sh64/crange3-cmpct.rd: Update.
	* ld-sh/sh64/crange3-media.rd: Update.

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 7311abf..465b4e4 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-29  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
+
+       * gas/sh/basic.exp: Don't do sh2a test for sh5.
+       * gas/sh/sh2a.d: Match elf32-sh* format too.
+
 2004-07-29  Alexandre Oliva  <aoliva@redhat.com>
 
        2003-12-30  DJ Delorie  <dj@redhat.com>

diff --git a/gas/testsuite/gas/sh/basic.exp b/gas/testsuite/gas/sh/basic.exp
index 0b3c210..554feaa 100644 (file)
--- a/gas/testsuite/gas/sh/basic.exp
+++ b/gas/testsuite/gas/sh/basic.exp
@@ -147,6 +147,8 @@ if [istarget sh*-*-*] then {
 
            run_dump_test "sh4a-dsp"
            run_dump_test "sh4al-dsp"
+
+           run_dump_test "sh2a"
        }
 
        run_dump_test "pic"
@@ -160,7 +162,6 @@ if [istarget sh*-*-*] then {
 
        # Test -renesas.
        run_dump_test "renesas-1"
-       run_dump_test "sh2a"
     }
 }
 

diff --git a/gas/testsuite/gas/sh/sh2a.d b/gas/testsuite/gas/sh/sh2a.d
index 7b7b0c6..b70a3dc 100644 (file)
--- a/gas/testsuite/gas/sh/sh2a.d
+++ b/gas/testsuite/gas/sh/sh2a.d
@@ -2,7 +2,7 @@
 #name: SH2a new instructions
 #as: -isa=sh2a
 
-dump.o:     file format elf32-sh
+dump.o:     file format elf32-sh.*
 
 Disassembly of section .text:
 0x00000000 33 79 4f ff         band.b  #7,@\(4095,r3\)

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 32d223b..18323fc 100644 (file)
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-29  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
+
+       * ld-sh/sh64/crange3-cmpct.rd: Update.
+       * ld-sh/sh64/crange3-media.rd: Update.
+
 2004-07-27  Nitin Yewale  <nitiny@kpitcummins.com>
 
        * ld-h8300/h8300.exp: Addition of new test case to check

diff --git a/ld/testsuite/ld-sh/sh64/crange3-cmpct.rd b/ld/testsuite/ld-sh/sh64/crange3-cmpct.rd
index d285658..8ff9691 100644 (file)
--- a/ld/testsuite/ld-sh/sh64/crange3-cmpct.rd
+++ b/ld/testsuite/ld-sh/sh64/crange3-cmpct.rd
@@ -11,7 +11,7 @@ ELF Header:
   Entry point address:               0x10c4
   Start of program headers:          52 \(bytes into file\)
   Start of section headers:          664 \(bytes into file\)
-  Flags:                             0xa
+  Flags:                             0xa, sh5
   Size of this header:               52 \(bytes\)
   Size of program headers:           32 \(bytes\)
   Number of program headers:         3

diff --git a/ld/testsuite/ld-sh/sh64/crange3-media.rd b/ld/testsuite/ld-sh/sh64/crange3-media.rd
index c5c8c0a..51d0a95 100644 (file)
--- a/ld/testsuite/ld-sh/sh64/crange3-media.rd
+++ b/ld/testsuite/ld-sh/sh64/crange3-media.rd
@@ -11,7 +11,7 @@ ELF Header:
   Entry point address:               0x10a5
   Start of program headers:          52 \(bytes into file\)
   Start of section headers:          664 \(bytes into file\)
-  Flags:                             0xa
+  Flags:                             0xa, sh5
   Size of this header:               52 \(bytes\)
   Size of program headers:           32 \(bytes\)
   Number of program headers:         3