sim: testsuite: calculate $arch from $subdir

Since we require ports to use a matching subdir name in the testsuite
tree, we can use that to calculate the $arch value.

diff --git a/sim/testsuite/ChangeLog b/sim/testsuite/ChangeLog
index b9efa9208c669ac00731363fd2740a2b91f86abd..8876c386aeb856687f850fdace3aae5f2d0680d7 100644 (file)
--- a/sim/testsuite/ChangeLog
+++ b/sim/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2021-04-08  Mike Frysinger  <vapier@gentoo.org>
+
+       * lib/sim-defs.exp (sim_tool_path): New function.
+       (sim_run): Set sim to [sim_tool_path].
+
 2021-04-03  Mike Frysinger  <vapier@gentoo.org>
 
        * lib/sim-defs.exp (run_sim_test): Convert examples to binaries.

diff --git a/sim/testsuite/aarch64/ChangeLog b/sim/testsuite/aarch64/ChangeLog
index 29378ce49ca32beba1347bdcab471c4522763fd6..9a6c8343814132a74d3b6cd3e5ce52a6de1df93d 100644 (file)
--- a/sim/testsuite/aarch64/ChangeLog
+++ b/sim/testsuite/aarch64/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-08  Mike Frysinger  <vapier@gentoo.org>
+
+       * allinsn.exp (arch): Delete.
+
 2021-02-13  Mike Frysinger  <vapier@gentoo.org>
 
        * allinsn.exp: Define arch.

diff --git a/sim/testsuite/aarch64/allinsn.exp b/sim/testsuite/aarch64/allinsn.exp
index 04a234f53577825197f8c13faf37ccde91abc4a1..54d64784c230dd0d51049232dbda653fa9be5952 100644 (file)
--- a/sim/testsuite/aarch64/allinsn.exp
+++ b/sim/testsuite/aarch64/allinsn.exp
@@ -1,10 +1,6 @@
 # AArch64 simulator testsuite
 
 if [istarget aarch64*-*] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "aarch64"
-
     # all machines
     set all_machs "aarch64"
 

diff --git a/sim/testsuite/arm/ChangeLog b/sim/testsuite/arm/ChangeLog
index a1e80feb607dabb6b84b0f110f08ef31ef3a9044..89fab48557b173a19a31ad64890ae7c1e9229e9e 100644 (file)
--- a/sim/testsuite/arm/ChangeLog
+++ b/sim/testsuite/arm/ChangeLog
@@ -1,3 +1,9 @@
+2021-04-08  Mike Frysinger  <vapier@gentoo.org>
+
+       * allinsn.exp (arch): Delete.
+       * iwmmxt/iwmmxt.exp, misc.exp, thumb/allthumb.exp, xscale/xscale.exp:
+       Likewise.
+
 2021-02-13  Mike Frysinger  <vapier@gentoo.org>
 
        * allinsn.exp, iwmmxt/iwmmxt.exp, misc.exp, thumb/allthumb.ex,

