FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sim: unify cgen maintainer settings

Browse source 
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.
This commit is contained in:
Mike Frysinger 2021-06-19 10:42:37 -04:00
parent 4ca8baee00
commit 1bf5c34239
43 changed files with 104 additions and 318 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sim/ChangeLog
View file

@ -1,3 +1,9 @@
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).

4
sim/Makefile.in
View file

@ -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@

1
sim/aclocal.m4 vendored
View file

@ -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])

6
sim/arch-subdir.mk.in
View file

@ -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@

6
sim/bpf/ChangeLog
View file

@ -1,3 +1,9 @@
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.

5
sim/bpf/Makefile.in
View file

@ -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 = \

1
sim/bpf/aclocal.m4 vendored
View file

@ -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])

38
sim/bpf/configure vendored
View file

@ -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"

1
sim/bpf/configure.ac
View file

@ -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

4
sim/common/ChangeLog
View file

@ -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.

1
sim/common/Make-common.in
View file

@ -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

42
sim/configure vendored
View file

@ -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"

1
sim/configure.ac
View file

@ -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

6
sim/cris/ChangeLog
View file

@ -1,3 +1,9 @@
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.

5
sim/cris/Makefile.in
View file

@ -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

1
sim/cris/aclocal.m4 vendored
View file

@ -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])

38
sim/cris/configure vendored
View file

@ -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

1
sim/cris/configure.ac
View file

@ -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

6
sim/frv/ChangeLog
View file

@ -1,3 +1,9 @@
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.

5
sim/frv/Makefile.in
View file

@ -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 \

1
sim/frv/aclocal.m4 vendored
View file

@ -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])

38
sim/frv/configure vendored
View file

@ -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
#

1
sim/frv/configure.ac
View file

@ -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

6
sim/iq2000/ChangeLog
View file

@ -1,3 +1,9 @@
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.

5
sim/iq2000/Makefile.in
View file

@ -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 \

1
sim/iq2000/aclocal.m4 vendored
View file

@ -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])

38
sim/iq2000/configure vendored
View file

@ -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"

1
sim/iq2000/configure.ac
View file

@ -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

6
sim/lm32/ChangeLog
View file

@ -1,3 +1,9 @@
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.

5
sim/lm32/Makefile.in
View file

@ -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 \

1
sim/lm32/aclocal.m4 vendored
View file

@ -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])

38
sim/lm32/configure vendored
View file

@ -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"

1
sim/lm32/configure.ac
View file

@ -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

6
sim/m32r/ChangeLog
View file

@ -1,3 +1,9 @@
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.

5
sim/m32r/Makefile.in
View file

@ -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.

1
sim/m32r/aclocal.m4 vendored
View file

@ -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])

38
sim/m32r/configure vendored
View file

@ -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

1
sim/m32r/configure.ac
View file

@ -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*)

6
sim/or1k/ChangeLog
View file

@ -1,3 +1,9 @@
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.

5
sim/or1k/Makefile.in
View file

@ -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,

1
sim/or1k/aclocal.m4 vendored
View file

@ -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])

38
sim/or1k/configure vendored
View file

@ -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"

1
sim/or1k/configure.ac
View file

@ -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