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.

diff --git a/sim/ChangeLog b/sim/ChangeLog
index a2c90fa7457b972ee6972e83425f92dcfdf69cfd..3c652d4b5f440baaf324dee3c9df5bf50a561ecb 100644 (file)
--- a/sim/ChangeLog
+++ b/sim/ChangeLog
@@ -1,3 +1,11 @@
+2021-06-30  Mike Frysinger  <vapier@gentoo.org>
+
+       * configure.ac: Call SIM_AC_OPTION_SCACHE.
+       (sim_scache): Delete.
+       * m4/sim_ac_option_scache.m4: Delete first arg.  Define WITH_SCACHE.
+       * m4/sim_ac_output.m4 (sim_scache): Delete.
+       * aclocal.m4, config.h.in, configure, Makefile.in: Regenerate.
+
 2021-06-30  Mike Frysinger  <vapier@gentoo.org>
 
        * configure.ac: Remove [true] from bfin SIM_TARGET call.

diff --git a/sim/Makefile.in b/sim/Makefile.in
index 929975f4246c5d5771323510691cf89b7951559f..c672c5e69b3fa687cee2cdd566d35f85d0ee7ad9 100644 (file)
--- a/sim/Makefile.in
+++ b/sim/Makefile.in
@@ -213,6 +213,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
        $(top_srcdir)/m4/sim_ac_option_hardware.m4 \
        $(top_srcdir)/m4/sim_ac_option_inline.m4 \
        $(top_srcdir)/m4/sim_ac_option_profile.m4 \
+       $(top_srcdir)/m4/sim_ac_option_scache.m4 \
        $(top_srcdir)/m4/sim_ac_option_stdio.m4 \
        $(top_srcdir)/m4/sim_ac_option_trace.m4 \
        $(top_srcdir)/m4/sim_ac_option_warnings.m4 \
@@ -785,7 +786,6 @@ sim_float = @sim_float@
 sim_hw_cflags = @sim_hw_cflags@
 sim_hw_sockser = @sim_hw_sockser@
 sim_reserved_bits = @sim_reserved_bits@
-sim_scache = @sim_scache@
 srcdir = @srcdir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@

diff --git a/sim/aclocal.m4 b/sim/aclocal.m4
index a2b2bae447b8cee611ad784ac85e72496725a991..88c71d93e53ab4bc1dd14e579ac27c3a89e3294d 100644 (file)
--- a/sim/aclocal.m4
+++ b/sim/aclocal.m4
@@ -1189,6 +1189,7 @@ m4_include([m4/sim_ac_option_environment.m4])
 m4_include([m4/sim_ac_option_hardware.m4])
 m4_include([m4/sim_ac_option_inline.m4])
 m4_include([m4/sim_ac_option_profile.m4])
+m4_include([m4/sim_ac_option_scache.m4])
 m4_include([m4/sim_ac_option_stdio.m4])
 m4_include([m4/sim_ac_option_trace.m4])
 m4_include([m4/sim_ac_option_warnings.m4])

diff --git a/sim/bpf/ChangeLog b/sim/bpf/ChangeLog
index 63037fd56b981d913d98ff689f4ab73f5dcdbe8d..c740860703a2dbe341f85feed90f06c70ac67de7 100644 (file)
--- a/sim/bpf/ChangeLog
+++ b/sim/bpf/ChangeLog
@@ -1,3 +1,9 @@
+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>
 
        * configure.ac: Delete SIM_AC_OPTION_DEFAULT_MODEL call.

diff --git a/sim/bpf/aclocal.m4 b/sim/bpf/aclocal.m4
index 90a839c26137e3e4eaeba9819a834015ff15140f..3b7f0c1f4a443eb3a8752dd8cd3b199b9f8a0e6d 100644 (file)
--- a/sim/bpf/aclocal.m4
+++ b/sim/bpf/aclocal.m4
@@ -13,5 +13,4 @@
 
 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_scache.m4])
 m4_include([../m4/sim_ac_output.m4])

