diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2016-01-10 16:52:25 -0500 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2016-01-10 17:03:36 -0500 |
| commit | 16f7876d71604f835aefe48f0bf230c028c05d99 (patch) | |
| tree | 6e5d6683ee8b3e506058f141a4304f265e458812 /sim | |
| parent | 35656e95217a20309c0a0f16bf0c89a49a549177 (diff) | |
sim: allow the environment configure option everywhere
Currently ports have to call SIM_AC_OPTION_ENVIRONMENT explicitly in
order to make the configure flag available. There's no real reason
to not allow this flag for all ports, so move it to the common sim
macro. This way we get standard behavior across all ports too.
Diffstat (limited to 'sim')
73 files changed, 744 insertions, 411 deletions
diff --git a/sim/aarch64/ChangeLog b/sim/aarch64/ChangeLog index 3e9826bb51..609a72c415 100644 --- a/sim/aarch64/ChangeLog +++ b/sim/aarch64/ChangeLog @@ -1,5 +1,10 @@ 2016-01-10 Mike Frysinger <vapier@gentoo.org> + * configure.ac (SIM_AC_OPTION_ENVIRONMENT): Delete call. + * configure: Regenerate. + +2016-01-10 Mike Frysinger <vapier@gentoo.org> + * configure: Regenerate. 2016-01-10 Mike Frysinger <vapier@gentoo.org> diff --git a/sim/aarch64/configure b/sim/aarch64/configure index 74358fdb6d..72255f8845 100755 --- a/sim/aarch64/configure +++ b/sim/aarch64/configure @@ -753,12 +753,12 @@ enable_sim_stdio enable_sim_trace enable_sim_profile enable_sim_assert +enable_sim_environment enable_sim_inline with_pkgversion with_bugurl enable_sim_endian enable_sim_alignment -enable_sim_environment enable_werror enable_build_warnings enable_sim_build_warnings @@ -1406,6 +1406,9 @@ Optional Features: --enable-sim-profile=opts Enable profiling flags --enable-sim-assert Specify whether to perform random assertions + --enable-sim-environment=environment + Specify mixed, user, virtual or operating + environment --enable-sim-inline=inlines Specify which functions should be inlined --enable-sim-endian=endian @@ -1413,9 +1416,6 @@ Optional Features: --enable-sim-alignment=align Specify strict, nonstrict or forced alignment of memory accesses - --enable-sim-environment=environment - Specify mixed, user, virtual or operating - environment --enable-werror treat compile warnings as errors --enable-build-warnings enable build-time compiler warnings if gcc is used --enable-sim-build-warnings @@ -13323,6 +13323,24 @@ else fi +# Check whether --enable-sim-environment was given. +if test "${enable_sim_environment+set}" = set; then : + enableval=$enable_sim_environment; case "${enableval}" in + all | ALL) sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT";; + user | USER) sim_environment="-DWITH_ENVIRONMENT=USER_ENVIRONMENT";; + virtual | VIRTUAL) sim_environment="-DWITH_ENVIRONMENT=VIRTUAL_ENVIRONMENT";; + operating | OPERATING) sim_environment="-DWITH_ENVIRONMENT=OPERATING_ENVIRONMENT";; + *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-environment\"" "$LINENO" 5; + sim_environment="";; +esac +if test x"$silent" != x"yes" && test x"$sim_environment" != x""; then + echo "Setting sim environment = $sim_environment" 6>&1 +fi +else + sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT" +fi + + sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. if test "${enable_sim_inline+set}" = set; then : @@ -13543,24 +13561,6 @@ fi fi -# Check whether --enable-sim-environment was given. -if test "${enable_sim_environment+set}" = set; then : - enableval=$enable_sim_environment; case "${enableval}" in - all | ALL) sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT";; - user | USER) sim_environment="-DWITH_ENVIRONMENT=USER_ENVIRONMENT";; - virtual | VIRTUAL) sim_environment="-DWITH_ENVIRONMENT=VIRTUAL_ENVIRONMENT";; - operating | OPERATING) sim_environment="-DWITH_ENVIRONMENT=OPERATING_ENVIRONMENT";; - *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-environment\"" "$LINENO" 5; - sim_environment="";; -esac -if test x"$silent" != x"yes" && test x"$sim_environment" != x""; then - echo "Setting sim environment = $sim_environment" 6>&1 -fi -else - sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT" -fi - - # Check whether --enable-werror was given. if test "${enable_werror+set}" = set; then : enableval=$enable_werror; case "${enableval}" in diff --git a/sim/aarch64/configure.ac b/sim/aarch64/configure.ac index c6e32564c5..5536343dac 100644 --- a/sim/aarch64/configure.ac +++ b/sim/aarch64/configure.ac @@ -31,7 +31,6 @@ SIM_AC_OPTION_ENDIAN ## common core does not support this, so we opt for non-strict ## alignment instead. SIM_AC_OPTION_ALIGNMENT(NONSTRICT_ALIGNMENT,NONSTRICT_ALIGNMENT) -SIM_AC_OPTION_ENVIRONMENT SIM_AC_OPTION_WARNINGS SIM_AC_OUTPUT diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog index 7220500637..36dcc112be 100644 --- a/sim/arm/ChangeLog +++ b/sim/arm/ChangeLog @@ -1,5 +1,10 @@ 2016-01-10 Mike Frysinger <vapier@gentoo.org> + * configure.ac (SIM_AC_OPTION_ENVIRONMENT): Delete call. + * configure: Regenerate. + +2016-01-10 Mike Frysinger <vapier@gentoo.org> + * configure: Regenerate. 2016-01-10 Mike Frysinger <vapier@gentoo.org> diff --git a/sim/arm/configure b/sim/arm/configure index cf8a451ab2..b4e6c827c3 100755 --- a/sim/arm/configure +++ b/sim/arm/configure @@ -753,12 +753,12 @@ enable_sim_stdio enable_sim_trace enable_sim_profile enable_sim_assert +enable_sim_environment enable_sim_inline with_pkgversion with_bugurl enable_sim_endian enable_sim_alignment -enable_sim_environment enable_werror enable_build_warnings enable_sim_build_warnings @@ -1406,6 +1406,9 @@ Optional Features: --enable-sim-profile=opts Enable profiling flags --enable-sim-assert Specify whether to perform random assertions + --enable-sim-environment=environment + Specify mixed, user, virtual or operating + environment --enable-sim-inline=inlines Specify which functions should be inlined --enable-sim-endian=endian @@ -1413,9 +1416,6 @@ Optional Features: --enable-sim-alignment=align Specify strict, nonstrict or forced alignment of memory accesses - --enable-sim-environment=environment - Specify mixed, user, virtual or operating - environment --enable-werror treat compile warnings as errors --enable-build-warnings enable build-time compiler warnings if gcc is used --enable-sim-build-warnings @@ -13323,6 +13323,24 @@ else fi +# Check whether --enable-sim-environment was given. +if test "${enable_sim_environment+set}" = set; then : + enableval=$enable_sim_environment; case "${enableval}" in + all | ALL) sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT";; + user | USER) sim_environment="-DWITH_ENVIRONMENT=USER_ENVIRONMENT";; + virtual | VIRTUAL) sim_environment="-DWITH_ENVIRONMENT=VIRTUAL_ENVIRONMENT";; + operating | OPERATING) sim_environment="-DWITH_ENVIRONMENT=OPERATING_ENVIRONMENT";; + *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-environment\"" "$LINENO" 5; + sim_environment="";; +esac +if test x"$silent" != x"yes" && test x"$sim_environment" != x""; then + echo "Setting sim environment = $sim_environment" 6>&1 +fi +else + sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT" +fi + + sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. if test "${enable_sim_inline+set}" = set; then : @@ -13539,24 +13557,6 @@ fi fi -# Check whether --enable-sim-environment was given. -if test "${enable_sim_environment+set}" = set; then : - enableval=$enable_sim_environment; case "${enableval}" in - all | ALL) sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT";; - user | USER) sim_environment="-DWITH_ENVIRONMENT=USER_ENVIRONMENT";; - virtual | VIRTUAL) sim_environment="-DWITH_ENVIRONMENT=VIRTUAL_ENVIRONMENT";; - operating | OPERATING) sim_environment="-DWITH_ENVIRONMENT=OPERATING_ENVIRONMENT";; - *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-environment\"" "$LINENO" 5; - sim_environment="";; -esac -if test x"$silent" != x"yes" && test x"$sim_environment" != x""; then - echo "Setting sim environment = $sim_environment" 6>&1 -fi -else - sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT" -fi - - # Check whether --enable-werror was given. if test "${enable_werror+set}" = set; then : enableval=$enable_werror; case "${enableval}" in diff --git a/sim/arm/configure.ac b/sim/arm/configure.ac index 6d5622e266..a93418f932 100644 --- a/sim/arm/configure.ac +++ b/sim/arm/configure.ac @@ -7,7 +7,6 @@ SIM_AC_COMMON SIM_AC_OPTION_ENDIAN SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT,STRICT_ALIGNMENT) -SIM_AC_OPTION_ENVIRONMENT SIM_AC_OPTION_WARNINGS SIM_AC_OUTPUT diff --git a/sim/avr/ChangeLog b/sim/avr/ChangeLog index 3ba38f3842..df93df5d9a 100644 --- a/sim/avr/ChangeLog +++ b/sim/avr/ChangeLog @@ -1,5 +1,10 @@ 2016-01-10 Mike Frysinger <vapier@gentoo.org> + * configure.ac (SIM_AC_OPTION_ENVIRONMENT): Delete call. + * configure: Regenerate. + +2016-01-10 Mike Frysinger <vapier@gentoo.org> + * configure: Regenerate. 2016-01-10 Mike Frysinger <vapier@gentoo.org> diff --git a/sim/avr/configure b/sim/avr/configure index eda7aab113..b43b3ed458 100755 --- a/sim/avr/configure +++ b/sim/avr/configure @@ -753,12 +753,12 @@ enable_sim_stdio enable_sim_trace enable_sim_profile enable_sim_assert +enable_sim_environment enable_sim_inline with_pkgversion with_bugurl enable_sim_endian enable_sim_alignment -enable_sim_environment enable_werror enable_build_warnings enable_sim_build_warnings @@ -1406,6 +1406,9 @@ Optional Features: --enable-sim-profile=opts Enable profiling flags --enable-sim-assert Specify whether to perform random assertions + --enable-sim-environment=environment + Specify mixed, user, virtual or operating + environment --enable-sim-inline=inlines Specify which functions should be inlined --enable-sim-endian=endian @@ -1413,9 +1416,6 @@ Optional Features: --enable-sim-alignment=align Specify strict, nonstrict or forced alignment of memory accesses - --enable-sim-environment=environment - Specify mixed, user, virtual or operating - environment --enable-werror treat compile warnings as errors --enable-build-warnings enable build-time compiler warnings if gcc is used --enable-sim-build-warnings @@ -13323,6 +13323,24 @@ else fi +# Check whether --enable-sim-environment was given. +if test "${enable_sim_environment+set}" = set; then : + enableval=$enable_sim_environment; case "${enableval}" in + all | ALL) sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT";; + user | USER) sim_environment="-DWITH_ENVIRONMENT=USER_ENVIRONMENT";; + virtual | VIRTUAL) sim_environment="-DWITH_ENVIRONMENT=VIRTUAL_ENVIRONMENT";; + operating | OPERATING) sim_environment="-DWITH_ENVIRONMENT=OPERATING_ENVIRONMENT";; + *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-environment\"" "$LINENO" 5; + sim_environment="";; +esac +if test x"$silent" != x"yes" && test x"$sim_environment" != x""; then + echo "Setting sim environment = $sim_environment" 6>&1 +fi +else + sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT" +fi + + sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. if test "${enable_sim_inline+set}" = set; then : @@ -13539,24 +13557,6 @@ fi fi -# Check whether --enable-sim-environment was given. -if test "${enable_sim_environment+set}" = set; then : - enableval=$enable_sim_environment; case "${enableval}" in - all | ALL) sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT";; - user | USER) sim_environment="-DWITH_ENVIRONMENT=USER_ENVIRONMENT";; - virtual | VIRTUAL) sim_environment="-DWITH_ENVIRONMENT=VIRTUAL_ENVIRONMENT";; - operating | OPERATING) sim_environment="-DWITH_ENVIRONMENT=OPERATING_ENVIRONMENT";; - *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-environment\"" "$LINENO" 5; - sim_environment="";; -esac -if test x"$silent" != x"yes" && test x"$sim_environment" != x""; then - echo "Setting sim environment = $sim_environment" 6>&1 -fi -else - sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT" -fi - - # Check whether --enable-werror was given. if test "${enable_werror+set}" = set; then : enableval=$enable_werror; case "${enableval}" in diff --git a/sim/avr/configure.ac b/sim/avr/configure.ac index 184ccb53db..54ac06f48e 100644 --- a/sim/avr/configure.ac +++ b/sim/avr/configure.ac @@ -7,7 +7,6 @@ SIM_AC_COMMON SIM_AC_OPTION_ENDIAN(LITTLE) SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT,STRICT_ALIGNMENT) -SIM_AC_OPTION_ENVIRONMENT SIM_AC_OPTION_WARNINGS SIM_AC_OUTPUT diff --git a/sim/bfin/ChangeLog b/sim/bfin/ChangeLog index ef177ad242..c41b989aa6 100644 --- a/sim/bfin/ChangeLog +++ b/sim/bfin/ChangeLog @@ -1,5 +1,10 @@ 2016-01-10 Mike Frysinger <vapier@gentoo.org> + * configure.ac (SIM_AC_OPTION_ENVIRONMENT): Delete call. + * configure: Regenerate. + +2016-01-10 Mike Frysinger <vapier@gentoo.org> + * configure: Regenerate. 2016-01-10 Mike Frysinger <vapier@gentoo.org> diff --git a/sim/bfin/configure b/sim/bfin/configure index 09a8e3a15b..bfdb36248a 100755 --- a/sim/bfin/configure +++ b/sim/bfin/configure @@ -758,13 +758,13 @@ enable_sim_stdio enable_sim_trace enable_sim_profile enable_sim_assert +enable_sim_environment enable_sim_inline with_pkgversion with_bugurl enable_sim_endian enable_sim_alignment enable_sim_default_model -enable_sim_environment enable_werror enable_build_warnings enable_sim_build_warnings @@ -1418,6 +1418,9 @@ Optional Features: --enable-sim-profile=opts Enable profiling flags --enable-sim-assert Specify whether to perform random assertions + --enable-sim-environment=environment + Specify mixed, user, virtual or operating + environment --enable-sim-inline=inlines Specify which functions should be inlined --enable-sim-endian=endian @@ -1427,9 +1430,6 @@ Optional Features: memory accesses --enable-sim-default-model=model Specify default model to simulate - --enable-sim-environment=environment - Specify mixed, user, virtual or operating - environment --enable-werror treat compile warnings as errors --enable-build-warnings enable build-time compiler warnings if gcc is used --enable-sim-build-warnings @@ -13346,6 +13346,24 @@ else fi +# Check whether --enable-sim-environment was given. +if test "${enable_sim_environment+set}" = set; then : + enableval=$enable_sim_environment; case "${enableval}" in + all | ALL) sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT";; + user | USER) sim_environment="-DWITH_ENVIRONMENT=USER_ENVIRONMENT";; + virtual | VIRTUAL) sim_environment="-DWITH_ENVIRONMENT=VIRTUAL_ENVIRONMENT";; + operating | OPERATING) sim_environment="-DWITH_ENVIRONMENT=OPERATING_ENVIRONMENT";; + *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-environment\"" "$LINENO" 5; + sim_environment="";; +esac +if test x"$silent" != x"yes" && test x"$sim_environment" != x""; then + echo "Setting sim environment = $sim_environment" 6>&1 +fi +else + sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT" +fi + + sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. if test "${enable_sim_inline+set}" = set; then : @@ -13578,24 +13596,6 @@ fi -# Check whether --enable-sim-environment was given. -if test "${enable_sim_environment+set}" = set; then : - enableval=$enable_sim_environment; case "${enableval}" in - all | ALL) sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT";; - user | USER) sim_environment="-DWITH_ENVIRONMENT=USER_ENVIRONMENT";; - virtual | VIRTUAL) sim_environment="-DWITH_ENVIRONMENT=VIRTUAL_ENVIRONMENT";; - operating | OPERATING) sim_environment="-DWITH_ENVIRONMENT=OPERATING_ENVIRONMENT";; - *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-environment\"" "$LINENO" 5; - sim_environment="";; -esac -if test x"$silent" != x"yes" && test x"$sim_environment" != x""; then - echo "Setting sim environment = $sim_environment" 6>&1 -fi -else - sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT" -fi - - # Check whether --enable-werror was given. if test "${enable_werror+set}" = set; then : enableval=$enable_werror; case "${enableval}" in diff --git a/sim/bfin/configure.ac b/sim/bfin/configure.ac index 711cae451c..5b8a4c2b18 100644 --- a/sim/bfin/configure.ac +++ b/sim/bfin/configure.ac @@ -8,7 +8,6 @@ SIM_AC_COMMON SIM_AC_OPTION_ENDIAN(LITTLE) SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT,STRICT_ALIGNMENT) SIM_AC_OPTION_DEFAULT_MODEL(bf537) -SIM_AC_OPTION_ENVIRONMENT SIM_AC_OPTION_WARNINGS SIM_AC_OPTION_HARDWARE(yes,,\ bfin_cec \ diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index ae0345915f..fee3deedf6 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,5 +1,9 @@ 2016-01-10 Mike Frysinger <vapier@gentoo.org> + * acinclude.m4 (SIM_AC_COMMON): Call SIM_AC_OPTION_ENVIRONMENT. + +2016-01-10 Mike Frysinger <vapier@gentoo.org> + * acinclude.m4 (SIM_AC_COMMON): Call SIM_AC_OPTION_ASSERT. 2016-01-10 Mike Frysinger <vapier@gentoo.org> diff --git a/sim/common/acinclude.m4 b/sim/common/acinclude.m4 index 675c59505a..9b62bcdd07 100644 --- a/sim/common/acinclude.m4 +++ b/sim/common/acinclude.m4 @@ -224,6 +224,7 @@ fi],[sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1"])dnl AC_SUBST(sim_profile) SIM_AC_OPTION_ASSERT +SIM_AC_OPTION_ENVIRONMENT SIM_AC_OPTION_INLINE ACX_PKGVERSION([SIM]) diff --git a/sim/cr16/ChangeLog b/sim/cr16/ChangeLog index bd7fb2a2af..1e50f1598e 100644 --- a/sim/cr16/ChangeLog +++ b/sim/cr16/ChangeLog @@ -1,5 +1,10 @@ 2016-01-10 Mike Frysinger <vapier@gentoo.org> + * configure.ac (SIM_AC_OPTION_ENVIRONMENT): Delete call. + * configure: Regenerate. + +2016-01-10 Mike Frysinger <vapier@gentoo.org> + * configure: Regenerate. 2016-01-10 Mike Frysinger <vapier@gentoo.org> diff --git a/sim/cr16/configure b/sim/cr16/configure index 1d026410a4..9c62b97eb1 100755 --- a/sim/cr16/configure +++ b/sim/cr16/configure @@ -753,12 +753,12 @@ enable_sim_stdio enable_sim_trace enable_sim_profile enable_sim_assert +enable_sim_environment enable_sim_inline with_pkgversion with_bugurl enable_sim_endian enable_sim_alignment -enable_sim_environment enable_werror enable_build_warnings enable_sim_build_warnings @@ -1406,6 +1406,9 @@ Optional Features: --enable-sim-profile=opts Enable profiling flags --enable-sim-assert Specify whether to perform random assertions + --enable-sim-environment=environment + Specify mixed, user, virtual or operating + environment --enable-sim-inline=inlines Specify which functions should be inlined --enable-sim-endian=endian @@ -1413,9 +1416,6 @@ Optional Features: --enable-sim-alignment=align Specify strict, nonstrict or forced alignment of memory accesses - --enable-sim-environment=environment - Specify mixed, user, virtual or operating - environment --enable-werror treat compile warnings as errors --enable-build-warnings enable build-time compiler warnings if gcc is used --enable-sim-build-warnings @@ -13323,6 +13323,24 @@ else fi +# Check whether --enable-sim-environment was given. +if test "${enable_sim_environment+set}" = set; then : + enableval=$enable_sim_environment; case "${enableval}" in + all | ALL) sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT";; + user | USER) sim_environment="-DWITH_ENVIRONMENT=USER_ENVIRONMENT";; + virtual | VIRTUAL) sim_environment="-DWITH_ENVIRONMENT=VIRTUAL_ENVIRONMENT";; + operating | OPERATING) sim_environment="-DWITH_ENVIRONMENT=OPERATING_ENVIRONMENT";; + *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-environment\"" "$LINENO" 5; + sim_environment="";; +esac +if test x"$silent" != x"yes" && test x"$sim_environment" != x""; then + echo "Setting sim environment = $sim_environment" 6>&1 +fi +else + sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT" +fi + + sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. if test "${enable_sim_inline+set}" = set; then : @@ -13539,24 +13557,6 @@ fi fi -# Check whether --enable-sim-environment was given. -if test "${enable_sim_environment+set}" = set; then : - enableval=$enable_sim_environment; case "${enableval}" in - all | ALL) sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT";; - user | USER) sim_environment="-DWITH_ENVIRONMENT=USER_ENVIRONMENT";; - virtual | VIRTUAL) sim_environment="-DWITH_ENVIRONMENT=VIRTUAL_ENVIRONMENT";; - operating | OPERATING) sim_environment="-DWITH_ENVIRONMENT=OPERATING_ENVIRONMENT";; - *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-environment\"" "$LINENO" 5; - sim_environment="";; -esac -if test x"$silent" != x"yes" && test x"$sim_environment" != x""; then - echo "Setting sim environment = $sim_environment" 6>&1 -fi -else - sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT" -fi - - # Check whether --enable-werror was given. if test "${enable_werror+set}" = set; then : enableval=$enable_werror; case "${enableval}" in diff --git a/sim/cr16/configure.ac b/sim/cr16/configure.ac index 8ce247d7db..b85b17d007 100644 --- a/sim/cr16/configure.ac +++ b/sim/cr16/configure.ac @@ -7,7 +7,6 @@ SIM_AC_COMMON SIM_AC_OPTION_ENDIAN(LITTLE) SIM_AC_OPTION_ALIGNMENT(NONSTRICT_ALIGNMENT) -SIM_AC_OPTION_ENVIRONMENT SIM_AC_OPTION_WARNINGS SIM_AC_OUTPUT diff --git a/sim/cris/ChangeLog b/sim/cris/ChangeLog index 2583d8b4b3..e3f4b6daf0 100644 --- a/sim/cris/ChangeLog +++ b/sim/cris/ChangeLog @@ -1,5 +1,10 @@ 2016-01-10 Mike Frysinger <vapier@gentoo.org> + * configure.ac (SIM_AC_OPTION_ENVIRONMENT): Delete call. + * configure: Regenerate. + +2016-01-10 Mike Frysinger <vapier@gentoo.org> + * configure: Regenerate. 2016-01-10 Mike Frysinger <vapier@gentoo.org> diff --git a/sim/cris/configure b/sim/cris/configure index 7b5d7653ce..e63e0f6b90 100755 --- a/sim/cris/configure +++ b/sim/cris/configure @@ -756,6 +756,7 @@ enable_sim_stdio enable_sim_trace enable_sim_profile enable_sim_assert +enable_sim_environment enable_sim_inline with_pkgversion with_bugurl @@ -767,7 +768,6 @@ enable_build_warnings enable_sim_build_warnings enable_sim_hardware enable_sim_default_model -enable_sim_environment enable_cgen_maint ' ac_precious_vars='build_alias @@ -1413,6 +1413,9 @@ Optional Features: --enable-sim-profile=opts Enable profiling flags --enable-sim-assert Specify whether to perform random assertions + --enable-sim-environment=environment + Specify mixed, user, virtual or operating + environment --enable-sim-inline=inlines Specify which functions should be inlined --enable-sim-endian=endian @@ -1431,9 +1434,6 @@ Optional Features: Specify the hardware to be included in the build. --enable-sim-default-model=model Specify default model to simulate - --enable-sim-environment=environment - Specify mixed, user, virtual or operating - environment --enable-cgen-maint=DIR build cgen generated files Optional Packages: @@ -13337,6 +13337,24 @@ else fi +# Check whether --enable-sim-environment was given. +if test "${enable_sim_environment+set}" = set; then : + enableval=$enable_sim_environment; case "${enableval}" in + all | ALL) sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT";; + user | USER) sim_environment="-DWITH_ENVIRONMENT=USER_ENVIRONMENT";; + virtual | VIRTUAL) sim_environment="-DWITH_ENVIRONMENT=VIRTUAL_ENVIRONMENT";; + operating | OPERATING) sim_environment="-DWITH_ENVIRONMENT=OPERATING_ENVIRONMENT";; + *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-environment\"" "$LINENO" 5; + sim_environment="";; +esac +if test x"$silent" != x"yes" && test x"$sim_environment" != x""; then + echo "Setting sim environment = $sim_environment" 6>&1 +fi +else + sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT" +fi + + sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. if test "${enable_sim_inline+set}" = set; then : @@ -13815,24 +13833,6 @@ fi -# Check whether --enable-sim-environment was given. -if test "${enable_sim_environment+set}" = set; then : - enableval=$enable_sim_environment; case "${enableval}" in - all | ALL) sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT";; - user | USER) sim_environment="-DWITH_ENVIRONMENT=USER_ENVIRONMENT";; - virtual | VIRTUAL) sim_environment="-DWITH_ENVIRONMENT=VIRTUAL_ENVIRONMENT";; - operating | OPERATING) sim_environment="-DWITH_ENVIRONMENT=OPERATING_ENVIRONMENT";; - *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-environment\"" "$LINENO" 5; - sim_environment="";; -esac -if test x"$silent" != x"yes" && test x"$sim_environment" != x""; then - echo "Setting sim environment = $sim_environment" 6>&1 -fi -else - sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT" -fi - - cgen_maint=no cgen=guile cgendir='$(srcdir)/../../cgen' diff --git a/sim/cris/configure.ac b/sim/cris/configure.ac index 4e9455aa1f..beae702929 100644 --- a/sim/cris/configure.ac +++ b/sim/cris/configure.ac @@ -16,7 +16,6 @@ SIM_AC_OPTION_HARDWARE(yes,,rv cris cris_900000xx) # The default model shouldn't matter as long as there's a BFD. SIM_AC_OPTION_DEFAULT_MODEL(crisv32) -SIM_AC_OPTION_ENVIRONMENT SIM_AC_OPTION_CGEN_MAINT SIM_AC_OUTPUT diff --git a/sim/d10v/ChangeLog b/sim/d10v/ChangeLog index 20cde46d18..1a89f9e329 100644 --- a/sim/d10v/ChangeLog +++ b/sim/d10v/ChangeLog @@ -1,5 +1,10 @@ 2016-01-10 Mike Frysinger <vapier@gentoo.org> + * configure.ac (SIM_AC_OPTION_ENVIRONMENT): Delete call. + * configure: Regenerate. + +2016-01-10 Mike Frysinger <vapier@gentoo.org> + * configure: Regenerate. 2016-01-10 Mike Frysinger <vapier@gentoo.org> diff --git a/sim/d10v/configure b/sim/d10v/configure index cf8a451ab2..b4e6c827c3 100755 --- a/sim/d10v/configure +++ b/sim/d10v/configure @@ -753,12 +753,12 @@ enable_sim_stdio enable_sim_trace enable_sim_profile enable_sim_assert +enable_sim_environment enable_sim_inline with_pkgversion with_bugurl enable_sim_endian enable_sim_alignment -enable_sim_environment enable_werror enable_build_warnings enable_sim_build_warnings @@ -1406,6 +1406,9 @@ Optional Features: --enable-sim-profile=opts Enable profiling flags --enable-sim-assert Specify whether to perform random assertions + --enable-sim-environment=environment + Specify mixed, user, virtual or operating + environment --enable-sim-inline=inlines Specify which functions should be inlined --enable-sim-endian=endian @@ -1413,9 +1416,6 @@ Optional Features: --enable-sim-alignment=align Specify strict, nonstrict or forced alignment of memory accesses - --enable-sim-environment=environment - Specify mixed, user, virtual or operating - environment --enable-werror treat compile warnings as errors --enable-build-warnings enable build-time compiler warnings if gcc is used --enable-sim-build-warnings @@ -13323,6 +13323,24 @@ else fi +# Check whether --enable-sim-environment was given. +if test "${enable_sim_environment+set}" = set; then : + enableval=$enable_sim_environment; case "${enableval}" in + all | ALL) sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT";; + user | USER) sim_environment="-DWITH_ENVIRONMENT=USER_ENVIRONMENT";; + virtual | VIRTUAL) sim_environment="-DWITH_ENVIRONMENT=VIRTUAL_ENVIRONMENT";; + operating | OPERATING) sim_environment="-DWITH_ENVIRONMENT=OPERATING_ENVIRONMENT";; + *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-environment\"" "$LINENO" 5; + sim_environment="";; +esac +if test x"$silent" != x"yes" && test x"$sim_environment" != x""; then + echo "Setting sim environment = $sim_environment" 6>&1 +fi +else + sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT" +fi + + sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. if test "${enable_sim_inline+set}" = set; then : @@ -13539,24 +13557,6 @@ fi fi -# Check whether --enable-sim-environment was given. -if test "${enable_sim_environment+set}" = set; then : - enableval=$enable_sim_environment; case "${enableval}" in - all | ALL) sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT";; - user | USER) sim_environment="-DWITH_ENVIRONMENT=USER_ENVIRONMENT";; - virtual | VIRTUAL) sim_environment="-DWITH_ENVIRONMENT=VIRTUAL_ENVIRONMENT";; - operating | OPERATING) sim_environment="-DWITH_ENVIRONMENT=OPERATING_ENVIRONMENT";; - *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-environment\"" "$LINENO" 5; - sim_environment="";; -esac -if test x"$silent" != x"yes" && test x"$sim_environment" != x""; then - echo "Setting sim environment = $sim_environment" 6>&1 -fi -else - sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT" -fi - - # Check whether --enable-werror was given. if test "${enable_werror+set}" = set; then : enableval=$enable_werror; case "${enableval}" in diff --git a/sim/d10v/configure.ac b/sim/d10v/configure.ac index 6d5622e266..a93418f932 100644 --- a/sim/d10v/configure.ac +++ b/sim/d10v/configure.ac @@ -7,7 +7,6 @@ SIM_AC_COMMON SIM_AC_OPTION_ENDIAN SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT,STRICT_ALIGNMENT) -SIM_AC_OPTION_ENVIRONMENT SIM_AC_OPTION_WARNINGS SIM_AC_OUTPUT diff --git a/sim/erc32/ChangeLog b/sim/erc32/ChangeLog index 2ff4bcc9c9..2a3a34a289 100644 --- a/sim/erc32/ChangeLog +++ b/sim/erc32/ChangeLog @@ -18,6 +18,10 @@ * configure: Regenerate. +2016-01-10 Mike Frysinger <vapier@gentoo.org> + + * configure: Regenerate. + 2016-01-09 Mike Frysinger <vapier@gentoo.org> * config.in, configure: Regenerate. diff --git a/sim/erc32/configure b/sim/erc32/configure index 857e093ef0..962bd0700d 100755 --- a/sim/erc32/configure +++ b/sim/erc32/configure @@ -755,6 +755,7 @@ enable_sim_stdio enable_sim_trace enable_sim_profile enable_sim_assert +enable_sim_environment enable_sim_inline with_pkgversion with_bugurl @@ -1402,6 +1403,9 @@ Optional Features: --enable-sim-profile=opts Enable profiling flags --enable-sim-assert Specify whether to perform random assertions + --enable-sim-environment=environment + Specify mixed, user, virtual or operating + environment --enable-sim-inline=inlines Specify which functions should be inlined @@ -12831,7 +12835,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12834 "configure" +#line 12838 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12937,7 +12941,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12940 "configure" +#line 12944 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13306,6 +13310,24 @@ else fi +# Check whether --enable-sim-environment was given. +if test "${enable_sim_environment+set}" = set; then : + enableval=$enable_sim_environment; case "${enableval}" in + all | ALL) sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT";; + user | USER) sim_environment="-DWITH_ENVIRONMENT=USER_ENVIRONMENT";; + virtual | VIRTUAL) sim_environment="-DWITH_ENVIRONMENT=VIRTUAL_ENVIRONMENT";; + operating | OPERATING) sim_environment="-DWITH_ENVIRONMENT=OPERATING_ENVIRONMENT";; + *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-environment\"" "$LINENO" 5; + sim_environment="";; +esac +if test x"$silent" != x"yes" && test x"$sim_environment" != x""; then + echo "Setting sim environment = $sim_environment" 6>&1 +fi +else + sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT" +fi + + sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. if test "${enable_sim_inline+set}" = set; then : diff --git a/sim/frv/ChangeLog b/sim/frv/ChangeLog index 7be18a3faf..b6c8ac18e8 100644 --- a/sim/frv/ChangeLog +++ b/sim/frv/ChangeLog @@ -1,5 +1,10 @@ 2016-01-10 Mike Frysinger <vapier@gentoo.org> + * configure.ac (SIM_AC_OPTION_ENVIRONMENT): Delete call. + * configure: Regenerate. + +2016-01-10 Mike Frysinger <vapier@gentoo.org> + * configure: Regenerate. 2016-01-10 Mike Frysinger <vapier@gentoo.org> diff --git a/sim/frv/configure b/sim/frv/configure index 7d1726f8a7..d9dc957f41 100755 --- a/sim/frv/configure +++ b/sim/frv/configure @@ -757,6 +757,7 @@ enable_sim_stdio enable_sim_trace enable_sim_profile enable_sim_assert +enable_sim_environment enable_sim_inline with_pkgversion with_bugurl @@ -764,7 +765,6 @@ enable_sim_endian enable_sim_alignment enable_sim_scache enable_sim_default_model -enable_sim_environment enable_cgen_maint enable_sim_trapdump enable_sim_hardware @@ -1412,6 +1412,9 @@ Optional Features: --enable-sim-profile=opts Enable profiling flags --enable-sim-assert Specify whether to perform random assertions + --enable-sim-environment=environment + Specify mixed, user, virtual or operating + environment --enable-sim-inline=inlines Specify which functions should be inlined --enable-sim-endian=endian @@ -1423,9 +1426,6 @@ Optional Features: Specify simulator execution cache size --enable-sim-default-model=model Specify default model to simulate - --enable-sim-environment=environment - Specify mixed, user, virtual or operating - environment --enable-cgen-maint=DIR build cgen generated files --enable-sim-trapdump Make unknown traps dump the registers --enable-sim-hardware=LIST @@ -13332,6 +13332,24 @@ else fi +# Check whether --enable-sim-environment was given. +if test "${enable_sim_environment+set}" = set; then : + enableval=$enable_sim_environment; case "${enableval}" in + all | ALL) sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT";; + user | USER) sim_environment="-DWITH_ENVIRONMENT=USER_ENVIRONMENT";; + virtual | VIRTUAL) sim_environment="-DWITH_ENVIRONMENT=VIRTUAL_ENVIRONMENT";; + operating | OPERATING) sim_environment="-DWITH_ENVIRONMENT=OPERATING_ENVIRONMENT";; + *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-environment\"" "$LINENO" 5; + sim_environment="";; +esac +if test x"$silent" != x"yes" && test x"$sim_environment" != x""; then + echo "Setting sim environment = $sim_environment" 6>&1 +fi +else + sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT" +fi + + sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. if test "${enable_sim_inline+set}" = set; then : @@ -13583,24 +13601,6 @@ fi -# Check whether --enable-sim-environment was given. -if test "${enable_sim_environment+set}" = set; then : - enableval=$enable_sim_environment; case "${enableval}" in - all | ALL) sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT";; - user | USER) sim_environment="-DWITH_ENVIRONMENT=USER_ENVIRONMENT";; - virtual | VIRTUAL) sim_environment="-DWITH_ENVIRONMENT=VIRTUAL_ENVIRONMENT";; - operating | OPERATING) sim_environment="-DWITH_ENVIRONMENT=OPERATING_ENVIRONMENT";; - *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-environment\"" "$LINENO" 5; - sim_environment="";; -esac -if test x"$silent" != x"yes" && test x"$sim_environment" != x""; then - echo "Setting sim environment = $sim_environment" 6>&1 -fi -else - sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT" -fi - - cgen_maint=no cgen=guile cgendir='$(srcdir)/../../cgen' diff --git a/sim/frv/configure.ac b/sim/frv/configure.ac index bb5f459de9..cfbe29a054 100644 --- a/sim/frv/configure.ac +++ b/sim/frv/configure.ac @@ -9,7 +9,6 @@ SIM_AC_OPTION_ENDIAN(BIG) SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT) SIM_AC_OPTION_SCACHE(16384) SIM_AC_OPTION_DEFAULT_MODEL(fr500) -SIM_AC_OPTION_ENVIRONMENT SIM_AC_OPTION_CGEN_MAINT # diff --git a/sim/ft32/ChangeLog b/sim/ft32/ChangeLog index 9d9fde52ed..6ec12cbedb 100644 --- a/sim/ft32/ChangeLog +++ b/sim/ft32/ChangeLog @@ -1,5 +1,10 @@ 2016-01-10 Mike Frysinger <vapier@gentoo.org> + * configure.ac (SIM_AC_OPTION_ENVIRONMENT): Delete call. + * configure: Regenerate. + +2016-01-10 Mike Frysinger <vapier@gentoo.org> + * configure: Regenerate. 2016-01-10 Mike Frysinger <vapier@gentoo.org> diff --git a/sim/ft32/configure b/sim/ft32/configure index 5d4ebc4060..c01c48e6fe 100755 --- a/sim/ft32/configure +++ b/sim/ft32/configure @@ -753,12 +753,12 @@ enable_sim_stdio enable_sim_trace enable_sim_profile enable_sim_assert +enable_sim_environment enable_sim_inline with_pkgversion with_bugurl enable_sim_endian enable_sim_alignment -enable_sim_environment enable_werror enable_build_warnings enable_sim_build_warnings @@ -1406,6 +1406,9 @@ Optional Features: --enable-sim-profile=opts Enable profiling flags --enable-sim-assert Specify whether to perform random assertions + --enable-sim-environment=environment + Specify mixed, user, virtual or operating + environment --enable-sim-inline=inlines Specify which functions should be inlined --enable-sim-endian=endian @@ -1413,9 +1416,6 @@ Optional Features: --enable-sim-alignment=align Specify strict, nonstrict or forced alignment of memory accesses - --enable-sim-environment=environment - Specify mixed, user, virtual or operating - environment --enable-werror treat compile warnings as errors --enable-build-warnings enable build-time compiler warnings if gcc is used --enable-sim-build-warnings @@ -13323,6 +13323,24 @@ else fi +# Check whether --enable-sim-environment was given. +if test "${enable_sim_environment+set}" = set; then : + enableval=$enable_sim_environment; case "${enableval}" in + all | ALL) sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT";; + user | USER) sim_environment="-DWITH_ENVIRONMENT=USER_ENVIRONMENT";; + virtual | VIRTUAL) sim_environment="-DWITH_ENVIRONMENT=VIRTUAL_ENVIRONMENT";; + operating | OPERATING) sim_environment="-DWITH_ENVIRONMENT=OPERATING_ENVIRONMENT";; + *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-environment\"" "$LINENO" 5; + sim_environment="";; +esac +if test x"$silent" != x"yes" && test x"$sim_environment" != x""; then + echo "Setting sim environment = $sim_environment" 6>&1 +fi +else + sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT" +fi + + sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. if test "${enable_sim_inline+set}" = set; then : @@ -13539,24 +13557,6 @@ fi fi -# Check whether --enable-sim-environment was given. -if test "${enable_sim_environment+set}" = set; then : - enableval=$enable_sim_environment; case "${enableval}" in - all | ALL) sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT";; - user | USER) sim_environment="-DWITH_ENVIRONMENT=USER_ENVIRONMENT";; - virtual | VIRTUAL) sim_environment="-DWITH_ENVIRONMENT=VIRTUAL_ENVIRONMENT";; - operating | OPERATING) sim_environment="-DWITH_ENVIRONMENT=OPERATING_ENVIRONMENT";; - *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-environment\"" "$LINENO" 5; - sim_environment="";; -esac -if test x"$silent" != x"yes" && test x"$sim_environment" != x""; then - echo "Setting sim environment = $sim_environment" 6>&1 -fi -else - sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT" -fi - - # Check whether --enable-werror was given. if test "${enable_werror+set}" = set; then : enableval=$enable_werror; case "${enableval}" in diff --git a/sim/ft32/configure.ac b/sim/ft32/configure.ac index 8aadb5f71c..279b6613df 100644 --- a/sim/ft32/configure.ac +++ b/sim/ft32/configure.ac @@ -7,7 +7,6 @@ SIM_AC_COMMON SIM_AC_OPTION_ENDIAN(LITTLE) SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT) -SIM_AC_OPTION_ENVIRONMENT SIM_AC_OPTION_WARNINGS SIM_AC_OUTPUT diff --git a/sim/h8300/ChangeLog b/sim/h8300/ChangeLog index fa83702931..a29bad6e8b 100644 --- a/sim/h8300/ChangeLog +++ b/sim/h8300/ChangeLog @@ -18,6 +18,10 @@ * configure: Regenerate. +2016-01-10 Mike Frysinger <vapier@gentoo.org> + + * configure: Regenerate. + 2016-01-09 Mike Frysinger <vapier@gentoo.org> * config.in, configure: Regenerate. diff --git a/sim/h8300/configure b/sim/h8300/configure index 85360499f1..b4d3b8bcf2 100755 --- a/sim/h8300/configure +++ b/sim/h8300/configure @@ -753,6 +753,7 @@ enable_sim_stdio enable_sim_trace enable_sim_profile enable_sim_assert +enable_sim_environment enable_sim_inline with_pkgversion with_bugurl @@ -1402,6 +1403,9 @@ Optional Features: --enable-sim-profile=opts Enable profiling flags --enable-sim-assert Specify whether to perform random assertions + --enable-sim-environment=environment + Specify mixed, user, virtual or operating + environment --enable-sim-inline=inlines Specify which functions should be inlined --enable-sim-endian=endian @@ -12836,7 +12840,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12839 "configure" +#line 12843 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12942,7 +12946,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12945 "configure" +#line 12949 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13311,6 +13315,24 @@ else fi +# Check whether --enable-sim-environment was given. +if test "${enable_sim_environment+set}" = set; then : + enableval=$enable_sim_environment; case "${enableval}" in + all | ALL) sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT";; + user | USER) sim_environment="-DWITH_ENVIRONMENT=USER_ENVIRONMENT";; + virtual | VIRTUAL) sim_environment="-DWITH_ENVIRONMENT=VIRTUAL_ENVIRONMENT";; + operating | OPERATING) sim_environment="-DWITH_ENVIRONMENT=OPERATING_ENVIRONMENT";; + *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-environment\"" "$LINENO" 5; + sim_environment="";; +esac +if test x"$silent" != x"yes" && test x"$sim_environment" != x""; then + echo "Setting sim environment = $sim_environment" 6>&1 +fi +else + sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT" +fi + + sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. if test "${enable_sim_inline+set}" = set; then : diff --git a/sim/iq2000/ChangeLog b/sim/iq2000/ChangeLog index f3872a033b..9440f74999 100644 --- a/sim/iq2000/ChangeLog +++ b/sim/iq2000/ChangeLog @@ -1,5 +1,10 @@ 2016-01-10 Mike Frysinger <vapier@gentoo.org> + * configure.ac (SIM_AC_OPTION_ENVIRONMENT): Delete call. + * configure: Regenerate. + +2016-01-10 Mike Frysinger <vapier@gentoo.org> + * configure: Regenerate. 2016-01-10 Mike Frysinger <vapier@gentoo.org> diff --git a/sim/iq2000/configure b/sim/iq2000/configure index a4b398d50f..6cf83e77ea 100755 --- a/sim/iq2000/configure +++ b/sim/iq2000/configure @@ -756,6 +756,7 @@ enable_sim_stdio enable_sim_trace enable_sim_profile enable_sim_assert +enable_sim_environment enable_sim_inline with_pkgversion with_bugurl @@ -763,7 +764,6 @@ enable_sim_endian enable_sim_alignment enable_sim_scache enable_sim_default_model -enable_sim_environment enable_cgen_maint enable_sim_hardware ' @@ -1410,6 +1410,9 @@ Optional Features: --enable-sim-profile=opts Enable profiling flags --enable-sim-assert Specify whether to perform random assertions + --enable-sim-environment=environment + Specify mixed, user, virtual or operating + environment --enable-sim-inline=inlines Specify which functions should be inlined --enable-sim-endian=endian @@ -1421,9 +1424,6 @@ Optional Features: Specify simulator execution cache size --enable-sim-default-model=model Specify default model to simulate - --enable-sim-environment=environment - Specify mixed, user, virtual or operating - environment --enable-cgen-maint=DIR build cgen generated files --enable-sim-hardware=LIST Specify the hardware to be included in the build. @@ -13329,6 +13329,24 @@ else fi +# Check whether --enable-sim-environment was given. +if test "${enable_sim_environment+set}" = set; then : + enableval=$enable_sim_environment; case "${enableval}" in + all | ALL) sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT";; + user | USER) sim_environment="-DWITH_ENVIRONMENT=USER_ENVIRONMENT";; + virtual | VIRTUAL) sim_environment="-DWITH_ENVIRONMENT=VIRTUAL_ENVIRONMENT";; + operating | OPERATING) sim_environment="-DWITH_ENVIRONMENT=OPERATING_ENVIRONMENT";; + *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-environment\"" "$LINENO" 5; + sim_environment="";; +esac +if test x"$silent" != x"yes" && test x"$sim_environment" != x""; then + echo "Setting sim environment = $sim_environment" 6>&1 +fi +else + sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT" +fi + + sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. if test "${enable_sim_inline+set}" = set; then : @@ -13580,24 +13598,6 @@ fi -# Check whether --enable-sim-environment was given. -if test "${enable_sim_environment+set}" = set; then : - enableval=$enable_sim_environment; case "${enableval}" in - all | ALL) sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT";; - user | USER) sim_environment="-DWITH_ENVIRONMENT=USER_ENVIRONMENT";; - virtual | VIRTUAL) sim_environment="-DWITH_ENVIRONMENT=VIRTUAL_ENVIRONMENT";; - operating | OPERATING) sim_environment="-DWITH_ENVIRONMENT=OPERATING_ENVIRONMENT";; - *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-environment\"" "$LINENO" 5; - sim_environment="";; -esac -if test x"$silent" != x"yes" && test x"$sim_environment" != x""; then - echo "Setting sim environment = $sim_environment" 6>&1 -fi -else - sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT" -fi - - cgen_maint=no cgen=guile cgendir='$(srcdir)/../../cgen' diff --git a/sim/iq2000/configure.ac b/sim/iq2000/configure.ac index 0d6b1164b3..7424e4d41d 100644 --- a/sim/iq2000/configure.ac +++ b/sim/iq2000/configure.ac @@ -9,7 +9,6 @@ SIM_AC_OPTION_ENDIAN(BIG) SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT) SIM_AC_OPTION_SCACHE(16384) SIM_AC_OPTION_DEFAULT_MODEL(iq2000) -SIM_AC_OPTION_ENVIRONMENT SIM_AC_OPTION_CGEN_MAINT SIM_AC_OPTION_HARDWARE(yes,"","") diff --git a/sim/lm32/ChangeLog b/sim/lm32/ChangeLog index 3086517d5b..e427101ac3 100644 --- a/sim/lm32/ChangeLog +++ b/sim/lm32/ChangeLog @@ -1,5 +1,10 @@ 2016-01-10 Mike Frysinger <vapier@gentoo.org> + * configure.ac (SIM_AC_OPTION_ENVIRONMENT): Delete call. + * configure: Regenerate. + +2016-01-10 Mike Frysinger <vapier@gentoo.org> + * configure: Regenerate. 2016-01-10 Mike Frysinger <vapier@gentoo.org> diff --git a/sim/lm32/configure b/sim/lm32/configure index 7838a83d0d..d40a491268 100755 --- a/sim/lm32/configure +++ b/sim/lm32/configure @@ -756,6 +756,7 @@ enable_sim_stdio enable_sim_trace enable_sim_profile enable_sim_assert +enable_sim_environment enable_sim_inline with_pkgversion with_bugurl @@ -763,7 +764,6 @@ enable_sim_endian enable_sim_alignment enable_sim_scache enable_sim_default_model -enable_sim_environment enable_cgen_maint enable_sim_hardware ' @@ -1410,6 +1410,9 @@ Optional Features: --enable-sim-profile=opts Enable profiling flags --enable-sim-assert Specify whether to perform random assertions + --enable-sim-environment=environment + Specify mixed, user, virtual or operating + environment --enable-sim-inline=inlines Specify which functions should be inlined --enable-sim-endian=endian @@ -1421,9 +1424,6 @@ Optional Features: Specify simulator execution cache size --enable-sim-default-model=model Specify default model to simulate - --enable-sim-environment=environment - Specify mixed, user, virtual or operating - environment --enable-cgen-maint=DIR build cgen generated files --enable-sim-hardware=LIST Specify the hardware to be included in the build. @@ -13329,6 +13329,24 @@ else fi +# Check whether --enable-sim-environment was given. +if test "${enable_sim_environment+set}" = set; then : + enableval=$enable_sim_environment; case "${enableval}" in + all | ALL) sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT";; + user | USER) sim_environment="-DWITH_ENVIRONMENT=USER_ENVIRONMENT";; + virtual | VIRTUAL) sim_environment="-DWITH_ENVIRONMENT=VIRTUAL_ENVIRONMENT";; + operating | OPERATING) sim_environment="-DWITH_ENVIRONMENT=OPERATING_ENVIRONMENT";; + *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-environment\"" "$LINENO" 5; + sim_environment="";; +esac +if test x"$silent" != x"yes" && test x"$sim_environment" != x""; then + echo "Setting sim environment = $sim_environment" 6>&1 +fi +else + sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT" +fi + + sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. if test "${enable_sim_inline+set}" = set; then : @@ -13580,24 +13598,6 @@ fi -# Check whether --enable-sim-environment was given. -if test "${enable_sim_environment+set}" = set; then : - enableval=$enable_sim_environment; case "${enableval}" in - all | ALL) sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT";; - user | USER) sim_environment="-DWITH_ENVIRONMENT=USER_ENVIRONMENT";; - virtual | VIRTUAL) sim_environment="-DWITH_ENVIRONMENT=VIRTUAL_ENVIRONMENT";; - operating | OPERATING) sim_environment="-DWITH_ENVIRONMENT=OPERATING_ENVIRONMENT";; - *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-environment\"" "$LINENO" 5; - sim_environment="";; -esac -if test x"$silent" != x"yes" && test x"$sim_environment" != x""; then - echo "Setting sim environment = $sim_environment" 6>&1 -fi -else - sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT" -fi - - cgen_maint=no cgen=guile cgendir='$(srcdir)/../../cgen' diff --git a/sim/lm32/configure.ac b/sim/lm32/configure.ac index a162f294d7..e928885658 100644 --- a/sim/lm32/configure.ac +++ b/sim/lm32/configure.ac @@ -9,7 +9,6 @@ SIM_AC_OPTION_ENDIAN(BIG) SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT,STRICT_ALIGNMENT) SIM_AC_OPTION_SCACHE(16384) SIM_AC_OPTION_DEFAULT_MODEL(lm32) -SIM_AC_OPTION_ENVIRONMENT SIM_AC_OPTION_CGEN_MAINT SIM_AC_OPTION_HARDWARE(yes,,lm32cpu lm32timer lm32uart) diff --git a/sim/m32c/ChangeLog b/sim/m32c/ChangeLog index 0f50701bed..db383c99b1 100644 --- a/sim/m32c/ChangeLog +++ b/sim/m32c/ChangeLog @@ -18,6 +18,10 @@ * configure: Regenerate. +2016-01-10 Mike Frysinger <vapier@gentoo.org> + + * configure: Regenerate. + 2016-01-09 Mike Frysinger <vapier@gentoo.org> * config.in, configure: Regenerate. diff --git a/sim/m32c/configure b/sim/m32c/configure index 77515c213c..b0c2bb2ebe 100755 --- a/sim/m32c/configure +++ b/sim/m32c/configure @@ -753,6 +753,7 @@ enable_sim_stdio enable_sim_trace enable_sim_profile enable_sim_assert +enable_sim_environment enable_sim_inline with_pkgversion with_bugurl @@ -1403,6 +1404,9 @@ Optional Features: --enable-sim-profile=opts Enable profiling flags --enable-sim-assert Specify whether to perform random assertions + --enable-sim-environment=environment + Specify mixed, user, virtual or operating + environment --enable-sim-inline=inlines Specify which functions should be inlined --enable-werror treat compile warnings as errors @@ -12837,7 +12841,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12840 "configure" +#line 12844 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12943,7 +12947,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12946 "configure" +#line 12950 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13312,6 +13316,24 @@ else fi +# Check whether --enable-sim-environment was given. +if test "${enable_sim_environment+set}" = set; then : + enableval=$enable_sim_environment; case "${enableval}" in + all | ALL) sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT";; + user | USER) sim_environment="-DWITH_ENVIRONMENT=USER_ENVIRONMENT";; + virtual | VIRTUAL) sim_environment="-DWITH_ENVIRONMENT=VIRTUAL_ENVIRONMENT";; + operating | OPERATING) sim_environment="-DWITH_ENVIRONMENT=OPERATING_ENVIRONMENT";; + *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-environment\"" "$LINENO" 5; + sim_environment="";; +esac +if test x"$silent" != x"yes" && test x"$sim_environment" != x""; then + echo "Setting sim environment = $sim_environment" 6>&1 +fi +else + sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT" +fi + + sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. if test "${enable_sim_inline+set}" = set; then : diff --git a/sim/m32r/ChangeLog b/sim/m32r/ChangeLog index 1bc70e1084..d33c5fefa6 100644 --- a/sim/m32r/ChangeLog +++ b/sim/m32r/ChangeLog @@ -1,5 +1,10 @@ 2016-01-10 Mike Frysinger <vapier@gentoo.org> + * configure.ac (SIM_AC_OPTION_ENVIRONMENT): Delete call. + * configure: Regenerate. + +2016-01-10 Mike Frysinger <vapier@gentoo.org> + * configure: Regenerate. 2016-01-10 Mike Frysinger <vapier@gentoo.org> diff --git a/sim/m32r/configure b/sim/m32r/configure index 492d3afa67..49f33f4c95 100755 --- a/sim/m32r/configure +++ b/sim/m32r/configure @@ -758,6 +758,7 @@ enable_sim_stdio enable_sim_trace enable_sim_profile enable_sim_assert +enable_sim_environment enable_sim_inline with_pkgversion with_bugurl @@ -765,7 +766,6 @@ enable_sim_endian enable_sim_alignment enable_sim_scache enable_sim_default_model -enable_sim_environment enable_cgen_maint enable_sim_hardware ' @@ -1412,6 +1412,9 @@ Optional Features: --enable-sim-profile=opts Enable profiling flags --enable-sim-assert Specify whether to perform random assertions + --enable-sim-environment=environment + Specify mixed, user, virtual or operating + environment --enable-sim-inline=inlines Specify which functions should be inlined --enable-sim-endian=endian @@ -1423,9 +1426,6 @@ Optional Features: Specify simulator execution cache size --enable-sim-default-model=model Specify default model to simulate - --enable-sim-environment=environment - Specify mixed, user, virtual or operating - environment --enable-cgen-maint=DIR build cgen generated files --enable-sim-hardware=LIST Specify the hardware to be included in the build. @@ -13331,6 +13331,24 @@ else fi +# Check whether --enable-sim-environment was given. +if test "${enable_sim_environment+set}" = set; then : + enableval=$enable_sim_environment; case "${enableval}" in + all | ALL) sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT";; + user | USER) sim_environment="-DWITH_ENVIRONMENT=USER_ENVIRONMENT";; + virtual | VIRTUAL) sim_environment="-DWITH_ENVIRONMENT=VIRTUAL_ENVIRONMENT";; + operating | OPERATING) sim_environment="-DWITH_ENVIRONMENT=OPERATING_ENVIRONMENT";; + *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-environment\"" "$LINENO" 5; + sim_environment="";; +esac +if test x"$silent" != x"yes" && test x"$sim_environment" != x""; then + echo "Setting sim environment = $sim_environment" 6>&1 +fi +else + sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT" +fi + + sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. if test "${enable_sim_inline+set}" = set; then : @@ -13582,24 +13600,6 @@ fi -# Check whether --enable-sim-environment was given. -if test "${enable_sim_environment+set}" = set; then : - enableval=$enable_sim_environment; case "${enableval}" in - all | ALL) sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT";; - user | USER) sim_environment="-DWITH_ENVIRONMENT=USER_ENVIRONMENT";; - virtual | VIRTUAL) sim_environment="-DWITH_ENVIRONMENT=VIRTUAL_ENVIRONMENT";; - operating | OPERATING) sim_environment="-DWITH_ENVIRONMENT=OPERATING_ENVIRONMENT";; - *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-environment\"" "$LINENO" 5; - sim_environment="";; -esac -if test x"$silent" != x"yes" && test x"$sim_environment" != x""; then - echo "Setting sim environment = $sim_environment" 6>&1 -fi -else - sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT" -fi - - cgen_maint=no cgen=guile cgendir='$(srcdir)/../../cgen' diff --git a/sim/m32r/configure.ac b/sim/m32r/configure.ac index 43950206fe..d9c7d62e6a 100644 --- a/sim/m32r/configure.ac +++ b/sim/m32r/configure.ac @@ -9,7 +9,6 @@ SIM_AC_OPTION_ENDIAN(BIG) SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT) SIM_AC_OPTION_SCACHE(16384) SIM_AC_OPTION_DEFAULT_MODEL(m32r/d) -SIM_AC_OPTION_ENVIRONMENT SIM_AC_OPTION_CGEN_MAINT case "${target_alias}" in diff --git a/sim/m68hc11/ChangeLog b/sim/m68hc11/ChangeLog index 3c715975b5..b9b16a9ae7 100644 --- a/sim/m68hc11/ChangeLog +++ b/sim/m68hc11/ChangeLog @@ -8,6 +8,10 @@ 2016-01-10 Mike Frysinger <vapier@gentoo.org> + * configure: Regenerate. + +2016-01-10 Mike Frysinger <vapier@gentoo.org> + * configure.ac (SIM_AC_OPTION_INLINE): Delete call. * configure: Regenerate. diff --git a/sim/m68hc11/configure b/sim/m68hc11/configure index d0328fec92..22a65eb379 100755 --- a/sim/m68hc11/configure +++ b/sim/m68hc11/configure @@ -753,6 +753,7 @@ enable_sim_stdio enable_sim_trace enable_sim_profile enable_sim_assert +enable_sim_environment enable_sim_inline with_pkgversion with_bugurl @@ -1406,6 +1407,9 @@ Optional Features: --enable-sim-profile=opts Enable profiling flags --enable-sim-assert Specify whether to perform random assertions + --enable-sim-environment=environment + Specify mixed, user, virtual or operating + environment --enable-sim-inline=inlines Specify which functions should be inlined --enable-sim-endian=endian @@ -12847,7 +12851,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12850 "configure" +#line 12854 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12953,7 +12957,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12956 "configure" +#line 12960 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13322,6 +13326,24 @@ else fi +# Check whether --enable-sim-environment was given. +if test "${enable_sim_environment+set}" = set; then : + enableval=$enable_sim_environment; case "${enableval}" in + all | ALL) sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT";; + user | USER) sim_environment="-DWITH_ENVIRONMENT=USER_ENVIRONMENT";; + virtual | VIRTUAL) sim_environment="-DWITH_ENVIRONMENT=VIRTUAL_ENVIRONMENT";; + operating | OPERATING) sim_environment="-DWITH_ENVIRONMENT=OPERATING_ENVIRONMENT";; + *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-environment\"" "$LINENO" 5; + sim_environment="";; +esac +if test x"$silent" != x"yes" && test x"$sim_environment" != x""; then + echo "Setting sim environment = $sim_environment" 6>&1 +fi +else + sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT" +fi + + sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. if test "${enable_sim_inline+set}" = set; then : diff --git a/sim/mcore/ChangeLog b/sim/mcore/ChangeLog index 87a759ad24..d93f895acd 100644 --- a/sim/mcore/ChangeLog +++ b/sim/mcore/ChangeLog @@ -1,5 +1,10 @@ 2016-01-10 Mike Frysinger <vapier@gentoo.org> + * configure.ac (SIM_AC_OPTION_ENVIRONMENT): Delete call. + * configure: Regenerate. + +2016-01-10 Mike Frysinger <vapier@gentoo.org> + * configure: Regenerate. 2016-01-10 Mike Frysinger <vapier@gentoo.org> diff --git a/sim/mcore/configure b/sim/mcore/configure index cf8a451ab2..b4e6c827c3 100755 --- a/sim/mcore/configure +++ b/sim/mcore/configure @@ -753,12 +753,12 @@ enable_sim_stdio enable_sim_trace enable_sim_profile enable_sim_assert +enable_sim_environment enable_sim_inline with_pkgversion with_bugurl enable_sim_endian enable_sim_alignment -enable_sim_environment enable_werror enable_build_warnings enable_sim_build_warnings @@ -1406,6 +1406,9 @@ Optional Features: --enable-sim-profile=opts Enable profiling flags --enable-sim-assert Specify whether to perform random assertions + --enable-sim-environment=environment + Specify mixed, user, virtual or operating + environment --enable-sim-inline=inlines Specify which functions should be inlined --enable-sim-endian=endian @@ -1413,9 +1416,6 @@ Optional Features: --enable-sim-alignment=align Specify strict, nonstrict or forced alignment of memory accesses - --enable-sim-environment=environment - Specify mixed, user, virtual or operating - environment --enable-werror treat compile warnings as errors --enable-build-warnings enable build-time compiler warnings if gcc is used --enable-sim-build-warnings @@ -13323,6 +13323,24 @@ else fi +# Check whether --enable-sim-environment was given. +if test "${enable_sim_environment+set}" = set; then : + enableval=$enable_sim_environment; case "${enableval}" in + all | ALL) sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT";; + user | USER) sim_environment="-DWITH_ENVIRONMENT=USER_ENVIRONMENT";; + virtual | VIRTUAL) sim_environment="-DWITH_ENVIRONMENT=VIRTUAL_ENVIRONMENT";; + operating | OPERATING) sim_environment="-DWITH_ENVIRONMENT=OPERATING_ENVIRONMENT";; + *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-environment\"" "$LINENO" 5; + sim_environment="";; +esac +if test x"$silent" != x"yes" && test x"$sim_environment" != x""; then + echo "Setting sim environment = $sim_environment" 6>&1 +fi +else + sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT" +fi + + sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. if test "${enable_sim_inline+set}" = set; then : @@ -13539,24 +13557,6 @@ fi fi -# Check whether --enable-sim-environment was given. -if test "${enable_sim_environment+set}" = set; then : - enableval=$enable_sim_environment; case "${enableval}" in - all | ALL) sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT";; - user | USER) sim_environment="-DWITH_ENVIRONMENT=USER_ENVIRONMENT";; - virtual | VIRTUAL) sim_environment="-DWITH_ENVIRONMENT=VIRTUAL_ENVIRONMENT";; - operating | OPERATING) sim_environment="-DWITH_ENVIRONMENT=OPERATING_ENVIRONMENT";; - *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-environment\"" "$LINENO" 5; - sim_environment="";; -esac -if test x"$silent" != x"yes" && test x"$sim_environment" != x""; then - echo "Setting sim environment = $sim_environment" 6>&1 -fi -else - sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT" -fi - - # Check whether --enable-werror was given. if test "${enable_werror+set}" = set; then : enableval=$enable_werror; case "${enableval}" in diff --git a/sim/mcore/configure.ac b/sim/mcore/configure.ac index 6d5622e266..a93418f932 100644 --- a/sim/mcore/configure.ac +++ b/sim/mcore/configure.ac @@ -7,7 +7,6 @@ SIM_AC_COMMON SIM_AC_OPTION_ENDIAN SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT,STRICT_ALIGNMENT) -SIM_AC_OPTION_ENVIRONMENT SIM_AC_OPTION_WARNINGS SIM_AC_OUTPUT diff --git a/sim/microblaze/ChangeLog b/sim/microblaze/ChangeLog index f9c6ad477e..4af462b315 100644 --- a/sim/microblaze/ChangeLog +++ b/sim/microblaze/ChangeLog @@ -1,5 +1,10 @@ 2016-01-10 Mike Frysinger <vapier@gentoo.org> + * configure.ac (SIM_AC_OPTION_ENVIRONMENT): Delete call. + * configure: Regenerate. + +2016-01-10 Mike Frysinger <vapier@gentoo.org> + * configure: Regenerate. 2016-01-10 Mike Frysinger <vapier@gentoo.org> diff --git a/sim/microblaze/configure b/sim/microblaze/configure index cf8a451ab2..b4e6c827c3 100755 --- a/sim/microblaze/configure +++ b/sim/microblaze/configure @@ -753,12 +753,12 @@ enable_sim_stdio enable_sim_trace enable_sim_profile enable_sim_assert +enable_sim_environment enable_sim_inline with_pkgversion with_bugurl enable_sim_endian enable_sim_alignment -enable_sim_environment enable_werror enable_build_warnings enable_sim_build_warnings @@ -1406,6 +1406,9 @@ Optional Features: --enable-sim-profile=opts Enable profiling flags --enable-sim-assert Specify whether to perform random assertions + --enable-sim-environment=environment + Specify mixed, user, virtual or operating + environment --enable-sim-inline=inlines Specify which functions should be inlined --enable-sim-endian=endian @@ -1413,9 +1416,6 @@ Optional Features: --enable-sim-alignment=align Specify strict, nonstrict or forced alignment of memory accesses - --enable-sim-environment=environment - Specify mixed, user, virtual or operating - environment --enable-werror treat compile warnings as errors --enable-build-warnings enable build-time compiler warnings if gcc is used --enable-sim-build-warnings @@ -13323,6 +13323,24 @@ else fi +# Check whether --enable-sim-environment was given. +if test "${enable_sim_environment+set}" = set; then : + enableval=$enable_sim_environment; case "${enableval}" in + all | ALL) sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT";; + user | USER) sim_environment="-DWITH_ENVIRONMENT=USER_ENVIRONMENT";; + virtual | VIRTUAL) sim_environment="-DWITH_ENVIRONMENT=VIRTUAL_ENVIRONMENT";; + operating | OPERATING) sim_environment="-DWITH_ENVIRONMENT=OPERATING_ENVIRONMENT";; + *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-environment\"" "$LINENO" 5; + sim_environment="";; +esac +if test x"$silent" != x"yes" && test x"$sim_environment" != x""; then + echo "Setting sim environment = $sim_environment" 6>&1 +fi +else + sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT" +fi + + sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. if test "${enable_sim_inline+set}" = set; then : @@ -13539,24 +13557,6 @@ fi fi -# Check whether --enable-sim-environment was given. -if test "${enable_sim_environment+set}" = set; then : - enableval=$enable_sim_environment; case "${enableval}" in - all | ALL) sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT";; - user | USER) sim_environment="-DWITH_ENVIRONMENT=USER_ENVIRONMENT";; - virtual | VIRTUAL) sim_environment="-DWITH_ENVIRONMENT=VIRTUAL_ENVIRONMENT";; - operating | OPERATING) sim_environment="-DWITH_ENVIRONMENT=OPERATING_ENVIRONMENT";; - *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-environment\"" "$LINENO" 5; - sim_environment="";; -esac -if test x"$silent" != x"yes" && test x"$sim_environment" != x""; then - echo "Setting sim environment = $sim_environment" 6>&1 -fi -else - sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT" -fi - - # Check whether --enable-werror was given. if test "${enable_werror+set}" = set; then : enableval=$enable_werror; case "${enableval}" in diff --git a/sim/microblaze/configure.ac b/sim/microblaze/configure.ac index 6d5622e266..a93418f932 100644 --- a/sim/microblaze/configure.ac +++ b/sim/microblaze/configure.ac @@ -7,7 +7,6 @@ SIM_AC_COMMON SIM_AC_OPTION_ENDIAN SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT,STRICT_ALIGNMENT) -SIM_AC_OPTION_ENVIRONMENT SIM_AC_OPTION_WARNINGS SIM_AC_OUTPUT diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog index 2de22d1e24..0cfc8d5ecd 100644 --- a/sim/mips/ChangeLog +++ b/sim/mips/ChangeLog @@ -8,6 +8,10 @@ 2016-01-10 Mike Frysinger <vapier@gentoo.org> + * configure: Regenerate. + +2016-01-10 Mike Frysinger <vapier@gentoo.org> + * configure.ac (SIM_AC_OPTION_SMP): Delete call. * configure: Regenerate. diff --git a/sim/mips/configure b/sim/mips/configure index 3e792d2bb5..9fa2866dee 100755 --- a/sim/mips/configure +++ b/sim/mips/configure @@ -766,6 +766,7 @@ enable_sim_stdio enable_sim_trace enable_sim_profile enable_sim_assert +enable_sim_environment enable_sim_inline with_pkgversion with_bugurl @@ -1428,6 +1429,9 @@ Optional Features: --enable-sim-profile=opts Enable profiling flags --enable-sim-assert Specify whether to perform random assertions + --enable-sim-environment=environment + Specify mixed, user, virtual or operating + environment --enable-sim-inline=inlines Specify which functions should be inlined --enable-sim-alignment=align @@ -12877,7 +12881,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12880 "configure" +#line 12884 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12983,7 +12987,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12986 "configure" +#line 12990 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13352,6 +13356,24 @@ else fi +# Check whether --enable-sim-environment was given. +if test "${enable_sim_environment+set}" = set; then : + enableval=$enable_sim_environment; case "${enableval}" in + all | ALL) sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT";; + user | USER) sim_environment="-DWITH_ENVIRONMENT=USER_ENVIRONMENT";; + virtual | VIRTUAL) sim_environment="-DWITH_ENVIRONMENT=VIRTUAL_ENVIRONMENT";; + operating | OPERATING) sim_environment="-DWITH_ENVIRONMENT=OPERATING_ENVIRONMENT";; + *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-environment\"" "$LINENO" 5; + sim_environment="";; +esac +if test x"$silent" != x"yes" && test x"$sim_environment" != x""; then + echo "Setting sim environment = $sim_environment" 6>&1 +fi +else + sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT" +fi + + sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. if test "${enable_sim_inline+set}" = set; then : diff --git a/sim/mn10300/ChangeLog b/sim/mn10300/ChangeLog index f8c3892128..bd37aef0cc 100644 --- a/sim/mn10300/ChangeLog +++ b/sim/mn10300/ChangeLog @@ -8,6 +8,10 @@ 2016-01-10 Mike Frysinger <vapier@gentoo.org> + * configure: Regenerate. + +2016-01-10 Mike Frysinger <vapier@gentoo.org> + * configure.ac (SIM_AC_OPTION_INLINE): Delete call. * configure: Regenerate. diff --git a/sim/mn10300/configure b/sim/mn10300/configure index a9baee692e..21e4cb318a 100755 --- a/sim/mn10300/configure +++ b/sim/mn10300/configure @@ -753,6 +753,7 @@ enable_sim_stdio enable_sim_trace enable_sim_profile enable_sim_assert +enable_sim_environment enable_sim_inline with_pkgversion with_bugurl @@ -1408,6 +1409,9 @@ Optional Features: --enable-sim-profile=opts Enable profiling flags --enable-sim-assert Specify whether to perform random assertions + --enable-sim-environment=environment + Specify mixed, user, virtual or operating + environment --enable-sim-inline=inlines Specify which functions should be inlined --enable-sim-endian=endian @@ -12853,7 +12857,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12856 "configure" +#line 12860 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12959,7 +12963,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12962 "configure" +#line 12966 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13328,6 +13332,24 @@ else fi +# Check whether --enable-sim-environment was given. +if test "${enable_sim_environment+set}" = set; then : + enableval=$enable_sim_environment; case "${enableval}" in + all | ALL) sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT";; + user | USER) sim_environment="-DWITH_ENVIRONMENT=USER_ENVIRONMENT";; + virtual | VIRTUAL) sim_environment="-DWITH_ENVIRONMENT=VIRTUAL_ENVIRONMENT";; + operating | OPERATING) sim_environment="-DWITH_ENVIRONMENT=OPERATING_ENVIRONMENT";; + *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-environment\"" "$LINENO" 5; + sim_environment="";; +esac +if test x"$silent" != x"yes" && test x"$sim_environment" != x""; then + echo "Setting sim environment = $sim_environment" 6>&1 +fi +else + sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT" +fi + + sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. if test "${enable_sim_inline+set}" = set; then : diff --git a/sim/moxie/ChangeLog b/sim/moxie/ChangeLog index 605c9c4e64..d1f57f998f 100644 --- a/sim/moxie/ChangeLog +++ b/sim/moxie/ChangeLog @@ -1,5 +1,10 @@ 2016-01-10 Mike Frysinger <vapier@gentoo.org> + * configure.ac (SIM_AC_OPTION_ENVIRONMENT): Delete call. + * configure: Regenerate. + +2016-01-10 Mike Frysinger <vapier@gentoo.org> + * configure: Regenerate. 2016-01-10 Mike Frysinger <vapier@gentoo.org> diff --git a/sim/moxie/configure b/sim/moxie/configure index 514ea4039b..b43cb53853 100755 --- a/sim/moxie/configure +++ b/sim/moxie/configure @@ -754,12 +754,12 @@ enable_sim_stdio enable_sim_trace enable_sim_profile enable_sim_assert +enable_sim_environment enable_sim_inline with_pkgversion with_bugurl enable_sim_endian enable_sim_alignment -enable_sim_environment enable_werror enable_build_warnings enable_sim_build_warnings @@ -1407,6 +1407,9 @@ Optional Features: --enable-sim-profile=opts Enable profiling flags --enable-sim-assert Specify whether to perform random assertions + --enable-sim-environment=environment + Specify mixed, user, virtual or operating + environment --enable-sim-inline=inlines Specify which functions should be inlined --enable-sim-endian=endian @@ -1414,9 +1417,6 @@ Optional Features: --enable-sim-alignment=align Specify strict, nonstrict or forced alignment of memory accesses - --enable-sim-environment=environment - Specify mixed, user, virtual or operating - environment --enable-werror treat compile warnings as errors --enable-build-warnings enable build-time compiler warnings if gcc is used --enable-sim-build-warnings @@ -13324,6 +13324,24 @@ else fi +# Check whether --enable-sim-environment was given. +if test "${enable_sim_environment+set}" = set; then : + enableval=$enable_sim_environment; case "${enableval}" in + all | ALL) sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT";; + user | USER) sim_environment="-DWITH_ENVIRONMENT=USER_ENVIRONMENT";; + virtual | VIRTUAL) sim_environment="-DWITH_ENVIRONMENT=VIRTUAL_ENVIRONMENT";; + operating | OPERATING) sim_environment="-DWITH_ENVIRONMENT=OPERATING_ENVIRONMENT";; + *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-environment\"" "$LINENO" 5; + sim_environment="";; +esac +if test x"$silent" != x"yes" && test x"$sim_environment" != x""; then + echo "Setting sim environment = $sim_environment" 6>&1 +fi +else + sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT" +fi + + sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. if test "${enable_sim_inline+set}" = set; then : @@ -13633,24 +13651,6 @@ fi fi -# Check whether --enable-sim-environment was given. -if test "${enable_sim_environment+set}" = set; then : - enableval=$enable_sim_environment; case "${enableval}" in - all | ALL) sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT";; - user | USER) sim_environment="-DWITH_ENVIRONMENT=USER_ENVIRONMENT";; - virtual | VIRTUAL) sim_environment="-DWITH_ENVIRONMENT=VIRTUAL_ENVIRONMENT";; - operating | OPERATING) sim_environment="-DWITH_ENVIRONMENT=OPERATING_ENVIRONMENT";; - *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-environment\"" "$LINENO" 5; - sim_environment="";; -esac -if test x"$silent" != x"yes" && test x"$sim_environment" != x""; then - echo "Setting sim environment = $sim_environment" 6>&1 -fi -else - sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT" -fi - - # Check whether --enable-werror was given. if test "${enable_werror+set}" = set; then : enableval=$enable_werror; case "${enableval}" in diff --git a/sim/moxie/configure.ac b/sim/moxie/configure.ac index d9302086a5..afbeef987d 100644 --- a/sim/moxie/configure.ac +++ b/sim/moxie/configure.ac @@ -9,7 +9,6 @@ AC_CHECK_TOOL(DTC, dtc) SIM_AC_OPTION_ENDIAN(BIG) SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT) -SIM_AC_OPTION_ENVIRONMENT SIM_AC_OPTION_WARNINGS SIM_AC_OUTPUT diff --git a/sim/msp430/ChangeLog b/sim/msp430/ChangeLog index 5d5e7ce5cd..277126f83c 100644 --- a/sim/msp430/ChangeLog +++ b/sim/msp430/ChangeLog @@ -8,6 +8,10 @@ 2016-01-10 Mike Frysinger <vapier@gentoo.org> + * configure: Regenerate. + +2016-01-10 Mike Frysinger <vapier@gentoo.org> + * configure.ac (SIM_AC_OPTION_INLINE): Delete call. * configure: Regenerate. diff --git a/sim/msp430/configure b/sim/msp430/configure index 5409bacd2e..5b62f557ec 100755 --- a/sim/msp430/configure +++ b/sim/msp430/configure @@ -753,6 +753,7 @@ enable_sim_stdio enable_sim_trace enable_sim_profile enable_sim_assert +enable_sim_environment enable_sim_inline with_pkgversion with_bugurl @@ -1405,6 +1406,9 @@ Optional Features: --enable-sim-profile=opts Enable profiling flags --enable-sim-assert Specify whether to perform random assertions + --enable-sim-environment=environment + Specify mixed, user, virtual or operating + environment --enable-sim-inline=inlines Specify which functions should be inlined --enable-sim-endian=endian @@ -12844,7 +12848,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12847 "configure" +#line 12851 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12950,7 +12954,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12953 "configure" +#line 12957 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13319,6 +13323,24 @@ else fi +# Check whether --enable-sim-environment was given. +if test "${enable_sim_environment+set}" = set; then : + enableval=$enable_sim_environment; case "${enableval}" in + all | ALL) sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT";; + user | USER) sim_environment="-DWITH_ENVIRONMENT=USER_ENVIRONMENT";; + virtual | VIRTUAL) sim_environment="-DWITH_ENVIRONMENT=VIRTUAL_ENVIRONMENT";; + operating | OPERATING) sim_environment="-DWITH_ENVIRONMENT=OPERATING_ENVIRONMENT";; + *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-environment\"" "$LINENO" 5; + sim_environment="";; +esac +if test x"$silent" != x"yes" && test x"$sim_environment" != x""; then + echo "Setting sim environment = $sim_environment" 6>&1 +fi +else + sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT" +fi + + sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. if test "${enable_sim_inline+set}" = set; then : diff --git a/sim/rl78/ChangeLog b/sim/rl78/ChangeLog index 6707b6c293..2f767255d0 100644 --- a/sim/rl78/ChangeLog +++ b/sim/rl78/ChangeLog @@ -18,6 +18,10 @@ * configure: Regenerate. +2016-01-10 Mike Frysinger <vapier@gentoo.org> + + * configure: Regenerate. + 2016-01-09 Mike Frysinger <vapier@gentoo.org> * config.in, configure: Regenerate. diff --git a/sim/rl78/configure b/sim/rl78/configure index 64e3f31999..86e5db83bf 100755 --- a/sim/rl78/configure +++ b/sim/rl78/configure @@ -753,6 +753,7 @@ enable_sim_stdio enable_sim_trace enable_sim_profile enable_sim_assert +enable_sim_environment enable_sim_inline with_pkgversion with_bugurl @@ -1400,6 +1401,9 @@ Optional Features: --enable-sim-profile=opts Enable profiling flags --enable-sim-assert Specify whether to perform random assertions + --enable-sim-environment=environment + Specify mixed, user, virtual or operating + environment --enable-sim-inline=inlines Specify which functions should be inlined @@ -12829,7 +12833,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12832 "configure" +#line 12836 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12935,7 +12939,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12938 "configure" +#line 12942 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13304,6 +13308,24 @@ else fi +# Check whether --enable-sim-environment was given. +if test "${enable_sim_environment+set}" = set; then : + enableval=$enable_sim_environment; case "${enableval}" in + all | ALL) sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT";; + user | USER) sim_environment="-DWITH_ENVIRONMENT=USER_ENVIRONMENT";; + virtual | VIRTUAL) sim_environment="-DWITH_ENVIRONMENT=VIRTUAL_ENVIRONMENT";; + operating | OPERATING) sim_environment="-DWITH_ENVIRONMENT=OPERATING_ENVIRONMENT";; + *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-environment\"" "$LINENO" 5; + sim_environment="";; +esac +if test x"$silent" != x"yes" && test x"$sim_environment" != x""; then + echo "Setting sim environment = $sim_environment" 6>&1 +fi +else + sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT" +fi + + sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. if test "${enable_sim_inline+set}" = set; then : diff --git a/sim/rx/ChangeLog b/sim/rx/ChangeLog index ecc5a3771c..461b4cc61c 100644 --- a/sim/rx/ChangeLog +++ b/sim/rx/ChangeLog @@ -18,6 +18,10 @@ * configure: Regenerate. +2016-01-10 Mike Frysinger <vapier@gentoo.org> + + * configure: Regenerate. + 2016-01-09 Mike Frysinger <vapier@gentoo.org> * config.in, configure: Regenerate. diff --git a/sim/rx/configure b/sim/rx/configure index c8767cf59c..0125ce71c9 100755 --- a/sim/rx/configure +++ b/sim/rx/configure @@ -753,6 +753,7 @@ enable_sim_stdio enable_sim_trace enable_sim_profile enable_sim_assert +enable_sim_environment enable_sim_inline with_pkgversion with_bugurl @@ -1402,6 +1403,9 @@ Optional Features: --enable-sim-profile=opts Enable profiling flags --enable-sim-assert Specify whether to perform random assertions + --enable-sim-environment=environment + Specify mixed, user, virtual or operating + environment --enable-sim-inline=inlines Specify which functions should be inlined --disable-cycle-accurate @@ -12834,7 +12838,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12837 "configure" +#line 12841 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12940,7 +12944,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12943 "configure" +#line 12947 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13309,6 +13313,24 @@ else fi +# Check whether --enable-sim-environment was given. +if test "${enable_sim_environment+set}" = set; then : + enableval=$enable_sim_environment; case "${enableval}" in + all | ALL) sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT";; + user | USER) sim_environment="-DWITH_ENVIRONMENT=USER_ENVIRONMENT";; + virtual | VIRTUAL) sim_environment="-DWITH_ENVIRONMENT=VIRTUAL_ENVIRONMENT";; + operating | OPERATING) sim_environment="-DWITH_ENVIRONMENT=OPERATING_ENVIRONMENT";; + *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-environment\"" "$LINENO" 5; + sim_environment="";; +esac +if test x"$silent" != x"yes" && test x"$sim_environment" != x""; then + echo "Setting sim environment = $sim_environment" 6>&1 +fi +else + sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT" +fi + + sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. if test "${enable_sim_inline+set}" = set; then : diff --git a/sim/sh/ChangeLog b/sim/sh/ChangeLog index d897ae0731..76b27751a0 100644 --- a/sim/sh/ChangeLog +++ b/sim/sh/ChangeLog @@ -1,5 +1,10 @@ 2016-01-10 Mike Frysinger <vapier@gentoo.org> + * configure.ac (SIM_AC_OPTION_ENVIRONMENT): Delete call. + * configure: Regenerate. + +2016-01-10 Mike Frysinger <vapier@gentoo.org> + * configure: Regenerate. 2016-01-10 Mike Frysinger <vapier@gentoo.org> diff --git a/sim/sh/configure b/sim/sh/configure index cf8a451ab2..b4e6c827c3 100755 --- a/sim/sh/configure +++ b/sim/sh/configure @@ -753,12 +753,12 @@ enable_sim_stdio enable_sim_trace enable_sim_profile enable_sim_assert +enable_sim_environment enable_sim_inline with_pkgversion with_bugurl enable_sim_endian enable_sim_alignment -enable_sim_environment enable_werror enable_build_warnings enable_sim_build_warnings @@ -1406,6 +1406,9 @@ Optional Features: --enable-sim-profile=opts Enable profiling flags --enable-sim-assert Specify whether to perform random assertions + --enable-sim-environment=environment + Specify mixed, user, virtual or operating + environment --enable-sim-inline=inlines Specify which functions should be inlined --enable-sim-endian=endian @@ -1413,9 +1416,6 @@ Optional Features: --enable-sim-alignment=align Specify strict, nonstrict or forced alignment of memory accesses - --enable-sim-environment=environment - Specify mixed, user, virtual or operating - environment --enable-werror treat compile warnings as errors --enable-build-warnings enable build-time compiler warnings if gcc is used --enable-sim-build-warnings @@ -13323,6 +13323,24 @@ else fi +# Check whether --enable-sim-environment was given. +if test "${enable_sim_environment+set}" = set; then : + enableval=$enable_sim_environment; case "${enableval}" in + all | ALL) sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT";; + user | USER) sim_environment="-DWITH_ENVIRONMENT=USER_ENVIRONMENT";; + virtual | VIRTUAL) sim_environment="-DWITH_ENVIRONMENT=VIRTUAL_ENVIRONMENT";; + operating | OPERATING) sim_environment="-DWITH_ENVIRONMENT=OPERATING_ENVIRONMENT";; + *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-environment\"" "$LINENO" 5; + sim_environment="";; +esac +if test x"$silent" != x"yes" && test x"$sim_environment" != x""; then + echo "Setting sim environment = $sim_environment" 6>&1 +fi +else + sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT" +fi + + sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. if test "${enable_sim_inline+set}" = set; then : @@ -13539,24 +13557,6 @@ fi fi -# Check whether --enable-sim-environment was given. -if test "${enable_sim_environment+set}" = set; then : - enableval=$enable_sim_environment; case "${enableval}" in - all | ALL) sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT";; - user | USER) sim_environment="-DWITH_ENVIRONMENT=USER_ENVIRONMENT";; - virtual | VIRTUAL) sim_environment="-DWITH_ENVIRONMENT=VIRTUAL_ENVIRONMENT";; - operating | OPERATING) sim_environment="-DWITH_ENVIRONMENT=OPERATING_ENVIRONMENT";; - *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-environment\"" "$LINENO" 5; - sim_environment="";; -esac -if test x"$silent" != x"yes" && test x"$sim_environment" != x""; then - echo "Setting sim environment = $sim_environment" 6>&1 -fi -else - sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT" -fi - - # Check whether --enable-werror was given. if test "${enable_werror+set}" = set; then : enableval=$enable_werror; case "${enableval}" in diff --git a/sim/sh/configure.ac b/sim/sh/configure.ac index 6d5622e266..a93418f932 100644 --- a/sim/sh/configure.ac +++ b/sim/sh/configure.ac @@ -7,7 +7,6 @@ SIM_AC_COMMON SIM_AC_OPTION_ENDIAN SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT,STRICT_ALIGNMENT) -SIM_AC_OPTION_ENVIRONMENT SIM_AC_OPTION_WARNINGS SIM_AC_OUTPUT diff --git a/sim/sh64/ChangeLog b/sim/sh64/ChangeLog index 0c47bec307..81cc8a300f 100644 --- a/sim/sh64/ChangeLog +++ b/sim/sh64/ChangeLog @@ -1,5 +1,10 @@ 2016-01-10 Mike Frysinger <vapier@gentoo.org> + * configure.ac (SIM_AC_OPTION_ENVIRONMENT): Delete call. + * configure: Regenerate. + +2016-01-10 Mike Frysinger <vapier@gentoo.org> + * configure: Regenerate. 2016-01-10 Mike Frysinger <vapier@gentoo.org> diff --git a/sim/sh64/configure b/sim/sh64/configure index 19d76f1ad8..88b92558ac 100755 --- a/sim/sh64/configure +++ b/sim/sh64/configure @@ -756,6 +756,7 @@ enable_sim_stdio enable_sim_trace enable_sim_profile enable_sim_assert +enable_sim_environment enable_sim_inline with_pkgversion with_bugurl @@ -763,7 +764,6 @@ enable_sim_endian enable_sim_alignment enable_sim_scache enable_sim_default_model -enable_sim_environment enable_cgen_maint enable_sim_hardware ' @@ -1410,6 +1410,9 @@ Optional Features: --enable-sim-profile=opts Enable profiling flags --enable-sim-assert Specify whether to perform random assertions + --enable-sim-environment=environment + Specify mixed, user, virtual or operating + environment --enable-sim-inline=inlines Specify which functions should be inlined --enable-sim-endian=endian @@ -1421,9 +1424,6 @@ Optional Features: Specify simulator execution cache size --enable-sim-default-model=model Specify default model to simulate - --enable-sim-environment=environment - Specify mixed, user, virtual or operating - environment --enable-cgen-maint=DIR build cgen generated files --enable-sim-hardware=LIST Specify the hardware to be included in the build. @@ -13329,6 +13329,24 @@ else fi +# Check whether --enable-sim-environment was given. +if test "${enable_sim_environment+set}" = set; then : + enableval=$enable_sim_environment; case "${enableval}" in + all | ALL) sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT";; + user | USER) sim_environment="-DWITH_ENVIRONMENT=USER_ENVIRONMENT";; + virtual | VIRTUAL) sim_environment="-DWITH_ENVIRONMENT=VIRTUAL_ENVIRONMENT";; + operating | OPERATING) sim_environment="-DWITH_ENVIRONMENT=OPERATING_ENVIRONMENT";; + *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-environment\"" "$LINENO" 5; + sim_environment="";; +esac +if test x"$silent" != x"yes" && test x"$sim_environment" != x""; then + echo "Setting sim environment = $sim_environment" 6>&1 +fi +else + sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT" +fi + + sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. if test "${enable_sim_inline+set}" = set; then : @@ -13580,24 +13598,6 @@ fi -# Check whether --enable-sim-environment was given. -if test "${enable_sim_environment+set}" = set; then : - enableval=$enable_sim_environment; case "${enableval}" in - all | ALL) sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT";; - user | USER) sim_environment="-DWITH_ENVIRONMENT=USER_ENVIRONMENT";; - virtual | VIRTUAL) sim_environment="-DWITH_ENVIRONMENT=VIRTUAL_ENVIRONMENT";; - operating | OPERATING) sim_environment="-DWITH_ENVIRONMENT=OPERATING_ENVIRONMENT";; - *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-environment\"" "$LINENO" 5; - sim_environment="";; -esac -if test x"$silent" != x"yes" && test x"$sim_environment" != x""; then - echo "Setting sim environment = $sim_environment" 6>&1 -fi -else - sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT" -fi - - cgen_maint=no cgen=guile cgendir='$(srcdir)/../../cgen' diff --git a/sim/sh64/configure.ac b/sim/sh64/configure.ac index 818af1299e..04bcd56364 100644 --- a/sim/sh64/configure.ac +++ b/sim/sh64/configure.ac @@ -9,7 +9,6 @@ SIM_AC_OPTION_ENDIAN([], BIG) SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT) SIM_AC_OPTION_SCACHE(16384) SIM_AC_OPTION_DEFAULT_MODEL(sh5) -SIM_AC_OPTION_ENVIRONMENT SIM_AC_OPTION_CGEN_MAINT SIM_AC_OPTION_HARDWARE(yes,"","") diff --git a/sim/v850/ChangeLog b/sim/v850/ChangeLog index 35c4108964..47ae8758ea 100644 --- a/sim/v850/ChangeLog +++ b/sim/v850/ChangeLog @@ -18,6 +18,10 @@ * configure: Regenerate. +2016-01-10 Mike Frysinger <vapier@gentoo.org> + + * configure: Regenerate. + 2016-01-09 Mike Frysinger <vapier@gentoo.org> * config.in, configure: Regenerate. diff --git a/sim/v850/configure b/sim/v850/configure index 66d6962780..a4881fde66 100755 --- a/sim/v850/configure +++ b/sim/v850/configure @@ -753,6 +753,7 @@ enable_sim_stdio enable_sim_trace enable_sim_profile enable_sim_assert +enable_sim_environment enable_sim_inline with_pkgversion with_bugurl @@ -1407,6 +1408,9 @@ Optional Features: --enable-sim-profile=opts Enable profiling flags --enable-sim-assert Specify whether to perform random assertions + --enable-sim-environment=environment + Specify mixed, user, virtual or operating + environment --enable-sim-inline=inlines Specify which functions should be inlined --enable-sim-endian=endian @@ -12850,7 +12854,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12853 "configure" +#line 12857 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12956,7 +12960,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12959 "configure" +#line 12963 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13325,6 +13329,24 @@ else fi +# Check whether --enable-sim-environment was given. +if test "${enable_sim_environment+set}" = set; then : + enableval=$enable_sim_environment; case "${enableval}" in + all | ALL) sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT";; + user | USER) sim_environment="-DWITH_ENVIRONMENT=USER_ENVIRONMENT";; + virtual | VIRTUAL) sim_environment="-DWITH_ENVIRONMENT=VIRTUAL_ENVIRONMENT";; + operating | OPERATING) sim_environment="-DWITH_ENVIRONMENT=OPERATING_ENVIRONMENT";; + *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-environment\"" "$LINENO" 5; + sim_environment="";; +esac +if test x"$silent" != x"yes" && test x"$sim_environment" != x""; then + echo "Setting sim environment = $sim_environment" 6>&1 +fi +else + sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT" +fi + + sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. if test "${enable_sim_inline+set}" = set; then : |