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/cris | |
| parent | 35656e95217a20309c0a0f16bf0c89a49a549177 (diff) | |
| download | fsf-binutils-gdb-16f7876d71604f835aefe48f0bf230c028c05d99.zip fsf-binutils-gdb-16f7876d71604f835aefe48f0bf230c028c05d99.tar.gz fsf-binutils-gdb-16f7876d71604f835aefe48f0bf230c028c05d99.tar.bz2 | |
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/cris')
| -rw-r--r-- | sim/cris/ChangeLog | 5 | ||||
| -rwxr-xr-x | sim/cris/configure | 44 | ||||
| -rw-r--r-- | sim/cris/configure.ac | 1 |
3 files changed, 27 insertions, 23 deletions
diff --git a/sim/cris/ChangeLog b/sim/cris/ChangeLog index 2583d8b..e3f4b6d 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 7b5d765..e63e0f6 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 4e9455a..beae702 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 |