diff --git a/sim/bpf/configure b/sim/bpf/configure
index de2798ce6f46e596cc5ac7be9b34a44f7512d167..666257b872b8a065bd059fe7ee037a6b99dc5e12 100755 (executable)
--- a/sim/bpf/configure
+++ b/sim/bpf/configure
@@ -627,13 +627,11 @@ PACKAGE_TARNAME
 PACKAGE_NAME
 PATH_SEPARATOR
 SHELL
-sim_scache
 sim_bitsize'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
 enable_sim_bitsize
-enable_sim_scache
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1246,8 +1244,6 @@ Optional Features:
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-sim-bitsize=N  Specify target bitsize (32 or 64)
-  --enable-sim-scache=size
-                          Specify simulator execution cache size
 
 Report bugs to the package provider.
 _ACEOF
@@ -1739,25 +1735,6 @@ fi
 fi
 
 
-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
-
-
-
 cgen_breaks=""
 if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then
 cgen_breaks="break cgen_rtx_error";
@@ -1778,7 +1755,6 @@ ac_config_commands="$ac_config_commands stamp-h"
 
 
 
-
 SIM_COMMON_BUILD_TRUE='#'
 SIM_COMMON_BUILD_FALSE=
 

diff --git a/sim/bpf/configure.ac b/sim/bpf/configure.ac
index 9cbd202d590dc487936fa23c39239c0c9562cf88..87654ec6a9194cc6152705839aad552436c37f88 100644 (file)
--- a/sim/bpf/configure.ac
+++ b/sim/bpf/configure.ac
@@ -3,6 +3,5 @@ AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
 
 SIM_AC_OPTION_BITSIZE([64])
-SIM_AC_OPTION_SCACHE(16384)
 
 SIM_AC_OUTPUT

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index c6fa33ce5ee8b635d2bf13d06c54ccd22614843e..5b167eb89ae30f3dc8cb0b49e0141ae1ef7735eb 100644 (file)
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,9 @@
+2021-06-30  Mike Frysinger  <vapier@gentoo.org>
+
+       * Make-common.in (SIM_SCACHE): Delete.
+       * cgen-scache.h (WITH_SCACHE): Delete.
+       * sim-profile.c (profile_info): Check CGEN_ARCH.
+
 2021-06-30  Mike Frysinger  <vapier@gentoo.org>
 
        * cgen-scache.c (scache_install): Rename to ...

diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in
index 992fd7f8a6eff882eeeb77081599b3cd8f44c106..e7c1cce46f41bd5d3348578a511f1a3d994573fe 100644 (file)
--- a/sim/common/Make-common.in
+++ b/sim/common/Make-common.in
@@ -75,7 +75,6 @@ SHELL = @SHELL@
 SIM_BITSIZE = @sim_bitsize@
 SIM_FLOAT = @sim_float@
 SIM_RESERVED_BITS = @sim_reserved_bits@
-SIM_SCACHE = @sim_scache@
 SIM_WARN_CFLAGS = $(WARN_CFLAGS)
 SIM_WERROR_CFLAGS = $(WERROR_CFLAGS)
 
@@ -199,7 +198,6 @@ CONFIG_CFLAGS = \
        $(SIM_HW_CFLAGS) \
        $(SIM_INLINE) \
        $(SIM_RESERVED_BITS) \
-       $(SIM_SCACHE) \
        $(SIM_WARN_CFLAGS) \
        $(SIM_WERROR_CFLAGS) \
        $(SIM_HARDWARE)

diff --git a/sim/common/cgen-scache.h b/sim/common/cgen-scache.h
index b43528101abec6641ae3465e8d8d1aca4c2b2fca..70ea0907d824d3c91c84d403c4265735d73bd6ee 100644 (file)
--- a/sim/common/cgen-scache.h
+++ b/sim/common/cgen-scache.h
@@ -20,10 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #ifndef CGEN_SCACHE_H
 #define CGEN_SCACHE_H
 
