diff options
Diffstat (limited to 'sim/or1k')
| -rw-r--r-- | sim/or1k/ChangeLog | 7 | ||||
| -rw-r--r-- | sim/or1k/aclocal.m4 | 1 | ||||
| -rwxr-xr-x | sim/or1k/configure | 21 | ||||
| -rw-r--r-- | sim/or1k/configure.ac | 1 | ||||
| -rw-r--r-- | sim/or1k/sim-if.c | 1 |
5 files changed, 8 insertions, 23 deletions
diff --git a/sim/or1k/ChangeLog b/sim/or1k/ChangeLog index 94e7e0e..9cd2f22 100644 --- a/sim/or1k/ChangeLog +++ b/sim/or1k/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 ... (or1k_sim_machs): ... this. * sim-if.c (or1k_sim_machs): New decl. diff --git a/sim/or1k/aclocal.m4 b/sim/or1k/aclocal.m4 index d0f761f..90a839c 100644 --- a/sim/or1k/aclocal.m4 +++ b/sim/or1k/aclocal.m4 @@ -13,6 +13,5 @@ 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_bitsize.m4]) -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/or1k/configure b/sim/or1k/configure index adf13d0..3677607 100755 --- a/sim/or1k/configure +++ b/sim/or1k/configure @@ -628,14 +628,12 @@ PACKAGE_NAME PATH_SEPARATOR SHELL sim_scache -sim_default_model sim_bitsize' ac_subst_files='' ac_user_opts=' enable_option_checking enable_sim_bitsize enable_sim_scache -enable_sim_default_model ' ac_precious_vars='build_alias host_alias @@ -1250,8 +1248,6 @@ Optional Features: --enable-sim-bitsize=N Specify target bitsize (32 or 64) --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 @@ -1762,22 +1758,6 @@ fi -default_sim_default_model="or1200" -# 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"; @@ -1799,7 +1779,6 @@ ac_config_commands="$ac_config_commands stamp-h" - SIM_COMMON_BUILD_TRUE='#' SIM_COMMON_BUILD_FALSE= diff --git a/sim/or1k/configure.ac b/sim/or1k/configure.ac index c72c80c..aaeb121 100644 --- a/sim/or1k/configure.ac +++ b/sim/or1k/configure.ac @@ -4,6 +4,5 @@ AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config]) SIM_AC_OPTION_BITSIZE([32], [31], [32]) SIM_AC_OPTION_SCACHE(16384) -SIM_AC_OPTION_DEFAULT_MODEL([or1200]) SIM_AC_OUTPUT diff --git a/sim/or1k/sim-if.c b/sim/or1k/sim-if.c index e835388..3f47ce5 100644 --- a/sim/or1k/sim-if.c +++ b/sim/or1k/sim-if.c @@ -164,6 +164,7 @@ sim_open (SIM_OPEN_KIND kind, host_callback *callback, struct bfd *abfd, /* Set default options before parsing user options. */ STATE_MACHS (sd) = or1k_sim_machs; + STATE_MODEL_NAME (sd) = "or1200"; current_target_byte_order = BFD_ENDIAN_BIG; /* The cpu data is kept in a separately allocated chunk of memory. */ |