diff --git a/sim/testsuite/arm/allinsn.exp b/sim/testsuite/arm/allinsn.exp
index 89ff96594793914e331e50c438e31e1ce2941389..c4d1ccecc3c607cff45c3c8b14f839aa026512ef 100644 (file)
--- a/sim/testsuite/arm/allinsn.exp
+++ b/sim/testsuite/arm/allinsn.exp
@@ -1,10 +1,6 @@
 # ARM simulator testsuite.
 
 if { [istarget arm*-*-*] } {
-    # Used to locate the `run` program.
-    global arch
-    set arch "arm"
-
     # all machines
     set all_machs "xscale"
 

diff --git a/sim/testsuite/arm/iwmmxt/iwmmxt.exp b/sim/testsuite/arm/iwmmxt/iwmmxt.exp
index 9710f3670ba75d523646a5062ef52a3c332679a0..4aff9c7d02873776389b6cc286696e9bae912f84 100644 (file)
--- a/sim/testsuite/arm/iwmmxt/iwmmxt.exp
+++ b/sim/testsuite/arm/iwmmxt/iwmmxt.exp
@@ -1,10 +1,6 @@
 # Intel(r) Wireless MMX(tm) technology simulator testsuite.
 
 if { [istarget arm*-*-*] } {
-    # Used to locate the `run` program.
-    global arch
-    set arch "arm"
-
     # all machines
     set all_machs "xscale"
 

diff --git a/sim/testsuite/arm/misc.exp b/sim/testsuite/arm/misc.exp
index ea6fd3c3c9a0823317d7edac6471394b169bf158..818ee58adec352ce2cb57323915f64ea32fc12f4 100644 (file)
--- a/sim/testsuite/arm/misc.exp
+++ b/sim/testsuite/arm/misc.exp
@@ -1,10 +1,6 @@
 # Miscellaneous ARM simulator testcases
 
 if { [istarget arm*-*-*] } {
-    # Used to locate the `run` program.
-    global arch
-    set arch "arm"
-
     # all machines
     set all_machs "arm7tdmi"
 

diff --git a/sim/testsuite/arm/thumb/allthumb.exp b/sim/testsuite/arm/thumb/allthumb.exp
index eca5fa18c7193a9dc9cfbbf218781096e4fba7f0..ec09a0da8294a84ed012176fe75d6838555d9595 100644 (file)
--- a/sim/testsuite/arm/thumb/allthumb.exp
+++ b/sim/testsuite/arm/thumb/allthumb.exp
@@ -1,10 +1,6 @@
 # ARM simulator testsuite.
 
 if { [istarget arm*-*-*] } {
-    # Used to locate the `run` program.
-    global arch
-    set arch "arm"
-
     # all machines
     set all_machs "arm7tdmi"
 

diff --git a/sim/testsuite/arm/xscale/xscale.exp b/sim/testsuite/arm/xscale/xscale.exp
index 20c9df80351cc9274f2d3a6ea6854e0a3f533b03..e65a952dadb0112b8c6b5a5c91c486405298bfc5 100644 (file)
--- a/sim/testsuite/arm/xscale/xscale.exp
+++ b/sim/testsuite/arm/xscale/xscale.exp
@@ -1,10 +1,6 @@
 # XSCALE simulator testsuite.
 
 if { [istarget arm*-*-*] } {
-    # Used to locate the `run` program.
-    global arch
-    set arch "arm"
-
     # all machines
     set all_machs "xscale"
 

diff --git a/sim/testsuite/avr/ChangeLog b/sim/testsuite/avr/ChangeLog
index 8ee57d29d1340b7e63bea8bfdf51e39e05c725de..5ce686f4db1c12675bb9656a688c5205a7f3c7a4 100644 (file)
--- a/sim/testsuite/avr/ChangeLog
+++ b/sim/testsuite/avr/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-08  Mike Frysinger  <vapier@gentoo.org>
+
+       * allinsn.exp (arch): Delete.
+
 2021-02-13  Mike Frysinger  <vapier@gentoo.org>
 
        * allinsn.exp: Define arch.

diff --git a/sim/testsuite/avr/allinsn.exp b/sim/testsuite/avr/allinsn.exp
index a5c16b629b76afcf893587e292c631c34e8c7684..584a93da93050dc6030ddfd1b4d1e3070315db37 100644 (file)
--- a/sim/testsuite/avr/allinsn.exp
+++ b/sim/testsuite/avr/allinsn.exp
@@ -1,10 +1,6 @@
 # avr simulator testsuite
 
 if [istarget avr-*] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "avr"
-
     # all machines
     set all_machs "avr"
 

diff --git a/sim/testsuite/bfin/ChangeLog b/sim/testsuite/bfin/ChangeLog
index ff7f639922ee803b1e1b95405f0aa55eafb51914..2abca7eee7c9a40c125a555e6390ca344ac22c3a 100644 (file)
--- a/sim/testsuite/bfin/ChangeLog
+++ b/sim/testsuite/bfin/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-08  Mike Frysinger  <vapier@gentoo.org>
+
+       * allinsn.exp (arch): Delete.
+
 2021-02-13  Mike Frysinger  <vapier@gentoo.org>
 
        * allinsn.exp: Define arch.

diff --git a/sim/testsuite/bfin/allinsn.exp b/sim/testsuite/bfin/allinsn.exp
index 3d3378171c6d67522b081b4e8b148cc1466c9e4f..aa304eaa9b4ae2aa6a22e98cbb187b90d4e88ac0 100644 (file)
--- a/sim/testsuite/bfin/allinsn.exp
+++ b/sim/testsuite/bfin/allinsn.exp
@@ -1,10 +1,6 @@
 # Analog Devices Blackfin simulator testsuite
 
 if [istarget bfin-*-elf] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "bfin"
-
     # all machines
     set all_machs "bfin"
 

diff --git a/sim/testsuite/bpf/ChangeLog b/sim/testsuite/bpf/ChangeLog
index 76d54e1369d260ec8e5a3a78ce8d149434c1d3c1..5814a7c768a7b5346b37995e5d3a0dc3e52c5b52 100644 (file)
--- a/sim/testsuite/bpf/ChangeLog
+++ b/sim/testsuite/bpf/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-08  Mike Frysinger  <vapier@gentoo.org>
+
+       * allinsn.exp (arch): Delete.
+
 2021-02-13  Mike Frysinger  <vapier@gentoo.org>
 
        * allinsn.exp: Define arch.

diff --git a/sim/testsuite/bpf/allinsn.exp b/sim/testsuite/bpf/allinsn.exp
index ffffd8a6892804a8c3a253681b91f80bed889fcc..2cca77021afed94f9de5ae0c4d4cabfba566a609 100644 (file)
--- a/sim/testsuite/bpf/allinsn.exp
+++ b/sim/testsuite/bpf/allinsn.exp
@@ -1,10 +1,6 @@
 # eBPF simulator testsuite
 
 if [istarget bpf-unknown-none] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "bpf"
-
     # all machines
     set all_machs "bpf"
 

diff --git a/sim/testsuite/cr16/ChangeLog b/sim/testsuite/cr16/ChangeLog
index b241c8609498b5e223f49d84d5b089e314a65875..68353f04910c47963d71aca3917d96f445e52f87 100644 (file)
--- a/sim/testsuite/cr16/ChangeLog
+++ b/sim/testsuite/cr16/ChangeLog
@@ -1,3 +1,8 @@
+2021-04-08  Mike Frysinger  <vapier@gentoo.org>
+
+       * allinsn.exp (arch): Delete.
+       * misc.exp: Likewise.
+
 2021-02-13  Mike Frysinger  <vapier@gentoo.org>
 
        * allinsn.exp, misc.exp: Define arch.

diff --git a/sim/testsuite/cr16/allinsn.exp b/sim/testsuite/cr16/allinsn.exp
index 1b6847c78150a3eafb55aef10705049f1159c890..d6602b4c6822839a6a40344f352f417ee4f1ee9e 100644 (file)
--- a/sim/testsuite/cr16/allinsn.exp
+++ b/sim/testsuite/cr16/allinsn.exp
@@ -1,10 +1,6 @@
 # CR16 simulator testsuite.
 
 if [istarget cr16*-*-*] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "cr16"
-
     # all machines
     set all_machs "cr16"
 

diff --git a/sim/testsuite/cr16/misc.exp b/sim/testsuite/cr16/misc.exp
index 67fa4c2d7d38c72ebab43f4641245481333a9249..5f9d68132b6aed95cc6fb64f3399fefb4b0b2478 100644 (file)
--- a/sim/testsuite/cr16/misc.exp
+++ b/sim/testsuite/cr16/misc.exp
@@ -1,10 +1,6 @@
 # Miscellaneous CR16 simulator testcases
 
 if [istarget cr16*-*-*] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "cr16"
-
     # all machines
     set all_machs "cr16"
 

diff --git a/sim/testsuite/cris/ChangeLog b/sim/testsuite/cris/ChangeLog
index d780e2c1d31784d847b4f8f3620489df33a28c75..121b6f326175dd2532a34a5e3a2c29a025b7b87d 100644 (file)
--- a/sim/testsuite/cris/ChangeLog
+++ b/sim/testsuite/cris/ChangeLog
@@ -1,3 +1,8 @@
+2021-04-08  Mike Frysinger  <vapier@gentoo.org>
+
+       * asm/asm.exp (arch): Delete.
+       * c/c.exp, hw/rv-n-cris/rvc.exp: Likewise.
+
 2021-02-13  Mike Frysinger  <vapier@gentoo.org>
 
        * asm/asm.exp, c/c.exp, hw/rv-n-cris/rvc.exp: Define arch.

diff --git a/sim/testsuite/cris/asm/asm.exp b/sim/testsuite/cris/asm/asm.exp
index b8c14c8d05cbc21d1f21bb7a8108c93505391128..415bbf1082a996b47ba4638258d738a7136d2ee1 100644 (file)
--- a/sim/testsuite/cris/asm/asm.exp
+++ b/sim/testsuite/cris/asm/asm.exp
@@ -16,10 +16,6 @@
 # Miscellaneous CRIS simulator testcases in assembly code.
 
 if [istarget cris*-*-*] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "cris"
-
     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 3d493b7c1449a3a45097670c102800650110fee3..08ea18812ec5bd655556d0db2877eb5ebefe5d39 100644 (file)
--- a/sim/testsuite/cris/c/c.exp
+++ b/sim/testsuite/cris/c/c.exp
@@ -19,10 +19,6 @@ if ![istarget cris*-*-*] {
     return
 }
 
-# Used to locate the `run` program.
-global arch
-set arch "cris"
-
 set CFLAGS_FOR_TARGET "-O2"
 if [istarget cris-*-*] {
     set mach "crisv10"

diff --git a/sim/testsuite/cris/hw/rv-n-cris/rvc.exp b/sim/testsuite/cris/hw/rv-n-cris/rvc.exp
index 0a018fa4b881ca0a631064fa730651848a0c1500..4e302d2238fb25fee0dd4388c7d5693989431f26 100644 (file)
--- a/sim/testsuite/cris/hw/rv-n-cris/rvc.exp
+++ b/sim/testsuite/cris/hw/rv-n-cris/rvc.exp
@@ -112,10 +112,6 @@ proc slurp_rv { file } {
 # The main test loop.
 
 if [istarget cris*-*-*] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "cris"
-
     global ASFLAGS_FOR_TARGET
     set has_rv_and_cris [sim_has_rv_and_cris]
     global global_as_options
@@ -129,8 +125,7 @@ if [istarget cris*-*-*] {
     set sim [board_info target sim]
     if [string equal "" $sim] {
        global objdir
-       global arch
-       set rvdummy "$objdir/../$arch/rvdummy"
+       set rvdummy "$objdir/cris/rvdummy"
     } else {
        set rvdummy "[file dirname [board_info target sim]]/rvdummy"
     }

diff --git a/sim/testsuite/d10v/ChangeLog b/sim/testsuite/d10v/ChangeLog
index d04d884513c12d1690c645b73ccceba946ef556d..f50a384c8129215534a16a0a2f38f4ef7f761703 100644 (file)
--- a/sim/testsuite/d10v/ChangeLog
+++ b/sim/testsuite/d10v/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-08  Mike Frysinger  <vapier@gentoo.org>
+
+       * allinsn.exp (arch): Delete.
+
 2021-02-13  Mike Frysinger  <vapier@gentoo.org>
 
        * allinsn.exp: Define arch.

diff --git a/sim/testsuite/d10v/allinsn.exp b/sim/testsuite/d10v/allinsn.exp
index e2e44a29092092eb7c47fcf2f56d5fbe8d419c9a..5f1a13177f142818f372557634cf9e17204b647b 100644 (file)
--- a/sim/testsuite/d10v/allinsn.exp
+++ b/sim/testsuite/d10v/allinsn.exp
@@ -1,10 +1,6 @@
 # d10v simulator testsuite.
 
 if [istarget d10v*-*] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "d10v"
-
     # all machines
     set all_machs "d10v"
 

diff --git a/sim/testsuite/example-synacor/ChangeLog b/sim/testsuite/example-synacor/ChangeLog
index 5d4562130668ca222de3f7aba3dac3157e9a7673..bb9b0b499325cf2226713a23f2ad11a24f904bc3 100644 (file)
--- a/sim/testsuite/example-synacor/ChangeLog
+++ b/sim/testsuite/example-synacor/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-08  Mike Frysinger  <vapier@gentoo.org>
+
+       * allinsn.exp (arch): Delete.
+
 2021-04-03  Mike Frysinger  <vapier@gentoo.org>
 
        * add.s, allinsn.exp, and.s, call.s, exit-0.s, gt.s, isa.inc, jmp.s,

diff --git a/sim/testsuite/example-synacor/allinsn.exp b/sim/testsuite/example-synacor/allinsn.exp
index 7210a610e737b92d46a18491c237f42d04ecb402..a73312b8adfb8a423a045fa93a7fab01f5b22c22 100644 (file)
--- a/sim/testsuite/example-synacor/allinsn.exp
+++ b/sim/testsuite/example-synacor/allinsn.exp
@@ -1,10 +1,6 @@
 # Example synacor simulator testsuite.
 
 if [istarget *] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "example-synacor"
-
     # All machines.
     set all_machs "example"
 

diff --git a/sim/testsuite/frv/ChangeLog b/sim/testsuite/frv/ChangeLog
index 7a34cf456f743ed8c3b995785727fdeedbf1eb32..aa7409f3ab35f381e8c4cf4fc81af9df3247ff1a 100644 (file)
--- a/sim/testsuite/frv/ChangeLog
+++ b/sim/testsuite/frv/ChangeLog
@@ -1,3 +1,9 @@
+2021-04-08  Mike Frysinger  <vapier@gentoo.org>
+
+       * allinsn.exp (arch): Delete.
+       * fr400/allinsn.exp, fr500/allinsn.exp, fr550/allinsn.exp,
+       interrupts.exp, misc.exp, parallel.exp: Likewise.
+
 2021-02-13  Mike Frysinger  <vapier@gentoo.org>
 
        * allinsn.exp, fr400/allinsn.exp, fr500/allinsn.exp,

diff --git a/sim/testsuite/frv/allinsn.exp b/sim/testsuite/frv/allinsn.exp
index 2633f30df567a33d8d92996137a8a26affde1acd..1781bf0ed170f5e166b8475b0a8600bc1741a578 100644 (file)
--- a/sim/testsuite/frv/allinsn.exp
+++ b/sim/testsuite/frv/allinsn.exp
@@ -1,10 +1,6 @@
 # FRV simulator testsuite.
 
 if [istarget frv*-*] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "frv"
-
     # all machines
     set all_machs "frv fr500 fr550 fr400 fr405 fr450"
     set cpu_option -mcpu

diff --git a/sim/testsuite/frv/fr400/allinsn.exp b/sim/testsuite/frv/fr400/allinsn.exp
index ea5846f8fa429607e02afdfb00ddb60992883e72..03ccbd6e8abaf4588269ca51ebd63bbb432ca6d8 100644 (file)
--- a/sim/testsuite/frv/fr400/allinsn.exp
+++ b/sim/testsuite/frv/fr400/allinsn.exp
@@ -1,10 +1,6 @@
 # FRV simulator testsuite.
 
 if [istarget frv*-*] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "frv"
-
     # 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 40caa630706068c11e52b7de2867ea633f3b1cb2..fa03797d39ceb36de195cafe92a43159ac68a4d6 100644 (file)
--- a/sim/testsuite/frv/fr500/allinsn.exp
+++ b/sim/testsuite/frv/fr500/allinsn.exp
@@ -1,10 +1,6 @@
 # FRV simulator testsuite.
 
 if [istarget frv*-*] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "frv"
-
     # 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 8768a6719946fccbb047c6336cb4034f5da047d2..c0e373aa2672727a1b257238df90e9376d960402 100644 (file)
--- a/sim/testsuite/frv/fr550/allinsn.exp
+++ b/sim/testsuite/frv/fr550/allinsn.exp
@@ -1,10 +1,6 @@
 # FRV simulator testsuite.
 
 if [istarget frv*-*] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "frv"
-
     # 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 d1f7628d962d404618c2dc7ba70e810d8ac3ec3b..6b2c84a629ad9a166360ba7af1f3bf08d4ad9b48 100644 (file)
--- a/sim/testsuite/frv/interrupts.exp
+++ b/sim/testsuite/frv/interrupts.exp
@@ -1,10 +1,6 @@
 # FRV simulator testsuite.
 
 if [istarget frv*-*] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "frv"
-
     # 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 d9c80a54600089542f61f153fe45e892b66c4774..fb394bb17f002bb19c172e629e349e8a1d2be7e0 100644 (file)
--- a/sim/testsuite/frv/misc.exp
+++ b/sim/testsuite/frv/misc.exp
@@ -1,10 +1,6 @@
 # Miscellaneous FRV simulator testcases.
 
 if [istarget frv*-*] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "frv"
-
     # 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 a883b9891d5d3cb70aacb9233426c862b31cdc70..612a1bfd9e1458cca9b6c05aa52f62f890b2bac6 100644 (file)
--- a/sim/testsuite/frv/parallel.exp
+++ b/sim/testsuite/frv/parallel.exp
@@ -1,10 +1,6 @@
 # FRV simulator testsuite.
 
 if [istarget frv*-*] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "frv"
-
     # all machines
     set all_machs "frv fr500 fr550 fr400"
     set cpu_option -mcpu

diff --git a/sim/testsuite/ft32/ChangeLog b/sim/testsuite/ft32/ChangeLog
index d7aba74aac2ba1f888397712f90fc35abca450dd..346ac7476ae77968f76e70bfbfced1f257c5bfe7 100644 (file)
--- a/sim/testsuite/ft32/ChangeLog
+++ b/sim/testsuite/ft32/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-08  Mike Frysinger  <vapier@gentoo.org>
+
+       * allinsn.exp (arch): Delete.
+
 2021-02-13  Mike Frysinger  <vapier@gentoo.org>
 
        * allinsn.exp: Define arch.

diff --git a/sim/testsuite/ft32/allinsn.exp b/sim/testsuite/ft32/allinsn.exp
index 50827a592473c4bc06e03b8cd55602550da6b8b4..730b4223632d62844440e33c119dbb7c60f08ec7 100644 (file)
--- a/sim/testsuite/ft32/allinsn.exp
+++ b/sim/testsuite/ft32/allinsn.exp
@@ -1,10 +1,6 @@
 # ft32 simulator testsuite
 
 if [istarget ft32-*] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "ft32"
-
     # all machines
     set all_machs "ft32"
 

diff --git a/sim/testsuite/h8300/ChangeLog b/sim/testsuite/h8300/ChangeLog
index 98020b806dcae350beb04c41c7fee458698f1da7..3a91705885e3825d71d35947294c6b9265c6bf91 100644 (file)
--- a/sim/testsuite/h8300/ChangeLog
+++ b/sim/testsuite/h8300/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-08  Mike Frysinger  <vapier@gentoo.org>
+
+       * allinsn.exp (arch): Delete.
+
 2021-02-13  Mike Frysinger  <vapier@gentoo.org>
 
        * allinsn.exp: Define arch.

diff --git a/sim/testsuite/h8300/allinsn.exp b/sim/testsuite/h8300/allinsn.exp
index 5355bf58a69d2dc21af03dd2fe8d70b2d4daed01..68468f6bb10682f3f984dfe0373adac82c3fc6a4 100644 (file)
--- a/sim/testsuite/h8300/allinsn.exp
+++ b/sim/testsuite/h8300/allinsn.exp
@@ -1,10 +1,6 @@
 # Hitachi H8/300 (h, s, sx) simulator testsuite
 
 if {[istarget h8300*-*-*] || [istarget h8sx*-*-*]} then {
-    # Used to locate the `run` program.
-    global arch
-    set arch "h8300"
-
     set all_machs "h8300 h8300h h8300s h8sx"
 
     foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] {

diff --git a/sim/testsuite/iq2000/ChangeLog b/sim/testsuite/iq2000/ChangeLog
index 8eb2490bb4dd6c4dd4abf490fe33f622539f9bea..4c94a665507b8098fd620f2e645742c597992ce7 100644 (file)
--- a/sim/testsuite/iq2000/ChangeLog
+++ b/sim/testsuite/iq2000/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-08  Mike Frysinger  <vapier@gentoo.org>
+
+       * allinsn.exp (arch): Delete.
+
 2021-02-13  Mike Frysinger  <vapier@gentoo.org>
 
        * allinsn.exp: Define arch.

diff --git a/sim/testsuite/iq2000/allinsn.exp b/sim/testsuite/iq2000/allinsn.exp
index 96d58435fb4551757ff6491cd13cf789bfa49deb..38eee9b277f13154a2265d198d75b18030355dda 100644 (file)
--- a/sim/testsuite/iq2000/allinsn.exp
+++ b/sim/testsuite/iq2000/allinsn.exp
@@ -1,10 +1,6 @@
 # iq2000 simulator testsuite
 
 if [istarget iq2000-*] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "iq2000"
-
     # all machines
     set all_machs "iq2000"
 

diff --git a/sim/testsuite/lib/sim-defs.exp b/sim/testsuite/lib/sim-defs.exp
index e1254a3278cf9116bb3621f5666dcd619eaeacba..1b40216ea6ed632b25750c2fff1131edd8e7fdfc 100644 (file)
--- a/sim/testsuite/lib/sim-defs.exp
+++ b/sim/testsuite/lib/sim-defs.exp
@@ -48,6 +48,22 @@ proc sim_compile { source dest type options } {
     return $result
 }
 
+# Find the path to the simulator for executing.
+proc sim_tool_path {} {
+    global sim_path
+    set sim "$sim_path"
+    if [string equal "" $sim] {
+       global objdir
+       global subdir
+       set arch "$subdir"
+       while { [file dirname $arch] != "." } {
+           set arch [file dirname $arch]
+       }
+       return "$objdir/$arch/run"
+    }
+    return "$sim"
+}
+
 # Run a program on the simulator.
 # Required by dejagnu (at least ${tool}_run used to be).
 #
@@ -98,16 +114,7 @@ proc sim_run { prog sim_opts prog_opts redir options } {
        
     verbose "testcase timeout is set to $testcase_timeout" 1
 
-    set sim [board_info target sim]
-    if [string equal "" $sim] {
-       # Special case the simulator.  These tests are designed to
-       # be run inside of the simulator, not on the native host.
-       # So if the sim target isn't set, default to the target run.
-       # These global variables come from generated site.exp.
-       global objdir
-       global arch
-       set sim "$objdir/$arch/run"
-    }
+    set sim [sim_tool_path]
 
     if [is_remote host] {
        set prog [remote_download host $prog]

diff --git a/sim/testsuite/lm32/ChangeLog b/sim/testsuite/lm32/ChangeLog
index 8eb2490bb4dd6c4dd4abf490fe33f622539f9bea..4c94a665507b8098fd620f2e645742c597992ce7 100644 (file)
--- a/sim/testsuite/lm32/ChangeLog
+++ b/sim/testsuite/lm32/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-08  Mike Frysinger  <vapier@gentoo.org>
+
+       * allinsn.exp (arch): Delete.
+
 2021-02-13  Mike Frysinger  <vapier@gentoo.org>
 
        * allinsn.exp: Define arch.

diff --git a/sim/testsuite/lm32/allinsn.exp b/sim/testsuite/lm32/allinsn.exp
index ae7c141bd6439b8e158db83b884c770e6b26d65d..61744985f6c8cdf280148fbb0661fff31750918b 100644 (file)
--- a/sim/testsuite/lm32/allinsn.exp
+++ b/sim/testsuite/lm32/allinsn.exp
@@ -1,10 +1,6 @@
 # lm32 simulator testsuite
 
 if [istarget lm32-*] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "lm32"
-
     # all machines
     set all_machs "lm32"
 

diff --git a/sim/testsuite/m32c/ChangeLog b/sim/testsuite/m32c/ChangeLog
index ce68cc35d4558f2e0d950da6743f631425648633..8172521f37983f6fa575bf06ce08dfa362955876 100644 (file)
--- a/sim/testsuite/m32c/ChangeLog
+++ b/sim/testsuite/m32c/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-08  Mike Frysinger  <vapier@gentoo.org>
+
+       * allinsn.exp (arch): Delete.
+
 2021-02-13  Mike Frysinger  <vapier@gentoo.org>
 
        * allinsn.exp: Define arch.

diff --git a/sim/testsuite/m32c/allinsn.exp b/sim/testsuite/m32c/allinsn.exp
index b09b505972a3e2e14ce419158f5d6116e64300d9..fb5ccca282e1e47c06f30462f5f635c6122ae2db 100644 (file)
--- a/sim/testsuite/m32c/allinsn.exp
+++ b/sim/testsuite/m32c/allinsn.exp
@@ -2,10 +2,6 @@
 # TODO: Add support for .c tests.
 
 if [istarget m32c*-*-*] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "m32c"
-
     # all machines
     set all_machs "m32c"
 

diff --git a/sim/testsuite/m32r/ChangeLog b/sim/testsuite/m32r/ChangeLog
index e855c1a48049fc40a358178e6c6579af64f36297..6e6facbf9bd220f54ff76d3935dbd960fdc0751a 100644 (file)
--- a/sim/testsuite/m32r/ChangeLog
+++ b/sim/testsuite/m32r/ChangeLog
@@ -1,3 +1,8 @@
+2021-04-08  Mike Frysinger  <vapier@gentoo.org>
+
+       * allinsn.exp (arch): Delete.
+       * misc.exp: Likewise.
+
 2021-02-13  Mike Frysinger  <vapier@gentoo.org>
 
        * allinsn.exp, misc.exp: Define arch.

diff --git a/sim/testsuite/m32r/allinsn.exp b/sim/testsuite/m32r/allinsn.exp
index a800e78b1b4618b79dff8d3e99f29560c4d528a8..17a86189f79f2f5b15bb14f2fb0ce85f24a8e756 100644 (file)
--- a/sim/testsuite/m32r/allinsn.exp
+++ b/sim/testsuite/m32r/allinsn.exp
@@ -1,10 +1,6 @@
 # M32R simulator testsuite.
 
 if [istarget m32r*-*-*] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "m32r"
-
     # all machines
     set all_machs "m32r"
 

diff --git a/sim/testsuite/m32r/misc.exp b/sim/testsuite/m32r/misc.exp
index e571c2eeb69ddc4e495cf2be6aecb3795755352d..6c624e737e74e016440e68c4113aa08797d68341 100644 (file)
--- a/sim/testsuite/m32r/misc.exp
+++ b/sim/testsuite/m32r/misc.exp
@@ -1,10 +1,6 @@
 # Miscellaneous M32R simulator testcases
 
 if [istarget m32r*-*-*] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "m32r"
-
     # all machines
     set all_machs "m32r"
 

diff --git a/sim/testsuite/m68hc11/ChangeLog b/sim/testsuite/m68hc11/ChangeLog
index 8eb2490bb4dd6c4dd4abf490fe33f622539f9bea..4c94a665507b8098fd620f2e645742c597992ce7 100644 (file)
--- a/sim/testsuite/m68hc11/ChangeLog
+++ b/sim/testsuite/m68hc11/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-08  Mike Frysinger  <vapier@gentoo.org>
+
+       * allinsn.exp (arch): Delete.
+
 2021-02-13  Mike Frysinger  <vapier@gentoo.org>
 
        * allinsn.exp: Define arch.

diff --git a/sim/testsuite/m68hc11/allinsn.exp b/sim/testsuite/m68hc11/allinsn.exp
index 0e9b51ec59346456d3147513ee04754b20a18d31..db0cbd5d46700a451e31f4ba2286fc97c55b8ae6 100644 (file)
--- a/sim/testsuite/m68hc11/allinsn.exp
+++ b/sim/testsuite/m68hc11/allinsn.exp
@@ -1,10 +1,6 @@
 # m68hc11 simulator testsuite
 
 if [istarget m68hc11-*] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "m68hc11"
-
     # all machines
     set all_machs "m68hc11"
 

diff --git a/sim/testsuite/mcore/ChangeLog b/sim/testsuite/mcore/ChangeLog
index 18a2292c2f0d2aee15986abaa897b4aa70611cf4..78f076918ee1becec3f473bf710db80809b53f22 100644 (file)
--- a/sim/testsuite/mcore/ChangeLog
+++ b/sim/testsuite/mcore/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-08  Mike Frysinger  <vapier@gentoo.org>
+
+       * allinsn.exp (arch): Delete.
+
 2021-02-13  Mike Frysinger  <vapier@gentoo.org>
 
        * allinsn.exp: Define arch.

diff --git a/sim/testsuite/mcore/allinsn.exp b/sim/testsuite/mcore/allinsn.exp
index ecc934b201463bcb1cccf864ef6915a4e38faf64..5921cfc26431e6bdd71769020c34c27460bfeafb 100644 (file)
--- a/sim/testsuite/mcore/allinsn.exp
+++ b/sim/testsuite/mcore/allinsn.exp
@@ -1,10 +1,6 @@
 # mcore simulator testsuite
 
 if [istarget mcore-*] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "mcore"
-
     # all machines
     set all_machs "mcore"
 

diff --git a/sim/testsuite/microblaze/ChangeLog b/sim/testsuite/microblaze/ChangeLog
index 5808b63ab60d908f51244e5e85a690be69b827f8..b282fc3a31c97bfbb38fc4d9bd45c74363a08738 100644 (file)
--- a/sim/testsuite/microblaze/ChangeLog
+++ b/sim/testsuite/microblaze/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-08  Mike Frysinger  <vapier@gentoo.org>
+
+       * allinsn.exp (arch): Delete.
+
 2021-02-13  Mike Frysinger  <vapier@gentoo.org>
 
        * allinsn.exp: Define arch.

diff --git a/sim/testsuite/microblaze/allinsn.exp b/sim/testsuite/microblaze/allinsn.exp
index 5f5a4475eed42eb1596772728c856a952460fb17..f756914292c4e46e0cb14ea280b4c34cd28cc496 100644 (file)
--- a/sim/testsuite/microblaze/allinsn.exp
+++ b/sim/testsuite/microblaze/allinsn.exp
@@ -1,10 +1,6 @@
 # microblaze simulator testsuite
 
 if [istarget microblaze-*] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "microblaze"
-
     # all machines
     set all_machs "microblaze"
 

diff --git a/sim/testsuite/mips/ChangeLog b/sim/testsuite/mips/ChangeLog
index feedcd36c9bb77c15b11a70115f86414c2af53b6..b64f6912d10066b1a8e77a421eede2f4d41c60b0 100644 (file)
--- a/sim/testsuite/mips/ChangeLog
+++ b/sim/testsuite/mips/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-08  Mike Frysinger  <vapier@gentoo.org>
+
+       * basic.exp (arch): Delete.
+
 2021-02-13  Mike Frysinger  <vapier@gentoo.org>
 
        * basic.exp: Define arch.

diff --git a/sim/testsuite/mips/basic.exp b/sim/testsuite/mips/basic.exp
index 2eff923c0fc7671112c95fa5cac022eefb7c53e2..352b3b4e7193f46825a09174c49a5817814eaf21 100644 (file)
--- a/sim/testsuite/mips/basic.exp
+++ b/sim/testsuite/mips/basic.exp
@@ -42,10 +42,6 @@ proc run_sim_tests { name requested_machs { requested_micromips_machs "" } } {
 
 # Only test mips*-*-elf (e.g., no mips*-*-linux)
 if {[istarget mips*-*-elf]} {
-    # Used to locate the `run` program.
-    global arch
-    set arch "mips"
-
     set dspmodels ""
     set mdmxmodels ""
     set micromipsmodels ""

diff --git a/sim/testsuite/mn10300/ChangeLog b/sim/testsuite/mn10300/ChangeLog
index 8eb2490bb4dd6c4dd4abf490fe33f622539f9bea..4c94a665507b8098fd620f2e645742c597992ce7 100644 (file)
--- a/sim/testsuite/mn10300/ChangeLog
+++ b/sim/testsuite/mn10300/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-08  Mike Frysinger  <vapier@gentoo.org>
+
+       * allinsn.exp (arch): Delete.
+
 2021-02-13  Mike Frysinger  <vapier@gentoo.org>
 
        * allinsn.exp: Define arch.

diff --git a/sim/testsuite/mn10300/allinsn.exp b/sim/testsuite/mn10300/allinsn.exp
index 7166aefddf30d35f5d02bb1dd7652b35b628e52b..f8431e7222ea51d580a598cf836fc04c793cdc7e 100644 (file)
--- a/sim/testsuite/mn10300/allinsn.exp
+++ b/sim/testsuite/mn10300/allinsn.exp
@@ -1,10 +1,6 @@
 # mn10300 simulator testsuite
 
 if [istarget mn10300-*] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "mn10300"
-
     # all machines
     set all_machs "mn10300"
 

diff --git a/sim/testsuite/moxie/ChangeLog b/sim/testsuite/moxie/ChangeLog
index 8eb2490bb4dd6c4dd4abf490fe33f622539f9bea..4c94a665507b8098fd620f2e645742c597992ce7 100644 (file)
--- a/sim/testsuite/moxie/ChangeLog
+++ b/sim/testsuite/moxie/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-08  Mike Frysinger  <vapier@gentoo.org>
+
+       * allinsn.exp (arch): Delete.
+
 2021-02-13  Mike Frysinger  <vapier@gentoo.org>
 
        * allinsn.exp: Define arch.

diff --git a/sim/testsuite/moxie/allinsn.exp b/sim/testsuite/moxie/allinsn.exp
index 241e675762532685577cb9fa37642f94ccfe3917..1a6af8b37d456a50ea352f73035e2f4f1038b1b5 100644 (file)
--- a/sim/testsuite/moxie/allinsn.exp
+++ b/sim/testsuite/moxie/allinsn.exp
@@ -1,10 +1,6 @@
 # moxie simulator testsuite
 
 if [istarget moxie-*] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "moxie"
-
     # all machines
     set all_machs "moxie"
 

diff --git a/sim/testsuite/msp430/ChangeLog b/sim/testsuite/msp430/ChangeLog
index df36ad6e5dc5924503e849d2bf8c14add14f85e8..ebb42c559cb90dfe0262f6e42d44562c29e4f742 100644 (file)
--- a/sim/testsuite/msp430/ChangeLog
+++ b/sim/testsuite/msp430/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-08  Mike Frysinger  <vapier@gentoo.org>
+
+       * allinsn.exp (arch): Delete.
+
 2021-02-13  Mike Frysinger  <vapier@gentoo.org>
 
        * allinsn.exp: Define arch.

diff --git a/sim/testsuite/msp430/allinsn.exp b/sim/testsuite/msp430/allinsn.exp
index 83030290cce292aaf8c57cfcdf9defde5ee81d1b..affa8aedc2ad998370835e04ac45e94c6f3c53c8 100644 (file)
--- a/sim/testsuite/msp430/allinsn.exp
+++ b/sim/testsuite/msp430/allinsn.exp
@@ -1,10 +1,6 @@
 # msp430 simulator testsuite
 
 if [istarget msp430-*] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "msp430"
-
     # all machines
     set all_machs "msp430"
 

diff --git a/sim/testsuite/or1k/ChangeLog b/sim/testsuite/or1k/ChangeLog
index f4bc2e1f2638ab15210e6c5094d2666f3e583979..b105c0f0cfd3d625cc2e7f6a4bc6888ce12d1a95 100644 (file)
--- a/sim/testsuite/or1k/ChangeLog
+++ b/sim/testsuite/or1k/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-08  Mike Frysinger  <vapier@gentoo.org>
+
+       * alltests.exp (arch): Delete.
+
 2021-02-13  Mike Frysinger  <vapier@gentoo.org>
 
        * alltests.exp: Define arch.

diff --git a/sim/testsuite/or1k/alltests.exp b/sim/testsuite/or1k/alltests.exp
index 98c1345d0be5a5a69849e8c63fe516940bf13e6a..365f3910debf0f140478ba205c965fb170d25336 100644 (file)
--- a/sim/testsuite/or1k/alltests.exp
+++ b/sim/testsuite/or1k/alltests.exp
@@ -16,10 +16,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 if [istarget or1k*-*-*] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "or1k"
-
     set all_machs "or1k"
 
     global global_ld_options

diff --git a/sim/testsuite/pru/ChangeLog b/sim/testsuite/pru/ChangeLog
index c6a0af5f026ae95c92d56ff0573989e12a9592dc..a10ff0bc16fe1d8beb3dd35187dce94686d6b230 100644 (file)
--- a/sim/testsuite/pru/ChangeLog
+++ b/sim/testsuite/pru/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-08  Mike Frysinger  <vapier@gentoo.org>
+
+       * allinsn.exp (arch): Delete.
+
 2021-02-13  Mike Frysinger  <vapier@gentoo.org>
 
        * allinsn.exp: Define arch.

diff --git a/sim/testsuite/pru/allinsn.exp b/sim/testsuite/pru/allinsn.exp
index c0d5ce93689481293f20fa2e4bf9ccf66400050c..d147f731c9134326f86a17cc760903e972577b0f 100644 (file)
--- a/sim/testsuite/pru/allinsn.exp
+++ b/sim/testsuite/pru/allinsn.exp
@@ -19,10 +19,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 if [istarget pru-*] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "pru"
-
     # all machines
     set all_machs "pru"
 

diff --git a/sim/testsuite/riscv/ChangeLog b/sim/testsuite/riscv/ChangeLog
index f982ea85b61f6c1659945c830c0d01a1be06850d..9d7feba490090096057df6f650415892302b56c2 100644 (file)
--- a/sim/testsuite/riscv/ChangeLog
+++ b/sim/testsuite/riscv/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-08  Mike Frysinger  <vapier@gentoo.org>
+
+       * allinsn.exp (arch): Delete.
+
 2021-02-13  Mike Frysinger  <vapier@gentoo.org>
 
        * allinsn.exp: Define arch.

diff --git a/sim/testsuite/riscv/allinsn.exp b/sim/testsuite/riscv/allinsn.exp
index 5701391da832bedf3e2cdb831835d22eccbe76c3..03bec1b541e7c9f5629d7a513765e23690d4b7a8 100644 (file)
--- a/sim/testsuite/riscv/allinsn.exp
+++ b/sim/testsuite/riscv/allinsn.exp
@@ -1,10 +1,6 @@
 # RISC-V simulator testsuite.
 
 if [istarget riscv*-*] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "riscv"
-
     # all machines
     set all_machs "riscv"
 

diff --git a/sim/testsuite/sh/ChangeLog b/sim/testsuite/sh/ChangeLog
index 3351f5f932d54134b0829eae73774a53a52e6cff..0e1f20060f42ad6f36dd03346e15c385e4b95701 100644 (file)
--- a/sim/testsuite/sh/ChangeLog
+++ b/sim/testsuite/sh/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-08  Mike Frysinger  <vapier@gentoo.org>
+
+       * allinsn.exp (arch): Delete.
+
 2021-02-13  Mike Frysinger  <vapier@gentoo.org>
 
        * allinsn.exp: Define arch.

diff --git a/sim/testsuite/sh/allinsn.exp b/sim/testsuite/sh/allinsn.exp
index 235a40c692ab0248efe78732a88877c3207c9c7b..40d1392994263041db6c1a093999790c1998dd0e 100644 (file)
--- a/sim/testsuite/sh/allinsn.exp
+++ b/sim/testsuite/sh/allinsn.exp
@@ -13,10 +13,6 @@ foreach opt $board_variant_list {
 }
 
 if [istarget sh-*elf] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "sh"
-
     run_sim_test add.s    $all
     run_sim_test and.s    $all
     run_sim_test bandor.s sh

diff --git a/sim/testsuite/v850/ChangeLog b/sim/testsuite/v850/ChangeLog
index 24933c53a9726a46ca1349c5cdad454c19e75462..5e9ddbe5bed703ec64e221e1e0a2b8a87d58ed35 100644 (file)
--- a/sim/testsuite/v850/ChangeLog
+++ b/sim/testsuite/v850/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-08  Mike Frysinger  <vapier@gentoo.org>
+
+       * allinsns.exp (arch): Delete.
+
 2021-02-13  Mike Frysinger  <vapier@gentoo.org>
 
        * allinsns.exp: Define arch.

diff --git a/sim/testsuite/v850/allinsns.exp b/sim/testsuite/v850/allinsns.exp
index 4c3bc088ff6b31ff36232b64d9408b35f1bef65e..93dcffce2f372baec3b7827d358cc8169007a1d7 100644 (file)
--- a/sim/testsuite/v850/allinsns.exp
+++ b/sim/testsuite/v850/allinsns.exp
@@ -3,10 +3,6 @@
 if [istarget v850*-*] {
     global opt
 
-    # Used to locate the `run` program.
-    global arch
-    set arch "v850"
-
     # all machines
     switch -regexp -- $opt {
        .*v850e.* {