diff options
Diffstat (limited to 'sim/avr')
| -rw-r--r-- | sim/avr/ChangeLog | 5 | ||||
| -rwxr-xr-x | sim/avr/configure | 44 | ||||
| -rw-r--r-- | sim/avr/configure.ac | 1 |
3 files changed, 27 insertions, 23 deletions
diff --git a/sim/avr/ChangeLog b/sim/avr/ChangeLog index 3ba38f3..df93df5 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 eda7aab..b43b3ed 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 184ccb5..54ac06f 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 |