sim: testsuite: rename global_sim_options to SIMFLAGS_FOR_TARGET

Now that all the other toolchain settings have been renamed to match
the dejagnu settings of XXX_FOR_TARGET, rename global_sim_options to
SIMFLAGS_FOR_TARGET too.

2 files changed, 4 insertions, 16 deletions

diff --git a/sim/testsuite/cr16/allinsn.exp b/sim/testsuite/cr16/allinsn.exp
index d6602b4..7105a1a 100644
--- a/sim/testsuite/cr16/allinsn.exp
+++ b/sim/testsuite/cr16/allinsn.exp
@@ -4,14 +4,10 @@ if [istarget cr16*-*-*] {
     # all machines
     set all_machs "cr16"
 
-    global global_sim_options
-    if ![info exists global_sim_options] {
-	set global_sim_options ""
-    }
-    set saved_global_sim_options $global_sim_options
+    global SIMFLAGS_FOR_TARGET
     # The cr16 linker sets the default LMA base to 0, and all the code
     # expects the VMA when running, so use that when running the tests.
-    set global_sim_options "$saved_global_sim_options --load-vma"
+    set SIMFLAGS_FOR_TARGET "--load-vma"
 
     # The .cgs suffix is for "cgen .s".
     foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.cgs]] {
@@ -23,6 +19,4 @@ if [istarget cr16*-*-*] {
 
 	run_sim_test $src $all_machs
     }
-
-    set global_sim_options $saved_global_sim_options
 }
diff --git a/sim/testsuite/cr16/misc.exp b/sim/testsuite/cr16/misc.exp
index 5f9d681..bb1bef3 100644
--- a/sim/testsuite/cr16/misc.exp
+++ b/sim/testsuite/cr16/misc.exp
@@ -4,14 +4,10 @@ if [istarget cr16*-*-*] {
     # all machines
     set all_machs "cr16"
 
-    global global_sim_options
-    if ![info exists global_sim_options] {
-	set global_sim_options ""
-    }
-    set saved_global_sim_options $global_sim_options
+    global SIMFLAGS_FOR_TARGET
     # The cr16 linker sets the default LMA base to 0, and all the code
     # expects the VMA when running, so use that when running the tests.
-    set global_sim_options "$saved_global_sim_options --load-vma"
+    set SIMFLAGS_FOR_TARGET "--load-vma"
 
     # The .ms suffix is for "miscellaneous .s".
     foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.ms]] {
@@ -23,6 +19,4 @@ if [istarget cr16*-*-*] {
 
 	run_sim_test $src $all_machs
     }
-
-    set global_sim_options $saved_global_sim_options
 }