From 16f7876d71604f835aefe48f0bf230c028c05d99 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 10 Jan 2016 16:52:25 -0500 Subject: 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. --- sim/microblaze/ChangeLog | 5 +++++ sim/microblaze/configure | 44 ++++++++++++++++++++++---------------------- sim/microblaze/configure.ac | 1 - 3 files changed, 27 insertions(+), 23 deletions(-) (limited to 'sim/microblaze') diff --git a/sim/microblaze/ChangeLog b/sim/microblaze/ChangeLog index f9c6ad4..4af462b 100644 --- a/sim/microblaze/ChangeLog +++ b/sim/microblaze/ChangeLog @@ -1,5 +1,10 @@ 2016-01-10 Mike Frysinger + * configure.ac (SIM_AC_OPTION_ENVIRONMENT): Delete call. + * configure: Regenerate. + +2016-01-10 Mike Frysinger + * configure: Regenerate. 2016-01-10 Mike Frysinger diff --git a/sim/microblaze/configure b/sim/microblaze/configure index cf8a451..b4e6c82 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 6d5622e..a93418f 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 -- cgit v1.1