-#ifndef WITH_SCACHE
-#define WITH_SCACHE 0
-#endif
-
 /* When caching bb's, instructions are extracted into "chains".
    SCACHE_MAP is a hash table into these chains.  */
 

diff --git a/sim/common/sim-profile.c b/sim/common/sim-profile.c
index 3a8ed1f2567fdd6ec56a4c6b892a1a0f51c9e338..1459ae70ab284980b82f933575b9020d8b3b891a 100644 (file)
--- a/sim/common/sim-profile.c
+++ b/sim/common/sim-profile.c
@@ -1152,7 +1152,7 @@ profile_info (SIM_DESC sd, int verbose)
 #if WITH_PROFILE_MODEL_P
              || PROFILE_FLAGS (data) [PROFILE_MODEL_IDX]
 #endif
-#if WITH_PROFILE_SCACHE_P && WITH_SCACHE
+#if WITH_PROFILE_SCACHE_P && WITH_SCACHE && defined(CGEN_ARCH)
              || PROFILE_FLAGS (data) [PROFILE_SCACHE_IDX]
 #endif
 #if WITH_PROFILE_PC_P
@@ -1190,7 +1190,7 @@ profile_info (SIM_DESC sd, int verbose)
        profile_print_model (cpu, verbose);
 #endif
 
-#if WITH_PROFILE_SCACHE_P && WITH_SCACHE
+#if WITH_PROFILE_SCACHE_P && WITH_SCACHE && defined(CGEN_ARCH)
       if (PROFILE_FLAGS (data) [PROFILE_SCACHE_IDX])
        scache_print_profile (cpu, verbose);
 #endif

diff --git a/sim/config.h.in b/sim/config.h.in
index 8d926f3de7db1d4c67db735531efef8710fc51e5..ccd864340cddbdf6a486efd2aa88e4743b2e61a7 100644 (file)
--- a/sim/config.h.in
+++ b/sim/config.h.in
@@ -469,6 +469,9 @@
 /* Sim profile settings */
 #undef WITH_PROFILE
 
+/* Sim cache szie */
+#undef WITH_SCACHE
+
 /* How to route I/O */
 #undef WITH_STDIO
 

diff --git a/sim/configure b/sim/configure
index eb38cda267d2325ba05e6ba14ba74347f38bc5ec..4a0b87ff50620d4371fe9f00049c495e92412708 100755 (executable)
--- a/sim/configure
+++ b/sim/configure
@@ -640,7 +640,6 @@ am__EXEEXT_TRUE
 LTLIBOBJS
 SIM_RX_CYCLE_ACCURATE_FLAGS
 sim_reserved_bits
-sim_scache
 sim_float
 sim_bitsize
 SIM_INLINE
@@ -840,6 +839,7 @@ enable_sim_environment
 enable_sim_hardware
 enable_sim_inline
 enable_sim_profile
+enable_sim_scache
 enable_sim_stdio
 enable_sim_trace
 enable_werror
@@ -1526,6 +1526,8 @@ Optional Features:
                           Specify which functions should be inlined
   --enable-sim-profile=opts
                           Enable profiling flags
+  --enable-sim-scache=size
+                          Specify simulator execution cache size
   --enable-sim-stdio      Specify whether to use stdio for console
                           input/output
   --enable-sim-trace=opts Enable tracing of simulated programs
@@ -12178,7 +12180,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12181 "configure"
+#line 12183 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12284,7 +12286,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12287 "configure"
+#line 12289 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -14516,6 +14518,27 @@ _ACEOF
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_profile" >&5
 $as_echo "$sim_profile" >&6; }
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim cache size" >&5
+$as_echo_n "checking for sim cache size... " >&6; }
+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) ;;
+  no)  sim_scache="0";;
+  [0-9]*) sim_scache="${enableval}";;
+  *)   as_fn_error $? "\"Bad value $enableval passed to --enable-sim-scache\"" "$LINENO" 5;;
+esac
+fi
+
+
+cat >>confdefs.h <<_ACEOF
+#define WITH_SCACHE $sim_scache
+_ACEOF
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_scache" >&5
+$as_echo "$sim_scache" >&6; }
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim stdio debug behavior" >&5
 $as_echo_n "checking for sim stdio debug behavior... " >&6; }
 sim_stdio="0"
