sim: unify environment build settings

Move the --sim-enable-environment option up to the common dir so we
only test & export it once across all ports.

3 files changed, 2 insertions, 32 deletions

diff --git a/sim/aarch64/aclocal.m4 b/sim/aarch64/aclocal.m4
index db1cdbf..0cdbae2 100644
--- a/sim/aarch64/aclocal.m4
+++ b/sim/aarch64/aclocal.m4
@@ -113,7 +113,6 @@ m4_include([../../lt~obsolete.m4])
 m4_include([../m4/sim_ac_common.m4])
 m4_include([../m4/sim_ac_option_alignment.m4])
 m4_include([../m4/sim_ac_option_endian.m4])
-m4_include([../m4/sim_ac_option_environment.m4])
 m4_include([../m4/sim_ac_option_hardware.m4])
 m4_include([../m4/sim_ac_option_inline.m4])
 m4_include([../m4/sim_ac_option_warnings.m4])
diff --git a/sim/aarch64/config.in b/sim/aarch64/config.in
index 0b237bf..b21bf7c 100644
--- a/sim/aarch64/config.in
+++ b/sim/aarch64/config.in
@@ -117,9 +117,6 @@
 /* Sim debug setting */
 #undef WITH_DEBUG
 
-/* Sim default environment */
-#undef WITH_ENVIRONMENT
-
 /* Sim profile settings */
 #undef WITH_PROFILE
 
diff --git a/sim/aarch64/configure b/sim/aarch64/configure
index 8fb02f1..5269d6d 100755
--- a/sim/aarch64/configure
+++ b/sim/aarch64/configure
@@ -775,7 +775,6 @@ enable_sim_debug
 enable_sim_stdio
 enable_sim_trace
 enable_sim_profile
-enable_sim_environment
 enable_sim_inline
 with_pkgversion
 with_bugurl
@@ -1428,9 +1427,6 @@ Optional Features:
   --enable-sim-trace=opts Enable tracing of simulated programs
   --enable-sim-profile=opts
                           Enable profiling flags
-  --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
@@ -10782,7 +10778,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10785 "configure"
+#line 10781 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10888,7 +10884,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10891 "configure"
+#line 10887 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11271,28 +11267,6 @@ $as_echo "$sim_profile" >&6; }
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking default sim environment setting" >&5
-$as_echo_n "checking default sim environment setting... " >&6; }
-sim_environment="ALL_ENVIRONMENT"
-# 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="ALL_ENVIRONMENT";;
-  user | USER)           sim_environment="USER_ENVIRONMENT";;
-  virtual | VIRTUAL)     sim_environment="VIRTUAL_ENVIRONMENT";;
-  operating | OPERATING) sim_environment="OPERATING_ENVIRONMENT";;
-  *)   as_fn_error $? "Unknown value $enableval passed to --enable-sim-environment" "$LINENO" 5;;
-esac
-fi
-
-cat >>confdefs.h <<_ACEOF
-#define WITH_ENVIRONMENT $sim_environment
-_ACEOF
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_environment" >&5
-$as_echo "$sim_environment" >&6; }
-
-
 sim_inline="-DDEFAULT_INLINE=0"
 # Check whether --enable-sim-inline was given.
 if test "${enable_sim_inline+set}" = set; then :