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.
This commit is contained in:
Mike Frysinger
2021-11-21 20:36:40 -05:00
parent 61a5375b84
commit aa1b9bdef2
3 changed files with 3 additions and 44 deletions

View File

@ -2,41 +2,4 @@
load_lib sim-defs.exp 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 sim_init

View File

@ -21,7 +21,6 @@
proc sim_has_rv_and_cris {} { proc sim_has_rv_and_cris {} {
global srcdir global srcdir
global subdir global subdir
global SIMFLAGS
global global_as_options global global_as_options
global global_ld_options global global_ld_options
global global_sim_options global global_sim_options

View File

@ -73,8 +73,6 @@ proc sim_tool_path {} {
# simulator (not the simulated program, the simulator) with sim_load. # simulator (not the simulated program, the simulator) with sim_load.
proc sim_run { prog sim_opts prog_opts redir options } { proc sim_run { prog sim_opts prog_opts redir options } {
global SIMFLAGS
# Set the default value of the timeout. # Set the default value of the timeout.
# FIXME: The timeout value we actually want is a function of # FIXME: The timeout value we actually want is a function of
# host, target, and testcase. # host, target, and testcase.
@ -130,12 +128,12 @@ proc sim_run { prog sim_opts prog_opts redir options } {
set cmd "$prog" 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" == "" } { 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 { } 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] 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 } { proc run_sim_test { name requested_machs } {
global subdir srcdir global subdir srcdir
global SIMFLAGS
global opts global opts
global cpu_option global cpu_option
global cpu_option_sep global cpu_option_sep