@@ -14674,7 +14697,6 @@ fi
 
 
 
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether sim rx should be cycle accurate" >&5
 $as_echo_n "checking whether sim rx should be cycle accurate... " >&6; }
 # Check whether --enable-sim-rx-cycle-accurate was given.

diff --git a/sim/configure.ac b/sim/configure.ac
index c2a724b61386944a87c94e5cb75c8a2b612c280d..7e6d01360b6e69e75ad803011b66e1a79f4de3eb 100644 (file)
--- a/sim/configure.ac
+++ b/sim/configure.ac
@@ -161,6 +161,7 @@ SIM_AC_OPTION_ENVIRONMENT
 SIM_AC_OPTION_HARDWARE
 SIM_AC_OPTION_INLINE
 SIM_AC_OPTION_PROFILE
+SIM_AC_OPTION_SCACHE
 SIM_AC_OPTION_STDIO
 SIM_AC_OPTION_TRACE
 SIM_AC_OPTION_WARNINGS
@@ -171,7 +172,6 @@ dnl when the rest of the code is in the respective macros.  Once we merge the
 dnl respective SIM_AC_OPTION_xxx call above, we can drop these.
 AC_SUBST(sim_bitsize)
 AC_SUBST(sim_float)
-AC_SUBST(sim_scache)
 AC_SUBST(sim_reserved_bits)
 
 dnl Some arches have unique configure flags.

diff --git a/sim/cris/ChangeLog b/sim/cris/ChangeLog
index 9cdc48831c2e849848a23e3c52727eac36e20a4d..fa1e6b6ee559183f0e131c4d115097c916ae7810 100644 (file)
--- a/sim/cris/ChangeLog
+++ b/sim/cris/ChangeLog
@@ -1,3 +1,9 @@
+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>
 
        * configure.ac: Delete SIM_AC_OPTION_DEFAULT_MODEL call.

diff --git a/sim/cris/aclocal.m4 b/sim/cris/aclocal.m4
index ca624a71181d20f210f3f58179e4c6d38b147638..c9414d4680f1db90e5d5f6f1d4e8f0ee2eeb0f35 100644 (file)
--- a/sim/cris/aclocal.m4
+++ b/sim/cris/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/cris/configure b/sim/cris/configure
index 1f182822a71378428c5e12d08c56017f96c10e16..38fa43dc998b059a6ccc6d70df4db3add57443c6 100755 (executable)
--- a/sim/cris/configure
+++ b/sim/cris/configure
@@ -627,12 +627,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
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1240,13 +1238,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-scache=size
-                          Specify simulator execution cache size
-
 Report bugs to the package provider.
 _ACEOF
 ac_status=$?
@@ -1677,26 +1668,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
-
-
-
 cgen_breaks=""
 if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then
 cgen_breaks="break cgen_rtx_error";
@@ -1717,7 +1688,6 @@ ac_config_commands="$ac_config_commands stamp-h"
 
 
 
-
 SIM_COMMON_BUILD_TRUE='#'
 SIM_COMMON_BUILD_FALSE=
 

diff --git a/sim/cris/configure.ac b/sim/cris/configure.ac
index d2037221bfee920ae4639565b04d0e2b7d74c8d6..99370b3a5770e6ce8dc83f6ca797c74d008978a7 100644 (file)
--- a/sim/cris/configure.ac
+++ b/sim/cris/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_SCACHE(16384)
-
 SIM_AC_OUTPUT

