diff options
author | Mike Frysinger <vapier@gentoo.org> | 2021-06-06 20:35:02 -0400 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2021-06-12 20:07:57 -0400 |
commit | 04381273a9ea0cf30575d58983287cd950b3e166 (patch) | |
tree | c58e24e6afe011ffca7403f18ff41f9740dcf4a4 | |
parent | 497a20bd3b7f7bffac5cdc7ae03e768cf92a04fd (diff) |
sim: unify debug/stdio/trace/profile build settings
Move these options up to the common dir so we only test & export
them once across all ports.
The ppc code needs a little extra care with its trace settings as
it's not exactly the same API as the common code. The other knobs
are the same though.
73 files changed, 244 insertions, 4742 deletions
diff --git a/sim/ChangeLog b/sim/ChangeLog index 07a974ff5f..b9616110e0 100644 --- a/sim/ChangeLog +++ b/sim/ChangeLog @@ -1,5 +1,13 @@ 2021-06-12 Mike Frysinger <vapier@gentoo.org> + * configure.ac: Call SIM_AC_OPTION_DEBUG, SIM_AC_OPTION_STDIO, + SIM_AC_OPTION_TRACE, and SIM_AC_OPTION_PROFILE. + * m4/sim_ac_common.m4: Delete calls to SIM_AC_OPTION_DEBUG, + SIM_AC_OPTION_STDIO, SIM_AC_OPTION_TRACE, and SIM_AC_OPTION_PROFILE. + * aclocal.m4, config.h.in, configure, Makefile.in: Regenerate. + +2021-06-12 Mike Frysinger <vapier@gentoo.org> + * m4/sim_ac_common.m4: Replace --enable-sim-debug, --enable-sim-stdio, --enable-sim-trace, and --enable-sim-profile with calls to SIM_AC_OPTION_DEBUG, SIM_AC_OPTION_STDIO, SIM_AC_OPTION_TRACE, and diff --git a/sim/Makefile.in b/sim/Makefile.in index c8b52493f4..6df3d67d20 100644 --- a/sim/Makefile.in +++ b/sim/Makefile.in @@ -198,7 +198,11 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \ $(top_srcdir)/../config/lead-dot.m4 \ $(top_srcdir)/../config/override.m4 \ $(top_srcdir)/m4/sim_ac_option_assert.m4 \ + $(top_srcdir)/m4/sim_ac_option_debug.m4 \ $(top_srcdir)/m4/sim_ac_option_environment.m4 \ + $(top_srcdir)/m4/sim_ac_option_profile.m4 \ + $(top_srcdir)/m4/sim_ac_option_stdio.m4 \ + $(top_srcdir)/m4/sim_ac_option_trace.m4 \ $(top_srcdir)/m4/sim_ac_platform.m4 \ $(top_srcdir)/m4/sim_ac_toolchain.m4 \ $(top_srcdir)/configure.ac diff --git a/sim/aarch64/config.in b/sim/aarch64/config.in index b21bf7cd6b..29d1fe2ab9 100644 --- a/sim/aarch64/config.in +++ b/sim/aarch64/config.in @@ -3,9 +3,6 @@ /* 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 @@ -83,9 +80,6 @@ /* Additional package description */ #undef PKGVERSION -/* Sim profile settings */ -#undef PROFILE - /* Bug reporting address */ #undef REPORT_BUGS_TO @@ -114,18 +108,6 @@ #endif -/* Sim debug setting */ -#undef WITH_DEBUG - -/* 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 5269d6db77..4c47bdcfcf 100755 --- a/sim/aarch64/configure +++ b/sim/aarch64/configure @@ -771,10 +771,6 @@ enable_fast_install with_gnu_ld enable_libtool_lock enable_maintainer_mode -enable_sim_debug -enable_sim_stdio -enable_sim_trace -enable_sim_profile enable_sim_inline with_pkgversion with_bugurl @@ -1420,13 +1416,6 @@ Optional Features: --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer - --enable-sim-debug=opts Enable debugging flags (for developers of the sim - itself) - --enable-sim-stdio Specify whether to use stdio for console - input/output - --enable-sim-trace=opts Enable tracing of simulated programs - --enable-sim-profile=opts - Enable profiling flags --enable-sim-inline=inlines Specify which functions should be inlined --enable-sim-endian=endian @@ -10778,7 +10767,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10781 "configure" +#line 10770 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10884,7 +10873,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10887 "configure" +#line 10876 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11124,8 +11113,6 @@ CC="$lt_save_CC" - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -11150,123 +11137,6 @@ 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="7";; - no) sim_debug="0";; - *) sim_debug="($enableval)";; -esac -fi -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="DO_USE_STDIO";; - no) sim_stdio="DONT_USE_STDIO";; - *) as_fn_error $? "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;; -esac -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="-1";; - no) sim_trace="0";; - [-0-9]*) - 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="(TRACE_$x" - else - sim_trace="${sim_trace}|TRACE_$x" - fi - done - sim_trace="$sim_trace)" ;; -esac -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) profile="1" sim_profile="-1";; - no) profile="0" sim_profile="0";; - [-0-9]*) - 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="(PROFILE_$x" - else - sim_profile="${sim_profile}|PROFILE_$x" - fi - done - sim_profile="$sim_profile)" ;; -esac -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; } - - - sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. if test "${enable_sim_inline+set}" = set; then : diff --git a/sim/aclocal.m4 b/sim/aclocal.m4 index 4b6eb267ad..3c639f0edf 100644 --- a/sim/aclocal.m4 +++ b/sim/aclocal.m4 @@ -1171,6 +1171,10 @@ m4_include([../config/depstand.m4]) m4_include([../config/lead-dot.m4]) m4_include([../config/override.m4]) m4_include([m4/sim_ac_option_assert.m4]) +m4_include([m4/sim_ac_option_debug.m4]) m4_include([m4/sim_ac_option_environment.m4]) +m4_include([m4/sim_ac_option_profile.m4]) +m4_include([m4/sim_ac_option_stdio.m4]) +m4_include([m4/sim_ac_option_trace.m4]) m4_include([m4/sim_ac_platform.m4]) m4_include([m4/sim_ac_toolchain.m4]) diff --git a/sim/arm/config.in b/sim/arm/config.in index b21bf7cd6b..29d1fe2ab9 100644 --- a/sim/arm/config.in +++ b/sim/arm/config.in @@ -3,9 +3,6 @@ /* 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 @@ -83,9 +80,6 @@ /* Additional package description */ #undef PKGVERSION -/* Sim profile settings */ -#undef PROFILE - /* Bug reporting address */ #undef REPORT_BUGS_TO @@ -114,18 +108,6 @@ #endif -/* Sim debug setting */ -#undef WITH_DEBUG - -/* 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 48f24aaa56..9ecbc24f8a 100755 --- a/sim/arm/configure +++ b/sim/arm/configure @@ -771,10 +771,6 @@ enable_fast_install with_gnu_ld enable_libtool_lock enable_maintainer_mode -enable_sim_debug -enable_sim_stdio -enable_sim_trace -enable_sim_profile enable_sim_inline with_pkgversion with_bugurl @@ -1420,13 +1416,6 @@ Optional Features: --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer - --enable-sim-debug=opts Enable debugging flags (for developers of the sim - itself) - --enable-sim-stdio Specify whether to use stdio for console - input/output - --enable-sim-trace=opts Enable tracing of simulated programs - --enable-sim-profile=opts - Enable profiling flags --enable-sim-inline=inlines Specify which functions should be inlined --enable-sim-endian=endian @@ -10778,7 +10767,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10781 "configure" +#line 10770 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10884,7 +10873,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10887 "configure" +#line 10876 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11124,8 +11113,6 @@ CC="$lt_save_CC" - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -11150,123 +11137,6 @@ 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="7";; - no) sim_debug="0";; - *) sim_debug="($enableval)";; -esac -fi -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="DO_USE_STDIO";; - no) sim_stdio="DONT_USE_STDIO";; - *) as_fn_error $? "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;; -esac -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="-1";; - no) sim_trace="0";; - [-0-9]*) - 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="(TRACE_$x" - else - sim_trace="${sim_trace}|TRACE_$x" - fi - done - sim_trace="$sim_trace)" ;; -esac -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) profile="1" sim_profile="-1";; - no) profile="0" sim_profile="0";; - [-0-9]*) - 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="(PROFILE_$x" - else - sim_profile="${sim_profile}|PROFILE_$x" - fi - done - sim_profile="$sim_profile)" ;; -esac -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; } - - - sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. if test "${enable_sim_inline+set}" = set; then : diff --git a/sim/avr/config.in b/sim/avr/config.in index b21bf7cd6b..29d1fe2ab9 100644 --- a/sim/avr/config.in +++ b/sim/avr/config.in @@ -3,9 +3,6 @@ /* 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 @@ -83,9 +80,6 @@ /* Additional package description */ #undef PKGVERSION -/* Sim profile settings */ -#undef PROFILE - /* Bug reporting address */ #undef REPORT_BUGS_TO @@ -114,18 +108,6 @@ #endif -/* Sim debug setting */ -#undef WITH_DEBUG - -/* 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 0877f01f1d..9b16f2fb10 100755 --- a/sim/avr/configure +++ b/sim/avr/configure @@ -771,10 +771,6 @@ enable_fast_install with_gnu_ld enable_libtool_lock enable_maintainer_mode -enable_sim_debug -enable_sim_stdio -enable_sim_trace -enable_sim_profile enable_sim_inline with_pkgversion with_bugurl @@ -1420,13 +1416,6 @@ Optional Features: --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer - --enable-sim-debug=opts Enable debugging flags (for developers of the sim - itself) - --enable-sim-stdio Specify whether to use stdio for console - input/output - --enable-sim-trace=opts Enable tracing of simulated programs - --enable-sim-profile=opts - Enable profiling flags --enable-sim-inline=inlines Specify which functions should be inlined --enable-sim-endian=endian @@ -10778,7 +10767,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10781 "configure" +#line 10770 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10884,7 +10873,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10887 "configure" +#line 10876 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11124,8 +11113,6 @@ CC="$lt_save_CC" - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -11150,123 +11137,6 @@ 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="7";; - no) sim_debug="0";; - *) sim_debug="($enableval)";; -esac -fi -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="DO_USE_STDIO";; - no) sim_stdio="DONT_USE_STDIO";; - *) as_fn_error $? "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;; -esac -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="-1";; - no) sim_trace="0";; - [-0-9]*) - 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="(TRACE_$x" - else - sim_trace="${sim_trace}|TRACE_$x" - fi - done - sim_trace="$sim_trace)" ;; -esac -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) profile="1" sim_profile="-1";; - no) profile="0" sim_profile="0";; - [-0-9]*) - 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="(PROFILE_$x" - else - sim_profile="${sim_profile}|PROFILE_$x" - fi - done - sim_profile="$sim_profile)" ;; -esac -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; } - - - sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. if test "${enable_sim_inline+set}" = set; then : diff --git a/sim/bfin/config.in b/sim/bfin/config.in index b21bf7cd6b..29d1fe2ab9 100644 --- a/sim/bfin/config.in +++ b/sim/bfin/config.in @@ -3,9 +3,6 @@ /* 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 @@ -83,9 +80,6 @@ /* Additional package description */ #undef PKGVERSION -/* Sim profile settings */ -#undef PROFILE - /* Bug reporting address */ #undef REPORT_BUGS_TO @@ -114,18 +108,6 @@ #endif -/* Sim debug setting */ -#undef WITH_DEBUG - -/* 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 30fd48ac55..0b3ea4a73d 100755 --- a/sim/bfin/configure +++ b/sim/bfin/configure @@ -776,10 +776,6 @@ enable_fast_install with_gnu_ld enable_libtool_lock enable_maintainer_mode -enable_sim_debug -enable_sim_stdio -enable_sim_trace -enable_sim_profile enable_sim_inline with_pkgversion with_bugurl @@ -1431,13 +1427,6 @@ Optional Features: --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer - --enable-sim-debug=opts Enable debugging flags (for developers of the sim - itself) - --enable-sim-stdio Specify whether to use stdio for console - input/output - --enable-sim-trace=opts Enable tracing of simulated programs - --enable-sim-profile=opts - Enable profiling flags --enable-sim-inline=inlines Specify which functions should be inlined --enable-sim-endian=endian @@ -10798,7 +10787,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10801 "configure" +#line 10790 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10904,7 +10893,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10907 "configure" +#line 10896 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11144,8 +11133,6 @@ CC="$lt_save_CC" - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -11170,123 +11157,6 @@ 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="7";; - no) sim_debug="0";; - *) sim_debug="($enableval)";; -esac -fi -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="DO_USE_STDIO";; - no) sim_stdio="DONT_USE_STDIO";; - *) as_fn_error $? "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;; -esac -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="-1";; - no) sim_trace="0";; - [-0-9]*) - 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="(TRACE_$x" - else - sim_trace="${sim_trace}|TRACE_$x" - fi - done - sim_trace="$sim_trace)" ;; -esac -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) profile="1" sim_profile="-1";; - no) profile="0" sim_profile="0";; - [-0-9]*) - 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="(PROFILE_$x" - else - sim_profile="${sim_profile}|PROFILE_$x" - fi - done - sim_profile="$sim_profile)" ;; -esac -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; } - - - sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. if test "${enable_sim_inline+set}" = set; then : diff --git a/sim/bpf/config.in b/sim/bpf/config.in index b21bf7cd6b..29d1fe2ab9 100644 --- a/sim/bpf/config.in +++ b/sim/bpf/config.in @@ -3,9 +3,6 @@ /* 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 @@ -83,9 +80,6 @@ /* Additional package description */ #undef PKGVERSION -/* Sim profile settings */ -#undef PROFILE - /* Bug reporting address */ #undef REPORT_BUGS_TO @@ -114,18 +108,6 @@ #endif -/* Sim debug setting */ -#undef WITH_DEBUG - -/* 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/bpf/configure b/sim/bpf/configure index 375916b98c..87a79e1a7e 100755 --- a/sim/bpf/configure +++ b/sim/bpf/configure @@ -774,10 +774,6 @@ enable_fast_install with_gnu_ld enable_libtool_lock enable_maintainer_mode -enable_sim_debug -enable_sim_stdio -enable_sim_trace -enable_sim_profile enable_sim_inline with_pkgversion with_bugurl @@ -1427,13 +1423,6 @@ Optional Features: --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer - --enable-sim-debug=opts Enable debugging flags (for developers of the sim - itself) - --enable-sim-stdio Specify whether to use stdio for console - input/output - --enable-sim-trace=opts Enable tracing of simulated programs - --enable-sim-profile=opts - Enable profiling flags --enable-sim-inline=inlines Specify which functions should be inlined --enable-sim-bitsize=N Specify target bitsize (32 or 64) @@ -10791,7 +10780,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10794 "configure" +#line 10783 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10897,7 +10886,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10900 "configure" +#line 10889 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11137,8 +11126,6 @@ CC="$lt_save_CC" - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -11163,123 +11150,6 @@ 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="7";; - no) sim_debug="0";; - *) sim_debug="($enableval)";; -esac -fi -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="DO_USE_STDIO";; - no) sim_stdio="DONT_USE_STDIO";; - *) as_fn_error $? "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;; -esac -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="-1";; - no) sim_trace="0";; - [-0-9]*) - 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="(TRACE_$x" - else - sim_trace="${sim_trace}|TRACE_$x" - fi - done - sim_trace="$sim_trace)" ;; -esac -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) profile="1" sim_profile="-1";; - no) profile="0" sim_profile="0";; - [-0-9]*) - 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="(PROFILE_$x" - else - sim_profile="${sim_profile}|PROFILE_$x" - fi - done - sim_profile="$sim_profile)" ;; -esac -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; } - - - sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. if test "${enable_sim_inline+set}" = set; then : diff --git a/sim/config.h.in b/sim/config.h.in index 4ca8fc690a..8d7923e534 100644 --- a/sim/config.h.in +++ b/sim/config.h.in @@ -3,6 +3,9 @@ /* Define if building universal (internal helper macro) */ #undef AC_APPLE_UNIVERSAL_BUILD +/* Sim debug setting */ +#undef DEBUG + /* Define to the type of elements in the array set by `getgroups'. Usually this is either `int' or `gid_t'. */ #undef GETGROUPS_T @@ -391,6 +394,9 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION +/* Sim profile settings */ +#undef PROFILE + /* Define as the return type of signal handlers (`int' or `void'). */ #undef RETSIGTYPE @@ -428,9 +434,21 @@ /* 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/configure b/sim/configure index aac219bd09..c9e4d6fcd4 100755 --- a/sim/configure +++ b/sim/configure @@ -751,7 +751,11 @@ enable_sim enable_example_sims enable_targets enable_sim_assert +enable_sim_debug enable_sim_environment +enable_sim_profile +enable_sim_stdio +enable_sim_trace ' ac_precious_vars='build_alias host_alias @@ -1425,9 +1429,16 @@ Optional Features: --enable-example-sims enable example GNU simulators --enable-targets alternative target configurations --enable-sim-assert Specify whether to perform random assertions + --enable-sim-debug=opts Enable debugging flags (for developers of the sim + itself) --enable-sim-environment=environment Specify mixed, user, virtual or operating environment + --enable-sim-profile=opts + Enable profiling flags + --enable-sim-stdio Specify whether to use stdio for console + input/output + --enable-sim-trace=opts Enable tracing of simulated programs Some influential environment variables: CC C compiler command @@ -6587,6 +6598,32 @@ _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 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="7";; + no) sim_debug="0";; + *) sim_debug="($enableval)";; +esac +fi +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 default sim environment setting" >&5 $as_echo_n "checking default sim environment setting... " >&6; } @@ -6609,6 +6646,92 @@ _ACEOF { $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_environment" >&5 $as_echo "$sim_environment" >&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) profile="1" sim_profile="-1";; + no) profile="0" sim_profile="0";; + [-0-9]*) + 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="(PROFILE_$x" + else + sim_profile="${sim_profile}|PROFILE_$x" + fi + done + sim_profile="$sim_profile)" ;; +esac +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 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="DO_USE_STDIO";; + no) sim_stdio="DONT_USE_STDIO";; + *) as_fn_error $? "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;; +esac +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="-1";; + no) sim_trace="0";; + [-0-9]*) + 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="(TRACE_$x" + else + sim_trace="${sim_trace}|TRACE_$x" + fi + done + sim_trace="$sim_trace)" ;; +esac +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; } + ac_config_files="$ac_config_files Makefile" diff --git a/sim/configure.ac b/sim/configure.ac index ecf12b57a1..d8c6f2d4fe 100644 --- a/sim/configure.ac +++ b/sim/configure.ac @@ -99,8 +99,14 @@ if test "${enable_sim}" != no; then fi AM_CONDITIONAL([SIM_ENABLE_IGEN], [test "$sim_igen" = "yes"]) +dnl Standard (and optional) simulator options. +dnl Eventually all simulators will support these. SIM_AC_OPTION_ASSERT +SIM_AC_OPTION_DEBUG SIM_AC_OPTION_ENVIRONMENT +SIM_AC_OPTION_PROFILE +SIM_AC_OPTION_STDIO +SIM_AC_OPTION_TRACE AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/sim/cr16/config.in b/sim/cr16/config.in index b21bf7cd6b..29d1fe2ab9 100644 --- a/sim/cr16/config.in +++ b/sim/cr16/config.in @@ -3,9 +3,6 @@ /* 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 @@ -83,9 +80,6 @@ /* Additional package description */ #undef PKGVERSION -/* Sim profile settings */ -#undef PROFILE - /* Bug reporting address */ #undef REPORT_BUGS_TO @@ -114,18 +108,6 @@ #endif -/* Sim debug setting */ -#undef WITH_DEBUG - -/* 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 b8e51ce59c..50b302e7e8 100755 --- a/sim/cr16/configure +++ b/sim/cr16/configure @@ -771,10 +771,6 @@ enable_fast_install with_gnu_ld enable_libtool_lock enable_maintainer_mode -enable_sim_debug -enable_sim_stdio -enable_sim_trace -enable_sim_profile enable_sim_inline with_pkgversion with_bugurl @@ -1420,13 +1416,6 @@ Optional Features: --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer - --enable-sim-debug=opts Enable debugging flags (for developers of the sim - itself) - --enable-sim-stdio Specify whether to use stdio for console - input/output - --enable-sim-trace=opts Enable tracing of simulated programs - --enable-sim-profile=opts - Enable profiling flags --enable-sim-inline=inlines Specify which functions should be inlined --enable-sim-endian=endian @@ -10778,7 +10767,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10781 "configure" +#line 10770 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10884,7 +10873,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10887 "configure" +#line 10876 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11124,8 +11113,6 @@ CC="$lt_save_CC" - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -11150,123 +11137,6 @@ 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="7";; - no) sim_debug="0";; - *) sim_debug="($enableval)";; -esac -fi -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="DO_USE_STDIO";; - no) sim_stdio="DONT_USE_STDIO";; - *) as_fn_error $? "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;; -esac -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="-1";; - no) sim_trace="0";; - [-0-9]*) - 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="(TRACE_$x" - else - sim_trace="${sim_trace}|TRACE_$x" - fi - done - sim_trace="$sim_trace)" ;; -esac -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) profile="1" sim_profile="-1";; - no) profile="0" sim_profile="0";; - [-0-9]*) - 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="(PROFILE_$x" - else - sim_profile="${sim_profile}|PROFILE_$x" - fi - done - sim_profile="$sim_profile)" ;; -esac -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; } - - - sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. if test "${enable_sim_inline+set}" = set; then : diff --git a/sim/cris/config.in b/sim/cris/config.in index b21bf7cd6b..29d1fe2ab9 100644 --- a/sim/cris/config.in +++ b/sim/cris/config.in @@ -3,9 +3,6 @@ /* 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 @@ -83,9 +80,6 @@ /* Additional package description */ #undef PKGVERSION -/* Sim profile settings */ -#undef PROFILE - /* Bug reporting address */ #undef REPORT_BUGS_TO @@ -114,18 +108,6 @@ #endif -/* Sim debug setting */ -#undef WITH_DEBUG - -/* 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 9312f2711c..fa8aed58ef 100755 --- a/sim/cris/configure +++ b/sim/cris/configure @@ -774,10 +774,6 @@ enable_fast_install with_gnu_ld enable_libtool_lock enable_maintainer_mode -enable_sim_debug -enable_sim_stdio -enable_sim_trace -enable_sim_profile enable_sim_inline with_pkgversion with_bugurl @@ -1426,13 +1422,6 @@ Optional Features: --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer - --enable-sim-debug=opts Enable debugging flags (for developers of the sim - itself) - --enable-sim-stdio Specify whether to use stdio for console - input/output - --enable-sim-trace=opts Enable tracing of simulated programs - --enable-sim-profile=opts - Enable profiling flags --enable-sim-inline=inlines Specify which functions should be inlined --enable-sim-endian=endian @@ -10789,7 +10778,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10792 "configure" +#line 10781 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10895,7 +10884,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10898 "configure" +#line 10887 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11135,8 +11124,6 @@ CC="$lt_save_CC" - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -11161,123 +11148,6 @@ 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="7";; - no) sim_debug="0";; - *) sim_debug="($enableval)";; -esac -fi -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="DO_USE_STDIO";; - no) sim_stdio="DONT_USE_STDIO";; - *) as_fn_error $? "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;; -esac -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="-1";; - no) sim_trace="0";; - [-0-9]*) - 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="(TRACE_$x" - else - sim_trace="${sim_trace}|TRACE_$x" - fi - done - sim_trace="$sim_trace)" ;; -esac -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) profile="1" sim_profile="-1";; - no) profile="0" sim_profile="0";; - [-0-9]*) - 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="(PROFILE_$x" - else - sim_profile="${sim_profile}|PROFILE_$x" - fi - done - sim_profile="$sim_profile)" ;; -esac -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; } - - - sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. if test "${enable_sim_inline+set}" = set; then : diff --git a/sim/d10v/config.in b/sim/d10v/config.in index b21bf7cd6b..29d1fe2ab9 100644 --- a/sim/d10v/config.in +++ b/sim/d10v/config.in @@ -3,9 +3,6 @@ /* 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 @@ -83,9 +80,6 @@ /* Additional package description */ #undef PKGVERSION -/* Sim profile settings */ -#undef PROFILE - /* Bug reporting address */ #undef REPORT_BUGS_TO @@ -114,18 +108,6 @@ #endif -/* Sim debug setting */ -#undef WITH_DEBUG - -/* 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 1a5c3a0232..e605546d58 100755 --- a/sim/d10v/configure +++ b/sim/d10v/configure @@ -771,10 +771,6 @@ enable_fast_install with_gnu_ld enable_libtool_lock enable_maintainer_mode -enable_sim_debug -enable_sim_stdio -enable_sim_trace -enable_sim_profile enable_sim_inline with_pkgversion with_bugurl @@ -1420,13 +1416,6 @@ Optional Features: --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer - --enable-sim-debug=opts Enable debugging flags (for developers of the sim - itself) - --enable-sim-stdio Specify whether to use stdio for console - input/output - --enable-sim-trace=opts Enable tracing of simulated programs - --enable-sim-profile=opts - Enable profiling flags --enable-sim-inline=inlines Specify which functions should be inlined --enable-sim-endian=endian @@ -10778,7 +10767,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10781 "configure" +#line 10770 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10884,7 +10873,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10887 "configure" +#line 10876 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11124,8 +11113,6 @@ CC="$lt_save_CC" - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -11150,123 +11137,6 @@ 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="7";; - no) sim_debug="0";; - *) sim_debug="($enableval)";; -esac -fi -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="DO_USE_STDIO";; - no) sim_stdio="DONT_USE_STDIO";; - *) as_fn_error $? "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;; -esac -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="-1";; - no) sim_trace="0";; - [-0-9]*) - 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="(TRACE_$x" - else - sim_trace="${sim_trace}|TRACE_$x" - fi - done - sim_trace="$sim_trace)" ;; -esac -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) profile="1" sim_profile="-1";; - no) profile="0" sim_profile="0";; - [-0-9]*) - 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="(PROFILE_$x" - else - sim_profile="${sim_profile}|PROFILE_$x" - fi - done - sim_profile="$sim_profile)" ;; -esac -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; } - - - sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. if test "${enable_sim_inline+set}" = set; then : diff --git a/sim/erc32/config.in b/sim/erc32/config.in index b21bf7cd6b..29d1fe2ab9 100644 --- a/sim/erc32/config.in +++ b/sim/erc32/config.in @@ -3,9 +3,6 @@ /* 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 @@ -83,9 +80,6 @@ /* Additional package description */ #undef PKGVERSION -/* Sim profile settings */ -#undef PROFILE - /* Bug reporting address */ #undef REPORT_BUGS_TO @@ -114,18 +108,6 @@ #endif -/* Sim debug setting */ -#undef WITH_DEBUG - -/* 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 160189df46..23fc3dc180 100755 --- a/sim/erc32/configure +++ b/sim/erc32/configure @@ -774,10 +774,6 @@ enable_fast_install with_gnu_ld enable_libtool_lock enable_maintainer_mode -enable_sim_debug -enable_sim_stdio -enable_sim_trace -enable_sim_profile enable_sim_inline with_pkgversion with_bugurl @@ -1421,13 +1417,6 @@ Optional Features: --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer - --enable-sim-debug=opts Enable debugging flags (for developers of the sim - itself) - --enable-sim-stdio Specify whether to use stdio for console - input/output - --enable-sim-trace=opts Enable tracing of simulated programs - --enable-sim-profile=opts - Enable profiling flags --enable-sim-inline=inlines Specify which functions should be inlined --enable-werror treat compile warnings as errors @@ -10774,7 +10763,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10777 "configure" +#line 10766 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10880,7 +10869,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10883 "configure" +#line 10872 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11120,8 +11109,6 @@ CC="$lt_save_CC" - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -11146,123 +11133,6 @@ 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="7";; - no) sim_debug="0";; - *) sim_debug="($enableval)";; -esac -fi -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="DO_USE_STDIO";; - no) sim_stdio="DONT_USE_STDIO";; - *) as_fn_error $? "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;; -esac -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="-1";; - no) sim_trace="0";; - [-0-9]*) - 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="(TRACE_$x" - else - sim_trace="${sim_trace}|TRACE_$x" - fi - done - sim_trace="$sim_trace)" ;; -esac -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) profile="1" sim_profile="-1";; - no) profile="0" sim_profile="0";; - [-0-9]*) - 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="(PROFILE_$x" - else - sim_profile="${sim_profile}|PROFILE_$x" - fi - done - sim_profile="$sim_profile)" ;; -esac -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; } - - - sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. if test "${enable_sim_inline+set}" = set; then : diff --git a/sim/example-synacor/config.in b/sim/example-synacor/config.in index b21bf7cd6b..29d1fe2ab9 100644 --- a/sim/example-synacor/config.in +++ b/sim/example-synacor/config.in @@ -3,9 +3,6 @@ /* 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 @@ -83,9 +80,6 @@ /* Additional package description */ #undef PKGVERSION -/* Sim profile settings */ -#undef PROFILE - /* Bug reporting address */ #undef REPORT_BUGS_TO @@ -114,18 +108,6 @@ #endif -/* Sim debug setting */ -#undef WITH_DEBUG - -/* 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/example-synacor/configure b/sim/example-synacor/configure index eb7a968b9e..1cd1af911f 100755 --- a/sim/example-synacor/configure +++ b/sim/example-synacor/configure @@ -771,10 +771,6 @@ enable_fast_install with_gnu_ld enable_libtool_lock enable_maintainer_mode -enable_sim_debug -enable_sim_stdio -enable_sim_trace -enable_sim_profile enable_sim_inline with_pkgversion with_bugurl @@ -1420,13 +1416,6 @@ Optional Features: --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer - --enable-sim-debug=opts Enable debugging flags (for developers of the sim - itself) - --enable-sim-stdio Specify whether to use stdio for console - input/output - --enable-sim-trace=opts Enable tracing of simulated programs - --enable-sim-profile=opts - Enable profiling flags --enable-sim-inline=inlines Specify which functions should be inlined --enable-sim-endian=endian @@ -10778,7 +10767,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10781 "configure" +#line 10770 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10884,7 +10873,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10887 "configure" +#line 10876 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11124,8 +11113,6 @@ CC="$lt_save_CC" - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -11150,123 +11137,6 @@ 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="7";; - no) sim_debug="0";; - *) sim_debug="($enableval)";; -esac -fi -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="DO_USE_STDIO";; - no) sim_stdio="DONT_USE_STDIO";; - *) as_fn_error $? "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;; -esac -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="-1";; - no) sim_trace="0";; - [-0-9]*) - 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="(TRACE_$x" - else - sim_trace="${sim_trace}|TRACE_$x" - fi - done - sim_trace="$sim_trace)" ;; -esac -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) profile="1" sim_profile="-1";; - no) profile="0" sim_profile="0";; - [-0-9]*) - 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="(PROFILE_$x" - else - sim_profile="${sim_profile}|PROFILE_$x" - fi - done - sim_profile="$sim_profile)" ;; -esac -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; } - - - sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. if test "${enable_sim_inline+set}" = set; then : diff --git a/sim/frv/config.in b/sim/frv/config.in index b21bf7cd6b..29d1fe2ab9 100644 --- a/sim/frv/config.in +++ b/sim/frv/config.in @@ -3,9 +3,6 @@ /* 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 @@ -83,9 +80,6 @@ /* Additional package description */ #undef PKGVERSION -/* Sim profile settings */ -#undef PROFILE - /* Bug reporting address */ #undef REPORT_BUGS_TO @@ -114,18 +108,6 @@ #endif -/* Sim debug setting */ -#undef WITH_DEBUG - -/* 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 c4eedf2228..d2f72d6162 100755 --- a/sim/frv/configure +++ b/sim/frv/configure @@ -775,10 +775,6 @@ enable_fast_install with_gnu_ld enable_libtool_lock enable_maintainer_mode -enable_sim_debug -enable_sim_stdio -enable_sim_trace -enable_sim_profile enable_sim_inline with_pkgversion with_bugurl @@ -1428,13 +1424,6 @@ Optional Features: --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer - --enable-sim-debug=opts Enable debugging flags (for developers of the sim - itself) - --enable-sim-stdio Specify whether to use stdio for console - input/output - --enable-sim-trace=opts Enable tracing of simulated programs - --enable-sim-profile=opts - Enable profiling flags --enable-sim-inline=inlines Specify which functions should be inlined --enable-sim-endian=endian @@ -10792,7 +10781,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10795 "configure" +#line 10784 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10898,7 +10887,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10901 "configure" +#line 10890 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11138,8 +11127,6 @@ CC="$lt_save_CC" - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -11164,123 +11151,6 @@ 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="7";; - no) sim_debug="0";; - *) sim_debug="($enableval)";; -esac -fi -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="DO_USE_STDIO";; - no) sim_stdio="DONT_USE_STDIO";; - *) as_fn_error $? "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;; -esac -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="-1";; - no) sim_trace="0";; - [-0-9]*) - 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="(TRACE_$x" - else - sim_trace="${sim_trace}|TRACE_$x" - fi - done - sim_trace="$sim_trace)" ;; -esac -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) profile="1" sim_profile="-1";; - no) profile="0" sim_profile="0";; - [-0-9]*) - 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="(PROFILE_$x" - else - sim_profile="${sim_profile}|PROFILE_$x" - fi - done - sim_profile="$sim_profile)" ;; -esac -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; } - - - sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. if test "${enable_sim_inline+set}" = set; then : diff --git a/sim/ft32/config.in b/sim/ft32/config.in index b21bf7cd6b..29d1fe2ab9 100644 --- a/sim/ft32/config.in +++ b/sim/ft32/config.in @@ -3,9 +3,6 @@ /* 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 @@ -83,9 +80,6 @@ /* Additional package description */ #undef PKGVERSION -/* Sim profile settings */ -#undef PROFILE - /* Bug reporting address */ #undef REPORT_BUGS_TO @@ -114,18 +108,6 @@ #endif -/* Sim debug setting */ -#undef WITH_DEBUG - -/* 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 f99d0c5f7c..0a5678cf41 100755 --- a/sim/ft32/configure +++ b/sim/ft32/configure @@ -771,10 +771,6 @@ enable_fast_install with_gnu_ld enable_libtool_lock enable_maintainer_mode -enable_sim_debug -enable_sim_stdio -enable_sim_trace -enable_sim_profile enable_sim_inline with_pkgversion with_bugurl @@ -1420,13 +1416,6 @@ Optional Features: --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer - --enable-sim-debug=opts Enable debugging flags (for developers of the sim - itself) - --enable-sim-stdio Specify whether to use stdio for console - input/output - --enable-sim-trace=opts Enable tracing of simulated programs - --enable-sim-profile=opts - Enable profiling flags --enable-sim-inline=inlines Specify which functions should be inlined --enable-sim-endian=endian @@ -10778,7 +10767,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10781 "configure" +#line 10770 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10884,7 +10873,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10887 "configure" +#line 10876 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11124,8 +11113,6 @@ CC="$lt_save_CC" - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -11150,123 +11137,6 @@ 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="7";; - no) sim_debug="0";; - *) sim_debug="($enableval)";; -esac -fi -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="DO_USE_STDIO";; - no) sim_stdio="DONT_USE_STDIO";; - *) as_fn_error $? "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;; -esac -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="-1";; - no) sim_trace="0";; - [-0-9]*) - 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="(TRACE_$x" - else - sim_trace="${sim_trace}|TRACE_$x" - fi - done - sim_trace="$sim_trace)" ;; -esac -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) profile="1" sim_profile="-1";; - no) profile="0" sim_profile="0";; - [-0-9]*) - 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="(PROFILE_$x" - else - sim_profile="${sim_profile}|PROFILE_$x" - fi - done - sim_profile="$sim_profile)" ;; -esac -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; } - - - sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. if test "${enable_sim_inline+set}" = set; then : diff --git a/sim/h8300/config.in b/sim/h8300/config.in index b21bf7cd6b..29d1fe2ab9 100644 --- a/sim/h8300/config.in +++ b/sim/h8300/config.in @@ -3,9 +3,6 @@ /* 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 @@ -83,9 +80,6 @@ /* Additional package description */ #undef PKGVERSION -/* Sim profile settings */ -#undef PROFILE - /* Bug reporting address */ #undef REPORT_BUGS_TO @@ -114,18 +108,6 @@ #endif -/* Sim debug setting */ -#undef WITH_DEBUG - -/* 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 17b04353d1..9caaf0a1c3 100755 --- a/sim/h8300/configure +++ b/sim/h8300/configure @@ -771,10 +771,6 @@ enable_fast_install with_gnu_ld enable_libtool_lock enable_maintainer_mode -enable_sim_debug -enable_sim_stdio -enable_sim_trace -enable_sim_profile enable_sim_inline with_pkgversion with_bugurl @@ -1420,13 +1416,6 @@ Optional Features: --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer - --enable-sim-debug=opts Enable debugging flags (for developers of the sim - itself) - --enable-sim-stdio Specify whether to use stdio for console - input/output - --enable-sim-trace=opts Enable tracing of simulated programs - --enable-sim-profile=opts - Enable profiling flags --enable-sim-inline=inlines Specify which functions should be inlined --enable-sim-endian=endian @@ -10778,7 +10767,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10781 "configure" +#line 10770 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10884,7 +10873,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10887 "configure" +#line 10876 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11124,8 +11113,6 @@ CC="$lt_save_CC" - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -11150,123 +11137,6 @@ 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="7";; - no) sim_debug="0";; - *) sim_debug="($enableval)";; -esac -fi -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="DO_USE_STDIO";; - no) sim_stdio="DONT_USE_STDIO";; - *) as_fn_error $? "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;; -esac -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="-1";; - no) sim_trace="0";; - [-0-9]*) - 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="(TRACE_$x" - else - sim_trace="${sim_trace}|TRACE_$x" - fi - done - sim_trace="$sim_trace)" ;; -esac -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) profile="1" sim_profile="-1";; - no) profile="0" sim_profile="0";; - [-0-9]*) - 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="(PROFILE_$x" - else - sim_profile="${sim_profile}|PROFILE_$x" - fi - done - sim_profile="$sim_profile)" ;; -esac -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; } - - - sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. if test "${enable_sim_inline+set}" = set; then : diff --git a/sim/iq2000/config.in b/sim/iq2000/config.in index b21bf7cd6b..29d1fe2ab9 100644 --- a/sim/iq2000/config.in +++ b/sim/iq2000/config.in @@ -3,9 +3,6 @@ /* 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 @@ -83,9 +80,6 @@ /* Additional package description */ #undef PKGVERSION -/* Sim profile settings */ -#undef PROFILE - /* Bug reporting address */ #undef REPORT_BUGS_TO @@ -114,18 +108,6 @@ #endif -/* Sim debug setting */ -#undef WITH_DEBUG - -/* 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 43e4a18c20..5ac8ba9f2d 100755 --- a/sim/iq2000/configure +++ b/sim/iq2000/configure @@ -774,10 +774,6 @@ enable_fast_install with_gnu_ld enable_libtool_lock enable_maintainer_mode -enable_sim_debug -enable_sim_stdio -enable_sim_trace -enable_sim_profile enable_sim_inline with_pkgversion with_bugurl @@ -1426,13 +1422,6 @@ Optional Features: --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer - --enable-sim-debug=opts Enable debugging flags (for developers of the sim - itself) - --enable-sim-stdio Specify whether to use stdio for console - input/output - --enable-sim-trace=opts Enable tracing of simulated programs - --enable-sim-profile=opts - Enable profiling flags --enable-sim-inline=inlines Specify which functions should be inlined --enable-sim-endian=endian @@ -10789,7 +10778,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10792 "configure" +#line 10781 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10895,7 +10884,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10898 "configure" +#line 10887 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11135,8 +11124,6 @@ CC="$lt_save_CC" - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -11161,123 +11148,6 @@ 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="7";; - no) sim_debug="0";; - *) sim_debug="($enableval)";; -esac -fi -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="DO_USE_STDIO";; - no) sim_stdio="DONT_USE_STDIO";; - *) as_fn_error $? "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;; -esac -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="-1";; - no) sim_trace="0";; - [-0-9]*) - 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="(TRACE_$x" - else - sim_trace="${sim_trace}|TRACE_$x" - fi - done - sim_trace="$sim_trace)" ;; -esac -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) profile="1" sim_profile="-1";; - no) profile="0" sim_profile="0";; - [-0-9]*) - 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="(PROFILE_$x" - else - sim_profile="${sim_profile}|PROFILE_$x" - fi - done - sim_profile="$sim_profile)" ;; -esac -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; } - - - sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. if test "${enable_sim_inline+set}" = set; then : diff --git a/sim/lm32/config.in b/sim/lm32/config.in index b21bf7cd6b..29d1fe2ab9 100644 --- a/sim/lm32/config.in +++ b/sim/lm32/config.in @@ -3,9 +3,6 @@ /* 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 @@ -83,9 +80,6 @@ /* Additional package description */ #undef PKGVERSION -/* Sim profile settings */ -#undef PROFILE - /* Bug reporting address */ #undef REPORT_BUGS_TO @@ -114,18 +108,6 @@ #endif -/* Sim debug setting */ -#undef WITH_DEBUG - -/* 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 285c3ee8b0..3dbb140f1e 100755 --- a/sim/lm32/configure +++ b/sim/lm32/configure @@ -774,10 +774,6 @@ enable_fast_install with_gnu_ld enable_libtool_lock enable_maintainer_mode -enable_sim_debug -enable_sim_stdio -enable_sim_trace -enable_sim_profile enable_sim_inline with_pkgversion with_bugurl @@ -1426,13 +1422,6 @@ Optional Features: --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer - --enable-sim-debug=opts Enable debugging flags (for developers of the sim - itself) - --enable-sim-stdio Specify whether to use stdio for console - input/output - --enable-sim-trace=opts Enable tracing of simulated programs - --enable-sim-profile=opts - Enable profiling flags --enable-sim-inline=inlines Specify which functions should be inlined --enable-sim-endian=endian @@ -10789,7 +10778,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10792 "configure" +#line 10781 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10895,7 +10884,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10898 "configure" +#line 10887 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11135,8 +11124,6 @@ CC="$lt_save_CC" - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -11161,123 +11148,6 @@ 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="7";; - no) sim_debug="0";; - *) sim_debug="($enableval)";; -esac -fi -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="DO_USE_STDIO";; - no) sim_stdio="DONT_USE_STDIO";; - *) as_fn_error $? "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;; -esac -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="-1";; - no) sim_trace="0";; - [-0-9]*) - 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="(TRACE_$x" - else - sim_trace="${sim_trace}|TRACE_$x" - fi - done - sim_trace="$sim_trace)" ;; -esac -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) profile="1" sim_profile="-1";; - no) profile="0" sim_profile="0";; - [-0-9]*) - 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="(PROFILE_$x" - else - sim_profile="${sim_profile}|PROFILE_$x" - fi - done - sim_profile="$sim_profile)" ;; -esac -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; } - - - sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. if test "${enable_sim_inline+set}" = set; then : diff --git a/sim/m32c/config.in b/sim/m32c/config.in index b21bf7cd6b..29d1fe2ab9 100644 --- a/sim/m32c/config.in +++ b/sim/m32c/config.in @@ -3,9 +3,6 @@ /* 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 @@ -83,9 +80,6 @@ /* Additional package description */ #undef PKGVERSION -/* Sim profile settings */ -#undef PROFILE - /* Bug reporting address */ #undef REPORT_BUGS_TO @@ -114,18 +108,6 @@ #endif -/* Sim debug setting */ -#undef WITH_DEBUG - -/* 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 22f01e85a0..d153041e8b 100755 --- a/sim/m32c/configure +++ b/sim/m32c/configure @@ -771,10 +771,6 @@ enable_fast_install with_gnu_ld enable_libtool_lock enable_maintainer_mode -enable_sim_debug -enable_sim_stdio -enable_sim_trace -enable_sim_profile enable_sim_inline with_pkgversion with_bugurl @@ -1418,13 +1414,6 @@ Optional Features: --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer - --enable-sim-debug=opts Enable debugging flags (for developers of the sim - itself) - --enable-sim-stdio Specify whether to use stdio for console - input/output - --enable-sim-trace=opts Enable tracing of simulated programs - --enable-sim-profile=opts - Enable profiling flags --enable-sim-inline=inlines Specify which functions should be inlined --enable-werror treat compile warnings as errors @@ -10771,7 +10760,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10774 "configure" +#line 10763 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10877,7 +10866,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10880 "configure" +#line 10869 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11117,8 +11106,6 @@ CC="$lt_save_CC" - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -11143,123 +11130,6 @@ 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="7";; - no) sim_debug="0";; - *) sim_debug="($enableval)";; -esac -fi -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="DO_USE_STDIO";; - no) sim_stdio="DONT_USE_STDIO";; - *) as_fn_error $? "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;; -esac -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="-1";; - no) sim_trace="0";; - [-0-9]*) - 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="(TRACE_$x" - else - sim_trace="${sim_trace}|TRACE_$x" - fi - done - sim_trace="$sim_trace)" ;; -esac -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) profile="1" sim_profile="-1";; - no) profile="0" sim_profile="0";; - [-0-9]*) - 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="(PROFILE_$x" - else - sim_profile="${sim_profile}|PROFILE_$x" - fi - done - sim_profile="$sim_profile)" ;; -esac -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; } - - - sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. if test "${enable_sim_inline+set}" = set; then : diff --git a/sim/m32r/config.in b/sim/m32r/config.in index b21bf7cd6b..29d1fe2ab9 100644 --- a/sim/m32r/config.in +++ b/sim/m32r/config.in @@ -3,9 +3,6 @@ /* 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 @@ -83,9 +80,6 @@ /* Additional package description */ #undef PKGVERSION -/* Sim profile settings */ -#undef PROFILE - /* Bug reporting address */ #undef REPORT_BUGS_TO @@ -114,18 +108,6 @@ #endif -/* Sim debug setting */ -#undef WITH_DEBUG - -/* 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 54efeb6e34..25ee335704 100755 --- a/sim/m32r/configure +++ b/sim/m32r/configure @@ -776,10 +776,6 @@ enable_fast_install with_gnu_ld enable_libtool_lock enable_maintainer_mode -enable_sim_debug -enable_sim_stdio -enable_sim_trace -enable_sim_profile enable_sim_inline with_pkgversion with_bugurl @@ -1428,13 +1424,6 @@ Optional Features: --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer - --enable-sim-debug=opts Enable debugging flags (for developers of the sim - itself) - --enable-sim-stdio Specify whether to use stdio for console - input/output - --enable-sim-trace=opts Enable tracing of simulated programs - --enable-sim-profile=opts - Enable profiling flags --enable-sim-inline=inlines Specify which functions should be inlined --enable-sim-endian=endian @@ -10791,7 +10780,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10794 "configure" +#line 10783 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10897,7 +10886,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10900 "configure" +#line 10889 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11137,8 +11126,6 @@ CC="$lt_save_CC" - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -11163,123 +11150,6 @@ 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="7";; - no) sim_debug="0";; - *) sim_debug="($enableval)";; -esac -fi -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="DO_USE_STDIO";; - no) sim_stdio="DONT_USE_STDIO";; - *) as_fn_error $? "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;; -esac -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="-1";; - no) sim_trace="0";; - [-0-9]*) - 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="(TRACE_$x" - else - sim_trace="${sim_trace}|TRACE_$x" - fi - done - sim_trace="$sim_trace)" ;; -esac -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) profile="1" sim_profile="-1";; - no) profile="0" sim_profile="0";; - [-0-9]*) - 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="(PROFILE_$x" - else - sim_profile="${sim_profile}|PROFILE_$x" - fi - done - sim_profile="$sim_profile)" ;; -esac -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; } - - - sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. if test "${enable_sim_inline+set}" = set; then : diff --git a/sim/m4/sim_ac_common.m4 b/sim/m4/sim_ac_common.m4 index 353855707a..0f687dc7bc 100644 --- a/sim/m4/sim_ac_common.m4 +++ b/sim/m4/sim_ac_common.m4 @@ -54,26 +54,10 @@ AM_CONDITIONAL(PLUGINS, test "$plugins" = yes) LT_INIT([dlopen]) AC_SUBST(lt_cv_dlopen_libs) -dnl Standard (and optional) simulator options. -dnl Eventually all simulators will support these. -dnl Do not add any here that cannot be supported by all simulators. -dnl Do not add similar but different options to a particular simulator, -dnl all shall eventually behave the same way. - - dnl We don't use automake, but we still want to support dnl --enable-maintainer-mode. AM_MAINTAINER_MODE - -SIM_AC_OPTION_DEBUG - -SIM_AC_OPTION_STDIO - -SIM_AC_OPTION_TRACE - -SIM_AC_OPTION_PROFILE - SIM_AC_OPTION_INLINE ACX_PKGVERSION([SIM]) diff --git a/sim/m68hc11/config.in b/sim/m68hc11/config.in index b21bf7cd6b..29d1fe2ab9 100644 --- a/sim/m68hc11/config.in +++ b/sim/m68hc11/config.in @@ -3,9 +3,6 @@ /* 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 @@ -83,9 +80,6 @@ /* Additional package description */ #undef PKGVERSION -/* Sim profile settings */ -#undef PROFILE - /* Bug reporting address */ #undef REPORT_BUGS_TO @@ -114,18 +108,6 @@ #endif -/* Sim debug setting */ -#undef WITH_DEBUG - -/* 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 4a3591a3f0..7be0e7e985 100755 --- a/sim/m68hc11/configure +++ b/sim/m68hc11/configure @@ -771,10 +771,6 @@ enable_fast_install with_gnu_ld enable_libtool_lock enable_maintainer_mode -enable_sim_debug -enable_sim_stdio -enable_sim_trace -enable_sim_profile enable_sim_inline with_pkgversion with_bugurl @@ -1420,13 +1416,6 @@ Optional Features: --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer - --enable-sim-debug=opts Enable debugging flags (for developers of the sim - itself) - --enable-sim-stdio Specify whether to use stdio for console - input/output - --enable-sim-trace=opts Enable tracing of simulated programs - --enable-sim-profile=opts - Enable profiling flags --enable-sim-inline=inlines Specify which functions should be inlined --enable-sim-endian=endian @@ -10778,7 +10767,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10781 "configure" +#line 10770 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10884,7 +10873,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10887 "configure" +#line 10876 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11124,8 +11113,6 @@ CC="$lt_save_CC" - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -11150,123 +11137,6 @@ 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="7";; - no) sim_debug="0";; - *) sim_debug="($enableval)";; -esac -fi -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="DO_USE_STDIO";; - no) sim_stdio="DONT_USE_STDIO";; - *) as_fn_error $? "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;; -esac -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="-1";; - no) sim_trace="0";; - [-0-9]*) - 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="(TRACE_$x" - else - sim_trace="${sim_trace}|TRACE_$x" - fi - done - sim_trace="$sim_trace)" ;; -esac -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) profile="1" sim_profile="-1";; - no) profile="0" sim_profile="0";; - [-0-9]*) - 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="(PROFILE_$x" - else - sim_profile="${sim_profile}|PROFILE_$x" - fi - done - sim_profile="$sim_profile)" ;; -esac -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; } - - - sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. if test "${enable_sim_inline+set}" = set; then : diff --git a/sim/mcore/config.in b/sim/mcore/config.in index b21bf7cd6b..29d1fe2ab9 100644 --- a/sim/mcore/config.in +++ b/sim/mcore/config.in @@ -3,9 +3,6 @@ /* 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 @@ -83,9 +80,6 @@ /* Additional package description */ #undef PKGVERSION -/* Sim profile settings */ -#undef PROFILE - /* Bug reporting address */ #undef REPORT_BUGS_TO @@ -114,18 +108,6 @@ #endif -/* Sim debug setting */ -#undef WITH_DEBUG - -/* 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 1a5c3a0232..e605546d58 100755 --- a/sim/mcore/configure +++ b/sim/mcore/configure @@ -771,10 +771,6 @@ enable_fast_install with_gnu_ld enable_libtool_lock enable_maintainer_mode -enable_sim_debug -enable_sim_stdio -enable_sim_trace -enable_sim_profile enable_sim_inline with_pkgversion with_bugurl @@ -1420,13 +1416,6 @@ Optional Features: --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer - --enable-sim-debug=opts Enable debugging flags (for developers of the sim - itself) - --enable-sim-stdio Specify whether to use stdio for console - input/output - --enable-sim-trace=opts Enable tracing of simulated programs - --enable-sim-profile=opts - Enable profiling flags --enable-sim-inline=inlines Specify which functions should be inlined --enable-sim-endian=endian @@ -10778,7 +10767,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10781 "configure" +#line 10770 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10884,7 +10873,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10887 "configure" +#line 10876 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11124,8 +11113,6 @@ CC="$lt_save_CC" - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -11150,123 +11137,6 @@ 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="7";; - no) sim_debug="0";; - *) sim_debug="($enableval)";; -esac -fi -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="DO_USE_STDIO";; - no) sim_stdio="DONT_USE_STDIO";; - *) as_fn_error $? "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;; -esac -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="-1";; - no) sim_trace="0";; - [-0-9]*) - 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="(TRACE_$x" - else - sim_trace="${sim_trace}|TRACE_$x" - fi - done - sim_trace="$sim_trace)" ;; -esac -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) profile="1" sim_profile="-1";; - no) profile="0" sim_profile="0";; - [-0-9]*) - 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="(PROFILE_$x" - else - sim_profile="${sim_profile}|PROFILE_$x" - fi - done - sim_profile="$sim_profile)" ;; -esac -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; } - - - sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. if test "${enable_sim_inline+set}" = set; then : diff --git a/sim/microblaze/config.in b/sim/microblaze/config.in index b21bf7cd6b..29d1fe2ab9 100644 --- a/sim/microblaze/config.in +++ b/sim/microblaze/config.in @@ -3,9 +3,6 @@ /* 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 @@ -83,9 +80,6 @@ /* Additional package description */ #undef PKGVERSION -/* Sim profile settings */ -#undef PROFILE - /* Bug reporting address */ #undef REPORT_BUGS_TO @@ -114,18 +108,6 @@ #endif -/* Sim debug setting */ -#undef WITH_DEBUG - -/* 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 48f24aaa56..9ecbc24f8a 100755 --- a/sim/microblaze/configure +++ b/sim/microblaze/configure @@ -771,10 +771,6 @@ enable_fast_install with_gnu_ld enable_libtool_lock enable_maintainer_mode -enable_sim_debug -enable_sim_stdio -enable_sim_trace -enable_sim_profile enable_sim_inline with_pkgversion with_bugurl @@ -1420,13 +1416,6 @@ Optional Features: --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer - --enable-sim-debug=opts Enable debugging flags (for developers of the sim - itself) - --enable-sim-stdio Specify whether to use stdio for console - input/output - --enable-sim-trace=opts Enable tracing of simulated programs - --enable-sim-profile=opts - Enable profiling flags --enable-sim-inline=inlines Specify which functions should be inlined --enable-sim-endian=endian @@ -10778,7 +10767,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10781 "configure" +#line 10770 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10884,7 +10873,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10887 "configure" +#line 10876 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11124,8 +11113,6 @@ CC="$lt_save_CC" - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -11150,123 +11137,6 @@ 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="7";; - no) sim_debug="0";; - *) sim_debug="($enableval)";; -esac -fi -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="DO_USE_STDIO";; - no) sim_stdio="DONT_USE_STDIO";; - *) as_fn_error $? "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;; -esac -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="-1";; - no) sim_trace="0";; - [-0-9]*) - 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="(TRACE_$x" - else - sim_trace="${sim_trace}|TRACE_$x" - fi - done - sim_trace="$sim_trace)" ;; -esac -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) profile="1" sim_profile="-1";; - no) profile="0" sim_profile="0";; - [-0-9]*) - 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="(PROFILE_$x" - else - sim_profile="${sim_profile}|PROFILE_$x" - fi - done - sim_profile="$sim_profile)" ;; -esac -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; } - - - sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. if test "${enable_sim_inline+set}" = set; then : diff --git a/sim/mips/config.in b/sim/mips/config.in index b21bf7cd6b..29d1fe2ab9 100644 --- a/sim/mips/config.in +++ b/sim/mips/config.in @@ -3,9 +3,6 @@ /* 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 @@ -83,9 +80,6 @@ /* Additional package description */ #undef PKGVERSION -/* Sim profile settings */ -#undef PROFILE - /* Bug reporting address */ #undef REPORT_BUGS_TO @@ -114,18 +108,6 @@ #endif -/* Sim debug setting */ -#undef WITH_DEBUG - -/* 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 9527016313..f3c03ddd01 100755 --- a/sim/mips/configure +++ b/sim/mips/configure @@ -782,10 +782,6 @@ enable_fast_install with_gnu_ld enable_libtool_lock enable_maintainer_mode -enable_sim_debug -enable_sim_stdio -enable_sim_trace -enable_sim_profile enable_sim_inline with_pkgversion with_bugurl @@ -1440,13 +1436,6 @@ Optional Features: --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer - --enable-sim-debug=opts Enable debugging flags (for developers of the sim - itself) - --enable-sim-stdio Specify whether to use stdio for console - input/output - --enable-sim-trace=opts Enable tracing of simulated programs - --enable-sim-profile=opts - Enable profiling flags --enable-sim-inline=inlines Specify which functions should be inlined --enable-sim-alignment=align @@ -10806,7 +10795,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10809 "configure" +#line 10798 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10912,7 +10901,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10915 "configure" +#line 10904 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11152,8 +11141,6 @@ CC="$lt_save_CC" - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -11178,123 +11165,6 @@ 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="7";; - no) sim_debug="0";; - *) sim_debug="($enableval)";; -esac -fi -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="DO_USE_STDIO";; - no) sim_stdio="DONT_USE_STDIO";; - *) as_fn_error $? "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;; -esac -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="-1";; - no) sim_trace="0";; - [-0-9]*) - 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="(TRACE_$x" - else - sim_trace="${sim_trace}|TRACE_$x" - fi - done - sim_trace="$sim_trace)" ;; -esac -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) profile="1" sim_profile="-1";; - no) profile="0" sim_profile="0";; - [-0-9]*) - 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="(PROFILE_$x" - else - sim_profile="${sim_profile}|PROFILE_$x" - fi - done - sim_profile="$sim_profile)" ;; -esac -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; } - - - sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. if test "${enable_sim_inline+set}" = set; then : diff --git a/sim/mn10300/config.in b/sim/mn10300/config.in index b21bf7cd6b..29d1fe2ab9 100644 --- a/sim/mn10300/config.in +++ b/sim/mn10300/config.in @@ -3,9 +3,6 @@ /* 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 @@ -83,9 +80,6 @@ /* Additional package description */ #undef PKGVERSION -/* Sim profile settings */ -#undef PROFILE - /* Bug reporting address */ #undef REPORT_BUGS_TO @@ -114,18 +108,6 @@ #endif -/* Sim debug setting */ -#undef WITH_DEBUG - -/* 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 31f8de0e3b..3d5c0a778b 100755 --- a/sim/mn10300/configure +++ b/sim/mn10300/configure @@ -771,10 +771,6 @@ enable_fast_install with_gnu_ld enable_libtool_lock enable_maintainer_mode -enable_sim_debug -enable_sim_stdio -enable_sim_trace -enable_sim_profile enable_sim_inline with_pkgversion with_bugurl @@ -1422,13 +1418,6 @@ Optional Features: --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer - --enable-sim-debug=opts Enable debugging flags (for developers of the sim - itself) - --enable-sim-stdio Specify whether to use stdio for console - input/output - --enable-sim-trace=opts Enable tracing of simulated programs - --enable-sim-profile=opts - Enable profiling flags --enable-sim-inline=inlines Specify which functions should be inlined --enable-sim-endian=endian @@ -10784,7 +10773,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10787 "configure" +#line 10776 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10890,7 +10879,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10893 "configure" +#line 10882 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11130,8 +11119,6 @@ CC="$lt_save_CC" - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -11156,123 +11143,6 @@ 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="7";; - no) sim_debug="0";; - *) sim_debug="($enableval)";; -esac -fi -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="DO_USE_STDIO";; - no) sim_stdio="DONT_USE_STDIO";; - *) as_fn_error $? "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;; -esac -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="-1";; - no) sim_trace="0";; - [-0-9]*) - 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="(TRACE_$x" - else - sim_trace="${sim_trace}|TRACE_$x" - fi - done - sim_trace="$sim_trace)" ;; -esac -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) profile="1" sim_profile="-1";; - no) profile="0" sim_profile="0";; - [-0-9]*) - 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="(PROFILE_$x" - else - sim_profile="${sim_profile}|PROFILE_$x" - fi - done - sim_profile="$sim_profile)" ;; -esac -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; } - - - sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. if test "${enable_sim_inline+set}" = set; then : diff --git a/sim/moxie/config.in b/sim/moxie/config.in index b21bf7cd6b..29d1fe2ab9 100644 --- a/sim/moxie/config.in +++ b/sim/moxie/config.in @@ -3,9 +3,6 @@ /* 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 @@ -83,9 +80,6 @@ /* Additional package description */ #undef PKGVERSION -/* Sim profile settings */ -#undef PROFILE - /* Bug reporting address */ #undef REPORT_BUGS_TO @@ -114,18 +108,6 @@ #endif -/* Sim debug setting */ -#undef WITH_DEBUG - -/* 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 749ed229f9..4b3567930b 100755 --- a/sim/moxie/configure +++ b/sim/moxie/configure @@ -772,10 +772,6 @@ enable_fast_install with_gnu_ld enable_libtool_lock enable_maintainer_mode -enable_sim_debug -enable_sim_stdio -enable_sim_trace -enable_sim_profile enable_sim_inline with_pkgversion with_bugurl @@ -1421,13 +1417,6 @@ Optional Features: --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer - --enable-sim-debug=opts Enable debugging flags (for developers of the sim - itself) - --enable-sim-stdio Specify whether to use stdio for console - input/output - --enable-sim-trace=opts Enable tracing of simulated programs - --enable-sim-profile=opts - Enable profiling flags --enable-sim-inline=inlines Specify which functions should be inlined --enable-sim-endian=endian @@ -10779,7 +10768,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10782 "configure" +#line 10771 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10885,7 +10874,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10888 "configure" +#line 10877 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11125,8 +11114,6 @@ CC="$lt_save_CC" - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -11151,123 +11138,6 @@ 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="7";; - no) sim_debug="0";; - *) sim_debug="($enableval)";; -esac -fi -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="DO_USE_STDIO";; - no) sim_stdio="DONT_USE_STDIO";; - *) as_fn_error $? "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;; -esac -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="-1";; - no) sim_trace="0";; - [-0-9]*) - 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="(TRACE_$x" - else - sim_trace="${sim_trace}|TRACE_$x" - fi - done - sim_trace="$sim_trace)" ;; -esac -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) profile="1" sim_profile="-1";; - no) profile="0" sim_profile="0";; - [-0-9]*) - 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="(PROFILE_$x" - else - sim_profile="${sim_profile}|PROFILE_$x" - fi - done - sim_profile="$sim_profile)" ;; -esac -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; } - - - sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. if test "${enable_sim_inline+set}" = set; then : diff --git a/sim/msp430/config.in b/sim/msp430/config.in index b21bf7cd6b..29d1fe2ab9 100644 --- a/sim/msp430/config.in +++ b/sim/msp430/config.in @@ -3,9 +3,6 @@ /* 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 @@ -83,9 +80,6 @@ /* Additional package description */ #undef PKGVERSION -/* Sim profile settings */ -#undef PROFILE - /* Bug reporting address */ #undef REPORT_BUGS_TO @@ -114,18 +108,6 @@ #endif -/* Sim debug setting */ -#undef WITH_DEBUG - -/* 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 0877f01f1d..9b16f2fb10 100755 --- a/sim/msp430/configure +++ b/sim/msp430/configure @@ -771,10 +771,6 @@ enable_fast_install with_gnu_ld enable_libtool_lock enable_maintainer_mode -enable_sim_debug -enable_sim_stdio -enable_sim_trace -enable_sim_profile enable_sim_inline with_pkgversion with_bugurl @@ -1420,13 +1416,6 @@ Optional Features: --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer - --enable-sim-debug=opts Enable debugging flags (for developers of the sim - itself) - --enable-sim-stdio Specify whether to use stdio for console - input/output - --enable-sim-trace=opts Enable tracing of simulated programs - --enable-sim-profile=opts - Enable profiling flags --enable-sim-inline=inlines Specify which functions should be inlined --enable-sim-endian=endian @@ -10778,7 +10767,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10781 "configure" +#line 10770 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10884,7 +10873,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10887 "configure" +#line 10876 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11124,8 +11113,6 @@ CC="$lt_save_CC" - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -11150,123 +11137,6 @@ 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="7";; - no) sim_debug="0";; - *) sim_debug="($enableval)";; -esac -fi -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="DO_USE_STDIO";; - no) sim_stdio="DONT_USE_STDIO";; - *) as_fn_error $? "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;; -esac -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="-1";; - no) sim_trace="0";; - [-0-9]*) - 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="(TRACE_$x" - else - sim_trace="${sim_trace}|TRACE_$x" - fi - done - sim_trace="$sim_trace)" ;; -esac -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) profile="1" sim_profile="-1";; - no) profile="0" sim_profile="0";; - [-0-9]*) - 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="(PROFILE_$x" - else - sim_profile="${sim_profile}|PROFILE_$x" - fi - done - sim_profile="$sim_profile)" ;; -esac -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; } - - - sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. if test "${enable_sim_inline+set}" = set; then : diff --git a/sim/or1k/config.in b/sim/or1k/config.in index b21bf7cd6b..29d1fe2ab9 100644 --- a/sim/or1k/config.in +++ b/sim/or1k/config.in @@ -3,9 +3,6 @@ /* 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 @@ -83,9 +80,6 @@ /* Additional package description */ #undef PKGVERSION -/* Sim profile settings */ -#undef PROFILE - /* Bug reporting address */ #undef REPORT_BUGS_TO @@ -114,18 +108,6 @@ #endif -/* Sim debug setting */ -#undef WITH_DEBUG - -/* 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/or1k/configure b/sim/or1k/configure index 4d4a09c08a..88a1b0c2d5 100755 --- a/sim/or1k/configure +++ b/sim/or1k/configure @@ -774,10 +774,6 @@ enable_fast_install with_gnu_ld enable_libtool_lock enable_maintainer_mode -enable_sim_debug -enable_sim_stdio -enable_sim_trace -enable_sim_profile enable_sim_inline with_pkgversion with_bugurl @@ -1427,13 +1423,6 @@ Optional Features: --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer - --enable-sim-debug=opts Enable debugging flags (for developers of the sim - itself) - --enable-sim-stdio Specify whether to use stdio for console - input/output - --enable-sim-trace=opts Enable tracing of simulated programs - --enable-sim-profile=opts - Enable profiling flags --enable-sim-inline=inlines Specify which functions should be inlined --enable-sim-endian=endian @@ -10791,7 +10780,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10794 "configure" +#line 10783 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10897,7 +10886,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10900 "configure" +#line 10889 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11137,8 +11126,6 @@ CC="$lt_save_CC" - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -11163,123 +11150,6 @@ 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="7";; - no) sim_debug="0";; - *) sim_debug="($enableval)";; -esac -fi -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="DO_USE_STDIO";; - no) sim_stdio="DONT_USE_STDIO";; - *) as_fn_error $? "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;; -esac -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="-1";; - no) sim_trace="0";; - [-0-9]*) - 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="(TRACE_$x" - else - sim_trace="${sim_trace}|TRACE_$x" - fi - done - sim_trace="$sim_trace)" ;; -esac -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) profile="1" sim_profile="-1";; - no) profile="0" sim_profile="0";; - [-0-9]*) - 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="(PROFILE_$x" - else - sim_profile="${sim_profile}|PROFILE_$x" - fi - done - sim_profile="$sim_profile)" ;; -esac -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; } - - - sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. if test "${enable_sim_inline+set}" = set; then : diff --git a/sim/ppc/config.in b/sim/ppc/config.in index 2d3fbbdba3..02e6d94e94 100644 --- a/sim/ppc/config.in +++ b/sim/ppc/config.in @@ -84,12 +84,6 @@ /* Sim assert settings */ #undef WITH_ASSERT -/* 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 de2d28320a..49990a47a1 100755 --- a/sim/ppc/configure +++ b/sim/ppc/configure @@ -769,10 +769,8 @@ enable_sim_opcode enable_sim_packages enable_sim_reserved_bits enable_sim_smp -enable_sim_stdio enable_sim_switch enable_sim_timebase -enable_sim_trace enable_werror enable_sim_warnings enable_sim_xor_endian @@ -1431,10 +1429,8 @@ Optional Features: --enable-sim-packages=list Specify the packages to be included in the build. --enable-sim-reserved-bits Specify whether to check reserved bits in instruction. --enable-sim-smp=n Specify number of processors to configure for. - --enable-sim-stdio Specify whether to use stdio for console input/output. --enable-sim-switch Use a switch instead of a table for instruction call. --enable-sim-timebase Specify whether the PPC timebase is supported. - --enable-sim-trace Specify whether tracing is supported. --enable-werror treat compile warnings as errors --enable-sim-warnings=opts Extra CFLAGS for turning on compiler warnings except for idecode.o, semantics.o and psim.o --enable-sim-xor-endian=n Specify number bytes involved in PowerPC XOR bi-endian mode (default 8). @@ -4407,26 +4403,6 @@ 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="DO_USE_STDIO";; - no) sim_stdio="DONT_USE_STDIO";; - *) as_fn_error $? "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;; -esac -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 : enableval=$enable_sim_switch; case "${enableval}" in @@ -4460,26 +4436,6 @@ 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="1";; - no) sim_trace="0";; - *) as_fn_error $? "--enable-sim-trace does not take a value" "$LINENO" 5;; -esac -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-werror was given. if test "${enable_werror+set}" = set; then : enableval=$enable_werror; case "${enableval}" in diff --git a/sim/ppc/configure.ac b/sim/ppc/configure.ac index bf17622434..9783dcf407 100644 --- a/sim/ppc/configure.ac +++ b/sim/ppc/configure.ac @@ -519,19 +519,6 @@ 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="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, [ --enable-sim-switch Use a switch instead of a table for instruction call.], [case "${enableval}" in @@ -559,19 +546,6 @@ 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="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(werror, AS_HELP_STRING([--enable-werror], [treat compile warnings as errors]), [case "${enableval}" in diff --git a/sim/ppc/debug.h b/sim/ppc/debug.h index 6f19624179..08ea5795fd 100644 --- a/sim/ppc/debug.h +++ b/sim/ppc/debug.h @@ -169,5 +169,24 @@ trace_option(const char *option, int setting); extern void trace_usage (int verbose); +/* TODO: These values aren't currently used by the ppc port. They're here to + glue the common sim compile-time settings in. The ppc_trace settings above + would need to be overhauled. */ +#define TRACE_insn 1 +#define TRACE_disasm 1 +#define TRACE_decode 1 +#define TRACE_extract 1 +#define TRACE_linenum 1 +#define TRACE_memory 1 +#define TRACE_model 1 +#define TRACE_alu 1 +#define TRACE_core 1 +#define TRACE_events 1 +#define TRACE_fpu 1 +#define TRACE_vpu 1 +#define TRACE_branch 1 +#define TRACE_syscall 1 +#define TRACE_register 1 +#define TRACE_debug 1 #endif /* _DEBUG_H_ */ diff --git a/sim/pru/config.in b/sim/pru/config.in index b21bf7cd6b..29d1fe2ab9 100644 --- a/sim/pru/config.in +++ b/sim/pru/config.in @@ -3,9 +3,6 @@ /* 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 @@ -83,9 +80,6 @@ /* Additional package description */ #undef PKGVERSION -/* Sim profile settings */ -#undef PROFILE - /* Bug reporting address */ #undef REPORT_BUGS_TO @@ -114,18 +108,6 @@ #endif -/* Sim debug setting */ -#undef WITH_DEBUG - -/* 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/pru/configure b/sim/pru/configure index 0877f01f1d..9b16f2fb10 100755 --- a/sim/pru/configure +++ b/sim/pru/configure @@ -771,10 +771,6 @@ enable_fast_install with_gnu_ld enable_libtool_lock enable_maintainer_mode -enable_sim_debug -enable_sim_stdio -enable_sim_trace -enable_sim_profile enable_sim_inline with_pkgversion with_bugurl @@ -1420,13 +1416,6 @@ Optional Features: --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer - --enable-sim-debug=opts Enable debugging flags (for developers of the sim - itself) - --enable-sim-stdio Specify whether to use stdio for console - input/output - --enable-sim-trace=opts Enable tracing of simulated programs - --enable-sim-profile=opts - Enable profiling flags --enable-sim-inline=inlines Specify which functions should be inlined --enable-sim-endian=endian @@ -10778,7 +10767,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10781 "configure" +#line 10770 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10884,7 +10873,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10887 "configure" +#line 10876 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11124,8 +11113,6 @@ CC="$lt_save_CC" - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -11150,123 +11137,6 @@ 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="7";; - no) sim_debug="0";; - *) sim_debug="($enableval)";; -esac -fi -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="DO_USE_STDIO";; - no) sim_stdio="DONT_USE_STDIO";; - *) as_fn_error $? "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;; -esac -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="-1";; - no) sim_trace="0";; - [-0-9]*) - 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="(TRACE_$x" - else - sim_trace="${sim_trace}|TRACE_$x" - fi - done - sim_trace="$sim_trace)" ;; -esac -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) profile="1" sim_profile="-1";; - no) profile="0" sim_profile="0";; - [-0-9]*) - 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="(PROFILE_$x" - else - sim_profile="${sim_profile}|PROFILE_$x" - fi - done - sim_profile="$sim_profile)" ;; -esac -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; } - - - sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. if test "${enable_sim_inline+set}" = set; then : diff --git a/sim/riscv/config.in b/sim/riscv/config.in index b21bf7cd6b..29d1fe2ab9 100644 --- a/sim/riscv/config.in +++ b/sim/riscv/config.in @@ -3,9 +3,6 @@ /* 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 @@ -83,9 +80,6 @@ /* Additional package description */ #undef PKGVERSION -/* Sim profile settings */ -#undef PROFILE - /* Bug reporting address */ #undef REPORT_BUGS_TO @@ -114,18 +108,6 @@ #endif -/* Sim debug setting */ -#undef WITH_DEBUG - -/* 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/riscv/configure b/sim/riscv/configure index f405268e70..35e6edf4d1 100755 --- a/sim/riscv/configure +++ b/sim/riscv/configure @@ -771,10 +771,6 @@ enable_fast_install with_gnu_ld enable_libtool_lock enable_maintainer_mode -enable_sim_debug -enable_sim_stdio -enable_sim_trace -enable_sim_profile enable_sim_inline with_pkgversion with_bugurl @@ -1422,13 +1418,6 @@ Optional Features: --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer - --enable-sim-debug=opts Enable debugging flags (for developers of the sim - itself) - --enable-sim-stdio Specify whether to use stdio for console - input/output - --enable-sim-trace=opts Enable tracing of simulated programs - --enable-sim-profile=opts - Enable profiling flags --enable-sim-inline=inlines Specify which functions should be inlined --enable-sim-endian=endian @@ -10783,7 +10772,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10786 "configure" +#line 10775 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10889,7 +10878,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10892 "configure" +#line 10881 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11129,8 +11118,6 @@ CC="$lt_save_CC" - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -11155,123 +11142,6 @@ 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="7";; - no) sim_debug="0";; - *) sim_debug="($enableval)";; -esac -fi -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="DO_USE_STDIO";; - no) sim_stdio="DONT_USE_STDIO";; - *) as_fn_error $? "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;; -esac -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="-1";; - no) sim_trace="0";; - [-0-9]*) - 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="(TRACE_$x" - else - sim_trace="${sim_trace}|TRACE_$x" - fi - done - sim_trace="$sim_trace)" ;; -esac -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) profile="1" sim_profile="-1";; - no) profile="0" sim_profile="0";; - [-0-9]*) - 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="(PROFILE_$x" - else - sim_profile="${sim_profile}|PROFILE_$x" - fi - done - sim_profile="$sim_profile)" ;; -esac -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; } - - - sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. if test "${enable_sim_inline+set}" = set; then : diff --git a/sim/rl78/config.in b/sim/rl78/config.in index b21bf7cd6b..29d1fe2ab9 100644 --- a/sim/rl78/config.in +++ b/sim/rl78/config.in @@ -3,9 +3,6 @@ /* 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 @@ -83,9 +80,6 @@ /* Additional package description */ #undef PKGVERSION -/* Sim profile settings */ -#undef PROFILE - /* Bug reporting address */ #undef REPORT_BUGS_TO @@ -114,18 +108,6 @@ #endif -/* Sim debug setting */ -#undef WITH_DEBUG - -/* 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 22f01e85a0..d153041e8b 100755 --- a/sim/rl78/configure +++ b/sim/rl78/configure @@ -771,10 +771,6 @@ enable_fast_install with_gnu_ld enable_libtool_lock enable_maintainer_mode -enable_sim_debug -enable_sim_stdio -enable_sim_trace -enable_sim_profile enable_sim_inline with_pkgversion with_bugurl @@ -1418,13 +1414,6 @@ Optional Features: --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer - --enable-sim-debug=opts Enable debugging flags (for developers of the sim - itself) - --enable-sim-stdio Specify whether to use stdio for console - input/output - --enable-sim-trace=opts Enable tracing of simulated programs - --enable-sim-profile=opts - Enable profiling flags --enable-sim-inline=inlines Specify which functions should be inlined --enable-werror treat compile warnings as errors @@ -10771,7 +10760,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10774 "configure" +#line 10763 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10877,7 +10866,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10880 "configure" +#line 10869 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11117,8 +11106,6 @@ CC="$lt_save_CC" - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -11143,123 +11130,6 @@ 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="7";; - no) sim_debug="0";; - *) sim_debug="($enableval)";; -esac -fi -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="DO_USE_STDIO";; - no) sim_stdio="DONT_USE_STDIO";; - *) as_fn_error $? "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;; -esac -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="-1";; - no) sim_trace="0";; - [-0-9]*) - 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="(TRACE_$x" - else - sim_trace="${sim_trace}|TRACE_$x" - fi - done - sim_trace="$sim_trace)" ;; -esac -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) profile="1" sim_profile="-1";; - no) profile="0" sim_profile="0";; - [-0-9]*) - 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="(PROFILE_$x" - else - sim_profile="${sim_profile}|PROFILE_$x" - fi - done - sim_profile="$sim_profile)" ;; -esac -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; } - - - sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. if test "${enable_sim_inline+set}" = set; then : diff --git a/sim/rx/config.in b/sim/rx/config.in index 80c07e8305..af33a82976 100644 --- a/sim/rx/config.in +++ b/sim/rx/config.in @@ -9,9 +9,6 @@ /* --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 @@ -89,9 +86,6 @@ /* Additional package description */ #undef PKGVERSION -/* Sim profile settings */ -#undef PROFILE - /* Bug reporting address */ #undef REPORT_BUGS_TO @@ -120,18 +114,6 @@ #endif -/* Sim debug setting */ -#undef WITH_DEBUG - -/* 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 1acc8b2c96..1c0248526b 100755 --- a/sim/rx/configure +++ b/sim/rx/configure @@ -771,10 +771,6 @@ enable_fast_install with_gnu_ld enable_libtool_lock enable_maintainer_mode -enable_sim_debug -enable_sim_stdio -enable_sim_trace -enable_sim_profile enable_sim_inline with_pkgversion with_bugurl @@ -1420,13 +1416,6 @@ Optional Features: --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer - --enable-sim-debug=opts Enable debugging flags (for developers of the sim - itself) - --enable-sim-stdio Specify whether to use stdio for console - input/output - --enable-sim-trace=opts Enable tracing of simulated programs - --enable-sim-profile=opts - Enable profiling flags --enable-sim-inline=inlines Specify which functions should be inlined --disable-cycle-accurate @@ -10776,7 +10765,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10779 "configure" +#line 10768 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10882,7 +10871,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10885 "configure" +#line 10874 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11122,8 +11111,6 @@ CC="$lt_save_CC" - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -11148,123 +11135,6 @@ 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="7";; - no) sim_debug="0";; - *) sim_debug="($enableval)";; -esac -fi -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="DO_USE_STDIO";; - no) sim_stdio="DONT_USE_STDIO";; - *) as_fn_error $? "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;; -esac -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="-1";; - no) sim_trace="0";; - [-0-9]*) - 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="(TRACE_$x" - else - sim_trace="${sim_trace}|TRACE_$x" - fi - done - sim_trace="$sim_trace)" ;; -esac -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) profile="1" sim_profile="-1";; - no) profile="0" sim_profile="0";; - [-0-9]*) - 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="(PROFILE_$x" - else - sim_profile="${sim_profile}|PROFILE_$x" - fi - done - sim_profile="$sim_profile)" ;; -esac -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; } - - - sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. if test "${enable_sim_inline+set}" = set; then : diff --git a/sim/sh/config.in b/sim/sh/config.in index b21bf7cd6b..29d1fe2ab9 100644 --- a/sim/sh/config.in +++ b/sim/sh/config.in @@ -3,9 +3,6 @@ /* 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 @@ -83,9 +80,6 @@ /* Additional package description */ #undef PKGVERSION -/* Sim profile settings */ -#undef PROFILE - /* Bug reporting address */ #undef REPORT_BUGS_TO @@ -114,18 +108,6 @@ #endif -/* Sim debug setting */ -#undef WITH_DEBUG - -/* 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 84d533421b..0b548f798e 100755 --- a/sim/sh/configure +++ b/sim/sh/configure @@ -771,10 +771,6 @@ enable_fast_install with_gnu_ld enable_libtool_lock enable_maintainer_mode -enable_sim_debug -enable_sim_stdio -enable_sim_trace -enable_sim_profile enable_sim_inline with_pkgversion with_bugurl @@ -1420,13 +1416,6 @@ Optional Features: --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer - --enable-sim-debug=opts Enable debugging flags (for developers of the sim - itself) - --enable-sim-stdio Specify whether to use stdio for console - input/output - --enable-sim-trace=opts Enable tracing of simulated programs - --enable-sim-profile=opts - Enable profiling flags --enable-sim-inline=inlines Specify which functions should be inlined --enable-sim-endian=endian @@ -10778,7 +10767,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10781 "configure" +#line 10770 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10884,7 +10873,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10887 "configure" +#line 10876 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11124,8 +11113,6 @@ CC="$lt_save_CC" - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -11150,123 +11137,6 @@ 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="7";; - no) sim_debug="0";; - *) sim_debug="($enableval)";; -esac -fi -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="DO_USE_STDIO";; - no) sim_stdio="DONT_USE_STDIO";; - *) as_fn_error $? "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;; -esac -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="-1";; - no) sim_trace="0";; - [-0-9]*) - 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="(TRACE_$x" - else - sim_trace="${sim_trace}|TRACE_$x" - fi - done - sim_trace="$sim_trace)" ;; -esac -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) profile="1" sim_profile="-1";; - no) profile="0" sim_profile="0";; - [-0-9]*) - 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="(PROFILE_$x" - else - sim_profile="${sim_profile}|PROFILE_$x" - fi - done - sim_profile="$sim_profile)" ;; -esac -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; } - - - sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. if test "${enable_sim_inline+set}" = set; then : diff --git a/sim/v850/config.in b/sim/v850/config.in index b21bf7cd6b..29d1fe2ab9 100644 --- a/sim/v850/config.in +++ b/sim/v850/config.in @@ -3,9 +3,6 @@ /* 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 @@ -83,9 +80,6 @@ /* Additional package description */ #undef PKGVERSION -/* Sim profile settings */ -#undef PROFILE - /* Bug reporting address */ #undef REPORT_BUGS_TO @@ -114,18 +108,6 @@ #endif -/* Sim debug setting */ -#undef WITH_DEBUG - -/* 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 925a4a120b..e298dbd8d4 100755 --- a/sim/v850/configure +++ b/sim/v850/configure @@ -771,10 +771,6 @@ enable_fast_install with_gnu_ld enable_libtool_lock enable_maintainer_mode -enable_sim_debug -enable_sim_stdio -enable_sim_trace -enable_sim_profile enable_sim_inline with_pkgversion with_bugurl @@ -1422,13 +1418,6 @@ Optional Features: --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer - --enable-sim-debug=opts Enable debugging flags (for developers of the sim - itself) - --enable-sim-stdio Specify whether to use stdio for console - input/output - --enable-sim-trace=opts Enable tracing of simulated programs - --enable-sim-profile=opts - Enable profiling flags --enable-sim-inline=inlines Specify which functions should be inlined --enable-sim-endian=endian @@ -10784,7 +10773,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10787 "configure" +#line 10776 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10890,7 +10879,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10893 "configure" +#line 10882 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11130,8 +11119,6 @@ CC="$lt_save_CC" - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -11156,123 +11143,6 @@ 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="7";; - no) sim_debug="0";; - *) sim_debug="($enableval)";; -esac -fi -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="DO_USE_STDIO";; - no) sim_stdio="DONT_USE_STDIO";; - *) as_fn_error $? "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;; -esac -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="-1";; - no) sim_trace="0";; - [-0-9]*) - 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="(TRACE_$x" - else - sim_trace="${sim_trace}|TRACE_$x" - fi - done - sim_trace="$sim_trace)" ;; -esac -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) profile="1" sim_profile="-1";; - no) profile="0" sim_profile="0";; - [-0-9]*) - 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="(PROFILE_$x" - else - sim_profile="${sim_profile}|PROFILE_$x" - fi - done - sim_profile="$sim_profile)" ;; -esac -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; } - - - sim_inline="-DDEFAULT_INLINE=0" # Check whether --enable-sim-inline was given. if test "${enable_sim_inline+set}" = set; then : |