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: 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(-)

(limited to 'sim')

diff --git a/sim/testsuite/aarch64/allinsn.exp b/sim/testsuite/aarch64/allinsn.exp
index 402d748..e09d157 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 ef41c95..da28b69 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 7283a42..19a78a2 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 0b939a6..47d714c 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 76aac93..36eb29c 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 17e99c3..80faf5c 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 c82610c..56b6e39 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 2be369d..d6a4530 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 4f81d4c..88752b8 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 3f05fb9..39b464a 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 136b0e7..4d42667 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 d64d352..364cf98 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 e432594..a6c9605 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 905a2da..e675c4d 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 6e76196..97265a1 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 dea8041..32a87a3 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 5b93f01..4ed18d0 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 ed501e5..4f92f22 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 40d81d9..ec1309a 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 91948be..56df37d 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 38c2f41..ec83de4 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 2025935..21877f9 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 2fcc652..00bcccd 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 6958f06..260f13e 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 df4d02a..f270661 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 c6a83a0..30a1c94 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 c3e70b2..fb5d4d3 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 045cc7e..c979514 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 1461134..c20fc86 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 d45e119..2ca2c03 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 710af98..09653a0 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 6463ac2..6474775 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 f3662c2..3f582b0 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 1509492..81cce85 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 2eaf249..3e5903a 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 d534085..3f2f0a7 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 c7da3c5..888afa9 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 6f4238d..a3d0769 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 b71a387..3c7b4fd 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 bdf9299..db310c3 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 ceed950..69d324a 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 f2a43ca..1aa8024 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.
-- 
cgit v1.1