diff options
Diffstat (limited to 'sim')
43 files changed, 104 insertions, 318 deletions
diff --git a/sim/ChangeLog b/sim/ChangeLog index 722d91e..74ed77c 100644 --- a/sim/ChangeLog +++ b/sim/ChangeLog @@ -1,5 +1,11 @@ 2021-06-20 Mike Frysinger <vapier@gentoo.org> + * arch-subdir.mk.in (CGEN_MAINT, CGENDIR): Define. + * configure.ac: Call SIM_AC_OPTION_CGEN_MAINT. + * aclocal.m4, configure, Makefile.in: Regenerate. + +2021-06-20 Mike Frysinger <vapier@gentoo.org> + * Makefile.am (AM_CPPFLAGS): Add $(SIM_INLINE). * arch-subdir.mk.in (SIM_INLINE): Define. * configure.ac: Call SIM_AC_OPTION_INLINE. diff --git a/sim/Makefile.in b/sim/Makefile.in index 925e7670..2737e10 100644 --- a/sim/Makefile.in +++ b/sim/Makefile.in @@ -205,6 +205,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ $(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \ $(top_srcdir)/m4/sim_ac_option_alignment.m4 \ $(top_srcdir)/m4/sim_ac_option_assert.m4 \ + $(top_srcdir)/m4/sim_ac_option_cgen_maint.m4 \ $(top_srcdir)/m4/sim_ac_option_debug.m4 \ $(top_srcdir)/m4/sim_ac_option_endian.m4 \ $(top_srcdir)/m4/sim_ac_option_environment.m4 \ @@ -638,6 +639,7 @@ CCDEPMODE = @CCDEPMODE@ CC_FOR_BUILD = @CC_FOR_BUILD@ CFLAGS = @CFLAGS@ CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ +CGEN_MAINT = @CGEN_MAINT@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -727,6 +729,8 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ builddir = @builddir@ +cgen = @cgen@ +cgendir = @cgendir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ diff --git a/sim/aclocal.m4 b/sim/aclocal.m4 index 6513ae2..400bc87 100644 --- a/sim/aclocal.m4 +++ b/sim/aclocal.m4 @@ -1181,6 +1181,7 @@ m4_include([../ltversion.m4]) m4_include([../lt~obsolete.m4]) m4_include([m4/sim_ac_option_alignment.m4]) m4_include([m4/sim_ac_option_assert.m4]) +m4_include([m4/sim_ac_option_cgen_maint.m4]) m4_include([m4/sim_ac_option_debug.m4]) m4_include([m4/sim_ac_option_endian.m4]) m4_include([m4/sim_ac_option_environment.m4]) diff --git a/sim/arch-subdir.mk.in b/sim/arch-subdir.mk.in index 4352f92..321366e 100644 --- a/sim/arch-subdir.mk.in +++ b/sim/arch-subdir.mk.in @@ -54,4 +54,10 @@ COMMON_LIBS = @LIBS@ WARN_CFLAGS = @WARN_CFLAGS@ WERROR_CFLAGS = @WERROR_CFLAGS@ +# 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 = +CGENDIR = @cgendir@ + SIM_INLINE = @SIM_INLINE@ 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 diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index a367939..f3530df 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,3 +1,7 @@ +2021-06-20 Mike Frysinger <vapier@gentoo.org> + + * Make-common.in (CGENDIR): Delete. + 2021-06-19 Mike Frysinger <vapier@gentoo.org> * Make-common.in (SIM_INLINE): Delete. diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in index b8116d8..ba62c32 100644 --- a/sim/common/Make-common.in +++ b/sim/common/Make-common.in @@ -542,7 +542,6 @@ config.status: configure # CGEN support -CGENDIR = @cgendir@ CGEN = "`if [ -f ../../guile/libguile/guile ]; then echo ../../guile/libguile/guile; else echo guile ; fi` -l $(CGENDIR)/guile.scm -s" CGENFLAGS = -v CGEN_CPU_DIR = $(CGENDIR)/cpu diff --git a/sim/configure b/sim/configure index 7563ad6..2468453 100755 --- a/sim/configure +++ b/sim/configure @@ -639,6 +639,9 @@ ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS SIM_INLINE +cgen +cgendir +CGEN_MAINT SIM_ENABLE_IGEN_FALSE SIM_ENABLE_IGEN_TRUE subdirs @@ -810,6 +813,7 @@ enable_example_sims enable_targets enable_sim_alignment enable_sim_assert +enable_cgen_maint enable_sim_debug enable_sim_endian enable_sim_environment @@ -1502,6 +1506,7 @@ Optional Features: Specify strict, nonstrict or forced alignment of memory accesses --enable-sim-assert Specify whether to perform random assertions + --enable-cgen-maint=DIR build cgen generated files --enable-sim-debug=opts Enable debugging flags (for developers of the sim itself) --enable-sim-endian=endian @@ -12036,7 +12041,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12039 "configure" +#line 12044 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12142,7 +12147,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12145 "configure" +#line 12150 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13781,6 +13786,39 @@ _ACEOF { $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_assert" >&5 $as_echo "$sim_assert" >&6; } + +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 + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim debug setting" >&5 $as_echo_n "checking for sim debug setting... " >&6; } sim_debug="0" diff --git a/sim/configure.ac b/sim/configure.ac index a3f02a7..9530268 100644 --- a/sim/configure.ac +++ b/sim/configure.ac @@ -118,6 +118,7 @@ dnl Standard (and optional) simulator options. dnl Eventually all simulators will support these. SIM_AC_OPTION_ALIGNMENT SIM_AC_OPTION_ASSERT +SIM_AC_OPTION_CGEN_MAINT SIM_AC_OPTION_DEBUG SIM_AC_OPTION_ENDIAN SIM_AC_OPTION_ENVIRONMENT diff --git a/sim/cris/ChangeLog b/sim/cris/ChangeLog index 713446d..d6ca935 100644 --- a/sim/cris/ChangeLog +++ b/sim/cris/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/cris/Makefile.in b/sim/cris/Makefile.in index 0b4b8f5..ef83ce8 100644 --- a/sim/cris/Makefile.in +++ b/sim/cris/Makefile.in @@ -102,11 +102,6 @@ cris-clean: -rm -f stamp-arch -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 = - # Useful when making CGEN-generated files manually, without --enable-cgen-maint. stamps: stamp-v10fmloop stamp-v32fmloop stamp-arch stamp-v10fcpu stamp-v32fcpu diff --git a/sim/cris/aclocal.m4 b/sim/cris/aclocal.m4 index 50fcc1f..137af59 100644 --- a/sim/cris/aclocal.m4 +++ b/sim/cris/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/cris/configure b/sim/cris/configure index d4af223..2b854f7 100755 --- a/sim/cris/configure +++ b/sim/cris/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 @@ -644,7 +641,6 @@ enable_maintainer_mode enable_sim_scache enable_sim_hardware enable_sim_default_model -enable_cgen_maint ' ac_precious_vars='build_alias host_alias @@ -1265,7 +1261,6 @@ Optional Features: Specify the hardware to be included in the build. --enable-sim-default-model=model Specify default model to simulate - --enable-cgen-maint=DIR build cgen generated files Report bugs to the package provider. _ACEOF @@ -1813,39 +1808,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 - - - - - cgen_breaks="" if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then diff --git a/sim/cris/configure.ac b/sim/cris/configure.ac index d94eabb..909c416 100644 --- a/sim/cris/configure.ac +++ b/sim/cris/configure.ac @@ -9,6 +9,5 @@ SIM_AC_OPTION_HARDWARE(rv cris cris_900000xx) # The default model shouldn't matter as long as there's a BFD. SIM_AC_OPTION_DEFAULT_MODEL(crisv32) -SIM_AC_OPTION_CGEN_MAINT SIM_AC_OUTPUT diff --git a/sim/frv/ChangeLog b/sim/frv/ChangeLog index 084012d..7ed3598 100644 --- a/sim/frv/ChangeLog +++ b/sim/frv/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/frv/Makefile.in b/sim/frv/Makefile.in index 5356add..6fdd6e0 100644 --- a/sim/frv/Makefile.in +++ b/sim/frv/Makefile.in @@ -69,11 +69,6 @@ frv-clean: rm -f tmp-* rm -f stamp-arch stamp-cpu -# 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) $(srcdir)/../../cpu/frv.cpu $(MAKE) cgen-arch $(CGEN_FLAGS_TO_PASS) mach=all \ archfile=$(srcdir)/../../cpu/frv.cpu \ diff --git a/sim/frv/aclocal.m4 b/sim/frv/aclocal.m4 index 50fcc1f..137af59 100644 --- a/sim/frv/aclocal.m4 +++ b/sim/frv/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/frv/configure b/sim/frv/configure index 2da2c50..3c9a65c 100755 --- a/sim/frv/configure +++ b/sim/frv/configure @@ -589,9 +589,6 @@ sim_float sim_bitsize cgen_breaks sim_trapdump -cgen -cgendir -CGEN_MAINT MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -644,7 +641,6 @@ enable_option_checking enable_maintainer_mode enable_sim_scache enable_sim_default_model -enable_cgen_maint enable_sim_trapdump enable_sim_hardware ' @@ -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-trapdump Make unknown traps dump the registers --enable-sim-hardware=LIST Specify the hardware to be included in the build. @@ -1764,39 +1759,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 - - - - - # # Enable making unknown traps dump out registers # diff --git a/sim/frv/configure.ac b/sim/frv/configure.ac index f652e26..a03b4f6 100644 --- a/sim/frv/configure.ac +++ b/sim/frv/configure.ac @@ -6,7 +6,6 @@ SIM_AC_COMMON SIM_AC_OPTION_SCACHE(16384) SIM_AC_OPTION_DEFAULT_MODEL(fr500) -SIM_AC_OPTION_CGEN_MAINT # # Enable making unknown traps dump out registers diff --git a/sim/iq2000/ChangeLog b/sim/iq2000/ChangeLog index c2b8dd6..679eccb 100644 --- a/sim/iq2000/ChangeLog +++ b/sim/iq2000/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/iq2000/Makefile.in b/sim/iq2000/Makefile.in index f7a77c2..557db48 100644 --- a/sim/iq2000/Makefile.in +++ b/sim/iq2000/Makefile.in @@ -69,11 +69,6 @@ iq2000-clean: rm -f tmp-* rm -f stamp-arch stamp-cpu -# 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)/iq2000.cpu Makefile $(MAKE) cgen-arch $(CGEN_FLAGS_TO_PASS) mach=iq2000 \ archfile=$(CPU_DIR)/iq2000.cpu \ diff --git a/sim/iq2000/aclocal.m4 b/sim/iq2000/aclocal.m4 index 50fcc1f..137af59 100644 --- a/sim/iq2000/aclocal.m4 +++ b/sim/iq2000/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/iq2000/configure b/sim/iq2000/configure index 3575e5d..810c507 100755 --- a/sim/iq2000/configure +++ b/sim/iq2000/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 " sim_hw_cflags="-DWITH_HW=1" diff --git a/sim/iq2000/configure.ac b/sim/iq2000/configure.ac index 92c10d2..c434633 100644 --- a/sim/iq2000/configure.ac +++ b/sim/iq2000/configure.ac @@ -6,6 +6,5 @@ SIM_AC_COMMON SIM_AC_OPTION_SCACHE(16384) SIM_AC_OPTION_DEFAULT_MODEL(iq2000) -SIM_AC_OPTION_CGEN_MAINT SIM_AC_OUTPUT 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 diff --git a/sim/m32r/ChangeLog b/sim/m32r/ChangeLog index 0fabbfc..ac58a95 100644 --- a/sim/m32r/ChangeLog +++ b/sim/m32r/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/m32r/Makefile.in b/sim/m32r/Makefile.in index 2729745..f8ccb97 100644 --- a/sim/m32r/Makefile.in +++ b/sim/m32r/Makefile.in @@ -108,11 +108,6 @@ m32r-clean: rm -f stamp-arch stamp-cpu stamp-xcpu stamp-2cpu 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 = - # NOTE: Generated source files are specified as full paths, # e.g. $(srcdir)/arch.c, because make may decide the files live # in objdir otherwise. diff --git a/sim/m32r/aclocal.m4 b/sim/m32r/aclocal.m4 index 50fcc1f..137af59 100644 --- a/sim/m32r/aclocal.m4 +++ b/sim/m32r/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/m32r/configure b/sim/m32r/configure index cdfcddd..71efc1a 100755 --- a/sim/m32r/configure +++ b/sim/m32r/configure @@ -590,9 +590,6 @@ sim_bitsize cgen_breaks sim_extra_cflags traps_obj -cgen -cgendir -CGEN_MAINT MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -645,7 +642,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 @@ -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. @@ -1763,39 +1758,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 - - - - - case "${target_alias}" in m32r*-linux*) traps_obj=traps-linux.o diff --git a/sim/m32r/configure.ac b/sim/m32r/configure.ac index 3146fee..2e6b415 100644 --- a/sim/m32r/configure.ac +++ b/sim/m32r/configure.ac @@ -6,7 +6,6 @@ SIM_AC_COMMON SIM_AC_OPTION_SCACHE(16384) SIM_AC_OPTION_DEFAULT_MODEL(m32r/d) -SIM_AC_OPTION_CGEN_MAINT case "${target_alias}" in m32r*-linux*) 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 |