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.

diff --git a/sim/ChangeLog b/sim/ChangeLog
index 94ba4dedbffd1cebbc011c3697a8205c5a54671c..e832e131c8a5479f748c2d7ca4ed8cc30f0f9c8d 100644 (file)
--- a/sim/ChangeLog
+++ b/sim/ChangeLog
@@ -1,3 +1,9 @@
+2021-06-12  Mike Frysinger  <vapier@gentoo.org>
+
+       * configure.ac: Call SIM_AC_OPTION_ENVIRONMENT.
+       * m4/sim_ac_common.m4: Delete call to SIM_AC_OPTION_ENVIRONMENT.
+       * aclocal.m4, config.h.in, configure, Makefile.in: Regenerate.
+
 2021-06-12  Mike Frysinger  <vapier@gentoo.org>
 
        * configure.ac: Call SIM_AC_OPTION_ASSERT.

diff --git a/sim/Makefile.in b/sim/Makefile.in
index d8a993af8387cb8c9839ac542d75587e957b29a3..c8b52493f4e0fa6d1f6f74fa35ac61558f7ccf4f 100644 (file)
--- a/sim/Makefile.in
+++ b/sim/Makefile.in
@@ -198,6 +198,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \
        $(top_srcdir)/../config/lead-dot.m4 \
        $(top_srcdir)/../config/override.m4 \
        $(top_srcdir)/m4/sim_ac_option_assert.m4 \
+       $(top_srcdir)/m4/sim_ac_option_environment.m4 \
        $(top_srcdir)/m4/sim_ac_platform.m4 \
        $(top_srcdir)/m4/sim_ac_toolchain.m4 \
        $(top_srcdir)/configure.ac

diff --git a/sim/aarch64/aclocal.m4 b/sim/aarch64/aclocal.m4
index db1cdbfd2e8e2baccd37d6499f5ae96a43ecc9a6..0cdbae2da9d1a2c88c238aa75b29039970866dd7 100644 (file)
--- 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 0b237bf309b3d7efaafbb4dccd21fededb753d2c..b21bf7cd6b526e5dfc567473d1b03911224b0ac5 100644 (file)
--- 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 8fb02f18846b1d2874cf6d297c2540fb88fd8c1c..5269d6db77d9358496f684eb9cc16a74baa251be 100755 (executable)
--- 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 :

diff --git a/sim/aclocal.m4 b/sim/aclocal.m4
index d87931af92238ec62225533c40ffd94a915b2673..4b6eb267ad4b92bf358fa2b4ce4b631d337a1e1d 100644 (file)
--- a/sim/aclocal.m4
+++ b/sim/aclocal.m4
@@ -1171,5 +1171,6 @@ m4_include([../config/depstand.m4])
 m4_include([../config/lead-dot.m4])
 m4_include([../config/override.m4])
 m4_include([m4/sim_ac_option_assert.m4])
+m4_include([m4/sim_ac_option_environment.m4])
 m4_include([m4/sim_ac_platform.m4])
 m4_include([m4/sim_ac_toolchain.m4])

diff --git a/sim/arm/aclocal.m4 b/sim/arm/aclocal.m4
index db1cdbfd2e8e2baccd37d6499f5ae96a43ecc9a6..0cdbae2da9d1a2c88c238aa75b29039970866dd7 100644 (file)
--- a/sim/arm/aclocal.m4
+++ b/sim/arm/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/arm/config.in b/sim/arm/config.in
index 0b237bf309b3d7efaafbb4dccd21fededb753d2c..b21bf7cd6b526e5dfc567473d1b03911224b0ac5 100644 (file)
--- a/sim/arm/config.in
+++ b/sim/arm/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/arm/configure b/sim/arm/configure
index 9d57aa24739f69fb879f7427033defc4222c23a6..48f24aaa5692ae3abde89c5bdeefbe8768ecf0a5 100755 (executable)
--- a/sim/arm/configure
+++ b/sim/arm/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 :

diff --git a/sim/avr/aclocal.m4 b/sim/avr/aclocal.m4
index db1cdbfd2e8e2baccd37d6499f5ae96a43ecc9a6..0cdbae2da9d1a2c88c238aa75b29039970866dd7 100644 (file)
--- a/sim/avr/aclocal.m4
+++ b/sim/avr/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/avr/config.in b/sim/avr/config.in
index 0b237bf309b3d7efaafbb4dccd21fededb753d2c..b21bf7cd6b526e5dfc567473d1b03911224b0ac5 100644 (file)
--- a/sim/avr/config.in
+++ b/sim/avr/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/avr/configure b/sim/avr/configure
index 5d4faa67f88fd1dc8b36111a81bb9e2c8ed8cb90..0877f01f1d94df50f0c682f6bd5d9a4d85a92659 100755 (executable)
--- a/sim/avr/configure
+++ b/sim/avr/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 :

