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.

4 files changed, 7 insertions, 34 deletions

diff --git a/sim/cris/ChangeLog b/sim/cris/ChangeLog
index 9cdc488..fa1e6b6 100644
--- a/sim/cris/ChangeLog
+++ b/sim/cris/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>
+
 	* configure.ac: Delete SIM_AC_OPTION_DEFAULT_MODEL call.
 	* sim-if.c (sim_open): Set STATE_MODEL_NAME.
 	* aclocal.m4: Regenerate.
diff --git a/sim/cris/aclocal.m4 b/sim/cris/aclocal.m4
index ca624a7..c9414d4 100644
--- 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 1f18282..38fa43d 100755
--- 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 d203722..99370b3 100644
--- 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