summaryrefslogtreecommitdiff
path: root/sim/mcore
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/mcore
parent35656e95217a20309c0a0f16bf0c89a49a549177 (diff)
downloadbinutils-gdb-16f7876d71604f835aefe48f0bf230c028c05d99.tar.gz
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/mcore')
-rw-r--r--sim/mcore/ChangeLog5
-rwxr-xr-xsim/mcore/configure44
-rw-r--r--sim/mcore/configure.ac1
3 files changed, 27 insertions, 23 deletions
diff --git a/sim/mcore/ChangeLog b/sim/mcore/ChangeLog
index 87a759ad24b..d93f895acdb 100644
--- a/sim/mcore/ChangeLog
+++ b/sim/mcore/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/mcore/configure b/sim/mcore/configure
index cf8a451ab2c..b4e6c827c31 100755
--- a/sim/mcore/configure
+++ b/sim/mcore/configure
@@ -753,12 +753,12 @@ enable_sim_stdio
enable_sim_trace
enable_sim_profile
enable_sim_assert
+enable_sim_environment
enable_sim_inline
with_pkgversion
with_bugurl
enable_sim_endian
enable_sim_alignment
-enable_sim_environment
enable_werror
enable_build_warnings
enable_sim_build_warnings
@@ -1406,6 +1406,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
@@ -1413,9 +1416,6 @@ Optional Features:
--enable-sim-alignment=align
Specify strict, nonstrict or forced alignment of
memory accesses
- --enable-sim-environment=environment
- Specify mixed, user, virtual or operating
- environment
--enable-werror treat compile warnings as errors
--enable-build-warnings enable build-time compiler warnings if gcc is used
--enable-sim-build-warnings
@@ -13323,6 +13323,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 :
@@ -13539,24 +13557,6 @@ fi
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
-
-
# Check whether --enable-werror was given.
if test "${enable_werror+set}" = set; then :
enableval=$enable_werror; case "${enableval}" in
diff --git a/sim/mcore/configure.ac b/sim/mcore/configure.ac
index 6d5622e2665..a93418f9323 100644
--- a/sim/mcore/configure.ac
+++ b/sim/mcore/configure.ac
@@ -7,7 +7,6 @@ SIM_AC_COMMON
SIM_AC_OPTION_ENDIAN
SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT,STRICT_ALIGNMENT)
-SIM_AC_OPTION_ENVIRONMENT
SIM_AC_OPTION_WARNINGS
SIM_AC_OUTPUT