From 5ea45474021e98cbb325534b328e391593119cb0 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 6 Jun 2021 20:11:02 -0400
Subject: 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.
---
 sim/riscv/aclocal.m4 |  1 -
 sim/riscv/config.in  |  3 ---
 sim/riscv/configure  | 30 ++----------------------------
 3 files changed, 2 insertions(+), 32 deletions(-)

(limited to 'sim/riscv')

diff --git a/sim/riscv/aclocal.m4 b/sim/riscv/aclocal.m4
index 487fd07..98b9d17 100644
--- a/sim/riscv/aclocal.m4
+++ b/sim/riscv/aclocal.m4
@@ -115,7 +115,6 @@ m4_include([../m4/sim_ac_option_alignment.m4])
 m4_include([../m4/sim_ac_option_bitsize.m4])
 m4_include([../m4/sim_ac_option_default_model.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/riscv/config.in b/sim/riscv/config.in
index 0b237bf..b21bf7c 100644
--- a/sim/riscv/config.in
+++ b/sim/riscv/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/riscv/configure b/sim/riscv/configure
index 1c59cfa..f405268 100755
--- a/sim/riscv/configure
+++ b/sim/riscv/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
@@ -1430,9 +1429,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
@@ -10787,7 +10783,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10790 "configure"
+#line 10786 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10893,7 +10889,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10896 "configure"
+#line 10892 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11276,28 +11272,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 :
-- 
cgit v1.1