diff options
Diffstat (limited to 'sim/lm32')
| -rw-r--r-- | sim/lm32/ChangeLog | 6 | ||||
| -rw-r--r-- | sim/lm32/Makefile.in | 5 | ||||
| -rw-r--r-- | sim/lm32/aclocal.m4 | 1 | ||||
| -rwxr-xr-x | sim/lm32/configure | 38 | ||||
| -rw-r--r-- | sim/lm32/configure.ac | 1 |
5 files changed, 6 insertions, 45 deletions
diff --git a/sim/lm32/ChangeLog b/sim/lm32/ChangeLog index 41f800d..88363a4 100644 --- a/sim/lm32/ChangeLog +++ b/sim/lm32/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/lm32/Makefile.in b/sim/lm32/Makefile.in index 29489bc..2688827 100644 --- a/sim/lm32/Makefile.in +++ b/sim/lm32/Makefile.in @@ -48,11 +48,6 @@ lm32-clean: rm -f stamp-arch stamp-cpu rm -f tmp-* -# 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 = - stamp-arch: $(CGEN_READ_SCM) $(CGEN_ARCH_SCM) $(CPU_DIR)/lm32.cpu $(MAKE) cgen-arch $(CGEN_FLAGS_TO_PASS) mach=all \ archfile=$(CPU_DIR)/lm32.cpu \ diff --git a/sim/lm32/aclocal.m4 b/sim/lm32/aclocal.m4 index 50fcc1f..137af59 100644 --- a/sim/lm32/aclocal.m4 +++ b/sim/lm32/aclocal.m4 @@ -100,7 +100,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_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/lm32/configure b/sim/lm32/configure index 3404115..f1c2a3f 100755 --- a/sim/lm32/configure +++ b/sim/lm32/configure @@ -588,9 +588,6 @@ sim_reserved_bits sim_float sim_bitsize cgen_breaks -cgen -cgendir -CGEN_MAINT MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -643,7 +640,6 @@ enable_option_checking enable_maintainer_mode enable_sim_scache enable_sim_default_model -enable_cgen_maint enable_sim_hardware ' ac_precious_vars='build_alias @@ -1263,7 +1259,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. @@ -1761,39 +1756,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 lm32cpu lm32timer lm32uart" sim_hw_cflags="-DWITH_HW=1" sim_hw="$hardware" diff --git a/sim/lm32/configure.ac b/sim/lm32/configure.ac index 32bbd1b..b277c96 100644 --- a/sim/lm32/configure.ac +++ b/sim/lm32/configure.ac @@ -6,7 +6,6 @@ SIM_AC_COMMON SIM_AC_OPTION_SCACHE(16384) SIM_AC_OPTION_DEFAULT_MODEL(lm32) -SIM_AC_OPTION_CGEN_MAINT SIM_AC_OPTION_HARDWARE(lm32cpu lm32timer lm32uart) SIM_AC_OUTPUT |