From b42f20d2ac724c4936ff9cc1109f6cf2d91a7a52 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Fri, 26 Nov 2021 00:18:45 -0500
Subject: [PATCH] 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.
---
 sim/testsuite/aarch64/allinsn.exp       | 2 +-
 sim/testsuite/arm/allinsn.exp           | 2 +-
 sim/testsuite/arm/iwmmxt/iwmmxt.exp     | 2 +-
 sim/testsuite/arm/misc.exp              | 2 +-
 sim/testsuite/arm/thumb/allthumb.exp    | 2 +-
 sim/testsuite/arm/xscale/xscale.exp     | 2 +-
 sim/testsuite/avr/allinsn.exp           | 2 +-
 sim/testsuite/bfin/allinsn.exp          | 2 +-
 sim/testsuite/bpf/allinsn.exp           | 2 +-
 sim/testsuite/cr16/allinsn.exp          | 2 +-
 sim/testsuite/cr16/misc.exp             | 2 +-
 sim/testsuite/cris/asm/asm.exp          | 2 +-
 sim/testsuite/cris/c/c.exp              | 6 +-----
 sim/testsuite/cris/hw/rv-n-cris/rvc.exp | 2 +-
 sim/testsuite/d10v/allinsn.exp          | 2 +-
 sim/testsuite/frv/allinsn.exp           | 2 +-
 sim/testsuite/frv/cache.ms              | 2 +-
 sim/testsuite/frv/fr400/allinsn.exp     | 2 +-
 sim/testsuite/frv/fr500/allinsn.exp     | 2 +-
 sim/testsuite/frv/fr550/allinsn.exp     | 2 +-
 sim/testsuite/frv/interrupts.exp        | 2 +-
 sim/testsuite/frv/misc.exp              | 2 +-
 sim/testsuite/frv/parallel.exp          | 2 +-
 sim/testsuite/ft32/allinsn.exp          | 2 +-
 sim/testsuite/h8300/allinsn.exp         | 2 +-
 sim/testsuite/iq2000/allinsn.exp        | 2 +-
 sim/testsuite/lm32/allinsn.exp          | 2 +-
 sim/testsuite/m32c/allinsn.exp          | 2 +-
 sim/testsuite/m32r/allinsn.exp          | 2 +-
 sim/testsuite/m32r/misc.exp             | 2 +-
 sim/testsuite/m68hc11/allinsn.exp       | 2 +-
 sim/testsuite/mcore/allinsn.exp         | 2 +-
 sim/testsuite/microblaze/allinsn.exp    | 2 +-
 sim/testsuite/mips/basic.exp            | 3 +--
 sim/testsuite/mn10300/allinsn.exp       | 2 +-
 sim/testsuite/moxie/allinsn.exp         | 2 +-
 sim/testsuite/msp430/allinsn.exp        | 2 +-
 sim/testsuite/or1k/alltests.exp         | 2 +-
 sim/testsuite/pru/allinsn.exp           | 2 +-
 sim/testsuite/riscv/allinsn.exp         | 2 +-
 sim/testsuite/sh/allinsn.exp            | 2 +-
 sim/testsuite/v850/allinsns.exp         | 2 +-
 42 files changed, 42 insertions(+), 47 deletions(-)

diff --git a/sim/testsuite/aarch64/allinsn.exp b/sim/testsuite/aarch64/allinsn.exp
index 402d7483f4f..e09d15739b3 100644
--- 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 ef41c955a64..da28b69e51a 100644
--- 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 7283a4246b0..19a78a201ed 100644
--- 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 0b939a6c56f..47d714cce2f 100644
--- 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 76aac939555..36eb29c08f0 100644
--- 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 17e99c3fd02..80faf5c119f 100644
--- 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 c82610c8e78..56b6e396881 100644
--- 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 2be369dc938..d6a45304e36 100644
--- 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 4f81d4cee16..88752b8e568 100644
--- 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 3f05fb974cf..39b464a85ff 100644
--- 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 136b0e798da..4d42667b0a4 100644
--- 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 d64d3526e4c..364cf989c28 100644
--- 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 e43259434bc..a6c96057c55 100644
--- 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 905a2da92ec..e675c4d2fcd 100644
--- 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 6e7619691dc..97265a15db7 100644
--- 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 dea804109a4..32a87a3a354 100644
--- 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 5b93f010002..4ed18d0ddc6 100644
--- 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 ed501e5400f..4f92f227d92 100644
--- 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 40d81d9e3f2..ec1309a2441 100644
--- 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 91948beada4..56df37d427d 100644
--- 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 38c2f410c10..ec83de422ea 100644
--- 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 2025935da8c..21877f96338 100644
--- 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 2fcc6529182..00bcccd66ef 100644
--- 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 6958f061228..260f13e1ceb 100644
--- 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 df4d02aad36..f270661f021 100644
--- 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 c6a83a0f754..30a1c94ea61 100644
--- 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 c3e70b223df..fb5d4d3471e 100644
--- 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 045cc7e6bac..c979514f5dd 100644
--- 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 146113458f3..c20fc86558b 100644
--- 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 d45e119c509..2ca2c03018b 100644
--- 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 710af981064..09653a00c45 100644
--- 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 6463ac2ae85..64747752a8e 100644
--- 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 f3662c29391..3f582b033d3 100644
--- 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 150949283b4..81cce85a5b2 100644
--- 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 2eaf249c98f..3e5903ac7ba 100644
--- 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 d5340859216..3f2f0a7ac3f 100644
--- 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 c7da3c58713..888afa918d8 100644
--- 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 6f4238dbe7e..a3d07692b30 100644
--- 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 b71a387d782..3c7b4fd019f 100644
--- 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 bdf92993f05..db310c30ea5 100644
--- 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 ceed950490e..69d324ae91d 100644
--- 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 f2a43cab1d3..1aa80249f9d 100644
--- 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.
-- 
2.30.2