sim: unify assert build settings

Move the --sim-enable-assert option up to the common dir so we only
test & export it once across all ports.

4 files changed, 6 insertions, 28 deletions

diff --git a/sim/rx/ChangeLog b/sim/rx/ChangeLog
index 34a274a222..c358f7c1fe 100644
--- a/sim/rx/ChangeLog
+++ b/sim/rx/ChangeLog
@@ -1,5 +1,9 @@
 2021-06-12  Mike Frysinger  <vapier@gentoo.org>
 
+	* aclocal.m4, config.in, configure: Regenerate.
+
+2021-06-12  Mike Frysinger  <vapier@gentoo.org>
+
 	* config.in, configure: Regenerate.
 
 2021-05-16  Mike Frysinger  <vapier@gentoo.org>
diff --git a/sim/rx/aclocal.m4 b/sim/rx/aclocal.m4
index ed052697cd..cff614273b 100644
--- a/sim/rx/aclocal.m4
+++ b/sim/rx/aclocal.m4
@@ -111,7 +111,6 @@ m4_include([../../ltsugar.m4])
 m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
 m4_include([../m4/sim_ac_common.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
 m4_include([../m4/sim_ac_option_environment.m4])
 m4_include([../m4/sim_ac_option_hardware.m4])
 m4_include([../m4/sim_ac_option_inline.m4])
diff --git a/sim/rx/config.in b/sim/rx/config.in
index 67b0039a17..01c7aefa50 100644
--- a/sim/rx/config.in
+++ b/sim/rx/config.in
@@ -120,9 +120,6 @@
 #endif
 
 
-/* Sim assert settings */
-#undef WITH_ASSERT
-
 /* Sim debug setting */
 #undef WITH_DEBUG
 
diff --git a/sim/rx/configure b/sim/rx/configure
index 9f48a5ec6e..7088573e5f 100755
--- a/sim/rx/configure
+++ b/sim/rx/configure
@@ -775,7 +775,6 @@ enable_sim_debug
 enable_sim_stdio
 enable_sim_trace
 enable_sim_profile
-enable_sim_assert
 enable_sim_environment
 enable_sim_inline
 with_pkgversion
@@ -1429,7 +1428,6 @@ 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-environment=environment
                           Specify mixed, user, virtual or operating
                           environment
@@ -10782,7 +10780,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10785 "configure"
+#line 10783 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10888,7 +10886,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10891 "configure"
+#line 10889 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11271,26 +11269,6 @@ $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="1";;
-  no)	sim_assert="0";;
-  *)	as_fn_error $? "--enable-sim-assert does not take a value" "$LINENO" 5;;
-esac
-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"