sim: testsuite: drop most specific istarget checks

We'll rely on the toolchain probing to determine whether each arch's
tests can be run rather the current configure target.  This allows
testing all of the ports in a multitarget configuration.

For now, we don't reformat the files entirely to make it easier to
review, and in case we need to make adjustments.  Once this feels
like it's stable, we can flatten the code a bit by removing the if
statement entirely.

diff --git a/sim/testsuite/aarch64/allinsn.exp b/sim/testsuite/aarch64/allinsn.exp
index 402d7483f4f0a518c682988a12d8871bdfdc3f89..e09d15739b3dcd22db202ac671e400fa00cffae9 100644 (file)
--- a/sim/testsuite/aarch64/allinsn.exp
+++ b/sim/testsuite/aarch64/allinsn.exp
@@ -2,7 +2,7 @@
 
 sim_init
 
-if [istarget aarch64*-*] {
+if [istarget *] {
     # all machines
     set all_machs "aarch64"
 

diff --git a/sim/testsuite/arm/allinsn.exp b/sim/testsuite/arm/allinsn.exp
index ef41c955a64b5aae509578aa9686d65c85c243f8..da28b69e51a645be1857a0e7eca9ce1587f7d12c 100644 (file)
--- a/sim/testsuite/arm/allinsn.exp
+++ b/sim/testsuite/arm/allinsn.exp
@@ -2,7 +2,7 @@
 
 sim_init
 
-if { [istarget arm*-*-*] } {
+if { [istarget *] } {
     # all machines
     set all_machs "xscale"
 

diff --git a/sim/testsuite/arm/iwmmxt/iwmmxt.exp b/sim/testsuite/arm/iwmmxt/iwmmxt.exp
index 7283a4246b0047c1526ba33e60d7e6fae6bc4792..19a78a201ed72985612b694ad75cafd40721da3b 100644 (file)
--- a/sim/testsuite/arm/iwmmxt/iwmmxt.exp
+++ b/sim/testsuite/arm/iwmmxt/iwmmxt.exp
@@ -2,7 +2,7 @@
 
 sim_init
 
-if { [istarget arm*-*-*] } {
+if { [istarget *] } {
     # all machines
     set all_machs "xscale"
 

diff --git a/sim/testsuite/arm/misc.exp b/sim/testsuite/arm/misc.exp
index 0b939a6c56ff2bc25c6bd5202eaf57c9c4756b62..47d714cce2f9f283ef0c7bc3cacd7f5f31737d0b 100644 (file)
--- a/sim/testsuite/arm/misc.exp
+++ b/sim/testsuite/arm/misc.exp
@@ -2,7 +2,7 @@
 
 sim_init
 
-if { [istarget arm*-*-*] } {
+if { [istarget *] } {
     # all machines
     set all_machs "arm7tdmi"
 

diff --git a/sim/testsuite/arm/thumb/allthumb.exp b/sim/testsuite/arm/thumb/allthumb.exp
index 76aac93955579c4037db7456de434ad3dd8424aa..36eb29c08f0fd7382f457c6a1470b8619852551f 100644 (file)
--- a/sim/testsuite/arm/thumb/allthumb.exp
+++ b/sim/testsuite/arm/thumb/allthumb.exp
@@ -2,7 +2,7 @@
 
 sim_init
 
-if { [istarget arm*-*-*] } {
+if { [istarget *] } {
     # all machines
     set all_machs "arm7tdmi"
 

diff --git a/sim/testsuite/arm/xscale/xscale.exp b/sim/testsuite/arm/xscale/xscale.exp
index 17e99c3fd0272e749d1df14dfd1b5d73203bf843..80faf5c119fd13067f9e87ff9752ab8c1dc8e707 100644 (file)
--- a/sim/testsuite/arm/xscale/xscale.exp
+++ b/sim/testsuite/arm/xscale/xscale.exp
@@ -2,7 +2,7 @@
 
 sim_init
 
-if { [istarget arm*-*-*] } {
+if { [istarget *] } {
     # all machines
     set all_machs "xscale"
 

diff --git a/sim/testsuite/avr/allinsn.exp b/sim/testsuite/avr/allinsn.exp
index c82610c8e781bbf9195fe8f1d898403ef0b17845..56b6e396881da6790fd5a1946e871a0a62f045c8 100644 (file)
--- a/sim/testsuite/avr/allinsn.exp
+++ b/sim/testsuite/avr/allinsn.exp
@@ -2,7 +2,7 @@
 
 sim_init
 
-if [istarget avr-*] {
+if [istarget *] {
     # all machines
     set all_machs "avr"
 

diff --git a/sim/testsuite/bfin/allinsn.exp b/sim/testsuite/bfin/allinsn.exp
index 2be369dc9383ad2a8714cd9d3bf6692e49d14c63..d6a45304e36c96f3a36e674155941d73878df8b5 100644 (file)
--- a/sim/testsuite/bfin/allinsn.exp
+++ b/sim/testsuite/bfin/allinsn.exp
@@ -6,7 +6,7 @@ global CFLAGS_FOR_TARGET_init
 set CFLAGS_FOR_TARGET_init "-mcpu=bf537"
 sim_init
 
-if [istarget bfin-*-elf] {
+if [istarget *] {
     # all machines
     set all_machs "bfin"
 

diff --git a/sim/testsuite/bpf/allinsn.exp b/sim/testsuite/bpf/allinsn.exp
index 4f81d4cee166001cbd9d8f5f51eedac912ae8dad..88752b8e568dcad9b2d2831e9e00102ce22a9554 100644 (file)
--- a/sim/testsuite/bpf/allinsn.exp
+++ b/sim/testsuite/bpf/allinsn.exp
@@ -2,7 +2,7 @@
 
 sim_init
 
-if [istarget bpf-unknown-none] {
+if [istarget *] {
     # all machines
     set all_machs "bpf"
 

diff --git a/sim/testsuite/cr16/allinsn.exp b/sim/testsuite/cr16/allinsn.exp
index 3f05fb974cf2adf264945945a2268a5024da42cc..39b464a85ffcd3b7c904ae220be4442d2fcfb378 100644 (file)
--- a/sim/testsuite/cr16/allinsn.exp
+++ b/sim/testsuite/cr16/allinsn.exp
@@ -2,7 +2,7 @@
 
 sim_init
 
-if [istarget cr16*-*-*] {
+if [istarget *] {
     # all machines
     set all_machs "cr16"
 

diff --git a/sim/testsuite/cr16/misc.exp b/sim/testsuite/cr16/misc.exp
index 136b0e798da2f1a20e66389e3c83cb835fba2e77..4d42667b0a43721d913e860fe79dabe322846af9 100644 (file)
--- a/sim/testsuite/cr16/misc.exp
+++ b/sim/testsuite/cr16/misc.exp
@@ -2,7 +2,7 @@
 
 sim_init
 
-if [istarget cr16*-*-*] {
+if [istarget *] {
     # all machines
     set all_machs "cr16"
 

diff --git a/sim/testsuite/cris/asm/asm.exp b/sim/testsuite/cris/asm/asm.exp
index d64d3526e4c8b0fb7d062e440ce80edaaf981880..364cf989c283923033c7c1ce2af2a3c9ba31b096 100644 (file)
--- a/sim/testsuite/cris/asm/asm.exp
+++ b/sim/testsuite/cris/asm/asm.exp
@@ -17,7 +17,7 @@
 
 sim_init
 
-if [istarget cris*-*-*] {
+if [istarget *] {
     global ASFLAGS_FOR_TARGET
     # All machines we test and the corresponding assembler option.  Needs
     # update if we build the simulator for crisv0 crisv3 and crisv8 too.

diff --git a/sim/testsuite/cris/c/c.exp b/sim/testsuite/cris/c/c.exp
index e43259434bc3419412a0d9090d5aa40960943164..a6c96057c552358a46568ad95d4c90f9cf3fb2d9 100644 (file)
--- a/sim/testsuite/cris/c/c.exp
+++ b/sim/testsuite/cris/c/c.exp
@@ -17,10 +17,6 @@
 
 sim_init
 
-if ![istarget cris*-*-*] {
-    return
-}
-
 set CFLAGS_FOR_TARGET "-O2"
 if [istarget cris-*-*] {
     set mach "crisv10"
@@ -28,7 +24,7 @@ if [istarget cris-*-*] {
     set mach "crisv32"
 }
 
-if [istarget cris*-*-elf] {
+if [istarget *] {
     append CFLAGS_FOR_TARGET " -sim"
 }
 

diff --git a/sim/testsuite/cris/hw/rv-n-cris/rvc.exp b/sim/testsuite/cris/hw/rv-n-cris/rvc.exp
index 905a2da92ecebf0fc6a44c73ddf42a3294c39b2c..e675c4d2fcdcbaa254a02e3a0501fdc4bbf3eceb 100644 (file)
--- a/sim/testsuite/cris/hw/rv-n-cris/rvc.exp
+++ b/sim/testsuite/cris/hw/rv-n-cris/rvc.exp
@@ -116,7 +116,7 @@ proc slurp_rv { file } {
 
 # The main test loop.
 
-if [istarget cris*-*-*] {
+if [istarget *] {
     global ASFLAGS_FOR_TARGET
     global LDFLAGS_FOR_TARGET
     global SIMFLAGS_FOR_TARGET

diff --git a/sim/testsuite/d10v/allinsn.exp b/sim/testsuite/d10v/allinsn.exp
index 6e7619691dcafb87916cd0c518262e43e6bdcc08..97265a15db7bec6830332345228d9fca7e9eedb3 100644 (file)
--- a/sim/testsuite/d10v/allinsn.exp
+++ b/sim/testsuite/d10v/allinsn.exp
@@ -2,7 +2,7 @@
 
 sim_init
 
-if [istarget d10v*-*] {
+if [istarget *] {
     # all machines
     set all_machs "d10v"
 

diff --git a/sim/testsuite/frv/allinsn.exp b/sim/testsuite/frv/allinsn.exp
index dea804109a405d74e84edafc5ecc82c649bd6248..32a87a3a3548b45ba3599257752c51d7cde526d0 100644 (file)
--- a/sim/testsuite/frv/allinsn.exp
+++ b/sim/testsuite/frv/allinsn.exp
@@ -2,7 +2,7 @@
 
 sim_init
 
-if [istarget frv*-*] {
+if [istarget *] {
     # all machines
     set all_machs "frv fr500 fr550 fr400 fr405 fr450"
     set cpu_option -mcpu

diff --git a/sim/testsuite/frv/cache.ms b/sim/testsuite/frv/cache.ms
index 5b93f01000243bd5bea8529fddaf75e66f5c30e9..4ed18d0ddc6fd2a8a59f02fdf23af5c98c6c28d8 100644 (file)
--- a/sim/testsuite/frv/cache.ms
+++ b/sim/testsuite/frv/cache.ms
@@ -1,6 +1,6 @@
 # mach: frv fr500 fr550
 # sim: --memory-region 0xff000000,4 --memory-region 0xfe000000,00404000
-# xfail: "crashes with bad write" frv-*
+# xfail: "crashes with bad write" *-*
 
 ; Exit with return code
 

diff --git a/sim/testsuite/frv/fr400/allinsn.exp b/sim/testsuite/frv/fr400/allinsn.exp
index ed501e5400f21670ad6a5f964d4406bcebf2553f..4f92f227d9255ec5b2e7b65fbc87dc6870ead5e6 100644 (file)
--- a/sim/testsuite/frv/fr400/allinsn.exp
+++ b/sim/testsuite/frv/fr400/allinsn.exp
@@ -2,7 +2,7 @@
 
 sim_init
 
-if [istarget frv*-*] {
+if [istarget *] {
     # all machines
     set all_machs "fr400 fr405 fr450 fr550"
     set cpu_option -mcpu

diff --git a/sim/testsuite/frv/fr500/allinsn.exp b/sim/testsuite/frv/fr500/allinsn.exp
index 40d81d9e3f26ab18ca280f5d61f58fe24c673889..ec1309a24411bb0e7b7685f526e5f53a98cea37a 100644 (file)
--- a/sim/testsuite/frv/fr500/allinsn.exp
+++ b/sim/testsuite/frv/fr500/allinsn.exp
@@ -2,7 +2,7 @@
 
 sim_init
 
-if [istarget frv*-*] {
+if [istarget *] {
     # all machines
     set all_machs "frv fr500 fr550"
     set cpu_option -mcpu

diff --git a/sim/testsuite/frv/fr550/allinsn.exp b/sim/testsuite/frv/fr550/allinsn.exp
index 91948beada40c1e1e360dc9bc9d9218c0199ce74..56df37d427dc3d6e38f5a8d96e399df0fece5c2e 100644 (file)
--- a/sim/testsuite/frv/fr550/allinsn.exp
+++ b/sim/testsuite/frv/fr550/allinsn.exp
@@ -2,7 +2,7 @@
 
 sim_init
 
-if [istarget frv*-*] {
+if [istarget *] {
     # all machines
     set all_machs "fr550"
     set cpu_option -mcpu

diff --git a/sim/testsuite/frv/interrupts.exp b/sim/testsuite/frv/interrupts.exp
index 38c2f410c106ebd47b417f97a95488bfad9cffcb..ec83de422ea8db599335e09d745ac9e856a8e9b6 100644 (file)
--- a/sim/testsuite/frv/interrupts.exp
+++ b/sim/testsuite/frv/interrupts.exp
@@ -2,7 +2,7 @@
 
 sim_init
 
-if [istarget frv*-*] {
+if [istarget *] {
     # all machines
     set all_machs "frv fr500 fr550 fr400"
     set cpu_option -mcpu

diff --git a/sim/testsuite/frv/misc.exp b/sim/testsuite/frv/misc.exp
index 2025935da8ca86a6fc722e2f8ef6af745ae28e73..21877f963381fc5ec0d3ec97b864be47e4f7a704 100644 (file)
--- a/sim/testsuite/frv/misc.exp
+++ b/sim/testsuite/frv/misc.exp
@@ -2,7 +2,7 @@
 
 sim_init
 
-if [istarget frv*-*] {
+if [istarget *] {
     # all machines
     set all_machs "frv fr500 fr550 fr400 fr405 fr450"
     set cpu_option -mcpu

diff --git a/sim/testsuite/frv/parallel.exp b/sim/testsuite/frv/parallel.exp
index 2fcc6529182bea00a63ef9b40d25fb9dcc4583a3..00bcccd66efb1aeb182a9a55790b21921043e40e 100644 (file)
--- a/sim/testsuite/frv/parallel.exp
+++ b/sim/testsuite/frv/parallel.exp
@@ -2,7 +2,7 @@
 
 sim_init
 
-if [istarget frv*-*] {
+if [istarget *] {
     # all machines
     set all_machs "frv fr500 fr550 fr400"
     set cpu_option -mcpu

diff --git a/sim/testsuite/ft32/allinsn.exp b/sim/testsuite/ft32/allinsn.exp
index 6958f0612285252f9829dae223fcd65d9ec7de35..260f13e1cebc6142a2a3ead52d4c005248cb2f70 100644 (file)
--- a/sim/testsuite/ft32/allinsn.exp
+++ b/sim/testsuite/ft32/allinsn.exp
@@ -2,7 +2,7 @@
 
 sim_init
 
-if [istarget ft32-*] {
+if [istarget *] {
     # all machines
     set all_machs "ft32"
 

diff --git a/sim/testsuite/h8300/allinsn.exp b/sim/testsuite/h8300/allinsn.exp
index df4d02aad364e51cc5b1bb0dbccf4ee15d8a79fb..f270661f021eac13c31c4edf0b2c12a37fc6de3e 100644 (file)
--- a/sim/testsuite/h8300/allinsn.exp
+++ b/sim/testsuite/h8300/allinsn.exp
@@ -2,7 +2,7 @@
 
 sim_init
 
-if {[istarget h8300*-*-*] || [istarget h8sx*-*-*]} then {
+if {[istarget *]} {
     set all_machs "h8300 h8300h h8300s h8sx"
 
     foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] {

diff --git a/sim/testsuite/iq2000/allinsn.exp b/sim/testsuite/iq2000/allinsn.exp
index c6a83a0f75413a2117d1dd4b221ed1253d9e3ddc..30a1c94ea61d45648aa39d1e6ae41c426a0ea852 100644 (file)
--- a/sim/testsuite/iq2000/allinsn.exp
+++ b/sim/testsuite/iq2000/allinsn.exp
@@ -2,7 +2,7 @@
 
 sim_init
 
-if [istarget iq2000-*] {
+if [istarget *] {
     # all machines
     set all_machs "iq2000"
 

diff --git a/sim/testsuite/lm32/allinsn.exp b/sim/testsuite/lm32/allinsn.exp
index c3e70b223df8ec967213f08522b535f7238120cd..fb5d4d3471e315a3d0f845a7c2f4295ab99b7889 100644 (file)
--- a/sim/testsuite/lm32/allinsn.exp
+++ b/sim/testsuite/lm32/allinsn.exp
@@ -2,7 +2,7 @@
 
 sim_init
 
-if [istarget lm32-*] {
+if [istarget *] {
     # all machines
     set all_machs "lm32"
 

diff --git a/sim/testsuite/m32c/allinsn.exp b/sim/testsuite/m32c/allinsn.exp
index 045cc7e6bac3c8177cf1180c357b73587eb63020..c979514f5dd8463ca6e9fcdb06b56de93635db8e 100644 (file)
--- a/sim/testsuite/m32c/allinsn.exp
+++ b/sim/testsuite/m32c/allinsn.exp
@@ -3,7 +3,7 @@
 
 sim_init
 
-if [istarget m32c*-*-*] {
+if [istarget *] {
     # all machines
     set all_machs "m32c"
 

diff --git a/sim/testsuite/m32r/allinsn.exp b/sim/testsuite/m32r/allinsn.exp
index 146113458f35e4b7fa0a45a0a805ef4af32ca15b..c20fc86558be581a8492892dc08ae2d6a661a9b2 100644 (file)
--- a/sim/testsuite/m32r/allinsn.exp
+++ b/sim/testsuite/m32r/allinsn.exp
@@ -2,7 +2,7 @@
 
 sim_init
 
-if [istarget m32r*-*-*] {
+if [istarget *] {
     # all machines
     set all_machs "m32r"
 

diff --git a/sim/testsuite/m32r/misc.exp b/sim/testsuite/m32r/misc.exp
index d45e119c50966adc128f7842902fea1ce5b6eae4..2ca2c03018ba0f473a55e601f960867f7405da9f 100644 (file)
--- a/sim/testsuite/m32r/misc.exp
+++ b/sim/testsuite/m32r/misc.exp
@@ -2,7 +2,7 @@
 
 sim_init
 
-if [istarget m32r*-*-*] {
+if [istarget *] {
     # all machines
     set all_machs "m32r"
 

diff --git a/sim/testsuite/m68hc11/allinsn.exp b/sim/testsuite/m68hc11/allinsn.exp
index 710af981064c4be764f06483276a014ff56aa855..09653a00c45f59a3e3ac2ca9e24b96020867241b 100644 (file)
--- a/sim/testsuite/m68hc11/allinsn.exp
+++ b/sim/testsuite/m68hc11/allinsn.exp
@@ -2,7 +2,7 @@
 
 sim_init
 
-if [istarget m68hc11-*] {
+if [istarget *] {
     # all machines
     set all_machs "m68hc11"
 

diff --git a/sim/testsuite/mcore/allinsn.exp b/sim/testsuite/mcore/allinsn.exp
index 6463ac2ae85935c68c735d7fe1a307d20f9fb2c5..64747752a8e570e3170d8917b47730f0964bcb38 100644 (file)
--- a/sim/testsuite/mcore/allinsn.exp
+++ b/sim/testsuite/mcore/allinsn.exp
@@ -2,7 +2,7 @@
 
 sim_init
 
-if [istarget mcore-*] {
+if [istarget *] {
     # all machines
     set all_machs "mcore"
 

diff --git a/sim/testsuite/microblaze/allinsn.exp b/sim/testsuite/microblaze/allinsn.exp
index f3662c2939137368d37f90fe5732ae3cc16a7026..3f582b033d3d0143fbf78f9cf16061f4541ca751 100644 (file)
--- a/sim/testsuite/microblaze/allinsn.exp
+++ b/sim/testsuite/microblaze/allinsn.exp
@@ -2,7 +2,7 @@
 
 sim_init
 
-if [istarget microblaze-*] {
+if [istarget *] {
     # all machines
     set all_machs "microblaze"
 

diff --git a/sim/testsuite/mips/basic.exp b/sim/testsuite/mips/basic.exp
index 150949283b40187012b15b1965364284d8b936b8..81cce85a5b2ecdc51538f7d11f074aec72cc0369 100644 (file)
--- a/sim/testsuite/mips/basic.exp
+++ b/sim/testsuite/mips/basic.exp
@@ -41,8 +41,7 @@ proc run_sim_tests { name requested_machs { requested_micromips_machs "" } } {
     run_micromips_test $name $requested_micromips_machs
 }
 
-# Only test mips*-*-elf (e.g., no mips*-*-linux)
-if {[istarget mips*-*-elf]} {
+if {[istarget *]} {
     set dspmodels ""
     set mdmxmodels ""
     set micromipsmodels ""

diff --git a/sim/testsuite/mn10300/allinsn.exp b/sim/testsuite/mn10300/allinsn.exp
index 2eaf249c98f022aa14d1f09452019f21b0cbe9d9..3e5903ac7ba078ac738ca3f00ce951a55193762e 100644 (file)
--- a/sim/testsuite/mn10300/allinsn.exp
+++ b/sim/testsuite/mn10300/allinsn.exp
@@ -2,7 +2,7 @@
 
 sim_init
 
-if [istarget mn10300-*] {
+if [istarget *] {
     # all machines
     set all_machs "mn10300"
 

diff --git a/sim/testsuite/moxie/allinsn.exp b/sim/testsuite/moxie/allinsn.exp
index d534085921620c43f2b3bce7d41c8d7ed67c6fa9..3f2f0a7ac3fa99ff764053d4adeea03b4b4c6c6e 100644 (file)
--- a/sim/testsuite/moxie/allinsn.exp
+++ b/sim/testsuite/moxie/allinsn.exp
@@ -2,7 +2,7 @@
 
 sim_init
 
-if [istarget moxie-*] {
+if [istarget *] {
     # all machines
     set all_machs "moxie"
 

diff --git a/sim/testsuite/msp430/allinsn.exp b/sim/testsuite/msp430/allinsn.exp
index c7da3c58713447cfa9c0f4ff7a1a12ebcd643950..888afa918d84af0587f26613e1f13e7d193302dc 100644 (file)
--- a/sim/testsuite/msp430/allinsn.exp
+++ b/sim/testsuite/msp430/allinsn.exp
@@ -2,7 +2,7 @@
 
 sim_init
 
-if [istarget msp430-*] {
+if [istarget *] {
     # all machines
     set all_machs "msp430"
 

diff --git a/sim/testsuite/or1k/alltests.exp b/sim/testsuite/or1k/alltests.exp
index 6f4238dbe7ec9d830c52e48f28d504c3573971c9..a3d07692b30c13dbf2fd304630462e97411fdc3c 100644 (file)
--- a/sim/testsuite/or1k/alltests.exp
+++ b/sim/testsuite/or1k/alltests.exp
@@ -17,7 +17,7 @@
 
 sim_init
 
-if [istarget or1k*-*-*] {
+if [istarget *] {
     set all_machs "or1k"
 
     global LDFLAGS_FOR_TARGET

diff --git a/sim/testsuite/pru/allinsn.exp b/sim/testsuite/pru/allinsn.exp
index b71a387d78266db5106081fba31fe24fd359a314..3c7b4fd019fa6b7f88ae5581b715364da5075f69 100644 (file)
--- a/sim/testsuite/pru/allinsn.exp
+++ b/sim/testsuite/pru/allinsn.exp
@@ -20,7 +20,7 @@
 
 sim_init
 
-if [istarget pru-*] {
+if [istarget *] {
     # all machines
     set all_machs "pru"
 

diff --git a/sim/testsuite/riscv/allinsn.exp b/sim/testsuite/riscv/allinsn.exp
index bdf92993f0585fd7a8698908dabc763c574a1239..db310c30ea5854beba8d37f0a043f0bf175b74f3 100644 (file)
--- a/sim/testsuite/riscv/allinsn.exp
+++ b/sim/testsuite/riscv/allinsn.exp
@@ -2,7 +2,7 @@
 
 sim_init
 
-if [istarget riscv*-*] {
+if [istarget *] {
     # all machines
     set all_machs "riscv"
 

diff --git a/sim/testsuite/sh/allinsn.exp b/sim/testsuite/sh/allinsn.exp
index ceed950490e2a54a8fe127d6c8c3dae16c886934..69d324ae91d91cc2686e207b86b69955bf49ca5d 100644 (file)
--- a/sim/testsuite/sh/allinsn.exp
+++ b/sim/testsuite/sh/allinsn.exp
@@ -14,7 +14,7 @@ foreach opt $board_variant_list {
     }
 }
 
-if [istarget sh-*elf] {
+if [istarget *] {
     foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] {
        run_sim_test $src $all_machs
     }

diff --git a/sim/testsuite/v850/allinsns.exp b/sim/testsuite/v850/allinsns.exp
index f2a43cab1d366b55d2410a5fe701379bc6f07756..1aa80249f9db6393a3de34c2cf48e6eb74276748 100644 (file)
--- a/sim/testsuite/v850/allinsns.exp
+++ b/sim/testsuite/v850/allinsns.exp
@@ -2,7 +2,7 @@
 
 sim_init
 
-if [istarget v850*-*] {
+if [istarget *] {
     # All machines.
     # Should add more cpus if the testsuite adds coverage for their insns, but
     # at the core level, there's no deviation beyond these two.