diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2021-06-06 20:11:02 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2021-06-12 11:01:57 -0400 |
| commit | 5ea45474021e98cbb325534b328e391593119cb0 (patch) | |
| tree | 548bbb6a52ad6161ceacaab342532f4c9b89ca1d | |
| parent | dba333c1e4051400983d3cb8b13c9c4a2d766e9c (diff) | |
| download | fsf-binutils-gdb-5ea45474021e98cbb325534b328e391593119cb0.zip fsf-binutils-gdb-5ea45474021e98cbb325534b328e391593119cb0.tar.gz fsf-binutils-gdb-5ea45474021e98cbb325534b328e391593119cb0.tar.bz2 | |
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.
100 files changed, 100 insertions, 993 deletions
diff --git a/sim/ChangeLog b/sim/ChangeLog index 94ba4de..e832e13 100644 --- a/sim/ChangeLog +++ b/sim/ChangeLog @@ -1,5 +1,11 @@ 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. * m4/sim_ac_common.m4: Delete call to SIM_AC_OPTION_ASSERT. * aclocal.m4, config.h.in, configure, Makefile.in: Regenerate. diff --git a/sim/Makefile.in b/sim/Makefile.in index d8a993a..c8b5249 100644 --- 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 db1cdbf..0cdbae2 100644 --- a/sim/aarch64/aclocal.m4 +++ b/sim/aarch64/aclocal.m4 @@ -113,7 +113,6 @@ m4_include([../../lt~obsolete.m4]) m4_include([../m4/sim_ac_common.m4]) m4_include([../m4/sim_ac_option_alignment.m4]) m4_include([../m4/sim_ac_option_endian.m4]) -m4_include([../m4/sim_ac_option_environment.m4]) m4_include([../m4/sim_ac_option_hardware.m4]) m4_include([../m4/sim_ac_option_inline.m4]) m4_include([../m4/sim_ac_option_warnings.m4]) diff --git a/sim/aarch64/config.in b/sim/aarch64/config.in index 0b237bf..b21bf7c 100644 --- a/sim/aarch64/config.in +++ b/sim/aarch64/config.in @@ -117,9 +117,6 @@ /* Sim debug setting */ #undef WITH_DEBUG -/* Sim default environment */ -#undef WITH_ENVIRONMENT - /* Sim profile settings */ #undef WITH_PROFILE diff --git a/sim/aarch64/configure b/sim/aarch64/configure index 8fb02f1..5269d6d 100755 --- a/sim/aarch64/configure +++ b/sim/aarch64/configure @@ -775,7 +775,6 @@ enable_sim_debug enable_sim_stdio enable_sim_trace enable_sim_profile -enable_sim_environment enable_sim_inline with_pkgversion with_bugurl @@ -1428,9 +1427,6 @@ Optional Features: --enable-sim-trace=opts Enable tracing of simulated programs --enable-sim-profile=opts Enable profiling flags - --enable-sim-environment=environment - Specify mixed, user, virtual or operating - environment --enable-sim-inline=inlines Specify which functions should be inlined --enable-sim-endian=endian @@ -10782,7 +10778,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10785 "configure" +#line 10781 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10888,7 +10884,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10891 "configure" +#line 10887 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11271,28 +11267,6 @@ $as_echo "$sim_profile" >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking default sim environment setting" >&5 -$as_echo_n "checking default sim environment setting... " >&6; } -sim_environment="ALL_ENVIRONMENT" -# Check whether --enable-sim-environment was given. -if test "${enable_sim_environment+set}" = set; then : - enableval=$enable_sim_environment; case "${enableval}" in - all | ALL) sim_environment="ALL_ENVIRONMENT";; - user | USER) sim_environment="USER_ENVIRONMENT";; - virtual | VIRTUAL) sim_environment="VIRTUAL_ENVIRONMENT";; - operating | OPERATING) sim_environment="OPERATING_ENVIRONMENT";; - *) as_fn_error $? "Unknown value $enableval passed to --enable-sim-environment" "$LINENO" 5;; -esac -fi - -cat >>confdefs.h <<_ACEOF -#define WITH_ENVIRONMENT $sim_environment -_ACEOF - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_environment" >&5 -$as_echo "$sim_environment" >&6; } - - sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. if test "${enable_sim_inline+set}" = set; then : diff --git a/sim/aclocal.m4 b/sim/aclocal.m4 index d87931a..4b6eb26 100644 --- 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 db1cdbf..0cdbae2 100644 --- 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 0b237bf..b21bf7c 100644 --- 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 9d57aa2..48f24aa 100755 --- 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 db1cdbf..0cdbae2 100644 --- 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 0b237bf..b21bf7c 100644 --- 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 5d4faa6..0877f01 100755 --- 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 eccf6ce..24e0597 100644 --- 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 0b237bf..b21bf7c 100644 --- 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 9ffef26..30fd48a 100755 --- 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 fcc47b8..50bdf77 100644 --- 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 0b237bf..b21bf7c 100644 --- 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 3eb6cf1..375916b 100755 --- 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 850d42c..5fd8c8d 100644 --- 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 5cbe2e6..0b9a118 100755 --- 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 700e04d..ecf12b5 100644 --- 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 db1cdbf..0cdbae2 100644 --- 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 0b237bf..b21bf7c 100644 --- 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 3303b4d..b8e51ce 100755 --- 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 7ef344a..1af7a84 100644 --- 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 0b237bf..b21bf7c 100644 --- 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 2eee945..9312f27 100755 --- 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 db1cdbf..0cdbae2 100644 --- 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 0b237bf..b21bf7c 100644 --- 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 7bb5099..1a5c3a0 100755 --- 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 cff6142..b568fae 100644 --- 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 0b237bf..b21bf7c 100644 --- 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 0ac222d..160189d 100755 --- 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 db1cdbf..0cdbae2 100644 --- 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 0b237bf..b21bf7c 100644 --- 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 dcab9c5..eb7a968 100755 --- 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 7ef344a..1af7a84 100644 --- 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 0b237bf..b21bf7c 100644 --- 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 5c527cf..c4eedf2 100755 --- 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 db1cdbf..0cdbae2 100644 --- 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 0b237bf..b21bf7c 100644 --- 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 0b0b814..f99d0c5 100755 --- 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 db1cdbf..0cdbae2 100644 --- 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 0b237bf..b21bf7c 100644 --- 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 547e538..17b0435 100755 --- 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 7ef344a..1af7a84 100644 --- 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 0b237bf..b21bf7c 100644 --- 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 68c9f22..43e4a18 100755 --- 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 7ef344a..1af7a84 100644 --- 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 0b237bf..b21bf7c 100644 --- 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 ac28329..285c3ee 100755 --- 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 cff6142..b568fae 100644 --- 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 0b237bf..b21bf7c 100644 --- 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 e9c5d04..22f01e8 100755 --- 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 7ef344a..1af7a84 100644 --- 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 0b237bf..b21bf7c 100644 --- 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 a5699be..54efeb6 100755 --- 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 1df56e4..7bad148 100644 --- 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 db1cdbf..0cdbae2 100644 --- 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 0b237bf..b21bf7c 100644 --- 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 ab0175b..4a3591a 100755 --- 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 db1cdbf..0cdbae2 100644 --- 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 0b237bf..b21bf7c 100644 --- 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 7bb5099..1a5c3a0 100755 --- 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 db1cdbf..0cdbae2 100644 --- 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 0b237bf..b21bf7c 100644 --- 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 9d57aa2..48f24aa 100755 --- 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 add447e..61707d8 100644 --- 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 0b237bf..b21bf7c 100644 --- 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 82f8e04..9527016 100755 --- 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 4afbd42..7db520c 100644 --- 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 0b237bf..b21bf7c 100644 --- 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 77098d2..31f8de0 100755 --- 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 db1cdbf..0cdbae2 100644 --- 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 0b237bf..b21bf7c 100644 --- 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 b4c00bd..749ed22 100755 --- 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 db1cdbf..0cdbae2 100644 --- 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 0b237bf..b21bf7c 100644 --- 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 5d4faa6..0877f01 100755 --- 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 fcc47b8..50bdf77 100644 --- 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 0b237bf..b21bf7c 100644 --- 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 fd13549..4d4a09c 100755 --- 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 db1cdbf..0cdbae2 100644 --- 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 0b237bf..b21bf7c 100644 --- 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 5d4faa6..0877f01 100755 --- 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 487fd07..98b9d17 100644 --- a/sim/riscv/aclocal.m4 +++ b/sim/riscv/aclocal.m4 @@ -115,7 +115,6 @@ m4_include([../m4/sim_ac_option_alignment.m4]) m4_include([../m4/sim_ac_option_bitsize.m4]) m4_include([../m4/sim_ac_option_default_model.m4]) m4_include([../m4/sim_ac_option_endian.m4]) -m4_include([../m4/sim_ac_option_environment.m4]) m4_include([../m4/sim_ac_option_hardware.m4]) m4_include([../m4/sim_ac_option_inline.m4]) m4_include([../m4/sim_ac_option_warnings.m4]) diff --git a/sim/riscv/config.in b/sim/riscv/config.in index 0b237bf..b21bf7c 100644 --- a/sim/riscv/config.in +++ b/sim/riscv/config.in @@ -117,9 +117,6 @@ /* Sim debug setting */ #undef WITH_DEBUG -/* Sim default environment */ -#undef WITH_ENVIRONMENT - /* Sim profile settings */ #undef WITH_PROFILE diff --git a/sim/riscv/configure b/sim/riscv/configure index 1c59cfa..f405268 100755 --- a/sim/riscv/configure +++ b/sim/riscv/configure @@ -775,7 +775,6 @@ enable_sim_debug enable_sim_stdio enable_sim_trace enable_sim_profile -enable_sim_environment enable_sim_inline with_pkgversion with_bugurl @@ -1430,9 +1429,6 @@ Optional Features: --enable-sim-trace=opts Enable tracing of simulated programs --enable-sim-profile=opts Enable profiling flags - --enable-sim-environment=environment - Specify mixed, user, virtual or operating - environment --enable-sim-inline=inlines Specify which functions should be inlined --enable-sim-endian=endian @@ -10787,7 +10783,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10790 "configure" +#line 10786 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10893,7 +10889,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10896 "configure" +#line 10892 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11276,28 +11272,6 @@ $as_echo "$sim_profile" >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking default sim environment setting" >&5 -$as_echo_n "checking default sim environment setting... " >&6; } -sim_environment="ALL_ENVIRONMENT" -# Check whether --enable-sim-environment was given. -if test "${enable_sim_environment+set}" = set; then : - enableval=$enable_sim_environment; case "${enableval}" in - all | ALL) sim_environment="ALL_ENVIRONMENT";; - user | USER) sim_environment="USER_ENVIRONMENT";; - virtual | VIRTUAL) sim_environment="VIRTUAL_ENVIRONMENT";; - operating | OPERATING) sim_environment="OPERATING_ENVIRONMENT";; - *) as_fn_error $? "Unknown value $enableval passed to --enable-sim-environment" "$LINENO" 5;; -esac -fi - -cat >>confdefs.h <<_ACEOF -#define WITH_ENVIRONMENT $sim_environment -_ACEOF - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_environment" >&5 -$as_echo "$sim_environment" >&6; } - - sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. if test "${enable_sim_inline+set}" = set; then : diff --git a/sim/rl78/aclocal.m4 b/sim/rl78/aclocal.m4 index cff6142..b568fae 100644 --- 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 0b237bf..b21bf7c 100644 --- 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 e9c5d04..22f01e8 100755 --- 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 cff6142..b568fae 100644 --- 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 01c7aef..80c07e8 100644 --- 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 7088573..1acc8b2 100755 --- 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 db1cdbf..0cdbae2 100644 --- 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 0b237bf..b21bf7c 100644 --- 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 a7cebe5..84d5334 100755 --- 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 4afbd42..7db520c 100644 --- 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 0b237bf..b21bf7c 100644 --- 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 0b8d9fc..925a4a1 100755 --- 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 : |