diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2016-01-09 04:09:35 -0500 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2016-01-10 18:54:41 -0500 |
| commit | ce39bd389039d99458950b072550ab52f0a07a34 (patch) | |
| tree | 2bd4218fe7cc847322b73d613065a6825e49bcda | |
| parent | e19418e02e25ae4c62eb95547220897fa6aaf2e0 (diff) | |
| download | gdb-ce39bd389039d99458950b072550ab52f0a07a34.zip gdb-ce39bd389039d99458950b072550ab52f0a07a34.tar.gz gdb-ce39bd389039d99458950b072550ab52f0a07a34.tar.bz2 | |
sim: move many common settings from CPPFLAGS to config.h
Rather than stuffing the command line with a bunch of -D flags, start
moving things to config.h which is managed by autoheader. This makes
the makefile a bit simpler and the build output tighter, and it makes
the migration to automake easier as there are fewer vars to juggle.
We'll want to move the other options out too, but it'll take more work.
96 files changed, 3571 insertions, 2107 deletions
diff --git a/sim/aarch64/ChangeLog b/sim/aarch64/ChangeLog index 5cac849..115b528 100644 --- a/sim/aarch64/ChangeLog +++ b/sim/aarch64/ChangeLog @@ -1,5 +1,9 @@ 2016-01-10 Mike Frysinger <vapier@gentoo.org> + * config.in, 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/config.in b/sim/aarch64/config.in index f24eb3b..aa3e45c 100644 --- a/sim/aarch64/config.in +++ b/sim/aarch64/config.in @@ -3,6 +3,9 @@ /* Define if building universal (internal helper macro) */ #undef AC_APPLE_UNIVERSAL_BUILD +/* Sim debug setting */ +#undef DEBUG + /* Define to 1 if translation of program messages to the user's native language is requested. */ #undef ENABLE_NLS @@ -170,6 +173,9 @@ /* Additional package description */ #undef PKGVERSION +/* Sim profile settings */ +#undef PROFILE + /* Bug reporting address */ #undef REPORT_BUGS_TO @@ -201,6 +207,24 @@ #endif +/* Sim assert settings */ +#undef WITH_ASSERT + +/* Sim debug setting */ +#undef WITH_DEBUG + +/* Sim default environment */ +#undef WITH_ENVIRONMENT + +/* Sim profile settings */ +#undef WITH_PROFILE + +/* How to route I/O */ +#undef WITH_STDIO + +/* Sim trace settings */ +#undef WITH_TRACE + /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ #if defined AC_APPLE_UNIVERSAL_BUILD diff --git a/sim/aarch64/configure b/sim/aarch64/configure index 70ca0d5..fa4cf92 100755 --- a/sim/aarch64/configure +++ b/sim/aarch64/configure @@ -604,10 +604,6 @@ cgen_breaks REPORT_BUGS_TEXI REPORT_BUGS_TO PKGVERSION -sim_profile -sim_trace -sim_stdio -sim_debug MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -682,8 +678,6 @@ CFLAGS CC WERROR_CFLAGS WARN_CFLAGS -sim_xor_endian -sim_smp sim_reserved_bits sim_inline sim_hw @@ -694,9 +688,7 @@ sim_scache sim_float sim_endian sim_bitsize -sim_assert sim_alignment -sim_environment target_alias host_alias build_alias @@ -4032,10 +4024,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - # intl sister-directory configuration rules. # @@ -12843,7 +12831,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12846 "configure" +#line 12834 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12949,7 +12937,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12952 "configure" +#line 12940 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13217,124 +13205,164 @@ fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim debug setting" >&5 +$as_echo_n "checking for sim debug setting... " >&6; } +sim_debug="0" # Check whether --enable-sim-debug was given. if test "${enable_sim_debug+set}" = set; then : enableval=$enable_sim_debug; case "${enableval}" in - yes) sim_debug="-DDEBUG=7 -DWITH_DEBUG=7";; - no) sim_debug="-DDEBUG=0 -DWITH_DEBUG=0";; - *) sim_debug="-DDEBUG='(${enableval})' -DWITH_DEBUG='(${enableval})'";; + yes) sim_debug="7";; + no) sim_debug="0";; + *) sim_debug="($enableval)";; esac -if test x"$silent" != x"yes" && test x"$sim_debug" != x""; then - echo "Setting sim debug = $sim_debug" 6>&1 fi -else - sim_debug="" +if test "$sim_debug" != "0"; then + +cat >>confdefs.h <<_ACEOF +#define DEBUG $sim_debug +_ACEOF + fi +cat >>confdefs.h <<_ACEOF +#define WITH_DEBUG $sim_debug +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_debug" >&5 +$as_echo "$sim_debug" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim stdio debug behavior" >&5 +$as_echo_n "checking for sim stdio debug behavior... " >&6; } +sim_stdio="0" # Check whether --enable-sim-stdio was given. if test "${enable_sim_stdio+set}" = set; then : enableval=$enable_sim_stdio; case "${enableval}" in - yes) sim_stdio="-DWITH_STDIO=DO_USE_STDIO";; - no) sim_stdio="-DWITH_STDIO=DONT_USE_STDIO";; - *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-stdio\"" "$LINENO" 5; sim_stdio="";; + yes) sim_stdio="DO_USE_STDIO";; + no) sim_stdio="DONT_USE_STDIO";; + *) as_fn_error "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_stdio" != x""; then - echo "Setting stdio flags = $sim_stdio" 6>&1 -fi -else - sim_stdio="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_STDIO $sim_stdio +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_stdio" >&5 +$as_echo "$sim_stdio" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim trace settings" >&5 +$as_echo_n "checking for sim trace settings... " >&6; } +sim_trace="~TRACE_debug" # Check whether --enable-sim-trace was given. if test "${enable_sim_trace+set}" = set; then : enableval=$enable_sim_trace; case "${enableval}" in - yes) sim_trace="-DWITH_TRACE=-1";; - no) sim_trace="-DWITH_TRACE=0";; + yes) sim_trace="-1";; + no) sim_trace="0";; [-0-9]*) - sim_trace="-DWITH_TRACE='(${enableval})'";; + sim_trace="'(${enableval})'";; [[:lower:]]*) sim_trace="" for x in `echo "$enableval" | sed -e "s/,/ /g"`; do if test x"$sim_trace" = x; then - sim_trace="-DWITH_TRACE='(TRACE_$x" + sim_trace="(TRACE_$x" else sim_trace="${sim_trace}|TRACE_$x" fi done - sim_trace="$sim_trace)'" ;; + sim_trace="$sim_trace)" ;; esac -if test x"$silent" != x"yes" && test x"$sim_trace" != x""; then - echo "Setting sim trace = $sim_trace" 6>&1 -fi -else - sim_trace="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_TRACE $sim_trace +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_trace" >&5 +$as_echo "$sim_trace" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim profile settings" >&5 +$as_echo_n "checking for sim profile settings... " >&6; } +profile="1" +sim_profile="-1" # Check whether --enable-sim-profile was given. if test "${enable_sim_profile+set}" = set; then : enableval=$enable_sim_profile; case "${enableval}" in - yes) sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1";; - no) sim_profile="-DPROFILE=0 -DWITH_PROFILE=0";; + yes) profile="1" sim_profile="-1";; + no) profile="0" sim_profile="0";; [-0-9]*) - sim_profile="-DPROFILE='(${enableval})' -DWITH_PROFILE='(${enableval})'";; + profile="(${enableval})" sim_profile="(${enableval})";; [a-z]*) + profile="1" sim_profile="" for x in `echo "$enableval" | sed -e "s/,/ /g"`; do if test x"$sim_profile" = x; then - sim_profile="-DWITH_PROFILE='(PROFILE_$x" + sim_profile="(PROFILE_$x" else sim_profile="${sim_profile}|PROFILE_$x" fi done - sim_profile="$sim_profile)'" ;; + sim_profile="$sim_profile)" ;; esac -if test x"$silent" != x"yes" && test x"$sim_profile" != x""; then - echo "Setting sim profile = $sim_profile" 6>&1 -fi -else - sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1" fi +cat >>confdefs.h <<_ACEOF +#define PROFILE $profile +_ACEOF +cat >>confdefs.h <<_ACEOF +#define WITH_PROFILE $sim_profile +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_profile" >&5 +$as_echo "$sim_profile" >&6; } + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable sim asserts" >&5 +$as_echo_n "checking whether to enable sim asserts... " >&6; } +sim_assert="1" # Check whether --enable-sim-assert was given. if test "${enable_sim_assert+set}" = set; then : enableval=$enable_sim_assert; case "${enableval}" in - yes) sim_assert="-DWITH_ASSERT=1";; - no) sim_assert="-DWITH_ASSERT=0";; - *) as_fn_error "\"--enable-sim-assert does not take a value\"" "$LINENO" 5; sim_assert="";; + yes) sim_assert="1";; + no) sim_assert="0";; + *) as_fn_error "--enable-sim-assert does not take a value" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_assert" != x""; then - echo "Setting assert flags = $sim_assert" 6>&1 -fi -else - sim_assert="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_ASSERT $sim_assert +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_assert" >&5 +$as_echo "$sim_assert" >&6; } + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking default sim environment setting" >&5 +$as_echo_n "checking default sim environment setting... " >&6; } +sim_environment="ALL_ENVIRONMENT" # 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="";; + all | ALL) sim_environment="ALL_ENVIRONMENT";; + user | USER) sim_environment="USER_ENVIRONMENT";; + virtual | VIRTUAL) sim_environment="VIRTUAL_ENVIRONMENT";; + operating | OPERATING) sim_environment="OPERATING_ENVIRONMENT";; + *) as_fn_error "Unknown value $enableval passed to --enable-sim-environment" "$LINENO" 5;; 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 +cat >>confdefs.h <<_ACEOF +#define WITH_ENVIRONMENT $sim_environment +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_environment" >&5 +$as_echo "$sim_environment" >&6; } + sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog index 1e99d0c..cae6f52 100644 --- a/sim/arm/ChangeLog +++ b/sim/arm/ChangeLog @@ -1,5 +1,9 @@ 2016-01-10 Mike Frysinger <vapier@gentoo.org> + * config.in, 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/config.in b/sim/arm/config.in index f24eb3b..aa3e45c 100644 --- a/sim/arm/config.in +++ b/sim/arm/config.in @@ -3,6 +3,9 @@ /* Define if building universal (internal helper macro) */ #undef AC_APPLE_UNIVERSAL_BUILD +/* Sim debug setting */ +#undef DEBUG + /* Define to 1 if translation of program messages to the user's native language is requested. */ #undef ENABLE_NLS @@ -170,6 +173,9 @@ /* Additional package description */ #undef PKGVERSION +/* Sim profile settings */ +#undef PROFILE + /* Bug reporting address */ #undef REPORT_BUGS_TO @@ -201,6 +207,24 @@ #endif +/* Sim assert settings */ +#undef WITH_ASSERT + +/* Sim debug setting */ +#undef WITH_DEBUG + +/* Sim default environment */ +#undef WITH_ENVIRONMENT + +/* Sim profile settings */ +#undef WITH_PROFILE + +/* How to route I/O */ +#undef WITH_STDIO + +/* Sim trace settings */ +#undef WITH_TRACE + /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ #if defined AC_APPLE_UNIVERSAL_BUILD diff --git a/sim/arm/configure b/sim/arm/configure index c16d784..e177055 100755 --- a/sim/arm/configure +++ b/sim/arm/configure @@ -604,10 +604,6 @@ cgen_breaks REPORT_BUGS_TEXI REPORT_BUGS_TO PKGVERSION -sim_profile -sim_trace -sim_stdio -sim_debug MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -682,8 +678,6 @@ CFLAGS CC WERROR_CFLAGS WARN_CFLAGS -sim_xor_endian -sim_smp sim_reserved_bits sim_inline sim_hw @@ -694,9 +688,7 @@ sim_scache sim_float sim_endian sim_bitsize -sim_assert sim_alignment -sim_environment target_alias host_alias build_alias @@ -4032,10 +4024,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - # intl sister-directory configuration rules. # @@ -12843,7 +12831,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12846 "configure" +#line 12834 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12949,7 +12937,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12952 "configure" +#line 12940 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13217,124 +13205,164 @@ fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim debug setting" >&5 +$as_echo_n "checking for sim debug setting... " >&6; } +sim_debug="0" # Check whether --enable-sim-debug was given. if test "${enable_sim_debug+set}" = set; then : enableval=$enable_sim_debug; case "${enableval}" in - yes) sim_debug="-DDEBUG=7 -DWITH_DEBUG=7";; - no) sim_debug="-DDEBUG=0 -DWITH_DEBUG=0";; - *) sim_debug="-DDEBUG='(${enableval})' -DWITH_DEBUG='(${enableval})'";; + yes) sim_debug="7";; + no) sim_debug="0";; + *) sim_debug="($enableval)";; esac -if test x"$silent" != x"yes" && test x"$sim_debug" != x""; then - echo "Setting sim debug = $sim_debug" 6>&1 fi -else - sim_debug="" +if test "$sim_debug" != "0"; then + +cat >>confdefs.h <<_ACEOF +#define DEBUG $sim_debug +_ACEOF + fi +cat >>confdefs.h <<_ACEOF +#define WITH_DEBUG $sim_debug +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_debug" >&5 +$as_echo "$sim_debug" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim stdio debug behavior" >&5 +$as_echo_n "checking for sim stdio debug behavior... " >&6; } +sim_stdio="0" # Check whether --enable-sim-stdio was given. if test "${enable_sim_stdio+set}" = set; then : enableval=$enable_sim_stdio; case "${enableval}" in - yes) sim_stdio="-DWITH_STDIO=DO_USE_STDIO";; - no) sim_stdio="-DWITH_STDIO=DONT_USE_STDIO";; - *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-stdio\"" "$LINENO" 5; sim_stdio="";; + yes) sim_stdio="DO_USE_STDIO";; + no) sim_stdio="DONT_USE_STDIO";; + *) as_fn_error "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_stdio" != x""; then - echo "Setting stdio flags = $sim_stdio" 6>&1 -fi -else - sim_stdio="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_STDIO $sim_stdio +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_stdio" >&5 +$as_echo "$sim_stdio" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim trace settings" >&5 +$as_echo_n "checking for sim trace settings... " >&6; } +sim_trace="~TRACE_debug" # Check whether --enable-sim-trace was given. if test "${enable_sim_trace+set}" = set; then : enableval=$enable_sim_trace; case "${enableval}" in - yes) sim_trace="-DWITH_TRACE=-1";; - no) sim_trace="-DWITH_TRACE=0";; + yes) sim_trace="-1";; + no) sim_trace="0";; [-0-9]*) - sim_trace="-DWITH_TRACE='(${enableval})'";; + sim_trace="'(${enableval})'";; [[:lower:]]*) sim_trace="" for x in `echo "$enableval" | sed -e "s/,/ /g"`; do if test x"$sim_trace" = x; then - sim_trace="-DWITH_TRACE='(TRACE_$x" + sim_trace="(TRACE_$x" else sim_trace="${sim_trace}|TRACE_$x" fi done - sim_trace="$sim_trace)'" ;; + sim_trace="$sim_trace)" ;; esac -if test x"$silent" != x"yes" && test x"$sim_trace" != x""; then - echo "Setting sim trace = $sim_trace" 6>&1 -fi -else - sim_trace="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_TRACE $sim_trace +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_trace" >&5 +$as_echo "$sim_trace" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim profile settings" >&5 +$as_echo_n "checking for sim profile settings... " >&6; } +profile="1" +sim_profile="-1" # Check whether --enable-sim-profile was given. if test "${enable_sim_profile+set}" = set; then : enableval=$enable_sim_profile; case "${enableval}" in - yes) sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1";; - no) sim_profile="-DPROFILE=0 -DWITH_PROFILE=0";; + yes) profile="1" sim_profile="-1";; + no) profile="0" sim_profile="0";; [-0-9]*) - sim_profile="-DPROFILE='(${enableval})' -DWITH_PROFILE='(${enableval})'";; + profile="(${enableval})" sim_profile="(${enableval})";; [a-z]*) + profile="1" sim_profile="" for x in `echo "$enableval" | sed -e "s/,/ /g"`; do if test x"$sim_profile" = x; then - sim_profile="-DWITH_PROFILE='(PROFILE_$x" + sim_profile="(PROFILE_$x" else sim_profile="${sim_profile}|PROFILE_$x" fi done - sim_profile="$sim_profile)'" ;; + sim_profile="$sim_profile)" ;; esac -if test x"$silent" != x"yes" && test x"$sim_profile" != x""; then - echo "Setting sim profile = $sim_profile" 6>&1 -fi -else - sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1" fi +cat >>confdefs.h <<_ACEOF +#define PROFILE $profile +_ACEOF +cat >>confdefs.h <<_ACEOF +#define WITH_PROFILE $sim_profile +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_profile" >&5 +$as_echo "$sim_profile" >&6; } + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable sim asserts" >&5 +$as_echo_n "checking whether to enable sim asserts... " >&6; } +sim_assert="1" # Check whether --enable-sim-assert was given. if test "${enable_sim_assert+set}" = set; then : enableval=$enable_sim_assert; case "${enableval}" in - yes) sim_assert="-DWITH_ASSERT=1";; - no) sim_assert="-DWITH_ASSERT=0";; - *) as_fn_error "\"--enable-sim-assert does not take a value\"" "$LINENO" 5; sim_assert="";; + yes) sim_assert="1";; + no) sim_assert="0";; + *) as_fn_error "--enable-sim-assert does not take a value" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_assert" != x""; then - echo "Setting assert flags = $sim_assert" 6>&1 -fi -else - sim_assert="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_ASSERT $sim_assert +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_assert" >&5 +$as_echo "$sim_assert" >&6; } + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking default sim environment setting" >&5 +$as_echo_n "checking default sim environment setting... " >&6; } +sim_environment="ALL_ENVIRONMENT" # 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="";; + all | ALL) sim_environment="ALL_ENVIRONMENT";; + user | USER) sim_environment="USER_ENVIRONMENT";; + virtual | VIRTUAL) sim_environment="VIRTUAL_ENVIRONMENT";; + operating | OPERATING) sim_environment="OPERATING_ENVIRONMENT";; + *) as_fn_error "Unknown value $enableval passed to --enable-sim-environment" "$LINENO" 5;; 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 +cat >>confdefs.h <<_ACEOF +#define WITH_ENVIRONMENT $sim_environment +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_environment" >&5 +$as_echo "$sim_environment" >&6; } + sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. diff --git a/sim/avr/ChangeLog b/sim/avr/ChangeLog index e47993e..9cdc039 100644 --- a/sim/avr/ChangeLog +++ b/sim/avr/ChangeLog @@ -1,5 +1,9 @@ 2016-01-10 Mike Frysinger <vapier@gentoo.org> + * config.in, 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/config.in b/sim/avr/config.in index f24eb3b..aa3e45c 100644 --- a/sim/avr/config.in +++ b/sim/avr/config.in @@ -3,6 +3,9 @@ /* Define if building universal (internal helper macro) */ #undef AC_APPLE_UNIVERSAL_BUILD +/* Sim debug setting */ +#undef DEBUG + /* Define to 1 if translation of program messages to the user's native language is requested. */ #undef ENABLE_NLS @@ -170,6 +173,9 @@ /* Additional package description */ #undef PKGVERSION +/* Sim profile settings */ +#undef PROFILE + /* Bug reporting address */ #undef REPORT_BUGS_TO @@ -201,6 +207,24 @@ #endif +/* Sim assert settings */ +#undef WITH_ASSERT + +/* Sim debug setting */ +#undef WITH_DEBUG + +/* Sim default environment */ +#undef WITH_ENVIRONMENT + +/* Sim profile settings */ +#undef WITH_PROFILE + +/* How to route I/O */ +#undef WITH_STDIO + +/* Sim trace settings */ +#undef WITH_TRACE + /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ #if defined AC_APPLE_UNIVERSAL_BUILD diff --git a/sim/avr/configure b/sim/avr/configure index 37f2d4c..1aa87b1 100755 --- a/sim/avr/configure +++ b/sim/avr/configure @@ -604,10 +604,6 @@ cgen_breaks REPORT_BUGS_TEXI REPORT_BUGS_TO PKGVERSION -sim_profile -sim_trace -sim_stdio -sim_debug MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -682,8 +678,6 @@ CFLAGS CC WERROR_CFLAGS WARN_CFLAGS -sim_xor_endian -sim_smp sim_reserved_bits sim_inline sim_hw @@ -694,9 +688,7 @@ sim_scache sim_float sim_endian sim_bitsize -sim_assert sim_alignment -sim_environment target_alias host_alias build_alias @@ -4032,10 +4024,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - # intl sister-directory configuration rules. # @@ -12843,7 +12831,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12846 "configure" +#line 12834 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12949,7 +12937,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12952 "configure" +#line 12940 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13217,124 +13205,164 @@ fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim debug setting" >&5 +$as_echo_n "checking for sim debug setting... " >&6; } +sim_debug="0" # Check whether --enable-sim-debug was given. if test "${enable_sim_debug+set}" = set; then : enableval=$enable_sim_debug; case "${enableval}" in - yes) sim_debug="-DDEBUG=7 -DWITH_DEBUG=7";; - no) sim_debug="-DDEBUG=0 -DWITH_DEBUG=0";; - *) sim_debug="-DDEBUG='(${enableval})' -DWITH_DEBUG='(${enableval})'";; + yes) sim_debug="7";; + no) sim_debug="0";; + *) sim_debug="($enableval)";; esac -if test x"$silent" != x"yes" && test x"$sim_debug" != x""; then - echo "Setting sim debug = $sim_debug" 6>&1 fi -else - sim_debug="" +if test "$sim_debug" != "0"; then + +cat >>confdefs.h <<_ACEOF +#define DEBUG $sim_debug +_ACEOF + fi +cat >>confdefs.h <<_ACEOF +#define WITH_DEBUG $sim_debug +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_debug" >&5 +$as_echo "$sim_debug" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim stdio debug behavior" >&5 +$as_echo_n "checking for sim stdio debug behavior... " >&6; } +sim_stdio="0" # Check whether --enable-sim-stdio was given. if test "${enable_sim_stdio+set}" = set; then : enableval=$enable_sim_stdio; case "${enableval}" in - yes) sim_stdio="-DWITH_STDIO=DO_USE_STDIO";; - no) sim_stdio="-DWITH_STDIO=DONT_USE_STDIO";; - *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-stdio\"" "$LINENO" 5; sim_stdio="";; + yes) sim_stdio="DO_USE_STDIO";; + no) sim_stdio="DONT_USE_STDIO";; + *) as_fn_error "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_stdio" != x""; then - echo "Setting stdio flags = $sim_stdio" 6>&1 -fi -else - sim_stdio="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_STDIO $sim_stdio +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_stdio" >&5 +$as_echo "$sim_stdio" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim trace settings" >&5 +$as_echo_n "checking for sim trace settings... " >&6; } +sim_trace="~TRACE_debug" # Check whether --enable-sim-trace was given. if test "${enable_sim_trace+set}" = set; then : enableval=$enable_sim_trace; case "${enableval}" in - yes) sim_trace="-DWITH_TRACE=-1";; - no) sim_trace="-DWITH_TRACE=0";; + yes) sim_trace="-1";; + no) sim_trace="0";; [-0-9]*) - sim_trace="-DWITH_TRACE='(${enableval})'";; + sim_trace="'(${enableval})'";; [[:lower:]]*) sim_trace="" for x in `echo "$enableval" | sed -e "s/,/ /g"`; do if test x"$sim_trace" = x; then - sim_trace="-DWITH_TRACE='(TRACE_$x" + sim_trace="(TRACE_$x" else sim_trace="${sim_trace}|TRACE_$x" fi done - sim_trace="$sim_trace)'" ;; + sim_trace="$sim_trace)" ;; esac -if test x"$silent" != x"yes" && test x"$sim_trace" != x""; then - echo "Setting sim trace = $sim_trace" 6>&1 -fi -else - sim_trace="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_TRACE $sim_trace +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_trace" >&5 +$as_echo "$sim_trace" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim profile settings" >&5 +$as_echo_n "checking for sim profile settings... " >&6; } +profile="1" +sim_profile="-1" # Check whether --enable-sim-profile was given. if test "${enable_sim_profile+set}" = set; then : enableval=$enable_sim_profile; case "${enableval}" in - yes) sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1";; - no) sim_profile="-DPROFILE=0 -DWITH_PROFILE=0";; + yes) profile="1" sim_profile="-1";; + no) profile="0" sim_profile="0";; [-0-9]*) - sim_profile="-DPROFILE='(${enableval})' -DWITH_PROFILE='(${enableval})'";; + profile="(${enableval})" sim_profile="(${enableval})";; [a-z]*) + profile="1" sim_profile="" for x in `echo "$enableval" | sed -e "s/,/ /g"`; do if test x"$sim_profile" = x; then - sim_profile="-DWITH_PROFILE='(PROFILE_$x" + sim_profile="(PROFILE_$x" else sim_profile="${sim_profile}|PROFILE_$x" fi done - sim_profile="$sim_profile)'" ;; + sim_profile="$sim_profile)" ;; esac -if test x"$silent" != x"yes" && test x"$sim_profile" != x""; then - echo "Setting sim profile = $sim_profile" 6>&1 -fi -else - sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1" fi +cat >>confdefs.h <<_ACEOF +#define PROFILE $profile +_ACEOF +cat >>confdefs.h <<_ACEOF +#define WITH_PROFILE $sim_profile +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_profile" >&5 +$as_echo "$sim_profile" >&6; } + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable sim asserts" >&5 +$as_echo_n "checking whether to enable sim asserts... " >&6; } +sim_assert="1" # Check whether --enable-sim-assert was given. if test "${enable_sim_assert+set}" = set; then : enableval=$enable_sim_assert; case "${enableval}" in - yes) sim_assert="-DWITH_ASSERT=1";; - no) sim_assert="-DWITH_ASSERT=0";; - *) as_fn_error "\"--enable-sim-assert does not take a value\"" "$LINENO" 5; sim_assert="";; + yes) sim_assert="1";; + no) sim_assert="0";; + *) as_fn_error "--enable-sim-assert does not take a value" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_assert" != x""; then - echo "Setting assert flags = $sim_assert" 6>&1 -fi -else - sim_assert="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_ASSERT $sim_assert +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_assert" >&5 +$as_echo "$sim_assert" >&6; } + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking default sim environment setting" >&5 +$as_echo_n "checking default sim environment setting... " >&6; } +sim_environment="ALL_ENVIRONMENT" # 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="";; + all | ALL) sim_environment="ALL_ENVIRONMENT";; + user | USER) sim_environment="USER_ENVIRONMENT";; + virtual | VIRTUAL) sim_environment="VIRTUAL_ENVIRONMENT";; + operating | OPERATING) sim_environment="OPERATING_ENVIRONMENT";; + *) as_fn_error "Unknown value $enableval passed to --enable-sim-environment" "$LINENO" 5;; 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 +cat >>confdefs.h <<_ACEOF +#define WITH_ENVIRONMENT $sim_environment +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_environment" >&5 +$as_echo "$sim_environment" >&6; } + sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. diff --git a/sim/bfin/ChangeLog b/sim/bfin/ChangeLog index fcb14ae..3dea7c9 100644 --- a/sim/bfin/ChangeLog +++ b/sim/bfin/ChangeLog @@ -1,5 +1,9 @@ 2016-01-10 Mike Frysinger <vapier@gentoo.org> + * config.in, 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/config.in b/sim/bfin/config.in index 65ae650..2c415ac 100644 --- a/sim/bfin/config.in +++ b/sim/bfin/config.in @@ -3,6 +3,9 @@ /* Define if building universal (internal helper macro) */ #undef AC_APPLE_UNIVERSAL_BUILD +/* Sim debug setting */ +#undef DEBUG + /* Define to 1 if translation of program messages to the user's native language is requested. */ #undef ENABLE_NLS @@ -215,6 +218,9 @@ /* Additional package description */ #undef PKGVERSION +/* Sim profile settings */ +#undef PROFILE + /* Bug reporting address */ #undef REPORT_BUGS_TO @@ -246,6 +252,24 @@ #endif +/* Sim assert settings */ +#undef WITH_ASSERT + +/* Sim debug setting */ +#undef WITH_DEBUG + +/* Sim default environment */ +#undef WITH_ENVIRONMENT + +/* Sim profile settings */ +#undef WITH_PROFILE + +/* How to route I/O */ +#undef WITH_STDIO + +/* Sim trace settings */ +#undef WITH_TRACE + /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ #if defined AC_APPLE_UNIVERSAL_BUILD diff --git a/sim/bfin/configure b/sim/bfin/configure index 7d64751..cf426ea 100755 --- a/sim/bfin/configure +++ b/sim/bfin/configure @@ -609,10 +609,6 @@ PKG_CONFIG REPORT_BUGS_TEXI REPORT_BUGS_TO PKGVERSION -sim_profile -sim_trace -sim_stdio -sim_debug MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -687,8 +683,6 @@ CFLAGS CC WERROR_CFLAGS WARN_CFLAGS -sim_xor_endian -sim_smp sim_reserved_bits sim_inline sim_hw @@ -699,9 +693,7 @@ sim_scache sim_float sim_endian sim_bitsize -sim_assert sim_alignment -sim_environment target_alias host_alias build_alias @@ -4055,10 +4047,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - # intl sister-directory configuration rules. # @@ -12866,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 12869 "configure" +#line 12857 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12972,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 12975 "configure" +#line 12963 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13240,124 +13228,164 @@ fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim debug setting" >&5 +$as_echo_n "checking for sim debug setting... " >&6; } +sim_debug="0" # Check whether --enable-sim-debug was given. if test "${enable_sim_debug+set}" = set; then : enableval=$enable_sim_debug; case "${enableval}" in - yes) sim_debug="-DDEBUG=7 -DWITH_DEBUG=7";; - no) sim_debug="-DDEBUG=0 -DWITH_DEBUG=0";; - *) sim_debug="-DDEBUG='(${enableval})' -DWITH_DEBUG='(${enableval})'";; + yes) sim_debug="7";; + no) sim_debug="0";; + *) sim_debug="($enableval)";; esac -if test x"$silent" != x"yes" && test x"$sim_debug" != x""; then - echo "Setting sim debug = $sim_debug" 6>&1 fi -else - sim_debug="" +if test "$sim_debug" != "0"; then + +cat >>confdefs.h <<_ACEOF +#define DEBUG $sim_debug +_ACEOF + fi +cat >>confdefs.h <<_ACEOF +#define WITH_DEBUG $sim_debug +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_debug" >&5 +$as_echo "$sim_debug" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim stdio debug behavior" >&5 +$as_echo_n "checking for sim stdio debug behavior... " >&6; } +sim_stdio="0" # Check whether --enable-sim-stdio was given. if test "${enable_sim_stdio+set}" = set; then : enableval=$enable_sim_stdio; case "${enableval}" in - yes) sim_stdio="-DWITH_STDIO=DO_USE_STDIO";; - no) sim_stdio="-DWITH_STDIO=DONT_USE_STDIO";; - *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-stdio\"" "$LINENO" 5; sim_stdio="";; + yes) sim_stdio="DO_USE_STDIO";; + no) sim_stdio="DONT_USE_STDIO";; + *) as_fn_error "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_stdio" != x""; then - echo "Setting stdio flags = $sim_stdio" 6>&1 -fi -else - sim_stdio="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_STDIO $sim_stdio +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_stdio" >&5 +$as_echo "$sim_stdio" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim trace settings" >&5 +$as_echo_n "checking for sim trace settings... " >&6; } +sim_trace="~TRACE_debug" # Check whether --enable-sim-trace was given. if test "${enable_sim_trace+set}" = set; then : enableval=$enable_sim_trace; case "${enableval}" in - yes) sim_trace="-DWITH_TRACE=-1";; - no) sim_trace="-DWITH_TRACE=0";; + yes) sim_trace="-1";; + no) sim_trace="0";; [-0-9]*) - sim_trace="-DWITH_TRACE='(${enableval})'";; + sim_trace="'(${enableval})'";; [[:lower:]]*) sim_trace="" for x in `echo "$enableval" | sed -e "s/,/ /g"`; do if test x"$sim_trace" = x; then - sim_trace="-DWITH_TRACE='(TRACE_$x" + sim_trace="(TRACE_$x" else sim_trace="${sim_trace}|TRACE_$x" fi done - sim_trace="$sim_trace)'" ;; + sim_trace="$sim_trace)" ;; esac -if test x"$silent" != x"yes" && test x"$sim_trace" != x""; then - echo "Setting sim trace = $sim_trace" 6>&1 -fi -else - sim_trace="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_TRACE $sim_trace +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_trace" >&5 +$as_echo "$sim_trace" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim profile settings" >&5 +$as_echo_n "checking for sim profile settings... " >&6; } +profile="1" +sim_profile="-1" # Check whether --enable-sim-profile was given. if test "${enable_sim_profile+set}" = set; then : enableval=$enable_sim_profile; case "${enableval}" in - yes) sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1";; - no) sim_profile="-DPROFILE=0 -DWITH_PROFILE=0";; + yes) profile="1" sim_profile="-1";; + no) profile="0" sim_profile="0";; [-0-9]*) - sim_profile="-DPROFILE='(${enableval})' -DWITH_PROFILE='(${enableval})'";; + profile="(${enableval})" sim_profile="(${enableval})";; [a-z]*) + profile="1" sim_profile="" for x in `echo "$enableval" | sed -e "s/,/ /g"`; do if test x"$sim_profile" = x; then - sim_profile="-DWITH_PROFILE='(PROFILE_$x" + sim_profile="(PROFILE_$x" else sim_profile="${sim_profile}|PROFILE_$x" fi done - sim_profile="$sim_profile)'" ;; + sim_profile="$sim_profile)" ;; esac -if test x"$silent" != x"yes" && test x"$sim_profile" != x""; then - echo "Setting sim profile = $sim_profile" 6>&1 -fi -else - sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1" fi +cat >>confdefs.h <<_ACEOF +#define PROFILE $profile +_ACEOF +cat >>confdefs.h <<_ACEOF +#define WITH_PROFILE $sim_profile +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_profile" >&5 +$as_echo "$sim_profile" >&6; } + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable sim asserts" >&5 +$as_echo_n "checking whether to enable sim asserts... " >&6; } +sim_assert="1" # Check whether --enable-sim-assert was given. if test "${enable_sim_assert+set}" = set; then : enableval=$enable_sim_assert; case "${enableval}" in - yes) sim_assert="-DWITH_ASSERT=1";; - no) sim_assert="-DWITH_ASSERT=0";; - *) as_fn_error "\"--enable-sim-assert does not take a value\"" "$LINENO" 5; sim_assert="";; + yes) sim_assert="1";; + no) sim_assert="0";; + *) as_fn_error "--enable-sim-assert does not take a value" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_assert" != x""; then - echo "Setting assert flags = $sim_assert" 6>&1 -fi -else - sim_assert="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_ASSERT $sim_assert +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_assert" >&5 +$as_echo "$sim_assert" >&6; } + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking default sim environment setting" >&5 +$as_echo_n "checking default sim environment setting... " >&6; } +sim_environment="ALL_ENVIRONMENT" # 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="";; + all | ALL) sim_environment="ALL_ENVIRONMENT";; + user | USER) sim_environment="USER_ENVIRONMENT";; + virtual | VIRTUAL) sim_environment="VIRTUAL_ENVIRONMENT";; + operating | OPERATING) sim_environment="OPERATING_ENVIRONMENT";; + *) as_fn_error "Unknown value $enableval passed to --enable-sim-environment" "$LINENO" 5;; 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 +cat >>confdefs.h <<_ACEOF +#define WITH_ENVIRONMENT $sim_environment +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_environment" >&5 +$as_echo "$sim_environment" >&6; } + sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index 8afffa4..7b5c8f9 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,5 +1,27 @@ 2016-01-10 Mike Frysinger <vapier@gentoo.org> + * acinclude.m4 (SIM_AC_COMMON): Call AC_MSG_CHECKING, + AC_DEFINE_UNQUOTED, and AC_MSG_RESULT for sim-debug. Likewise for + sim-stdio, sim-trace, and sim-profile. + (SIM_AC_OPTION_ENVIRONMENT): Likewise. + (SIM_AC_OPTION_ASSERT): Likewise. + (SIM_AC_OPTION_SMP): Likewise. + (SIM_AC_OPTION_XOR_ENDIAN): Likewise. + * configure: Regenerate. + * Make-common.in (SIM_DEBUG, SIM_TRACE, SIM_PROFILE, SIM_ASSERT, + SIM_ENVIRONMENT, SIM_SMP, SIM_XOR_ENDIAN): Delete. + (CONFIG_CFLAGS): Delete $(SIM_DEBUG), $(SIM_TRACE), $(SIM_PROFILE), + $(SIM_ASSERT), $(SIM_ENVIRONMENT), $(SIM_SMP), and $(SIM_XOR_ENDIAN). + * sim-config.c (sim_config): Change DEFAULT_ENVIRONMENT to + WITH_ENVIRONMENT & USER_ENVIRONMENT. + * sim-config.h (SIM_HAVE_ENVIRONMENT, WITH_ENVIRONMENT, + DEFAULT_ENVIRONMENT, WITH_DEBUG, WITH_TRACE, WITH_PROFILE, + WITH_ASSERT, WITH_STDIO): Delete. + * sim-options.c (standard_options): Delete SIM_HAVE_ENVIRONMENT + check. + +2016-01-10 Mike Frysinger <vapier@gentoo.org> + * acinclude.m4 (SIM_AC_OPTION_PACKAGES): Delete. * configure: Regenerate. * Make-common.in (SIM_PACKAGES): Delete. diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in index 49401dd..3d99f62 100644 --- a/sim/common/Make-common.in +++ b/sim/common/Make-common.in @@ -75,16 +75,11 @@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ CXXFLAGS = @CXXFLAGS@ LDFLAGS = @LDFLAGS@ -SIM_DEBUG = @sim_debug@ -SIM_TRACE = @sim_trace@ -SIM_PROFILE = @sim_profile@ -SIM_ASSERT = @sim_assert@ SIM_ALIGNMENT = @sim_alignment@ SIM_BITSIZE = @sim_bitsize@ SIM_DEFAULT_MODEL = @sim_default_model@ SIM_ENDIAN = @sim_endian@ -SIM_ENVIRONMENT = @sim_environment@ SIM_FLOAT = @sim_float@ SIM_HW_CFLAGS = @sim_hw_cflags@ SIM_HW_OBJS = @sim_hw_objs@ @@ -92,8 +87,6 @@ SIM_HW = @sim_hw@ SIM_INLINE = @sim_inline@ SIM_RESERVED_BITS = @sim_reserved_bits@ SIM_SCACHE = @sim_scache@ -SIM_SMP = @sim_smp@ -SIM_XOR_ENDIAN = @sim_xor_endian@ WARN_CFLAGS = @WARN_CFLAGS@ WERROR_CFLAGS = @WERROR_CFLAGS@ SIM_WARN_CFLAGS = $(WARN_CFLAGS) @@ -224,24 +217,17 @@ CGEN_INCLUDE_DEPS = \ CONFIG_CFLAGS = \ @DEFS@ \ - $(SIM_DEBUG) \ $(SIM_DEFAULT_MODEL) \ - $(SIM_TRACE) \ - $(SIM_PROFILE) \ - $(SIM_ASSERT) \ $(SIM_ALIGNMENT) \ $(SIM_BITSIZE) \ $(SIM_ENDIAN) \ - $(SIM_ENVIRONMENT) \ $(SIM_FLOAT) \ $(SIM_HW_CFLAGS) \ $(SIM_INLINE) \ $(SIM_RESERVED_BITS) \ $(SIM_SCACHE) \ - $(SIM_SMP) \ $(SIM_WARN_CFLAGS) \ $(SIM_WERROR_CFLAGS) \ - $(SIM_XOR_ENDIAN) \ $(SIM_HARDWARE) \ $(SIM_EXTRA_CFLAGS) \ $(HDEFINES) $(TDEFINES) diff --git a/sim/common/acinclude.m4 b/sim/common/acinclude.m4 index 16e6d5c..5ebf584 100644 --- a/sim/common/acinclude.m4 +++ b/sim/common/acinclude.m4 @@ -135,64 +135,67 @@ AM_MAINTAINER_MODE dnl --enable-sim-debug is for developers of the simulator dnl the allowable values are work-in-progress +AC_MSG_CHECKING([for sim debug setting]) +sim_debug="0" AC_ARG_ENABLE(sim-debug, [AS_HELP_STRING([--enable-sim-debug=opts], [Enable debugging flags (for developers of the sim itself)])], [case "${enableval}" in - yes) sim_debug="-DDEBUG=7 -DWITH_DEBUG=7";; - no) sim_debug="-DDEBUG=0 -DWITH_DEBUG=0";; - *) sim_debug="-DDEBUG='(${enableval})' -DWITH_DEBUG='(${enableval})'";; -esac -if test x"$silent" != x"yes" && test x"$sim_debug" != x""; then - echo "Setting sim debug = $sim_debug" 6>&1 -fi],[sim_debug=""])dnl -AC_SUBST(sim_debug) + yes) sim_debug="7";; + no) sim_debug="0";; + *) sim_debug="($enableval)";; +esac])dnl +if test "$sim_debug" != "0"; then + AC_DEFINE_UNQUOTED([DEBUG], [$sim_debug], [Sim debug setting]) +fi +AC_DEFINE_UNQUOTED([WITH_DEBUG], [$sim_debug], [Sim debug setting]) +AC_MSG_RESULT($sim_debug) dnl --enable-sim-stdio is for users of the simulator dnl It determines if IO from the program is routed through STDIO (buffered) +AC_MSG_CHECKING([for sim stdio debug behavior]) +sim_stdio="0" AC_ARG_ENABLE(sim-stdio, [AS_HELP_STRING([--enable-sim-stdio], [Specify whether to use stdio for console input/output])], [case "${enableval}" in - yes) sim_stdio="-DWITH_STDIO=DO_USE_STDIO";; - no) sim_stdio="-DWITH_STDIO=DONT_USE_STDIO";; - *) AC_MSG_ERROR("Unknown value $enableval passed to --enable-sim-stdio"); sim_stdio="";; -esac -if test x"$silent" != x"yes" && test x"$sim_stdio" != x""; then - echo "Setting stdio flags = $sim_stdio" 6>&1 -fi],[sim_stdio=""])dnl -AC_SUBST(sim_stdio) + yes) sim_stdio="DO_USE_STDIO";; + no) sim_stdio="DONT_USE_STDIO";; + *) AC_MSG_ERROR([Unknown value $enableval passed to --enable-sim-stdio]);; +esac])dnl +AC_DEFINE_UNQUOTED([WITH_STDIO], [$sim_stdio], [How to route I/O]) +AC_MSG_RESULT($sim_stdio) dnl --enable-sim-trace is for users of the simulator dnl The argument is either a bitmask of things to enable [exactly what is dnl up to the simulator], or is a comma separated list of names of tracing dnl elements to enable. The latter is only supported on simulators that -dnl use WITH_TRACE. +dnl use WITH_TRACE. Default to all tracing but internal debug. +AC_MSG_CHECKING([for sim trace settings]) +sim_trace="~TRACE_debug" AC_ARG_ENABLE(sim-trace, [AS_HELP_STRING([--enable-sim-trace=opts], [Enable tracing of simulated programs])], [case "${enableval}" in - yes) sim_trace="-DWITH_TRACE=-1";; - no) sim_trace="-DWITH_TRACE=0";; + yes) sim_trace="-1";; + no) sim_trace="0";; [[-0-9]]*) - sim_trace="-DWITH_TRACE='(${enableval})'";; + sim_trace="'(${enableval})'";; [[[:lower:]]]*) sim_trace="" for x in `echo "$enableval" | sed -e "s/,/ /g"`; do if test x"$sim_trace" = x; then - sim_trace="-DWITH_TRACE='(TRACE_$x" + sim_trace="(TRACE_$x" else sim_trace="${sim_trace}|TRACE_$x" fi done - sim_trace="$sim_trace)'" ;; -esac -if test x"$silent" != x"yes" && test x"$sim_trace" != x""; then - echo "Setting sim trace = $sim_trace" 6>&1 -fi],[sim_trace=""])dnl -AC_SUBST(sim_trace) + sim_trace="$sim_trace)" ;; +esac])dnl +AC_DEFINE_UNQUOTED([WITH_TRACE], [$sim_trace], [Sim trace settings]) +AC_MSG_RESULT($sim_trace) dnl --enable-sim-profile @@ -200,28 +203,32 @@ dnl The argument is either a bitmask of things to enable [exactly what is dnl up to the simulator], or is a comma separated list of names of profiling dnl elements to enable. The latter is only supported on simulators that dnl use WITH_PROFILE. +AC_MSG_CHECKING([for sim profile settings]) +profile="1" +sim_profile="-1" AC_ARG_ENABLE(sim-profile, [AS_HELP_STRING([--enable-sim-profile=opts], [Enable profiling flags])], [case "${enableval}" in - yes) sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1";; - no) sim_profile="-DPROFILE=0 -DWITH_PROFILE=0";; + yes) profile="1" sim_profile="-1";; + no) profile="0" sim_profile="0";; [[-0-9]]*) - sim_profile="-DPROFILE='(${enableval})' -DWITH_PROFILE='(${enableval})'";; + profile="(${enableval})" sim_profile="(${enableval})";; [[a-z]]*) + profile="1" sim_profile="" for x in `echo "$enableval" | sed -e "s/,/ /g"`; do if test x"$sim_profile" = x; then - sim_profile="-DWITH_PROFILE='(PROFILE_$x" + sim_profile="(PROFILE_$x" else sim_profile="${sim_profile}|PROFILE_$x" fi done - sim_profile="$sim_profile)'" ;; -esac -if test x"$silent" != x"yes" && test x"$sim_profile" != x""; then - echo "Setting sim profile = $sim_profile" 6>&1 -fi],[sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1"])dnl -AC_SUBST(sim_profile) + sim_profile="$sim_profile)" ;; +esac])dnl +AC_DEFINE_UNQUOTED([PROFILE], [$profile], [Sim profile settings]) +AC_DEFINE_UNQUOTED([WITH_PROFILE], [$sim_profile], [Sim profile settings]) +AC_MSG_RESULT($sim_profile) + SIM_AC_OPTION_ASSERT SIM_AC_OPTION_ENVIRONMENT @@ -257,23 +264,21 @@ dnl ??? Until there is demonstrable value in doing something more complicated, dnl let's not. AC_DEFUN([SIM_AC_OPTION_ENVIRONMENT], [ +AC_MSG_CHECKING([default sim environment setting]) +sim_environment="ALL_ENVIRONMENT" AC_ARG_ENABLE(sim-environment, [AS_HELP_STRING([--enable-sim-environment=environment], [Specify mixed, user, virtual or operating 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";; - *) AC_MSG_ERROR("Unknown value $enableval passed to --enable-sim-environment"); - sim_environment="";; -esac -if test x"$silent" != x"yes" && test x"$sim_environment" != x""; then - echo "Setting sim environment = $sim_environment" 6>&1 -fi], -[sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT"])dnl + all | ALL) sim_environment="ALL_ENVIRONMENT";; + user | USER) sim_environment="USER_ENVIRONMENT";; + virtual | VIRTUAL) sim_environment="VIRTUAL_ENVIRONMENT";; + operating | OPERATING) sim_environment="OPERATING_ENVIRONMENT";; + *) AC_MSG_ERROR([Unknown value $enableval passed to --enable-sim-environment]);; +esac])dnl +AC_DEFINE_UNQUOTED([WITH_ENVIRONMENT], [$sim_environment], [Sim default environment]) +AC_MSG_RESULT($sim_environment) ]) -AC_SUBST(sim_environment) dnl Specify the alignment restrictions of the target architecture. @@ -332,19 +337,19 @@ AC_SUBST(sim_alignment) dnl Conditionally compile in assertion statements. AC_DEFUN([SIM_AC_OPTION_ASSERT], [ +AC_MSG_CHECKING([whether to enable sim asserts]) +sim_assert="1" AC_ARG_ENABLE(sim-assert, [AS_HELP_STRING([--enable-sim-assert], [Specify whether to perform random assertions])], [case "${enableval}" in - yes) sim_assert="-DWITH_ASSERT=1";; - no) sim_assert="-DWITH_ASSERT=0";; - *) AC_MSG_ERROR("--enable-sim-assert does not take a value"); sim_assert="";; -esac -if test x"$silent" != x"yes" && test x"$sim_assert" != x""; then - echo "Setting assert flags = $sim_assert" 6>&1 -fi],[sim_assert=""])dnl + yes) sim_assert="1";; + no) sim_assert="0";; + *) AC_MSG_ERROR([--enable-sim-assert does not take a value]);; +esac])dnl +AC_DEFINE_UNQUOTED([WITH_ASSERT], [$sim_assert], [Sim assert settings]) +AC_MSG_RESULT($sim_assert) ]) -AC_SUBST(sim_assert) @@ -667,41 +672,39 @@ AC_SUBST(sim_reserved_bits) AC_DEFUN([SIM_AC_OPTION_SMP], [ +AC_MSG_CHECKING([number of sim cpus to support]) default_sim_smp="ifelse([$1],,5,[$1])" +sim_smp="$default_sim_smp"" AC_ARG_ENABLE(sim-smp, [AS_HELP_STRING([--enable-sim-smp=n], [Specify number of processors to configure for (default ${default_sim_smp})])], [case "${enableval}" in - yes) sim_smp="-DWITH_SMP=5" ; sim_igen_smp="-N 5";; - no) sim_smp="-DWITH_SMP=0" ; sim_igen_smp="-N 0";; - *) sim_smp="-DWITH_SMP=$enableval" ; sim_igen_smp="-N $enableval";; -esac -if test x"$silent" != x"yes" && test x"$sim_smp" != x""; then - echo "Setting smp flags = $sim_smp" 6>&1 -fi],[sim_smp="-DWITH_SMP=${default_sim_smp}" ; sim_igen_smp="-N ${default_sim_smp}" -if test x"$silent" != x"yes"; then - echo "Setting smp flags = $sim_smp" 6>&1 -fi])dnl + yes) sim_smp="5";; + no) sim_smp="0";; + *) sim_smp="$enableval";; +esac])dnl +sim_igen_smp="-N ${sim_smp}" +AC_DEFINE_UNQUOTED([WITH_SMP], [$sim_smp], [Sim SMP settings]) +AC_MSG_RESULT($sim_smp) ]) -AC_SUBST(sim_smp) AC_DEFUN([SIM_AC_OPTION_XOR_ENDIAN], [ +AC_MSG_CHECKING([for xor endian support]) default_sim_xor_endian="ifelse([$1],,8,[$1])" +sim_xor_endian="$default_sim_xor_endian" AC_ARG_ENABLE(sim-xor-endian, [AS_HELP_STRING([--enable-sim-xor-endian=n], [Specify number bytes involved in XOR bi-endian mode (default ${default_sim_xor_endian})])], [case "${enableval}" in - yes) sim_xor_endian="-DWITH_XOR_ENDIAN=8";; - no) sim_xor_endian="-DWITH_XOR_ENDIAN=0";; - *) sim_xor_endian="-DWITH_XOR_ENDIAN=$enableval";; -esac -if test x"$silent" != x"yes" && test x"$sim_xor_endian" != x""; then - echo "Setting xor-endian flag = $sim_xor_endian" 6>&1 -fi],[sim_xor_endian="-DWITH_XOR_ENDIAN=${default_sim_xor_endian}"])dnl + yes) sim_xor_endian="8";; + no) sim_xor_endian="0";; + *) sim_xor_endian="$enableval";; +esac])dnl +AC_DEFINE_UNQUOTED([WITH_XOR_ENDIAN], [$sim_xor_endian], [Sim XOR endian settings]) +AC_MSG_RESULT($sim_smp) ]) -AC_SUBST(sim_xor_endian) dnl --enable-build-warnings is for developers of the simulator. diff --git a/sim/common/configure b/sim/common/configure index a02b129..53082d4 100755 --- a/sim/common/configure +++ b/sim/common/configure @@ -602,8 +602,6 @@ PATH_SEPARATOR SHELL WERROR_CFLAGS WARN_CFLAGS -sim_xor_endian -sim_smp sim_reserved_bits sim_inline sim_hw @@ -614,9 +612,7 @@ sim_scache sim_float sim_endian sim_bitsize -sim_assert -sim_alignment -sim_environment' +sim_alignment' ac_subst_files='' ac_user_opts=' enable_option_checking diff --git a/sim/common/sim-config.c b/sim/common/sim-config.c index 7e66787..9da7105 100644 --- a/sim/common/sim-config.c +++ b/sim/common/sim-config.c @@ -237,7 +237,8 @@ sim_config (SIM_DESC sd) } #endif if (STATE_ENVIRONMENT (sd) == ALL_ENVIRONMENT) - STATE_ENVIRONMENT (sd) = DEFAULT_ENVIRONMENT; + STATE_ENVIRONMENT (sd) = (WITH_ENVIRONMENT != ALL_ENVIRONMENT ? + WITH_ENVIRONMENT : USER_ENVIRONMENT); /* set the alignment */ diff --git a/sim/common/sim-config.h b/sim/common/sim-config.h index 1c65365..88ecfd8 100644 --- a/sim/common/sim-config.h +++ b/sim/common/sim-config.h @@ -167,21 +167,6 @@ enum sim_environment { OPERATING_ENVIRONMENT }; -/* If the simulator specified SIM_AC_OPTION_ENVIRONMENT, indicate so. */ -#ifdef WITH_ENVIRONMENT -#define SIM_HAVE_ENVIRONMENT -#endif - -/* If the simulator doesn't specify SIM_AC_OPTION_ENVIRONMENT in its - configure.ac, the only supported environment is the user environment. */ -#ifndef WITH_ENVIRONMENT -#define WITH_ENVIRONMENT USER_ENVIRONMENT -#endif - -#define DEFAULT_ENVIRONMENT (WITH_ENVIRONMENT != ALL_ENVIRONMENT \ - ? WITH_ENVIRONMENT \ - : USER_ENVIRONMENT) - /* To be prepended to simulator calls with absolute file paths and chdir:ed at startup. */ extern char *simulator_sysroot; @@ -267,39 +252,6 @@ extern int current_floating_point; #endif -/* Debugging: - - Control the inclusion of debugging code. - Debugging is only turned on in rare circumstances [say during development] - and is not intended to be turned on otherwise. */ - -#ifndef WITH_DEBUG -#define WITH_DEBUG 0 -#endif - -/* Include the tracing code. Disabling this eliminates all tracing - code. Default to all tracing but internal debug. */ - -#ifndef WITH_TRACE -#define WITH_TRACE (~TRACE_debug) -#endif - -/* Include the profiling code. Disabling this eliminates all profiling - code. */ - -#ifndef WITH_PROFILE -#define WITH_PROFILE (-1) -#endif - - -/* include code that checks assertions scattered through out the - program */ - -#ifndef WITH_ASSERT -#define WITH_ASSERT 1 -#endif - - /* Whether to check instructions for reserved bits being set */ /* #define WITH_RESERVED_BITS 1 */ @@ -344,10 +296,6 @@ extern int current_model_issue; #define DONT_USE_STDIO 2 #define DO_USE_STDIO 1 -#ifndef WITH_STDIO -#define WITH_STDIO 0 -#endif - extern int current_stdio; #define CURRENT_STDIO (WITH_STDIO \ ? WITH_STDIO \ diff --git a/sim/common/sim-options.c b/sim/common/sim-options.c index 7393554..54a8c43 100644 --- a/sim/common/sim-options.c +++ b/sim/common/sim-options.c @@ -119,14 +119,12 @@ static const OPTION standard_options[] = 'E', "big|little", "Set endianness", standard_option_handler, NULL }, -#ifdef SIM_HAVE_ENVIRONMENT /* This option isn't supported unless all choices are supported in keeping with the goal of not printing in --help output things the simulator can't do [as opposed to things that just haven't been configured in]. */ { {"environment", required_argument, NULL, OPTION_ENVIRONMENT}, '\0', "user|virtual|operating", "Set running environment", standard_option_handler }, -#endif { {"alignment", required_argument, NULL, OPTION_ALIGNMENT}, '\0', "strict|nonstrict|forced", "Set memory access alignment", diff --git a/sim/cr16/ChangeLog b/sim/cr16/ChangeLog index 7c2fe22..576898c 100644 --- a/sim/cr16/ChangeLog +++ b/sim/cr16/ChangeLog @@ -1,5 +1,9 @@ 2016-01-10 Mike Frysinger <vapier@gentoo.org> + * config.in, 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/config.in b/sim/cr16/config.in index f24eb3b..aa3e45c 100644 --- a/sim/cr16/config.in +++ b/sim/cr16/config.in @@ -3,6 +3,9 @@ /* Define if building universal (internal helper macro) */ #undef AC_APPLE_UNIVERSAL_BUILD +/* Sim debug setting */ +#undef DEBUG + /* Define to 1 if translation of program messages to the user's native language is requested. */ #undef ENABLE_NLS @@ -170,6 +173,9 @@ /* Additional package description */ #undef PKGVERSION +/* Sim profile settings */ +#undef PROFILE + /* Bug reporting address */ #undef REPORT_BUGS_TO @@ -201,6 +207,24 @@ #endif +/* Sim assert settings */ +#undef WITH_ASSERT + +/* Sim debug setting */ +#undef WITH_DEBUG + +/* Sim default environment */ +#undef WITH_ENVIRONMENT + +/* Sim profile settings */ +#undef WITH_PROFILE + +/* How to route I/O */ +#undef WITH_STDIO + +/* Sim trace settings */ +#undef WITH_TRACE + /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ #if defined AC_APPLE_UNIVERSAL_BUILD diff --git a/sim/cr16/configure b/sim/cr16/configure index 107d9a6..0185727 100755 --- a/sim/cr16/configure +++ b/sim/cr16/configure @@ -604,10 +604,6 @@ cgen_breaks REPORT_BUGS_TEXI REPORT_BUGS_TO PKGVERSION -sim_profile -sim_trace -sim_stdio -sim_debug MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -682,8 +678,6 @@ CFLAGS CC WERROR_CFLAGS WARN_CFLAGS -sim_xor_endian -sim_smp sim_reserved_bits sim_inline sim_hw @@ -694,9 +688,7 @@ sim_scache sim_float sim_endian sim_bitsize -sim_assert sim_alignment -sim_environment target_alias host_alias build_alias @@ -4032,10 +4024,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - # intl sister-directory configuration rules. # @@ -12843,7 +12831,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12846 "configure" +#line 12834 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12949,7 +12937,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12952 "configure" +#line 12940 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13217,124 +13205,164 @@ fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim debug setting" >&5 +$as_echo_n "checking for sim debug setting... " >&6; } +sim_debug="0" # Check whether --enable-sim-debug was given. if test "${enable_sim_debug+set}" = set; then : enableval=$enable_sim_debug; case "${enableval}" in - yes) sim_debug="-DDEBUG=7 -DWITH_DEBUG=7";; - no) sim_debug="-DDEBUG=0 -DWITH_DEBUG=0";; - *) sim_debug="-DDEBUG='(${enableval})' -DWITH_DEBUG='(${enableval})'";; + yes) sim_debug="7";; + no) sim_debug="0";; + *) sim_debug="($enableval)";; esac -if test x"$silent" != x"yes" && test x"$sim_debug" != x""; then - echo "Setting sim debug = $sim_debug" 6>&1 fi -else - sim_debug="" +if test "$sim_debug" != "0"; then + +cat >>confdefs.h <<_ACEOF +#define DEBUG $sim_debug +_ACEOF + fi +cat >>confdefs.h <<_ACEOF +#define WITH_DEBUG $sim_debug +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_debug" >&5 +$as_echo "$sim_debug" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim stdio debug behavior" >&5 +$as_echo_n "checking for sim stdio debug behavior... " >&6; } +sim_stdio="0" # Check whether --enable-sim-stdio was given. if test "${enable_sim_stdio+set}" = set; then : enableval=$enable_sim_stdio; case "${enableval}" in - yes) sim_stdio="-DWITH_STDIO=DO_USE_STDIO";; - no) sim_stdio="-DWITH_STDIO=DONT_USE_STDIO";; - *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-stdio\"" "$LINENO" 5; sim_stdio="";; + yes) sim_stdio="DO_USE_STDIO";; + no) sim_stdio="DONT_USE_STDIO";; + *) as_fn_error "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_stdio" != x""; then - echo "Setting stdio flags = $sim_stdio" 6>&1 -fi -else - sim_stdio="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_STDIO $sim_stdio +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_stdio" >&5 +$as_echo "$sim_stdio" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim trace settings" >&5 +$as_echo_n "checking for sim trace settings... " >&6; } +sim_trace="~TRACE_debug" # Check whether --enable-sim-trace was given. if test "${enable_sim_trace+set}" = set; then : enableval=$enable_sim_trace; case "${enableval}" in - yes) sim_trace="-DWITH_TRACE=-1";; - no) sim_trace="-DWITH_TRACE=0";; + yes) sim_trace="-1";; + no) sim_trace="0";; [-0-9]*) - sim_trace="-DWITH_TRACE='(${enableval})'";; + sim_trace="'(${enableval})'";; [[:lower:]]*) sim_trace="" for x in `echo "$enableval" | sed -e "s/,/ /g"`; do if test x"$sim_trace" = x; then - sim_trace="-DWITH_TRACE='(TRACE_$x" + sim_trace="(TRACE_$x" else sim_trace="${sim_trace}|TRACE_$x" fi done - sim_trace="$sim_trace)'" ;; + sim_trace="$sim_trace)" ;; esac -if test x"$silent" != x"yes" && test x"$sim_trace" != x""; then - echo "Setting sim trace = $sim_trace" 6>&1 -fi -else - sim_trace="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_TRACE $sim_trace +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_trace" >&5 +$as_echo "$sim_trace" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim profile settings" >&5 +$as_echo_n "checking for sim profile settings... " >&6; } +profile="1" +sim_profile="-1" # Check whether --enable-sim-profile was given. if test "${enable_sim_profile+set}" = set; then : enableval=$enable_sim_profile; case "${enableval}" in - yes) sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1";; - no) sim_profile="-DPROFILE=0 -DWITH_PROFILE=0";; + yes) profile="1" sim_profile="-1";; + no) profile="0" sim_profile="0";; [-0-9]*) - sim_profile="-DPROFILE='(${enableval})' -DWITH_PROFILE='(${enableval})'";; + profile="(${enableval})" sim_profile="(${enableval})";; [a-z]*) + profile="1" sim_profile="" for x in `echo "$enableval" | sed -e "s/,/ /g"`; do if test x"$sim_profile" = x; then - sim_profile="-DWITH_PROFILE='(PROFILE_$x" + sim_profile="(PROFILE_$x" else sim_profile="${sim_profile}|PROFILE_$x" fi done - sim_profile="$sim_profile)'" ;; + sim_profile="$sim_profile)" ;; esac -if test x"$silent" != x"yes" && test x"$sim_profile" != x""; then - echo "Setting sim profile = $sim_profile" 6>&1 -fi -else - sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1" fi +cat >>confdefs.h <<_ACEOF +#define PROFILE $profile +_ACEOF +cat >>confdefs.h <<_ACEOF +#define WITH_PROFILE $sim_profile +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_profile" >&5 +$as_echo "$sim_profile" >&6; } + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable sim asserts" >&5 +$as_echo_n "checking whether to enable sim asserts... " >&6; } +sim_assert="1" # Check whether --enable-sim-assert was given. if test "${enable_sim_assert+set}" = set; then : enableval=$enable_sim_assert; case "${enableval}" in - yes) sim_assert="-DWITH_ASSERT=1";; - no) sim_assert="-DWITH_ASSERT=0";; - *) as_fn_error "\"--enable-sim-assert does not take a value\"" "$LINENO" 5; sim_assert="";; + yes) sim_assert="1";; + no) sim_assert="0";; + *) as_fn_error "--enable-sim-assert does not take a value" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_assert" != x""; then - echo "Setting assert flags = $sim_assert" 6>&1 -fi -else - sim_assert="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_ASSERT $sim_assert +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_assert" >&5 +$as_echo "$sim_assert" >&6; } + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking default sim environment setting" >&5 +$as_echo_n "checking default sim environment setting... " >&6; } +sim_environment="ALL_ENVIRONMENT" # 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="";; + all | ALL) sim_environment="ALL_ENVIRONMENT";; + user | USER) sim_environment="USER_ENVIRONMENT";; + virtual | VIRTUAL) sim_environment="VIRTUAL_ENVIRONMENT";; + operating | OPERATING) sim_environment="OPERATING_ENVIRONMENT";; + *) as_fn_error "Unknown value $enableval passed to --enable-sim-environment" "$LINENO" 5;; 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 +cat >>confdefs.h <<_ACEOF +#define WITH_ENVIRONMENT $sim_environment +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_environment" >&5 +$as_echo "$sim_environment" >&6; } + sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. diff --git a/sim/cris/ChangeLog b/sim/cris/ChangeLog index f92e089..ef96ec7 100644 --- a/sim/cris/ChangeLog +++ b/sim/cris/ChangeLog @@ -1,5 +1,9 @@ 2016-01-10 Mike Frysinger <vapier@gentoo.org> + * config.in, 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/config.in b/sim/cris/config.in index e5e69a8..124dc54 100644 --- a/sim/cris/config.in +++ b/sim/cris/config.in @@ -3,6 +3,9 @@ /* Define if building universal (internal helper macro) */ #undef AC_APPLE_UNIVERSAL_BUILD +/* Sim debug setting */ +#undef DEBUG + /* Define to 1 if translation of program messages to the user's native language is requested. */ #undef ENABLE_NLS @@ -188,6 +191,9 @@ /* Additional package description */ #undef PKGVERSION +/* Sim profile settings */ +#undef PROFILE + /* Bug reporting address */ #undef REPORT_BUGS_TO @@ -219,6 +225,24 @@ #endif +/* Sim assert settings */ +#undef WITH_ASSERT + +/* Sim debug setting */ +#undef WITH_DEBUG + +/* Sim default environment */ +#undef WITH_ENVIRONMENT + +/* Sim profile settings */ +#undef WITH_PROFILE + +/* How to route I/O */ +#undef WITH_STDIO + +/* Sim trace settings */ +#undef WITH_TRACE + /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ #if defined AC_APPLE_UNIVERSAL_BUILD diff --git a/sim/cris/configure b/sim/cris/configure index 7e79cdf..2150da7 100755 --- a/sim/cris/configure +++ b/sim/cris/configure @@ -607,10 +607,6 @@ CGEN_MAINT REPORT_BUGS_TEXI REPORT_BUGS_TO PKGVERSION -sim_profile -sim_trace -sim_stdio -sim_debug MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -685,8 +681,6 @@ CFLAGS CC WERROR_CFLAGS WARN_CFLAGS -sim_xor_endian -sim_smp sim_reserved_bits sim_inline sim_hw @@ -697,9 +691,7 @@ sim_scache sim_float sim_endian sim_bitsize -sim_assert sim_alignment -sim_environment target_alias host_alias build_alias @@ -4046,10 +4038,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - # intl sister-directory configuration rules. # @@ -12857,7 +12845,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12860 "configure" +#line 12848 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12963,7 +12951,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12966 "configure" +#line 12954 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13231,124 +13219,164 @@ fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim debug setting" >&5 +$as_echo_n "checking for sim debug setting... " >&6; } +sim_debug="0" # Check whether --enable-sim-debug was given. if test "${enable_sim_debug+set}" = set; then : enableval=$enable_sim_debug; case "${enableval}" in - yes) sim_debug="-DDEBUG=7 -DWITH_DEBUG=7";; - no) sim_debug="-DDEBUG=0 -DWITH_DEBUG=0";; - *) sim_debug="-DDEBUG='(${enableval})' -DWITH_DEBUG='(${enableval})'";; + yes) sim_debug="7";; + no) sim_debug="0";; + *) sim_debug="($enableval)";; esac -if test x"$silent" != x"yes" && test x"$sim_debug" != x""; then - echo "Setting sim debug = $sim_debug" 6>&1 fi -else - sim_debug="" +if test "$sim_debug" != "0"; then + +cat >>confdefs.h <<_ACEOF +#define DEBUG $sim_debug +_ACEOF + fi +cat >>confdefs.h <<_ACEOF +#define WITH_DEBUG $sim_debug +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_debug" >&5 +$as_echo "$sim_debug" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim stdio debug behavior" >&5 +$as_echo_n "checking for sim stdio debug behavior... " >&6; } +sim_stdio="0" # Check whether --enable-sim-stdio was given. if test "${enable_sim_stdio+set}" = set; then : enableval=$enable_sim_stdio; case "${enableval}" in - yes) sim_stdio="-DWITH_STDIO=DO_USE_STDIO";; - no) sim_stdio="-DWITH_STDIO=DONT_USE_STDIO";; - *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-stdio\"" "$LINENO" 5; sim_stdio="";; + yes) sim_stdio="DO_USE_STDIO";; + no) sim_stdio="DONT_USE_STDIO";; + *) as_fn_error "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_stdio" != x""; then - echo "Setting stdio flags = $sim_stdio" 6>&1 -fi -else - sim_stdio="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_STDIO $sim_stdio +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_stdio" >&5 +$as_echo "$sim_stdio" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim trace settings" >&5 +$as_echo_n "checking for sim trace settings... " >&6; } +sim_trace="~TRACE_debug" # Check whether --enable-sim-trace was given. if test "${enable_sim_trace+set}" = set; then : enableval=$enable_sim_trace; case "${enableval}" in - yes) sim_trace="-DWITH_TRACE=-1";; - no) sim_trace="-DWITH_TRACE=0";; + yes) sim_trace="-1";; + no) sim_trace="0";; [-0-9]*) - sim_trace="-DWITH_TRACE='(${enableval})'";; + sim_trace="'(${enableval})'";; [[:lower:]]*) sim_trace="" for x in `echo "$enableval" | sed -e "s/,/ /g"`; do if test x"$sim_trace" = x; then - sim_trace="-DWITH_TRACE='(TRACE_$x" + sim_trace="(TRACE_$x" else sim_trace="${sim_trace}|TRACE_$x" fi done - sim_trace="$sim_trace)'" ;; + sim_trace="$sim_trace)" ;; esac -if test x"$silent" != x"yes" && test x"$sim_trace" != x""; then - echo "Setting sim trace = $sim_trace" 6>&1 -fi -else - sim_trace="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_TRACE $sim_trace +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_trace" >&5 +$as_echo "$sim_trace" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim profile settings" >&5 +$as_echo_n "checking for sim profile settings... " >&6; } +profile="1" +sim_profile="-1" # Check whether --enable-sim-profile was given. if test "${enable_sim_profile+set}" = set; then : enableval=$enable_sim_profile; case "${enableval}" in - yes) sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1";; - no) sim_profile="-DPROFILE=0 -DWITH_PROFILE=0";; + yes) profile="1" sim_profile="-1";; + no) profile="0" sim_profile="0";; [-0-9]*) - sim_profile="-DPROFILE='(${enableval})' -DWITH_PROFILE='(${enableval})'";; + profile="(${enableval})" sim_profile="(${enableval})";; [a-z]*) + profile="1" sim_profile="" for x in `echo "$enableval" | sed -e "s/,/ /g"`; do if test x"$sim_profile" = x; then - sim_profile="-DWITH_PROFILE='(PROFILE_$x" + sim_profile="(PROFILE_$x" else sim_profile="${sim_profile}|PROFILE_$x" fi done - sim_profile="$sim_profile)'" ;; + sim_profile="$sim_profile)" ;; esac -if test x"$silent" != x"yes" && test x"$sim_profile" != x""; then - echo "Setting sim profile = $sim_profile" 6>&1 -fi -else - sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1" fi +cat >>confdefs.h <<_ACEOF +#define PROFILE $profile +_ACEOF +cat >>confdefs.h <<_ACEOF +#define WITH_PROFILE $sim_profile +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_profile" >&5 +$as_echo "$sim_profile" >&6; } + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable sim asserts" >&5 +$as_echo_n "checking whether to enable sim asserts... " >&6; } +sim_assert="1" # Check whether --enable-sim-assert was given. if test "${enable_sim_assert+set}" = set; then : enableval=$enable_sim_assert; case "${enableval}" in - yes) sim_assert="-DWITH_ASSERT=1";; - no) sim_assert="-DWITH_ASSERT=0";; - *) as_fn_error "\"--enable-sim-assert does not take a value\"" "$LINENO" 5; sim_assert="";; + yes) sim_assert="1";; + no) sim_assert="0";; + *) as_fn_error "--enable-sim-assert does not take a value" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_assert" != x""; then - echo "Setting assert flags = $sim_assert" 6>&1 -fi -else - sim_assert="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_ASSERT $sim_assert +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_assert" >&5 +$as_echo "$sim_assert" >&6; } + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking default sim environment setting" >&5 +$as_echo_n "checking default sim environment setting... " >&6; } +sim_environment="ALL_ENVIRONMENT" # 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="";; + all | ALL) sim_environment="ALL_ENVIRONMENT";; + user | USER) sim_environment="USER_ENVIRONMENT";; + virtual | VIRTUAL) sim_environment="VIRTUAL_ENVIRONMENT";; + operating | OPERATING) sim_environment="OPERATING_ENVIRONMENT";; + *) as_fn_error "Unknown value $enableval passed to --enable-sim-environment" "$LINENO" 5;; 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 +cat >>confdefs.h <<_ACEOF +#define WITH_ENVIRONMENT $sim_environment +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_environment" >&5 +$as_echo "$sim_environment" >&6; } + sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. diff --git a/sim/d10v/ChangeLog b/sim/d10v/ChangeLog index 09516f4..e889e3f 100644 --- a/sim/d10v/ChangeLog +++ b/sim/d10v/ChangeLog @@ -1,5 +1,9 @@ 2016-01-10 Mike Frysinger <vapier@gentoo.org> + * config.in, 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/config.in b/sim/d10v/config.in index f24eb3b..aa3e45c 100644 --- a/sim/d10v/config.in +++ b/sim/d10v/config.in @@ -3,6 +3,9 @@ /* Define if building universal (internal helper macro) */ #undef AC_APPLE_UNIVERSAL_BUILD +/* Sim debug setting */ +#undef DEBUG + /* Define to 1 if translation of program messages to the user's native language is requested. */ #undef ENABLE_NLS @@ -170,6 +173,9 @@ /* Additional package description */ #undef PKGVERSION +/* Sim profile settings */ +#undef PROFILE + /* Bug reporting address */ #undef REPORT_BUGS_TO @@ -201,6 +207,24 @@ #endif +/* Sim assert settings */ +#undef WITH_ASSERT + +/* Sim debug setting */ +#undef WITH_DEBUG + +/* Sim default environment */ +#undef WITH_ENVIRONMENT + +/* Sim profile settings */ +#undef WITH_PROFILE + +/* How to route I/O */ +#undef WITH_STDIO + +/* Sim trace settings */ +#undef WITH_TRACE + /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ #if defined AC_APPLE_UNIVERSAL_BUILD diff --git a/sim/d10v/configure b/sim/d10v/configure index c16d784..e177055 100755 --- a/sim/d10v/configure +++ b/sim/d10v/configure @@ -604,10 +604,6 @@ cgen_breaks REPORT_BUGS_TEXI REPORT_BUGS_TO PKGVERSION -sim_profile -sim_trace -sim_stdio -sim_debug MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -682,8 +678,6 @@ CFLAGS CC WERROR_CFLAGS WARN_CFLAGS -sim_xor_endian -sim_smp sim_reserved_bits sim_inline sim_hw @@ -694,9 +688,7 @@ sim_scache sim_float sim_endian sim_bitsize -sim_assert sim_alignment -sim_environment target_alias host_alias build_alias @@ -4032,10 +4024,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - # intl sister-directory configuration rules. # @@ -12843,7 +12831,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12846 "configure" +#line 12834 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12949,7 +12937,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12952 "configure" +#line 12940 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13217,124 +13205,164 @@ fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim debug setting" >&5 +$as_echo_n "checking for sim debug setting... " >&6; } +sim_debug="0" # Check whether --enable-sim-debug was given. if test "${enable_sim_debug+set}" = set; then : enableval=$enable_sim_debug; case "${enableval}" in - yes) sim_debug="-DDEBUG=7 -DWITH_DEBUG=7";; - no) sim_debug="-DDEBUG=0 -DWITH_DEBUG=0";; - *) sim_debug="-DDEBUG='(${enableval})' -DWITH_DEBUG='(${enableval})'";; + yes) sim_debug="7";; + no) sim_debug="0";; + *) sim_debug="($enableval)";; esac -if test x"$silent" != x"yes" && test x"$sim_debug" != x""; then - echo "Setting sim debug = $sim_debug" 6>&1 fi -else - sim_debug="" +if test "$sim_debug" != "0"; then + +cat >>confdefs.h <<_ACEOF +#define DEBUG $sim_debug +_ACEOF + fi +cat >>confdefs.h <<_ACEOF +#define WITH_DEBUG $sim_debug +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_debug" >&5 +$as_echo "$sim_debug" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim stdio debug behavior" >&5 +$as_echo_n "checking for sim stdio debug behavior... " >&6; } +sim_stdio="0" # Check whether --enable-sim-stdio was given. if test "${enable_sim_stdio+set}" = set; then : enableval=$enable_sim_stdio; case "${enableval}" in - yes) sim_stdio="-DWITH_STDIO=DO_USE_STDIO";; - no) sim_stdio="-DWITH_STDIO=DONT_USE_STDIO";; - *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-stdio\"" "$LINENO" 5; sim_stdio="";; + yes) sim_stdio="DO_USE_STDIO";; + no) sim_stdio="DONT_USE_STDIO";; + *) as_fn_error "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_stdio" != x""; then - echo "Setting stdio flags = $sim_stdio" 6>&1 -fi -else - sim_stdio="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_STDIO $sim_stdio +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_stdio" >&5 +$as_echo "$sim_stdio" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim trace settings" >&5 +$as_echo_n "checking for sim trace settings... " >&6; } +sim_trace="~TRACE_debug" # Check whether --enable-sim-trace was given. if test "${enable_sim_trace+set}" = set; then : enableval=$enable_sim_trace; case "${enableval}" in - yes) sim_trace="-DWITH_TRACE=-1";; - no) sim_trace="-DWITH_TRACE=0";; + yes) sim_trace="-1";; + no) sim_trace="0";; [-0-9]*) - sim_trace="-DWITH_TRACE='(${enableval})'";; + sim_trace="'(${enableval})'";; [[:lower:]]*) sim_trace="" for x in `echo "$enableval" | sed -e "s/,/ /g"`; do if test x"$sim_trace" = x; then - sim_trace="-DWITH_TRACE='(TRACE_$x" + sim_trace="(TRACE_$x" else sim_trace="${sim_trace}|TRACE_$x" fi done - sim_trace="$sim_trace)'" ;; + sim_trace="$sim_trace)" ;; esac -if test x"$silent" != x"yes" && test x"$sim_trace" != x""; then - echo "Setting sim trace = $sim_trace" 6>&1 -fi -else - sim_trace="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_TRACE $sim_trace +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_trace" >&5 +$as_echo "$sim_trace" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim profile settings" >&5 +$as_echo_n "checking for sim profile settings... " >&6; } +profile="1" +sim_profile="-1" # Check whether --enable-sim-profile was given. if test "${enable_sim_profile+set}" = set; then : enableval=$enable_sim_profile; case "${enableval}" in - yes) sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1";; - no) sim_profile="-DPROFILE=0 -DWITH_PROFILE=0";; + yes) profile="1" sim_profile="-1";; + no) profile="0" sim_profile="0";; [-0-9]*) - sim_profile="-DPROFILE='(${enableval})' -DWITH_PROFILE='(${enableval})'";; + profile="(${enableval})" sim_profile="(${enableval})";; [a-z]*) + profile="1" sim_profile="" for x in `echo "$enableval" | sed -e "s/,/ /g"`; do if test x"$sim_profile" = x; then - sim_profile="-DWITH_PROFILE='(PROFILE_$x" + sim_profile="(PROFILE_$x" else sim_profile="${sim_profile}|PROFILE_$x" fi done - sim_profile="$sim_profile)'" ;; + sim_profile="$sim_profile)" ;; esac -if test x"$silent" != x"yes" && test x"$sim_profile" != x""; then - echo "Setting sim profile = $sim_profile" 6>&1 -fi -else - sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1" fi +cat >>confdefs.h <<_ACEOF +#define PROFILE $profile +_ACEOF +cat >>confdefs.h <<_ACEOF +#define WITH_PROFILE $sim_profile +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_profile" >&5 +$as_echo "$sim_profile" >&6; } + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable sim asserts" >&5 +$as_echo_n "checking whether to enable sim asserts... " >&6; } +sim_assert="1" # Check whether --enable-sim-assert was given. if test "${enable_sim_assert+set}" = set; then : enableval=$enable_sim_assert; case "${enableval}" in - yes) sim_assert="-DWITH_ASSERT=1";; - no) sim_assert="-DWITH_ASSERT=0";; - *) as_fn_error "\"--enable-sim-assert does not take a value\"" "$LINENO" 5; sim_assert="";; + yes) sim_assert="1";; + no) sim_assert="0";; + *) as_fn_error "--enable-sim-assert does not take a value" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_assert" != x""; then - echo "Setting assert flags = $sim_assert" 6>&1 -fi -else - sim_assert="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_ASSERT $sim_assert +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_assert" >&5 +$as_echo "$sim_assert" >&6; } + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking default sim environment setting" >&5 +$as_echo_n "checking default sim environment setting... " >&6; } +sim_environment="ALL_ENVIRONMENT" # 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="";; + all | ALL) sim_environment="ALL_ENVIRONMENT";; + user | USER) sim_environment="USER_ENVIRONMENT";; + virtual | VIRTUAL) sim_environment="VIRTUAL_ENVIRONMENT";; + operating | OPERATING) sim_environment="OPERATING_ENVIRONMENT";; + *) as_fn_error "Unknown value $enableval passed to --enable-sim-environment" "$LINENO" 5;; 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 +cat >>confdefs.h <<_ACEOF +#define WITH_ENVIRONMENT $sim_environment +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_environment" >&5 +$as_echo "$sim_environment" >&6; } + sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. diff --git a/sim/erc32/ChangeLog b/sim/erc32/ChangeLog index aedefb8..c8f75f7 100644 --- a/sim/erc32/ChangeLog +++ b/sim/erc32/ChangeLog @@ -1,5 +1,9 @@ 2016-01-10 Mike Frysinger <vapier@gentoo.org> + * config.in, configure: Regenerate. + +2016-01-10 Mike Frysinger <vapier@gentoo.org> + * configure: Regenerate. 2016-01-10 Mike Frysinger <vapier@gentoo.org> diff --git a/sim/erc32/config.in b/sim/erc32/config.in index f24eb3b..aa3e45c 100644 --- a/sim/erc32/config.in +++ b/sim/erc32/config.in @@ -3,6 +3,9 @@ /* Define if building universal (internal helper macro) */ #undef AC_APPLE_UNIVERSAL_BUILD +/* Sim debug setting */ +#undef DEBUG + /* Define to 1 if translation of program messages to the user's native language is requested. */ #undef ENABLE_NLS @@ -170,6 +173,9 @@ /* Additional package description */ #undef PKGVERSION +/* Sim profile settings */ +#undef PROFILE + /* Bug reporting address */ #undef REPORT_BUGS_TO @@ -201,6 +207,24 @@ #endif +/* Sim assert settings */ +#undef WITH_ASSERT + +/* Sim debug setting */ +#undef WITH_DEBUG + +/* Sim default environment */ +#undef WITH_ENVIRONMENT + +/* Sim profile settings */ +#undef WITH_PROFILE + +/* How to route I/O */ +#undef WITH_STDIO + +/* Sim trace settings */ +#undef WITH_TRACE + /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ #if defined AC_APPLE_UNIVERSAL_BUILD diff --git a/sim/erc32/configure b/sim/erc32/configure index e7a4840..8f9a558 100755 --- a/sim/erc32/configure +++ b/sim/erc32/configure @@ -606,10 +606,6 @@ TERMCAP REPORT_BUGS_TEXI REPORT_BUGS_TO PKGVERSION -sim_profile -sim_trace -sim_stdio -sim_debug MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -684,8 +680,6 @@ CFLAGS CC WERROR_CFLAGS WARN_CFLAGS -sim_xor_endian -sim_smp sim_reserved_bits sim_inline sim_hw @@ -696,9 +690,7 @@ sim_scache sim_float sim_endian sim_bitsize -sim_assert sim_alignment -sim_environment target_alias host_alias build_alias @@ -4019,10 +4011,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - # intl sister-directory configuration rules. # @@ -12830,7 +12818,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12833 "configure" +#line 12821 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12936,7 +12924,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12939 "configure" +#line 12927 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13204,124 +13192,164 @@ fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim debug setting" >&5 +$as_echo_n "checking for sim debug setting... " >&6; } +sim_debug="0" # Check whether --enable-sim-debug was given. if test "${enable_sim_debug+set}" = set; then : enableval=$enable_sim_debug; case "${enableval}" in - yes) sim_debug="-DDEBUG=7 -DWITH_DEBUG=7";; - no) sim_debug="-DDEBUG=0 -DWITH_DEBUG=0";; - *) sim_debug="-DDEBUG='(${enableval})' -DWITH_DEBUG='(${enableval})'";; + yes) sim_debug="7";; + no) sim_debug="0";; + *) sim_debug="($enableval)";; esac -if test x"$silent" != x"yes" && test x"$sim_debug" != x""; then - echo "Setting sim debug = $sim_debug" 6>&1 fi -else - sim_debug="" +if test "$sim_debug" != "0"; then + +cat >>confdefs.h <<_ACEOF +#define DEBUG $sim_debug +_ACEOF + fi +cat >>confdefs.h <<_ACEOF +#define WITH_DEBUG $sim_debug +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_debug" >&5 +$as_echo "$sim_debug" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim stdio debug behavior" >&5 +$as_echo_n "checking for sim stdio debug behavior... " >&6; } +sim_stdio="0" # Check whether --enable-sim-stdio was given. if test "${enable_sim_stdio+set}" = set; then : enableval=$enable_sim_stdio; case "${enableval}" in - yes) sim_stdio="-DWITH_STDIO=DO_USE_STDIO";; - no) sim_stdio="-DWITH_STDIO=DONT_USE_STDIO";; - *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-stdio\"" "$LINENO" 5; sim_stdio="";; + yes) sim_stdio="DO_USE_STDIO";; + no) sim_stdio="DONT_USE_STDIO";; + *) as_fn_error "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_stdio" != x""; then - echo "Setting stdio flags = $sim_stdio" 6>&1 -fi -else - sim_stdio="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_STDIO $sim_stdio +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_stdio" >&5 +$as_echo "$sim_stdio" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim trace settings" >&5 +$as_echo_n "checking for sim trace settings... " >&6; } +sim_trace="~TRACE_debug" # Check whether --enable-sim-trace was given. if test "${enable_sim_trace+set}" = set; then : enableval=$enable_sim_trace; case "${enableval}" in - yes) sim_trace="-DWITH_TRACE=-1";; - no) sim_trace="-DWITH_TRACE=0";; + yes) sim_trace="-1";; + no) sim_trace="0";; [-0-9]*) - sim_trace="-DWITH_TRACE='(${enableval})'";; + sim_trace="'(${enableval})'";; [[:lower:]]*) sim_trace="" for x in `echo "$enableval" | sed -e "s/,/ /g"`; do if test x"$sim_trace" = x; then - sim_trace="-DWITH_TRACE='(TRACE_$x" + sim_trace="(TRACE_$x" else sim_trace="${sim_trace}|TRACE_$x" fi done - sim_trace="$sim_trace)'" ;; + sim_trace="$sim_trace)" ;; esac -if test x"$silent" != x"yes" && test x"$sim_trace" != x""; then - echo "Setting sim trace = $sim_trace" 6>&1 -fi -else - sim_trace="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_TRACE $sim_trace +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_trace" >&5 +$as_echo "$sim_trace" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim profile settings" >&5 +$as_echo_n "checking for sim profile settings... " >&6; } +profile="1" +sim_profile="-1" # Check whether --enable-sim-profile was given. if test "${enable_sim_profile+set}" = set; then : enableval=$enable_sim_profile; case "${enableval}" in - yes) sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1";; - no) sim_profile="-DPROFILE=0 -DWITH_PROFILE=0";; + yes) profile="1" sim_profile="-1";; + no) profile="0" sim_profile="0";; [-0-9]*) - sim_profile="-DPROFILE='(${enableval})' -DWITH_PROFILE='(${enableval})'";; + profile="(${enableval})" sim_profile="(${enableval})";; [a-z]*) + profile="1" sim_profile="" for x in `echo "$enableval" | sed -e "s/,/ /g"`; do if test x"$sim_profile" = x; then - sim_profile="-DWITH_PROFILE='(PROFILE_$x" + sim_profile="(PROFILE_$x" else sim_profile="${sim_profile}|PROFILE_$x" fi done - sim_profile="$sim_profile)'" ;; + sim_profile="$sim_profile)" ;; esac -if test x"$silent" != x"yes" && test x"$sim_profile" != x""; then - echo "Setting sim profile = $sim_profile" 6>&1 -fi -else - sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1" fi +cat >>confdefs.h <<_ACEOF +#define PROFILE $profile +_ACEOF +cat >>confdefs.h <<_ACEOF +#define WITH_PROFILE $sim_profile +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_profile" >&5 +$as_echo "$sim_profile" >&6; } + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable sim asserts" >&5 +$as_echo_n "checking whether to enable sim asserts... " >&6; } +sim_assert="1" # Check whether --enable-sim-assert was given. if test "${enable_sim_assert+set}" = set; then : enableval=$enable_sim_assert; case "${enableval}" in - yes) sim_assert="-DWITH_ASSERT=1";; - no) sim_assert="-DWITH_ASSERT=0";; - *) as_fn_error "\"--enable-sim-assert does not take a value\"" "$LINENO" 5; sim_assert="";; + yes) sim_assert="1";; + no) sim_assert="0";; + *) as_fn_error "--enable-sim-assert does not take a value" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_assert" != x""; then - echo "Setting assert flags = $sim_assert" 6>&1 -fi -else - sim_assert="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_ASSERT $sim_assert +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_assert" >&5 +$as_echo "$sim_assert" >&6; } + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking default sim environment setting" >&5 +$as_echo_n "checking default sim environment setting... " >&6; } +sim_environment="ALL_ENVIRONMENT" # 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="";; + all | ALL) sim_environment="ALL_ENVIRONMENT";; + user | USER) sim_environment="USER_ENVIRONMENT";; + virtual | VIRTUAL) sim_environment="VIRTUAL_ENVIRONMENT";; + operating | OPERATING) sim_environment="OPERATING_ENVIRONMENT";; + *) as_fn_error "Unknown value $enableval passed to --enable-sim-environment" "$LINENO" 5;; 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 +cat >>confdefs.h <<_ACEOF +#define WITH_ENVIRONMENT $sim_environment +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_environment" >&5 +$as_echo "$sim_environment" >&6; } + sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. diff --git a/sim/frv/ChangeLog b/sim/frv/ChangeLog index 4382806..1642a26 100644 --- a/sim/frv/ChangeLog +++ b/sim/frv/ChangeLog @@ -1,5 +1,9 @@ 2016-01-10 Mike Frysinger <vapier@gentoo.org> + * config.in, 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/config.in b/sim/frv/config.in index 6a83434..3fd3cde 100644 --- a/sim/frv/config.in +++ b/sim/frv/config.in @@ -3,6 +3,9 @@ /* Define if building universal (internal helper macro) */ #undef AC_APPLE_UNIVERSAL_BUILD +/* Sim debug setting */ +#undef DEBUG + /* Define to 1 if translation of program messages to the user's native language is requested. */ #undef ENABLE_NLS @@ -176,6 +179,9 @@ /* Additional package description */ #undef PKGVERSION +/* Sim profile settings */ +#undef PROFILE + /* Bug reporting address */ #undef REPORT_BUGS_TO @@ -207,6 +213,24 @@ #endif +/* Sim assert settings */ +#undef WITH_ASSERT + +/* Sim debug setting */ +#undef WITH_DEBUG + +/* Sim default environment */ +#undef WITH_ENVIRONMENT + +/* Sim profile settings */ +#undef WITH_PROFILE + +/* How to route I/O */ +#undef WITH_STDIO + +/* Sim trace settings */ +#undef WITH_TRACE + /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ #if defined AC_APPLE_UNIVERSAL_BUILD diff --git a/sim/frv/configure b/sim/frv/configure index fb708ee..81da83c 100755 --- a/sim/frv/configure +++ b/sim/frv/configure @@ -608,10 +608,6 @@ CGEN_MAINT REPORT_BUGS_TEXI REPORT_BUGS_TO PKGVERSION -sim_profile -sim_trace -sim_stdio -sim_debug MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -686,8 +682,6 @@ CFLAGS CC WERROR_CFLAGS WARN_CFLAGS -sim_xor_endian -sim_smp sim_reserved_bits sim_inline sim_hw @@ -698,9 +692,7 @@ sim_scache sim_float sim_endian sim_bitsize -sim_assert sim_alignment -sim_environment target_alias host_alias build_alias @@ -4041,10 +4033,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - # intl sister-directory configuration rules. # @@ -12852,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 12855 "configure" +#line 12843 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12958,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 12961 "configure" +#line 12949 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13226,124 +13214,164 @@ fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim debug setting" >&5 +$as_echo_n "checking for sim debug setting... " >&6; } +sim_debug="0" # Check whether --enable-sim-debug was given. if test "${enable_sim_debug+set}" = set; then : enableval=$enable_sim_debug; case "${enableval}" in - yes) sim_debug="-DDEBUG=7 -DWITH_DEBUG=7";; - no) sim_debug="-DDEBUG=0 -DWITH_DEBUG=0";; - *) sim_debug="-DDEBUG='(${enableval})' -DWITH_DEBUG='(${enableval})'";; + yes) sim_debug="7";; + no) sim_debug="0";; + *) sim_debug="($enableval)";; esac -if test x"$silent" != x"yes" && test x"$sim_debug" != x""; then - echo "Setting sim debug = $sim_debug" 6>&1 fi -else - sim_debug="" +if test "$sim_debug" != "0"; then + +cat >>confdefs.h <<_ACEOF +#define DEBUG $sim_debug +_ACEOF + fi +cat >>confdefs.h <<_ACEOF +#define WITH_DEBUG $sim_debug +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_debug" >&5 +$as_echo "$sim_debug" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim stdio debug behavior" >&5 +$as_echo_n "checking for sim stdio debug behavior... " >&6; } +sim_stdio="0" # Check whether --enable-sim-stdio was given. if test "${enable_sim_stdio+set}" = set; then : enableval=$enable_sim_stdio; case "${enableval}" in - yes) sim_stdio="-DWITH_STDIO=DO_USE_STDIO";; - no) sim_stdio="-DWITH_STDIO=DONT_USE_STDIO";; - *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-stdio\"" "$LINENO" 5; sim_stdio="";; + yes) sim_stdio="DO_USE_STDIO";; + no) sim_stdio="DONT_USE_STDIO";; + *) as_fn_error "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_stdio" != x""; then - echo "Setting stdio flags = $sim_stdio" 6>&1 -fi -else - sim_stdio="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_STDIO $sim_stdio +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_stdio" >&5 +$as_echo "$sim_stdio" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim trace settings" >&5 +$as_echo_n "checking for sim trace settings... " >&6; } +sim_trace="~TRACE_debug" # Check whether --enable-sim-trace was given. if test "${enable_sim_trace+set}" = set; then : enableval=$enable_sim_trace; case "${enableval}" in - yes) sim_trace="-DWITH_TRACE=-1";; - no) sim_trace="-DWITH_TRACE=0";; + yes) sim_trace="-1";; + no) sim_trace="0";; [-0-9]*) - sim_trace="-DWITH_TRACE='(${enableval})'";; + sim_trace="'(${enableval})'";; [[:lower:]]*) sim_trace="" for x in `echo "$enableval" | sed -e "s/,/ /g"`; do if test x"$sim_trace" = x; then - sim_trace="-DWITH_TRACE='(TRACE_$x" + sim_trace="(TRACE_$x" else sim_trace="${sim_trace}|TRACE_$x" fi done - sim_trace="$sim_trace)'" ;; + sim_trace="$sim_trace)" ;; esac -if test x"$silent" != x"yes" && test x"$sim_trace" != x""; then - echo "Setting sim trace = $sim_trace" 6>&1 -fi -else - sim_trace="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_TRACE $sim_trace +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_trace" >&5 +$as_echo "$sim_trace" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim profile settings" >&5 +$as_echo_n "checking for sim profile settings... " >&6; } +profile="1" +sim_profile="-1" # Check whether --enable-sim-profile was given. if test "${enable_sim_profile+set}" = set; then : enableval=$enable_sim_profile; case "${enableval}" in - yes) sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1";; - no) sim_profile="-DPROFILE=0 -DWITH_PROFILE=0";; + yes) profile="1" sim_profile="-1";; + no) profile="0" sim_profile="0";; [-0-9]*) - sim_profile="-DPROFILE='(${enableval})' -DWITH_PROFILE='(${enableval})'";; + profile="(${enableval})" sim_profile="(${enableval})";; [a-z]*) + profile="1" sim_profile="" for x in `echo "$enableval" | sed -e "s/,/ /g"`; do if test x"$sim_profile" = x; then - sim_profile="-DWITH_PROFILE='(PROFILE_$x" + sim_profile="(PROFILE_$x" else sim_profile="${sim_profile}|PROFILE_$x" fi done - sim_profile="$sim_profile)'" ;; + sim_profile="$sim_profile)" ;; esac -if test x"$silent" != x"yes" && test x"$sim_profile" != x""; then - echo "Setting sim profile = $sim_profile" 6>&1 -fi -else - sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1" fi +cat >>confdefs.h <<_ACEOF +#define PROFILE $profile +_ACEOF +cat >>confdefs.h <<_ACEOF +#define WITH_PROFILE $sim_profile +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_profile" >&5 +$as_echo "$sim_profile" >&6; } + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable sim asserts" >&5 +$as_echo_n "checking whether to enable sim asserts... " >&6; } +sim_assert="1" # Check whether --enable-sim-assert was given. if test "${enable_sim_assert+set}" = set; then : enableval=$enable_sim_assert; case "${enableval}" in - yes) sim_assert="-DWITH_ASSERT=1";; - no) sim_assert="-DWITH_ASSERT=0";; - *) as_fn_error "\"--enable-sim-assert does not take a value\"" "$LINENO" 5; sim_assert="";; + yes) sim_assert="1";; + no) sim_assert="0";; + *) as_fn_error "--enable-sim-assert does not take a value" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_assert" != x""; then - echo "Setting assert flags = $sim_assert" 6>&1 -fi -else - sim_assert="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_ASSERT $sim_assert +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_assert" >&5 +$as_echo "$sim_assert" >&6; } + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking default sim environment setting" >&5 +$as_echo_n "checking default sim environment setting... " >&6; } +sim_environment="ALL_ENVIRONMENT" # 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="";; + all | ALL) sim_environment="ALL_ENVIRONMENT";; + user | USER) sim_environment="USER_ENVIRONMENT";; + virtual | VIRTUAL) sim_environment="VIRTUAL_ENVIRONMENT";; + operating | OPERATING) sim_environment="OPERATING_ENVIRONMENT";; + *) as_fn_error "Unknown value $enableval passed to --enable-sim-environment" "$LINENO" 5;; 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 +cat >>confdefs.h <<_ACEOF +#define WITH_ENVIRONMENT $sim_environment +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_environment" >&5 +$as_echo "$sim_environment" >&6; } + sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. diff --git a/sim/ft32/ChangeLog b/sim/ft32/ChangeLog index eba0b15..f694e2c 100644 --- a/sim/ft32/ChangeLog +++ b/sim/ft32/ChangeLog @@ -1,5 +1,9 @@ 2016-01-10 Mike Frysinger <vapier@gentoo.org> + * config.in, 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/config.in b/sim/ft32/config.in index f24eb3b..aa3e45c 100644 --- a/sim/ft32/config.in +++ b/sim/ft32/config.in @@ -3,6 +3,9 @@ /* Define if building universal (internal helper macro) */ #undef AC_APPLE_UNIVERSAL_BUILD +/* Sim debug setting */ +#undef DEBUG + /* Define to 1 if translation of program messages to the user's native language is requested. */ #undef ENABLE_NLS @@ -170,6 +173,9 @@ /* Additional package description */ #undef PKGVERSION +/* Sim profile settings */ +#undef PROFILE + /* Bug reporting address */ #undef REPORT_BUGS_TO @@ -201,6 +207,24 @@ #endif +/* Sim assert settings */ +#undef WITH_ASSERT + +/* Sim debug setting */ +#undef WITH_DEBUG + +/* Sim default environment */ +#undef WITH_ENVIRONMENT + +/* Sim profile settings */ +#undef WITH_PROFILE + +/* How to route I/O */ +#undef WITH_STDIO + +/* Sim trace settings */ +#undef WITH_TRACE + /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ #if defined AC_APPLE_UNIVERSAL_BUILD diff --git a/sim/ft32/configure b/sim/ft32/configure index 557b4b2..340bcb4 100755 --- a/sim/ft32/configure +++ b/sim/ft32/configure @@ -604,10 +604,6 @@ cgen_breaks REPORT_BUGS_TEXI REPORT_BUGS_TO PKGVERSION -sim_profile -sim_trace -sim_stdio -sim_debug MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -682,8 +678,6 @@ CFLAGS CC WERROR_CFLAGS WARN_CFLAGS -sim_xor_endian -sim_smp sim_reserved_bits sim_inline sim_hw @@ -694,9 +688,7 @@ sim_scache sim_float sim_endian sim_bitsize -sim_assert sim_alignment -sim_environment target_alias host_alias build_alias @@ -4032,10 +4024,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - # intl sister-directory configuration rules. # @@ -12843,7 +12831,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12846 "configure" +#line 12834 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12949,7 +12937,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12952 "configure" +#line 12940 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13217,124 +13205,164 @@ fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim debug setting" >&5 +$as_echo_n "checking for sim debug setting... " >&6; } +sim_debug="0" # Check whether --enable-sim-debug was given. if test "${enable_sim_debug+set}" = set; then : enableval=$enable_sim_debug; case "${enableval}" in - yes) sim_debug="-DDEBUG=7 -DWITH_DEBUG=7";; - no) sim_debug="-DDEBUG=0 -DWITH_DEBUG=0";; - *) sim_debug="-DDEBUG='(${enableval})' -DWITH_DEBUG='(${enableval})'";; + yes) sim_debug="7";; + no) sim_debug="0";; + *) sim_debug="($enableval)";; esac -if test x"$silent" != x"yes" && test x"$sim_debug" != x""; then - echo "Setting sim debug = $sim_debug" 6>&1 fi -else - sim_debug="" +if test "$sim_debug" != "0"; then + +cat >>confdefs.h <<_ACEOF +#define DEBUG $sim_debug +_ACEOF + fi +cat >>confdefs.h <<_ACEOF +#define WITH_DEBUG $sim_debug +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_debug" >&5 +$as_echo "$sim_debug" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim stdio debug behavior" >&5 +$as_echo_n "checking for sim stdio debug behavior... " >&6; } +sim_stdio="0" # Check whether --enable-sim-stdio was given. if test "${enable_sim_stdio+set}" = set; then : enableval=$enable_sim_stdio; case "${enableval}" in - yes) sim_stdio="-DWITH_STDIO=DO_USE_STDIO";; - no) sim_stdio="-DWITH_STDIO=DONT_USE_STDIO";; - *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-stdio\"" "$LINENO" 5; sim_stdio="";; + yes) sim_stdio="DO_USE_STDIO";; + no) sim_stdio="DONT_USE_STDIO";; + *) as_fn_error "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_stdio" != x""; then - echo "Setting stdio flags = $sim_stdio" 6>&1 -fi -else - sim_stdio="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_STDIO $sim_stdio +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_stdio" >&5 +$as_echo "$sim_stdio" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim trace settings" >&5 +$as_echo_n "checking for sim trace settings... " >&6; } +sim_trace="~TRACE_debug" # Check whether --enable-sim-trace was given. if test "${enable_sim_trace+set}" = set; then : enableval=$enable_sim_trace; case "${enableval}" in - yes) sim_trace="-DWITH_TRACE=-1";; - no) sim_trace="-DWITH_TRACE=0";; + yes) sim_trace="-1";; + no) sim_trace="0";; [-0-9]*) - sim_trace="-DWITH_TRACE='(${enableval})'";; + sim_trace="'(${enableval})'";; [[:lower:]]*) sim_trace="" for x in `echo "$enableval" | sed -e "s/,/ /g"`; do if test x"$sim_trace" = x; then - sim_trace="-DWITH_TRACE='(TRACE_$x" + sim_trace="(TRACE_$x" else sim_trace="${sim_trace}|TRACE_$x" fi done - sim_trace="$sim_trace)'" ;; + sim_trace="$sim_trace)" ;; esac -if test x"$silent" != x"yes" && test x"$sim_trace" != x""; then - echo "Setting sim trace = $sim_trace" 6>&1 -fi -else - sim_trace="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_TRACE $sim_trace +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_trace" >&5 +$as_echo "$sim_trace" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim profile settings" >&5 +$as_echo_n "checking for sim profile settings... " >&6; } +profile="1" +sim_profile="-1" # Check whether --enable-sim-profile was given. if test "${enable_sim_profile+set}" = set; then : enableval=$enable_sim_profile; case "${enableval}" in - yes) sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1";; - no) sim_profile="-DPROFILE=0 -DWITH_PROFILE=0";; + yes) profile="1" sim_profile="-1";; + no) profile="0" sim_profile="0";; [-0-9]*) - sim_profile="-DPROFILE='(${enableval})' -DWITH_PROFILE='(${enableval})'";; + profile="(${enableval})" sim_profile="(${enableval})";; [a-z]*) + profile="1" sim_profile="" for x in `echo "$enableval" | sed -e "s/,/ /g"`; do if test x"$sim_profile" = x; then - sim_profile="-DWITH_PROFILE='(PROFILE_$x" + sim_profile="(PROFILE_$x" else sim_profile="${sim_profile}|PROFILE_$x" fi done - sim_profile="$sim_profile)'" ;; + sim_profile="$sim_profile)" ;; esac -if test x"$silent" != x"yes" && test x"$sim_profile" != x""; then - echo "Setting sim profile = $sim_profile" 6>&1 -fi -else - sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1" fi +cat >>confdefs.h <<_ACEOF +#define PROFILE $profile +_ACEOF +cat >>confdefs.h <<_ACEOF +#define WITH_PROFILE $sim_profile +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_profile" >&5 +$as_echo "$sim_profile" >&6; } + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable sim asserts" >&5 +$as_echo_n "checking whether to enable sim asserts... " >&6; } +sim_assert="1" # Check whether --enable-sim-assert was given. if test "${enable_sim_assert+set}" = set; then : enableval=$enable_sim_assert; case "${enableval}" in - yes) sim_assert="-DWITH_ASSERT=1";; - no) sim_assert="-DWITH_ASSERT=0";; - *) as_fn_error "\"--enable-sim-assert does not take a value\"" "$LINENO" 5; sim_assert="";; + yes) sim_assert="1";; + no) sim_assert="0";; + *) as_fn_error "--enable-sim-assert does not take a value" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_assert" != x""; then - echo "Setting assert flags = $sim_assert" 6>&1 -fi -else - sim_assert="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_ASSERT $sim_assert +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_assert" >&5 +$as_echo "$sim_assert" >&6; } + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking default sim environment setting" >&5 +$as_echo_n "checking default sim environment setting... " >&6; } +sim_environment="ALL_ENVIRONMENT" # 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="";; + all | ALL) sim_environment="ALL_ENVIRONMENT";; + user | USER) sim_environment="USER_ENVIRONMENT";; + virtual | VIRTUAL) sim_environment="VIRTUAL_ENVIRONMENT";; + operating | OPERATING) sim_environment="OPERATING_ENVIRONMENT";; + *) as_fn_error "Unknown value $enableval passed to --enable-sim-environment" "$LINENO" 5;; 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 +cat >>confdefs.h <<_ACEOF +#define WITH_ENVIRONMENT $sim_environment +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_environment" >&5 +$as_echo "$sim_environment" >&6; } + sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. diff --git a/sim/h8300/ChangeLog b/sim/h8300/ChangeLog index a3cde14..0f85069 100644 --- a/sim/h8300/ChangeLog +++ b/sim/h8300/ChangeLog @@ -1,5 +1,9 @@ 2016-01-10 Mike Frysinger <vapier@gentoo.org> + * config.in, configure: Regenerate. + +2016-01-10 Mike Frysinger <vapier@gentoo.org> + * configure: Regenerate. 2016-01-10 Mike Frysinger <vapier@gentoo.org> diff --git a/sim/h8300/config.in b/sim/h8300/config.in index f4d3978..2754ebf 100644 --- a/sim/h8300/config.in +++ b/sim/h8300/config.in @@ -3,6 +3,9 @@ /* Define if building universal (internal helper macro) */ #undef AC_APPLE_UNIVERSAL_BUILD +/* Sim debug setting */ +#undef DEBUG + /* Define to 1 if translation of program messages to the user's native language is requested. */ #undef ENABLE_NLS @@ -173,6 +176,9 @@ /* Additional package description */ #undef PKGVERSION +/* Sim profile settings */ +#undef PROFILE + /* Bug reporting address */ #undef REPORT_BUGS_TO @@ -204,6 +210,24 @@ #endif +/* Sim assert settings */ +#undef WITH_ASSERT + +/* Sim debug setting */ +#undef WITH_DEBUG + +/* Sim default environment */ +#undef WITH_ENVIRONMENT + +/* Sim profile settings */ +#undef WITH_PROFILE + +/* How to route I/O */ +#undef WITH_STDIO + +/* Sim trace settings */ +#undef WITH_TRACE + /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ #if defined AC_APPLE_UNIVERSAL_BUILD diff --git a/sim/h8300/configure b/sim/h8300/configure index d01758c..b65c65e 100755 --- a/sim/h8300/configure +++ b/sim/h8300/configure @@ -604,10 +604,6 @@ cgen_breaks REPORT_BUGS_TEXI REPORT_BUGS_TO PKGVERSION -sim_profile -sim_trace -sim_stdio -sim_debug MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -682,8 +678,6 @@ CFLAGS CC WERROR_CFLAGS WARN_CFLAGS -sim_xor_endian -sim_smp sim_reserved_bits sim_inline sim_hw @@ -694,9 +688,7 @@ sim_scache sim_float sim_endian sim_bitsize -sim_assert sim_alignment -sim_environment target_alias host_alias build_alias @@ -4024,10 +4016,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - # intl sister-directory configuration rules. # @@ -12835,7 +12823,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12838 "configure" +#line 12826 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12941,7 +12929,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12944 "configure" +#line 12932 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13209,124 +13197,164 @@ fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim debug setting" >&5 +$as_echo_n "checking for sim debug setting... " >&6; } +sim_debug="0" # Check whether --enable-sim-debug was given. if test "${enable_sim_debug+set}" = set; then : enableval=$enable_sim_debug; case "${enableval}" in - yes) sim_debug="-DDEBUG=7 -DWITH_DEBUG=7";; - no) sim_debug="-DDEBUG=0 -DWITH_DEBUG=0";; - *) sim_debug="-DDEBUG='(${enableval})' -DWITH_DEBUG='(${enableval})'";; + yes) sim_debug="7";; + no) sim_debug="0";; + *) sim_debug="($enableval)";; esac -if test x"$silent" != x"yes" && test x"$sim_debug" != x""; then - echo "Setting sim debug = $sim_debug" 6>&1 fi -else - sim_debug="" +if test "$sim_debug" != "0"; then + +cat >>confdefs.h <<_ACEOF +#define DEBUG $sim_debug +_ACEOF + fi +cat >>confdefs.h <<_ACEOF +#define WITH_DEBUG $sim_debug +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_debug" >&5 +$as_echo "$sim_debug" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim stdio debug behavior" >&5 +$as_echo_n "checking for sim stdio debug behavior... " >&6; } +sim_stdio="0" # Check whether --enable-sim-stdio was given. if test "${enable_sim_stdio+set}" = set; then : enableval=$enable_sim_stdio; case "${enableval}" in - yes) sim_stdio="-DWITH_STDIO=DO_USE_STDIO";; - no) sim_stdio="-DWITH_STDIO=DONT_USE_STDIO";; - *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-stdio\"" "$LINENO" 5; sim_stdio="";; + yes) sim_stdio="DO_USE_STDIO";; + no) sim_stdio="DONT_USE_STDIO";; + *) as_fn_error "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_stdio" != x""; then - echo "Setting stdio flags = $sim_stdio" 6>&1 -fi -else - sim_stdio="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_STDIO $sim_stdio +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_stdio" >&5 +$as_echo "$sim_stdio" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim trace settings" >&5 +$as_echo_n "checking for sim trace settings... " >&6; } +sim_trace="~TRACE_debug" # Check whether --enable-sim-trace was given. if test "${enable_sim_trace+set}" = set; then : enableval=$enable_sim_trace; case "${enableval}" in - yes) sim_trace="-DWITH_TRACE=-1";; - no) sim_trace="-DWITH_TRACE=0";; + yes) sim_trace="-1";; + no) sim_trace="0";; [-0-9]*) - sim_trace="-DWITH_TRACE='(${enableval})'";; + sim_trace="'(${enableval})'";; [[:lower:]]*) sim_trace="" for x in `echo "$enableval" | sed -e "s/,/ /g"`; do if test x"$sim_trace" = x; then - sim_trace="-DWITH_TRACE='(TRACE_$x" + sim_trace="(TRACE_$x" else sim_trace="${sim_trace}|TRACE_$x" fi done - sim_trace="$sim_trace)'" ;; + sim_trace="$sim_trace)" ;; esac -if test x"$silent" != x"yes" && test x"$sim_trace" != x""; then - echo "Setting sim trace = $sim_trace" 6>&1 -fi -else - sim_trace="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_TRACE $sim_trace +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_trace" >&5 +$as_echo "$sim_trace" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim profile settings" >&5 +$as_echo_n "checking for sim profile settings... " >&6; } +profile="1" +sim_profile="-1" # Check whether --enable-sim-profile was given. if test "${enable_sim_profile+set}" = set; then : enableval=$enable_sim_profile; case "${enableval}" in - yes) sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1";; - no) sim_profile="-DPROFILE=0 -DWITH_PROFILE=0";; + yes) profile="1" sim_profile="-1";; + no) profile="0" sim_profile="0";; [-0-9]*) - sim_profile="-DPROFILE='(${enableval})' -DWITH_PROFILE='(${enableval})'";; + profile="(${enableval})" sim_profile="(${enableval})";; [a-z]*) + profile="1" sim_profile="" for x in `echo "$enableval" | sed -e "s/,/ /g"`; do if test x"$sim_profile" = x; then - sim_profile="-DWITH_PROFILE='(PROFILE_$x" + sim_profile="(PROFILE_$x" else sim_profile="${sim_profile}|PROFILE_$x" fi done - sim_profile="$sim_profile)'" ;; + sim_profile="$sim_profile)" ;; esac -if test x"$silent" != x"yes" && test x"$sim_profile" != x""; then - echo "Setting sim profile = $sim_profile" 6>&1 -fi -else - sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1" fi +cat >>confdefs.h <<_ACEOF +#define PROFILE $profile +_ACEOF +cat >>confdefs.h <<_ACEOF +#define WITH_PROFILE $sim_profile +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_profile" >&5 +$as_echo "$sim_profile" >&6; } + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable sim asserts" >&5 +$as_echo_n "checking whether to enable sim asserts... " >&6; } +sim_assert="1" # Check whether --enable-sim-assert was given. if test "${enable_sim_assert+set}" = set; then : enableval=$enable_sim_assert; case "${enableval}" in - yes) sim_assert="-DWITH_ASSERT=1";; - no) sim_assert="-DWITH_ASSERT=0";; - *) as_fn_error "\"--enable-sim-assert does not take a value\"" "$LINENO" 5; sim_assert="";; + yes) sim_assert="1";; + no) sim_assert="0";; + *) as_fn_error "--enable-sim-assert does not take a value" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_assert" != x""; then - echo "Setting assert flags = $sim_assert" 6>&1 -fi -else - sim_assert="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_ASSERT $sim_assert +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_assert" >&5 +$as_echo "$sim_assert" >&6; } + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking default sim environment setting" >&5 +$as_echo_n "checking default sim environment setting... " >&6; } +sim_environment="ALL_ENVIRONMENT" # 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="";; + all | ALL) sim_environment="ALL_ENVIRONMENT";; + user | USER) sim_environment="USER_ENVIRONMENT";; + virtual | VIRTUAL) sim_environment="VIRTUAL_ENVIRONMENT";; + operating | OPERATING) sim_environment="OPERATING_ENVIRONMENT";; + *) as_fn_error "Unknown value $enableval passed to --enable-sim-environment" "$LINENO" 5;; 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 +cat >>confdefs.h <<_ACEOF +#define WITH_ENVIRONMENT $sim_environment +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_environment" >&5 +$as_echo "$sim_environment" >&6; } + sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. diff --git a/sim/igen/ChangeLog b/sim/igen/ChangeLog index 0da239a..932633e 100644 --- a/sim/igen/ChangeLog +++ b/sim/igen/ChangeLog @@ -10,6 +10,10 @@ * configure: Regenerate. +2016-01-10 Mike Frysinger <vapier@gentoo.org> + + * configure: Regenerate. + 2016-01-04 Mike Frysinger <vapier@gentoo.org> * configure: Regenerate. diff --git a/sim/igen/configure b/sim/igen/configure index 52d4bdb..41423d9 100755 --- a/sim/igen/configure +++ b/sim/igen/configure @@ -625,8 +625,6 @@ INSTALL_SCRIPT INSTALL_PROGRAM WERROR_CFLAGS WARN_CFLAGS -sim_xor_endian -sim_smp sim_reserved_bits sim_inline sim_hw @@ -637,9 +635,7 @@ sim_scache sim_float sim_endian sim_bitsize -sim_assert sim_alignment -sim_environment target_alias host_alias build_alias @@ -3741,10 +3737,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - # intl sister-directory configuration rules. # diff --git a/sim/iq2000/ChangeLog b/sim/iq2000/ChangeLog index c715414..5e91cbd 100644 --- a/sim/iq2000/ChangeLog +++ b/sim/iq2000/ChangeLog @@ -1,5 +1,9 @@ 2016-01-10 Mike Frysinger <vapier@gentoo.org> + * config.in, 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/config.in b/sim/iq2000/config.in index 6a83434..3fd3cde 100644 --- a/sim/iq2000/config.in +++ b/sim/iq2000/config.in @@ -3,6 +3,9 @@ /* Define if building universal (internal helper macro) */ #undef AC_APPLE_UNIVERSAL_BUILD +/* Sim debug setting */ +#undef DEBUG + /* Define to 1 if translation of program messages to the user's native language is requested. */ #undef ENABLE_NLS @@ -176,6 +179,9 @@ /* Additional package description */ #undef PKGVERSION +/* Sim profile settings */ +#undef PROFILE + /* Bug reporting address */ #undef REPORT_BUGS_TO @@ -207,6 +213,24 @@ #endif +/* Sim assert settings */ +#undef WITH_ASSERT + +/* Sim debug setting */ +#undef WITH_DEBUG + +/* Sim default environment */ +#undef WITH_ENVIRONMENT + +/* Sim profile settings */ +#undef WITH_PROFILE + +/* How to route I/O */ +#undef WITH_STDIO + +/* Sim trace settings */ +#undef WITH_TRACE + /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ #if defined AC_APPLE_UNIVERSAL_BUILD diff --git a/sim/iq2000/configure b/sim/iq2000/configure index 5dfb6d3..678a5ed 100755 --- a/sim/iq2000/configure +++ b/sim/iq2000/configure @@ -607,10 +607,6 @@ CGEN_MAINT REPORT_BUGS_TEXI REPORT_BUGS_TO PKGVERSION -sim_profile -sim_trace -sim_stdio -sim_debug MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -685,8 +681,6 @@ CFLAGS CC WERROR_CFLAGS WARN_CFLAGS -sim_xor_endian -sim_smp sim_reserved_bits sim_inline sim_hw @@ -697,9 +691,7 @@ sim_scache sim_float sim_endian sim_bitsize -sim_assert sim_alignment -sim_environment target_alias host_alias build_alias @@ -4038,10 +4030,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - # intl sister-directory configuration rules. # @@ -12849,7 +12837,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12852 "configure" +#line 12840 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12955,7 +12943,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12958 "configure" +#line 12946 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13223,124 +13211,164 @@ fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim debug setting" >&5 +$as_echo_n "checking for sim debug setting... " >&6; } +sim_debug="0" # Check whether --enable-sim-debug was given. if test "${enable_sim_debug+set}" = set; then : enableval=$enable_sim_debug; case "${enableval}" in - yes) sim_debug="-DDEBUG=7 -DWITH_DEBUG=7";; - no) sim_debug="-DDEBUG=0 -DWITH_DEBUG=0";; - *) sim_debug="-DDEBUG='(${enableval})' -DWITH_DEBUG='(${enableval})'";; + yes) sim_debug="7";; + no) sim_debug="0";; + *) sim_debug="($enableval)";; esac -if test x"$silent" != x"yes" && test x"$sim_debug" != x""; then - echo "Setting sim debug = $sim_debug" 6>&1 fi -else - sim_debug="" +if test "$sim_debug" != "0"; then + +cat >>confdefs.h <<_ACEOF +#define DEBUG $sim_debug +_ACEOF + fi +cat >>confdefs.h <<_ACEOF +#define WITH_DEBUG $sim_debug +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_debug" >&5 +$as_echo "$sim_debug" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim stdio debug behavior" >&5 +$as_echo_n "checking for sim stdio debug behavior... " >&6; } +sim_stdio="0" # Check whether --enable-sim-stdio was given. if test "${enable_sim_stdio+set}" = set; then : enableval=$enable_sim_stdio; case "${enableval}" in - yes) sim_stdio="-DWITH_STDIO=DO_USE_STDIO";; - no) sim_stdio="-DWITH_STDIO=DONT_USE_STDIO";; - *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-stdio\"" "$LINENO" 5; sim_stdio="";; + yes) sim_stdio="DO_USE_STDIO";; + no) sim_stdio="DONT_USE_STDIO";; + *) as_fn_error "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_stdio" != x""; then - echo "Setting stdio flags = $sim_stdio" 6>&1 -fi -else - sim_stdio="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_STDIO $sim_stdio +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_stdio" >&5 +$as_echo "$sim_stdio" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim trace settings" >&5 +$as_echo_n "checking for sim trace settings... " >&6; } +sim_trace="~TRACE_debug" # Check whether --enable-sim-trace was given. if test "${enable_sim_trace+set}" = set; then : enableval=$enable_sim_trace; case "${enableval}" in - yes) sim_trace="-DWITH_TRACE=-1";; - no) sim_trace="-DWITH_TRACE=0";; + yes) sim_trace="-1";; + no) sim_trace="0";; [-0-9]*) - sim_trace="-DWITH_TRACE='(${enableval})'";; + sim_trace="'(${enableval})'";; [[:lower:]]*) sim_trace="" for x in `echo "$enableval" | sed -e "s/,/ /g"`; do if test x"$sim_trace" = x; then - sim_trace="-DWITH_TRACE='(TRACE_$x" + sim_trace="(TRACE_$x" else sim_trace="${sim_trace}|TRACE_$x" fi done - sim_trace="$sim_trace)'" ;; + sim_trace="$sim_trace)" ;; esac -if test x"$silent" != x"yes" && test x"$sim_trace" != x""; then - echo "Setting sim trace = $sim_trace" 6>&1 -fi -else - sim_trace="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_TRACE $sim_trace +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_trace" >&5 +$as_echo "$sim_trace" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim profile settings" >&5 +$as_echo_n "checking for sim profile settings... " >&6; } +profile="1" +sim_profile="-1" # Check whether --enable-sim-profile was given. if test "${enable_sim_profile+set}" = set; then : enableval=$enable_sim_profile; case "${enableval}" in - yes) sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1";; - no) sim_profile="-DPROFILE=0 -DWITH_PROFILE=0";; + yes) profile="1" sim_profile="-1";; + no) profile="0" sim_profile="0";; [-0-9]*) - sim_profile="-DPROFILE='(${enableval})' -DWITH_PROFILE='(${enableval})'";; + profile="(${enableval})" sim_profile="(${enableval})";; [a-z]*) + profile="1" sim_profile="" for x in `echo "$enableval" | sed -e "s/,/ /g"`; do if test x"$sim_profile" = x; then - sim_profile="-DWITH_PROFILE='(PROFILE_$x" + sim_profile="(PROFILE_$x" else sim_profile="${sim_profile}|PROFILE_$x" fi done - sim_profile="$sim_profile)'" ;; + sim_profile="$sim_profile)" ;; esac -if test x"$silent" != x"yes" && test x"$sim_profile" != x""; then - echo "Setting sim profile = $sim_profile" 6>&1 -fi -else - sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1" fi +cat >>confdefs.h <<_ACEOF +#define PROFILE $profile +_ACEOF +cat >>confdefs.h <<_ACEOF +#define WITH_PROFILE $sim_profile +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_profile" >&5 +$as_echo "$sim_profile" >&6; } + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable sim asserts" >&5 +$as_echo_n "checking whether to enable sim asserts... " >&6; } +sim_assert="1" # Check whether --enable-sim-assert was given. if test "${enable_sim_assert+set}" = set; then : enableval=$enable_sim_assert; case "${enableval}" in - yes) sim_assert="-DWITH_ASSERT=1";; - no) sim_assert="-DWITH_ASSERT=0";; - *) as_fn_error "\"--enable-sim-assert does not take a value\"" "$LINENO" 5; sim_assert="";; + yes) sim_assert="1";; + no) sim_assert="0";; + *) as_fn_error "--enable-sim-assert does not take a value" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_assert" != x""; then - echo "Setting assert flags = $sim_assert" 6>&1 -fi -else - sim_assert="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_ASSERT $sim_assert +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_assert" >&5 +$as_echo "$sim_assert" >&6; } + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking default sim environment setting" >&5 +$as_echo_n "checking default sim environment setting... " >&6; } +sim_environment="ALL_ENVIRONMENT" # 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="";; + all | ALL) sim_environment="ALL_ENVIRONMENT";; + user | USER) sim_environment="USER_ENVIRONMENT";; + virtual | VIRTUAL) sim_environment="VIRTUAL_ENVIRONMENT";; + operating | OPERATING) sim_environment="OPERATING_ENVIRONMENT";; + *) as_fn_error "Unknown value $enableval passed to --enable-sim-environment" "$LINENO" 5;; 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 +cat >>confdefs.h <<_ACEOF +#define WITH_ENVIRONMENT $sim_environment +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_environment" >&5 +$as_echo "$sim_environment" >&6; } + sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. diff --git a/sim/lm32/ChangeLog b/sim/lm32/ChangeLog index 86c0a5b..c1b442d 100644 --- a/sim/lm32/ChangeLog +++ b/sim/lm32/ChangeLog @@ -1,5 +1,9 @@ 2016-01-10 Mike Frysinger <vapier@gentoo.org> + * config.in, 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/config.in b/sim/lm32/config.in index 6a83434..3fd3cde 100644 --- a/sim/lm32/config.in +++ b/sim/lm32/config.in @@ -3,6 +3,9 @@ /* Define if building universal (internal helper macro) */ #undef AC_APPLE_UNIVERSAL_BUILD +/* Sim debug setting */ +#undef DEBUG + /* Define to 1 if translation of program messages to the user's native language is requested. */ #undef ENABLE_NLS @@ -176,6 +179,9 @@ /* Additional package description */ #undef PKGVERSION +/* Sim profile settings */ +#undef PROFILE + /* Bug reporting address */ #undef REPORT_BUGS_TO @@ -207,6 +213,24 @@ #endif +/* Sim assert settings */ +#undef WITH_ASSERT + +/* Sim debug setting */ +#undef WITH_DEBUG + +/* Sim default environment */ +#undef WITH_ENVIRONMENT + +/* Sim profile settings */ +#undef WITH_PROFILE + +/* How to route I/O */ +#undef WITH_STDIO + +/* Sim trace settings */ +#undef WITH_TRACE + /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ #if defined AC_APPLE_UNIVERSAL_BUILD diff --git a/sim/lm32/configure b/sim/lm32/configure index c2f9952..31dcbc5 100755 --- a/sim/lm32/configure +++ b/sim/lm32/configure @@ -607,10 +607,6 @@ CGEN_MAINT REPORT_BUGS_TEXI REPORT_BUGS_TO PKGVERSION -sim_profile -sim_trace -sim_stdio -sim_debug MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -685,8 +681,6 @@ CFLAGS CC WERROR_CFLAGS WARN_CFLAGS -sim_xor_endian -sim_smp sim_reserved_bits sim_inline sim_hw @@ -697,9 +691,7 @@ sim_scache sim_float sim_endian sim_bitsize -sim_assert sim_alignment -sim_environment target_alias host_alias build_alias @@ -4038,10 +4030,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - # intl sister-directory configuration rules. # @@ -12849,7 +12837,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12852 "configure" +#line 12840 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12955,7 +12943,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12958 "configure" +#line 12946 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13223,124 +13211,164 @@ fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim debug setting" >&5 +$as_echo_n "checking for sim debug setting... " >&6; } +sim_debug="0" # Check whether --enable-sim-debug was given. if test "${enable_sim_debug+set}" = set; then : enableval=$enable_sim_debug; case "${enableval}" in - yes) sim_debug="-DDEBUG=7 -DWITH_DEBUG=7";; - no) sim_debug="-DDEBUG=0 -DWITH_DEBUG=0";; - *) sim_debug="-DDEBUG='(${enableval})' -DWITH_DEBUG='(${enableval})'";; + yes) sim_debug="7";; + no) sim_debug="0";; + *) sim_debug="($enableval)";; esac -if test x"$silent" != x"yes" && test x"$sim_debug" != x""; then - echo "Setting sim debug = $sim_debug" 6>&1 fi -else - sim_debug="" +if test "$sim_debug" != "0"; then + +cat >>confdefs.h <<_ACEOF +#define DEBUG $sim_debug +_ACEOF + fi +cat >>confdefs.h <<_ACEOF +#define WITH_DEBUG $sim_debug +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_debug" >&5 +$as_echo "$sim_debug" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim stdio debug behavior" >&5 +$as_echo_n "checking for sim stdio debug behavior... " >&6; } +sim_stdio="0" # Check whether --enable-sim-stdio was given. if test "${enable_sim_stdio+set}" = set; then : enableval=$enable_sim_stdio; case "${enableval}" in - yes) sim_stdio="-DWITH_STDIO=DO_USE_STDIO";; - no) sim_stdio="-DWITH_STDIO=DONT_USE_STDIO";; - *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-stdio\"" "$LINENO" 5; sim_stdio="";; + yes) sim_stdio="DO_USE_STDIO";; + no) sim_stdio="DONT_USE_STDIO";; + *) as_fn_error "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_stdio" != x""; then - echo "Setting stdio flags = $sim_stdio" 6>&1 -fi -else - sim_stdio="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_STDIO $sim_stdio +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_stdio" >&5 +$as_echo "$sim_stdio" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim trace settings" >&5 +$as_echo_n "checking for sim trace settings... " >&6; } +sim_trace="~TRACE_debug" # Check whether --enable-sim-trace was given. if test "${enable_sim_trace+set}" = set; then : enableval=$enable_sim_trace; case "${enableval}" in - yes) sim_trace="-DWITH_TRACE=-1";; - no) sim_trace="-DWITH_TRACE=0";; + yes) sim_trace="-1";; + no) sim_trace="0";; [-0-9]*) - sim_trace="-DWITH_TRACE='(${enableval})'";; + sim_trace="'(${enableval})'";; [[:lower:]]*) sim_trace="" for x in `echo "$enableval" | sed -e "s/,/ /g"`; do if test x"$sim_trace" = x; then - sim_trace="-DWITH_TRACE='(TRACE_$x" + sim_trace="(TRACE_$x" else sim_trace="${sim_trace}|TRACE_$x" fi done - sim_trace="$sim_trace)'" ;; + sim_trace="$sim_trace)" ;; esac -if test x"$silent" != x"yes" && test x"$sim_trace" != x""; then - echo "Setting sim trace = $sim_trace" 6>&1 -fi -else - sim_trace="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_TRACE $sim_trace +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_trace" >&5 +$as_echo "$sim_trace" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim profile settings" >&5 +$as_echo_n "checking for sim profile settings... " >&6; } +profile="1" +sim_profile="-1" # Check whether --enable-sim-profile was given. if test "${enable_sim_profile+set}" = set; then : enableval=$enable_sim_profile; case "${enableval}" in - yes) sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1";; - no) sim_profile="-DPROFILE=0 -DWITH_PROFILE=0";; + yes) profile="1" sim_profile="-1";; + no) profile="0" sim_profile="0";; [-0-9]*) - sim_profile="-DPROFILE='(${enableval})' -DWITH_PROFILE='(${enableval})'";; + profile="(${enableval})" sim_profile="(${enableval})";; [a-z]*) + profile="1" sim_profile="" for x in `echo "$enableval" | sed -e "s/,/ /g"`; do if test x"$sim_profile" = x; then - sim_profile="-DWITH_PROFILE='(PROFILE_$x" + sim_profile="(PROFILE_$x" else sim_profile="${sim_profile}|PROFILE_$x" fi done - sim_profile="$sim_profile)'" ;; + sim_profile="$sim_profile)" ;; esac -if test x"$silent" != x"yes" && test x"$sim_profile" != x""; then - echo "Setting sim profile = $sim_profile" 6>&1 -fi -else - sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1" fi +cat >>confdefs.h <<_ACEOF +#define PROFILE $profile +_ACEOF +cat >>confdefs.h <<_ACEOF +#define WITH_PROFILE $sim_profile +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_profile" >&5 +$as_echo "$sim_profile" >&6; } + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable sim asserts" >&5 +$as_echo_n "checking whether to enable sim asserts... " >&6; } +sim_assert="1" # Check whether --enable-sim-assert was given. if test "${enable_sim_assert+set}" = set; then : enableval=$enable_sim_assert; case "${enableval}" in - yes) sim_assert="-DWITH_ASSERT=1";; - no) sim_assert="-DWITH_ASSERT=0";; - *) as_fn_error "\"--enable-sim-assert does not take a value\"" "$LINENO" 5; sim_assert="";; + yes) sim_assert="1";; + no) sim_assert="0";; + *) as_fn_error "--enable-sim-assert does not take a value" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_assert" != x""; then - echo "Setting assert flags = $sim_assert" 6>&1 -fi -else - sim_assert="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_ASSERT $sim_assert +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_assert" >&5 +$as_echo "$sim_assert" >&6; } + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking default sim environment setting" >&5 +$as_echo_n "checking default sim environment setting... " >&6; } +sim_environment="ALL_ENVIRONMENT" # 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="";; + all | ALL) sim_environment="ALL_ENVIRONMENT";; + user | USER) sim_environment="USER_ENVIRONMENT";; + virtual | VIRTUAL) sim_environment="VIRTUAL_ENVIRONMENT";; + operating | OPERATING) sim_environment="OPERATING_ENVIRONMENT";; + *) as_fn_error "Unknown value $enableval passed to --enable-sim-environment" "$LINENO" 5;; 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 +cat >>confdefs.h <<_ACEOF +#define WITH_ENVIRONMENT $sim_environment +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_environment" >&5 +$as_echo "$sim_environment" >&6; } + sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. diff --git a/sim/m32c/ChangeLog b/sim/m32c/ChangeLog index 2b9401f..4205507 100644 --- a/sim/m32c/ChangeLog +++ b/sim/m32c/ChangeLog @@ -1,5 +1,9 @@ 2016-01-10 Mike Frysinger <vapier@gentoo.org> + * config.in, configure: Regenerate. + +2016-01-10 Mike Frysinger <vapier@gentoo.org> + * configure: Regenerate. 2016-01-10 Mike Frysinger <vapier@gentoo.org> diff --git a/sim/m32c/config.in b/sim/m32c/config.in index 3ba123f..c837518 100644 --- a/sim/m32c/config.in +++ b/sim/m32c/config.in @@ -3,6 +3,9 @@ /* Define if building universal (internal helper macro) */ #undef AC_APPLE_UNIVERSAL_BUILD +/* Sim debug setting */ +#undef DEBUG + /* Define to 1 if translation of program messages to the user's native language is requested. */ #undef ENABLE_NLS @@ -185,6 +188,9 @@ /* Additional package description */ #undef PKGVERSION +/* Sim profile settings */ +#undef PROFILE + /* Bug reporting address */ #undef REPORT_BUGS_TO @@ -216,6 +222,24 @@ #endif +/* Sim assert settings */ +#undef WITH_ASSERT + +/* Sim debug setting */ +#undef WITH_DEBUG + +/* Sim default environment */ +#undef WITH_ENVIRONMENT + +/* Sim profile settings */ +#undef WITH_PROFILE + +/* How to route I/O */ +#undef WITH_STDIO + +/* Sim trace settings */ +#undef WITH_TRACE + /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ #if defined AC_APPLE_UNIVERSAL_BUILD diff --git a/sim/m32c/configure b/sim/m32c/configure index 2ab1753..a0c9844 100755 --- a/sim/m32c/configure +++ b/sim/m32c/configure @@ -604,10 +604,6 @@ cgen_breaks REPORT_BUGS_TEXI REPORT_BUGS_TO PKGVERSION -sim_profile -sim_trace -sim_stdio -sim_debug MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -682,8 +678,6 @@ CFLAGS CC WERROR_CFLAGS WARN_CFLAGS -sim_xor_endian -sim_smp sim_reserved_bits sim_inline sim_hw @@ -694,9 +688,7 @@ sim_scache sim_float sim_endian sim_bitsize -sim_assert sim_alignment -sim_environment target_alias host_alias build_alias @@ -4025,10 +4017,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - # intl sister-directory configuration rules. # @@ -12836,7 +12824,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 12827 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12942,7 +12930,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 12933 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13210,124 +13198,164 @@ fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim debug setting" >&5 +$as_echo_n "checking for sim debug setting... " >&6; } +sim_debug="0" # Check whether --enable-sim-debug was given. if test "${enable_sim_debug+set}" = set; then : enableval=$enable_sim_debug; case "${enableval}" in - yes) sim_debug="-DDEBUG=7 -DWITH_DEBUG=7";; - no) sim_debug="-DDEBUG=0 -DWITH_DEBUG=0";; - *) sim_debug="-DDEBUG='(${enableval})' -DWITH_DEBUG='(${enableval})'";; + yes) sim_debug="7";; + no) sim_debug="0";; + *) sim_debug="($enableval)";; esac -if test x"$silent" != x"yes" && test x"$sim_debug" != x""; then - echo "Setting sim debug = $sim_debug" 6>&1 fi -else - sim_debug="" +if test "$sim_debug" != "0"; then + +cat >>confdefs.h <<_ACEOF +#define DEBUG $sim_debug +_ACEOF + fi +cat >>confdefs.h <<_ACEOF +#define WITH_DEBUG $sim_debug +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_debug" >&5 +$as_echo "$sim_debug" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim stdio debug behavior" >&5 +$as_echo_n "checking for sim stdio debug behavior... " >&6; } +sim_stdio="0" # Check whether --enable-sim-stdio was given. if test "${enable_sim_stdio+set}" = set; then : enableval=$enable_sim_stdio; case "${enableval}" in - yes) sim_stdio="-DWITH_STDIO=DO_USE_STDIO";; - no) sim_stdio="-DWITH_STDIO=DONT_USE_STDIO";; - *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-stdio\"" "$LINENO" 5; sim_stdio="";; + yes) sim_stdio="DO_USE_STDIO";; + no) sim_stdio="DONT_USE_STDIO";; + *) as_fn_error "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_stdio" != x""; then - echo "Setting stdio flags = $sim_stdio" 6>&1 -fi -else - sim_stdio="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_STDIO $sim_stdio +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_stdio" >&5 +$as_echo "$sim_stdio" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim trace settings" >&5 +$as_echo_n "checking for sim trace settings... " >&6; } +sim_trace="~TRACE_debug" # Check whether --enable-sim-trace was given. if test "${enable_sim_trace+set}" = set; then : enableval=$enable_sim_trace; case "${enableval}" in - yes) sim_trace="-DWITH_TRACE=-1";; - no) sim_trace="-DWITH_TRACE=0";; + yes) sim_trace="-1";; + no) sim_trace="0";; [-0-9]*) - sim_trace="-DWITH_TRACE='(${enableval})'";; + sim_trace="'(${enableval})'";; [[:lower:]]*) sim_trace="" for x in `echo "$enableval" | sed -e "s/,/ /g"`; do if test x"$sim_trace" = x; then - sim_trace="-DWITH_TRACE='(TRACE_$x" + sim_trace="(TRACE_$x" else sim_trace="${sim_trace}|TRACE_$x" fi done - sim_trace="$sim_trace)'" ;; + sim_trace="$sim_trace)" ;; esac -if test x"$silent" != x"yes" && test x"$sim_trace" != x""; then - echo "Setting sim trace = $sim_trace" 6>&1 -fi -else - sim_trace="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_TRACE $sim_trace +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_trace" >&5 +$as_echo "$sim_trace" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim profile settings" >&5 +$as_echo_n "checking for sim profile settings... " >&6; } +profile="1" +sim_profile="-1" # Check whether --enable-sim-profile was given. if test "${enable_sim_profile+set}" = set; then : enableval=$enable_sim_profile; case "${enableval}" in - yes) sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1";; - no) sim_profile="-DPROFILE=0 -DWITH_PROFILE=0";; + yes) profile="1" sim_profile="-1";; + no) profile="0" sim_profile="0";; [-0-9]*) - sim_profile="-DPROFILE='(${enableval})' -DWITH_PROFILE='(${enableval})'";; + profile="(${enableval})" sim_profile="(${enableval})";; [a-z]*) + profile="1" sim_profile="" for x in `echo "$enableval" | sed -e "s/,/ /g"`; do if test x"$sim_profile" = x; then - sim_profile="-DWITH_PROFILE='(PROFILE_$x" + sim_profile="(PROFILE_$x" else sim_profile="${sim_profile}|PROFILE_$x" fi done - sim_profile="$sim_profile)'" ;; + sim_profile="$sim_profile)" ;; esac -if test x"$silent" != x"yes" && test x"$sim_profile" != x""; then - echo "Setting sim profile = $sim_profile" 6>&1 -fi -else - sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1" fi +cat >>confdefs.h <<_ACEOF +#define PROFILE $profile +_ACEOF +cat >>confdefs.h <<_ACEOF +#define WITH_PROFILE $sim_profile +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_profile" >&5 +$as_echo "$sim_profile" >&6; } + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable sim asserts" >&5 +$as_echo_n "checking whether to enable sim asserts... " >&6; } +sim_assert="1" # Check whether --enable-sim-assert was given. if test "${enable_sim_assert+set}" = set; then : enableval=$enable_sim_assert; case "${enableval}" in - yes) sim_assert="-DWITH_ASSERT=1";; - no) sim_assert="-DWITH_ASSERT=0";; - *) as_fn_error "\"--enable-sim-assert does not take a value\"" "$LINENO" 5; sim_assert="";; + yes) sim_assert="1";; + no) sim_assert="0";; + *) as_fn_error "--enable-sim-assert does not take a value" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_assert" != x""; then - echo "Setting assert flags = $sim_assert" 6>&1 -fi -else - sim_assert="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_ASSERT $sim_assert +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_assert" >&5 +$as_echo "$sim_assert" >&6; } + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking default sim environment setting" >&5 +$as_echo_n "checking default sim environment setting... " >&6; } +sim_environment="ALL_ENVIRONMENT" # 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="";; + all | ALL) sim_environment="ALL_ENVIRONMENT";; + user | USER) sim_environment="USER_ENVIRONMENT";; + virtual | VIRTUAL) sim_environment="VIRTUAL_ENVIRONMENT";; + operating | OPERATING) sim_environment="OPERATING_ENVIRONMENT";; + *) as_fn_error "Unknown value $enableval passed to --enable-sim-environment" "$LINENO" 5;; 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 +cat >>confdefs.h <<_ACEOF +#define WITH_ENVIRONMENT $sim_environment +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_environment" >&5 +$as_echo "$sim_environment" >&6; } + sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. diff --git a/sim/m32r/ChangeLog b/sim/m32r/ChangeLog index d7a3ffa..a0be81e 100644 --- a/sim/m32r/ChangeLog +++ b/sim/m32r/ChangeLog @@ -1,5 +1,9 @@ 2016-01-10 Mike Frysinger <vapier@gentoo.org> + * config.in, 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/config.in b/sim/m32r/config.in index 6a83434..3fd3cde 100644 --- a/sim/m32r/config.in +++ b/sim/m32r/config.in @@ -3,6 +3,9 @@ /* Define if building universal (internal helper macro) */ #undef AC_APPLE_UNIVERSAL_BUILD +/* Sim debug setting */ +#undef DEBUG + /* Define to 1 if translation of program messages to the user's native language is requested. */ #undef ENABLE_NLS @@ -176,6 +179,9 @@ /* Additional package description */ #undef PKGVERSION +/* Sim profile settings */ +#undef PROFILE + /* Bug reporting address */ #undef REPORT_BUGS_TO @@ -207,6 +213,24 @@ #endif +/* Sim assert settings */ +#undef WITH_ASSERT + +/* Sim debug setting */ +#undef WITH_DEBUG + +/* Sim default environment */ +#undef WITH_ENVIRONMENT + +/* Sim profile settings */ +#undef WITH_PROFILE + +/* How to route I/O */ +#undef WITH_STDIO + +/* Sim trace settings */ +#undef WITH_TRACE + /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ #if defined AC_APPLE_UNIVERSAL_BUILD diff --git a/sim/m32r/configure b/sim/m32r/configure index 44a4c72..daa2365 100755 --- a/sim/m32r/configure +++ b/sim/m32r/configure @@ -609,10 +609,6 @@ CGEN_MAINT REPORT_BUGS_TEXI REPORT_BUGS_TO PKGVERSION -sim_profile -sim_trace -sim_stdio -sim_debug MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -687,8 +683,6 @@ CFLAGS CC WERROR_CFLAGS WARN_CFLAGS -sim_xor_endian -sim_smp sim_reserved_bits sim_inline sim_hw @@ -699,9 +693,7 @@ sim_scache sim_float sim_endian sim_bitsize -sim_assert sim_alignment -sim_environment target_alias host_alias build_alias @@ -4040,10 +4032,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - # intl sister-directory configuration rules. # @@ -12851,7 +12839,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12854 "configure" +#line 12842 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12957,7 +12945,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12960 "configure" +#line 12948 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13225,124 +13213,164 @@ fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim debug setting" >&5 +$as_echo_n "checking for sim debug setting... " >&6; } +sim_debug="0" # Check whether --enable-sim-debug was given. if test "${enable_sim_debug+set}" = set; then : enableval=$enable_sim_debug; case "${enableval}" in - yes) sim_debug="-DDEBUG=7 -DWITH_DEBUG=7";; - no) sim_debug="-DDEBUG=0 -DWITH_DEBUG=0";; - *) sim_debug="-DDEBUG='(${enableval})' -DWITH_DEBUG='(${enableval})'";; + yes) sim_debug="7";; + no) sim_debug="0";; + *) sim_debug="($enableval)";; esac -if test x"$silent" != x"yes" && test x"$sim_debug" != x""; then - echo "Setting sim debug = $sim_debug" 6>&1 fi -else - sim_debug="" +if test "$sim_debug" != "0"; then + +cat >>confdefs.h <<_ACEOF +#define DEBUG $sim_debug +_ACEOF + fi +cat >>confdefs.h <<_ACEOF +#define WITH_DEBUG $sim_debug +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_debug" >&5 +$as_echo "$sim_debug" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim stdio debug behavior" >&5 +$as_echo_n "checking for sim stdio debug behavior... " >&6; } +sim_stdio="0" # Check whether --enable-sim-stdio was given. if test "${enable_sim_stdio+set}" = set; then : enableval=$enable_sim_stdio; case "${enableval}" in - yes) sim_stdio="-DWITH_STDIO=DO_USE_STDIO";; - no) sim_stdio="-DWITH_STDIO=DONT_USE_STDIO";; - *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-stdio\"" "$LINENO" 5; sim_stdio="";; + yes) sim_stdio="DO_USE_STDIO";; + no) sim_stdio="DONT_USE_STDIO";; + *) as_fn_error "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_stdio" != x""; then - echo "Setting stdio flags = $sim_stdio" 6>&1 -fi -else - sim_stdio="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_STDIO $sim_stdio +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_stdio" >&5 +$as_echo "$sim_stdio" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim trace settings" >&5 +$as_echo_n "checking for sim trace settings... " >&6; } +sim_trace="~TRACE_debug" # Check whether --enable-sim-trace was given. if test "${enable_sim_trace+set}" = set; then : enableval=$enable_sim_trace; case "${enableval}" in - yes) sim_trace="-DWITH_TRACE=-1";; - no) sim_trace="-DWITH_TRACE=0";; + yes) sim_trace="-1";; + no) sim_trace="0";; [-0-9]*) - sim_trace="-DWITH_TRACE='(${enableval})'";; + sim_trace="'(${enableval})'";; [[:lower:]]*) sim_trace="" for x in `echo "$enableval" | sed -e "s/,/ /g"`; do if test x"$sim_trace" = x; then - sim_trace="-DWITH_TRACE='(TRACE_$x" + sim_trace="(TRACE_$x" else sim_trace="${sim_trace}|TRACE_$x" fi done - sim_trace="$sim_trace)'" ;; + sim_trace="$sim_trace)" ;; esac -if test x"$silent" != x"yes" && test x"$sim_trace" != x""; then - echo "Setting sim trace = $sim_trace" 6>&1 -fi -else - sim_trace="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_TRACE $sim_trace +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_trace" >&5 +$as_echo "$sim_trace" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim profile settings" >&5 +$as_echo_n "checking for sim profile settings... " >&6; } +profile="1" +sim_profile="-1" # Check whether --enable-sim-profile was given. if test "${enable_sim_profile+set}" = set; then : enableval=$enable_sim_profile; case "${enableval}" in - yes) sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1";; - no) sim_profile="-DPROFILE=0 -DWITH_PROFILE=0";; + yes) profile="1" sim_profile="-1";; + no) profile="0" sim_profile="0";; [-0-9]*) - sim_profile="-DPROFILE='(${enableval})' -DWITH_PROFILE='(${enableval})'";; + profile="(${enableval})" sim_profile="(${enableval})";; [a-z]*) + profile="1" sim_profile="" for x in `echo "$enableval" | sed -e "s/,/ /g"`; do if test x"$sim_profile" = x; then - sim_profile="-DWITH_PROFILE='(PROFILE_$x" + sim_profile="(PROFILE_$x" else sim_profile="${sim_profile}|PROFILE_$x" fi done - sim_profile="$sim_profile)'" ;; + sim_profile="$sim_profile)" ;; esac -if test x"$silent" != x"yes" && test x"$sim_profile" != x""; then - echo "Setting sim profile = $sim_profile" 6>&1 -fi -else - sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1" fi +cat >>confdefs.h <<_ACEOF +#define PROFILE $profile +_ACEOF +cat >>confdefs.h <<_ACEOF +#define WITH_PROFILE $sim_profile +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_profile" >&5 +$as_echo "$sim_profile" >&6; } + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable sim asserts" >&5 +$as_echo_n "checking whether to enable sim asserts... " >&6; } +sim_assert="1" # Check whether --enable-sim-assert was given. if test "${enable_sim_assert+set}" = set; then : enableval=$enable_sim_assert; case "${enableval}" in - yes) sim_assert="-DWITH_ASSERT=1";; - no) sim_assert="-DWITH_ASSERT=0";; - *) as_fn_error "\"--enable-sim-assert does not take a value\"" "$LINENO" 5; sim_assert="";; + yes) sim_assert="1";; + no) sim_assert="0";; + *) as_fn_error "--enable-sim-assert does not take a value" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_assert" != x""; then - echo "Setting assert flags = $sim_assert" 6>&1 -fi -else - sim_assert="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_ASSERT $sim_assert +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_assert" >&5 +$as_echo "$sim_assert" >&6; } + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking default sim environment setting" >&5 +$as_echo_n "checking default sim environment setting... " >&6; } +sim_environment="ALL_ENVIRONMENT" # 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="";; + all | ALL) sim_environment="ALL_ENVIRONMENT";; + user | USER) sim_environment="USER_ENVIRONMENT";; + virtual | VIRTUAL) sim_environment="VIRTUAL_ENVIRONMENT";; + operating | OPERATING) sim_environment="OPERATING_ENVIRONMENT";; + *) as_fn_error "Unknown value $enableval passed to --enable-sim-environment" "$LINENO" 5;; 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 +cat >>confdefs.h <<_ACEOF +#define WITH_ENVIRONMENT $sim_environment +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_environment" >&5 +$as_echo "$sim_environment" >&6; } + sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. diff --git a/sim/m68hc11/ChangeLog b/sim/m68hc11/ChangeLog index c0e4ff1..b8f9ffc 100644 --- a/sim/m68hc11/ChangeLog +++ b/sim/m68hc11/ChangeLog @@ -1,5 +1,9 @@ 2016-01-10 Mike Frysinger <vapier@gentoo.org> + * config.in, configure: Regenerate. + +2016-01-10 Mike Frysinger <vapier@gentoo.org> + * configure: Regenerate. 2016-01-10 Mike Frysinger <vapier@gentoo.org> diff --git a/sim/m68hc11/config.in b/sim/m68hc11/config.in index 6a83434..3fd3cde 100644 --- a/sim/m68hc11/config.in +++ b/sim/m68hc11/config.in @@ -3,6 +3,9 @@ /* Define if building universal (internal helper macro) */ #undef AC_APPLE_UNIVERSAL_BUILD +/* Sim debug setting */ +#undef DEBUG + /* Define to 1 if translation of program messages to the user's native language is requested. */ #undef ENABLE_NLS @@ -176,6 +179,9 @@ /* Additional package description */ #undef PKGVERSION +/* Sim profile settings */ +#undef PROFILE + /* Bug reporting address */ #undef REPORT_BUGS_TO @@ -207,6 +213,24 @@ #endif +/* Sim assert settings */ +#undef WITH_ASSERT + +/* Sim debug setting */ +#undef WITH_DEBUG + +/* Sim default environment */ +#undef WITH_ENVIRONMENT + +/* Sim profile settings */ +#undef WITH_PROFILE + +/* How to route I/O */ +#undef WITH_STDIO + +/* Sim trace settings */ +#undef WITH_TRACE + /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ #if defined AC_APPLE_UNIVERSAL_BUILD diff --git a/sim/m68hc11/configure b/sim/m68hc11/configure index 9c712f0..223a48f 100755 --- a/sim/m68hc11/configure +++ b/sim/m68hc11/configure @@ -604,10 +604,6 @@ cgen_breaks REPORT_BUGS_TEXI REPORT_BUGS_TO PKGVERSION -sim_profile -sim_trace -sim_stdio -sim_debug MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -682,8 +678,6 @@ CFLAGS CC WERROR_CFLAGS WARN_CFLAGS -sim_xor_endian -sim_smp sim_reserved_bits sim_inline sim_hw @@ -694,9 +688,7 @@ sim_scache sim_float sim_endian sim_bitsize -sim_assert sim_alignment -sim_environment target_alias host_alias build_alias @@ -4035,10 +4027,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - # intl sister-directory configuration rules. # @@ -12846,7 +12834,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12849 "configure" +#line 12837 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12952,7 +12940,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12955 "configure" +#line 12943 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13220,124 +13208,164 @@ fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim debug setting" >&5 +$as_echo_n "checking for sim debug setting... " >&6; } +sim_debug="0" # Check whether --enable-sim-debug was given. if test "${enable_sim_debug+set}" = set; then : enableval=$enable_sim_debug; case "${enableval}" in - yes) sim_debug="-DDEBUG=7 -DWITH_DEBUG=7";; - no) sim_debug="-DDEBUG=0 -DWITH_DEBUG=0";; - *) sim_debug="-DDEBUG='(${enableval})' -DWITH_DEBUG='(${enableval})'";; + yes) sim_debug="7";; + no) sim_debug="0";; + *) sim_debug="($enableval)";; esac -if test x"$silent" != x"yes" && test x"$sim_debug" != x""; then - echo "Setting sim debug = $sim_debug" 6>&1 fi -else - sim_debug="" +if test "$sim_debug" != "0"; then + +cat >>confdefs.h <<_ACEOF +#define DEBUG $sim_debug +_ACEOF + fi +cat >>confdefs.h <<_ACEOF +#define WITH_DEBUG $sim_debug +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_debug" >&5 +$as_echo "$sim_debug" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim stdio debug behavior" >&5 +$as_echo_n "checking for sim stdio debug behavior... " >&6; } +sim_stdio="0" # Check whether --enable-sim-stdio was given. if test "${enable_sim_stdio+set}" = set; then : enableval=$enable_sim_stdio; case "${enableval}" in - yes) sim_stdio="-DWITH_STDIO=DO_USE_STDIO";; - no) sim_stdio="-DWITH_STDIO=DONT_USE_STDIO";; - *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-stdio\"" "$LINENO" 5; sim_stdio="";; + yes) sim_stdio="DO_USE_STDIO";; + no) sim_stdio="DONT_USE_STDIO";; + *) as_fn_error "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_stdio" != x""; then - echo "Setting stdio flags = $sim_stdio" 6>&1 -fi -else - sim_stdio="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_STDIO $sim_stdio +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_stdio" >&5 +$as_echo "$sim_stdio" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim trace settings" >&5 +$as_echo_n "checking for sim trace settings... " >&6; } +sim_trace="~TRACE_debug" # Check whether --enable-sim-trace was given. if test "${enable_sim_trace+set}" = set; then : enableval=$enable_sim_trace; case "${enableval}" in - yes) sim_trace="-DWITH_TRACE=-1";; - no) sim_trace="-DWITH_TRACE=0";; + yes) sim_trace="-1";; + no) sim_trace="0";; [-0-9]*) - sim_trace="-DWITH_TRACE='(${enableval})'";; + sim_trace="'(${enableval})'";; [[:lower:]]*) sim_trace="" for x in `echo "$enableval" | sed -e "s/,/ /g"`; do if test x"$sim_trace" = x; then - sim_trace="-DWITH_TRACE='(TRACE_$x" + sim_trace="(TRACE_$x" else sim_trace="${sim_trace}|TRACE_$x" fi done - sim_trace="$sim_trace)'" ;; + sim_trace="$sim_trace)" ;; esac -if test x"$silent" != x"yes" && test x"$sim_trace" != x""; then - echo "Setting sim trace = $sim_trace" 6>&1 -fi -else - sim_trace="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_TRACE $sim_trace +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_trace" >&5 +$as_echo "$sim_trace" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim profile settings" >&5 +$as_echo_n "checking for sim profile settings... " >&6; } +profile="1" +sim_profile="-1" # Check whether --enable-sim-profile was given. if test "${enable_sim_profile+set}" = set; then : enableval=$enable_sim_profile; case "${enableval}" in - yes) sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1";; - no) sim_profile="-DPROFILE=0 -DWITH_PROFILE=0";; + yes) profile="1" sim_profile="-1";; + no) profile="0" sim_profile="0";; [-0-9]*) - sim_profile="-DPROFILE='(${enableval})' -DWITH_PROFILE='(${enableval})'";; + profile="(${enableval})" sim_profile="(${enableval})";; [a-z]*) + profile="1" sim_profile="" for x in `echo "$enableval" | sed -e "s/,/ /g"`; do if test x"$sim_profile" = x; then - sim_profile="-DWITH_PROFILE='(PROFILE_$x" + sim_profile="(PROFILE_$x" else sim_profile="${sim_profile}|PROFILE_$x" fi done - sim_profile="$sim_profile)'" ;; + sim_profile="$sim_profile)" ;; esac -if test x"$silent" != x"yes" && test x"$sim_profile" != x""; then - echo "Setting sim profile = $sim_profile" 6>&1 -fi -else - sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1" fi +cat >>confdefs.h <<_ACEOF +#define PROFILE $profile +_ACEOF +cat >>confdefs.h <<_ACEOF +#define WITH_PROFILE $sim_profile +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_profile" >&5 +$as_echo "$sim_profile" >&6; } + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable sim asserts" >&5 +$as_echo_n "checking whether to enable sim asserts... " >&6; } +sim_assert="1" # Check whether --enable-sim-assert was given. if test "${enable_sim_assert+set}" = set; then : enableval=$enable_sim_assert; case "${enableval}" in - yes) sim_assert="-DWITH_ASSERT=1";; - no) sim_assert="-DWITH_ASSERT=0";; - *) as_fn_error "\"--enable-sim-assert does not take a value\"" "$LINENO" 5; sim_assert="";; + yes) sim_assert="1";; + no) sim_assert="0";; + *) as_fn_error "--enable-sim-assert does not take a value" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_assert" != x""; then - echo "Setting assert flags = $sim_assert" 6>&1 -fi -else - sim_assert="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_ASSERT $sim_assert +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_assert" >&5 +$as_echo "$sim_assert" >&6; } + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking default sim environment setting" >&5 +$as_echo_n "checking default sim environment setting... " >&6; } +sim_environment="ALL_ENVIRONMENT" # 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="";; + all | ALL) sim_environment="ALL_ENVIRONMENT";; + user | USER) sim_environment="USER_ENVIRONMENT";; + virtual | VIRTUAL) sim_environment="VIRTUAL_ENVIRONMENT";; + operating | OPERATING) sim_environment="OPERATING_ENVIRONMENT";; + *) as_fn_error "Unknown value $enableval passed to --enable-sim-environment" "$LINENO" 5;; 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 +cat >>confdefs.h <<_ACEOF +#define WITH_ENVIRONMENT $sim_environment +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_environment" >&5 +$as_echo "$sim_environment" >&6; } + sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. diff --git a/sim/mcore/ChangeLog b/sim/mcore/ChangeLog index 1c6ba2d..17c76cf 100644 --- a/sim/mcore/ChangeLog +++ b/sim/mcore/ChangeLog @@ -1,5 +1,9 @@ 2016-01-10 Mike Frysinger <vapier@gentoo.org> + * config.in, 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/config.in b/sim/mcore/config.in index f24eb3b..aa3e45c 100644 --- a/sim/mcore/config.in +++ b/sim/mcore/config.in @@ -3,6 +3,9 @@ /* Define if building universal (internal helper macro) */ #undef AC_APPLE_UNIVERSAL_BUILD +/* Sim debug setting */ +#undef DEBUG + /* Define to 1 if translation of program messages to the user's native language is requested. */ #undef ENABLE_NLS @@ -170,6 +173,9 @@ /* Additional package description */ #undef PKGVERSION +/* Sim profile settings */ +#undef PROFILE + /* Bug reporting address */ #undef REPORT_BUGS_TO @@ -201,6 +207,24 @@ #endif +/* Sim assert settings */ +#undef WITH_ASSERT + +/* Sim debug setting */ +#undef WITH_DEBUG + +/* Sim default environment */ +#undef WITH_ENVIRONMENT + +/* Sim profile settings */ +#undef WITH_PROFILE + +/* How to route I/O */ +#undef WITH_STDIO + +/* Sim trace settings */ +#undef WITH_TRACE + /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ #if defined AC_APPLE_UNIVERSAL_BUILD diff --git a/sim/mcore/configure b/sim/mcore/configure index c16d784..e177055 100755 --- a/sim/mcore/configure +++ b/sim/mcore/configure @@ -604,10 +604,6 @@ cgen_breaks REPORT_BUGS_TEXI REPORT_BUGS_TO PKGVERSION -sim_profile -sim_trace -sim_stdio -sim_debug MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -682,8 +678,6 @@ CFLAGS CC WERROR_CFLAGS WARN_CFLAGS -sim_xor_endian -sim_smp sim_reserved_bits sim_inline sim_hw @@ -694,9 +688,7 @@ sim_scache sim_float sim_endian sim_bitsize -sim_assert sim_alignment -sim_environment target_alias host_alias build_alias @@ -4032,10 +4024,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - # intl sister-directory configuration rules. # @@ -12843,7 +12831,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12846 "configure" +#line 12834 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12949,7 +12937,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12952 "configure" +#line 12940 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13217,124 +13205,164 @@ fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim debug setting" >&5 +$as_echo_n "checking for sim debug setting... " >&6; } +sim_debug="0" # Check whether --enable-sim-debug was given. if test "${enable_sim_debug+set}" = set; then : enableval=$enable_sim_debug; case "${enableval}" in - yes) sim_debug="-DDEBUG=7 -DWITH_DEBUG=7";; - no) sim_debug="-DDEBUG=0 -DWITH_DEBUG=0";; - *) sim_debug="-DDEBUG='(${enableval})' -DWITH_DEBUG='(${enableval})'";; + yes) sim_debug="7";; + no) sim_debug="0";; + *) sim_debug="($enableval)";; esac -if test x"$silent" != x"yes" && test x"$sim_debug" != x""; then - echo "Setting sim debug = $sim_debug" 6>&1 fi -else - sim_debug="" +if test "$sim_debug" != "0"; then + +cat >>confdefs.h <<_ACEOF +#define DEBUG $sim_debug +_ACEOF + fi +cat >>confdefs.h <<_ACEOF +#define WITH_DEBUG $sim_debug +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_debug" >&5 +$as_echo "$sim_debug" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim stdio debug behavior" >&5 +$as_echo_n "checking for sim stdio debug behavior... " >&6; } +sim_stdio="0" # Check whether --enable-sim-stdio was given. if test "${enable_sim_stdio+set}" = set; then : enableval=$enable_sim_stdio; case "${enableval}" in - yes) sim_stdio="-DWITH_STDIO=DO_USE_STDIO";; - no) sim_stdio="-DWITH_STDIO=DONT_USE_STDIO";; - *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-stdio\"" "$LINENO" 5; sim_stdio="";; + yes) sim_stdio="DO_USE_STDIO";; + no) sim_stdio="DONT_USE_STDIO";; + *) as_fn_error "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_stdio" != x""; then - echo "Setting stdio flags = $sim_stdio" 6>&1 -fi -else - sim_stdio="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_STDIO $sim_stdio +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_stdio" >&5 +$as_echo "$sim_stdio" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim trace settings" >&5 +$as_echo_n "checking for sim trace settings... " >&6; } +sim_trace="~TRACE_debug" # Check whether --enable-sim-trace was given. if test "${enable_sim_trace+set}" = set; then : enableval=$enable_sim_trace; case "${enableval}" in - yes) sim_trace="-DWITH_TRACE=-1";; - no) sim_trace="-DWITH_TRACE=0";; + yes) sim_trace="-1";; + no) sim_trace="0";; [-0-9]*) - sim_trace="-DWITH_TRACE='(${enableval})'";; + sim_trace="'(${enableval})'";; [[:lower:]]*) sim_trace="" for x in `echo "$enableval" | sed -e "s/,/ /g"`; do if test x"$sim_trace" = x; then - sim_trace="-DWITH_TRACE='(TRACE_$x" + sim_trace="(TRACE_$x" else sim_trace="${sim_trace}|TRACE_$x" fi done - sim_trace="$sim_trace)'" ;; + sim_trace="$sim_trace)" ;; esac -if test x"$silent" != x"yes" && test x"$sim_trace" != x""; then - echo "Setting sim trace = $sim_trace" 6>&1 -fi -else - sim_trace="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_TRACE $sim_trace +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_trace" >&5 +$as_echo "$sim_trace" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim profile settings" >&5 +$as_echo_n "checking for sim profile settings... " >&6; } +profile="1" +sim_profile="-1" # Check whether --enable-sim-profile was given. if test "${enable_sim_profile+set}" = set; then : enableval=$enable_sim_profile; case "${enableval}" in - yes) sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1";; - no) sim_profile="-DPROFILE=0 -DWITH_PROFILE=0";; + yes) profile="1" sim_profile="-1";; + no) profile="0" sim_profile="0";; [-0-9]*) - sim_profile="-DPROFILE='(${enableval})' -DWITH_PROFILE='(${enableval})'";; + profile="(${enableval})" sim_profile="(${enableval})";; [a-z]*) + profile="1" sim_profile="" for x in `echo "$enableval" | sed -e "s/,/ /g"`; do if test x"$sim_profile" = x; then - sim_profile="-DWITH_PROFILE='(PROFILE_$x" + sim_profile="(PROFILE_$x" else sim_profile="${sim_profile}|PROFILE_$x" fi done - sim_profile="$sim_profile)'" ;; + sim_profile="$sim_profile)" ;; esac -if test x"$silent" != x"yes" && test x"$sim_profile" != x""; then - echo "Setting sim profile = $sim_profile" 6>&1 -fi -else - sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1" fi +cat >>confdefs.h <<_ACEOF +#define PROFILE $profile +_ACEOF +cat >>confdefs.h <<_ACEOF +#define WITH_PROFILE $sim_profile +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_profile" >&5 +$as_echo "$sim_profile" >&6; } + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable sim asserts" >&5 +$as_echo_n "checking whether to enable sim asserts... " >&6; } +sim_assert="1" # Check whether --enable-sim-assert was given. if test "${enable_sim_assert+set}" = set; then : enableval=$enable_sim_assert; case "${enableval}" in - yes) sim_assert="-DWITH_ASSERT=1";; - no) sim_assert="-DWITH_ASSERT=0";; - *) as_fn_error "\"--enable-sim-assert does not take a value\"" "$LINENO" 5; sim_assert="";; + yes) sim_assert="1";; + no) sim_assert="0";; + *) as_fn_error "--enable-sim-assert does not take a value" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_assert" != x""; then - echo "Setting assert flags = $sim_assert" 6>&1 -fi -else - sim_assert="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_ASSERT $sim_assert +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_assert" >&5 +$as_echo "$sim_assert" >&6; } + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking default sim environment setting" >&5 +$as_echo_n "checking default sim environment setting... " >&6; } +sim_environment="ALL_ENVIRONMENT" # 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="";; + all | ALL) sim_environment="ALL_ENVIRONMENT";; + user | USER) sim_environment="USER_ENVIRONMENT";; + virtual | VIRTUAL) sim_environment="VIRTUAL_ENVIRONMENT";; + operating | OPERATING) sim_environment="OPERATING_ENVIRONMENT";; + *) as_fn_error "Unknown value $enableval passed to --enable-sim-environment" "$LINENO" 5;; 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 +cat >>confdefs.h <<_ACEOF +#define WITH_ENVIRONMENT $sim_environment +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_environment" >&5 +$as_echo "$sim_environment" >&6; } + sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. diff --git a/sim/microblaze/ChangeLog b/sim/microblaze/ChangeLog index aedefcb..67de9f4 100644 --- a/sim/microblaze/ChangeLog +++ b/sim/microblaze/ChangeLog @@ -1,5 +1,9 @@ 2016-01-10 Mike Frysinger <vapier@gentoo.org> + * config.in, 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/config.in b/sim/microblaze/config.in index f24eb3b..aa3e45c 100644 --- a/sim/microblaze/config.in +++ b/sim/microblaze/config.in @@ -3,6 +3,9 @@ /* Define if building universal (internal helper macro) */ #undef AC_APPLE_UNIVERSAL_BUILD +/* Sim debug setting */ +#undef DEBUG + /* Define to 1 if translation of program messages to the user's native language is requested. */ #undef ENABLE_NLS @@ -170,6 +173,9 @@ /* Additional package description */ #undef PKGVERSION +/* Sim profile settings */ +#undef PROFILE + /* Bug reporting address */ #undef REPORT_BUGS_TO @@ -201,6 +207,24 @@ #endif +/* Sim assert settings */ +#undef WITH_ASSERT + +/* Sim debug setting */ +#undef WITH_DEBUG + +/* Sim default environment */ +#undef WITH_ENVIRONMENT + +/* Sim profile settings */ +#undef WITH_PROFILE + +/* How to route I/O */ +#undef WITH_STDIO + +/* Sim trace settings */ +#undef WITH_TRACE + /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ #if defined AC_APPLE_UNIVERSAL_BUILD diff --git a/sim/microblaze/configure b/sim/microblaze/configure index c16d784..e177055 100755 --- a/sim/microblaze/configure +++ b/sim/microblaze/configure @@ -604,10 +604,6 @@ cgen_breaks REPORT_BUGS_TEXI REPORT_BUGS_TO PKGVERSION -sim_profile -sim_trace -sim_stdio -sim_debug MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -682,8 +678,6 @@ CFLAGS CC WERROR_CFLAGS WARN_CFLAGS -sim_xor_endian -sim_smp sim_reserved_bits sim_inline sim_hw @@ -694,9 +688,7 @@ sim_scache sim_float sim_endian sim_bitsize -sim_assert sim_alignment -sim_environment target_alias host_alias build_alias @@ -4032,10 +4024,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - # intl sister-directory configuration rules. # @@ -12843,7 +12831,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12846 "configure" +#line 12834 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12949,7 +12937,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12952 "configure" +#line 12940 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13217,124 +13205,164 @@ fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim debug setting" >&5 +$as_echo_n "checking for sim debug setting... " >&6; } +sim_debug="0" # Check whether --enable-sim-debug was given. if test "${enable_sim_debug+set}" = set; then : enableval=$enable_sim_debug; case "${enableval}" in - yes) sim_debug="-DDEBUG=7 -DWITH_DEBUG=7";; - no) sim_debug="-DDEBUG=0 -DWITH_DEBUG=0";; - *) sim_debug="-DDEBUG='(${enableval})' -DWITH_DEBUG='(${enableval})'";; + yes) sim_debug="7";; + no) sim_debug="0";; + *) sim_debug="($enableval)";; esac -if test x"$silent" != x"yes" && test x"$sim_debug" != x""; then - echo "Setting sim debug = $sim_debug" 6>&1 fi -else - sim_debug="" +if test "$sim_debug" != "0"; then + +cat >>confdefs.h <<_ACEOF +#define DEBUG $sim_debug +_ACEOF + fi +cat >>confdefs.h <<_ACEOF +#define WITH_DEBUG $sim_debug +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_debug" >&5 +$as_echo "$sim_debug" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim stdio debug behavior" >&5 +$as_echo_n "checking for sim stdio debug behavior... " >&6; } +sim_stdio="0" # Check whether --enable-sim-stdio was given. if test "${enable_sim_stdio+set}" = set; then : enableval=$enable_sim_stdio; case "${enableval}" in - yes) sim_stdio="-DWITH_STDIO=DO_USE_STDIO";; - no) sim_stdio="-DWITH_STDIO=DONT_USE_STDIO";; - *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-stdio\"" "$LINENO" 5; sim_stdio="";; + yes) sim_stdio="DO_USE_STDIO";; + no) sim_stdio="DONT_USE_STDIO";; + *) as_fn_error "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_stdio" != x""; then - echo "Setting stdio flags = $sim_stdio" 6>&1 -fi -else - sim_stdio="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_STDIO $sim_stdio +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_stdio" >&5 +$as_echo "$sim_stdio" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim trace settings" >&5 +$as_echo_n "checking for sim trace settings... " >&6; } +sim_trace="~TRACE_debug" # Check whether --enable-sim-trace was given. if test "${enable_sim_trace+set}" = set; then : enableval=$enable_sim_trace; case "${enableval}" in - yes) sim_trace="-DWITH_TRACE=-1";; - no) sim_trace="-DWITH_TRACE=0";; + yes) sim_trace="-1";; + no) sim_trace="0";; [-0-9]*) - sim_trace="-DWITH_TRACE='(${enableval})'";; + sim_trace="'(${enableval})'";; [[:lower:]]*) sim_trace="" for x in `echo "$enableval" | sed -e "s/,/ /g"`; do if test x"$sim_trace" = x; then - sim_trace="-DWITH_TRACE='(TRACE_$x" + sim_trace="(TRACE_$x" else sim_trace="${sim_trace}|TRACE_$x" fi done - sim_trace="$sim_trace)'" ;; + sim_trace="$sim_trace)" ;; esac -if test x"$silent" != x"yes" && test x"$sim_trace" != x""; then - echo "Setting sim trace = $sim_trace" 6>&1 -fi -else - sim_trace="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_TRACE $sim_trace +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_trace" >&5 +$as_echo "$sim_trace" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim profile settings" >&5 +$as_echo_n "checking for sim profile settings... " >&6; } +profile="1" +sim_profile="-1" # Check whether --enable-sim-profile was given. if test "${enable_sim_profile+set}" = set; then : enableval=$enable_sim_profile; case "${enableval}" in - yes) sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1";; - no) sim_profile="-DPROFILE=0 -DWITH_PROFILE=0";; + yes) profile="1" sim_profile="-1";; + no) profile="0" sim_profile="0";; [-0-9]*) - sim_profile="-DPROFILE='(${enableval})' -DWITH_PROFILE='(${enableval})'";; + profile="(${enableval})" sim_profile="(${enableval})";; [a-z]*) + profile="1" sim_profile="" for x in `echo "$enableval" | sed -e "s/,/ /g"`; do if test x"$sim_profile" = x; then - sim_profile="-DWITH_PROFILE='(PROFILE_$x" + sim_profile="(PROFILE_$x" else sim_profile="${sim_profile}|PROFILE_$x" fi done - sim_profile="$sim_profile)'" ;; + sim_profile="$sim_profile)" ;; esac -if test x"$silent" != x"yes" && test x"$sim_profile" != x""; then - echo "Setting sim profile = $sim_profile" 6>&1 -fi -else - sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1" fi +cat >>confdefs.h <<_ACEOF +#define PROFILE $profile +_ACEOF +cat >>confdefs.h <<_ACEOF +#define WITH_PROFILE $sim_profile +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_profile" >&5 +$as_echo "$sim_profile" >&6; } + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable sim asserts" >&5 +$as_echo_n "checking whether to enable sim asserts... " >&6; } +sim_assert="1" # Check whether --enable-sim-assert was given. if test "${enable_sim_assert+set}" = set; then : enableval=$enable_sim_assert; case "${enableval}" in - yes) sim_assert="-DWITH_ASSERT=1";; - no) sim_assert="-DWITH_ASSERT=0";; - *) as_fn_error "\"--enable-sim-assert does not take a value\"" "$LINENO" 5; sim_assert="";; + yes) sim_assert="1";; + no) sim_assert="0";; + *) as_fn_error "--enable-sim-assert does not take a value" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_assert" != x""; then - echo "Setting assert flags = $sim_assert" 6>&1 -fi -else - sim_assert="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_ASSERT $sim_assert +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_assert" >&5 +$as_echo "$sim_assert" >&6; } + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking default sim environment setting" >&5 +$as_echo_n "checking default sim environment setting... " >&6; } +sim_environment="ALL_ENVIRONMENT" # 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="";; + all | ALL) sim_environment="ALL_ENVIRONMENT";; + user | USER) sim_environment="USER_ENVIRONMENT";; + virtual | VIRTUAL) sim_environment="VIRTUAL_ENVIRONMENT";; + operating | OPERATING) sim_environment="OPERATING_ENVIRONMENT";; + *) as_fn_error "Unknown value $enableval passed to --enable-sim-environment" "$LINENO" 5;; 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 +cat >>confdefs.h <<_ACEOF +#define WITH_ENVIRONMENT $sim_environment +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_environment" >&5 +$as_echo "$sim_environment" >&6; } + sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog index 4ce0a70..918c4c0 100644 --- a/sim/mips/ChangeLog +++ b/sim/mips/ChangeLog @@ -1,5 +1,9 @@ 2016-01-10 Mike Frysinger <vapier@gentoo.org> + * config.in, configure: Regenerate. + +2016-01-10 Mike Frysinger <vapier@gentoo.org> + * configure: Regenerate. 2016-01-10 Mike Frysinger <vapier@gentoo.org> diff --git a/sim/mips/config.in b/sim/mips/config.in index 252be50..8c960bc 100644 --- a/sim/mips/config.in +++ b/sim/mips/config.in @@ -3,6 +3,9 @@ /* Define if building universal (internal helper macro) */ #undef AC_APPLE_UNIVERSAL_BUILD +/* Sim debug setting */ +#undef DEBUG + /* Define to 1 if translation of program messages to the user's native language is requested. */ #undef ENABLE_NLS @@ -185,6 +188,9 @@ /* Additional package description */ #undef PKGVERSION +/* Sim profile settings */ +#undef PROFILE + /* Bug reporting address */ #undef REPORT_BUGS_TO @@ -216,6 +222,24 @@ #endif +/* Sim assert settings */ +#undef WITH_ASSERT + +/* Sim debug setting */ +#undef WITH_DEBUG + +/* Sim default environment */ +#undef WITH_ENVIRONMENT + +/* Sim profile settings */ +#undef WITH_PROFILE + +/* How to route I/O */ +#undef WITH_STDIO + +/* Sim trace settings */ +#undef WITH_TRACE + /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ #if defined AC_APPLE_UNIVERSAL_BUILD diff --git a/sim/mips/configure b/sim/mips/configure index 2b82ec7..1e61e9d 100755 --- a/sim/mips/configure +++ b/sim/mips/configure @@ -617,10 +617,6 @@ SIM_SUBTARGET REPORT_BUGS_TEXI REPORT_BUGS_TO PKGVERSION -sim_profile -sim_trace -sim_stdio -sim_debug MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -695,8 +691,6 @@ CFLAGS CC WERROR_CFLAGS WARN_CFLAGS -sim_xor_endian -sim_smp sim_reserved_bits sim_inline sim_hw @@ -707,9 +701,7 @@ sim_scache sim_float sim_endian sim_bitsize -sim_assert sim_alignment -sim_environment target_alias host_alias build_alias @@ -4065,10 +4057,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - # intl sister-directory configuration rules. # @@ -12876,7 +12864,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12879 "configure" +#line 12867 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12982,7 +12970,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12985 "configure" +#line 12973 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13250,124 +13238,164 @@ fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim debug setting" >&5 +$as_echo_n "checking for sim debug setting... " >&6; } +sim_debug="0" # Check whether --enable-sim-debug was given. if test "${enable_sim_debug+set}" = set; then : enableval=$enable_sim_debug; case "${enableval}" in - yes) sim_debug="-DDEBUG=7 -DWITH_DEBUG=7";; - no) sim_debug="-DDEBUG=0 -DWITH_DEBUG=0";; - *) sim_debug="-DDEBUG='(${enableval})' -DWITH_DEBUG='(${enableval})'";; + yes) sim_debug="7";; + no) sim_debug="0";; + *) sim_debug="($enableval)";; esac -if test x"$silent" != x"yes" && test x"$sim_debug" != x""; then - echo "Setting sim debug = $sim_debug" 6>&1 fi -else - sim_debug="" +if test "$sim_debug" != "0"; then + +cat >>confdefs.h <<_ACEOF +#define DEBUG $sim_debug +_ACEOF + fi +cat >>confdefs.h <<_ACEOF +#define WITH_DEBUG $sim_debug +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_debug" >&5 +$as_echo "$sim_debug" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim stdio debug behavior" >&5 +$as_echo_n "checking for sim stdio debug behavior... " >&6; } +sim_stdio="0" # Check whether --enable-sim-stdio was given. if test "${enable_sim_stdio+set}" = set; then : enableval=$enable_sim_stdio; case "${enableval}" in - yes) sim_stdio="-DWITH_STDIO=DO_USE_STDIO";; - no) sim_stdio="-DWITH_STDIO=DONT_USE_STDIO";; - *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-stdio\"" "$LINENO" 5; sim_stdio="";; + yes) sim_stdio="DO_USE_STDIO";; + no) sim_stdio="DONT_USE_STDIO";; + *) as_fn_error "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_stdio" != x""; then - echo "Setting stdio flags = $sim_stdio" 6>&1 -fi -else - sim_stdio="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_STDIO $sim_stdio +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_stdio" >&5 +$as_echo "$sim_stdio" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim trace settings" >&5 +$as_echo_n "checking for sim trace settings... " >&6; } +sim_trace="~TRACE_debug" # Check whether --enable-sim-trace was given. if test "${enable_sim_trace+set}" = set; then : enableval=$enable_sim_trace; case "${enableval}" in - yes) sim_trace="-DWITH_TRACE=-1";; - no) sim_trace="-DWITH_TRACE=0";; + yes) sim_trace="-1";; + no) sim_trace="0";; [-0-9]*) - sim_trace="-DWITH_TRACE='(${enableval})'";; + sim_trace="'(${enableval})'";; [[:lower:]]*) sim_trace="" for x in `echo "$enableval" | sed -e "s/,/ /g"`; do if test x"$sim_trace" = x; then - sim_trace="-DWITH_TRACE='(TRACE_$x" + sim_trace="(TRACE_$x" else sim_trace="${sim_trace}|TRACE_$x" fi done - sim_trace="$sim_trace)'" ;; + sim_trace="$sim_trace)" ;; esac -if test x"$silent" != x"yes" && test x"$sim_trace" != x""; then - echo "Setting sim trace = $sim_trace" 6>&1 -fi -else - sim_trace="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_TRACE $sim_trace +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_trace" >&5 +$as_echo "$sim_trace" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim profile settings" >&5 +$as_echo_n "checking for sim profile settings... " >&6; } +profile="1" +sim_profile="-1" # Check whether --enable-sim-profile was given. if test "${enable_sim_profile+set}" = set; then : enableval=$enable_sim_profile; case "${enableval}" in - yes) sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1";; - no) sim_profile="-DPROFILE=0 -DWITH_PROFILE=0";; + yes) profile="1" sim_profile="-1";; + no) profile="0" sim_profile="0";; [-0-9]*) - sim_profile="-DPROFILE='(${enableval})' -DWITH_PROFILE='(${enableval})'";; + profile="(${enableval})" sim_profile="(${enableval})";; [a-z]*) + profile="1" sim_profile="" for x in `echo "$enableval" | sed -e "s/,/ /g"`; do if test x"$sim_profile" = x; then - sim_profile="-DWITH_PROFILE='(PROFILE_$x" + sim_profile="(PROFILE_$x" else sim_profile="${sim_profile}|PROFILE_$x" fi done - sim_profile="$sim_profile)'" ;; + sim_profile="$sim_profile)" ;; esac -if test x"$silent" != x"yes" && test x"$sim_profile" != x""; then - echo "Setting sim profile = $sim_profile" 6>&1 -fi -else - sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1" fi +cat >>confdefs.h <<_ACEOF +#define PROFILE $profile +_ACEOF +cat >>confdefs.h <<_ACEOF +#define WITH_PROFILE $sim_profile +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_profile" >&5 +$as_echo "$sim_profile" >&6; } + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable sim asserts" >&5 +$as_echo_n "checking whether to enable sim asserts... " >&6; } +sim_assert="1" # Check whether --enable-sim-assert was given. if test "${enable_sim_assert+set}" = set; then : enableval=$enable_sim_assert; case "${enableval}" in - yes) sim_assert="-DWITH_ASSERT=1";; - no) sim_assert="-DWITH_ASSERT=0";; - *) as_fn_error "\"--enable-sim-assert does not take a value\"" "$LINENO" 5; sim_assert="";; + yes) sim_assert="1";; + no) sim_assert="0";; + *) as_fn_error "--enable-sim-assert does not take a value" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_assert" != x""; then - echo "Setting assert flags = $sim_assert" 6>&1 -fi -else - sim_assert="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_ASSERT $sim_assert +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_assert" >&5 +$as_echo "$sim_assert" >&6; } + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking default sim environment setting" >&5 +$as_echo_n "checking default sim environment setting... " >&6; } +sim_environment="ALL_ENVIRONMENT" # 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="";; + all | ALL) sim_environment="ALL_ENVIRONMENT";; + user | USER) sim_environment="USER_ENVIRONMENT";; + virtual | VIRTUAL) sim_environment="VIRTUAL_ENVIRONMENT";; + operating | OPERATING) sim_environment="OPERATING_ENVIRONMENT";; + *) as_fn_error "Unknown value $enableval passed to --enable-sim-environment" "$LINENO" 5;; 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 +cat >>confdefs.h <<_ACEOF +#define WITH_ENVIRONMENT $sim_environment +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_environment" >&5 +$as_echo "$sim_environment" >&6; } + sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. diff --git a/sim/mn10300/ChangeLog b/sim/mn10300/ChangeLog index 095ff39..e182202 100644 --- a/sim/mn10300/ChangeLog +++ b/sim/mn10300/ChangeLog @@ -1,5 +1,9 @@ 2016-01-10 Mike Frysinger <vapier@gentoo.org> + * config.in, configure: Regenerate. + +2016-01-10 Mike Frysinger <vapier@gentoo.org> + * configure: Regenerate. 2016-01-10 Mike Frysinger <vapier@gentoo.org> diff --git a/sim/mn10300/config.in b/sim/mn10300/config.in index 5ca6940..d1138cf 100644 --- a/sim/mn10300/config.in +++ b/sim/mn10300/config.in @@ -3,6 +3,9 @@ /* Define if building universal (internal helper macro) */ #undef AC_APPLE_UNIVERSAL_BUILD +/* Sim debug setting */ +#undef DEBUG + /* Define to 1 if translation of program messages to the user's native language is requested. */ #undef ENABLE_NLS @@ -197,6 +200,9 @@ /* Additional package description */ #undef PKGVERSION +/* Sim profile settings */ +#undef PROFILE + /* Bug reporting address */ #undef REPORT_BUGS_TO @@ -228,6 +234,24 @@ #endif +/* Sim assert settings */ +#undef WITH_ASSERT + +/* Sim debug setting */ +#undef WITH_DEBUG + +/* Sim default environment */ +#undef WITH_ENVIRONMENT + +/* Sim profile settings */ +#undef WITH_PROFILE + +/* How to route I/O */ +#undef WITH_STDIO + +/* Sim trace settings */ +#undef WITH_TRACE + /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ #if defined AC_APPLE_UNIVERSAL_BUILD diff --git a/sim/mn10300/configure b/sim/mn10300/configure index 027f3b33..2e7fdc6 100755 --- a/sim/mn10300/configure +++ b/sim/mn10300/configure @@ -604,10 +604,6 @@ cgen_breaks REPORT_BUGS_TEXI REPORT_BUGS_TO PKGVERSION -sim_profile -sim_trace -sim_stdio -sim_debug MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -682,8 +678,6 @@ CFLAGS CC WERROR_CFLAGS WARN_CFLAGS -sim_xor_endian -sim_smp sim_reserved_bits sim_inline sim_hw @@ -694,9 +688,7 @@ sim_scache sim_float sim_endian sim_bitsize -sim_assert sim_alignment -sim_environment target_alias host_alias build_alias @@ -4041,10 +4033,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - # intl sister-directory configuration rules. # @@ -12852,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 12855 "configure" +#line 12843 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12958,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 12961 "configure" +#line 12949 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13226,124 +13214,164 @@ fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim debug setting" >&5 +$as_echo_n "checking for sim debug setting... " >&6; } +sim_debug="0" # Check whether --enable-sim-debug was given. if test "${enable_sim_debug+set}" = set; then : enableval=$enable_sim_debug; case "${enableval}" in - yes) sim_debug="-DDEBUG=7 -DWITH_DEBUG=7";; - no) sim_debug="-DDEBUG=0 -DWITH_DEBUG=0";; - *) sim_debug="-DDEBUG='(${enableval})' -DWITH_DEBUG='(${enableval})'";; + yes) sim_debug="7";; + no) sim_debug="0";; + *) sim_debug="($enableval)";; esac -if test x"$silent" != x"yes" && test x"$sim_debug" != x""; then - echo "Setting sim debug = $sim_debug" 6>&1 fi -else - sim_debug="" +if test "$sim_debug" != "0"; then + +cat >>confdefs.h <<_ACEOF +#define DEBUG $sim_debug +_ACEOF + fi +cat >>confdefs.h <<_ACEOF +#define WITH_DEBUG $sim_debug +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_debug" >&5 +$as_echo "$sim_debug" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim stdio debug behavior" >&5 +$as_echo_n "checking for sim stdio debug behavior... " >&6; } +sim_stdio="0" # Check whether --enable-sim-stdio was given. if test "${enable_sim_stdio+set}" = set; then : enableval=$enable_sim_stdio; case "${enableval}" in - yes) sim_stdio="-DWITH_STDIO=DO_USE_STDIO";; - no) sim_stdio="-DWITH_STDIO=DONT_USE_STDIO";; - *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-stdio\"" "$LINENO" 5; sim_stdio="";; + yes) sim_stdio="DO_USE_STDIO";; + no) sim_stdio="DONT_USE_STDIO";; + *) as_fn_error "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_stdio" != x""; then - echo "Setting stdio flags = $sim_stdio" 6>&1 -fi -else - sim_stdio="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_STDIO $sim_stdio +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_stdio" >&5 +$as_echo "$sim_stdio" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim trace settings" >&5 +$as_echo_n "checking for sim trace settings... " >&6; } +sim_trace="~TRACE_debug" # Check whether --enable-sim-trace was given. if test "${enable_sim_trace+set}" = set; then : enableval=$enable_sim_trace; case "${enableval}" in - yes) sim_trace="-DWITH_TRACE=-1";; - no) sim_trace="-DWITH_TRACE=0";; + yes) sim_trace="-1";; + no) sim_trace="0";; [-0-9]*) - sim_trace="-DWITH_TRACE='(${enableval})'";; + sim_trace="'(${enableval})'";; [[:lower:]]*) sim_trace="" for x in `echo "$enableval" | sed -e "s/,/ /g"`; do if test x"$sim_trace" = x; then - sim_trace="-DWITH_TRACE='(TRACE_$x" + sim_trace="(TRACE_$x" else sim_trace="${sim_trace}|TRACE_$x" fi done - sim_trace="$sim_trace)'" ;; + sim_trace="$sim_trace)" ;; esac -if test x"$silent" != x"yes" && test x"$sim_trace" != x""; then - echo "Setting sim trace = $sim_trace" 6>&1 -fi -else - sim_trace="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_TRACE $sim_trace +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_trace" >&5 +$as_echo "$sim_trace" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim profile settings" >&5 +$as_echo_n "checking for sim profile settings... " >&6; } +profile="1" +sim_profile="-1" # Check whether --enable-sim-profile was given. if test "${enable_sim_profile+set}" = set; then : enableval=$enable_sim_profile; case "${enableval}" in - yes) sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1";; - no) sim_profile="-DPROFILE=0 -DWITH_PROFILE=0";; + yes) profile="1" sim_profile="-1";; + no) profile="0" sim_profile="0";; [-0-9]*) - sim_profile="-DPROFILE='(${enableval})' -DWITH_PROFILE='(${enableval})'";; + profile="(${enableval})" sim_profile="(${enableval})";; [a-z]*) + profile="1" sim_profile="" for x in `echo "$enableval" | sed -e "s/,/ /g"`; do if test x"$sim_profile" = x; then - sim_profile="-DWITH_PROFILE='(PROFILE_$x" + sim_profile="(PROFILE_$x" else sim_profile="${sim_profile}|PROFILE_$x" fi done - sim_profile="$sim_profile)'" ;; + sim_profile="$sim_profile)" ;; esac -if test x"$silent" != x"yes" && test x"$sim_profile" != x""; then - echo "Setting sim profile = $sim_profile" 6>&1 -fi -else - sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1" fi +cat >>confdefs.h <<_ACEOF +#define PROFILE $profile +_ACEOF +cat >>confdefs.h <<_ACEOF +#define WITH_PROFILE $sim_profile +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_profile" >&5 +$as_echo "$sim_profile" >&6; } + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable sim asserts" >&5 +$as_echo_n "checking whether to enable sim asserts... " >&6; } +sim_assert="1" # Check whether --enable-sim-assert was given. if test "${enable_sim_assert+set}" = set; then : enableval=$enable_sim_assert; case "${enableval}" in - yes) sim_assert="-DWITH_ASSERT=1";; - no) sim_assert="-DWITH_ASSERT=0";; - *) as_fn_error "\"--enable-sim-assert does not take a value\"" "$LINENO" 5; sim_assert="";; + yes) sim_assert="1";; + no) sim_assert="0";; + *) as_fn_error "--enable-sim-assert does not take a value" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_assert" != x""; then - echo "Setting assert flags = $sim_assert" 6>&1 -fi -else - sim_assert="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_ASSERT $sim_assert +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_assert" >&5 +$as_echo "$sim_assert" >&6; } + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking default sim environment setting" >&5 +$as_echo_n "checking default sim environment setting... " >&6; } +sim_environment="ALL_ENVIRONMENT" # 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="";; + all | ALL) sim_environment="ALL_ENVIRONMENT";; + user | USER) sim_environment="USER_ENVIRONMENT";; + virtual | VIRTUAL) sim_environment="VIRTUAL_ENVIRONMENT";; + operating | OPERATING) sim_environment="OPERATING_ENVIRONMENT";; + *) as_fn_error "Unknown value $enableval passed to --enable-sim-environment" "$LINENO" 5;; 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 +cat >>confdefs.h <<_ACEOF +#define WITH_ENVIRONMENT $sim_environment +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_environment" >&5 +$as_echo "$sim_environment" >&6; } + sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. diff --git a/sim/moxie/ChangeLog b/sim/moxie/ChangeLog index ce0644e..2371ff1 100644 --- a/sim/moxie/ChangeLog +++ b/sim/moxie/ChangeLog @@ -1,5 +1,9 @@ 2016-01-10 Mike Frysinger <vapier@gentoo.org> + * config.in, 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/config.in b/sim/moxie/config.in index f24eb3b..aa3e45c 100644 --- a/sim/moxie/config.in +++ b/sim/moxie/config.in @@ -3,6 +3,9 @@ /* Define if building universal (internal helper macro) */ #undef AC_APPLE_UNIVERSAL_BUILD +/* Sim debug setting */ +#undef DEBUG + /* Define to 1 if translation of program messages to the user's native language is requested. */ #undef ENABLE_NLS @@ -170,6 +173,9 @@ /* Additional package description */ #undef PKGVERSION +/* Sim profile settings */ +#undef PROFILE + /* Bug reporting address */ #undef REPORT_BUGS_TO @@ -201,6 +207,24 @@ #endif +/* Sim assert settings */ +#undef WITH_ASSERT + +/* Sim debug setting */ +#undef WITH_DEBUG + +/* Sim default environment */ +#undef WITH_ENVIRONMENT + +/* Sim profile settings */ +#undef WITH_PROFILE + +/* How to route I/O */ +#undef WITH_STDIO + +/* Sim trace settings */ +#undef WITH_TRACE + /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ #if defined AC_APPLE_UNIVERSAL_BUILD diff --git a/sim/moxie/configure b/sim/moxie/configure index 9ba20fa..ac103a6 100755 --- a/sim/moxie/configure +++ b/sim/moxie/configure @@ -605,10 +605,6 @@ DTC REPORT_BUGS_TEXI REPORT_BUGS_TO PKGVERSION -sim_profile -sim_trace -sim_stdio -sim_debug MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -683,8 +679,6 @@ CFLAGS CC WERROR_CFLAGS WARN_CFLAGS -sim_xor_endian -sim_smp sim_reserved_bits sim_inline sim_hw @@ -695,9 +689,7 @@ sim_scache sim_float sim_endian sim_bitsize -sim_assert sim_alignment -sim_environment target_alias host_alias build_alias @@ -4033,10 +4025,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - # intl sister-directory configuration rules. # @@ -12844,7 +12832,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 12835 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12950,7 +12938,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 12941 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13218,124 +13206,164 @@ fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim debug setting" >&5 +$as_echo_n "checking for sim debug setting... " >&6; } +sim_debug="0" # Check whether --enable-sim-debug was given. if test "${enable_sim_debug+set}" = set; then : enableval=$enable_sim_debug; case "${enableval}" in - yes) sim_debug="-DDEBUG=7 -DWITH_DEBUG=7";; - no) sim_debug="-DDEBUG=0 -DWITH_DEBUG=0";; - *) sim_debug="-DDEBUG='(${enableval})' -DWITH_DEBUG='(${enableval})'";; + yes) sim_debug="7";; + no) sim_debug="0";; + *) sim_debug="($enableval)";; esac -if test x"$silent" != x"yes" && test x"$sim_debug" != x""; then - echo "Setting sim debug = $sim_debug" 6>&1 fi -else - sim_debug="" +if test "$sim_debug" != "0"; then + +cat >>confdefs.h <<_ACEOF +#define DEBUG $sim_debug +_ACEOF + fi +cat >>confdefs.h <<_ACEOF +#define WITH_DEBUG $sim_debug +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_debug" >&5 +$as_echo "$sim_debug" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim stdio debug behavior" >&5 +$as_echo_n "checking for sim stdio debug behavior... " >&6; } +sim_stdio="0" # Check whether --enable-sim-stdio was given. if test "${enable_sim_stdio+set}" = set; then : enableval=$enable_sim_stdio; case "${enableval}" in - yes) sim_stdio="-DWITH_STDIO=DO_USE_STDIO";; - no) sim_stdio="-DWITH_STDIO=DONT_USE_STDIO";; - *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-stdio\"" "$LINENO" 5; sim_stdio="";; + yes) sim_stdio="DO_USE_STDIO";; + no) sim_stdio="DONT_USE_STDIO";; + *) as_fn_error "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_stdio" != x""; then - echo "Setting stdio flags = $sim_stdio" 6>&1 -fi -else - sim_stdio="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_STDIO $sim_stdio +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_stdio" >&5 +$as_echo "$sim_stdio" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim trace settings" >&5 +$as_echo_n "checking for sim trace settings... " >&6; } +sim_trace="~TRACE_debug" # Check whether --enable-sim-trace was given. if test "${enable_sim_trace+set}" = set; then : enableval=$enable_sim_trace; case "${enableval}" in - yes) sim_trace="-DWITH_TRACE=-1";; - no) sim_trace="-DWITH_TRACE=0";; + yes) sim_trace="-1";; + no) sim_trace="0";; [-0-9]*) - sim_trace="-DWITH_TRACE='(${enableval})'";; + sim_trace="'(${enableval})'";; [[:lower:]]*) sim_trace="" for x in `echo "$enableval" | sed -e "s/,/ /g"`; do if test x"$sim_trace" = x; then - sim_trace="-DWITH_TRACE='(TRACE_$x" + sim_trace="(TRACE_$x" else sim_trace="${sim_trace}|TRACE_$x" fi done - sim_trace="$sim_trace)'" ;; + sim_trace="$sim_trace)" ;; esac -if test x"$silent" != x"yes" && test x"$sim_trace" != x""; then - echo "Setting sim trace = $sim_trace" 6>&1 -fi -else - sim_trace="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_TRACE $sim_trace +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_trace" >&5 +$as_echo "$sim_trace" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim profile settings" >&5 +$as_echo_n "checking for sim profile settings... " >&6; } +profile="1" +sim_profile="-1" # Check whether --enable-sim-profile was given. if test "${enable_sim_profile+set}" = set; then : enableval=$enable_sim_profile; case "${enableval}" in - yes) sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1";; - no) sim_profile="-DPROFILE=0 -DWITH_PROFILE=0";; + yes) profile="1" sim_profile="-1";; + no) profile="0" sim_profile="0";; [-0-9]*) - sim_profile="-DPROFILE='(${enableval})' -DWITH_PROFILE='(${enableval})'";; + profile="(${enableval})" sim_profile="(${enableval})";; [a-z]*) + profile="1" sim_profile="" for x in `echo "$enableval" | sed -e "s/,/ /g"`; do if test x"$sim_profile" = x; then - sim_profile="-DWITH_PROFILE='(PROFILE_$x" + sim_profile="(PROFILE_$x" else sim_profile="${sim_profile}|PROFILE_$x" fi done - sim_profile="$sim_profile)'" ;; + sim_profile="$sim_profile)" ;; esac -if test x"$silent" != x"yes" && test x"$sim_profile" != x""; then - echo "Setting sim profile = $sim_profile" 6>&1 -fi -else - sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1" fi +cat >>confdefs.h <<_ACEOF +#define PROFILE $profile +_ACEOF +cat >>confdefs.h <<_ACEOF +#define WITH_PROFILE $sim_profile +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_profile" >&5 +$as_echo "$sim_profile" >&6; } + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable sim asserts" >&5 +$as_echo_n "checking whether to enable sim asserts... " >&6; } +sim_assert="1" # Check whether --enable-sim-assert was given. if test "${enable_sim_assert+set}" = set; then : enableval=$enable_sim_assert; case "${enableval}" in - yes) sim_assert="-DWITH_ASSERT=1";; - no) sim_assert="-DWITH_ASSERT=0";; - *) as_fn_error "\"--enable-sim-assert does not take a value\"" "$LINENO" 5; sim_assert="";; + yes) sim_assert="1";; + no) sim_assert="0";; + *) as_fn_error "--enable-sim-assert does not take a value" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_assert" != x""; then - echo "Setting assert flags = $sim_assert" 6>&1 -fi -else - sim_assert="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_ASSERT $sim_assert +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_assert" >&5 +$as_echo "$sim_assert" >&6; } + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking default sim environment setting" >&5 +$as_echo_n "checking default sim environment setting... " >&6; } +sim_environment="ALL_ENVIRONMENT" # 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="";; + all | ALL) sim_environment="ALL_ENVIRONMENT";; + user | USER) sim_environment="USER_ENVIRONMENT";; + virtual | VIRTUAL) sim_environment="VIRTUAL_ENVIRONMENT";; + operating | OPERATING) sim_environment="OPERATING_ENVIRONMENT";; + *) as_fn_error "Unknown value $enableval passed to --enable-sim-environment" "$LINENO" 5;; 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 +cat >>confdefs.h <<_ACEOF +#define WITH_ENVIRONMENT $sim_environment +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_environment" >&5 +$as_echo "$sim_environment" >&6; } + sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. diff --git a/sim/msp430/ChangeLog b/sim/msp430/ChangeLog index 7e88111..9f06b48 100644 --- a/sim/msp430/ChangeLog +++ b/sim/msp430/ChangeLog @@ -1,5 +1,9 @@ 2016-01-10 Mike Frysinger <vapier@gentoo.org> + * config.in, configure: Regenerate. + +2016-01-10 Mike Frysinger <vapier@gentoo.org> + * configure: Regenerate. 2016-01-10 Mike Frysinger <vapier@gentoo.org> diff --git a/sim/msp430/config.in b/sim/msp430/config.in index 5a5b182..c00e2f6 100644 --- a/sim/msp430/config.in +++ b/sim/msp430/config.in @@ -3,6 +3,9 @@ /* Define if building universal (internal helper macro) */ #undef AC_APPLE_UNIVERSAL_BUILD +/* Sim debug setting */ +#undef DEBUG + /* Define to 1 if translation of program messages to the user's native language is requested. */ #undef ENABLE_NLS @@ -173,6 +176,9 @@ /* Additional package description */ #undef PKGVERSION +/* Sim profile settings */ +#undef PROFILE + /* Bug reporting address */ #undef REPORT_BUGS_TO @@ -204,6 +210,24 @@ #endif +/* Sim assert settings */ +#undef WITH_ASSERT + +/* Sim debug setting */ +#undef WITH_DEBUG + +/* Sim default environment */ +#undef WITH_ENVIRONMENT + +/* Sim profile settings */ +#undef WITH_PROFILE + +/* How to route I/O */ +#undef WITH_STDIO + +/* Sim trace settings */ +#undef WITH_TRACE + /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ #if defined AC_APPLE_UNIVERSAL_BUILD diff --git a/sim/msp430/configure b/sim/msp430/configure index f7f3419..0a73ee0 100755 --- a/sim/msp430/configure +++ b/sim/msp430/configure @@ -604,10 +604,6 @@ cgen_breaks REPORT_BUGS_TEXI REPORT_BUGS_TO PKGVERSION -sim_profile -sim_trace -sim_stdio -sim_debug MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -682,8 +678,6 @@ CFLAGS CC WERROR_CFLAGS WARN_CFLAGS -sim_xor_endian -sim_smp sim_reserved_bits sim_inline sim_hw @@ -694,9 +688,7 @@ sim_scache sim_float sim_endian sim_bitsize -sim_assert sim_alignment -sim_environment target_alias host_alias build_alias @@ -4032,10 +4024,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - # intl sister-directory configuration rules. # @@ -12843,7 +12831,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12846 "configure" +#line 12834 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12949,7 +12937,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12952 "configure" +#line 12940 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13217,124 +13205,164 @@ fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim debug setting" >&5 +$as_echo_n "checking for sim debug setting... " >&6; } +sim_debug="0" # Check whether --enable-sim-debug was given. if test "${enable_sim_debug+set}" = set; then : enableval=$enable_sim_debug; case "${enableval}" in - yes) sim_debug="-DDEBUG=7 -DWITH_DEBUG=7";; - no) sim_debug="-DDEBUG=0 -DWITH_DEBUG=0";; - *) sim_debug="-DDEBUG='(${enableval})' -DWITH_DEBUG='(${enableval})'";; + yes) sim_debug="7";; + no) sim_debug="0";; + *) sim_debug="($enableval)";; esac -if test x"$silent" != x"yes" && test x"$sim_debug" != x""; then - echo "Setting sim debug = $sim_debug" 6>&1 fi -else - sim_debug="" +if test "$sim_debug" != "0"; then + +cat >>confdefs.h <<_ACEOF +#define DEBUG $sim_debug +_ACEOF + fi +cat >>confdefs.h <<_ACEOF +#define WITH_DEBUG $sim_debug +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_debug" >&5 +$as_echo "$sim_debug" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim stdio debug behavior" >&5 +$as_echo_n "checking for sim stdio debug behavior... " >&6; } +sim_stdio="0" # Check whether --enable-sim-stdio was given. if test "${enable_sim_stdio+set}" = set; then : enableval=$enable_sim_stdio; case "${enableval}" in - yes) sim_stdio="-DWITH_STDIO=DO_USE_STDIO";; - no) sim_stdio="-DWITH_STDIO=DONT_USE_STDIO";; - *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-stdio\"" "$LINENO" 5; sim_stdio="";; + yes) sim_stdio="DO_USE_STDIO";; + no) sim_stdio="DONT_USE_STDIO";; + *) as_fn_error "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_stdio" != x""; then - echo "Setting stdio flags = $sim_stdio" 6>&1 -fi -else - sim_stdio="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_STDIO $sim_stdio +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_stdio" >&5 +$as_echo "$sim_stdio" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim trace settings" >&5 +$as_echo_n "checking for sim trace settings... " >&6; } +sim_trace="~TRACE_debug" # Check whether --enable-sim-trace was given. if test "${enable_sim_trace+set}" = set; then : enableval=$enable_sim_trace; case "${enableval}" in - yes) sim_trace="-DWITH_TRACE=-1";; - no) sim_trace="-DWITH_TRACE=0";; + yes) sim_trace="-1";; + no) sim_trace="0";; [-0-9]*) - sim_trace="-DWITH_TRACE='(${enableval})'";; + sim_trace="'(${enableval})'";; [[:lower:]]*) sim_trace="" for x in `echo "$enableval" | sed -e "s/,/ /g"`; do if test x"$sim_trace" = x; then - sim_trace="-DWITH_TRACE='(TRACE_$x" + sim_trace="(TRACE_$x" else sim_trace="${sim_trace}|TRACE_$x" fi done - sim_trace="$sim_trace)'" ;; + sim_trace="$sim_trace)" ;; esac -if test x"$silent" != x"yes" && test x"$sim_trace" != x""; then - echo "Setting sim trace = $sim_trace" 6>&1 -fi -else - sim_trace="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_TRACE $sim_trace +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_trace" >&5 +$as_echo "$sim_trace" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim profile settings" >&5 +$as_echo_n "checking for sim profile settings... " >&6; } +profile="1" +sim_profile="-1" # Check whether --enable-sim-profile was given. if test "${enable_sim_profile+set}" = set; then : enableval=$enable_sim_profile; case "${enableval}" in - yes) sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1";; - no) sim_profile="-DPROFILE=0 -DWITH_PROFILE=0";; + yes) profile="1" sim_profile="-1";; + no) profile="0" sim_profile="0";; [-0-9]*) - sim_profile="-DPROFILE='(${enableval})' -DWITH_PROFILE='(${enableval})'";; + profile="(${enableval})" sim_profile="(${enableval})";; [a-z]*) + profile="1" sim_profile="" for x in `echo "$enableval" | sed -e "s/,/ /g"`; do if test x"$sim_profile" = x; then - sim_profile="-DWITH_PROFILE='(PROFILE_$x" + sim_profile="(PROFILE_$x" else sim_profile="${sim_profile}|PROFILE_$x" fi done - sim_profile="$sim_profile)'" ;; + sim_profile="$sim_profile)" ;; esac -if test x"$silent" != x"yes" && test x"$sim_profile" != x""; then - echo "Setting sim profile = $sim_profile" 6>&1 -fi -else - sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1" fi +cat >>confdefs.h <<_ACEOF +#define PROFILE $profile +_ACEOF +cat >>confdefs.h <<_ACEOF +#define WITH_PROFILE $sim_profile +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_profile" >&5 +$as_echo "$sim_profile" >&6; } + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable sim asserts" >&5 +$as_echo_n "checking whether to enable sim asserts... " >&6; } +sim_assert="1" # Check whether --enable-sim-assert was given. if test "${enable_sim_assert+set}" = set; then : enableval=$enable_sim_assert; case "${enableval}" in - yes) sim_assert="-DWITH_ASSERT=1";; - no) sim_assert="-DWITH_ASSERT=0";; - *) as_fn_error "\"--enable-sim-assert does not take a value\"" "$LINENO" 5; sim_assert="";; + yes) sim_assert="1";; + no) sim_assert="0";; + *) as_fn_error "--enable-sim-assert does not take a value" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_assert" != x""; then - echo "Setting assert flags = $sim_assert" 6>&1 -fi -else - sim_assert="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_ASSERT $sim_assert +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_assert" >&5 +$as_echo "$sim_assert" >&6; } + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking default sim environment setting" >&5 +$as_echo_n "checking default sim environment setting... " >&6; } +sim_environment="ALL_ENVIRONMENT" # 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="";; + all | ALL) sim_environment="ALL_ENVIRONMENT";; + user | USER) sim_environment="USER_ENVIRONMENT";; + virtual | VIRTUAL) sim_environment="VIRTUAL_ENVIRONMENT";; + operating | OPERATING) sim_environment="OPERATING_ENVIRONMENT";; + *) as_fn_error "Unknown value $enableval passed to --enable-sim-environment" "$LINENO" 5;; 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 +cat >>confdefs.h <<_ACEOF +#define WITH_ENVIRONMENT $sim_environment +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_environment" >&5 +$as_echo "$sim_environment" >&6; } + sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog index c8ecc03..7ed024e 100644 --- a/sim/ppc/ChangeLog +++ b/sim/ppc/ChangeLog @@ -1,5 +1,18 @@ 2016-01-10 Mike Frysinger <vapier@gentoo.org> + * configure.ac (sim-assert): Call AC_MSG_CHECKING, + AC_DEFINE_UNQUOTED, and AC_MSG_RESULT + (sim-env, sim-stdio, sim-trace): Delete. + * config.in, configure: Regenerate. + * Make-common.in (ENV_CFLAGS, TRACE_CFLAGS, ASSERT_CFLAGS, + STDIO_CFLAGS): Delete. + (CONFIG_CFLAGS): Delete $(ENV_CFLAGS), $(TRACE_CFLAGS), + $(ASSERT_CFLAGS), and $(STDIO_CFLAGS). + * std-config.h (WITH_ENVIRONMENT, WITH_TRACE, WITH_ASSERT, + WITH_STDIO): Delete. + +2016-01-10 Mike Frysinger <vapier@gentoo.org> + * configure: Regenerate. 2016-01-10 Mike Frysinger <vapier@gentoo.org> diff --git a/sim/ppc/Makefile.in b/sim/ppc/Makefile.in index 7d30fae..1635e01 100644 --- a/sim/ppc/Makefile.in +++ b/sim/ppc/Makefile.in @@ -77,16 +77,12 @@ SMP_CFLAGS = @sim_smp@ XOR_ENDIAN_CFLAGS = @sim_xor_endian@ BITSIZE_CFLAGS = @sim_bitsize@ HOSTBITSIZE_CFLAGS = @sim_hostbitsize@ -ENV_CFLAGS = @sim_env@ TIMEBASE_CFLAGS = @sim_timebase@ ALIGNMENT_CFLAGS = @sim_alignment@ FLOAT_CFLAGS = @sim_float@ -TRACE_CFLAGS = @sim_trace@ -ASSERT_CFLAGS = @sim_assert@ RESERVED_CFLAGS = @sim_reserved@ MONITOR_CFLAGS = @sim_monitor@ MODEL_CFLAGS = @sim_model@ @sim_default_model@ @sim_model_issue@ -STDIO_CFLAGS = @sim_stdio@ TERMIO_CFLAGS = @sim_termio@ WARNING_CFLAGS = @sim_warnings@ DEVZERO_CFLAGS = @sim_devzero@ @@ -97,16 +93,12 @@ CONFIG_CFLAGS = \ $(XOR_ENDIAN_CFLAGS) \ $(BITSIZE_CFLAGS) \ $(HOSTBITSIZE_CFLAGS) \ - $(ENV_CFLAGS) \ $(TIMEBASE_CFLAGS) \ $(ALIGNMENT_CFLAGS) \ $(FLOAT_CFLAGS) \ - $(TRACE_CFLAGS) \ - $(ASSERT_CFLAGS) \ $(RESERVED_CFLAGS) \ $(MONITOR_CFLAGS) \ $(MODEL_CFLAGS) \ - $(STDIO_CFLAGS) \ $(TERMIO_CFLAGS) \ $(DEVZERO_CFLAGS) SIM_FPU_CFLAGS = @sim_fpu_cflags@ diff --git a/sim/ppc/config.in b/sim/ppc/config.in index 02c7bf0..d001811 100644 --- a/sim/ppc/config.in +++ b/sim/ppc/config.in @@ -325,6 +325,18 @@ when building for Cygwin. */ #undef USE_WIN32API +/* Sim assert settings */ +#undef WITH_ASSERT + +/* Sim default environment */ +#undef WITH_ENVIRONMENT + +/* How to route I/O */ +#undef WITH_STDIO + +/* Sim trace settings */ +#undef WITH_TRACE + /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ #if defined AC_APPLE_UNIVERSAL_BUILD diff --git a/sim/ppc/configure b/sim/ppc/configure index a77265d..2331479 100755 --- a/sim/ppc/configure +++ b/sim/ppc/configure @@ -595,17 +595,16 @@ sim_targ_vals sim_callback sim_devzero sim_termio -sim_stdio sim_model_issue sim_model sim_monitor sim_reserved -sim_trace sim_timebase -sim_env sim_hostbitsize sim_igen_smp +sim_smp sim_hostendian +sim_xor_endian sim_pk_obj sim_pk_src sim_hw_obj @@ -670,8 +669,6 @@ INSTALL_SCRIPT INSTALL_PROGRAM WERROR_CFLAGS WARN_CFLAGS -sim_xor_endian -sim_smp sim_reserved_bits sim_inline sim_hw @@ -682,9 +679,7 @@ sim_scache sim_float sim_endian sim_bitsize -sim_assert sim_alignment -sim_environment target_alias host_alias build_alias @@ -4075,10 +4070,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - # intl sister-directory configuration rules. # @@ -5179,20 +5170,25 @@ else fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable sim asserts" >&5 +$as_echo_n "checking whether to enable sim asserts... " >&6; } +sim_assert="1" # Check whether --enable-sim-assert was given. if test "${enable_sim_assert+set}" = set; then : enableval=$enable_sim_assert; case "${enableval}" in - yes) sim_assert="-DWITH_ASSERT=1";; - no) sim_assert="-DWITH_ASSERT=0";; - *) as_fn_error "\"--enable-sim-assert does not take a value\"" "$LINENO" 5; sim_assert="";; + yes) sim_assert="1";; + no) sim_assert="0";; + *) as_fn_error "--enable-sim-assert does not take a value" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_assert" != x""; then - echo "Setting assert flags = $sim_assert" 6>&1 -fi -else - sim_assert="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_ASSERT $sim_assert +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_assert" >&5 +$as_echo "$sim_assert" >&6; } + # Check whether --enable-sim-bitsize was given. if test "${enable_sim_bitsize+set}" = set; then : @@ -5304,22 +5300,27 @@ else fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking default sim environment setting" >&5 +$as_echo_n "checking default sim environment setting... " >&6; } +sim_env="0" # Check whether --enable-sim-env was given. if test "${enable_sim_env+set}" = set; then : enableval=$enable_sim_env; case "${enableval}" in - operating | os | oea) sim_env="-DWITH_ENVIRONMENT=OPERATING_ENVIRONMENT";; - virtual | vea) sim_env="-DWITH_ENVIRONMENT=VIRTUAL_ENVIRONMENT";; - user | uea) sim_env="-DWITH_ENVIRONMENT=USER_ENVIRONMENT";; - no) sim_env="-DWITH_ENVIRONMENT=0";; - *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-env\"" "$LINENO" 5; sim_env="";; + operating | os | oea) sim_env="OPERATING_ENVIRONMENT";; + virtual | vea) sim_env="VIRTUAL_ENVIRONMENT";; + user | uea) sim_env="USER_ENVIRONMENT";; + no) sim_env="0";; + *) as_fn_error "Unknown value $enableval passed to --enable-sim-env" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_env" != x""; then - echo "Setting env flags = $sim_env" 6>&1 -fi -else - sim_env="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_ENVIRONMENT $sim_env +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_env" >&5 +$as_echo "$sim_env" >&6; } + # Check whether --enable-sim-filter was given. if test "${enable_sim_filter+set}" = set; then : @@ -6452,20 +6453,25 @@ fi fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim stdio debug behavior" >&5 +$as_echo_n "checking for sim stdio debug behavior... " >&6; } +sim_stdio=0 # Check whether --enable-sim-stdio was given. if test "${enable_sim_stdio+set}" = set; then : enableval=$enable_sim_stdio; case "${enableval}" in - yes) sim_stdio="-DWITH_STDIO=DO_USE_STDIO";; - no) sim_stdio="-DWITH_STDIO=DONT_USE_STDIO";; - *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-stdio\"" "$LINENO" 5; sim_stdio="";; + yes) sim_stdio="DO_USE_STDIO";; + no) sim_stdio="DONT_USE_STDIO";; + *) as_fn_error "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_stdio" != x""; then - echo "Setting stdio flags = $sim_stdio" 6>&1 -fi -else - sim_stdio="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_STDIO $sim_stdio +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_stdio" >&5 +$as_echo "$sim_stdio" >&6; } + # Check whether --enable-sim-switch was given. if test "${enable_sim_switch+set}" = set; then : @@ -6500,20 +6506,25 @@ else fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim trace settings" >&5 +$as_echo_n "checking for sim trace settings... " >&6; } +sim_trace="1" # Check whether --enable-sim-trace was given. if test "${enable_sim_trace+set}" = set; then : enableval=$enable_sim_trace; case "${enableval}" in - yes) sim_trace="-DWITH_TRACE=1";; - no) sim_trace="-DWITH_TRACE=0";; - *) as_fn_error "\"--enable-sim-trace does not take a value\"" "$LINENO" 5; sim_trace="";; + yes) sim_trace="1";; + no) sim_trace="0";; + *) as_fn_error "--enable-sim-trace does not take a value" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_trace" != x""; then - echo "Setting trace flags = $sim_trace" 6>&1 -fi -else - sim_trace="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_TRACE $sim_trace +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_trace" >&5 +$as_echo "$sim_trace" >&6; } + # Check whether --enable-sim-warnings was given. if test "${enable_sim_warnings+set}" = set; then : @@ -7844,10 +7855,6 @@ fi - - - - ac_config_files="$ac_config_files Makefile" ac_config_commands="$ac_config_commands default" diff --git a/sim/ppc/configure.ac b/sim/ppc/configure.ac index 8ac9fd0..8635d8f 100644 --- a/sim/ppc/configure.ac +++ b/sim/ppc/configure.ac @@ -33,16 +33,17 @@ if test x"$silent" != x"yes" && test x"$sim_alignment" != x""; then fi],[sim_alignment=""])dnl +AC_MSG_CHECKING([whether to enable sim asserts]) +sim_assert="1" AC_ARG_ENABLE(sim-assert, [ --enable-sim-assert Specify whether to perform random assertions.], [case "${enableval}" in - yes) sim_assert="-DWITH_ASSERT=1";; - no) sim_assert="-DWITH_ASSERT=0";; - *) AC_MSG_ERROR("--enable-sim-assert does not take a value"); sim_assert="";; -esac -if test x"$silent" != x"yes" && test x"$sim_assert" != x""; then - echo "Setting assert flags = $sim_assert" 6>&1 -fi],[sim_assert=""])dnl + yes) sim_assert="1";; + no) sim_assert="0";; + *) AC_MSG_ERROR([--enable-sim-assert does not take a value]);; +esac])dnl +AC_DEFINE_UNQUOTED([WITH_ASSERT], [$sim_assert], [Sim assert settings]) +AC_MSG_RESULT($sim_assert) AC_ARG_ENABLE(sim-bitsize, @@ -137,18 +138,19 @@ if test x"$silent" != x"yes" && test x"$sim_endian" != x""; then fi],[sim_endian=""])dnl +AC_MSG_CHECKING([default sim environment setting]) +sim_env="0" AC_ARG_ENABLE(sim-env, [ --enable-sim-env=env Specify target environment (operating, virtual, user).], [case "${enableval}" in - operating | os | oea) sim_env="-DWITH_ENVIRONMENT=OPERATING_ENVIRONMENT";; - virtual | vea) sim_env="-DWITH_ENVIRONMENT=VIRTUAL_ENVIRONMENT";; - user | uea) sim_env="-DWITH_ENVIRONMENT=USER_ENVIRONMENT";; - no) sim_env="-DWITH_ENVIRONMENT=0";; - *) AC_MSG_ERROR("Unknown value $enableval passed to --enable-sim-env"); sim_env="";; -esac -if test x"$silent" != x"yes" && test x"$sim_env" != x""; then - echo "Setting env flags = $sim_env" 6>&1 -fi],[sim_env=""])dnl + operating | os | oea) sim_env="OPERATING_ENVIRONMENT";; + virtual | vea) sim_env="VIRTUAL_ENVIRONMENT";; + user | uea) sim_env="USER_ENVIRONMENT";; + no) sim_env="0";; + *) AC_MSG_ERROR([Unknown value $enableval passed to --enable-sim-env]);; +esac])dnl +AC_DEFINE_UNQUOTED([WITH_ENVIRONMENT], [$sim_env], [Sim default environment]) +AC_MSG_RESULT($sim_env) AC_ARG_ENABLE(sim-filter, @@ -533,16 +535,17 @@ if test x"$silent" != x"yes"; then fi])dnl +AC_MSG_CHECKING([for sim stdio debug behavior]) +sim_stdio=0 AC_ARG_ENABLE(sim-stdio, [ --enable-sim-stdio Specify whether to use stdio for console input/output.], [case "${enableval}" in - yes) sim_stdio="-DWITH_STDIO=DO_USE_STDIO";; - no) sim_stdio="-DWITH_STDIO=DONT_USE_STDIO";; - *) AC_MSG_ERROR("Unknown value $enableval passed to --enable-sim-stdio"); sim_stdio="";; -esac -if test x"$silent" != x"yes" && test x"$sim_stdio" != x""; then - echo "Setting stdio flags = $sim_stdio" 6>&1 -fi],[sim_stdio=""])dnl + yes) sim_stdio="DO_USE_STDIO";; + no) sim_stdio="DONT_USE_STDIO";; + *) AC_MSG_ERROR([Unknown value $enableval passed to --enable-sim-stdio]);; +esac])dnl +AC_DEFINE_UNQUOTED([WITH_STDIO], [$sim_stdio], [How to route I/O]) +AC_MSG_RESULT($sim_stdio) AC_ARG_ENABLE(sim-switch, @@ -572,16 +575,17 @@ if test x"$silent" != x"yes" && test x"$sim_timebase" != x""; then fi],[sim_timebase=""])dnl +AC_MSG_CHECKING([for sim trace settings]) +sim_trace="1" AC_ARG_ENABLE(sim-trace, [ --enable-sim-trace Specify whether tracing is supported.], [case "${enableval}" in - yes) sim_trace="-DWITH_TRACE=1";; - no) sim_trace="-DWITH_TRACE=0";; - *) AC_MSG_ERROR("--enable-sim-trace does not take a value"); sim_trace="";; -esac -if test x"$silent" != x"yes" && test x"$sim_trace" != x""; then - echo "Setting trace flags = $sim_trace" 6>&1 -fi],[sim_trace=""])dnl + yes) sim_trace="1";; + no) sim_trace="0";; + *) AC_MSG_ERROR([--enable-sim-trace does not take a value]);; +esac])dnl +AC_DEFINE_UNQUOTED([WITH_TRACE], [$sim_trace], [Sim trace settings]) +AC_MSG_RESULT($sim_trace) AC_ARG_ENABLE(sim-warnings, @@ -858,18 +862,14 @@ AC_SUBST(sim_smp) AC_SUBST(sim_igen_smp) AC_SUBST(sim_bitsize) AC_SUBST(sim_hostbitsize) -AC_SUBST(sim_env) AC_SUBST(sim_timebase) AC_SUBST(sim_alignment) AC_SUBST(sim_float) -AC_SUBST(sim_trace) -AC_SUBST(sim_assert) AC_SUBST(sim_reserved) AC_SUBST(sim_monitor) AC_SUBST(sim_model) AC_SUBST(sim_default_model) AC_SUBST(sim_model_issue) -AC_SUBST(sim_stdio) AC_SUBST(sim_termio) AC_SUBST(sim_devzero) AC_SUBST(sim_callback) diff --git a/sim/ppc/std-config.h b/sim/ppc/std-config.h index badce3d..7e6b8c2 100644 --- a/sim/ppc/std-config.h +++ b/sim/ppc/std-config.h @@ -111,10 +111,6 @@ extern int current_target_byte_order; #define VIRTUAL_ENVIRONMENT 2 #define OPERATING_ENVIRONMENT 3 -#ifndef WITH_ENVIRONMENT -#define WITH_ENVIRONMENT 0 -#endif - extern int current_environment; #define CURRENT_ENVIRONMENT (WITH_ENVIRONMENT \ ? WITH_ENVIRONMENT \ @@ -223,20 +219,6 @@ extern int current_floating_point; Control the inclusion of debugging code. */ -/* Include the tracing code. Disabling this eliminates all tracing - code */ - -#ifndef WITH_TRACE -#define WITH_TRACE 1 -#endif - -/* include code that checks assertions scattered through out the - program */ - -#ifndef WITH_ASSERT -#define WITH_ASSERT 1 -#endif - /* Whether to check instructions for reserved bits being set */ #ifndef WITH_RESERVED_BITS @@ -283,10 +265,6 @@ extern int current_model_issue; #define DONT_USE_STDIO 2 #define DO_USE_STDIO 1 -#ifndef WITH_STDIO -#define WITH_STDIO 0 -#endif - extern int current_stdio; #define CURRENT_STDIO (WITH_STDIO \ ? WITH_STDIO \ diff --git a/sim/rl78/ChangeLog b/sim/rl78/ChangeLog index 5a0842b..eff58a2 100644 --- a/sim/rl78/ChangeLog +++ b/sim/rl78/ChangeLog @@ -1,5 +1,9 @@ 2016-01-10 Mike Frysinger <vapier@gentoo.org> + * config.in, configure: Regenerate. + +2016-01-10 Mike Frysinger <vapier@gentoo.org> + * configure: Regenerate. 2016-01-10 Mike Frysinger <vapier@gentoo.org> diff --git a/sim/rl78/config.in b/sim/rl78/config.in index 5a5b182..c00e2f6 100644 --- a/sim/rl78/config.in +++ b/sim/rl78/config.in @@ -3,6 +3,9 @@ /* Define if building universal (internal helper macro) */ #undef AC_APPLE_UNIVERSAL_BUILD +/* Sim debug setting */ +#undef DEBUG + /* Define to 1 if translation of program messages to the user's native language is requested. */ #undef ENABLE_NLS @@ -173,6 +176,9 @@ /* Additional package description */ #undef PKGVERSION +/* Sim profile settings */ +#undef PROFILE + /* Bug reporting address */ #undef REPORT_BUGS_TO @@ -204,6 +210,24 @@ #endif +/* Sim assert settings */ +#undef WITH_ASSERT + +/* Sim debug setting */ +#undef WITH_DEBUG + +/* Sim default environment */ +#undef WITH_ENVIRONMENT + +/* Sim profile settings */ +#undef WITH_PROFILE + +/* How to route I/O */ +#undef WITH_STDIO + +/* Sim trace settings */ +#undef WITH_TRACE + /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ #if defined AC_APPLE_UNIVERSAL_BUILD diff --git a/sim/rl78/configure b/sim/rl78/configure index aa2f763..00de3e0 100755 --- a/sim/rl78/configure +++ b/sim/rl78/configure @@ -604,10 +604,6 @@ cgen_breaks REPORT_BUGS_TEXI REPORT_BUGS_TO PKGVERSION -sim_profile -sim_trace -sim_stdio -sim_debug MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -682,8 +678,6 @@ CFLAGS CC WERROR_CFLAGS WARN_CFLAGS -sim_xor_endian -sim_smp sim_reserved_bits sim_inline sim_hw @@ -694,9 +688,7 @@ sim_scache sim_float sim_endian sim_bitsize -sim_assert sim_alignment -sim_environment target_alias host_alias build_alias @@ -4017,10 +4009,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - # intl sister-directory configuration rules. # @@ -12828,7 +12816,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12831 "configure" +#line 12819 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12934,7 +12922,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12937 "configure" +#line 12925 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13202,124 +13190,164 @@ fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim debug setting" >&5 +$as_echo_n "checking for sim debug setting... " >&6; } +sim_debug="0" # Check whether --enable-sim-debug was given. if test "${enable_sim_debug+set}" = set; then : enableval=$enable_sim_debug; case "${enableval}" in - yes) sim_debug="-DDEBUG=7 -DWITH_DEBUG=7";; - no) sim_debug="-DDEBUG=0 -DWITH_DEBUG=0";; - *) sim_debug="-DDEBUG='(${enableval})' -DWITH_DEBUG='(${enableval})'";; + yes) sim_debug="7";; + no) sim_debug="0";; + *) sim_debug="($enableval)";; esac -if test x"$silent" != x"yes" && test x"$sim_debug" != x""; then - echo "Setting sim debug = $sim_debug" 6>&1 fi -else - sim_debug="" +if test "$sim_debug" != "0"; then + +cat >>confdefs.h <<_ACEOF +#define DEBUG $sim_debug +_ACEOF + fi +cat >>confdefs.h <<_ACEOF +#define WITH_DEBUG $sim_debug +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_debug" >&5 +$as_echo "$sim_debug" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim stdio debug behavior" >&5 +$as_echo_n "checking for sim stdio debug behavior... " >&6; } +sim_stdio="0" # Check whether --enable-sim-stdio was given. if test "${enable_sim_stdio+set}" = set; then : enableval=$enable_sim_stdio; case "${enableval}" in - yes) sim_stdio="-DWITH_STDIO=DO_USE_STDIO";; - no) sim_stdio="-DWITH_STDIO=DONT_USE_STDIO";; - *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-stdio\"" "$LINENO" 5; sim_stdio="";; + yes) sim_stdio="DO_USE_STDIO";; + no) sim_stdio="DONT_USE_STDIO";; + *) as_fn_error "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_stdio" != x""; then - echo "Setting stdio flags = $sim_stdio" 6>&1 -fi -else - sim_stdio="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_STDIO $sim_stdio +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_stdio" >&5 +$as_echo "$sim_stdio" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim trace settings" >&5 +$as_echo_n "checking for sim trace settings... " >&6; } +sim_trace="~TRACE_debug" # Check whether --enable-sim-trace was given. if test "${enable_sim_trace+set}" = set; then : enableval=$enable_sim_trace; case "${enableval}" in - yes) sim_trace="-DWITH_TRACE=-1";; - no) sim_trace="-DWITH_TRACE=0";; + yes) sim_trace="-1";; + no) sim_trace="0";; [-0-9]*) - sim_trace="-DWITH_TRACE='(${enableval})'";; + sim_trace="'(${enableval})'";; [[:lower:]]*) sim_trace="" for x in `echo "$enableval" | sed -e "s/,/ /g"`; do if test x"$sim_trace" = x; then - sim_trace="-DWITH_TRACE='(TRACE_$x" + sim_trace="(TRACE_$x" else sim_trace="${sim_trace}|TRACE_$x" fi done - sim_trace="$sim_trace)'" ;; + sim_trace="$sim_trace)" ;; esac -if test x"$silent" != x"yes" && test x"$sim_trace" != x""; then - echo "Setting sim trace = $sim_trace" 6>&1 -fi -else - sim_trace="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_TRACE $sim_trace +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_trace" >&5 +$as_echo "$sim_trace" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim profile settings" >&5 +$as_echo_n "checking for sim profile settings... " >&6; } +profile="1" +sim_profile="-1" # Check whether --enable-sim-profile was given. if test "${enable_sim_profile+set}" = set; then : enableval=$enable_sim_profile; case "${enableval}" in - yes) sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1";; - no) sim_profile="-DPROFILE=0 -DWITH_PROFILE=0";; + yes) profile="1" sim_profile="-1";; + no) profile="0" sim_profile="0";; [-0-9]*) - sim_profile="-DPROFILE='(${enableval})' -DWITH_PROFILE='(${enableval})'";; + profile="(${enableval})" sim_profile="(${enableval})";; [a-z]*) + profile="1" sim_profile="" for x in `echo "$enableval" | sed -e "s/,/ /g"`; do if test x"$sim_profile" = x; then - sim_profile="-DWITH_PROFILE='(PROFILE_$x" + sim_profile="(PROFILE_$x" else sim_profile="${sim_profile}|PROFILE_$x" fi done - sim_profile="$sim_profile)'" ;; + sim_profile="$sim_profile)" ;; esac -if test x"$silent" != x"yes" && test x"$sim_profile" != x""; then - echo "Setting sim profile = $sim_profile" 6>&1 -fi -else - sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1" fi +cat >>confdefs.h <<_ACEOF +#define PROFILE $profile +_ACEOF +cat >>confdefs.h <<_ACEOF +#define WITH_PROFILE $sim_profile +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_profile" >&5 +$as_echo "$sim_profile" >&6; } + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable sim asserts" >&5 +$as_echo_n "checking whether to enable sim asserts... " >&6; } +sim_assert="1" # Check whether --enable-sim-assert was given. if test "${enable_sim_assert+set}" = set; then : enableval=$enable_sim_assert; case "${enableval}" in - yes) sim_assert="-DWITH_ASSERT=1";; - no) sim_assert="-DWITH_ASSERT=0";; - *) as_fn_error "\"--enable-sim-assert does not take a value\"" "$LINENO" 5; sim_assert="";; + yes) sim_assert="1";; + no) sim_assert="0";; + *) as_fn_error "--enable-sim-assert does not take a value" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_assert" != x""; then - echo "Setting assert flags = $sim_assert" 6>&1 -fi -else - sim_assert="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_ASSERT $sim_assert +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_assert" >&5 +$as_echo "$sim_assert" >&6; } + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking default sim environment setting" >&5 +$as_echo_n "checking default sim environment setting... " >&6; } +sim_environment="ALL_ENVIRONMENT" # 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="";; + all | ALL) sim_environment="ALL_ENVIRONMENT";; + user | USER) sim_environment="USER_ENVIRONMENT";; + virtual | VIRTUAL) sim_environment="VIRTUAL_ENVIRONMENT";; + operating | OPERATING) sim_environment="OPERATING_ENVIRONMENT";; + *) as_fn_error "Unknown value $enableval passed to --enable-sim-environment" "$LINENO" 5;; 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 +cat >>confdefs.h <<_ACEOF +#define WITH_ENVIRONMENT $sim_environment +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_environment" >&5 +$as_echo "$sim_environment" >&6; } + sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. diff --git a/sim/rx/ChangeLog b/sim/rx/ChangeLog index d7dae81..7049d94 100644 --- a/sim/rx/ChangeLog +++ b/sim/rx/ChangeLog @@ -1,5 +1,9 @@ 2016-01-10 Mike Frysinger <vapier@gentoo.org> + * config.in, configure: Regenerate. + +2016-01-10 Mike Frysinger <vapier@gentoo.org> + * configure: Regenerate. 2016-01-10 Mike Frysinger <vapier@gentoo.org> diff --git a/sim/rx/config.in b/sim/rx/config.in index c64ed76..33bdf16 100644 --- a/sim/rx/config.in +++ b/sim/rx/config.in @@ -9,6 +9,9 @@ /* --enable-cycle-stats */ #undef CYCLE_STATS +/* Sim debug setting */ +#undef DEBUG + /* Define to 1 if translation of program messages to the user's native language is requested. */ #undef ENABLE_NLS @@ -179,6 +182,9 @@ /* Additional package description */ #undef PKGVERSION +/* Sim profile settings */ +#undef PROFILE + /* Bug reporting address */ #undef REPORT_BUGS_TO @@ -210,6 +216,24 @@ #endif +/* Sim assert settings */ +#undef WITH_ASSERT + +/* Sim debug setting */ +#undef WITH_DEBUG + +/* Sim default environment */ +#undef WITH_ENVIRONMENT + +/* Sim profile settings */ +#undef WITH_PROFILE + +/* How to route I/O */ +#undef WITH_STDIO + +/* Sim trace settings */ +#undef WITH_TRACE + /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ #if defined AC_APPLE_UNIVERSAL_BUILD diff --git a/sim/rx/configure b/sim/rx/configure index 40d8faf..0bbd3ea 100755 --- a/sim/rx/configure +++ b/sim/rx/configure @@ -604,10 +604,6 @@ cgen_breaks REPORT_BUGS_TEXI REPORT_BUGS_TO PKGVERSION -sim_profile -sim_trace -sim_stdio -sim_debug MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -682,8 +678,6 @@ CFLAGS CC WERROR_CFLAGS WARN_CFLAGS -sim_xor_endian -sim_smp sim_reserved_bits sim_inline sim_hw @@ -694,9 +688,7 @@ sim_scache sim_float sim_endian sim_bitsize -sim_assert sim_alignment -sim_environment target_alias host_alias build_alias @@ -4022,10 +4014,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - # intl sister-directory configuration rules. # @@ -12833,7 +12821,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12836 "configure" +#line 12824 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12939,7 +12927,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12942 "configure" +#line 12930 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13207,124 +13195,164 @@ fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim debug setting" >&5 +$as_echo_n "checking for sim debug setting... " >&6; } +sim_debug="0" # Check whether --enable-sim-debug was given. if test "${enable_sim_debug+set}" = set; then : enableval=$enable_sim_debug; case "${enableval}" in - yes) sim_debug="-DDEBUG=7 -DWITH_DEBUG=7";; - no) sim_debug="-DDEBUG=0 -DWITH_DEBUG=0";; - *) sim_debug="-DDEBUG='(${enableval})' -DWITH_DEBUG='(${enableval})'";; + yes) sim_debug="7";; + no) sim_debug="0";; + *) sim_debug="($enableval)";; esac -if test x"$silent" != x"yes" && test x"$sim_debug" != x""; then - echo "Setting sim debug = $sim_debug" 6>&1 fi -else - sim_debug="" +if test "$sim_debug" != "0"; then + +cat >>confdefs.h <<_ACEOF +#define DEBUG $sim_debug +_ACEOF + fi +cat >>confdefs.h <<_ACEOF +#define WITH_DEBUG $sim_debug +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_debug" >&5 +$as_echo "$sim_debug" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim stdio debug behavior" >&5 +$as_echo_n "checking for sim stdio debug behavior... " >&6; } +sim_stdio="0" # Check whether --enable-sim-stdio was given. if test "${enable_sim_stdio+set}" = set; then : enableval=$enable_sim_stdio; case "${enableval}" in - yes) sim_stdio="-DWITH_STDIO=DO_USE_STDIO";; - no) sim_stdio="-DWITH_STDIO=DONT_USE_STDIO";; - *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-stdio\"" "$LINENO" 5; sim_stdio="";; + yes) sim_stdio="DO_USE_STDIO";; + no) sim_stdio="DONT_USE_STDIO";; + *) as_fn_error "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_stdio" != x""; then - echo "Setting stdio flags = $sim_stdio" 6>&1 -fi -else - sim_stdio="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_STDIO $sim_stdio +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_stdio" >&5 +$as_echo "$sim_stdio" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim trace settings" >&5 +$as_echo_n "checking for sim trace settings... " >&6; } +sim_trace="~TRACE_debug" # Check whether --enable-sim-trace was given. if test "${enable_sim_trace+set}" = set; then : enableval=$enable_sim_trace; case "${enableval}" in - yes) sim_trace="-DWITH_TRACE=-1";; - no) sim_trace="-DWITH_TRACE=0";; + yes) sim_trace="-1";; + no) sim_trace="0";; [-0-9]*) - sim_trace="-DWITH_TRACE='(${enableval})'";; + sim_trace="'(${enableval})'";; [[:lower:]]*) sim_trace="" for x in `echo "$enableval" | sed -e "s/,/ /g"`; do if test x"$sim_trace" = x; then - sim_trace="-DWITH_TRACE='(TRACE_$x" + sim_trace="(TRACE_$x" else sim_trace="${sim_trace}|TRACE_$x" fi done - sim_trace="$sim_trace)'" ;; + sim_trace="$sim_trace)" ;; esac -if test x"$silent" != x"yes" && test x"$sim_trace" != x""; then - echo "Setting sim trace = $sim_trace" 6>&1 -fi -else - sim_trace="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_TRACE $sim_trace +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_trace" >&5 +$as_echo "$sim_trace" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim profile settings" >&5 +$as_echo_n "checking for sim profile settings... " >&6; } +profile="1" +sim_profile="-1" # Check whether --enable-sim-profile was given. if test "${enable_sim_profile+set}" = set; then : enableval=$enable_sim_profile; case "${enableval}" in - yes) sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1";; - no) sim_profile="-DPROFILE=0 -DWITH_PROFILE=0";; + yes) profile="1" sim_profile="-1";; + no) profile="0" sim_profile="0";; [-0-9]*) - sim_profile="-DPROFILE='(${enableval})' -DWITH_PROFILE='(${enableval})'";; + profile="(${enableval})" sim_profile="(${enableval})";; [a-z]*) + profile="1" sim_profile="" for x in `echo "$enableval" | sed -e "s/,/ /g"`; do if test x"$sim_profile" = x; then - sim_profile="-DWITH_PROFILE='(PROFILE_$x" + sim_profile="(PROFILE_$x" else sim_profile="${sim_profile}|PROFILE_$x" fi done - sim_profile="$sim_profile)'" ;; + sim_profile="$sim_profile)" ;; esac -if test x"$silent" != x"yes" && test x"$sim_profile" != x""; then - echo "Setting sim profile = $sim_profile" 6>&1 -fi -else - sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1" fi +cat >>confdefs.h <<_ACEOF +#define PROFILE $profile +_ACEOF +cat >>confdefs.h <<_ACEOF +#define WITH_PROFILE $sim_profile +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_profile" >&5 +$as_echo "$sim_profile" >&6; } + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable sim asserts" >&5 +$as_echo_n "checking whether to enable sim asserts... " >&6; } +sim_assert="1" # Check whether --enable-sim-assert was given. if test "${enable_sim_assert+set}" = set; then : enableval=$enable_sim_assert; case "${enableval}" in - yes) sim_assert="-DWITH_ASSERT=1";; - no) sim_assert="-DWITH_ASSERT=0";; - *) as_fn_error "\"--enable-sim-assert does not take a value\"" "$LINENO" 5; sim_assert="";; + yes) sim_assert="1";; + no) sim_assert="0";; + *) as_fn_error "--enable-sim-assert does not take a value" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_assert" != x""; then - echo "Setting assert flags = $sim_assert" 6>&1 -fi -else - sim_assert="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_ASSERT $sim_assert +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_assert" >&5 +$as_echo "$sim_assert" >&6; } + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking default sim environment setting" >&5 +$as_echo_n "checking default sim environment setting... " >&6; } +sim_environment="ALL_ENVIRONMENT" # 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="";; + all | ALL) sim_environment="ALL_ENVIRONMENT";; + user | USER) sim_environment="USER_ENVIRONMENT";; + virtual | VIRTUAL) sim_environment="VIRTUAL_ENVIRONMENT";; + operating | OPERATING) sim_environment="OPERATING_ENVIRONMENT";; + *) as_fn_error "Unknown value $enableval passed to --enable-sim-environment" "$LINENO" 5;; 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 +cat >>confdefs.h <<_ACEOF +#define WITH_ENVIRONMENT $sim_environment +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_environment" >&5 +$as_echo "$sim_environment" >&6; } + sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. diff --git a/sim/sh/ChangeLog b/sim/sh/ChangeLog index 7ed89f9..39db68e 100644 --- a/sim/sh/ChangeLog +++ b/sim/sh/ChangeLog @@ -1,5 +1,9 @@ 2016-01-10 Mike Frysinger <vapier@gentoo.org> + * config.in, 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/config.in b/sim/sh/config.in index f24eb3b..aa3e45c 100644 --- a/sim/sh/config.in +++ b/sim/sh/config.in @@ -3,6 +3,9 @@ /* Define if building universal (internal helper macro) */ #undef AC_APPLE_UNIVERSAL_BUILD +/* Sim debug setting */ +#undef DEBUG + /* Define to 1 if translation of program messages to the user's native language is requested. */ #undef ENABLE_NLS @@ -170,6 +173,9 @@ /* Additional package description */ #undef PKGVERSION +/* Sim profile settings */ +#undef PROFILE + /* Bug reporting address */ #undef REPORT_BUGS_TO @@ -201,6 +207,24 @@ #endif +/* Sim assert settings */ +#undef WITH_ASSERT + +/* Sim debug setting */ +#undef WITH_DEBUG + +/* Sim default environment */ +#undef WITH_ENVIRONMENT + +/* Sim profile settings */ +#undef WITH_PROFILE + +/* How to route I/O */ +#undef WITH_STDIO + +/* Sim trace settings */ +#undef WITH_TRACE + /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ #if defined AC_APPLE_UNIVERSAL_BUILD diff --git a/sim/sh/configure b/sim/sh/configure index c16d784..e177055 100755 --- a/sim/sh/configure +++ b/sim/sh/configure @@ -604,10 +604,6 @@ cgen_breaks REPORT_BUGS_TEXI REPORT_BUGS_TO PKGVERSION -sim_profile -sim_trace -sim_stdio -sim_debug MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -682,8 +678,6 @@ CFLAGS CC WERROR_CFLAGS WARN_CFLAGS -sim_xor_endian -sim_smp sim_reserved_bits sim_inline sim_hw @@ -694,9 +688,7 @@ sim_scache sim_float sim_endian sim_bitsize -sim_assert sim_alignment -sim_environment target_alias host_alias build_alias @@ -4032,10 +4024,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - # intl sister-directory configuration rules. # @@ -12843,7 +12831,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12846 "configure" +#line 12834 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12949,7 +12937,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12952 "configure" +#line 12940 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13217,124 +13205,164 @@ fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim debug setting" >&5 +$as_echo_n "checking for sim debug setting... " >&6; } +sim_debug="0" # Check whether --enable-sim-debug was given. if test "${enable_sim_debug+set}" = set; then : enableval=$enable_sim_debug; case "${enableval}" in - yes) sim_debug="-DDEBUG=7 -DWITH_DEBUG=7";; - no) sim_debug="-DDEBUG=0 -DWITH_DEBUG=0";; - *) sim_debug="-DDEBUG='(${enableval})' -DWITH_DEBUG='(${enableval})'";; + yes) sim_debug="7";; + no) sim_debug="0";; + *) sim_debug="($enableval)";; esac -if test x"$silent" != x"yes" && test x"$sim_debug" != x""; then - echo "Setting sim debug = $sim_debug" 6>&1 fi -else - sim_debug="" +if test "$sim_debug" != "0"; then + +cat >>confdefs.h <<_ACEOF +#define DEBUG $sim_debug +_ACEOF + fi +cat >>confdefs.h <<_ACEOF +#define WITH_DEBUG $sim_debug +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_debug" >&5 +$as_echo "$sim_debug" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim stdio debug behavior" >&5 +$as_echo_n "checking for sim stdio debug behavior... " >&6; } +sim_stdio="0" # Check whether --enable-sim-stdio was given. if test "${enable_sim_stdio+set}" = set; then : enableval=$enable_sim_stdio; case "${enableval}" in - yes) sim_stdio="-DWITH_STDIO=DO_USE_STDIO";; - no) sim_stdio="-DWITH_STDIO=DONT_USE_STDIO";; - *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-stdio\"" "$LINENO" 5; sim_stdio="";; + yes) sim_stdio="DO_USE_STDIO";; + no) sim_stdio="DONT_USE_STDIO";; + *) as_fn_error "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_stdio" != x""; then - echo "Setting stdio flags = $sim_stdio" 6>&1 -fi -else - sim_stdio="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_STDIO $sim_stdio +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_stdio" >&5 +$as_echo "$sim_stdio" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim trace settings" >&5 +$as_echo_n "checking for sim trace settings... " >&6; } +sim_trace="~TRACE_debug" # Check whether --enable-sim-trace was given. if test "${enable_sim_trace+set}" = set; then : enableval=$enable_sim_trace; case "${enableval}" in - yes) sim_trace="-DWITH_TRACE=-1";; - no) sim_trace="-DWITH_TRACE=0";; + yes) sim_trace="-1";; + no) sim_trace="0";; [-0-9]*) - sim_trace="-DWITH_TRACE='(${enableval})'";; + sim_trace="'(${enableval})'";; [[:lower:]]*) sim_trace="" for x in `echo "$enableval" | sed -e "s/,/ /g"`; do if test x"$sim_trace" = x; then - sim_trace="-DWITH_TRACE='(TRACE_$x" + sim_trace="(TRACE_$x" else sim_trace="${sim_trace}|TRACE_$x" fi done - sim_trace="$sim_trace)'" ;; + sim_trace="$sim_trace)" ;; esac -if test x"$silent" != x"yes" && test x"$sim_trace" != x""; then - echo "Setting sim trace = $sim_trace" 6>&1 -fi -else - sim_trace="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_TRACE $sim_trace +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_trace" >&5 +$as_echo "$sim_trace" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim profile settings" >&5 +$as_echo_n "checking for sim profile settings... " >&6; } +profile="1" +sim_profile="-1" # Check whether --enable-sim-profile was given. if test "${enable_sim_profile+set}" = set; then : enableval=$enable_sim_profile; case "${enableval}" in - yes) sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1";; - no) sim_profile="-DPROFILE=0 -DWITH_PROFILE=0";; + yes) profile="1" sim_profile="-1";; + no) profile="0" sim_profile="0";; [-0-9]*) - sim_profile="-DPROFILE='(${enableval})' -DWITH_PROFILE='(${enableval})'";; + profile="(${enableval})" sim_profile="(${enableval})";; [a-z]*) + profile="1" sim_profile="" for x in `echo "$enableval" | sed -e "s/,/ /g"`; do if test x"$sim_profile" = x; then - sim_profile="-DWITH_PROFILE='(PROFILE_$x" + sim_profile="(PROFILE_$x" else sim_profile="${sim_profile}|PROFILE_$x" fi done - sim_profile="$sim_profile)'" ;; + sim_profile="$sim_profile)" ;; esac -if test x"$silent" != x"yes" && test x"$sim_profile" != x""; then - echo "Setting sim profile = $sim_profile" 6>&1 -fi -else - sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1" fi +cat >>confdefs.h <<_ACEOF +#define PROFILE $profile +_ACEOF +cat >>confdefs.h <<_ACEOF +#define WITH_PROFILE $sim_profile +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_profile" >&5 +$as_echo "$sim_profile" >&6; } + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable sim asserts" >&5 +$as_echo_n "checking whether to enable sim asserts... " >&6; } +sim_assert="1" # Check whether --enable-sim-assert was given. if test "${enable_sim_assert+set}" = set; then : enableval=$enable_sim_assert; case "${enableval}" in - yes) sim_assert="-DWITH_ASSERT=1";; - no) sim_assert="-DWITH_ASSERT=0";; - *) as_fn_error "\"--enable-sim-assert does not take a value\"" "$LINENO" 5; sim_assert="";; + yes) sim_assert="1";; + no) sim_assert="0";; + *) as_fn_error "--enable-sim-assert does not take a value" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_assert" != x""; then - echo "Setting assert flags = $sim_assert" 6>&1 -fi -else - sim_assert="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_ASSERT $sim_assert +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_assert" >&5 +$as_echo "$sim_assert" >&6; } + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking default sim environment setting" >&5 +$as_echo_n "checking default sim environment setting... " >&6; } +sim_environment="ALL_ENVIRONMENT" # 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="";; + all | ALL) sim_environment="ALL_ENVIRONMENT";; + user | USER) sim_environment="USER_ENVIRONMENT";; + virtual | VIRTUAL) sim_environment="VIRTUAL_ENVIRONMENT";; + operating | OPERATING) sim_environment="OPERATING_ENVIRONMENT";; + *) as_fn_error "Unknown value $enableval passed to --enable-sim-environment" "$LINENO" 5;; 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 +cat >>confdefs.h <<_ACEOF +#define WITH_ENVIRONMENT $sim_environment +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_environment" >&5 +$as_echo "$sim_environment" >&6; } + sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. diff --git a/sim/sh64/ChangeLog b/sim/sh64/ChangeLog index 833e546..7627e21 100644 --- a/sim/sh64/ChangeLog +++ b/sim/sh64/ChangeLog @@ -1,5 +1,9 @@ 2016-01-10 Mike Frysinger <vapier@gentoo.org> + * config.in, 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/config.in b/sim/sh64/config.in index 6a83434..3fd3cde 100644 --- a/sim/sh64/config.in +++ b/sim/sh64/config.in @@ -3,6 +3,9 @@ /* Define if building universal (internal helper macro) */ #undef AC_APPLE_UNIVERSAL_BUILD +/* Sim debug setting */ +#undef DEBUG + /* Define to 1 if translation of program messages to the user's native language is requested. */ #undef ENABLE_NLS @@ -176,6 +179,9 @@ /* Additional package description */ #undef PKGVERSION +/* Sim profile settings */ +#undef PROFILE + /* Bug reporting address */ #undef REPORT_BUGS_TO @@ -207,6 +213,24 @@ #endif +/* Sim assert settings */ +#undef WITH_ASSERT + +/* Sim debug setting */ +#undef WITH_DEBUG + +/* Sim default environment */ +#undef WITH_ENVIRONMENT + +/* Sim profile settings */ +#undef WITH_PROFILE + +/* How to route I/O */ +#undef WITH_STDIO + +/* Sim trace settings */ +#undef WITH_TRACE + /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ #if defined AC_APPLE_UNIVERSAL_BUILD diff --git a/sim/sh64/configure b/sim/sh64/configure index 9a2f7bf..515bdc7 100755 --- a/sim/sh64/configure +++ b/sim/sh64/configure @@ -607,10 +607,6 @@ CGEN_MAINT REPORT_BUGS_TEXI REPORT_BUGS_TO PKGVERSION -sim_profile -sim_trace -sim_stdio -sim_debug MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -685,8 +681,6 @@ CFLAGS CC WERROR_CFLAGS WARN_CFLAGS -sim_xor_endian -sim_smp sim_reserved_bits sim_inline sim_hw @@ -697,9 +691,7 @@ sim_scache sim_float sim_endian sim_bitsize -sim_assert sim_alignment -sim_environment target_alias host_alias build_alias @@ -4038,10 +4030,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - # intl sister-directory configuration rules. # @@ -12849,7 +12837,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12852 "configure" +#line 12840 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12955,7 +12943,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12958 "configure" +#line 12946 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13223,124 +13211,164 @@ fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim debug setting" >&5 +$as_echo_n "checking for sim debug setting... " >&6; } +sim_debug="0" # Check whether --enable-sim-debug was given. if test "${enable_sim_debug+set}" = set; then : enableval=$enable_sim_debug; case "${enableval}" in - yes) sim_debug="-DDEBUG=7 -DWITH_DEBUG=7";; - no) sim_debug="-DDEBUG=0 -DWITH_DEBUG=0";; - *) sim_debug="-DDEBUG='(${enableval})' -DWITH_DEBUG='(${enableval})'";; + yes) sim_debug="7";; + no) sim_debug="0";; + *) sim_debug="($enableval)";; esac -if test x"$silent" != x"yes" && test x"$sim_debug" != x""; then - echo "Setting sim debug = $sim_debug" 6>&1 fi -else - sim_debug="" +if test "$sim_debug" != "0"; then + +cat >>confdefs.h <<_ACEOF +#define DEBUG $sim_debug +_ACEOF + fi +cat >>confdefs.h <<_ACEOF +#define WITH_DEBUG $sim_debug +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_debug" >&5 +$as_echo "$sim_debug" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim stdio debug behavior" >&5 +$as_echo_n "checking for sim stdio debug behavior... " >&6; } +sim_stdio="0" # Check whether --enable-sim-stdio was given. if test "${enable_sim_stdio+set}" = set; then : enableval=$enable_sim_stdio; case "${enableval}" in - yes) sim_stdio="-DWITH_STDIO=DO_USE_STDIO";; - no) sim_stdio="-DWITH_STDIO=DONT_USE_STDIO";; - *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-stdio\"" "$LINENO" 5; sim_stdio="";; + yes) sim_stdio="DO_USE_STDIO";; + no) sim_stdio="DONT_USE_STDIO";; + *) as_fn_error "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_stdio" != x""; then - echo "Setting stdio flags = $sim_stdio" 6>&1 -fi -else - sim_stdio="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_STDIO $sim_stdio +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_stdio" >&5 +$as_echo "$sim_stdio" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim trace settings" >&5 +$as_echo_n "checking for sim trace settings... " >&6; } +sim_trace="~TRACE_debug" # Check whether --enable-sim-trace was given. if test "${enable_sim_trace+set}" = set; then : enableval=$enable_sim_trace; case "${enableval}" in - yes) sim_trace="-DWITH_TRACE=-1";; - no) sim_trace="-DWITH_TRACE=0";; + yes) sim_trace="-1";; + no) sim_trace="0";; [-0-9]*) - sim_trace="-DWITH_TRACE='(${enableval})'";; + sim_trace="'(${enableval})'";; [[:lower:]]*) sim_trace="" for x in `echo "$enableval" | sed -e "s/,/ /g"`; do if test x"$sim_trace" = x; then - sim_trace="-DWITH_TRACE='(TRACE_$x" + sim_trace="(TRACE_$x" else sim_trace="${sim_trace}|TRACE_$x" fi done - sim_trace="$sim_trace)'" ;; + sim_trace="$sim_trace)" ;; esac -if test x"$silent" != x"yes" && test x"$sim_trace" != x""; then - echo "Setting sim trace = $sim_trace" 6>&1 -fi -else - sim_trace="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_TRACE $sim_trace +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_trace" >&5 +$as_echo "$sim_trace" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim profile settings" >&5 +$as_echo_n "checking for sim profile settings... " >&6; } +profile="1" +sim_profile="-1" # Check whether --enable-sim-profile was given. if test "${enable_sim_profile+set}" = set; then : enableval=$enable_sim_profile; case "${enableval}" in - yes) sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1";; - no) sim_profile="-DPROFILE=0 -DWITH_PROFILE=0";; + yes) profile="1" sim_profile="-1";; + no) profile="0" sim_profile="0";; [-0-9]*) - sim_profile="-DPROFILE='(${enableval})' -DWITH_PROFILE='(${enableval})'";; + profile="(${enableval})" sim_profile="(${enableval})";; [a-z]*) + profile="1" sim_profile="" for x in `echo "$enableval" | sed -e "s/,/ /g"`; do if test x"$sim_profile" = x; then - sim_profile="-DWITH_PROFILE='(PROFILE_$x" + sim_profile="(PROFILE_$x" else sim_profile="${sim_profile}|PROFILE_$x" fi done - sim_profile="$sim_profile)'" ;; + sim_profile="$sim_profile)" ;; esac -if test x"$silent" != x"yes" && test x"$sim_profile" != x""; then - echo "Setting sim profile = $sim_profile" 6>&1 -fi -else - sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1" fi +cat >>confdefs.h <<_ACEOF +#define PROFILE $profile +_ACEOF +cat >>confdefs.h <<_ACEOF +#define WITH_PROFILE $sim_profile +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_profile" >&5 +$as_echo "$sim_profile" >&6; } + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable sim asserts" >&5 +$as_echo_n "checking whether to enable sim asserts... " >&6; } +sim_assert="1" # Check whether --enable-sim-assert was given. if test "${enable_sim_assert+set}" = set; then : enableval=$enable_sim_assert; case "${enableval}" in - yes) sim_assert="-DWITH_ASSERT=1";; - no) sim_assert="-DWITH_ASSERT=0";; - *) as_fn_error "\"--enable-sim-assert does not take a value\"" "$LINENO" 5; sim_assert="";; + yes) sim_assert="1";; + no) sim_assert="0";; + *) as_fn_error "--enable-sim-assert does not take a value" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_assert" != x""; then - echo "Setting assert flags = $sim_assert" 6>&1 -fi -else - sim_assert="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_ASSERT $sim_assert +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_assert" >&5 +$as_echo "$sim_assert" >&6; } + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking default sim environment setting" >&5 +$as_echo_n "checking default sim environment setting... " >&6; } +sim_environment="ALL_ENVIRONMENT" # 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="";; + all | ALL) sim_environment="ALL_ENVIRONMENT";; + user | USER) sim_environment="USER_ENVIRONMENT";; + virtual | VIRTUAL) sim_environment="VIRTUAL_ENVIRONMENT";; + operating | OPERATING) sim_environment="OPERATING_ENVIRONMENT";; + *) as_fn_error "Unknown value $enableval passed to --enable-sim-environment" "$LINENO" 5;; 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 +cat >>confdefs.h <<_ACEOF +#define WITH_ENVIRONMENT $sim_environment +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_environment" >&5 +$as_echo "$sim_environment" >&6; } + sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. diff --git a/sim/v850/ChangeLog b/sim/v850/ChangeLog index 2f08fa6..578526a 100644 --- a/sim/v850/ChangeLog +++ b/sim/v850/ChangeLog @@ -1,5 +1,9 @@ 2016-01-10 Mike Frysinger <vapier@gentoo.org> + * config.in, configure: Regenerate. + +2016-01-10 Mike Frysinger <vapier@gentoo.org> + * configure: Regenerate. 2016-01-10 Mike Frysinger <vapier@gentoo.org> diff --git a/sim/v850/config.in b/sim/v850/config.in index 0286438..7fce884 100644 --- a/sim/v850/config.in +++ b/sim/v850/config.in @@ -3,6 +3,9 @@ /* Define if building universal (internal helper macro) */ #undef AC_APPLE_UNIVERSAL_BUILD +/* Sim debug setting */ +#undef DEBUG + /* Define to 1 if translation of program messages to the user's native language is requested. */ #undef ENABLE_NLS @@ -191,6 +194,9 @@ /* Additional package description */ #undef PKGVERSION +/* Sim profile settings */ +#undef PROFILE + /* Bug reporting address */ #undef REPORT_BUGS_TO @@ -222,6 +228,24 @@ #endif +/* Sim assert settings */ +#undef WITH_ASSERT + +/* Sim debug setting */ +#undef WITH_DEBUG + +/* Sim default environment */ +#undef WITH_ENVIRONMENT + +/* Sim profile settings */ +#undef WITH_PROFILE + +/* How to route I/O */ +#undef WITH_STDIO + +/* Sim trace settings */ +#undef WITH_TRACE + /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ #if defined AC_APPLE_UNIVERSAL_BUILD diff --git a/sim/v850/configure b/sim/v850/configure index 58c2813..841ec46 100755 --- a/sim/v850/configure +++ b/sim/v850/configure @@ -604,10 +604,6 @@ cgen_breaks REPORT_BUGS_TEXI REPORT_BUGS_TO PKGVERSION -sim_profile -sim_trace -sim_stdio -sim_debug MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -682,8 +678,6 @@ CFLAGS CC WERROR_CFLAGS WARN_CFLAGS -sim_xor_endian -sim_smp sim_reserved_bits sim_inline sim_hw @@ -694,9 +688,7 @@ sim_scache sim_float sim_endian sim_bitsize -sim_assert sim_alignment -sim_environment target_alias host_alias build_alias @@ -4038,10 +4030,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - # intl sister-directory configuration rules. # @@ -12849,7 +12837,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12852 "configure" +#line 12840 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12955,7 +12943,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12958 "configure" +#line 12946 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13223,124 +13211,164 @@ fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim debug setting" >&5 +$as_echo_n "checking for sim debug setting... " >&6; } +sim_debug="0" # Check whether --enable-sim-debug was given. if test "${enable_sim_debug+set}" = set; then : enableval=$enable_sim_debug; case "${enableval}" in - yes) sim_debug="-DDEBUG=7 -DWITH_DEBUG=7";; - no) sim_debug="-DDEBUG=0 -DWITH_DEBUG=0";; - *) sim_debug="-DDEBUG='(${enableval})' -DWITH_DEBUG='(${enableval})'";; + yes) sim_debug="7";; + no) sim_debug="0";; + *) sim_debug="($enableval)";; esac -if test x"$silent" != x"yes" && test x"$sim_debug" != x""; then - echo "Setting sim debug = $sim_debug" 6>&1 fi -else - sim_debug="" +if test "$sim_debug" != "0"; then + +cat >>confdefs.h <<_ACEOF +#define DEBUG $sim_debug +_ACEOF + fi +cat >>confdefs.h <<_ACEOF +#define WITH_DEBUG $sim_debug +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_debug" >&5 +$as_echo "$sim_debug" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim stdio debug behavior" >&5 +$as_echo_n "checking for sim stdio debug behavior... " >&6; } +sim_stdio="0" # Check whether --enable-sim-stdio was given. if test "${enable_sim_stdio+set}" = set; then : enableval=$enable_sim_stdio; case "${enableval}" in - yes) sim_stdio="-DWITH_STDIO=DO_USE_STDIO";; - no) sim_stdio="-DWITH_STDIO=DONT_USE_STDIO";; - *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-stdio\"" "$LINENO" 5; sim_stdio="";; + yes) sim_stdio="DO_USE_STDIO";; + no) sim_stdio="DONT_USE_STDIO";; + *) as_fn_error "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_stdio" != x""; then - echo "Setting stdio flags = $sim_stdio" 6>&1 -fi -else - sim_stdio="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_STDIO $sim_stdio +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_stdio" >&5 +$as_echo "$sim_stdio" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim trace settings" >&5 +$as_echo_n "checking for sim trace settings... " >&6; } +sim_trace="~TRACE_debug" # Check whether --enable-sim-trace was given. if test "${enable_sim_trace+set}" = set; then : enableval=$enable_sim_trace; case "${enableval}" in - yes) sim_trace="-DWITH_TRACE=-1";; - no) sim_trace="-DWITH_TRACE=0";; + yes) sim_trace="-1";; + no) sim_trace="0";; [-0-9]*) - sim_trace="-DWITH_TRACE='(${enableval})'";; + sim_trace="'(${enableval})'";; [[:lower:]]*) sim_trace="" for x in `echo "$enableval" | sed -e "s/,/ /g"`; do if test x"$sim_trace" = x; then - sim_trace="-DWITH_TRACE='(TRACE_$x" + sim_trace="(TRACE_$x" else sim_trace="${sim_trace}|TRACE_$x" fi done - sim_trace="$sim_trace)'" ;; + sim_trace="$sim_trace)" ;; esac -if test x"$silent" != x"yes" && test x"$sim_trace" != x""; then - echo "Setting sim trace = $sim_trace" 6>&1 -fi -else - sim_trace="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_TRACE $sim_trace +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_trace" >&5 +$as_echo "$sim_trace" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim profile settings" >&5 +$as_echo_n "checking for sim profile settings... " >&6; } +profile="1" +sim_profile="-1" # Check whether --enable-sim-profile was given. if test "${enable_sim_profile+set}" = set; then : enableval=$enable_sim_profile; case "${enableval}" in - yes) sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1";; - no) sim_profile="-DPROFILE=0 -DWITH_PROFILE=0";; + yes) profile="1" sim_profile="-1";; + no) profile="0" sim_profile="0";; [-0-9]*) - sim_profile="-DPROFILE='(${enableval})' -DWITH_PROFILE='(${enableval})'";; + profile="(${enableval})" sim_profile="(${enableval})";; [a-z]*) + profile="1" sim_profile="" for x in `echo "$enableval" | sed -e "s/,/ /g"`; do if test x"$sim_profile" = x; then - sim_profile="-DWITH_PROFILE='(PROFILE_$x" + sim_profile="(PROFILE_$x" else sim_profile="${sim_profile}|PROFILE_$x" fi done - sim_profile="$sim_profile)'" ;; + sim_profile="$sim_profile)" ;; esac -if test x"$silent" != x"yes" && test x"$sim_profile" != x""; then - echo "Setting sim profile = $sim_profile" 6>&1 -fi -else - sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1" fi +cat >>confdefs.h <<_ACEOF +#define PROFILE $profile +_ACEOF +cat >>confdefs.h <<_ACEOF +#define WITH_PROFILE $sim_profile +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_profile" >&5 +$as_echo "$sim_profile" >&6; } + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable sim asserts" >&5 +$as_echo_n "checking whether to enable sim asserts... " >&6; } +sim_assert="1" # Check whether --enable-sim-assert was given. if test "${enable_sim_assert+set}" = set; then : enableval=$enable_sim_assert; case "${enableval}" in - yes) sim_assert="-DWITH_ASSERT=1";; - no) sim_assert="-DWITH_ASSERT=0";; - *) as_fn_error "\"--enable-sim-assert does not take a value\"" "$LINENO" 5; sim_assert="";; + yes) sim_assert="1";; + no) sim_assert="0";; + *) as_fn_error "--enable-sim-assert does not take a value" "$LINENO" 5;; esac -if test x"$silent" != x"yes" && test x"$sim_assert" != x""; then - echo "Setting assert flags = $sim_assert" 6>&1 -fi -else - sim_assert="" fi +cat >>confdefs.h <<_ACEOF +#define WITH_ASSERT $sim_assert +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_assert" >&5 +$as_echo "$sim_assert" >&6; } + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking default sim environment setting" >&5 +$as_echo_n "checking default sim environment setting... " >&6; } +sim_environment="ALL_ENVIRONMENT" # 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="";; + all | ALL) sim_environment="ALL_ENVIRONMENT";; + user | USER) sim_environment="USER_ENVIRONMENT";; + virtual | VIRTUAL) sim_environment="VIRTUAL_ENVIRONMENT";; + operating | OPERATING) sim_environment="OPERATING_ENVIRONMENT";; + *) as_fn_error "Unknown value $enableval passed to --enable-sim-environment" "$LINENO" 5;; 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 +cat >>confdefs.h <<_ACEOF +#define WITH_ENVIRONMENT $sim_environment +_ACEOF + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_environment" >&5 +$as_echo "$sim_environment" >&6; } + sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. |