summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2021-11-21 20:36:40 -0500
committerMike Frysinger <vapier@gentoo.org>2021-11-26 13:27:34 -0500
commitaa1b9bdef2a66205e34b0a62c80d8b1b70268825 (patch)
treead952b6cddb817aabaf23a9b1fc060c033fd45ca
parent61a5375b842e24b6f492efda7eb213b6e6cf677d (diff)
downloadbinutils-gdb-aa1b9bdef2a66205e34b0a62c80d8b1b70268825.tar.gz
sim: testsuite: punt unused toolchain variables
These haven't been used in over 20 years. The sim testsuite used to run these tools itself directly, but back in ~1999 it switched to the dejagnu helpers (e.g. target_assemble & target_link), and the dejagnu logic only utilizes XXX_FOR_TARGET variables. Punt them here to avoid confusion with dead code.
-rw-r--r--sim/testsuite/config/default.exp37
-rw-r--r--sim/testsuite/cris/hw/rv-n-cris/rvc.exp1
-rw-r--r--sim/testsuite/lib/sim-defs.exp9
3 files changed, 3 insertions, 44 deletions
diff --git a/sim/testsuite/config/default.exp b/sim/testsuite/config/default.exp
index 56255a33f3a..c167e10a7f3 100644
--- a/sim/testsuite/config/default.exp
+++ b/sim/testsuite/config/default.exp
@@ -2,41 +2,4 @@
load_lib sim-defs.exp
-global AS
-if ![info exists AS] {
- set AS [findfile $base_dir/../../gas/as-new $base_dir/../../gas/as-new \
- [transform as]]
-}
-
-global ASFLAGS
-if ![info exists ASFLAGS] {
- set ASFLAGS ""
-}
-
-# Compilation is achieved with sim_compile ... so we don't check $CC here.
-
-global CFLAGS
-if ![info exists CFLAGS] {
- set CFLAGS ""
-}
-
-global LD
-if ![info exists LD] {
- set LD [findfile $base_dir/../../ld/ld-new $base_dir/../../ld/ld-new \
- [transform ld]]
-}
-
-global LDFLAGS
-if ![info exists LDFLAGS] {
- set LDFLAGS ""
-}
-
-# The path to the simulator is obtained with [board_info host sim],
-# so we don't check $SIM here.
-
-global SIMFLAGS
-if ![info exists SIMFLAGS] {
- set SIMFLAGS ""
-}
-
sim_init
diff --git a/sim/testsuite/cris/hw/rv-n-cris/rvc.exp b/sim/testsuite/cris/hw/rv-n-cris/rvc.exp
index ff3f757e49d..24371d96bc4 100644
--- a/sim/testsuite/cris/hw/rv-n-cris/rvc.exp
+++ b/sim/testsuite/cris/hw/rv-n-cris/rvc.exp
@@ -21,7 +21,6 @@
proc sim_has_rv_and_cris {} {
global srcdir
global subdir
- global SIMFLAGS
global global_as_options
global global_ld_options
global global_sim_options
diff --git a/sim/testsuite/lib/sim-defs.exp b/sim/testsuite/lib/sim-defs.exp
index b3dff9e1a66..adf1369fc62 100644
--- a/sim/testsuite/lib/sim-defs.exp
+++ b/sim/testsuite/lib/sim-defs.exp
@@ -73,8 +73,6 @@ proc sim_tool_path {} {
# simulator (not the simulated program, the simulator) with sim_load.
proc sim_run { prog sim_opts prog_opts redir options } {
- global SIMFLAGS
-
# Set the default value of the timeout.
# FIXME: The timeout value we actually want is a function of
# host, target, and testcase.
@@ -130,12 +128,12 @@ proc sim_run { prog sim_opts prog_opts redir options } {
set cmd "$prog"
}
- send_log "$sim $always_opts $SIMFLAGS $sim_opts $cmd $prog_opts\n"
+ send_log "$sim $always_opts $sim_opts $cmd $prog_opts\n"
if { "$redir" == "" } {
- remote_spawn host "$sim $always_opts $SIMFLAGS $sim_opts $cmd $prog_opts"
+ remote_spawn host "$sim $always_opts $sim_opts $cmd $prog_opts"
} else {
- remote_spawn host "$sim $always_opts $SIMFLAGS $sim_opts $cmd $prog_opts $redir" writeonly
+ remote_spawn host "$sim $always_opts $sim_opts $cmd $prog_opts $redir" writeonly
}
set result [remote_wait host $testcase_timeout]
@@ -184,7 +182,6 @@ proc sim_run { prog sim_opts prog_opts redir options } {
proc run_sim_test { name requested_machs } {
global subdir srcdir
- global SIMFLAGS
global opts
global cpu_option
global cpu_option_sep