diff options
Diffstat (limited to 'sim/m32r')
| -rw-r--r-- | sim/m32r/ChangeLog | 7 | ||||
| -rw-r--r-- | sim/m32r/aclocal.m4 | 1 | ||||
| -rwxr-xr-x | sim/m32r/configure | 23 | ||||
| -rw-r--r-- | sim/m32r/configure.ac | 1 | ||||
| -rw-r--r-- | sim/m32r/sim-if.c | 1 |
5 files changed, 9 insertions, 24 deletions
diff --git a/sim/m32r/ChangeLog b/sim/m32r/ChangeLog index d2abefc..d738f5d 100644 --- a/sim/m32r/ChangeLog +++ b/sim/m32r/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 ... (m32r_sim_machs): ... this. * sim-if.c (m32r_sim_machs): New decl. diff --git a/sim/m32r/aclocal.m4 b/sim/m32r/aclocal.m4 index 212a399..ca624a7 100644 --- a/sim/m32r/aclocal.m4 +++ b/sim/m32r/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/m32r/configure b/sim/m32r/configure index e9b4b76..25077dd 100755 --- a/sim/m32r/configure +++ b/sim/m32r/configure @@ -630,13 +630,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 @@ -1250,8 +1248,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 @@ -1703,22 +1699,6 @@ fi -default_sim_default_model="m32r/d" -# 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 - - - case "${target_alias}" in m32r*-linux*) traps_obj=traps-linux.o @@ -1753,7 +1733,6 @@ ac_config_commands="$ac_config_commands stamp-h" - SIM_COMMON_BUILD_TRUE='#' SIM_COMMON_BUILD_FALSE= diff --git a/sim/m32r/configure.ac b/sim/m32r/configure.ac index f98adb2..eed2e91 100644 --- a/sim/m32r/configure.ac +++ b/sim/m32r/configure.ac @@ -3,7 +3,6 @@ AC_INIT(Makefile.in) AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config]) SIM_AC_OPTION_SCACHE(16384) -SIM_AC_OPTION_DEFAULT_MODEL(m32r/d) case "${target_alias}" in m32r*-linux*) diff --git a/sim/m32r/sim-if.c b/sim/m32r/sim-if.c index 33ae7c1..8957e83 100644 --- a/sim/m32r/sim-if.c +++ b/sim/m32r/sim-if.c @@ -58,6 +58,7 @@ sim_open (SIM_OPEN_KIND kind, host_callback *callback, struct bfd *abfd, /* Set default options before parsing user options. */ STATE_MACHS (sd) = m32r_sim_machs; + STATE_MODEL_NAME (sd) = "m32r/d"; current_alignment = STRICT_ALIGNMENT; current_target_byte_order = BFD_ENDIAN_BIG; |