aboutsummaryrefslogtreecommitdiff
path: root/sim/frv
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2021-06-19 10:42:37 -0400
committerMike Frysinger <vapier@gentoo.org>2021-06-20 00:25:13 -0400
commit1bf5c34239398dac1452e064b7194869054cf398 (patch)
treec2f4f0d0415fd9375c836e456395e568c4fcab8d /sim/frv
parent4ca8baee000128932f0cd61b226fa5b53656fc32 (diff)
downloadgdb-1bf5c34239398dac1452e064b7194869054cf398.zip
gdb-1bf5c34239398dac1452e064b7194869054cf398.tar.gz
gdb-1bf5c34239398dac1452e064b7194869054cf398.tar.bz2
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.
Diffstat (limited to 'sim/frv')
-rw-r--r--sim/frv/ChangeLog6
-rw-r--r--sim/frv/Makefile.in5
-rw-r--r--sim/frv/aclocal.m41
-rwxr-xr-xsim/frv/configure38
-rw-r--r--sim/frv/configure.ac1
5 files changed, 6 insertions, 45 deletions
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