[binutils-gdb] sim: unify debug/stdio/trace/profile build settings

Michael Frysinger vapier@sourceware.org
Sun Jun 13 00:09:53 GMT 2021


https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=04381273a9ea0cf30575d58983287cd950b3e166

commit 04381273a9ea0cf30575d58983287cd950b3e166
Author: Mike Frysinger <vapier@gentoo.org>
Date:   Sun Jun 6 20:35:02 2021 -0400

    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.

Diff:
---
 sim/ChangeLog                 |   8 +++
 sim/Makefile.in               |   4 ++
 sim/aarch64/config.in         |  18 ------
 sim/aarch64/configure         | 134 +-----------------------------------------
 sim/aclocal.m4                |   4 ++
 sim/arm/config.in             |  18 ------
 sim/arm/configure             | 134 +-----------------------------------------
 sim/avr/config.in             |  18 ------
 sim/avr/configure             | 134 +-----------------------------------------
 sim/bfin/config.in            |  18 ------
 sim/bfin/configure            | 134 +-----------------------------------------
 sim/bpf/config.in             |  18 ------
 sim/bpf/configure             | 134 +-----------------------------------------
 sim/config.h.in               |  18 ++++++
 sim/configure                 | 123 ++++++++++++++++++++++++++++++++++++++
 sim/configure.ac              |   6 ++
 sim/cr16/config.in            |  18 ------
 sim/cr16/configure            | 134 +-----------------------------------------
 sim/cris/config.in            |  18 ------
 sim/cris/configure            | 134 +-----------------------------------------
 sim/d10v/config.in            |  18 ------
 sim/d10v/configure            | 134 +-----------------------------------------
 sim/erc32/config.in           |  18 ------
 sim/erc32/configure           | 134 +-----------------------------------------
 sim/example-synacor/config.in |  18 ------
 sim/example-synacor/configure | 134 +-----------------------------------------
 sim/frv/config.in             |  18 ------
 sim/frv/configure             | 134 +-----------------------------------------
 sim/ft32/config.in            |  18 ------
 sim/ft32/configure            | 134 +-----------------------------------------
 sim/h8300/config.in           |  18 ------
 sim/h8300/configure           | 134 +-----------------------------------------
 sim/iq2000/config.in          |  18 ------
 sim/iq2000/configure          | 134 +-----------------------------------------
 sim/lm32/config.in            |  18 ------
 sim/lm32/configure            | 134 +-----------------------------------------
 sim/m32c/config.in            |  18 ------
 sim/m32c/configure            | 134 +-----------------------------------------
 sim/m32r/config.in            |  18 ------
 sim/m32r/configure            | 134 +-----------------------------------------
 sim/m4/sim_ac_common.m4       |  16 -----
 sim/m68hc11/config.in         |  18 ------
 sim/m68hc11/configure         | 134 +-----------------------------------------
 sim/mcore/config.in           |  18 ------
 sim/mcore/configure           | 134 +-----------------------------------------
 sim/microblaze/config.in      |  18 ------
 sim/microblaze/configure      | 134 +-----------------------------------------
 sim/mips/config.in            |  18 ------
 sim/mips/configure            | 134 +-----------------------------------------
 sim/mn10300/config.in         |  18 ------
 sim/mn10300/configure         | 134 +-----------------------------------------
 sim/moxie/config.in           |  18 ------
 sim/moxie/configure           | 134 +-----------------------------------------
 sim/msp430/config.in          |  18 ------
 sim/msp430/configure          | 134 +-----------------------------------------
 sim/or1k/config.in            |  18 ------
 sim/or1k/configure            | 134 +-----------------------------------------
 sim/ppc/config.in             |   6 --
 sim/ppc/configure             |  44 --------------
 sim/ppc/configure.ac          |  26 --------
 sim/ppc/debug.h               |  19 ++++++
 sim/pru/config.in             |  18 ------
 sim/pru/configure             | 134 +-----------------------------------------
 sim/riscv/config.in           |  18 ------
 sim/riscv/configure           | 134 +-----------------------------------------
 sim/rl78/config.in            |  18 ------
 sim/rl78/configure            | 134 +-----------------------------------------
 sim/rx/config.in              |  18 ------
 sim/rx/configure              | 134 +-----------------------------------------
 sim/sh/config.in              |  18 ------
 sim/sh/configure              | 134 +-----------------------------------------
 sim/v850/config.in            |  18 ------
 sim/v850/configure            | 134 +-----------------------------------------
 73 files changed, 244 insertions(+), 4742 deletions(-)

diff --git a/sim/ChangeLog b/sim/ChangeLog
index 07a974ff5fc..b9616110e06 100644
--- a/sim/ChangeLog
+++ b/sim/ChangeLog
@@ -1,3 +1,11 @@
+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,
diff --git a/sim/Makefile.in b/sim/Makefile.in
index c8b52493f4e..6df3d67d200 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 b21bf7cd6b5..29d1fe2ab99 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 5269d6db77d..4c47bdcfcf7 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 4b6eb267ad4..3c639f0edfc 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 b21bf7cd6b5..29d1fe2ab99 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 48f24aaa569..9ecbc24f8ad 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 b21bf7cd6b5..29d1fe2ab99 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 0877f01f1d9..9b16f2fb105 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 b21bf7cd6b5..29d1fe2ab99 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 30fd48ac552..0b3ea4a73d0 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 b21bf7cd6b5..29d1fe2ab99 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 375916b98c7..87a79e1a7e4 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 4ca8fc690a4..8d7923e5348 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 aac219bd096..c9e4d6fcd41 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 ecf12b57a19..d8c6f2d4feb 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 b21bf7cd6b5..29d1fe2ab99 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 b8e51ce59cc..50b302e7e84 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 b21bf7cd6b5..29d1fe2ab99 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 9312f2711c2..fa8aed58efc 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 b21bf7cd6b5..29d1fe2ab99 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 1a5c3a02324..e605546d584 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 b21bf7cd6b5..29d1fe2ab99 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 160189df464..23fc3dc1805 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 b21bf7cd6b5..29d1fe2ab99 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 eb7a968b9ea..1cd1af911fa 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 b21bf7cd6b5..29d1fe2ab99 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 c4eedf22287..d2f72d61628 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 b21bf7cd6b5..29d1fe2ab99 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 f99d0c5f7ce..0a5678cf41f 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 b21bf7cd6b5..29d1fe2ab99 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 17b04353d14..9caaf0a1c35 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 b21bf7cd6b5..29d1fe2ab99 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 43e4a18c203..5ac8ba9f2df 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 b21bf7cd6b5..29d1fe2ab99 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 nat[...]

[diff truncated at 100000 bytes]


More information about the Gdb-cvs mailing list