sim: unify cgen maintainer settings

Move these options up to the common dir so we only test & export
them once across all ports.  It makes it available to targets that
aren't cgen-based, but those will just ignore the settings, so it
shouldn't be an issue.

5 files changed, 6 insertions, 45 deletions

diff --git a/sim/bpf/ChangeLog b/sim/bpf/ChangeLog
index fa4346d..e0f55f4 100644
--- a/sim/bpf/ChangeLog
+++ b/sim/bpf/ChangeLog
@@ -1,5 +1,11 @@
 2021-06-20  Mike Frysinger  <vapier@gentoo.org>
 
+	* Makefile.in (CGEN_MAINT): Delete.
+	* configure.ac: Delete SIM_AC_OPTION_CGEN_MAINT call.
+	* aclocal.m4, configure: Regenerate.
+
+2021-06-20  Mike Frysinger  <vapier@gentoo.org>
+
 	* aclocal.m4: Regenerate.
 	* configure: Regenerate.
 
diff --git a/sim/bpf/Makefile.in b/sim/bpf/Makefile.in
index d165feb..c48c378 100644
--- a/sim/bpf/Makefile.in
+++ b/sim/bpf/Makefile.in
@@ -46,11 +46,6 @@ SIM_WERROR_CFLAGS =
 
 ## COMMON_POST_CONFIG_FRAG
 
-# cgen support, enable with --enable-cgen-maint
-CGEN_MAINT = ; @true
-# The following line is commented in or out depending upon --enable-cgen-maint.
-@CGEN_MAINT@CGEN_MAINT =
-
 # BPF headers
 
 BPF_INCLUDE_DEPS = \
diff --git a/sim/bpf/aclocal.m4 b/sim/bpf/aclocal.m4
index e511ab3..7a14aeb 100644
--- a/sim/bpf/aclocal.m4
+++ b/sim/bpf/aclocal.m4
@@ -101,7 +101,6 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 m4_include([../../config/override.m4])
 m4_include([../m4/sim_ac_common.m4])
 m4_include([../m4/sim_ac_option_bitsize.m4])
-m4_include([../m4/sim_ac_option_cgen_maint.m4])
 m4_include([../m4/sim_ac_option_default_model.m4])
 m4_include([../m4/sim_ac_option_hardware.m4])
 m4_include([../m4/sim_ac_option_scache.m4])
diff --git a/sim/bpf/configure b/sim/bpf/configure
index 57c85c9..316189b 100755
--- a/sim/bpf/configure
+++ b/sim/bpf/configure
@@ -587,9 +587,6 @@ LIBOBJS
 sim_reserved_bits
 sim_float
 cgen_breaks
-cgen
-cgendir
-CGEN_MAINT
 MAINT
 MAINTAINER_MODE_FALSE
 MAINTAINER_MODE_TRUE
@@ -644,7 +641,6 @@ enable_maintainer_mode
 enable_sim_bitsize
 enable_sim_scache
 enable_sim_default_model
-enable_cgen_maint
 enable_sim_hardware
 '
       ac_precious_vars='build_alias
@@ -1265,7 +1261,6 @@ Optional Features:
                           Specify simulator execution cache size
   --enable-sim-default-model=model
                           Specify default model to simulate
-  --enable-cgen-maint=DIR build cgen generated files
   --enable-sim-hardware=LIST
                           Specify the hardware to be included in the build.
 
@@ -1822,39 +1817,6 @@ fi
 
 
 
-cgen_maint=no
-cgen=guile
-cgendir='$(srcdir)/../../cgen'
-# Check whether --enable-cgen-maint was given.
-if test "${enable_cgen_maint+set}" = set; then :
-  enableval=$enable_cgen_maint; case "${enableval}" in
-  yes)	cgen_maint=yes ;;
-  no)	cgen_maint=no ;;
-  *)
-	# Argument is a directory where cgen can be found.  In some
-	# future world cgen could be installable, but right now this
-	# is not the case.  Instead we assume the directory is a path
-	# to the cgen source tree.
-	cgen_maint=yes
-        if test -r ${enableval}/iformat.scm; then
-          # This looks like a cgen source tree.
-	  cgendir=${enableval}
-        else
-	  as_fn_error $? "${enableval} doesn't look like a cgen source tree" "$LINENO" 5
-        fi
-	;;
-esac
-fi
-if test x${cgen_maint} != xno ; then
-  CGEN_MAINT=''
-else
-  CGEN_MAINT='#'
-fi
-
-
-
-
-
 
 hardware="cfi core pal glue "
 sim_hw_cflags="-DWITH_HW=1"
diff --git a/sim/bpf/configure.ac b/sim/bpf/configure.ac
index a4138c0..13516a0 100644
--- a/sim/bpf/configure.ac
+++ b/sim/bpf/configure.ac
@@ -7,6 +7,5 @@ SIM_AC_COMMON
 SIM_AC_OPTION_BITSIZE([64])
 SIM_AC_OPTION_SCACHE(16384)
 SIM_AC_OPTION_DEFAULT_MODEL([bpf-def])
-SIM_AC_OPTION_CGEN_MAINT
 
 SIM_AC_OUTPUT