diff --git a/sim/frv/ChangeLog b/sim/frv/ChangeLog
index c2c5354838e64124dbc99e0ce83fc21dda7710fa..883c6ba88019d01e59f3cd3ca5dd330f652dba30 100644 (file)
--- a/sim/frv/ChangeLog
+++ b/sim/frv/ChangeLog
@@ -1,3 +1,9 @@
+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.

diff --git a/sim/frv/aclocal.m4 b/sim/frv/aclocal.m4
index ca624a71181d20f210f3f58179e4c6d38b147638..c9414d4680f1db90e5d5f6f1d4e8f0ee2eeb0f35 100644 (file)
--- 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 23fc608783626f9a6a66c1de676e1d0eec3b25f2..2d93667107e0b4ed989a18137430f7713a4e48c0 100755 (executable)
--- 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 7430641101d1bd98e69ae94b5f60dbf05ebd9434..7e237151f347908befdba3ddb6f5f61e8421cf48 100644 (file)
--- 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,

diff --git a/sim/iq2000/ChangeLog b/sim/iq2000/ChangeLog
index 60aa9665bb2c9954142a1232aea0fcdaabc5260e..7ea55ea6996b893ad45b49682af0b9fcb4e538aa 100644 (file)
--- a/sim/iq2000/ChangeLog
+++ b/sim/iq2000/ChangeLog
@@ -1,3 +1,9 @@
+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>
 
        * configure.ac: Delete SIM_AC_OPTION_DEFAULT_MODEL call.

diff --git a/sim/iq2000/aclocal.m4 b/sim/iq2000/aclocal.m4
index ca624a71181d20f210f3f58179e4c6d38b147638..c9414d4680f1db90e5d5f6f1d4e8f0ee2eeb0f35 100644 (file)
--- a/sim/iq2000/aclocal.m4
+++ b/sim/iq2000/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/iq2000/configure b/sim/iq2000/configure
index 1f182822a71378428c5e12d08c56017f96c10e16..38fa43dc998b059a6ccc6d70df4db3add57443c6 100755 (executable)
--- a/sim/iq2000/configure
+++ b/sim/iq2000/configure
@@ -627,12 +627,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
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1240,13 +1238,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-scache=size
-                          Specify simulator execution cache size
-
 Report bugs to the package provider.
 _ACEOF
 ac_status=$?
@@ -1677,26 +1668,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
-
-
-
 cgen_breaks=""
 if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then
 cgen_breaks="break cgen_rtx_error";
@@ -1717,7 +1688,6 @@ ac_config_commands="$ac_config_commands stamp-h"
 
 
 
-
 SIM_COMMON_BUILD_TRUE='#'
 SIM_COMMON_BUILD_FALSE=
 

diff --git a/sim/iq2000/configure.ac b/sim/iq2000/configure.ac
index d2037221bfee920ae4639565b04d0e2b7d74c8d6..99370b3a5770e6ce8dc83f6ca797c74d008978a7 100644 (file)
--- a/sim/iq2000/configure.ac
+++ b/sim/iq2000/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_SCACHE(16384)
-
 SIM_AC_OUTPUT

diff --git a/sim/lm32/ChangeLog b/sim/lm32/ChangeLog
index f9092a93517804bf186cf2e5b6ac5f7397508442..fbb122fc895a1e490b43b93f83885b1980fcb51c 100644 (file)
--- a/sim/lm32/ChangeLog
+++ b/sim/lm32/ChangeLog
@@ -1,3 +1,9 @@
+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>
 
        * configure.ac: Delete SIM_AC_OPTION_DEFAULT_MODEL call.

diff --git a/sim/lm32/aclocal.m4 b/sim/lm32/aclocal.m4
index ca624a71181d20f210f3f58179e4c6d38b147638..c9414d4680f1db90e5d5f6f1d4e8f0ee2eeb0f35 100644 (file)
--- a/sim/lm32/aclocal.m4
+++ b/sim/lm32/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/lm32/configure b/sim/lm32/configure
index 1f182822a71378428c5e12d08c56017f96c10e16..38fa43dc998b059a6ccc6d70df4db3add57443c6 100755 (executable)
--- a/sim/lm32/configure
+++ b/sim/lm32/configure
@@ -627,12 +627,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
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1240,13 +1238,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-scache=size
-                          Specify simulator execution cache size
-
 Report bugs to the package provider.
 _ACEOF
 ac_status=$?
