aboutsummaryrefslogtreecommitdiff
path: root/sim/m32r
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2016-01-10 16:52:25 -0500
committerMike Frysinger <vapier@gentoo.org>2016-01-10 17:03:36 -0500
commit16f7876d71604f835aefe48f0bf230c028c05d99 (patch)
tree6e5d6683ee8b3e506058f141a4304f265e458812 /sim/m32r
parent35656e95217a20309c0a0f16bf0c89a49a549177 (diff)
downloadgdb-16f7876d71604f835aefe48f0bf230c028c05d99.zip
gdb-16f7876d71604f835aefe48f0bf230c028c05d99.tar.gz
gdb-16f7876d71604f835aefe48f0bf230c028c05d99.tar.bz2
sim: allow the environment configure option everywhere
Currently ports have to call SIM_AC_OPTION_ENVIRONMENT explicitly in order to make the configure flag available. There's no real reason to not allow this flag for all ports, so move it to the common sim macro. This way we get standard behavior across all ports too.
Diffstat (limited to 'sim/m32r')
-rw-r--r--sim/m32r/ChangeLog5
-rwxr-xr-xsim/m32r/configure44
-rw-r--r--sim/m32r/configure.ac1
3 files changed, 27 insertions, 23 deletions
diff --git a/sim/m32r/ChangeLog b/sim/m32r/ChangeLog
index 1bc70e1..d33c5fe 100644
--- a/sim/m32r/ChangeLog
+++ b/sim/m32r/ChangeLog
@@ -1,5 +1,10 @@
2016-01-10 Mike Frysinger <vapier@gentoo.org>
+ * configure.ac (SIM_AC_OPTION_ENVIRONMENT): Delete call.
+ * configure: Regenerate.
+
+2016-01-10 Mike Frysinger <vapier@gentoo.org>
+
* configure: Regenerate.
2016-01-10 Mike Frysinger <vapier@gentoo.org>
diff --git a/sim/m32r/configure b/sim/m32r/configure
index 492d3af..49f33f4 100755
--- a/sim/m32r/configure
+++ b/sim/m32r/configure
@@ -758,6 +758,7 @@ enable_sim_stdio
enable_sim_trace
enable_sim_profile
enable_sim_assert
+enable_sim_environment
enable_sim_inline
with_pkgversion
with_bugurl
@@ -765,7 +766,6 @@ enable_sim_endian
enable_sim_alignment
enable_sim_scache
enable_sim_default_model
-enable_sim_environment
enable_cgen_maint
enable_sim_hardware
'
@@ -1412,6 +1412,9 @@ Optional Features:
--enable-sim-profile=opts
Enable profiling flags
--enable-sim-assert Specify whether to perform random assertions
+ --enable-sim-environment=environment
+ Specify mixed, user, virtual or operating
+ environment
--enable-sim-inline=inlines
Specify which functions should be inlined
--enable-sim-endian=endian
@@ -1423,9 +1426,6 @@ Optional Features:
Specify simulator execution cache size
--enable-sim-default-model=model
Specify default model to simulate
- --enable-sim-environment=environment
- Specify mixed, user, virtual or operating
- environment
--enable-cgen-maint=DIR build cgen generated files
--enable-sim-hardware=LIST
Specify the hardware to be included in the build.
@@ -13331,6 +13331,24 @@ else
fi
+# Check whether --enable-sim-environment was given.
+if test "${enable_sim_environment+set}" = set; then :
+ enableval=$enable_sim_environment; case "${enableval}" in
+ all | ALL) sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT";;
+ user | USER) sim_environment="-DWITH_ENVIRONMENT=USER_ENVIRONMENT";;
+ virtual | VIRTUAL) sim_environment="-DWITH_ENVIRONMENT=VIRTUAL_ENVIRONMENT";;
+ operating | OPERATING) sim_environment="-DWITH_ENVIRONMENT=OPERATING_ENVIRONMENT";;
+ *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-environment\"" "$LINENO" 5;
+ sim_environment="";;
+esac
+if test x"$silent" != x"yes" && test x"$sim_environment" != x""; then
+ echo "Setting sim environment = $sim_environment" 6>&1
+fi
+else
+ sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT"
+fi
+
+
sim_inline="-DDEFAULT_INLINE=0"
# Check whether --enable-sim-inline was given.
if test "${enable_sim_inline+set}" = set; then :
@@ -13582,24 +13600,6 @@ fi
-# Check whether --enable-sim-environment was given.
-if test "${enable_sim_environment+set}" = set; then :
- enableval=$enable_sim_environment; case "${enableval}" in
- all | ALL) sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT";;
- user | USER) sim_environment="-DWITH_ENVIRONMENT=USER_ENVIRONMENT";;
- virtual | VIRTUAL) sim_environment="-DWITH_ENVIRONMENT=VIRTUAL_ENVIRONMENT";;
- operating | OPERATING) sim_environment="-DWITH_ENVIRONMENT=OPERATING_ENVIRONMENT";;
- *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-environment\"" "$LINENO" 5;
- sim_environment="";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_environment" != x""; then
- echo "Setting sim environment = $sim_environment" 6>&1
-fi
-else
- sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT"
-fi
-
-
cgen_maint=no
cgen=guile
cgendir='$(srcdir)/../../cgen'
diff --git a/sim/m32r/configure.ac b/sim/m32r/configure.ac
index 4395020..d9c7d62 100644
--- a/sim/m32r/configure.ac
+++ b/sim/m32r/configure.ac
@@ -9,7 +9,6 @@ SIM_AC_OPTION_ENDIAN(BIG)
SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT)
SIM_AC_OPTION_SCACHE(16384)
SIM_AC_OPTION_DEFAULT_MODEL(m32r/d)
-SIM_AC_OPTION_ENVIRONMENT
SIM_AC_OPTION_CGEN_MAINT
case "${target_alias}" in