diff options
author | Mike Frysinger <vapier@gentoo.org> | 2021-06-28 22:39:16 -0400 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2021-06-30 13:33:18 -0400 |
commit | b79efe264f9d2d4fc5b0491acd3258063b309723 (patch) | |
tree | 75808110808964a8813af7df9a5e8cf03b547dc7 /sim/frv | |
parent | e7954ef5e5ed90fb7d28c013518f4c2e6bcd20a1 (diff) | |
download | binutils-gdb-b79efe264f9d2d4fc5b0491acd3258063b309723.tar.gz |
sim: unify scache settings
The cgen scache module is enabled by every cgen port, and with the
same default value of 16k (which matches the common default value).
Let's pull this option out of the individual ports (via CPPFLAGS)
and into the common code (via config.h).
The object itself is compiled only for cgen ports atm, so that part
doesn't change. The scache code is initialized dynamically via the
modules.c logic. That's why the profile code needs an additional
CGEN_ARCH check.
This will allow us to collapse arch configure files more. Merging
the source files will require more future work, but integrating the
cgen & non-cgen worlds itself will take a lot.
Diffstat (limited to 'sim/frv')
-rw-r--r-- | sim/frv/ChangeLog | 6 | ||||
-rw-r--r-- | sim/frv/aclocal.m4 | 1 | ||||
-rwxr-xr-x | sim/frv/configure | 27 | ||||
-rw-r--r-- | sim/frv/configure.ac | 2 |
4 files changed, 7 insertions, 29 deletions
diff --git a/sim/frv/ChangeLog b/sim/frv/ChangeLog index c2c5354838e..883c6ba8801 100644 --- a/sim/frv/ChangeLog +++ b/sim/frv/ChangeLog @@ -1,5 +1,11 @@ 2021-06-30 Mike Frysinger <vapier@gentoo.org> + * configure.ac: Delete SIM_AC_OPTION_SCACHE call. + * aclocal.m4: Regenerate. + * configure: Regenerate. + +2021-06-30 Mike Frysinger <vapier@gentoo.org> + * Makefile.in (SIM_EXTRA_CFLAGS): Change to SIM_FRV_TRAPDUMP_FLAGS. * configure.ac: Change sim-trapdump to sim-frv-trapdump. * configure: Regenerate. diff --git a/sim/frv/aclocal.m4 b/sim/frv/aclocal.m4 index ca624a71181..c9414d4680f 100644 --- a/sim/frv/aclocal.m4 +++ b/sim/frv/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_scache.m4]) m4_include([../m4/sim_ac_output.m4]) diff --git a/sim/frv/configure b/sim/frv/configure index 23fc6087836..2d93667107e 100755 --- a/sim/frv/configure +++ b/sim/frv/configure @@ -628,12 +628,10 @@ PACKAGE_VERSION PACKAGE_TARNAME PACKAGE_NAME PATH_SEPARATOR -SHELL -sim_scache' +SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking -enable_sim_scache enable_sim_frv_trapdump ' ac_precious_vars='build_alias @@ -1246,8 +1244,6 @@ 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-scache=size - Specify simulator execution cache size --enable-sim-frv-trapdump Make unknown traps dump the registers @@ -1681,26 +1677,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - -default_sim_scache="16384" -# Check whether --enable-sim-scache was given. -if test "${enable_sim_scache+set}" = set; then : - enableval=$enable_sim_scache; case "${enableval}" in - yes) sim_scache="-DWITH_SCACHE=${default_sim_scache}";; - no) sim_scache="-DWITH_SCACHE=0" ;; - [0-9]*) sim_scache="-DWITH_SCACHE=${enableval}";; - *) as_fn_error $? "\"Bad value $enableval passed to --enable-sim-scache\"" "$LINENO" 5; - sim_scache="";; -esac -if test x"$silent" != x"yes" && test x"$sim_scache" != x""; then - echo "Setting scache size = $sim_scache" 6>&1 -fi -else - sim_scache="-DWITH_SCACHE=${default_sim_scache}" -fi - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether sim frv should dump cpu state on unknown traps" >&5 $as_echo_n "checking whether sim frv should dump cpu state on unknown traps... " >&6; } # Check whether --enable-sim-frv-trapdump was given. @@ -1742,7 +1718,6 @@ ac_config_commands="$ac_config_commands stamp-h" - SIM_COMMON_BUILD_TRUE='#' SIM_COMMON_BUILD_FALSE= diff --git a/sim/frv/configure.ac b/sim/frv/configure.ac index 7430641101d..7e237151f34 100644 --- a/sim/frv/configure.ac +++ b/sim/frv/configure.ac @@ -2,8 +2,6 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(Makefile.in) AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config]) -SIM_AC_OPTION_SCACHE(16384) - dnl Enable making unknown traps dump out registers AC_MSG_CHECKING([whether sim frv should dump cpu state on unknown traps]) AC_ARG_ENABLE(sim-frv-trapdump, |