@@ -1677,26 +1668,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
-
-
-
 cgen_breaks=""
 if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then
 cgen_breaks="break cgen_rtx_error";
@@ -1717,7 +1688,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 d2037221bfee920ae4639565b04d0e2b7d74c8d6..99370b3a5770e6ce8dc83f6ca797c74d008978a7 100644 (file)
--- a/sim/lm32/configure.ac
+++ b/sim/lm32/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_SCACHE(16384)
-
 SIM_AC_OUTPUT

diff --git a/sim/m32r/ChangeLog b/sim/m32r/ChangeLog
index d738f5d21ca2b6b3b1f3549313e002d4667ccb67..af8339a2cc756dfdec7a69796f3e6b192dd6ec94 100644 (file)
--- a/sim/m32r/ChangeLog
+++ b/sim/m32r/ChangeLog
@@ -1,3 +1,9 @@
+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>
 
        * configure.ac: Delete SIM_AC_OPTION_DEFAULT_MODEL call.

diff --git a/sim/m32r/aclocal.m4 b/sim/m32r/aclocal.m4
index ca624a71181d20f210f3f58179e4c6d38b147638..c9414d4680f1db90e5d5f6f1d4e8f0ee2eeb0f35 100644 (file)
--- a/sim/m32r/aclocal.m4
+++ b/sim/m32r/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/m32r/configure b/sim/m32r/configure
index 25077ddb7cd7b59f2cdfa32b564dee9b65d14a12..d3dbc725a38174a046254960726e2004b7557160 100755 (executable)
--- a/sim/m32r/configure
+++ b/sim/m32r/configure
@@ -629,12 +629,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
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1242,13 +1240,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-scache=size
-                          Specify simulator execution cache size
-
 Report bugs to the package provider.
 _ACEOF
 ac_status=$?
@@ -1679,26 +1670,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
-
-
-
   case "${target_alias}" in
   m32r*-linux*)
     traps_obj=traps-linux.o
@@ -1732,7 +1703,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 eed2e91c87a725a1521e75b8ce3a17d6d340f58a..d8054034abcb4595ab671225e5528b1b78db1631 100644 (file)
--- a/sim/m32r/configure.ac
+++ b/sim/m32r/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)
-
   case "${target_alias}" in
   m32r*-linux*)
     traps_obj=traps-linux.o

diff --git a/sim/m4/sim_ac_option_scache.m4 b/sim/m4/sim_ac_option_scache.m4
index 20e36158f9092947fd1edb19f44033e72401821d..7ae883fd7da2029601fcdb0c3580d785971b5769 100644 (file)
--- a/sim/m4/sim_ac_option_scache.m4
+++ b/sim/m4/sim_ac_option_scache.m4
@@ -12,23 +12,19 @@ dnl GNU General Public License for more details.
 dnl
 dnl You should have received a copy of the GNU General Public License
 dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
-dnl
-dnl The argument is the default cache size if none is specified.
 AC_DEFUN([SIM_AC_OPTION_SCACHE],
-[
-default_sim_scache="ifelse([$1],,0,[$1])"
+[dnl
+AC_MSG_CHECKING([for sim cache size])
+sim_scache="16384"
 AC_ARG_ENABLE(sim-scache,
 [AS_HELP_STRING([--enable-sim-scache=size],
                [Specify simulator execution cache size])],
 [case "${enableval}" in
-  yes) sim_scache="-DWITH_SCACHE=${default_sim_scache}";;
-  no)  sim_scache="-DWITH_SCACHE=0" ;;
-  [[0-9]]*) sim_scache="-DWITH_SCACHE=${enableval}";;
-  *)   AC_MSG_ERROR("Bad value $enableval passed to --enable-sim-scache");
-       sim_scache="";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_scache" != x""; then
-  echo "Setting scache size = $sim_scache" 6>&1
-fi],[sim_scache="-DWITH_SCACHE=${default_sim_scache}"])
+  yes) ;;
+  no)  sim_scache="0";;
+  [[0-9]]*) sim_scache="${enableval}";;
+  *)   AC_MSG_ERROR("Bad value $enableval passed to --enable-sim-scache");;
+esac])
+AC_DEFINE_UNQUOTED([WITH_SCACHE], [$sim_scache], [Sim cache szie])
+AC_MSG_RESULT($sim_scache)
 ])