diff --git a/sim/bfin/aclocal.m4 b/sim/bfin/aclocal.m4
index eccf6ce9b24a77fec9f96d9a26ffbd8eb0e5fe3e..24e0597672fefa55bb6be52339fe400ef5ea6bf4 100644 (file)
--- a/sim/bfin/aclocal.m4
+++ b/sim/bfin/aclocal.m4
@@ -115,7 +115,6 @@ m4_include([../m4/sim_ac_common.m4])
 m4_include([../m4/sim_ac_option_alignment.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/bfin/config.in b/sim/bfin/config.in
index 0b237bf309b3d7efaafbb4dccd21fededb753d2c..b21bf7cd6b526e5dfc567473d1b03911224b0ac5 100644 (file)
--- a/sim/bfin/config.in
+++ b/sim/bfin/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/bfin/configure b/sim/bfin/configure
index 9ffef2678dd83cd63febe7054aa190e104c3368f..30fd48ac552ab3ac4b0d600645aa38df03280eec 100755 (executable)
--- a/sim/bfin/configure
+++ b/sim/bfin/configure
@@ -780,7 +780,6 @@ enable_sim_debug
 enable_sim_stdio
 enable_sim_trace
 enable_sim_profile
-enable_sim_environment
 enable_sim_inline
 with_pkgversion
 with_bugurl
@@ -1439,9 +1438,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
@@ -10802,7 +10798,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10805 "configure"
+#line 10801 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10908,7 +10904,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10911 "configure"
+#line 10907 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11291,28 +11287,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 :

diff --git a/sim/bpf/aclocal.m4 b/sim/bpf/aclocal.m4
index fcc47b8fffd12a5e49a89c9a537ca5acb4f3e9c4..50bdf77f1af9d71a9146477d84f2d6be859960ec 100644 (file)
--- a/sim/bpf/aclocal.m4
+++ b/sim/bpf/aclocal.m4
@@ -116,7 +116,6 @@ m4_include([../m4/sim_ac_option_bitsize.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_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_scache.m4])

diff --git a/sim/bpf/config.in b/sim/bpf/config.in
index 0b237bf309b3d7efaafbb4dccd21fededb753d2c..b21bf7cd6b526e5dfc567473d1b03911224b0ac5 100644 (file)
--- a/sim/bpf/config.in
+++ b/sim/bpf/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/bpf/configure b/sim/bpf/configure
index 3eb6cf1f45e5e340644b2f5f1e289dc90807fac9..375916b98c7abd5728d11a8915ed5c41a34197a1 100755 (executable)
--- a/sim/bpf/configure
+++ b/sim/bpf/configure
@@ -778,7 +778,6 @@ enable_sim_debug
 enable_sim_stdio
 enable_sim_trace
 enable_sim_profile
-enable_sim_environment
 enable_sim_inline
 with_pkgversion
 with_bugurl
@@ -1435,9 +1434,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-bitsize=N  Specify target bitsize (32 or 64)
@@ -10795,7 +10791,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10798 "configure"
+#line 10794 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10901,7 +10897,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10904 "configure"
+#line 10900 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11284,28 +11280,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 :

diff --git a/sim/config.h.in b/sim/config.h.in
index 850d42cabba1e2fe66965eb2188de55f458955e6..5fd8c8dafb52103b3378e9509949dc42fcb19191 100644 (file)
--- a/sim/config.h.in
+++ b/sim/config.h.in
@@ -262,6 +262,9 @@
 /* Sim assert settings */
 #undef WITH_ASSERT
 
+/* Sim default environment */
+#undef WITH_ENVIRONMENT
+
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
    significant byte first (like Motorola and SPARC, unlike Intel). */
 #if defined AC_APPLE_UNIVERSAL_BUILD

diff --git a/sim/configure b/sim/configure
index 5cbe2e6c1ffe1a7f8d7cdc73f1d60e8d40603e9e..0b9a118b877774fd97338599be8ce7e81de5a42a 100755 (executable)
--- a/sim/configure
+++ b/sim/configure
@@ -751,6 +751,7 @@ enable_sim
 enable_example_sims
 enable_targets
 enable_sim_assert
+enable_sim_environment
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1424,6 +1425,9 @@ Optional Features:
   --enable-example-sims   enable example GNU simulators
   --enable-targets        alternative target configurations
   --enable-sim-assert     Specify whether to perform random assertions
+  --enable-sim-environment=environment
+                          Specify mixed, user, virtual or operating
+                          environment
 
 Some influential environment variables:
   CC          C compiler command
@@ -5940,6 +5944,28 @@ _ACEOF
 $as_echo "$sim_assert" >&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; }
+
+
 ac_config_files="$ac_config_files Makefile"
 
 cat >confcache <<\_ACEOF

diff --git a/sim/configure.ac b/sim/configure.ac
index 700e04d6a602e144681234aba8210db169d73bd1..ecf12b57a19baff59ec22ab46887880dc5816a99 100644 (file)
--- a/sim/configure.ac
+++ b/sim/configure.ac
@@ -100,6 +100,7 @@ fi
 AM_CONDITIONAL([SIM_ENABLE_IGEN], [test "$sim_igen" = "yes"])
 
 SIM_AC_OPTION_ASSERT
+SIM_AC_OPTION_ENVIRONMENT
 
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT

diff --git a/sim/cr16/aclocal.m4 b/sim/cr16/aclocal.m4
index db1cdbfd2e8e2baccd37d6499f5ae96a43ecc9a6..0cdbae2da9d1a2c88c238aa75b29039970866dd7 100644 (file)
--- a/sim/cr16/aclocal.m4
+++ b/sim/cr16/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/cr16/config.in b/sim/cr16/config.in
index 0b237bf309b3d7efaafbb4dccd21fededb753d2c..b21bf7cd6b526e5dfc567473d1b03911224b0ac5 100644 (file)
--- a/sim/cr16/config.in
+++ b/sim/cr16/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/cr16/configure b/sim/cr16/configure
index 3303b4db448561b42db833f956c48552d96c81e4..b8e51ce59cc110db117e90d9dfbd42f487ac06ec 100755 (executable)
--- a/sim/cr16/configure
+++ b/sim/cr16/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 :

diff --git a/sim/cris/aclocal.m4 b/sim/cris/aclocal.m4
index 7ef344a579cae73a453014e8034a4ad46d89548b..1af7a84043e18f3a1349ba76e7baf21a11d597dc 100644 (file)
--- a/sim/cris/aclocal.m4
+++ b/sim/cris/aclocal.m4
@@ -115,7 +115,6 @@ m4_include([../m4/sim_ac_option_alignment.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_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_scache.m4])

diff --git a/sim/cris/config.in b/sim/cris/config.in
index 0b237bf309b3d7efaafbb4dccd21fededb753d2c..b21bf7cd6b526e5dfc567473d1b03911224b0ac5 100644 (file)
--- a/sim/cris/config.in
+++ b/sim/cris/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/cris/configure b/sim/cris/configure
index 2eee94517ff44bb1c5015ca149b0fa981175e64f..9312f2711c278ba6f533ecadf7c7a6013f97d880 100755 (executable)
--- a/sim/cris/configure
+++ b/sim/cris/configure
@@ -778,7 +778,6 @@ enable_sim_debug
 enable_sim_stdio
 enable_sim_trace
 enable_sim_profile
-enable_sim_environment
 enable_sim_inline
 with_pkgversion
 with_bugurl
@@ -1434,9 +1433,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
@@ -10793,7 +10789,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10796 "configure"
+#line 10792 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10899,7 +10895,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10902 "configure"
+#line 10898 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11282,28 +11278,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 :

diff --git a/sim/d10v/aclocal.m4 b/sim/d10v/aclocal.m4
index db1cdbfd2e8e2baccd37d6499f5ae96a43ecc9a6..0cdbae2da9d1a2c88c238aa75b29039970866dd7 100644 (file)
--- a/sim/d10v/aclocal.m4
+++ b/sim/d10v/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/d10v/config.in b/sim/d10v/config.in
index 0b237bf309b3d7efaafbb4dccd21fededb753d2c..b21bf7cd6b526e5dfc567473d1b03911224b0ac5 100644 (file)
--- a/sim/d10v/config.in
+++ b/sim/d10v/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/d10v/configure b/sim/d10v/configure
index 7bb50991f7419fe6c2b4e29bcb87565727331929..1a5c3a02324fc6b6207d08cdb291d98bdf43044c 100755 (executable)
--- a/sim/d10v/configure
+++ b/sim/d10v/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 :

diff --git a/sim/erc32/aclocal.m4 b/sim/erc32/aclocal.m4
index cff614273b5a36bc087212a03b17d91fe725df83..b568fae568cdf78b90e3032bfb56a85ee0a4dc52 100644 (file)
--- a/sim/erc32/aclocal.m4
+++ b/sim/erc32/aclocal.m4
@@ -111,7 +111,6 @@ m4_include([../../ltsugar.m4])
 m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
 m4_include([../m4/sim_ac_common.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/erc32/config.in b/sim/erc32/config.in
index 0b237bf309b3d7efaafbb4dccd21fededb753d2c..b21bf7cd6b526e5dfc567473d1b03911224b0ac5 100644 (file)
--- a/sim/erc32/config.in
+++ b/sim/erc32/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/erc32/configure b/sim/erc32/configure
index 0ac222dc0b4f8705a8ae6cb3b8a381fac7bcaf56..160189df46408f2a5c46e7d19fbe41bd7d222e78 100755 (executable)
--- a/sim/erc32/configure
+++ b/sim/erc32/configure
@@ -778,7 +778,6 @@ enable_sim_debug
 enable_sim_stdio
 enable_sim_trace
 enable_sim_profile
-enable_sim_environment
 enable_sim_inline
 with_pkgversion
 with_bugurl
@@ -1429,9 +1428,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-werror         treat compile warnings as errors
@@ -10778,7 +10774,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10781 "configure"
+#line 10777 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10884,7 +10880,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10887 "configure"
+#line 10883 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11267,28 +11263,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 :

diff --git a/sim/example-synacor/aclocal.m4 b/sim/example-synacor/aclocal.m4
index db1cdbfd2e8e2baccd37d6499f5ae96a43ecc9a6..0cdbae2da9d1a2c88c238aa75b29039970866dd7 100644 (file)
--- a/sim/example-synacor/aclocal.m4
+++ b/sim/example-synacor/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/example-synacor/config.in b/sim/example-synacor/config.in
index 0b237bf309b3d7efaafbb4dccd21fededb753d2c..b21bf7cd6b526e5dfc567473d1b03911224b0ac5 100644 (file)
--- a/sim/example-synacor/config.in
+++ b/sim/example-synacor/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/example-synacor/configure b/sim/example-synacor/configure
index dcab9c5e00c52ee424847916cca30ff73a3433ab..eb7a968b9ea03195c243435d692e345daaad0093 100755 (executable)
--- a/sim/example-synacor/configure
+++ b/sim/example-synacor/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 :

diff --git a/sim/frv/aclocal.m4 b/sim/frv/aclocal.m4
index 7ef344a579cae73a453014e8034a4ad46d89548b..1af7a84043e18f3a1349ba76e7baf21a11d597dc 100644 (file)
--- a/sim/frv/aclocal.m4
+++ b/sim/frv/aclocal.m4
@@ -115,7 +115,6 @@ m4_include([../m4/sim_ac_option_alignment.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_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_scache.m4])

diff --git a/sim/frv/config.in b/sim/frv/config.in
index 0b237bf309b3d7efaafbb4dccd21fededb753d2c..b21bf7cd6b526e5dfc567473d1b03911224b0ac5 100644 (file)
--- a/sim/frv/config.in
+++ b/sim/frv/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/frv/configure b/sim/frv/configure
index 5c527cf13748c2df39eaee216a7b2d1832fc17d9..c4eedf22287c08ea56512cbe93c2872fb9aa1515 100755 (executable)
--- a/sim/frv/configure
+++ b/sim/frv/configure
@@ -779,7 +779,6 @@ enable_sim_debug
 enable_sim_stdio
 enable_sim_trace
 enable_sim_profile
-enable_sim_environment
 enable_sim_inline
 with_pkgversion
 with_bugurl
@@ -1436,9 +1435,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
@@ -10796,7 +10792,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10799 "configure"
+#line 10795 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10902,7 +10898,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10905 "configure"
+#line 10901 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11285,28 +11281,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 :

diff --git a/sim/ft32/aclocal.m4 b/sim/ft32/aclocal.m4
index db1cdbfd2e8e2baccd37d6499f5ae96a43ecc9a6..0cdbae2da9d1a2c88c238aa75b29039970866dd7 100644 (file)
--- a/sim/ft32/aclocal.m4
+++ b/sim/ft32/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/ft32/config.in b/sim/ft32/config.in
index 0b237bf309b3d7efaafbb4dccd21fededb753d2c..b21bf7cd6b526e5dfc567473d1b03911224b0ac5 100644 (file)
--- a/sim/ft32/config.in
+++ b/sim/ft32/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/ft32/configure b/sim/ft32/configure
index 0b0b8144648ef673157d80e5eaf3dbdea9b2ad2b..f99d0c5f7cee2c78d60ea134b50e52c273f0bf21 100755 (executable)
--- a/sim/ft32/configure
+++ b/sim/ft32/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 :

diff --git a/sim/h8300/aclocal.m4 b/sim/h8300/aclocal.m4
index db1cdbfd2e8e2baccd37d6499f5ae96a43ecc9a6..0cdbae2da9d1a2c88c238aa75b29039970866dd7 100644 (file)
--- a/sim/h8300/aclocal.m4
+++ b/sim/h8300/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/h8300/config.in b/sim/h8300/config.in
index 0b237bf309b3d7efaafbb4dccd21fededb753d2c..b21bf7cd6b526e5dfc567473d1b03911224b0ac5 100644 (file)
--- a/sim/h8300/config.in
+++ b/sim/h8300/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/h8300/configure b/sim/h8300/configure
index 547e538759f5e3adba56dcd716d6affdd1ec1662..17b04353d14c7ae17296815e3d0ef9b52ec5b854 100755 (executable)
--- a/sim/h8300/configure
+++ b/sim/h8300/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 :

diff --git a/sim/iq2000/aclocal.m4 b/sim/iq2000/aclocal.m4
index 7ef344a579cae73a453014e8034a4ad46d89548b..1af7a84043e18f3a1349ba76e7baf21a11d597dc 100644 (file)
--- a/sim/iq2000/aclocal.m4
+++ b/sim/iq2000/aclocal.m4
@@ -115,7 +115,6 @@ m4_include([../m4/sim_ac_option_alignment.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_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_scache.m4])

diff --git a/sim/iq2000/config.in b/sim/iq2000/config.in
index 0b237bf309b3d7efaafbb4dccd21fededb753d2c..b21bf7cd6b526e5dfc567473d1b03911224b0ac5 100644 (file)
--- a/sim/iq2000/config.in
+++ b/sim/iq2000/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/iq2000/configure b/sim/iq2000/configure
index 68c9f228e5ebd3d4cbe70305d15129d4820bf59f..43e4a18c203ccb8ffe537ea68b154a42e0b0b2f1 100755 (executable)
--- a/sim/iq2000/configure
+++ b/sim/iq2000/configure
@@ -778,7 +778,6 @@ enable_sim_debug
 enable_sim_stdio
 enable_sim_trace
 enable_sim_profile
-enable_sim_environment
 enable_sim_inline
 with_pkgversion
 with_bugurl
@@ -1434,9 +1433,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
@@ -10793,7 +10789,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10796 "configure"
+#line 10792 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10899,7 +10895,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10902 "configure"
+#line 10898 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11282,28 +11278,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 :

diff --git a/sim/lm32/aclocal.m4 b/sim/lm32/aclocal.m4
index 7ef344a579cae73a453014e8034a4ad46d89548b..1af7a84043e18f3a1349ba76e7baf21a11d597dc 100644 (file)
--- a/sim/lm32/aclocal.m4
+++ b/sim/lm32/aclocal.m4
@@ -115,7 +115,6 @@ m4_include([../m4/sim_ac_option_alignment.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_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_scache.m4])

diff --git a/sim/lm32/config.in b/sim/lm32/config.in
index 0b237bf309b3d7efaafbb4dccd21fededb753d2c..b21bf7cd6b526e5dfc567473d1b03911224b0ac5 100644 (file)
--- a/sim/lm32/config.in
+++ b/sim/lm32/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/lm32/configure b/sim/lm32/configure
index ac283290abb88d23e771c18c697ed13bac2253b4..285c3ee8b015caac976baf2705b5b9a44c0055c6 100755 (executable)
--- a/sim/lm32/configure
+++ b/sim/lm32/configure
@@ -778,7 +778,6 @@ enable_sim_debug
 enable_sim_stdio
 enable_sim_trace
 enable_sim_profile
-enable_sim_environment
 enable_sim_inline
 with_pkgversion
 with_bugurl
@@ -1434,9 +1433,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
@@ -10793,7 +10789,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10796 "configure"
+#line 10792 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10899,7 +10895,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10902 "configure"
+#line 10898 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11282,28 +11278,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 :

diff --git a/sim/m32c/aclocal.m4 b/sim/m32c/aclocal.m4
index cff614273b5a36bc087212a03b17d91fe725df83..b568fae568cdf78b90e3032bfb56a85ee0a4dc52 100644 (file)
--- a/sim/m32c/aclocal.m4
+++ b/sim/m32c/aclocal.m4
@@ -111,7 +111,6 @@ m4_include([../../ltsugar.m4])
 m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
 m4_include([../m4/sim_ac_common.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/m32c/config.in b/sim/m32c/config.in
index 0b237bf309b3d7efaafbb4dccd21fededb753d2c..b21bf7cd6b526e5dfc567473d1b03911224b0ac5 100644 (file)
--- a/sim/m32c/config.in
+++ b/sim/m32c/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/m32c/configure b/sim/m32c/configure
index e9c5d04fed60a2ab5dc55b0b7c52865ed501e4c7..22f01e85a0ec89f4b6e7e4ea68437856fc5a4c62 100755 (executable)
--- a/sim/m32c/configure
+++ b/sim/m32c/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
@@ -1426,9 +1425,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-werror         treat compile warnings as errors
@@ -10775,7 +10771,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10778 "configure"
+#line 10774 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10881,7 +10877,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10884 "configure"
+#line 10880 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11264,28 +11260,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 :

diff --git a/sim/m32r/aclocal.m4 b/sim/m32r/aclocal.m4
index 7ef344a579cae73a453014e8034a4ad46d89548b..1af7a84043e18f3a1349ba76e7baf21a11d597dc 100644 (file)
--- a/sim/m32r/aclocal.m4
+++ b/sim/m32r/aclocal.m4
@@ -115,7 +115,6 @@ m4_include([../m4/sim_ac_option_alignment.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_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_scache.m4])

diff --git a/sim/m32r/config.in b/sim/m32r/config.in
index 0b237bf309b3d7efaafbb4dccd21fededb753d2c..b21bf7cd6b526e5dfc567473d1b03911224b0ac5 100644 (file)
--- a/sim/m32r/config.in
+++ b/sim/m32r/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/m32r/configure b/sim/m32r/configure
index a5699be1dc193579affcb24c17c9befad0c36653..54efeb6e3461d40102176536392c0bc3464f7c67 100755 (executable)
--- a/sim/m32r/configure
+++ b/sim/m32r/configure
@@ -780,7 +780,6 @@ enable_sim_debug
 enable_sim_stdio
 enable_sim_trace
 enable_sim_profile
-enable_sim_environment
 enable_sim_inline
 with_pkgversion
 with_bugurl
@@ -1436,9 +1435,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
@@ -10795,7 +10791,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10798 "configure"
+#line 10794 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10901,7 +10897,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10904 "configure"
+#line 10900 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11284,28 +11280,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 :

diff --git a/sim/m4/sim_ac_common.m4 b/sim/m4/sim_ac_common.m4
index 1df56e4baed2a44c728de096a522d90e62ccfe1f..7bad1486c5ccfec8f45cbf5b44cf0aa777db84fd 100644 (file)
--- a/sim/m4/sim_ac_common.m4
+++ b/sim/m4/sim_ac_common.m4
@@ -163,7 +163,6 @@ AC_DEFINE_UNQUOTED([WITH_PROFILE], [$sim_profile], [Sim profile settings])
 AC_MSG_RESULT($sim_profile)
 
 
-SIM_AC_OPTION_ENVIRONMENT
 SIM_AC_OPTION_INLINE
 
 ACX_PKGVERSION([SIM])

diff --git a/sim/m68hc11/aclocal.m4 b/sim/m68hc11/aclocal.m4
index db1cdbfd2e8e2baccd37d6499f5ae96a43ecc9a6..0cdbae2da9d1a2c88c238aa75b29039970866dd7 100644 (file)
--- a/sim/m68hc11/aclocal.m4
+++ b/sim/m68hc11/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/m68hc11/config.in b/sim/m68hc11/config.in
index 0b237bf309b3d7efaafbb4dccd21fededb753d2c..b21bf7cd6b526e5dfc567473d1b03911224b0ac5 100644 (file)
--- a/sim/m68hc11/config.in
+++ b/sim/m68hc11/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/m68hc11/configure b/sim/m68hc11/configure
index ab0175b201cf00ff75774cabfab543f1415bc455..4a3591a3f00362f1c66662b7e0a7e16acf6e7078 100755 (executable)
--- a/sim/m68hc11/configure
+++ b/sim/m68hc11/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 :

diff --git a/sim/mcore/aclocal.m4 b/sim/mcore/aclocal.m4
index db1cdbfd2e8e2baccd37d6499f5ae96a43ecc9a6..0cdbae2da9d1a2c88c238aa75b29039970866dd7 100644 (file)
--- a/sim/mcore/aclocal.m4
+++ b/sim/mcore/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/mcore/config.in b/sim/mcore/config.in
index 0b237bf309b3d7efaafbb4dccd21fededb753d2c..b21bf7cd6b526e5dfc567473d1b03911224b0ac5 100644 (file)
--- a/sim/mcore/config.in
+++ b/sim/mcore/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/mcore/configure b/sim/mcore/configure
index 7bb50991f7419fe6c2b4e29bcb87565727331929..1a5c3a02324fc6b6207d08cdb291d98bdf43044c 100755 (executable)
--- a/sim/mcore/configure
+++ b/sim/mcore/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 :

diff --git a/sim/microblaze/aclocal.m4 b/sim/microblaze/aclocal.m4
index db1cdbfd2e8e2baccd37d6499f5ae96a43ecc9a6..0cdbae2da9d1a2c88c238aa75b29039970866dd7 100644 (file)
--- a/sim/microblaze/aclocal.m4
+++ b/sim/microblaze/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/microblaze/config.in b/sim/microblaze/config.in
index 0b237bf309b3d7efaafbb4dccd21fededb753d2c..b21bf7cd6b526e5dfc567473d1b03911224b0ac5 100644 (file)
--- a/sim/microblaze/config.in
+++ b/sim/microblaze/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/microblaze/configure b/sim/microblaze/configure
index 9d57aa24739f69fb879f7427033defc4222c23a6..48f24aaa5692ae3abde89c5bdeefbe8768ecf0a5 100755 (executable)
--- a/sim/microblaze/configure
+++ b/sim/microblaze/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 :

diff --git a/sim/mips/aclocal.m4 b/sim/mips/aclocal.m4
index add447ef166965b9875bd65fd1dae035ed1b6ffd..61707d892acea823fb4910f730675172796a910c 100644 (file)
--- a/sim/mips/aclocal.m4
+++ b/sim/mips/aclocal.m4
@@ -114,7 +114,6 @@ m4_include([../m4/sim_ac_common.m4])
 m4_include([../m4/sim_ac_option_alignment.m4])
 m4_include([../m4/sim_ac_option_bitsize.m4])
 m4_include([../m4/sim_ac_option_endian.m4])
-m4_include([../m4/sim_ac_option_environment.m4])
 m4_include([../m4/sim_ac_option_float.m4])
 m4_include([../m4/sim_ac_option_hardware.m4])
 m4_include([../m4/sim_ac_option_inline.m4])

diff --git a/sim/mips/config.in b/sim/mips/config.in
index 0b237bf309b3d7efaafbb4dccd21fededb753d2c..b21bf7cd6b526e5dfc567473d1b03911224b0ac5 100644 (file)
--- a/sim/mips/config.in
+++ b/sim/mips/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/mips/configure b/sim/mips/configure
index 82f8e04f76c0cafd0073c2fcece576af926459db..952701631374f85ba56d6bc8481de6f5334435aa 100755 (executable)
--- a/sim/mips/configure
+++ b/sim/mips/configure
@@ -786,7 +786,6 @@ enable_sim_debug
 enable_sim_stdio
 enable_sim_trace
 enable_sim_profile
-enable_sim_environment
 enable_sim_inline
 with_pkgversion
 with_bugurl
@@ -1448,9 +1447,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-alignment=align
@@ -10810,7 +10806,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10813 "configure"
+#line 10809 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10916,7 +10912,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10919 "configure"
+#line 10915 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11299,28 +11295,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 :

diff --git a/sim/mn10300/aclocal.m4 b/sim/mn10300/aclocal.m4
index 4afbd42aca6ca3f7a1f3d667e881a93412173abd..7db520cdf2e3b5cd96114c7ebfcc60f6f04bf22f 100644 (file)
--- a/sim/mn10300/aclocal.m4
+++ b/sim/mn10300/aclocal.m4
@@ -114,7 +114,6 @@ m4_include([../m4/sim_ac_common.m4])
 m4_include([../m4/sim_ac_option_alignment.m4])
 m4_include([../m4/sim_ac_option_bitsize.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_reserved_bits.m4])

diff --git a/sim/mn10300/config.in b/sim/mn10300/config.in
index 0b237bf309b3d7efaafbb4dccd21fededb753d2c..b21bf7cd6b526e5dfc567473d1b03911224b0ac5 100644 (file)
--- a/sim/mn10300/config.in
+++ b/sim/mn10300/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/mn10300/configure b/sim/mn10300/configure
index 77098d2970247036d24277f0c1003a907d8ee15f..31f8de0e3ba81085715bfa940a83554ec7f201a3 100755 (executable)
--- a/sim/mn10300/configure
+++ b/sim/mn10300/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
@@ -10788,7 +10784,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10791 "configure"
+#line 10787 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10894,7 +10890,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10897 "configure"
+#line 10893 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11277,28 +11273,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 :

diff --git a/sim/moxie/aclocal.m4 b/sim/moxie/aclocal.m4
index db1cdbfd2e8e2baccd37d6499f5ae96a43ecc9a6..0cdbae2da9d1a2c88c238aa75b29039970866dd7 100644 (file)
--- a/sim/moxie/aclocal.m4
+++ b/sim/moxie/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/moxie/config.in b/sim/moxie/config.in
index 0b237bf309b3d7efaafbb4dccd21fededb753d2c..b21bf7cd6b526e5dfc567473d1b03911224b0ac5 100644 (file)
--- a/sim/moxie/config.in
+++ b/sim/moxie/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/moxie/configure b/sim/moxie/configure
index b4c00bd10d7077a237f86f0e6a188c4d0f208c0c..749ed229f9ec863c0cecc4d8c49e8c301dab537a 100755 (executable)
--- a/sim/moxie/configure
+++ b/sim/moxie/configure
@@ -776,7 +776,6 @@ enable_sim_debug
 enable_sim_stdio
 enable_sim_trace
 enable_sim_profile
-enable_sim_environment
 enable_sim_inline
 with_pkgversion
 with_bugurl
@@ -1429,9 +1428,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
@@ -10783,7 +10779,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10786 "configure"
+#line 10782 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10889,7 +10885,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10892 "configure"
+#line 10888 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11272,28 +11268,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 :

diff --git a/sim/msp430/aclocal.m4 b/sim/msp430/aclocal.m4
index db1cdbfd2e8e2baccd37d6499f5ae96a43ecc9a6..0cdbae2da9d1a2c88c238aa75b29039970866dd7 100644 (file)
--- a/sim/msp430/aclocal.m4
+++ b/sim/msp430/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/msp430/config.in b/sim/msp430/config.in
index 0b237bf309b3d7efaafbb4dccd21fededb753d2c..b21bf7cd6b526e5dfc567473d1b03911224b0ac5 100644 (file)
--- a/sim/msp430/config.in
+++ b/sim/msp430/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/msp430/configure b/sim/msp430/configure
index 5d4faa67f88fd1dc8b36111a81bb9e2c8ed8cb90..0877f01f1d94df50f0c682f6bd5d9a4d85a92659 100755 (executable)
--- a/sim/msp430/configure
+++ b/sim/msp430/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 :

diff --git a/sim/or1k/aclocal.m4 b/sim/or1k/aclocal.m4
index fcc47b8fffd12a5e49a89c9a537ca5acb4f3e9c4..50bdf77f1af9d71a9146477d84f2d6be859960ec 100644 (file)
--- a/sim/or1k/aclocal.m4
+++ b/sim/or1k/aclocal.m4
@@ -116,7 +116,6 @@ m4_include([../m4/sim_ac_option_bitsize.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_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_scache.m4])

diff --git a/sim/or1k/config.in b/sim/or1k/config.in
index 0b237bf309b3d7efaafbb4dccd21fededb753d2c..b21bf7cd6b526e5dfc567473d1b03911224b0ac5 100644 (file)
--- a/sim/or1k/config.in
+++ b/sim/or1k/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/or1k/configure b/sim/or1k/configure
index fd13549b768d579f2e01852bcf25d13f66d6447b..4d4a09c08a83d5d3db01478fba301dc823a49188 100755 (executable)
--- a/sim/or1k/configure
+++ b/sim/or1k/configure
@@ -778,7 +778,6 @@ enable_sim_debug
 enable_sim_stdio
 enable_sim_trace
 enable_sim_profile
-enable_sim_environment
 enable_sim_inline
 with_pkgversion
 with_bugurl
@@ -1435,9 +1434,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
@@ -10795,7 +10791,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10798 "configure"
+#line 10794 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10901,7 +10897,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10904 "configure"
+#line 10900 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11284,28 +11280,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 :

diff --git a/sim/pru/aclocal.m4 b/sim/pru/aclocal.m4
index db1cdbfd2e8e2baccd37d6499f5ae96a43ecc9a6..0cdbae2da9d1a2c88c238aa75b29039970866dd7 100644 (file)
--- a/sim/pru/aclocal.m4
+++ b/sim/pru/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/pru/config.in b/sim/pru/config.in
index 0b237bf309b3d7efaafbb4dccd21fededb753d2c..b21bf7cd6b526e5dfc567473d1b03911224b0ac5 100644 (file)
--- a/sim/pru/config.in
+++ b/sim/pru/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/pru/configure b/sim/pru/configure
index 5d4faa67f88fd1dc8b36111a81bb9e2c8ed8cb90..0877f01f1d94df50f0c682f6bd5d9a4d85a92659 100755 (executable)
--- a/sim/pru/configure
+++ b/sim/pru/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 :

diff --git a/sim/riscv/aclocal.m4 b/sim/riscv/aclocal.m4
index 487fd0797f6096e962a3b20c33d6de3947a91545..98b9d1773f90fbb789ebd69202ad1e8f4af90d3f 100644 (file)
--- 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 0b237bf309b3d7efaafbb4dccd21fededb753d2c..b21bf7cd6b526e5dfc567473d1b03911224b0ac5 100644 (file)
--- 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 1c59cfafaa039f973594f1417bca3a43a73bf271..f405268e702eff7999f93600e5205cb42e86af26 100755 (executable)
--- 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 :

diff --git a/sim/rl78/aclocal.m4 b/sim/rl78/aclocal.m4
index cff614273b5a36bc087212a03b17d91fe725df83..b568fae568cdf78b90e3032bfb56a85ee0a4dc52 100644 (file)
--- a/sim/rl78/aclocal.m4
+++ b/sim/rl78/aclocal.m4
@@ -111,7 +111,6 @@ m4_include([../../ltsugar.m4])
 m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
 m4_include([../m4/sim_ac_common.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/rl78/config.in b/sim/rl78/config.in
index 0b237bf309b3d7efaafbb4dccd21fededb753d2c..b21bf7cd6b526e5dfc567473d1b03911224b0ac5 100644 (file)
--- a/sim/rl78/config.in
+++ b/sim/rl78/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/rl78/configure b/sim/rl78/configure
index e9c5d04fed60a2ab5dc55b0b7c52865ed501e4c7..22f01e85a0ec89f4b6e7e4ea68437856fc5a4c62 100755 (executable)
--- a/sim/rl78/configure
+++ b/sim/rl78/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
@@ -1426,9 +1425,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-werror         treat compile warnings as errors
@@ -10775,7 +10771,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10778 "configure"
+#line 10774 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10881,7 +10877,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10884 "configure"
+#line 10880 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11264,28 +11260,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 :

diff --git a/sim/rx/aclocal.m4 b/sim/rx/aclocal.m4
index cff614273b5a36bc087212a03b17d91fe725df83..b568fae568cdf78b90e3032bfb56a85ee0a4dc52 100644 (file)
--- a/sim/rx/aclocal.m4
+++ b/sim/rx/aclocal.m4
@@ -111,7 +111,6 @@ m4_include([../../ltsugar.m4])
 m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
 m4_include([../m4/sim_ac_common.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/rx/config.in b/sim/rx/config.in
index 01c7aefa506e6ddcbabb17fb71e9a52b6dd719b8..80c07e83052e204e0cb1027d21035fce62c693c4 100644 (file)
--- a/sim/rx/config.in
+++ b/sim/rx/config.in
@@ -123,9 +123,6 @@
 /* Sim debug setting */
 #undef WITH_DEBUG
 
-/* Sim default environment */
-#undef WITH_ENVIRONMENT
-
 /* Sim profile settings */
 #undef WITH_PROFILE
 

diff --git a/sim/rx/configure b/sim/rx/configure
index 7088573e5fb4908e5f45f818a65dee46caaf2346..1acc8b2c96745c9ea0f0c0094bd62f953f2a9012 100755 (executable)
--- a/sim/rx/configure
+++ b/sim/rx/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
   --disable-cycle-accurate
@@ -10780,7 +10776,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10783 "configure"
+#line 10779 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10886,7 +10882,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10889 "configure"
+#line 10885 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11269,28 +11265,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 :

diff --git a/sim/sh/aclocal.m4 b/sim/sh/aclocal.m4
index db1cdbfd2e8e2baccd37d6499f5ae96a43ecc9a6..0cdbae2da9d1a2c88c238aa75b29039970866dd7 100644 (file)
--- a/sim/sh/aclocal.m4
+++ b/sim/sh/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/sh/config.in b/sim/sh/config.in
index 0b237bf309b3d7efaafbb4dccd21fededb753d2c..b21bf7cd6b526e5dfc567473d1b03911224b0ac5 100644 (file)
--- a/sim/sh/config.in
+++ b/sim/sh/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/sh/configure b/sim/sh/configure
index a7cebe56d62158dd6a2ed1c0f59e0851aa95db8b..84d533421b6ac2fc4b2307427bcb7cd697363638 100755 (executable)
--- a/sim/sh/configure
+++ b/sim/sh/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 :

diff --git a/sim/v850/aclocal.m4 b/sim/v850/aclocal.m4
index 4afbd42aca6ca3f7a1f3d667e881a93412173abd..7db520cdf2e3b5cd96114c7ebfcc60f6f04bf22f 100644 (file)
--- a/sim/v850/aclocal.m4
+++ b/sim/v850/aclocal.m4
@@ -114,7 +114,6 @@ m4_include([../m4/sim_ac_common.m4])
 m4_include([../m4/sim_ac_option_alignment.m4])
 m4_include([../m4/sim_ac_option_bitsize.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_reserved_bits.m4])

diff --git a/sim/v850/config.in b/sim/v850/config.in
index 0b237bf309b3d7efaafbb4dccd21fededb753d2c..b21bf7cd6b526e5dfc567473d1b03911224b0ac5 100644 (file)
--- a/sim/v850/config.in
+++ b/sim/v850/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/v850/configure b/sim/v850/configure
index 0b8d9fca035161196f7fce95a223e0b254c643a1..925a4a120b66e4b8592ae4b8a8d7059e1f3f4f02 100755 (executable)
--- a/sim/v850/configure
+++ b/sim/v850/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
@@ -10788,7 +10784,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10791 "configure"
+#line 10787 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10894,7 +10890,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10897 "configure"
+#line 10893 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11277,28 +11273,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 :