diff options
Diffstat (limited to 'sim/sh64')
| -rw-r--r-- | sim/sh64/ChangeLog | 5 | ||||
| -rwxr-xr-x | sim/sh64/configure | 44 | ||||
| -rw-r--r-- | sim/sh64/configure.ac | 1 |
3 files changed, 27 insertions, 23 deletions
diff --git a/sim/sh64/ChangeLog b/sim/sh64/ChangeLog index 0c47bec..81cc8a3 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 19d76f1..88b9255 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 818af12..04bcd56 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,"","") |