From 35656e95217a20309c0a0f16bf0c89a49a549177 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 10 Jan 2016 15:55:44 -0500
Subject: sim: allow the assert configure option everywhere

Currently ports have to call SIM_AC_OPTION_ASSERT explicitly in order
to make the configure flag available, which none of them do.  There's
no real reason to not allow this flag for all ports, so move it to the
common sim macro.  This way we get standard behavior across all ports.
---
 sim/cris/ChangeLog |  4 ++++
 sim/cris/configure | 21 +++++++++++++++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)

(limited to 'sim/cris')

diff --git a/sim/cris/ChangeLog b/sim/cris/ChangeLog
index 0420390..2583d8b 100644
--- a/sim/cris/ChangeLog
+++ b/sim/cris/ChangeLog
@@ -4,6 +4,10 @@
 
 2016-01-10  Mike Frysinger  <vapier@gentoo.org>
 
+	* configure: Regenerate.
+
+2016-01-10  Mike Frysinger  <vapier@gentoo.org>
+
 	* configure.ac (SIM_AC_OPTION_INLINE): Delete call.
 	* configure: Regenerate.
 
diff --git a/sim/cris/configure b/sim/cris/configure
index 1f1793d..7b5d765 100755
--- a/sim/cris/configure
+++ b/sim/cris/configure
@@ -755,6 +755,7 @@ enable_sim_debug
 enable_sim_stdio
 enable_sim_trace
 enable_sim_profile
+enable_sim_assert
 enable_sim_inline
 with_pkgversion
 with_bugurl
@@ -1411,6 +1412,7 @@ Optional Features:
   --enable-sim-trace=opts Enable tracing of simulated programs
   --enable-sim-profile=opts
                           Enable profiling flags
+  --enable-sim-assert     Specify whether to perform random assertions
   --enable-sim-inline=inlines
                           Specify which functions should be inlined
   --enable-sim-endian=endian
@@ -12860,7 +12862,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12863 "configure"
+#line 12865 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12966,7 +12968,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12969 "configure"
+#line 12971 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13320,6 +13322,21 @@ fi
 
 
 
+# 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="";;
+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
+
+
 sim_inline="-DDEFAULT_INLINE=0"
 # Check whether --enable-sim-inline was given.
 if test "${enable_sim_inline+set}" = set; then :
-- 
cgit v1.1