This is the mail archive of the
gdb-cvs@sourceware.org
mailing list for the GDB project.
[binutils-gdb] sim: move many common settings from CPPFLAGS to config.h
- From: Michael Frysinger <vapier at sourceware dot org>
- To: gdb-cvs at sourceware dot org
- Date: 10 Jan 2016 23:56:45 -0000
- Subject: [binutils-gdb] sim: move many common settings from CPPFLAGS to config.h
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=ce39bd389039d99458950b072550ab52f0a07a34
commit ce39bd389039d99458950b072550ab52f0a07a34
Author: Mike Frysinger <vapier@gentoo.org>
Date: Sat Jan 9 04:09:35 2016 -0500
sim: move many common settings from CPPFLAGS to config.h
Rather than stuffing the command line with a bunch of -D flags, start
moving things to config.h which is managed by autoheader. This makes
the makefile a bit simpler and the build output tighter, and it makes
the migration to automake easier as there are fewer vars to juggle.
We'll want to move the other options out too, but it'll take more work.
Diff:
---
sim/aarch64/ChangeLog | 4 ++
sim/aarch64/config.in | 24 +++++++
sim/aarch64/configure | 164 +++++++++++++++++++++++++++-------------------
sim/arm/ChangeLog | 4 ++
sim/arm/config.in | 24 +++++++
sim/arm/configure | 164 +++++++++++++++++++++++++++-------------------
sim/avr/ChangeLog | 4 ++
sim/avr/config.in | 24 +++++++
sim/avr/configure | 164 +++++++++++++++++++++++++++-------------------
sim/bfin/ChangeLog | 4 ++
sim/bfin/config.in | 24 +++++++
sim/bfin/configure | 164 +++++++++++++++++++++++++++-------------------
sim/common/ChangeLog | 22 +++++++
sim/common/Make-common.in | 14 ----
sim/common/acinclude.m4 | 155 ++++++++++++++++++++++---------------------
sim/common/configure | 6 +-
sim/common/sim-config.c | 3 +-
sim/common/sim-config.h | 52 ---------------
sim/common/sim-options.c | 2 -
sim/cr16/ChangeLog | 4 ++
sim/cr16/config.in | 24 +++++++
sim/cr16/configure | 164 +++++++++++++++++++++++++++-------------------
sim/cris/ChangeLog | 4 ++
sim/cris/config.in | 24 +++++++
sim/cris/configure | 164 +++++++++++++++++++++++++++-------------------
sim/d10v/ChangeLog | 4 ++
sim/d10v/config.in | 24 +++++++
sim/d10v/configure | 164 +++++++++++++++++++++++++++-------------------
sim/erc32/ChangeLog | 4 ++
sim/erc32/config.in | 24 +++++++
sim/erc32/configure | 164 +++++++++++++++++++++++++++-------------------
sim/frv/ChangeLog | 4 ++
sim/frv/config.in | 24 +++++++
sim/frv/configure | 164 +++++++++++++++++++++++++++-------------------
sim/ft32/ChangeLog | 4 ++
sim/ft32/config.in | 24 +++++++
sim/ft32/configure | 164 +++++++++++++++++++++++++++-------------------
sim/h8300/ChangeLog | 4 ++
sim/h8300/config.in | 24 +++++++
sim/h8300/configure | 164 +++++++++++++++++++++++++++-------------------
sim/igen/ChangeLog | 4 ++
sim/igen/configure | 8 ---
sim/iq2000/ChangeLog | 4 ++
sim/iq2000/config.in | 24 +++++++
sim/iq2000/configure | 164 +++++++++++++++++++++++++++-------------------
sim/lm32/ChangeLog | 4 ++
sim/lm32/config.in | 24 +++++++
sim/lm32/configure | 164 +++++++++++++++++++++++++++-------------------
sim/m32c/ChangeLog | 4 ++
sim/m32c/config.in | 24 +++++++
sim/m32c/configure | 164 +++++++++++++++++++++++++++-------------------
sim/m32r/ChangeLog | 4 ++
sim/m32r/config.in | 24 +++++++
sim/m32r/configure | 164 +++++++++++++++++++++++++++-------------------
sim/m68hc11/ChangeLog | 4 ++
sim/m68hc11/config.in | 24 +++++++
sim/m68hc11/configure | 164 +++++++++++++++++++++++++++-------------------
sim/mcore/ChangeLog | 4 ++
sim/mcore/config.in | 24 +++++++
sim/mcore/configure | 164 +++++++++++++++++++++++++++-------------------
sim/microblaze/ChangeLog | 4 ++
sim/microblaze/config.in | 24 +++++++
sim/microblaze/configure | 164 +++++++++++++++++++++++++++-------------------
sim/mips/ChangeLog | 4 ++
sim/mips/config.in | 24 +++++++
sim/mips/configure | 164 +++++++++++++++++++++++++++-------------------
sim/mn10300/ChangeLog | 4 ++
sim/mn10300/config.in | 24 +++++++
sim/mn10300/configure | 164 +++++++++++++++++++++++++++-------------------
sim/moxie/ChangeLog | 4 ++
sim/moxie/config.in | 24 +++++++
sim/moxie/configure | 164 +++++++++++++++++++++++++++-------------------
sim/msp430/ChangeLog | 4 ++
sim/msp430/config.in | 24 +++++++
sim/msp430/configure | 164 +++++++++++++++++++++++++++-------------------
sim/ppc/ChangeLog | 13 ++++
sim/ppc/Makefile.in | 8 ---
sim/ppc/config.in | 12 ++++
sim/ppc/configure | 105 +++++++++++++++--------------
sim/ppc/configure.ac | 68 +++++++++----------
sim/ppc/std-config.h | 22 -------
sim/rl78/ChangeLog | 4 ++
sim/rl78/config.in | 24 +++++++
sim/rl78/configure | 164 +++++++++++++++++++++++++++-------------------
sim/rx/ChangeLog | 4 ++
sim/rx/config.in | 24 +++++++
sim/rx/configure | 164 +++++++++++++++++++++++++++-------------------
sim/sh/ChangeLog | 4 ++
sim/sh/config.in | 24 +++++++
sim/sh/configure | 164 +++++++++++++++++++++++++++-------------------
sim/sh64/ChangeLog | 4 ++
sim/sh64/config.in | 24 +++++++
sim/sh64/configure | 164 +++++++++++++++++++++++++++-------------------
sim/v850/ChangeLog | 4 ++
sim/v850/config.in | 24 +++++++
sim/v850/configure | 164 +++++++++++++++++++++++++++-------------------
96 files changed, 3571 insertions(+), 2107 deletions(-)
diff --git a/sim/aarch64/ChangeLog b/sim/aarch64/ChangeLog
index 5cac849..115b528 100644
--- a/sim/aarch64/ChangeLog
+++ b/sim/aarch64/ChangeLog
@@ -1,5 +1,9 @@
2016-01-10 Mike Frysinger <vapier@gentoo.org>
+ * config.in, configure: Regenerate.
+
+2016-01-10 Mike Frysinger <vapier@gentoo.org>
+
* configure: Regenerate.
2016-01-10 Mike Frysinger <vapier@gentoo.org>
diff --git a/sim/aarch64/config.in b/sim/aarch64/config.in
index f24eb3b..aa3e45c 100644
--- a/sim/aarch64/config.in
+++ b/sim/aarch64/config.in
@@ -3,6 +3,9 @@
/* Define if building universal (internal helper macro) */
#undef AC_APPLE_UNIVERSAL_BUILD
+/* Sim debug setting */
+#undef DEBUG
+
/* Define to 1 if translation of program messages to the user's native
language is requested. */
#undef ENABLE_NLS
@@ -170,6 +173,9 @@
/* Additional package description */
#undef PKGVERSION
+/* Sim profile settings */
+#undef PROFILE
+
/* Bug reporting address */
#undef REPORT_BUGS_TO
@@ -201,6 +207,24 @@
#endif
+/* Sim assert settings */
+#undef WITH_ASSERT
+
+/* Sim debug setting */
+#undef WITH_DEBUG
+
+/* Sim default environment */
+#undef WITH_ENVIRONMENT
+
+/* Sim profile settings */
+#undef WITH_PROFILE
+
+/* How to route I/O */
+#undef WITH_STDIO
+
+/* Sim trace settings */
+#undef WITH_TRACE
+
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
significant byte first (like Motorola and SPARC, unlike Intel). */
#if defined AC_APPLE_UNIVERSAL_BUILD
diff --git a/sim/aarch64/configure b/sim/aarch64/configure
index 70ca0d5..fa4cf92 100755
--- a/sim/aarch64/configure
+++ b/sim/aarch64/configure
@@ -604,10 +604,6 @@ cgen_breaks
REPORT_BUGS_TEXI
REPORT_BUGS_TO
PKGVERSION
-sim_profile
-sim_trace
-sim_stdio
-sim_debug
MAINT
MAINTAINER_MODE_FALSE
MAINTAINER_MODE_TRUE
@@ -682,8 +678,6 @@ CFLAGS
CC
WERROR_CFLAGS
WARN_CFLAGS
-sim_xor_endian
-sim_smp
sim_reserved_bits
sim_inline
sim_hw
@@ -694,9 +688,7 @@ sim_scache
sim_float
sim_endian
sim_bitsize
-sim_assert
sim_alignment
-sim_environment
target_alias
host_alias
build_alias
@@ -4032,10 +4024,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-
# intl sister-directory configuration rules.
#
@@ -12843,7 +12831,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12846 "configure"
+#line 12834 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12949,7 +12937,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12952 "configure"
+#line 12940 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13217,124 +13205,164 @@ fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim debug setting" >&5
+$as_echo_n "checking for sim debug setting... " >&6; }
+sim_debug="0"
# Check whether --enable-sim-debug was given.
if test "${enable_sim_debug+set}" = set; then :
enableval=$enable_sim_debug; case "${enableval}" in
- yes) sim_debug="-DDEBUG=7 -DWITH_DEBUG=7";;
- no) sim_debug="-DDEBUG=0 -DWITH_DEBUG=0";;
- *) sim_debug="-DDEBUG='(${enableval})' -DWITH_DEBUG='(${enableval})'";;
+ yes) sim_debug="7";;
+ no) sim_debug="0";;
+ *) sim_debug="($enableval)";;
esac
-if test x"$silent" != x"yes" && test x"$sim_debug" != x""; then
- echo "Setting sim debug = $sim_debug" 6>&1
fi
-else
- sim_debug=""
+if test "$sim_debug" != "0"; then
+
+cat >>confdefs.h <<_ACEOF
+#define DEBUG $sim_debug
+_ACEOF
+
fi
+cat >>confdefs.h <<_ACEOF
+#define WITH_DEBUG $sim_debug
+_ACEOF
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_debug" >&5
+$as_echo "$sim_debug" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim stdio debug behavior" >&5
+$as_echo_n "checking for sim stdio debug behavior... " >&6; }
+sim_stdio="0"
# Check whether --enable-sim-stdio was given.
if test "${enable_sim_stdio+set}" = set; then :
enableval=$enable_sim_stdio; case "${enableval}" in
- yes) sim_stdio="-DWITH_STDIO=DO_USE_STDIO";;
- no) sim_stdio="-DWITH_STDIO=DONT_USE_STDIO";;
- *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-stdio\"" "$LINENO" 5; sim_stdio="";;
+ yes) sim_stdio="DO_USE_STDIO";;
+ no) sim_stdio="DONT_USE_STDIO";;
+ *) as_fn_error "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;;
esac
-if test x"$silent" != x"yes" && test x"$sim_stdio" != x""; then
- echo "Setting stdio flags = $sim_stdio" 6>&1
-fi
-else
- sim_stdio=""
fi
+cat >>confdefs.h <<_ACEOF
+#define WITH_STDIO $sim_stdio
+_ACEOF
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_stdio" >&5
+$as_echo "$sim_stdio" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim trace settings" >&5
+$as_echo_n "checking for sim trace settings... " >&6; }
+sim_trace="~TRACE_debug"
# Check whether --enable-sim-trace was given.
if test "${enable_sim_trace+set}" = set; then :
enableval=$enable_sim_trace; case "${enableval}" in
- yes) sim_trace="-DWITH_TRACE=-1";;
- no) sim_trace="-DWITH_TRACE=0";;
+ yes) sim_trace="-1";;
+ no) sim_trace="0";;
[-0-9]*)
- sim_trace="-DWITH_TRACE='(${enableval})'";;
+ sim_trace="'(${enableval})'";;
[[:lower:]]*)
sim_trace=""
for x in `echo "$enableval" | sed -e "s/,/ /g"`; do
if test x"$sim_trace" = x; then
- sim_trace="-DWITH_TRACE='(TRACE_$x"
+ sim_trace="(TRACE_$x"
else
sim_trace="${sim_trace}|TRACE_$x"
fi
done
- sim_trace="$sim_trace)'" ;;
+ sim_trace="$sim_trace)" ;;
esac
-if test x"$silent" != x"yes" && test x"$sim_trace" != x""; then
- echo "Setting sim trace = $sim_trace" 6>&1
-fi
-else
- sim_trace=""
fi
+cat >>confdefs.h <<_ACEOF
+#define WITH_TRACE $sim_trace
+_ACEOF
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_trace" >&5
+$as_echo "$sim_trace" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim profile settings" >&5
+$as_echo_n "checking for sim profile settings... " >&6; }
+profile="1"
+sim_profile="-1"
# Check whether --enable-sim-profile was given.
if test "${enable_sim_profile+set}" = set; then :
enableval=$enable_sim_profile; case "${enableval}" in
- yes) sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1";;
- no) sim_profile="-DPROFILE=0 -DWITH_PROFILE=0";;
+ yes) profile="1" sim_profile="-1";;
+ no) profile="0" sim_profile="0";;
[-0-9]*)
- sim_profile="-DPROFILE='(${enableval})' -DWITH_PROFILE='(${enableval})'";;
+ profile="(${enableval})" sim_profile="(${enableval})";;
[a-z]*)
+ profile="1"
sim_profile=""
for x in `echo "$enableval" | sed -e "s/,/ /g"`; do
if test x"$sim_profile" = x; then
- sim_profile="-DWITH_PROFILE='(PROFILE_$x"
+ sim_profile="(PROFILE_$x"
else
sim_profile="${sim_profile}|PROFILE_$x"
fi
done
- sim_profile="$sim_profile)'" ;;
+ sim_profile="$sim_profile)" ;;
esac
-if test x"$silent" != x"yes" && test x"$sim_profile" != x""; then
- echo "Setting sim profile = $sim_profile" 6>&1
-fi
-else
- sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1"
fi
+cat >>confdefs.h <<_ACEOF
+#define PROFILE $profile
+_ACEOF
+cat >>confdefs.h <<_ACEOF
+#define WITH_PROFILE $sim_profile
+_ACEOF
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_profile" >&5
+$as_echo "$sim_profile" >&6; }
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable sim asserts" >&5
+$as_echo_n "checking whether to enable sim asserts... " >&6; }
+sim_assert="1"
# Check whether --enable-sim-assert was given.
if test "${enable_sim_assert+set}" = set; then :
enableval=$enable_sim_assert; case "${enableval}" in
- yes) sim_assert="-DWITH_ASSERT=1";;
- no) sim_assert="-DWITH_ASSERT=0";;
- *) as_fn_error "\"--enable-sim-assert does not take a value\"" "$LINENO" 5; sim_assert="";;
+ yes) sim_assert="1";;
+ no) sim_assert="0";;
+ *) as_fn_error "--enable-sim-assert does not take a value" "$LINENO" 5;;
esac
-if test x"$silent" != x"yes" && test x"$sim_assert" != x""; then
- echo "Setting assert flags = $sim_assert" 6>&1
-fi
-else
- sim_assert=""
fi
+cat >>confdefs.h <<_ACEOF
+#define WITH_ASSERT $sim_assert
+_ACEOF
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_assert" >&5
+$as_echo "$sim_assert" >&6; }
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking default sim environment setting" >&5
+$as_echo_n "checking default sim environment setting... " >&6; }
+sim_environment="ALL_ENVIRONMENT"
# Check whether --enable-sim-environment was given.
if test "${enable_sim_environment+set}" = set; then :
enableval=$enable_sim_environment; case "${enableval}" in
- all | ALL) sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT";;
- user | USER) sim_environment="-DWITH_ENVIRONMENT=USER_ENVIRONMENT";;
- virtual | VIRTUAL) sim_environment="-DWITH_ENVIRONMENT=VIRTUAL_ENVIRONMENT";;
- operating | OPERATING) sim_environment="-DWITH_ENVIRONMENT=OPERATING_ENVIRONMENT";;
- *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-environment\"" "$LINENO" 5;
- sim_environment="";;
+ all | ALL) sim_environment="ALL_ENVIRONMENT";;
+ user | USER) sim_environment="USER_ENVIRONMENT";;
+ virtual | VIRTUAL) sim_environment="VIRTUAL_ENVIRONMENT";;
+ operating | OPERATING) sim_environment="OPERATING_ENVIRONMENT";;
+ *) as_fn_error "Unknown value $enableval passed to --enable-sim-environment" "$LINENO" 5;;
esac
-if test x"$silent" != x"yes" && test x"$sim_environment" != x""; then
- echo "Setting sim environment = $sim_environment" 6>&1
-fi
-else
- sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT"
fi
+cat >>confdefs.h <<_ACEOF
+#define WITH_ENVIRONMENT $sim_environment
+_ACEOF
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_environment" >&5
+$as_echo "$sim_environment" >&6; }
+
sim_inline="-DDEFAULT_INLINE=0"
# Check whether --enable-sim-inline was given.
diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog
index 1e99d0c..cae6f52 100644
--- a/sim/arm/ChangeLog
+++ b/sim/arm/ChangeLog
@@ -1,5 +1,9 @@
2016-01-10 Mike Frysinger <vapier@gentoo.org>
+ * config.in, configure: Regenerate.
+
+2016-01-10 Mike Frysinger <vapier@gentoo.org>
+
* configure: Regenerate.
2016-01-10 Mike Frysinger <vapier@gentoo.org>
diff --git a/sim/arm/config.in b/sim/arm/config.in
index f24eb3b..aa3e45c 100644
--- a/sim/arm/config.in
+++ b/sim/arm/config.in
@@ -3,6 +3,9 @@
/* Define if building universal (internal helper macro) */
#undef AC_APPLE_UNIVERSAL_BUILD
+/* Sim debug setting */
+#undef DEBUG
+
/* Define to 1 if translation of program messages to the user's native
language is requested. */
#undef ENABLE_NLS
@@ -170,6 +173,9 @@
/* Additional package description */
#undef PKGVERSION
+/* Sim profile settings */
+#undef PROFILE
+
/* Bug reporting address */
#undef REPORT_BUGS_TO
@@ -201,6 +207,24 @@
#endif
+/* Sim assert settings */
+#undef WITH_ASSERT
+
+/* Sim debug setting */
+#undef WITH_DEBUG
+
+/* Sim default environment */
+#undef WITH_ENVIRONMENT
+
+/* Sim profile settings */
+#undef WITH_PROFILE
+
+/* How to route I/O */
+#undef WITH_STDIO
+
+/* Sim trace settings */
+#undef WITH_TRACE
+
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
significant byte first (like Motorola and SPARC, unlike Intel). */
#if defined AC_APPLE_UNIVERSAL_BUILD
diff --git a/sim/arm/configure b/sim/arm/configure
index c16d784..e177055 100755
--- a/sim/arm/configure
+++ b/sim/arm/configure
@@ -604,10 +604,6 @@ cgen_breaks
REPORT_BUGS_TEXI
REPORT_BUGS_TO
PKGVERSION
-sim_profile
-sim_trace
-sim_stdio
-sim_debug
MAINT
MAINTAINER_MODE_FALSE
MAINTAINER_MODE_TRUE
@@ -682,8 +678,6 @@ CFLAGS
CC
WERROR_CFLAGS
WARN_CFLAGS
-sim_xor_endian
-sim_smp
sim_reserved_bits
sim_inline
sim_hw
@@ -694,9 +688,7 @@ sim_scache
sim_float
sim_endian
sim_bitsize
-sim_assert
sim_alignment
-sim_environment
target_alias
host_alias
build_alias
@@ -4032,10 +4024,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-
# intl sister-directory configuration rules.
#
@@ -12843,7 +12831,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12846 "configure"
+#line 12834 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12949,7 +12937,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12952 "configure"
+#line 12940 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13217,124 +13205,164 @@ fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim debug setting" >&5
+$as_echo_n "checking for sim debug setting... " >&6; }
+sim_debug="0"
# Check whether --enable-sim-debug was given.
if test "${enable_sim_debug+set}" = set; then :
enableval=$enable_sim_debug; case "${enableval}" in
- yes) sim_debug="-DDEBUG=7 -DWITH_DEBUG=7";;
- no) sim_debug="-DDEBUG=0 -DWITH_DEBUG=0";;
- *) sim_debug="-DDEBUG='(${enableval})' -DWITH_DEBUG='(${enableval})'";;
+ yes) sim_debug="7";;
+ no) sim_debug="0";;
+ *) sim_debug="($enableval)";;
esac
-if test x"$silent" != x"yes" && test x"$sim_debug" != x""; then
- echo "Setting sim debug = $sim_debug" 6>&1
fi
-else
- sim_debug=""
+if test "$sim_debug" != "0"; then
+
+cat >>confdefs.h <<_ACEOF
+#define DEBUG $sim_debug
+_ACEOF
+
fi
+cat >>confdefs.h <<_ACEOF
+#define WITH_DEBUG $sim_debug
+_ACEOF
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_debug" >&5
+$as_echo "$sim_debug" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim stdio debug behavior" >&5
+$as_echo_n "checking for sim stdio debug behavior... " >&6; }
+sim_stdio="0"
# Check whether --enable-sim-stdio was given.
if test "${enable_sim_stdio+set}" = set; then :
enableval=$enable_sim_stdio; case "${enableval}" in
- yes) sim_stdio="-DWITH_STDIO=DO_USE_STDIO";;
- no) sim_stdio="-DWITH_STDIO=DONT_USE_STDIO";;
- *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-stdio\"" "$LINENO" 5; sim_stdio="";;
+ yes) sim_stdio="DO_USE_STDIO";;
+ no) sim_stdio="DONT_USE_STDIO";;
+ *) as_fn_error "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;;
esac
-if test x"$silent" != x"yes" && test x"$sim_stdio" != x""; then
- echo "Setting stdio flags = $sim_stdio" 6>&1
-fi
-else
- sim_stdio=""
fi
+cat >>confdefs.h <<_ACEOF
+#define WITH_STDIO $sim_stdio
+_ACEOF
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_stdio" >&5
+$as_echo "$sim_stdio" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim trace settings" >&5
+$as_echo_n "checking for sim trace settings... " >&6; }
+sim_trace="~TRACE_debug"
# Check whether --enable-sim-trace was given.
if test "${enable_sim_trace+set}" = set; then :
enableval=$enable_sim_trace; case "${enableval}" in
- yes) sim_trace="-DWITH_TRACE=-1";;
- no) sim_trace="-DWITH_TRACE=0";;
+ yes) sim_trace="-1";;
+ no) sim_trace="0";;
[-0-9]*)
- sim_trace="-DWITH_TRACE='(${enableval})'";;
+ sim_trace="'(${enableval})'";;
[[:lower:]]*)
sim_trace=""
for x in `echo "$enableval" | sed -e "s/,/ /g"`; do
if test x"$sim_trace" = x; then
- sim_trace="-DWITH_TRACE='(TRACE_$x"
+ sim_trace="(TRACE_$x"
else
sim_trace="${sim_trace}|TRACE_$x"
fi
done
- sim_trace="$sim_trace)'" ;;
+ sim_trace="$sim_trace)" ;;
esac
-if test x"$silent" != x"yes" && test x"$sim_trace" != x""; then
- echo "Setting sim trace = $sim_trace" 6>&1
-fi
-else
- sim_trace=""
fi
+cat >>confdefs.h <<_ACEOF
+#define WITH_TRACE $sim_trace
+_ACEOF
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_trace" >&5
+$as_echo "$sim_trace" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim profile settings" >&5
+$as_echo_n "checking for sim profile settings... " >&6; }
+profile="1"
+sim_profile="-1"
# Check whether --enable-sim-profile was given.
if test "${enable_sim_profile+set}" = set; then :
enableval=$enable_sim_profile; case "${enableval}" in
- yes) sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1";;
- no) sim_profile="-DPROFILE=0 -DWITH_PROFILE=0";;
+ yes) profile="1" sim_profile="-1";;
+ no) profile="0" sim_profile="0";;
[-0-9]*)
- sim_profile="-DPROFILE='(${enableval})' -DWITH_PROFILE='(${enableval})'";;
+ profile="(${enableval})" sim_profile="(${enableval})";;
[a-z]*)
+ profile="1"
sim_profile=""
for x in `echo "$enableval" | sed -e "s/,/ /g"`; do
if test x"$sim_profile" = x; then
- sim_profile="-DWITH_PROFILE='(PROFILE_$x"
+ sim_profile="(PROFILE_$x"
else
sim_profile="${sim_profile}|PROFILE_$x"
fi
done
- sim_profile="$sim_profile)'" ;;
+ sim_profile="$sim_profile)" ;;
esac
-if test x"$silent" != x"yes" && test x"$sim_profile" != x""; then
- echo "Setting sim profile = $sim_profile" 6>&1
-fi
-else
- sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1"
fi
+cat >>confdefs.h <<_ACEOF
+#define PROFILE $profile
+_ACEOF
+cat >>confdefs.h <<_ACEOF
+#define WITH_PROFILE $sim_profile
+_ACEOF
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_profile" >&5
+$as_echo "$sim_profile" >&6; }
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable sim asserts" >&5
+$as_echo_n "checking whether to enable sim asserts... " >&6; }
+sim_assert="1"
# Check whether --enable-sim-assert was given.
if test "${enable_sim_assert+set}" = set; then :
enableval=$enable_sim_assert; case "${enableval}" in
- yes) sim_assert="-DWITH_ASSERT=1";;
- no) sim_assert="-DWITH_ASSERT=0";;
- *) as_fn_error "\"--enable-sim-assert does not take a value\"" "$LINENO" 5; sim_assert="";;
+ yes) sim_assert="1";;
+ no) sim_assert="0";;
+ *) as_fn_error "--enable-sim-assert does not take a value" "$LINENO" 5;;
esac
-if test x"$silent" != x"yes" && test x"$sim_assert" != x""; then
- echo "Setting assert flags = $sim_assert" 6>&1
-fi
-else
- sim_assert=""
fi
+cat >>confdefs.h <<_ACEOF
+#define WITH_ASSERT $sim_assert
+_ACEOF
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_assert" >&5
+$as_echo "$sim_assert" >&6; }
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking default sim environment setting" >&5
+$as_echo_n "checking default sim environment setting... " >&6; }
+sim_environment="ALL_ENVIRONMENT"
# Check whether --enable-sim-environment was given.
if test "${enable_sim_environment+set}" = set; then :
enableval=$enable_sim_environment; case "${enableval}" in
- all | ALL) sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT";;
- user | USER) sim_environment="-DWITH_ENVIRONMENT=USER_ENVIRONMENT";;
- virtual | VIRTUAL) sim_environment="-DWITH_ENVIRONMENT=VIRTUAL_ENVIRONMENT";;
- operating | OPERATING) sim_environment="-DWITH_ENVIRONMENT=OPERATING_ENVIRONMENT";;
- *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-environment\"" "$LINENO" 5;
- sim_environment="";;
+ all | ALL) sim_environment="ALL_ENVIRONMENT";;
+ user | USER) sim_environment="USER_ENVIRONMENT";;
+ virtual | VIRTUAL) sim_environment="VIRTUAL_ENVIRONMENT";;
+ operating | OPERATING) sim_environment="OPERATING_ENVIRONMENT";;
+ *) as_fn_error "Unknown value $enableval passed to --enable-sim-environment" "$LINENO" 5;;
esac
-if test x"$silent" != x"yes" && test x"$sim_environment" != x""; then
- echo "Setting sim environment = $sim_environment" 6>&1
-fi
-else
- sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT"
fi
+cat >>confdefs.h <<_ACEOF
+#define WITH_ENVIRONMENT $sim_environment
+_ACEOF
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_environment" >&5
+$as_echo "$sim_environment" >&6; }
+
sim_inline="-DDEFAULT_INLINE=0"
# Check whether --enable-sim-inline was given.
diff --git a/sim/avr/ChangeLog b/sim/avr/ChangeLog
index e47993e..9cdc039 100644
--- a/sim/avr/ChangeLog
+++ b/sim/avr/ChangeLog
@@ -1,5 +1,9 @@
2016-01-10 Mike Frysinger <vapier@gentoo.org>
+ * config.in, configure: Regenerate.
+
+2016-01-10 Mike Frysinger <vapier@gentoo.org>
+
* configure: Regenerate.
2016-01-10 Mike Frysinger <vapier@gentoo.org>
diff --git a/sim/avr/config.in b/sim/avr/config.in
index f24eb3b..aa3e45c 100644
--- a/sim/avr/config.in
+++ b/sim/avr/config.in
@@ -3,6 +3,9 @@
/* Define if building universal (internal helper macro) */
#undef AC_APPLE_UNIVERSAL_BUILD
+/* Sim debug setting */
+#undef DEBUG
+
/* Define to 1 if translation of program messages to the user's native
language is requested. */
#undef ENABLE_NLS
@@ -170,6 +173,9 @@
/* Additional package description */
#undef PKGVERSION
+/* Sim profile settings */
+#undef PROFILE
+
/* Bug reporting address */
#undef REPORT_BUGS_TO
@@ -201,6 +207,24 @@
#endif
+/* Sim assert settings */
+#undef WITH_ASSERT
+
+/* Sim debug setting */
+#undef WITH_DEBUG
+
+/* Sim default environment */
+#undef WITH_ENVIRONMENT
+
+/* Sim profile settings */
+#undef WITH_PROFILE
+
+/* How to route I/O */
+#undef WITH_STDIO
+
+/* Sim trace settings */
+#undef WITH_TRACE
+
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
significant byte first (like Motorola and SPARC, unlike Intel). */
#if defined AC_APPLE_UNIVERSAL_BUILD
diff --git a/sim/avr/configure b/sim/avr/configure
index 37f2d4c..1aa87b1 100755
--- a/sim/avr/configure
+++ b/sim/avr/configure
@@ -604,10 +604,6 @@ cgen_breaks
REPORT_BUGS_TEXI
REPORT_BUGS_TO
PKGVERSION
-sim_profile
-sim_trace
-sim_stdio
-sim_debug
MAINT
MAINTAINER_MODE_FALSE
MAINTAINER_MODE_TRUE
@@ -682,8 +678,6 @@ CFLAGS
CC
WERROR_CFLAGS
WARN_CFLAGS
-sim_xor_endian
-sim_smp
sim_reserved_bits
sim_inline
sim_hw
@@ -694,9 +688,7 @@ sim_scache
sim_float
sim_endian
sim_bitsize
-sim_assert
sim_alignment
-sim_environment
target_alias
host_alias
build_alias
@@ -4032,10 +4024,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-
# intl sister-directory configuration rules.
#
@@ -12843,7 +12831,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12846 "configure"
+#line 12834 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12949,7 +12937,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12952 "configure"
+#line 12940 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13217,124 +13205,164 @@ fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim debug setting" >&5
+$as_echo_n "checking for sim debug setting... " >&6; }
+sim_debug="0"
# Check whether --enable-sim-debug was given.
if test "${enable_sim_debug+set}" = set; then :
enableval=$enable_sim_debug; case "${enableval}" in
- yes) sim_debug="-DDEBUG=7 -DWITH_DEBUG=7";;
- no) sim_debug="-DDEBUG=0 -DWITH_DEBUG=0";;
- *) sim_debug="-DDEBUG='(${enableval})' -DWITH_DEBUG='(${enableval})'";;
+ yes) sim_debug="7";;
+ no) sim_debug="0";;
+ *) sim_debug="($enableval)";;
esac
-if test x"$silent" != x"yes" && test x"$sim_debug" != x""; then
- echo "Setting sim debug = $sim_debug" 6>&1
fi
-else
- sim_debug=""
+if test "$sim_debug" != "0"; then
+
+cat >>confdefs.h <<_ACEOF
+#define DEBUG $sim_debug
+_ACEOF
+
fi
+cat >>confdefs.h <<_ACEOF
+#define WITH_DEBUG $sim_debug
+_ACEOF
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_debug" >&5
+$as_echo "$sim_debug" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim stdio debug behavior" >&5
+$as_echo_n "checking for sim stdio debug behavior... " >&6; }
+sim_stdio="0"
# Check whether --enable-sim-stdio was given.
if test "${enable_sim_stdio+set}" = set; then :
enableval=$enable_sim_stdio; case "${enableval}" in
- yes) sim_stdio="-DWITH_STDIO=DO_USE_STDIO";;
- no) sim_stdio="-DWITH_STDIO=DONT_USE_STDIO";;
- *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-stdio\"" "$LINENO" 5; sim_stdio="";;
+ yes) sim_stdio="DO_USE_STDIO";;
+ no) sim_stdio="DONT_USE_STDIO";;
+ *) as_fn_error "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;;
esac
-if test x"$silent" != x"yes" && test x"$sim_stdio" != x""; then
- echo "Setting stdio flags = $sim_stdio" 6>&1
-fi
-else
- sim_stdio=""
fi
+cat >>confdefs.h <<_ACEOF
+#define WITH_STDIO $sim_stdio
+_ACEOF
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_stdio" >&5
+$as_echo "$sim_stdio" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim trace settings" >&5
+$as_echo_n "checking for sim trace settings... " >&6; }
+sim_trace="~TRACE_debug"
# Check whether --enable-sim-trace was given.
if test "${enable_sim_trace+set}" = set; then :
enableval=$enable_sim_trace; case "${enableval}" in
- yes) sim_trace="-DWITH_TRACE=-1";;
- no) sim_trace="-DWITH_TRACE=0";;
+ yes) sim_trace="-1";;
+ no) sim_trace="0";;
[-0-9]*)
- sim_trace="-DWITH_TRACE='(${enableval})'";;
+ sim_trace="'(${enableval})'";;
[[:lower:]]*)
sim_trace=""
for x in `echo "$enableval" | sed -e "s/,/ /g"`; do
if test x"$sim_trace" = x; then
- sim_trace="-DWITH_TRACE='(TRACE_$x"
+ sim_trace="(TRACE_$x"
else
sim_trace="${sim_trace}|TRACE_$x"
fi
done
- sim_trace="$sim_trace)'" ;;
+ sim_trace="$sim_trace)" ;;
esac
-if test x"$silent" != x"yes" && test x"$sim_trace" != x""; then
- echo "Setting sim trace = $sim_trace" 6>&1
-fi
-else
- sim_trace=""
fi
+cat >>confdefs.h <<_ACEOF
+#define WITH_TRACE $sim_trace
+_ACEOF
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_trace" >&5
+$as_echo "$sim_trace" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim profile settings" >&5
+$as_echo_n "checking for sim profile settings... " >&6; }
+profile="1"
+sim_profile="-1"
# Check whether --enable-sim-profile was given.
if test "${enable_sim_profile+set}" = set; then :
enableval=$enable_sim_profile; case "${enableval}" in
- yes) sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1";;
- no) sim_profile="-DPROFILE=0 -DWITH_PROFILE=0";;
+ yes) profile="1" sim_profile="-1";;
+ no) profile="0" sim_profile="0";;
[-0-9]*)
- sim_profile="-DPROFILE='(${enableval})' -DWITH_PROFILE='(${enableval})'";;
+ profile="(${enableval})" sim_profile="(${enableval})";;
[a-z]*)
+ profile="1"
sim_profile=""
for x in `echo "$enableval" | sed -e "s/,/ /g"`; do
if test x"$sim_profile" = x; then
- sim_profile="-DWITH_PROFILE='(PROFILE_$x"
+ sim_profile="(PROFILE_$x"
else
sim_profile="${sim_profile}|PROFILE_$x"
fi
done
- sim_profile="$sim_profile)'" ;;
+ sim_profile="$sim_profile)" ;;
esac
-if test x"$silent" != x"yes" && test x"$sim_profile" != x""; then
- echo "Setting sim profile = $sim_profile" 6>&1
-fi
-else
- sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1"
fi
+cat >>confdefs.h <<_ACEOF
+#define PROFILE $profile
+_ACEOF
+cat >>confdefs.h <<_ACEOF
+#define WITH_PROFILE $sim_profile
+_ACEOF
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_profile" >&5
+$as_echo "$sim_profile" >&6; }
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable sim asserts" >&5
+$as_echo_n "checking whether to enable sim asserts... " >&6; }
+sim_assert="1"
# Check whether --enable-sim-assert was given.
if test "${enable_sim_assert+set}" = set; then :
enableval=$enable_sim_assert; case "${enableval}" in
- yes) sim_assert="-DWITH_ASSERT=1";;
- no) sim_assert="-DWITH_ASSERT=0";;
- *) as_fn_error "\"--enable-sim-assert does not take a value\"" "$LINENO" 5; sim_assert="";;
+ yes) sim_assert="1";;
+ no) sim_assert="0";;
+ *) as_fn_error "--enable-sim-assert does not take a value" "$LINENO" 5;;
esac
-if test x"$silent" != x"yes" && test x"$sim_assert" != x""; then
- echo "Setting assert flags = $sim_assert" 6>&1
-fi
-else
- sim_assert=""
fi
+cat >>confdefs.h <<_ACEOF
+#define WITH_ASSERT $sim_assert
+_ACEOF
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_assert" >&5
+$as_echo "$sim_assert" >&6; }
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking default sim environment setting" >&5
+$as_echo_n "checking default sim environment setting... " >&6; }
+sim_environment="ALL_ENVIRONMENT"
# Check whether --enable-sim-environment was given.
if test "${enable_sim_environment+set}" = set; then :
enableval=$enable_sim_environment; case "${enableval}" in
- all | ALL) sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT";;
- user | USER) sim_environment="-DWITH_ENVIRONMENT=USER_ENVIRONMENT";;
- virtual | VIRTUAL) sim_environment="-DWITH_ENVIRONMENT=VIRTUAL_ENVIRONMENT";;
- operating | OPERATING) sim_environment="-DWITH_ENVIRONMENT=OPERATING_ENVIRONMENT";;
- *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-environment\"" "$LINENO" 5;
- sim_environment="";;
+ all | ALL) sim_environment="ALL_ENVIRONMENT";;
+ user | USER) sim_environment="USER_ENVIRONMENT";;
+ virtual | VIRTUAL) sim_environment="VIRTUAL_ENVIRONMENT";;
+ operating | OPERATING) sim_environment="OPERATING_ENVIRONMENT";;
+ *) as_fn_error "Unknown value $enableval passed to --enable-sim-environment" "$LINENO" 5;;
esac
-if test x"$silent" != x"yes" && test x"$sim_environment" != x""; then
- echo "Setting sim environment = $sim_environment" 6>&1
-fi
-else
- sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT"
fi
+cat >>confdefs.h <<_ACEOF
+#define WITH_ENVIRONMENT $sim_environment
+_ACEOF
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_environment" >&5
+$as_echo "$sim_environment" >&6; }
+
sim_inline="-DDEFAULT_INLINE=0"
# Check whether --enable-sim-inline was given.
diff --git a/sim/bfin/ChangeLog b/sim/bfin/ChangeLog
index fcb14ae..3dea7c9 100644
--- a/sim/bfin/ChangeLog
+++ b/sim/bfin/ChangeLog
@@ -1,5 +1,9 @@
2016-01-10 Mike Frysinger <vapier@gentoo.org>
+ * config.in, configure: Regenerate.
+
+2016-01-10 Mike Frysinger <vapier@gentoo.org>
+
* configure: Regenerate.
2016-01-10 Mike Frysinger <vapier@gentoo.org>
diff --git a/sim/bfin/config.in b/sim/bfin/config.in
index 65ae650..2c415ac 100644
--- a/sim/bfin/config.in
+++ b/sim/bfin/config.in
@@ -3,6 +3,9 @@
/* Define if building universal (internal helper macro) */
#undef AC_APPLE_UNIVERSAL_BUILD
+/* Sim debug setting */
+#undef DEBUG
+
/* Define to 1 if translation of program messages to the user's native
language is requested. */
#undef ENABLE_NLS
@@ -215,6 +218,9 @@
/* Additional package description */
#undef PKGVERSION
+/* Sim profile settings */
+#undef PROFILE
+
/* Bug reporting address */
#undef REPORT_BUGS_TO
@@ -246,6 +252,24 @@
#endif
+/* Sim assert settings */
+#undef WITH_ASSERT
+
+/* Sim debug setting */
+#undef WITH_DEBUG
+
+/* Sim default environment */
+#undef WITH_ENVIRONMENT
+
+/* Sim profile settings */
+#undef WITH_PROFILE
+
+/* How to route I/O */
+#undef WITH_STDIO
+
+/* Sim trace settings */
+#undef WITH_TRACE
+
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
significant byte first (like Motorola and SPARC, unlike Intel). */
#if defined AC_APPLE_UNIVERSAL_BUILD
diff --git a/sim/bfin/configure b/sim/bfin/configure
index 7d64751..cf426ea 100755
--- a/sim/bfin/configure
+++ b/sim/bfin/configure
@@ -609,10 +609,6 @@ PKG_CONFIG
REPORT_BUGS_TEXI
REPORT_BUGS_TO
PKGVERSION
-sim_profile
-sim_trace
-sim_stdio
-sim_debug
MAINT
MAINTAINER_MODE_FALSE
MAINTAINER_MODE_TRUE
@@ -687,8 +683,6 @@ CFLAGS
CC
WERROR_CFLAGS
WARN_CFLAGS
-sim_xor_endian
-sim_smp
sim_reserved_bits
sim_inline
sim_hw
@@ -699,9 +693,7 @@ sim_scache
sim_float
sim_endian
sim_bitsize
-sim_assert
sim_alignment
-sim_environment
target_alias
host_alias
build_alias
@@ -4055,10 +4047,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-
# intl sister-directory configuration rules.
#
@@ -12866,7 +12854,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12869 "configure"
+#line 12857 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12972,7 +12960,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12975 "configure"
+#line 12963 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13240,124 +13228,164 @@ fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim debug setting" >&5
+$as_echo_n "checking for sim debug setting... " >&6; }
+sim_debug="0"
# Check whether --enable-sim-debug was given.
if test "${enable_sim_debug+set}" = set; then :
enableval=$enable_sim_debug; case "${enableval}" in
- yes) sim_debug="-DDEBUG=7 -DWITH_DEBUG=7";;
- no) sim_debug="-DDEBUG=0 -DWITH_DEBUG=0";;
- *) sim_debug="-DDEBUG='(${enableval})' -DWITH_DEBUG='(${enableval})'";;
+ yes) sim_debug="7";;
+ no) sim_debug="0";;
+ *) sim_debug="($enableval)";;
esac
-if test x"$silent" != x"yes" && test x"$sim_debug" != x""; then
- echo "Setting sim debug = $sim_debug" 6>&1
fi
-else
- sim_debug=""
+if test "$sim_debug" != "0"; then
+
+cat >>confdefs.h <<_ACEOF
+#define DEBUG $sim_debug
+_ACEOF
+
fi
+cat >>confdefs.h <<_ACEOF
+#define WITH_DEBUG $sim_debug
+_ACEOF
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_debug" >&5
+$as_echo "$sim_debug" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim stdio debug behavior" >&5
+$as_echo_n "checking for sim stdio debug behavior... " >&6; }
+sim_stdio="0"
# Check whether --enable-sim-stdio was given.
if test "${enable_sim_stdio+set}" = set; then :
enableval=$enable_sim_stdio; case "${enableval}" in
- yes) sim_stdio="-DWITH_STDIO=DO_USE_STDIO";;
- no) sim_stdio="-DWITH_STDIO=DONT_USE_STDIO";;
- *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-stdio\"" "$LINENO" 5; sim_stdio="";;
+ yes) sim_stdio="DO_USE_STDIO";;
+ no) sim_stdio="DONT_USE_STDIO";;
+ *) as_fn_error "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;;
esac
-if test x"$silent" != x"yes" && test x"$sim_stdio" != x""; then
- echo "Setting stdio flags = $sim_stdio" 6>&1
-fi
-else
- sim_stdio=""
fi
+cat >>confdefs.h <<_ACEOF
+#define WITH_STDIO $sim_stdio
+_ACEOF
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_stdio" >&5
+$as_echo "$sim_stdio" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim trace settings" >&5
+$as_echo_n "checking for sim trace settings... " >&6; }
+sim_trace="~TRACE_debug"
# Check whether --enable-sim-trace was given.
if test "${enable_sim_trace+set}" = set; then :
enableval=$enable_sim_trace; case "${enableval}" in
- yes) sim_trace="-DWITH_TRACE=-1";;
- no) sim_trace="-DWITH_TRACE=0";;
+ yes) sim_trace="-1";;
+ no) sim_trace="0";;
[-0-9]*)
- sim_trace="-DWITH_TRACE='(${enableval})'";;
+ sim_trace="'(${enableval})'";;
[[:lower:]]*)
sim_trace=""
for x in `echo "$enableval" | sed -e "s/,/ /g"`; do
if test x"$sim_trace" = x; then
- sim_trace="-DWITH_TRACE='(TRACE_$x"
+ sim_trace="(TRACE_$x"
else
sim_trace="${sim_trace}|TRACE_$x"
fi
done
- sim_trace="$sim_trace)'" ;;
+ sim_trace="$sim_trace)" ;;
esac
-if test x"$silent" != x"yes" && test x"$sim_trace" != x""; then
- echo "Setting sim trace = $sim_trace" 6>&1
-fi
-else
- sim_trace=""
fi
+cat >>confdefs.h <<_ACEOF
+#define WITH_TRACE $sim_trace
+_ACEOF
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_trace" >&5
+$as_echo "$sim_trace" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim profile settings" >&5
+$as_echo_n "checking for sim profile settings... " >&6; }
+profile="1"
+sim_profile="-1"
# Check whether --enable-sim-profile was given.
if test "${enable_sim_profile+set}" = set; then :
enableval=$enable_sim_profile; case "${enableval}" in
- yes) sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1";;
- no) sim_profile="-DPROFILE=0 -DWITH_PROFILE=0";;
+ yes) profile="1" sim_profile="-1";;
+ no) profile="0" sim_profile="0";;
[-0-9]*)
- sim_profile="-DPROFILE='(${enableval})' -DWITH_PROFILE='(${enableval})'";;
+ profile="(${enableval})" sim_profile="(${enableval})";;
[a-z]*)
+ profile="1"
sim_profile=""
for x in `echo "$enableval" | sed -e "s/,/ /g"`; do
if test x"$sim_profile" = x; then
- sim_profile="-DWITH_PROFILE='(PROFILE_$x"
+ sim_profile="(PROFILE_$x"
else
sim_profile="${sim_profile}|PROFILE_$x"
fi
done
- sim_profile="$sim_profile)'" ;;
+ sim_profile="$sim_profile)" ;;
esac
-if test x"$silent" != x"yes" && test x"$sim_profile" != x""; then
- echo "Setting sim profile = $sim_profile" 6>&1
-fi
-else
- sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1"
fi
+cat >>confdefs.h <<_ACEOF
+#define PROFILE $profile
+_ACEOF
+cat >>confdefs.h <<_ACEOF
+#define WITH_PROFILE $sim_profile
+_ACEOF
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_profile" >&5
+$as_echo "$sim_profile" >&6; }
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable sim asserts" >&5
+$as_echo_n "checking whether to enable sim asserts... " >&6; }
+sim_assert="1"
# Check whether --enable-sim-assert was given.
if test "${enable_sim_assert+set}" = set; then :
enableval=$enable_sim_assert; case "${enableval}" in
- yes) sim_assert="-DWITH_ASSERT=1";;
- no) sim_assert="-DWITH_ASSERT=0";;
- *) as_fn_error "\"--enable-sim-assert does not take a value\"" "$LINENO" 5; sim_assert="";;
+ yes) sim_assert="1";;
+ no) sim_assert="0";;
+ *) as_fn_error "--enable-sim-assert does not take a value" "$LINENO" 5;;
esac
-if test x"$silent" != x"yes" && test x"$sim_assert" != x""; then
- echo "Setting assert flags = $sim_assert" 6>&1
-fi
-else
- sim_assert=""
fi
+cat >>confdefs.h <<_ACEOF
+#define WITH_ASSERT $sim_assert
+_ACEOF
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_assert" >&5
+$as_echo "$sim_assert" >&6; }
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking default sim environment setting" >&5
+$as_echo_n "checking default sim environment setting... " >&6; }
+sim_environment="ALL_ENVIRONMENT"
# Check whether --enable-sim-environment was given.
if test "${enable_sim_environment+set}" = set; then :
enableval=$enable_sim_environment; case "${enableval}" in
- all | ALL) sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT";;
- user | USER) sim_environment="-DWITH_ENVIRONMENT=USER_ENVIRONMENT";;
- virtual | VIRTUAL) sim_environment="-DWITH_ENVIRONMENT=VIRTUAL_ENVIRONMENT";;
- operating | OPERATING) sim_environment="-DWITH_ENVIRONMENT=OPERATING_ENVIRONMENT";;
- *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-environment\"" "$LINENO" 5;
- sim_environment="";;
+ all | ALL) sim_environment="ALL_ENVIRONMENT";;
+ user | USER) sim_environment="USER_ENVIRONMENT";;
+ virtual | VIRTUAL) sim_environment="VIRTUAL_ENVIRONMENT";;
+ operating | OPERATING) sim_environment="OPERATING_ENVIRONMENT";;
+ *) as_fn_error "Unknown value $enableval passed to --enable-sim-environment" "$LINENO" 5;;
esac
-if test x"$silent" != x"yes" && test x"$sim_environment" != x""; then
- echo "Setting sim environment = $sim_environment" 6>&1
-fi
-else
- sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT"
fi
+cat >>confdefs.h <<_ACEOF
+#define WITH_ENVIRONMENT $sim_environment
+_ACEOF
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_environment" >&5
+$as_echo "$sim_environment" >&6; }
+
sim_inline="-DDEFAULT_INLINE=0"
# Check whether --enable-sim-inline was given.
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 8afffa4..7b5c8f9 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,5 +1,27 @@
2016-01-10 Mike Frysinger <vapier@gentoo.org>
+ * acinclude.m4 (SIM_AC_COMMON): Call AC_MSG_CHECKING,
+ AC_DEFINE_UNQUOTED, and AC_MSG_RESULT for sim-debug. Likewise for
+ sim-stdio, sim-trace, and sim-profile.
+ (SIM_AC_OPTION_ENVIRONMENT): Likewise.
+ (SIM_AC_OPTION_ASSERT): Likewise.
+ (SIM_AC_OPTION_SMP): Likewise.
+ (SIM_AC_OPTION_XOR_ENDIAN): Likewise.
+ * configure: Regenerate.
+ * Make-common.in (SIM_DEBUG, SIM_TRACE, SIM_PROFILE, SIM_ASSERT,
+ SIM_ENVIRONMENT, SIM_SMP, SIM_XOR_ENDIAN): Delete.
+ (CONFIG_CFLAGS): Delete $(SIM_DEBUG), $(SIM_TRACE), $(SIM_PROFILE),
+ $(SIM_ASSERT), $(SIM_ENVIRONMENT), $(SIM_SMP), and $(SIM_XOR_ENDIAN).
+ * sim-config.c (sim_config): Change DEFAULT_ENVIRONMENT to
+ WITH_ENVIRONMENT & USER_ENVIRONMENT.
+ * sim-config.h (SIM_HAVE_ENVIRONMENT, WITH_ENVIRONMENT,
+ DEFAULT_ENVIRONMENT, WITH_DEBUG, WITH_TRACE, WITH_PROFILE,
+ WITH_ASSERT, WITH_STDIO): Delete.
+ * sim-options.c (standard_options): Delete SIM_HAVE_ENVIRONMENT
+ check.
+
+2016-01-10 Mike Frysinger <vapier@gentoo.org>
+
* acinclude.m4 (SIM_AC_OPTION_PACKAGES): Delete.
* configure: Regenerate.
* Make-common.in (SIM_PACKAGES): Delete.
diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in
index 49401dd..3d99f62 100644
--- a/sim/common/Make-common.in
+++ b/sim/common/Make-common.in
@@ -75,16 +75,11 @@ CFLAGS = @CFLAGS@
CPPFLAGS = @CPPFLAGS@
CXXFLAGS = @CXXFLAGS@
LDFLAGS = @LDFLAGS@
-SIM_DEBUG = @sim_debug@
-SIM_TRACE = @sim_trace@
-SIM_PROFILE = @sim_profile@
-SIM_ASSERT = @sim_assert@
SIM_ALIGNMENT = @sim_alignment@
SIM_BITSIZE = @sim_bitsize@
SIM_DEFAULT_MODEL = @sim_default_model@
SIM_ENDIAN = @sim_endian@
-SIM_ENVIRONMENT = @sim_environment@
SIM_FLOAT = @sim_float@
SIM_HW_CFLAGS = @sim_hw_cflags@
SIM_HW_OBJS = @sim_hw_objs@
@@ -92,8 +87,6 @@ SIM_HW = @sim_hw@
SIM_INLINE = @sim_inline@
SIM_RESERVED_BITS = @sim_reserved_bits@
SIM_SCACHE = @sim_scache@
-SIM_SMP = @sim_smp@
-SIM_XOR_ENDIAN = @sim_xor_endian@
WARN_CFLAGS = @WARN_CFLAGS@
WERROR_CFLAGS = @WERROR_CFLAGS@
SIM_WARN_CFLAGS = $(WARN_CFLAGS)
@@ -224,24 +217,17 @@ CGEN_INCLUDE_DEPS = \
CONFIG_CFLAGS = \
@DEFS@ \
- $(SIM_DEBUG) \
$(SIM_DEFAULT_MODEL) \
- $(SIM_TRACE) \
- $(SIM_PROFILE) \
- $(SIM_ASSERT) \
$(SIM_ALIGNMENT) \
$(SIM_BITSIZE) \
$(SIM_ENDIAN) \
- $(SIM_ENVIRONMENT) \
$(SIM_FLOAT) \
$(SIM_HW_CFLAGS) \
$(SIM_INLINE) \
$(SIM_RESERVED_BITS) \
$(SIM_SCACHE) \
- $(SIM_SMP) \
$(SIM_WARN_CFLAGS) \
$(SIM_WERROR_CFLAGS) \
- $(SIM_XOR_ENDIAN) \
$(SIM_HARDWARE) \
$(SIM_EXTRA_CFLAGS) \
$(HDEFINES) $(TDEFINES)
diff --git a/sim/common/acinclude.m4 b/sim/common/acinclude.m4
index 16e6d5c..5ebf584 100644
--- a/sim/common/acinclude.m4
+++ b/sim/common/acinclude.m4
@@ -135,64 +135,67 @@ AM_MAINTAINER_MODE
dnl --enable-sim-debug is for developers of the simulator
dnl the allowable values are work-in-progress
+AC_MSG_CHECKING([for sim debug setting])
+sim_debug="0"
AC_ARG_ENABLE(sim-debug,
[AS_HELP_STRING([--enable-sim-debug=opts],
[Enable debugging flags (for developers of the sim itself)])],
[case "${enableval}" in
- yes) sim_debug="-DDEBUG=7 -DWITH_DEBUG=7";;
- no) sim_debug="-DDEBUG=0 -DWITH_DEBUG=0";;
- *) sim_debug="-DDEBUG='(${enableval})' -DWITH_DEBUG='(${enableval})'";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_debug" != x""; then
- echo "Setting sim debug = $sim_debug" 6>&1
-fi],[sim_debug=""])dnl
-AC_SUBST(sim_debug)
+ yes) sim_debug="7";;
+ no) sim_debug="0";;
+ *) sim_debug="($enableval)";;
+esac])dnl
+if test "$sim_debug" != "0"; then
+ AC_DEFINE_UNQUOTED([DEBUG], [$sim_debug], [Sim debug setting])
+fi
+AC_DEFINE_UNQUOTED([WITH_DEBUG], [$sim_debug], [Sim debug setting])
+AC_MSG_RESULT($sim_debug)
dnl --enable-sim-stdio is for users of the simulator
dnl It determines if IO from the program is routed through STDIO (buffered)
+AC_MSG_CHECKING([for sim stdio debug behavior])
+sim_stdio="0"
AC_ARG_ENABLE(sim-stdio,
[AS_HELP_STRING([--enable-sim-stdio],
[Specify whether to use stdio for console input/output])],
[case "${enableval}" in
- yes) sim_stdio="-DWITH_STDIO=DO_USE_STDIO";;
- no) sim_stdio="-DWITH_STDIO=DONT_USE_STDIO";;
- *) AC_MSG_ERROR("Unknown value $enableval passed to --enable-sim-stdio"); sim_stdio="";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_stdio" != x""; then
- echo "Setting stdio flags = $sim_stdio" 6>&1
-fi],[sim_stdio=""])dnl
-AC_SUBST(sim_stdio)
+ yes) sim_stdio="DO_USE_STDIO";;
+ no) sim_stdio="DONT_USE_STDIO";;
+ *) AC_MSG_ERROR([Unknown value $enableval passed to --enable-sim-stdio]);;
+esac])dnl
+AC_DEFINE_UNQUOTED([WITH_STDIO], [$sim_stdio], [How to route I/O])
+AC_MSG_RESULT($sim_stdio)
dnl --enable-sim-trace is for users of the simulator
dnl The argument is either a bitmask of things to enable [exactly what is
dnl up to the simulator], or is a comma separated list of names of tracing
dnl elements to enable. The latter is only supported on simulators that
-dnl use WITH_TRACE.
+dnl use WITH_TRACE. Default to all tracing but internal debug.
+AC_MSG_CHECKING([for sim trace settings])
+sim_trace="~TRACE_debug"
AC_ARG_ENABLE(sim-trace,
[AS_HELP_STRING([--enable-sim-trace=opts],
[Enable tracing of simulated programs])],
[case "${enableval}" in
- yes) sim_trace="-DWITH_TRACE=-1";;
- no) sim_trace="-DWITH_TRACE=0";;
+ yes) sim_trace="-1";;
+ no) sim_trace="0";;
[[-0-9]]*)
- sim_trace="-DWITH_TRACE='(${enableval})'";;
+ sim_trace="'(${enableval})'";;
[[[:lower:]]]*)
sim_trace=""
for x in `echo "$enableval" | sed -e "s/,/ /g"`; do
if test x"$sim_trace" = x; then
- sim_trace="-DWITH_TRACE='(TRACE_$x"
+ sim_trace="(TRACE_$x"
else
sim_trace="${sim_trace}|TRACE_$x"
fi
done
- sim_trace="$sim_trace)'" ;;
-esac
-if test x"$silent" != x"yes" && test x"$sim_trace" != x""; then
- echo "Setting sim trace = $sim_trace" 6>&1
-fi],[sim_trace=""])dnl
-AC_SUBST(sim_trace)
+ sim_trace="$sim_trace)" ;;
+esac])dnl
+AC_DEFINE_UNQUOTED([WITH_TRACE], [$sim_trace], [Sim trace settings])
+AC_MSG_RESULT($sim_trace)
dnl --enable-sim-profile
@@ -200,28 +203,32 @@ dnl The argument is either a bitmask of things to enable [exactly what is
dnl up to the simulator], or is a comma separated list of names of profiling
dnl elements to enable. The latter is only supported on simulators that
dnl use WITH_PROFILE.
+AC_MSG_CHECKING([for sim profile settings])
+profile="1"
+sim_profile="-1"
AC_ARG_ENABLE(sim-profile,
[AS_HELP_STRING([--enable-sim-profile=opts], [Enable profiling flags])],
[case "${enableval}" in
- yes) sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1";;
- no) sim_profile="-DPROFILE=0 -DWITH_PROFILE=0";;
+ yes) profile="1" sim_profile="-1";;
+ no) profile="0" sim_profile="0";;
[[-0-9]]*)
- sim_profile="-DPROFILE='(${enableval})' -DWITH_PROFILE='(${enableval})'";;
+ profile="(${enableval})" sim_profile="(${enableval})";;
[[a-z]]*)
+ profile="1"
sim_profile=""
for x in `echo "$enableval" | sed -e "s/,/ /g"`; do
if test x"$sim_profile" = x; then
- sim_profile="-DWITH_PROFILE='(PROFILE_$x"
+ sim_profile="(PROFILE_$x"
else
sim_profile="${sim_profile}|PROFILE_$x"
fi
done
- sim_profile="$sim_profile)'" ;;
-esac
-if test x"$silent" != x"yes" && test x"$sim_profile" != x""; then
- echo "Setting sim profile = $sim_profile" 6>&1
-fi],[sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1"])dnl
-AC_SUBST(sim_profile)
+ sim_profile="$sim_profile)" ;;
+esac])dnl
+AC_DEFINE_UNQUOTED([PROFILE], [$profile], [Sim profile settings])
+AC_DEFINE_UNQUOTED([WITH_PROFILE], [$sim_profile], [Sim profile settings])
+AC_MSG_RESULT($sim_profile)
+
SIM_AC_OPTION_ASSERT
SIM_AC_OPTION_ENVIRONMENT
@@ -257,23 +264,21 @@ dnl ??? Until there is demonstrable value in doing something more complicated,
dnl let's not.
AC_DEFUN([SIM_AC_OPTION_ENVIRONMENT],
[
+AC_MSG_CHECKING([default sim environment setting])
+sim_environment="ALL_ENVIRONMENT"
AC_ARG_ENABLE(sim-environment,
[AS_HELP_STRING([--enable-sim-environment=environment],
[Specify mixed, user, virtual or operating environment])],
[case "${enableval}" in
- all | ALL) sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT";;
- user | USER) sim_environment="-DWITH_ENVIRONMENT=USER_ENVIRONMENT";;
- virtual | VIRTUAL) sim_environment="-DWITH_ENVIRONMENT=VIRTUAL_ENVIRONMENT";;
- operating | OPERATING) sim_environment="-DWITH_ENVIRONMENT=OPERATING_ENVIRONMENT";;
- *) AC_MSG_ERROR("Unknown value $enableval passed to --enable-sim-environment");
- sim_environment="";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_environment" != x""; then
- echo "Setting sim environment = $sim_environment" 6>&1
-fi],
-[sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT"])dnl
+ all | ALL) sim_environment="ALL_ENVIRONMENT";;
+ user | USER) sim_environment="USER_ENVIRONMENT";;
+ virtual | VIRTUAL) sim_environment="VIRTUAL_ENVIRONMENT";;
+ operating | OPERATING) sim_environment="OPERATING_ENVIRONMENT";;
+ *) AC_MSG_ERROR([Unknown value $enableval passed to --enable-sim-environment]);;
+esac])dnl
+AC_DEFINE_UNQUOTED([WITH_ENVIRONMENT], [$sim_environment], [Sim default environment])
+AC_MSG_RESULT($sim_environment)
])
-AC_SUBST(sim_environment)
dnl Specify the alignment restrictions of the target architecture.
@@ -332,19 +337,19 @@ AC_SUBST(sim_alignment)
dnl Conditionally compile in assertion statements.
AC_DEFUN([SIM_AC_OPTION_ASSERT],
[
+AC_MSG_CHECKING([whether to enable sim asserts])
+sim_assert="1"
AC_ARG_ENABLE(sim-assert,
[AS_HELP_STRING([--enable-sim-assert],
[Specify whether to perform random assertions])],
[case "${enableval}" in
- yes) sim_assert="-DWITH_ASSERT=1";;
- no) sim_assert="-DWITH_ASSERT=0";;
- *) AC_MSG_ERROR("--enable-sim-assert does not take a value"); sim_assert="";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_assert" != x""; then
- echo "Setting assert flags = $sim_assert" 6>&1
-fi],[sim_assert=""])dnl
+ yes) sim_assert="1";;
+ no) sim_assert="0";;
+ *) AC_MSG_ERROR([--enable-sim-assert does not take a value]);;
+esac])dnl
+AC_DEFINE_UNQUOTED([WITH_ASSERT], [$sim_assert], [Sim assert settings])
+AC_MSG_RESULT($sim_assert)
])
-AC_SUBST(sim_assert)
@@ -667,41 +672,39 @@ AC_SUBST(sim_reserved_bits)
AC_DEFUN([SIM_AC_OPTION_SMP],
[
+AC_MSG_CHECKING([number of sim cpus to support])
default_sim_smp="ifelse([$1],,5,[$1])"
+sim_smp="$default_sim_smp""
AC_ARG_ENABLE(sim-smp,
[AS_HELP_STRING([--enable-sim-smp=n],
[Specify number of processors to configure for (default ${default_sim_smp})])],
[case "${enableval}" in
- yes) sim_smp="-DWITH_SMP=5" ; sim_igen_smp="-N 5";;
- no) sim_smp="-DWITH_SMP=0" ; sim_igen_smp="-N 0";;
- *) sim_smp="-DWITH_SMP=$enableval" ; sim_igen_smp="-N $enableval";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_smp" != x""; then
- echo "Setting smp flags = $sim_smp" 6>&1
-fi],[sim_smp="-DWITH_SMP=${default_sim_smp}" ; sim_igen_smp="-N ${default_sim_smp}"
-if test x"$silent" != x"yes"; then
- echo "Setting smp flags = $sim_smp" 6>&1
-fi])dnl
+ yes) sim_smp="5";;
+ no) sim_smp="0";;
+ *) sim_smp="$enableval";;
+esac])dnl
+sim_igen_smp="-N ${sim_smp}"
+AC_DEFINE_UNQUOTED([WITH_SMP], [$sim_smp], [Sim SMP settings])
+AC_MSG_RESULT($sim_smp)
])
-AC_SUBST(sim_smp)
AC_DEFUN([SIM_AC_OPTION_XOR_ENDIAN],
[
+AC_MSG_CHECKING([for xor endian support])
default_sim_xor_endian="ifelse([$1],,8,[$1])"
+sim_xor_endian="$default_sim_xor_endian"
AC_ARG_ENABLE(sim-xor-endian,
[AS_HELP_STRING([--enable-sim-xor-endian=n],
[Specify number bytes involved in XOR bi-endian mode (default ${default_sim_xor_endian})])],
[case "${enableval}" in
- yes) sim_xor_endian="-DWITH_XOR_ENDIAN=8";;
- no) sim_xor_endian="-DWITH_XOR_ENDIAN=0";;
- *) sim_xor_endian="-DWITH_XOR_ENDIAN=$enableval";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_xor_endian" != x""; then
- echo "Setting xor-endian flag = $sim_xor_endian" 6>&1
-fi],[sim_xor_endian="-DWITH_XOR_ENDIAN=${default_sim_xor_endian}"])dnl
+ yes) sim_xor_endian="8";;
+ no) sim_xor_endian="0";;
+ *) sim_xor_endian="$enableval";;
+esac])dnl
+AC_DEFINE_UNQUOTED([WITH_XOR_ENDIAN], [$sim_xor_endian], [Sim XOR endian settings])
+AC_MSG_RESULT($sim_smp)
])
-AC_SUBST(sim_xor_endian)
dnl --enable-build-warnings is for developers of the simulator.
diff --git a/sim/common/configure b/sim/common/configure
index a02b129..53082d4 100755
--- a/sim/common/configure
+++ b/sim/common/configure
@@ -602,8 +602,6 @@ PATH_SEPARATOR
SHELL
WERROR_CFLAGS
WARN_CFLAGS
-sim_xor_endian
-sim_smp
sim_reserved_bits
sim_inline
sim_hw
@@ -614,9 +612,7 @@ sim_scache
sim_float
sim_endian
sim_bitsize
-sim_assert
-sim_alignment
-sim_environment'
+sim_alignment'
ac_subst_files=''
ac_user_opts='
enable_option_checking
diff --git a/sim/common/sim-config.c b/sim/common/sim-config.c
index 7e66787..9da7105 100644
--- a/sim/common/sim-config.c
+++ b/sim/common/sim-config.c
@@ -237,7 +237,8 @@ sim_config (SIM_DESC sd)
}
#endif
if (STATE_ENVIRONMENT (sd) == ALL_ENVIRONMENT)
- STATE_ENVIRONMENT (sd) = DEFAULT_ENVIRONMENT;
+ STATE_ENVIRONMENT (sd) = (WITH_ENVIRONMENT != ALL_ENVIRONMENT ?
+ WITH_ENVIRONMENT : USER_ENVIRONMENT);
/* set the alignment */
diff --git a/sim/common/sim-config.h b/sim/common/sim-config.h
index 1c65365..88ecfd8 100644
--- a/sim/common/sim-config.h
+++ b/sim/common/sim-config.h
@@ -167,21 +167,6 @@ enum sim_environment {
OPERATING_ENVIRONMENT
};
-/* If the simulator specified SIM_AC_OPTION_ENVIRONMENT, indicate so. */
-#ifdef WITH_ENVIRONMENT
-#define SIM_HAVE_ENVIRONMENT
-#endif
-
-/* If the simulator doesn't specify SIM_AC_OPTION_ENVIRONMENT in its
- configure.ac, the only supported environment is the user environment. */
-#ifndef WITH_ENVIRONMENT
-#define WITH_ENVIRONMENT USER_ENVIRONMENT
-#endif
-
-#define DEFAULT_ENVIRONMENT (WITH_ENVIRONMENT != ALL_ENVIRONMENT \
- ? WITH_ENVIRONMENT \
- : USER_ENVIRONMENT)
-
/* To be prepended to simulator calls with absolute file paths and
chdir:ed at startup. */
extern char *simulator_sysroot;
@@ -267,39 +252,6 @@ extern int current_floating_point;
#endif
-/* Debugging:
-
- Control the inclusion of debugging code.
- Debugging is only turned on in rare circumstances [say during development]
- and is not intended to be turned on otherwise. */
-
-#ifndef WITH_DEBUG
-#define WITH_DEBUG 0
-#endif
-
-/* Include the tracing code. Disabling this eliminates all tracing
- code. Default to all tracing but internal debug. */
-
-#ifndef WITH_TRACE
-#define WITH_TRACE (~TRACE_debug)
-#endif
-
-/* Include the profiling code. Disabling this eliminates all profiling
- code. */
-
-#ifndef WITH_PROFILE
-#define WITH_PROFILE (-1)
-#endif
-
-
-/* include code that checks assertions scattered through out the
- program */
-
-#ifndef WITH_ASSERT
-#define WITH_ASSERT 1
-#endif
-
-
/* Whether to check instructions for reserved bits being set */
/* #define WITH_RESERVED_BITS 1 */
@@ -344,10 +296,6 @@ extern int current_model_issue;
#define DONT_USE_STDIO 2
#define DO_USE_STDIO 1
-#ifndef WITH_STDIO
-#define WITH_STDIO 0
-#endif
-
extern int current_stdio;
#define CURRENT_STDIO (WITH_STDIO \
? WITH_STDIO \
diff --git a/sim/common/sim-options.c b/sim/common/sim-options.c
index 7393554..54a8c43 100644
--- a/sim/common/sim-options.c
+++ b/sim/common/sim-options.c
@@ -119,14 +119,12 @@ static const OPTION standard_options[] =
'E', "big|little", "Set endianness",
standard_option_handler, NULL },
-#ifdef SIM_HAVE_ENVIRONMENT
/* This option isn't supported unless all choices are supported in keeping
with the goal of not printing in --help output things the simulator can't
do [as opposed to things that just haven't been configured in]. */
{ {"environment", required_argument, NULL, OPTION_ENVIRONMENT},
'\0', "user|virtual|operating", "Set running environment",
standard_option_handler },
-#endif
{ {"alignment", required_argument, NULL, OPTION_ALIGNMENT},
'\0', "strict|nonstrict|forced", "Set memory access alignment",
diff --git a/sim/cr16/ChangeLog b/sim/cr16/ChangeLog
index 7c2fe22..576898c 100644
--- a/sim/cr16/ChangeLog
+++ b/sim/cr16/ChangeLog
@@ -1,5 +1,9 @@
2016-01-10 Mike Frysinger <vapier@gentoo.org>
+ * config.in, configure: Regenerate.
+
+2016-01-10 Mike Frysinger <vapier@gentoo.org>
+
* configure: Regenerate.
2016-01-10 Mike Frysinger <vapier@gentoo.org>
diff --git a/sim/cr16/config.in b/sim/cr16/config.in
index f24eb3b..aa3e45c 100644
--- a/sim/cr16/config.in
+++ b/sim/cr16/config.in
@@ -3,6 +3,9 @@
/* Define if building universal (internal helper macro) */
#undef AC_APPLE_UNIVERSAL_BUILD
+/* Sim debug setting */
+#undef DEBUG
+
/* Define to 1 if translation of program messages to the user's native
language is requested. */
#undef ENABLE_NLS
@@ -170,6 +173,9 @@
/* Additional package description */
#undef PKGVERSION
+/* Sim profile settings */
+#undef PROFILE
+
/* Bug reporting address */
#undef REPORT_BUGS_TO
@@ -201,6 +207,24 @@
#endif
+/* Sim assert settings */
+#undef WITH_ASSERT
+
+/* Sim debug setting */
+#undef WITH_DEBUG
+
+/* Sim default environment */
+#undef WITH_ENVIRONMENT
+
+/* Sim profile settings */
+#undef WITH_PROFILE
+
+/* How to route I/O */
+#undef WITH_STDIO
+
+/* Sim trace settings */
+#undef WITH_TRACE
+
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
significant byte first (like Motorola and SPARC, unlike Intel). */
#if defined AC_APPLE_UNIVERSAL_BUILD
diff --git a/sim/cr16/configure b/sim/cr16/configure
index 107d9a6..0185727 100755
--- a/sim/cr16/configure
+++ b/sim/cr16/configure
@@ -604,10 +604,6 @@ cgen_breaks
REPORT_BUGS_TEXI
REPORT_BUGS_TO
PKGVERSION
-sim_profile
-sim_trace
-sim_stdio
-sim_debug
MAINT
MAINTAINER_MODE_FALSE
MAINTAINER_MODE_TRUE
@@ -682,8 +678,6 @@ CFLAGS
CC
WERROR_CFLAGS
WARN_CFLAGS
-sim_xor_endian
-sim_smp
sim_reserved_bits
sim_inline
sim_hw
@@ -694,9 +688,7 @@ sim_scache
sim_float
sim_endian
sim_bitsize
-sim_assert
sim_alignment
-sim_environment
target_alias
host_alias
build_alias
@@ -4032,10 +4024,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-
# intl sister-directory configuration rules.
#
@@ -12843,7 +12831,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12846 "configure"
+#line 12834 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12949,7 +12937,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12952 "configure"
+#line 12940 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13217,124 +13205,164 @@ fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim debug setting" >&5
+$as_echo_n "checking for sim debug setting... " >&6; }
+sim_debug="0"
# Check whether --enable-sim-debug was given.
if test "${enable_sim_debug+set}" = set; then :
enableval=$enable_sim_debug; case "${enableval}" in
- yes) sim_debug="-DDEBUG=7 -DWITH_DEBUG=7";;
- no) sim_debug="-DDEBUG=0 -DWITH_DEBUG=0";;
- *) sim_debug="-DDEBUG='(${enableval})' -DWITH_DEBUG='(${enableval})'";;
+ yes) sim_debug="7";;
+ no) sim_debug="0";;
+ *) sim_debug="($enableval)";;
esac
-if test x"$silent" != x"yes" && test x"$sim_debug" != x""; then
- echo "Setting sim debug = $sim_debug" 6>&1
fi
-else
- sim_debug=""
+if test "$sim_debug" != "0"; then
+
+cat >>confdefs.h <<_ACEOF
+#define DEBUG $sim_debug
+_ACEOF
+
fi
+cat >>confdefs.h <<_ACEOF
+#define WITH_DEBUG $sim_debug
+_ACEOF
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_debug" >&5
+$as_echo "$sim_debug" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim stdio debug behavior" >&5
+$as_echo_n "checking for sim stdio debug behavior... " >&6; }
+sim_stdio="0"
# Check whether --enable-sim-stdio was given.
if test "${enable_sim_stdio+set}" = set; then :
enableval=$enable_sim_stdio; case "${enableval}" in
- yes) sim_stdio="-DWITH_STDIO=DO_USE_STDIO";;
- no) sim_stdio="-DWITH_STDIO=DONT_USE_STDIO";;
- *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-stdio\"" "$LINENO" 5; sim_stdio="";;
+ yes) sim_stdio="DO_USE_STDIO";;
+ no) sim_stdio="DONT_USE_STDIO";;
+ *) as_fn_error "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;;
esac
-if test x"$silent" != x"yes" && test x"$sim_stdio" != x""; then
- echo "Setting stdio flags = $sim_stdio" 6>&1
-fi
-else
- sim_stdio=""
fi
+cat >>confdefs.h <<_ACEOF
+#define WITH_STDIO $sim_stdio
+_ACEOF
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_stdio" >&5
+$as_echo "$sim_stdio" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim trace settings" >&5
+$as_echo_n "checking for sim trace settings... " >&6; }
+sim_trace="~TRACE_debug"
# Check whether --enable-sim-trace was given.
if test "${enable_sim_trace+set}" = set; then :
enableval=$enable_sim_trace; case "${enableval}" in
- yes) sim_trace="-DWITH_TRACE=-1";;
- no) sim_trace="-DWITH_TRACE=0";;
+ yes) sim_trace="-1";;
+ no) sim_trace="0";;
[-0-9]*)
- sim_trace="-DWITH_TRACE='(${enableval})'";;
+ sim_trace="'(${enableval})'";;
[[:lower:]]*)
sim_trace=""
for x in `echo "$enableval" | sed -e "s/,/ /g"`; do
if test x"$sim_trace" = x; then
- sim_trace="-DWITH_TRACE='(TRACE_$x"
+ sim_trace="(TRACE_$x"
else
sim_trace="${sim_trace}|TRACE_$x"
fi
done
- sim_trace="$sim_trace)'" ;;
+ sim_trace="$sim_trace)" ;;
esac
-if test x"$silent" != x"yes" && test x"$sim_trace" != x""; then
- echo "Setting sim trace = $sim_trace" 6>&1
-fi
-else
- sim_trace=""
fi
+cat >>confdefs.h <<_ACEOF
+#define WITH_TRACE $sim_trace
+_ACEOF
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_trace" >&5
+$as_echo "$sim_trace" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim profile settings" >&5
+$as_echo_n "checking for sim profile settings... " >&6; }
+profile="1"
+sim_profile="-1"
# Check whether --enable-sim-profile was given.
if test "${enable_sim_profile+set}" = set; then :
enableval=$enable_sim_profile; case "${enableval}" in
- yes) sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1";;
- no) sim_profile="-DPROFILE=0 -DWITH_PROFILE=0";;
+ yes) profile="1" sim_profile="-1";;
+ no) profile="0" sim_profile="0";;
[-0-9]*)
- sim_profile="-DPROFILE='(${enableval})' -DWITH_PROFILE='(${enableval})'";;
+ profile="(${enableval})" sim_profile="(${enableval})";;
[a-z]*)
+ profile="1"
sim_profile=""
for x in `echo "$enableval" | sed -e "s/,/ /g"`; do
if test x"$sim_profile" = x; then
- sim_profile="-DWITH_PROFILE='(PROFILE_$x"
+ sim_profile="(PROFILE_$x"
else
sim_profile="${sim_profile}|PROFILE_$x"
fi
done
- sim_profile="$sim_profile)'" ;;
+ sim_profile="$sim_profile)" ;;
esac
-if test x"$silent" != x"yes" && test x"$sim_profile" != x""; then
- echo "Setting sim profile = $sim_profile" 6>&1
-fi
-else
- sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1"
fi
+cat >>confdefs.h <<_ACEOF
+#define PROFILE $profile
+_ACEOF
+cat >>confdefs.h <<_ACEOF
+#define WITH_PROFILE $sim_profile
+_ACEOF
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_profile" >&5
+$as_echo "$sim_profile" >&6; }
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable sim asserts" >&5
+$as_echo_n "checking whether to enable sim asserts... " >&6; }
+sim_assert="1"
# Check whether --enable-sim-assert was given.
if test "${enable_sim_assert+set}" = set; then :
enableval=$enable_sim_assert; case "${enableval}" in
- yes) sim_assert="-DWITH_ASSERT=1";;
- no) sim_assert="-DWITH_ASSERT=0";;
- *) as_fn_error "\"--enable-sim-assert does not take a value\"" "$LINENO" 5; sim_assert="";;
+ yes) sim_assert="1";;
+ no) sim_assert="0";;
+ *) as_fn_error "--enable-sim-assert does not take a value" "$LINENO" 5;;
esac
-if test x"$silent" != x"yes" && test x"$sim_assert" != x""; then
- echo "Setting assert flags = $sim_assert" 6>&1
-fi
-else
- sim_assert=""
fi
+cat >>confdefs.h <<_ACEOF
+#define WITH_ASSERT $sim_assert
+_ACEOF
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_assert" >&5
+$as_echo "$sim_assert" >&6; }
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking default sim environment setting" >&5
+$as_echo_n "checking default sim environment setting... " >&6; }
+sim_environment="ALL_ENVIRONMENT"
# Check whether --enable-sim-environment was given.
if test "${enable_sim_environment+set}" = set; then :
enableval=$enable_sim_environment; case "${enableval}" in
- all | ALL) sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT";;
- user | USER) sim_environment="-DWITH_ENVIRONMENT=USER_ENVIRONMENT";;
- virtual | VIRTUAL) sim_environment="-DWITH_ENVIRONMENT=VIRTUAL_ENVIRONMENT";;
- operating | OPERATING) sim_environment="-DWITH_ENVIRONMENT=OPERATING_ENVIRONMENT";;
- *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-environment\"" "$LINENO" 5;
- sim_environment="";;
+ all | ALL) sim_environment="ALL_ENVIRONMENT";;
+ user | USER) sim_environment="USER_ENVIRONMENT";;
+ virtual | VIRTUAL) sim_environment="VIRTUAL_ENVIRONMENT";;
+ operating | OPERATING) sim_environment="OPERATING_ENVIRONMENT";;
+ *) as_fn_error "Unknown value $enableval passed to --enable-sim-environment" "$LINENO" 5;;
esac
-if test x"$silent" != x"yes" && test x"$sim_environment" != x""; then
- echo "Setting sim environment = $sim_environment" 6>&1
-fi
-else
- sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT"
fi
+cat >>confdefs.h <<_ACEOF
+#define WITH_ENVIRONMENT $sim_environment
+_ACEOF
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_environment" >&5
+$as_echo "$sim_environment" >&6; }
+
sim_inline="-DDEFAULT_INLINE=0"
# Check whether --enable-sim-inline was given.
diff --git a/sim/cris/ChangeLog b/sim/cris/ChangeLog
index f92e089..ef96ec7 100644
--- a/sim/cris/ChangeLog
+++ b/sim/cris/ChangeLog
@@ -1,5 +1,9 @@
2016-01-10 Mike Frysinger <vapier@gentoo.org>
+ * config.in, configure: Regenerate.
+
+2016-01-10 Mike Frysinger <vapier@gentoo.org>
+
* configure: Regenerate.
2016-01-10 Mike Frysinger <vapier@gentoo.org>
diff --git a/sim/cris/config.in b/sim/cris/config.in
index e5e69a8..124dc54 100644
--- a/sim/cris/config.in
+++ b/sim/cris/config.in
@@ -3,6 +3,9 @@
/* Define if building universal (internal helper macro) */
#undef AC_APPLE_UNIVERSAL_BUILD
+/* Sim debug setting */
+#undef DEBUG
+
/* Define to 1 if translation of program messages to the user's native
language is requested. */
#undef ENABLE_NLS
@@ -188,6 +191,9 @@
/* Additional package description */
#undef PKGVERSION
+/* Sim profile settings */
+#undef PROFILE
+
/* Bug reporting address */
#undef REPORT_BUGS_TO
@@ -219,6 +225,24 @@
#endif
+/* Sim assert settings */
+#undef WITH_ASSERT
+
+/* Sim debug setting */
+#undef WITH_DEBUG
+
+/* Sim default environment */
+#undef WITH_ENVIRONMENT
+
+/* Sim profile settings */
+#undef WITH_PROFILE
+
+/* How to route I/O */
+#undef WITH_STDIO
+
+/* Sim trace settings */
+#undef WITH_TRACE
+
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
significant byte first (like Motorola and SPARC, unlike Intel). */
#if defined AC_APPLE_UNIVERSAL_BUILD
diff --git a/sim/cris/configure b/sim/cris/configure
index 7e79cdf..2150da7 100755
--- a/sim/cris/configure
+++ b/sim/cris/configure
@@ -607,10 +607,6 @@ CGEN_MAINT
REPORT_BUGS_TEXI
REPORT_BUGS_TO
PKGVERSION
-sim_profile
-sim_trace
-sim_stdio
-sim_debug
MAINT
MAINTAINER_MODE_FALSE
MAINTAINER_MODE_TRUE
@@ -685,8 +681,6 @@ CFLAGS
CC
WERROR_CFLAGS
WARN_CFLAGS
-sim_xor_endian
-sim_smp
sim_reserved_bits
sim_inline
sim_hw
@@ -697,9 +691,7 @@ sim_scache
sim_float
sim_endian
sim_bitsize
-sim_assert
sim_alignment
-sim_environment
target_alias
host_alias
build_alias
@@ -4046,10 +4038,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-
# intl sister-directory configuration rules.
#
@@ -12857,7 +12845,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12860 "configure"
+#line 12848 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12963,7 +12951,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12966 "configure"
+#line 12954 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13231,124 +13219,164 @@ fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim debug setting" >&5
+$as_echo_n "checking for sim debug setting... " >&6; }
+sim_debug="0"
# Check whether --enable-sim-debug was given.
if test "${enable_sim_debug+set}" = set; then :
enableval=$enable_sim_debug; case "${enableval}" in
- yes) sim_debug="-DDEBUG=7 -DWITH_DEBUG=7";;
- no) sim_debug="-DDEBUG=0 -DWITH_DEBUG=0";;
- *) sim_debug="-DDEBUG='(${enableval})' -DWITH_DEBUG='(${enableval})'";;
+ yes) sim_debug="7";;
+ no) sim_debug="0";;
+ *) sim_debug="($enableval)";;
esac
-if test x"$silent" != x"yes" && test x"$sim_debug" != x""; then
- echo "Setting sim debug = $sim_debug" 6>&1
fi
-else
- sim_debug=""
+if test "$sim_debug" != "0"; then
+
+cat >>confdefs.h <<_ACEOF
+#define DEBUG $sim_debug
+_ACEOF
+
fi
+cat >>confdefs.h <<_ACEOF
+#define WITH_DEBUG $sim_debug
+_ACEOF
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_debug" >&5
+$as_echo "$sim_debug" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim stdio debug behavior" >&5
+$as_echo_n "checking for sim stdio debug behavior... " >&6; }
+sim_stdio="0"
# Check whether --enable-sim-stdio was given.
if test "${enable_sim_stdio+set}" = set; then :
enableval=$enable_sim_stdio; case "${enableval}" in
- yes) sim_stdio="-DWITH_STDIO=DO_USE_STDIO";;
- no) sim_stdio="-DWITH_STDIO=DONT_USE_STDIO";;
- *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-stdio\"" "$LINENO" 5; sim_stdio="";;
+ yes) sim_stdio="DO_USE_STDIO";;
+ no) sim_stdio="DONT_USE_STDIO";;
+ *) as_fn_error "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;;
esac
-if test x"$silent" != x"yes" && test x"$sim_stdio" != x""; then
- echo "Setting stdio flags = $sim_stdio" 6>&1
-fi
-else
- sim_stdio=""
fi
+cat >>confdefs.h <<_ACEOF
+#define WITH_STDIO $sim_stdio
+_ACEOF
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_stdio" >&5
+$as_echo "$sim_stdio" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim trace settings" >&5
+$as_echo_n "checking for sim trace settings... " >&6; }
+sim_trace="~TRACE_debug"
# Check whether --enable-sim-trace was given.
if test "${enable_sim_trace+set}" = set; then :
enableval=$enable_sim_trace; case "${enableval}" in
- yes) sim_trace="-DWITH_TRACE=-1";;
- no) sim_trace="-DWITH_TRACE=0";;
+ yes) sim_trace="-1";;
+ no) sim_trace="0";;
[-0-9]*)
- sim_trace="-DWITH_TRACE='(${enableval})'";;
+ sim_trace="'(${enableval})'";;
[[:lower:]]*)
sim_trace=""
for x in `echo "$enableval" | sed -e "s/,/ /g"`; do
if test x"$sim_trace" = x; then
- sim_trace="-DWITH_TRACE='(TRACE_$x"
+ sim_trace="(TRACE_$x"
else
sim_trace="${sim_trace}|TRACE_$x"
fi
done
- sim_trace="$sim_trace)'" ;;
+ sim_trace="$sim_trace)" ;;
esac
-if test x"$silent" != x"yes" && test x"$sim_trace" != x""; then
- echo "Setting sim trace = $sim_trace" 6>&1
-fi
-else
- sim_trace=""
fi
+cat >>confdefs.h <<_ACEOF
+#define WITH_TRACE $sim_trace
+_ACEOF
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_trace" >&5
+$as_echo "$sim_trace" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim profile settings" >&5
+$as_echo_n "checking for sim profile settings... " >&6; }
+profile="1"
+sim_profile="-1"
# Check whether --enable-sim-profile was given.
if test "${enable_sim_profile+set}" = set; then :
enableval=$enable_sim_profile; case "${enableval}" in
- yes) sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1";;
- no) sim_profile="-DPROFILE=0 -DWITH_PROFILE=0";;
+ yes) profile="1" sim_profile="-1";;
+ no) profile="0" sim_profile="0";;
[-0-9]*)
- sim_profile="-DPROFILE='(${enableval})' -DWITH_PROFILE='(${enableval})'";;
+ profile="(${enableval})" sim_profile="(${enableval})";;
[a-z]*)
+ profile="1"
sim_profile=""
for x in `echo "$enableval" | sed -e "s/,/ /g"`; do
if test x"$sim_profile" = x; then
- sim_profile="-DWITH_PROFILE='(PROFILE_$x"
+ sim_profile="(PROFILE_$x"
else
sim_profile="${sim_profile}|PROFILE_$x"
fi
done
- sim_profile="$sim_profile)'" ;;
+ sim_profile="$sim_profile)" ;;
esac
-if test x"$silent" != x"yes" && test x"$sim_profile" != x""; then
- echo "Setting sim profile = $sim_profile" 6>&1
-fi
-else
- sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1"
fi
+cat >>confdefs.h <<_ACEOF
+#define PROFILE $profile
+_ACEOF
+cat >>confdefs.h <<_ACEOF
+#define WITH_PROFILE $sim_profile
+_ACEOF
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_profile" >&5
+$as_echo "$sim_profile" >&6; }
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable sim asserts" >&5
+$as_echo_n "checking whether to enable sim asserts... " >&6; }
+sim_assert="1"
# Check whether --enable-sim-assert was given.
if test "${enable_sim_assert+set}" = set; then :
enableval=$enable_sim_assert; case "${enableval}" in
- yes) sim_assert="-DWITH_ASSERT=1";;
- no) sim_assert="-DWITH_ASSERT=0";;
- *) as_fn_error "\"--enable-sim-assert does not take a value\"" "$LINENO" 5; sim_assert="";;
+ yes) sim_assert="1";;
+ no) sim_assert="0";;
+ *) as_fn_error "--enable-sim-assert does not take a value" "$LINENO" 5;;
esac
-if test x"$silent" != x"yes" && test x"$sim_assert" != x""; then
- echo "Setting assert flags = $sim_assert" 6>&1
-fi
-else
- sim_assert=""
fi
+cat >>confdefs.h <<_ACEOF
+#define WITH_ASSERT $sim_assert
+_ACEOF
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_assert" >&5
+$as_echo "$sim_assert" >&6; }
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking default sim environment setting" >&5
+$as_echo_n "checking default sim environment setting... " >&6; }
+sim_environment="ALL_ENVIRONMENT"
# Check whether --enable-sim-environment was given.
if test "${enable_sim_environment+set}" = set; then :
enableval=$enable_sim_environment; case "${enableval}" in
- all | ALL) sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT";;
- user | USER) sim_environment="-DWITH_ENVIRONMENT=USER_ENVIRONMENT";;
- virtual | VIRTUAL) sim_environment="-DWITH_ENVIRONMENT=VIRTUAL_ENVIRONMENT";;
- operating | OPERATING) sim_environment="-DWITH_ENVIRONMENT=OPERATING_ENVIRONMENT";;
- *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-environment\"" "$LINENO" 5;
- sim_environment="";;
+ all | ALL) sim_environment="ALL_ENVIRONMENT";;
+ user | USER) sim_environment="USER_ENVIRONMENT";;
+ virtual | VIRTUAL) sim_environment="VIRTUAL_ENVIRONMENT";;
+ operating | OPERATING) sim_environment="OPERATING_ENVIRONMENT";;
+ *) as_fn_error "Unknown value $enableval passed to --enable-sim-environment" "$LINENO" 5;;
esac
-if test x"$silent" != x"yes" && test x"$sim_environment" != x""; then
- echo "Setting sim environment = $sim_environment" 6>&1
-fi
-else
- sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT"
fi
+cat >>confdefs.h <<_ACEOF
+#define WITH_ENVIRONMENT $sim_environment
+_ACEOF
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_environment" >&5
+$as_echo "$sim_environment" >&6; }
+
sim_inline="-DDEFAULT_INLINE=0"
# Check whether --enable-sim-inline was given.
diff --git a/sim/d10v/ChangeLog b/sim/d10v/ChangeLog
index 09516f4..e889e3f 100644
--- a/sim/d10v/ChangeLog
+++ b/sim/d10v/ChangeLog
@@ -1,5 +1,9 @@
2016-01-10 Mike Frysinger <vapier@gentoo.org>
+ * config.in, configure: Regenerate.
+
+2016-01-10 Mike Frysinger <vapier@gentoo.org>
+
* configure: Regenerate.
2016-01-10 Mike Frysinger <vapier@gentoo.org>
diff --git a/sim/d10v/config.in b/sim/d10v/config.in
index f24eb3b..aa3e45c 100644
--- a/sim/d10v/config.in
+++ b/sim/d10v/config.in
@@ -3,6 +3,9 @@
/* Define if building universal (internal helper macro) */
#undef AC_APPLE_UNIVERSAL_BUILD
+/* Sim debug setting */
+#undef DEBUG
+
/* Define to 1 if translation of program messages to the user's native
language is requested. */
#undef ENABLE_NLS
@@ -170,6 +173,9 @@
/* Additional package description */
#undef PKGVERSION
+/* Sim profile settings */
+#undef PROFILE
+
/* Bug reporting address */
#undef REPORT_BUGS_TO
@@ -201,6 +207,24 @@
#endif
+/* Sim assert settings */
+#undef WITH_ASSERT
+
+/* Sim debug setting */
+#undef WITH_DEBUG
+
+/* Sim default environment */
+#undef WITH_ENVIRONMENT
+
+/* Sim profile settings */
+#undef WITH_PROFILE
+
+/* How to route I/O */
+#undef WITH_STDIO
+
+/* Sim trace settings */
+#undef WITH_TRACE
+
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
significant byte first (like Motorola and SPARC, unlike Intel). */
#if defined AC_APPLE_UNIVERSAL_BUILD
diff --git a/sim/d10v/configure b/sim/d10v/configure
index c16d784..e177055 100755
--- a/sim/d10v/configure
+++ b/sim/d10v/configure
@@ -604,10 +604,6 @@ cgen_breaks
REPORT_BUGS_TEXI
REPORT_BUGS_TO
PKGVERSION
-sim_profile
-sim_trace
-sim_stdio
-sim_debug
MAINT
MAINTAINER_MODE_FALSE
MAINTAINER_MODE_TRUE
@@ -682,8 +678,6 @@ CFLAGS
CC
WERROR_CFLAGS
WARN_CFLAGS
-sim_xor_endian
-sim_smp
sim_reserved_bits
sim_inline
sim_hw
@@ -694,9 +688,7 @@ sim_scache
sim_float
sim_endian
sim_bitsize
-sim_assert
sim_alignment
-sim_environment
target_alias
host_alias
build_alias
@@ -4032,10 +4024,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-
# intl sister-directory configuration rules.
#
@@ -12843,7 +12831,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12846 "configure"
+#line 12834 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12949,7 +12937,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12952 "configure"
+#line 12940 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13217,124 +13205,164 @@ fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim debug setting" >&5
+$as_echo_n "checking for sim debug setting... " >&6; }
+sim_debug="0"
# Check whether --enable-sim-debug was given.
if test "${enable_sim_debug+set}" = set; then :
enableval=$enable_sim_debug; case "${enableval}" in
- yes) sim_debug="-DDEBUG=7 -DWITH_DEBUG=7";;
- no) sim_debug="-DDEBUG=0 -DWITH_DEBUG=0";;
- *) sim_debug="-DDEBUG='(${enableval})' -DWITH_DEBUG='(${enableval})'";;
+ yes) sim_debug="7";;
+ no) sim_debug="0";;
+ *) sim_debug="($enableval)";;
esac
-if test x"$silent" != x"yes" && test x"$sim_debug" != x""; then
- echo "Setting sim debug = $sim_debug" 6>&1
fi
-else
- sim_debug=""
+if test "$sim_debug" != "0"; then
+
+cat >>confdefs.h <<_ACEOF
+#define DEBUG $sim_debug
+_ACEOF
+
fi
+cat >>confdefs.h <<_ACEOF
+#define WITH_DEBUG $sim_debug
+_ACEOF
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_debug" >&5
+$as_echo "$sim_debug" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim stdio debug behavior" >&5
+$as_echo_n "checking for sim stdio debug behavior... " >&6; }
+sim_stdio="0"
# Check whether --enable-sim-stdio was given.
if test "${enable_sim_stdio+set}" = set; then :
enableval=$enable_sim_stdio; case "${enableval}" in
- yes) sim_stdio="-DWITH_STDIO=DO_USE_STDIO";;
- no) sim_stdio="-DWITH_STDIO=DONT_USE_STDIO";;
- *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-stdio\"" "$LINENO" 5; sim_stdio="";;
+ yes) sim_stdio="DO_USE_STDIO";;
+ no) sim_stdio="DONT_USE_STDIO";;
+ *) as_fn_error "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;;
esac
-if test x"$silent" != x"yes" && test x"$sim_stdio" != x""; then
- echo "Setting stdio flags = $sim_stdio" 6>&1
-fi
-else
- sim_stdio=""
fi
+cat >>confdefs.h <<_ACEOF
+#define WITH_STDIO $sim_stdio
+_ACEOF
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_stdio" >&5
+$as_echo "$sim_stdio" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim trace settings" >&5
+$as_echo_n "checking for sim trace settings... " >&6; }
+sim_trace="~TRACE_debug"
# Check whether --enable-sim-trace was given.
if test "${enable_sim_trace+set}" = set; then :
enableval=$enable_sim_trace; case "${enableval}" in
- yes) sim_trace="-DWITH_TRACE=-1";;
- no) sim_trace="-DWITH_TRACE=0";;
+ yes) sim_trace="-1";;
+ no) sim_trace="0";;
[-0-9]*)
- sim_trace="-DWITH_TRACE='(${enableval})'";;
+ sim_trace="'(${enableval})'";;
[[:lower:]]*)
sim_trace=""
for x in `echo "$enableval" | sed -e "s/,/ /g"`; do
if test x"$sim_trace" = x; then
- sim_trace="-DWITH_TRACE='(TRACE_$x"
+ sim_trace="(TRACE_$x"
else
sim_trace="${sim_trace}|TRACE_$x"
fi
done
- sim_trace="$sim_trace)'" ;;
+ sim_trace="$sim_trace)" ;;
esac
-if test x"$silent" != x"yes" && test x"$sim_trace" != x""; then
- echo "Setting sim trace = $sim_trace" 6>&1
-fi
-else
- sim_trace=""
fi
+cat >>confdefs.h <<_ACEOF
+#define WITH_TRACE $sim_trace
+_ACEOF
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_trace" >&5
+$as_echo "$sim_trace" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim profile settings" >&5
+$as_echo_n "checking for sim profile settings... " >&6; }
+profile="1"
+sim_profile="-1"
# Check whether --enable-sim-profile was given.
if test "${enable_sim_profile+set}" = set; then :
enableval=$enable_sim_profile; case "${enableval}" in
- yes) sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1";;
- no) sim_profile="-DPROFILE=0 -DWITH_PROFILE=0";;
+ yes) profile="1" sim_profile="-1";;
+ no) profile="0" sim_profile="0";;
[-0-9]*)
- sim_profile="-DPROFILE='(${enableval})' -DWITH_PROFILE='(${enableval})'";;
+ profile="(${enableval})" sim_profile="(${enableval})";;
[a-z]*)
+ profile="1"
sim_profile=""
for x in `echo "$enableval" | sed -e "s/,/ /g"`; do
if test x"$sim_profile" = x; then
- sim_profile="-DWITH_PROFILE='(PROFILE_$x"
+ sim_profile="(PROFILE_$x"
else
sim_profile="${sim_profile}|PROFILE_$x"
fi
done
- sim_profile="$sim_profile)'" ;;
+ sim_profile="$sim_profile)" ;;
esac
-if test x"$silent" != x"yes" && test x"$sim_profile" != x""; then
- echo "Setting sim profile = $sim_profile" 6>&1
-fi
-else
- sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1"
fi
+cat >>confdefs.h <<_ACEOF
+#define PROFILE $profile
+_ACEOF
+cat >>confdefs.h <<_ACEOF
+#define WITH_PROFILE $sim_profile
+_ACEOF
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_profile" >&5
+$as_echo "$sim_profile" >&6; }
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable sim asserts" >&5
+$as_echo_n "checking whether to enable sim asserts... " >&6; }
+sim_assert="1"
# Check whether --enable-sim-assert was given.
if test "${enable_sim_assert+set}" = set; then :
enableval=$enable_sim_assert; case "${enableval}" in
- yes) sim_assert="-DWITH_ASSERT=1";;
- no) sim_assert="-DWITH_ASSERT=0";;
- *) as_fn_error "\"--enable-sim-assert does not take a value\"" "$LINENO" 5; sim_assert="";;
+ yes) sim_assert="1";;
+ no) sim_assert="0";;
+ *) as_fn_error "--enable-sim-assert does not take a value" "$LINENO" 5;;
esac
-if test x"$silent" != x"yes" && test x"$sim_assert" != x""; then
- echo "Setting assert flags = $sim_assert" 6>&1
-fi
-else
- sim_assert=""
fi
+cat >>confdefs.h <<_ACEOF
+#define WITH_ASSERT $sim_assert
+_ACEOF
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_assert" >&5
+$as_echo "$sim_assert" >&6; }
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking default sim environment setting" >&5
+$as_echo_n "checking default sim environment setting... " >&6; }
+sim_environment="ALL_ENVIRONMENT"
# Check whether --enable-sim-environment was given.
if test "${enable_sim_environment+set}" = set; then :
enableval=$enable_sim_environment; case "${enableval}" in
- all | ALL) sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT";;
- user | USER) sim_environment="-DWITH_ENVIRONMENT=USER_ENVIRONMENT";;
- virtual | VIRTUAL) sim_environment="-DWITH_ENVIRONMENT=VIRTUAL_ENVIRONMENT";;
- operating | OPERATING) sim_environment="-DWITH_ENVIRONMENT=OPERATING_ENVIRONMENT";;
- *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-environment\"" "$LINENO" 5;
- sim_environment="";;
+ all | ALL) sim_environment="ALL_ENVIRONMENT";;
+ user | USER) sim_environment="USER_ENVIRONMENT";;
+ virtual | VIRTUAL) sim_environment="VIRTUAL_ENVIRONMENT";;
+ operating | OPERATING) sim_environment="OPERATING_ENVIRONMENT";;
+ *) as_fn_error "Unknown value $enableval passed to --enable-sim-environment" "$LINENO" 5;;
esac
-if test x"$silent" != x"yes" && test x"$sim_environment" != x""; then
- echo "Setting sim environment = $sim_environment" 6>&1
-fi
-else
- sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT"
fi
+cat >>confdefs.h <<_ACEOF
+#define WITH_ENVIRONMENT $sim_environment
+_ACEOF
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_environment" >&5
+$as_echo "$sim_environment" >&6; }
+
sim_inline="-DDEFAULT_INLINE=0"
# Check whether --enable-sim-inline was given.
diff --git a/sim/erc32/ChangeLog b/sim/erc32/ChangeLog
index aedefb8..c8f75f7 100644
--- a/sim/erc32/ChangeLog
+++ b/sim/erc32/ChangeLog
@@ -1,5 +1,9 @@
2016-01-10 Mike Frysinger <vapier@gentoo.org>
+ * config.in, configure: Regenerate.
+
+2016-01-10 Mike Frysinger <vapier@gentoo.org>
+
* configure: Regenerate.
2016-01-10 Mike Frysinger <vapier@gentoo.org>
diff --git a/sim/erc32/config.in b/sim/erc32/config.in
index f24eb3b..aa3e45c 100644
--- a/sim/erc32/config.in
+++ b/sim/erc32/config.in
@@ -3,6 +3,9 @@
/* Define if building universal (internal helper macro) */
#undef AC_APPLE_UNIVERSAL_BUILD
+/* Sim debug setting */
+#undef DEBUG
+
/* Define to 1 if translation of program messages to the user's native
language is requested. */
#undef ENABLE_NLS
@@ -170,6 +173,9 @@
/* Additional package description */
#undef PKGVERSION
+/* Sim profile settings */
+#undef PROFILE
+
/* Bug reporting address */
#undef REPORT_BUGS_TO
@@ -201,6 +207,24 @@
#endif
+/* Sim assert settings */
+#undef WITH_ASSERT
+
+/* Sim debug setting */
+#undef WITH_DEBUG
+
+/* Sim default environment */
+#undef WITH_ENVIRONMENT
+
+/* Sim profile settings */
+#undef WITH_PROFILE
+
+/* How to route I/O */
+#undef WITH_STDIO
+
+/* Sim trace settings */
+#undef WITH_TRACE
+
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
significant byte first (like Motorola and SPARC, unlike Intel). */
#if defined AC_APPLE_UNIVERSAL_BUILD
diff --git a/sim/erc32/configure b/sim/erc32/configure
index e7a4840..8f9a558 100755
--- a/sim/erc32/configure
+++ b/sim/erc32/configure
@@ -606,10 +606,6 @@ TERMCAP
REPORT_BUGS_TEXI
REPORT_BUGS_TO
PKGVERSION
-sim_profile
-sim_trace
-sim_stdio
-sim_debug
MAINT
MAINTAINER_MODE_FALSE
MAINTAINER_MODE_TRUE
@@ -684,8 +680,6 @@ CFLAGS
CC
WERROR_CFLAGS
WARN_CFLAGS
-sim_xor_endian
-sim_smp
sim_reserved_bits
sim_inline
sim_hw
@@ -696,9 +690,7 @@ sim_scache
sim_float
sim_endian
sim_bitsize
-sim_assert
sim_alignment
-sim_environment
target_alias
host_alias
build_alias
@@ -4019,10 +4011,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-
# intl sister-directory configuration rules.
#
@@ -12830,7 +12818,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12833 "configure"
+#line 12821 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12936,7 +12924,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12939 "configure"
+#line 12927 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13204,124 +13192,164 @@ fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim debug setting" >&5
+$as_echo_n "checking for sim debug setting... " >&6; }
+sim_debug="0"
# Check whether --enable-sim-debug was given.
if test "${enable_sim_debug+set}" = set; then :
enableval=$enable_sim_debug; case "${enableval}" in
- yes) sim_debug="-DDEBUG=7 -DWITH_DEBUG=7";;
- no) sim_debug="-DDEBUG=0 -DWITH_DEBUG=0";;
- *) sim_debug="-DDEBUG='(${enableval})' -DWITH_DEBUG='(${enableval})'";;
+ yes) sim_debug="7";;
+ no) sim_debug="0";;
+ *) sim_debug="($enableval)";;
esac
-if test x"$silent" != x"yes" && test x"$sim_debug" != x""; then
- echo "Setting sim debug = $sim_debug" 6>&1
fi
-else
- sim_debug=""
+if test "$sim_debug" != "0"; then
+
+cat >>confdefs.h <<_ACEOF
+#define DEBUG $sim_debug
+_ACEOF
+
fi
+cat >>confdefs.h <<_ACEOF
+#define WITH_DEBUG $sim_debug
+_ACEOF
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_debug" >&5
+$as_echo "$sim_debug" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim stdio debug behavior" >&5
+$as_echo_n "checking for sim stdio debug behavior... " >&6; }
+sim_stdio="0"
# Check whether --enable-sim-stdio was given.
if test "${enable_sim_stdio+set}" = set; then :
enableval=$enable_sim_stdio; case "${enableval}" in
- yes) sim_stdio="-DWITH_STDIO=DO_USE_STDIO";;
- no) sim_stdio="-DWITH_STDIO=DONT_USE_STDIO";;
- *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-stdio\"" "$LINENO" 5; sim_stdio="";;
+ yes) sim_stdio="DO_USE_STDIO";;
+ no) sim_stdio="DONT_USE_STDIO";;
+ *) as_fn_error "Unknown value $enableval passed to --enable-sim-stdio" "$LINENO" 5;;
esac
-if test x"$silent" != x"yes" && test x"$sim_stdio" != x""; then
- echo "Setting stdio flags = $sim_stdio" 6>&1
-fi
-else
- sim_stdio=""
fi
+cat >>confdefs.h <<_ACEOF
+#define WITH_STDIO $sim_stdio
+_ACEOF
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_stdio" >&5
+$as_echo "$sim_stdio" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim trace settings" >&5
+$as_echo_n "checking for sim trace settings... " >&6; }
+sim_trace="~TRACE_debug"
# Check whether --enable-sim-trace was given.
if test "${enable_sim_trace+set}" = set; then :
enableval=$enable_sim_trace; case "${enableval}" in
- yes) sim_trace="-DWITH_TRACE=-1";;
- no) sim_trace="-DWITH_TRACE=0";;
+ yes) sim_trace="-1";;
+ no) sim_trace="0";;
[-0-9]*)
- sim_trace="-DWITH_TRACE='(${enableval})'";;
+ sim_trace="'(${enableval})'";;
[[:lower:]]*)
sim_trace=""
for x in `echo "$enableval" | sed -e "s/,/ /g"`; do
if test x"$sim_trace" = x; then
- sim_trace="-DWITH_TRACE='(TRACE_$x"
+ sim_trace="(TRACE_$x"
else
sim_trace="${sim_trace}|TRACE_$x"
fi
done
- sim_trace="$sim_trace)'" ;;
+ sim_trace="$sim_trace)" ;;
esac
-if test x"$silent" != x"yes" && test x"$sim_trace" != x""; then
- echo "Setting sim trace = $sim_trace" 6>&1
-fi
-else
- sim_trace=""
fi
+cat >>confdefs.h <<_ACEOF
+#define WITH_TRACE $sim_trace
+_ACEOF
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_trace" >&5
+$as_echo "$sim_trace" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sim profile settings" >&5
+$as_echo_n "checking for sim profile settings... " >&6; }
+profile="1"
+sim_profile="-1"
# Check whether --enable-sim-profile was given.
if test "${enable_sim_profile+set}" = set; then :
enableval=$enable_sim_profile; case "${enableval}" in
- yes) sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1";;
- no) sim_profile="-DPROFILE=0 -DWITH_PROFILE=0";;
+ yes) profile="1" sim_profile="-1";;
+ no) profile="0" sim_profile="0";;
[-0-9]*)
- sim_profile="-DPROFILE='(${enableval})' -DWITH_PROFILE='(${enableval})'";;
+ profile="(${enableval})" sim_profile="(${enableval})";;
[a-z]*)
+ profile="1"
sim_profile=""
for x in `echo "$enableval" | sed -e "s/,/ /g"`; do
if test x"$sim_profile" = x; then
- sim_profile="-DWITH_PROFILE='(PROFILE_$x"
+ sim_profile="(PROFILE_$x"
else
sim_profile="${sim_profile}|PROFILE_$x"
fi
done
- sim_profile="$sim_profile)'" ;;
+ sim_profile="$sim_profile)" ;;
esac
-if test x"$silent" != x"yes" && test x"$sim_profile" != x""; then
- echo "Setting sim profile = $sim_profile" 6>&1
-fi
-else
- sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1"
fi
+cat >>confdefs.h <<_ACEOF
+#define PROFILE $profile
+_ACEOF
+cat >>confdefs.h <<_ACEOF
+#define WITH_PROFILE $sim_profile
+_ACEOF
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_profile" >&5
+$as_echo "$sim_profile" >&6; }
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable sim asserts" >&5
+$as_echo_n "checking whether to enable sim asserts... " >&6; }
+sim_assert="1"
# Check whether --enable-sim-assert was given.
if test "${enable_sim_assert+set}" = set; then :
enableval=$enable_sim_assert; case "${enableval}" in
- yes) sim_assert="-DWITH_ASSERT=1";;
- no) sim_assert="-DWITH_ASSERT=0";;
- *) as_fn_error "\"--enable-sim-assert does not take a value\"" "$LINENO" 5; sim_assert="";;
+ yes) sim_assert="1";;
+ no) sim_assert="0";;
+ *) as_fn_error "--enable-sim-assert does not take a value" "$LINENO" 5;;
esac
-if test x"$silent" != x"yes" && test x"$sim_assert" != x""; then
- echo "Setting assert flags = $sim_assert" 6>&1
-fi
-else
- sim_assert=""
fi
+cat >>confdefs.h <<_ACEOF
+#define WITH_ASSERT $sim_assert
+_ACEOF
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $sim_assert" >&5
+$as_echo "$sim_assert" >&6; }
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking default sim environment setting" >&5
+$as_echo_n "checking default sim environment setting... " >&6; }
+sim_environment="ALL_ENVIRONMENT"
# Check whether --enable-sim-environment was given.
if test "${enable_sim_environment+set}" = set; then :
enableval=$enable_sim_environment; case "${enableval}" in
- all | ALL) sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT";;
- user | USER) sim_environment="-DWITH_ENVIRONMENT=USER_ENVIRONMENT";;
- virtual | VIRTUAL) sim_environment="-DWITH_ENVIRONMENT=VIRTUAL_ENVIRONMENT";;
- operating | OPERATING) sim_environment="-DWITH_ENVIRONMENT=OPERATING_ENVIRONMENT";;
- *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-environment\"" "$LINENO" 5;
- sim_environment="";;
+ all | ALL) sim_environment="ALL_ENVIRONMENT";;
+ user | USER) sim_environment="USER_ENVIRONMENT";;
+ virtual | VIRTUAL) sim_environment="VIRTUAL_ENVIRONMENT";;
+ operating | OPERATING) sim_environment="OPERATING_ENVIRONMENT";;
+ *) as_fn_error "Unknown value $enableval passed to --enable-sim-environment" "$LINENO" 5;;
esac
-if test x"$silent" != x"yes" && test x"$sim_environment" != x""; then
- echo "Setting sim environment = $sim_environment" 6>&1
-fi
-else
- sim_environment="-DWITH_ENVIRONMENT=ALL_ENVIRONMENT"
fi
+cat >>confdefs.h <<_ACEOF
+#define WITH_ENVIRONMENT $sim_environment
+_ACEOF
+
+{ $[...]
[diff truncated at 100000 bytes]