-AC_SUBST(sim_scache)

diff --git a/sim/m4/sim_ac_output.m4 b/sim/m4/sim_ac_output.m4
index 100e2f9b4024267a093d62584691bf8af3dc0008..3866213b91fe68d4d8abc3d738f233f3179c32c1 100644 (file)
--- a/sim/m4/sim_ac_output.m4
+++ b/sim/m4/sim_ac_output.m4
@@ -47,7 +47,6 @@ dnl but always used by common/Make-common.in.  So we have to subst here even
 dnl when the rest of the code is in the respective macros.
 AC_SUBST(sim_bitsize)
 AC_SUBST(sim_float)
-AC_SUBST(sim_scache)
 AC_SUBST(sim_reserved_bits)
 
 dnl Used by common/Make-common.in to see which configure script created it.

diff --git a/sim/mips/configure b/sim/mips/configure
index 2cc8d314e8850e7d35a4540c989489f3acae21ad..03cf399dfe7f851d06cd1c24250ae7044c2930e2 100755 (executable)
--- a/sim/mips/configure
+++ b/sim/mips/configure
@@ -586,7 +586,6 @@ ac_subst_vars='LTLIBOBJS
 LIBOBJS
 SIM_COMMON_BUILD_FALSE
 SIM_COMMON_BUILD_TRUE
-sim_scache
 cgen_breaks
 sim_multi_obj
 sim_multi_src
@@ -2210,7 +2209,6 @@ ac_config_commands="$ac_config_commands stamp-h"
 
 
 
-
 SIM_COMMON_BUILD_TRUE='#'
 SIM_COMMON_BUILD_FALSE=
 

diff --git a/sim/mn10300/configure b/sim/mn10300/configure
index 91c58e5ba2a383a4b6ae6062709e7d8722f45114..e6f39fcf77d3461d8fa65ab0e8ae27cd712b0b0e 100755 (executable)
--- a/sim/mn10300/configure
+++ b/sim/mn10300/configure
@@ -586,7 +586,6 @@ ac_subst_vars='LTLIBOBJS
 LIBOBJS
 SIM_COMMON_BUILD_FALSE
 SIM_COMMON_BUILD_TRUE
-sim_scache
 sim_float
 cgen_breaks
 target_alias
@@ -1776,7 +1775,6 @@ ac_config_commands="$ac_config_commands stamp-h"
 
 
 
-
 SIM_COMMON_BUILD_TRUE='#'
 SIM_COMMON_BUILD_FALSE=
 

diff --git a/sim/or1k/ChangeLog b/sim/or1k/ChangeLog
index 9cd2f225c607a9e2c25a91082d8d91d46ec52ad8..b2270082596ce98d05724fe2526613b495e92642 100644 (file)
--- a/sim/or1k/ChangeLog
+++ b/sim/or1k/ChangeLog
@@ -1,3 +1,9 @@
+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>
 
        * configure.ac: Delete SIM_AC_OPTION_DEFAULT_MODEL call.

diff --git a/sim/or1k/aclocal.m4 b/sim/or1k/aclocal.m4
index 90a839c26137e3e4eaeba9819a834015ff15140f..3b7f0c1f4a443eb3a8752dd8cd3b199b9f8a0e6d 100644 (file)
--- a/sim/or1k/aclocal.m4
+++ b/sim/or1k/aclocal.m4
@@ -13,5 +13,4 @@
 
 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_scache.m4])
 m4_include([../m4/sim_ac_output.m4])

