sim: move default model to the runtime sim state

This kills off another compile-time option by moving the setting to
the individual arch runtimes.  This will allow dynamic selection by
the arch when doing a single build with multiple arches.

The sim_model_init rework is a little funky.  In the past it was
disabled entirely if no default model was set.  We maintain the
spirit of the logic by gating the fallback logic on whether the
port has defined any models.

5 files changed, 9 insertions, 24 deletions

diff --git a/sim/lm32/ChangeLog b/sim/lm32/ChangeLog
index 6d2d238d66f..f9092a93517 100644
--- a/sim/lm32/ChangeLog
+++ b/sim/lm32/ChangeLog
@@ -1,5 +1,12 @@
 2021-06-30  Mike Frysinger  <vapier@gentoo.org>
 
+	* configure.ac: Delete SIM_AC_OPTION_DEFAULT_MODEL call.
+	* sim-if.c (sim_open): Set STATE_MODEL_NAME.
+	* aclocal.m4: Regenerate.
+	* configure: Regenerate.
+
+2021-06-30  Mike Frysinger  <vapier@gentoo.org>
+
 	* arch.c (sim_machs): Rename to ...
 	(lm32_sim_machs): ... this.
 	* sim-if.c (lm32_sim_machs): New decl.
diff --git a/sim/lm32/aclocal.m4 b/sim/lm32/aclocal.m4
index 212a399016b..ca624a71181 100644
--- a/sim/lm32/aclocal.m4
+++ b/sim/lm32/aclocal.m4
@@ -12,6 +12,5 @@
 # PARTICULAR PURPOSE.
 
 m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
-m4_include([../m4/sim_ac_option_default_model.m4])
 m4_include([../m4/sim_ac_option_scache.m4])
 m4_include([../m4/sim_ac_output.m4])
diff --git a/sim/lm32/configure b/sim/lm32/configure
index 2fa956b1fd4..1f182822a71 100755
--- a/sim/lm32/configure
+++ b/sim/lm32/configure
@@ -628,13 +628,11 @@ PACKAGE_TARNAME
 PACKAGE_NAME
 PATH_SEPARATOR
 SHELL
-sim_scache
-sim_default_model'
+sim_scache'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
 enable_sim_scache
-enable_sim_default_model
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1248,8 +1246,6 @@ Optional Features:
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-sim-scache=size
                           Specify simulator execution cache size
-  --enable-sim-default-model=model
-                          Specify default model to simulate
 
 Report bugs to the package provider.
 _ACEOF
@@ -1701,22 +1697,6 @@ fi
 
 
 
-default_sim_default_model="lm32"
-# Check whether --enable-sim-default-model was given.
-if test "${enable_sim_default_model+set}" = set; then :
-  enableval=$enable_sim_default_model; case "${enableval}" in
-  yes|no) as_fn_error $? "\"Missing argument to --enable-sim-default-model\"" "$LINENO" 5;;
-  *)	sim_default_model="-DWITH_DEFAULT_MODEL='\"${enableval}\"'";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_default_model" != x""; then
-  echo "Setting default model = $sim_default_model" 6>&1
-fi
-else
-  sim_default_model="-DWITH_DEFAULT_MODEL='\"${default_sim_default_model}\"'"
-fi
-
-
-
 cgen_breaks=""
 if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then
 cgen_breaks="break cgen_rtx_error";
@@ -1738,7 +1718,6 @@ ac_config_commands="$ac_config_commands stamp-h"
 
 
 
-
 SIM_COMMON_BUILD_TRUE='#'
 SIM_COMMON_BUILD_FALSE=
 
diff --git a/sim/lm32/configure.ac b/sim/lm32/configure.ac
index 96b6f0e98e2..d2037221bfe 100644
--- a/sim/lm32/configure.ac
+++ b/sim/lm32/configure.ac
@@ -3,6 +3,5 @@ AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
 
 SIM_AC_OPTION_SCACHE(16384)
-SIM_AC_OPTION_DEFAULT_MODEL(lm32)
 
 SIM_AC_OUTPUT
diff --git a/sim/lm32/sim-if.c b/sim/lm32/sim-if.c
index abb9ad7b042..f9143ea0037 100644
--- a/sim/lm32/sim-if.c
+++ b/sim/lm32/sim-if.c
@@ -95,6 +95,7 @@ sim_open (SIM_OPEN_KIND kind, host_callback *callback, struct bfd *abfd,
 
   /* Set default options before parsing user options.  */
   STATE_MACHS (sd) = lm32_sim_machs;
+  STATE_MODEL_NAME (sd) = "lm32";
   current_alignment = STRICT_ALIGNMENT;
   current_target_byte_order = BFD_ENDIAN_BIG;