diff options
Diffstat (limited to 'sim/or1k')
| -rw-r--r-- | sim/or1k/ChangeLog | 6 | ||||
| -rw-r--r-- | sim/or1k/Makefile.in | 5 | ||||
| -rw-r--r-- | sim/or1k/aclocal.m4 | 1 | ||||
| -rwxr-xr-x | sim/or1k/configure | 38 | ||||
| -rw-r--r-- | sim/or1k/configure.ac | 1 |
5 files changed, 6 insertions, 45 deletions
diff --git a/sim/or1k/ChangeLog b/sim/or1k/ChangeLog index 3783520..d229936 100644 --- a/sim/or1k/ChangeLog +++ b/sim/or1k/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/or1k/Makefile.in b/sim/or1k/Makefile.in index c6083b0..499b350 100644 --- a/sim/or1k/Makefile.in +++ b/sim/or1k/Makefile.in @@ -93,11 +93,6 @@ traps.o: traps.c $(SIM_MAIN_DEPS) eng.h or1k-clean: rm -f mloop.c eng.h stamp-mloop -# 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 = - stamps: stamp-arch stamp-cpu stamp-mloop # NOTE: Generated source files are specified as full paths, diff --git a/sim/or1k/aclocal.m4 b/sim/or1k/aclocal.m4 index e511ab3..7a14aeb 100644 --- a/sim/or1k/aclocal.m4 +++ b/sim/or1k/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/or1k/configure b/sim/or1k/configure index 95ce8b8..999d413 100755 --- a/sim/or1k/configure +++ b/sim/or1k/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/or1k/configure.ac b/sim/or1k/configure.ac index 576574c..f77a733 100644 --- a/sim/or1k/configure.ac +++ b/sim/or1k/configure.ac @@ -7,6 +7,5 @@ SIM_AC_COMMON SIM_AC_OPTION_BITSIZE([32], [31], [32]) SIM_AC_OPTION_SCACHE(16384) SIM_AC_OPTION_DEFAULT_MODEL([or1200]) -SIM_AC_OPTION_CGEN_MAINT SIM_AC_OUTPUT |