diff options
Diffstat (limited to 'sim/bfin')
| -rw-r--r-- | sim/bfin/ChangeLog | 7 | ||||
| -rw-r--r-- | sim/bfin/aclocal.m4 | 1 | ||||
| -rwxr-xr-x | sim/bfin/configure | 29 | ||||
| -rw-r--r-- | sim/bfin/configure.ac | 2 | ||||
| -rw-r--r-- | sim/bfin/interp.c | 1 |
5 files changed, 9 insertions, 31 deletions
diff --git a/sim/bfin/ChangeLog b/sim/bfin/ChangeLog index 6b0000a..c1397bd 100644 --- a/sim/bfin/ChangeLog +++ b/sim/bfin/ChangeLog @@ -1,5 +1,12 @@ 2021-06-30 Mike Frysinger <vapier@gentoo.org> + * configure.ac: Delete SIM_AC_OPTION_DEFAULT_MODEL call. + * interp.c (sim_open): Set STATE_MODEL_NAME. + * aclocal.m4: Regenerate. + * configure: Regenerate. + +2021-06-30 Mike Frysinger <vapier@gentoo.org> + * interp.c (sim_open): Set STATE_MACHS. * machs.c (sim_machs): Rename to ... (bfin_sim_machs): ... this. diff --git a/sim/bfin/aclocal.m4 b/sim/bfin/aclocal.m4 index bdbe880..c9414d4 100644 --- a/sim/bfin/aclocal.m4 +++ b/sim/bfin/aclocal.m4 @@ -12,5 +12,4 @@ # 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_output.m4]) diff --git a/sim/bfin/configure b/sim/bfin/configure index bed0a3d..9b8c7fc 100755 --- a/sim/bfin/configure +++ b/sim/bfin/configure @@ -628,12 +628,10 @@ PACKAGE_VERSION PACKAGE_TARNAME PACKAGE_NAME PATH_SEPARATOR -SHELL -sim_default_model' +SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking -enable_sim_default_model ' ac_precious_vars='build_alias host_alias @@ -1241,13 +1239,6 @@ if test -n "$ac_init_help"; then cat <<\_ACEOF -Optional Features: - --disable-option-checking ignore unrecognized --enable/--with options - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-sim-default-model=model - Specify default model to simulate - Report bugs to the package provider. _ACEOF ac_status=$? @@ -1678,23 +1669,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - -default_sim_default_model="bf537" -# 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"; @@ -1716,7 +1690,6 @@ ac_config_commands="$ac_config_commands stamp-h" - SIM_COMMON_BUILD_TRUE='#' SIM_COMMON_BUILD_FALSE= diff --git a/sim/bfin/configure.ac b/sim/bfin/configure.ac index 6cf5c48..99370b3 100644 --- a/sim/bfin/configure.ac +++ b/sim/bfin/configure.ac @@ -2,6 +2,4 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(Makefile.in) AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config]) -SIM_AC_OPTION_DEFAULT_MODEL(bf537) - SIM_AC_OUTPUT diff --git a/sim/bfin/interp.c b/sim/bfin/interp.c index dcc7a13..b99f20d 100644 --- a/sim/bfin/interp.c +++ b/sim/bfin/interp.c @@ -704,6 +704,7 @@ sim_open (SIM_OPEN_KIND kind, host_callback *callback, /* Set default options before parsing user options. */ STATE_MACHS (sd) = bfin_sim_machs; + STATE_MODEL_NAME (sd) = "bf537"; current_alignment = STRICT_ALIGNMENT; current_target_byte_order = BFD_ENDIAN_LITTLE; |