diff --git a/sim/or1k/configure b/sim/or1k/configure
index 3677607e0a79f7f7d7382edc569e05cbad184e78..acfcd639c02e256e12d58ce260c902916b296016 100755 (executable)
--- a/sim/or1k/configure
+++ b/sim/or1k/configure
@@ -627,13 +627,11 @@ PACKAGE_TARNAME
 PACKAGE_NAME
 PATH_SEPARATOR
 SHELL
-sim_scache
 sim_bitsize'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
 enable_sim_bitsize
-enable_sim_scache
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1246,8 +1244,6 @@ Optional Features:
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-sim-bitsize=N  Specify target bitsize (32 or 64)
-  --enable-sim-scache=size
-                          Specify simulator execution cache size
 
 Report bugs to the package provider.
 _ACEOF
@@ -1739,25 +1735,6 @@ fi
 fi
 
 
-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
-
-
-
 cgen_breaks=""
 if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then
 cgen_breaks="break cgen_rtx_error";
@@ -1778,7 +1755,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 aaeb121356540f08f308973b0bad202805ce451a..4a989e3fc4f3749b3e0e79fc0238707fd024d288 100644 (file)
--- a/sim/or1k/configure.ac
+++ b/sim/or1k/configure.ac
@@ -3,6 +3,5 @@ AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
 
 SIM_AC_OPTION_BITSIZE([32], [31], [32])
-SIM_AC_OPTION_SCACHE(16384)
 
 SIM_AC_OUTPUT

diff --git a/sim/riscv/ChangeLog b/sim/riscv/ChangeLog
index ec4f69a8408b277cb08522ec2aa117a8a42f502b..ee7246aa4b1d3b166ffc671e24615ef23a5175e8 100644 (file)
--- a/sim/riscv/ChangeLog
+++ b/sim/riscv/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-30  Mike Frysinger  <vapier@gentoo.org>
+
+       * configure: Regenerate.
+
 2021-06-30  Mike Frysinger  <vapier@gentoo.org>
 
        * configure.ac: Delete SIM_AC_OPTION_DEFAULT_MODEL call.

diff --git a/sim/riscv/configure b/sim/riscv/configure
index c2e53cc8c6d74998dae46a93eaf5a96272563105..e366d095bbe71b9f5809a8ea6930b0c699801c4f 100755 (executable)
--- a/sim/riscv/configure
+++ b/sim/riscv/configure
@@ -587,7 +587,6 @@ LIBOBJS
 SIM_COMMON_BUILD_FALSE
 SIM_COMMON_BUILD_TRUE
 sim_reserved_bits
-sim_scache
 sim_float
 cgen_breaks
 target_alias
@@ -1762,7 +1761,6 @@ ac_config_commands="$ac_config_commands stamp-h"
 
 
 
-
 SIM_COMMON_BUILD_TRUE='#'
 SIM_COMMON_BUILD_FALSE=
 

diff --git a/sim/v850/configure b/sim/v850/configure
index 91c58e5ba2a383a4b6ae6062709e7d8722f45114..e6f39fcf77d3461d8fa65ab0e8ae27cd712b0b0e 100755 (executable)
--- a/sim/v850/configure
+++ b/sim/v850/configure
@@ -586,7 +586,6 @@ ac_subst_vars='LTLIBOBJS
 LIBOBJS
 SIM_COMMON_BUILD_FALSE
 SIM_COMMON_BUILD_TRUE
-sim_scache
 sim_float
 cgen_breaks
 target_alias
@@ -1776,7 +1775,6 @@ ac_config_commands="$ac_config_commands stamp-h"
 
 
 
-
 SIM_COMMON_BUILD_TRUE='#'
 SIM_COMMON_BUILD_FALSE=