[binutils-gdb] sim: unify assert build settings

Michael Frysinger vapier@sourceware.org
Sat Jun 12 14:58:45 GMT 2021


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

commit dba333c1e4051400983d3cb8b13c9c4a2d766e9c
Author: Mike Frysinger <vapier@gentoo.org>
Date:   Sun Jun 6 18:45:05 2021 -0400

    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.

Diff:
---
 sim/ChangeLog                  |  6 ++++++
 sim/Makefile.in                |  1 +
 sim/aarch64/ChangeLog          |  4 ++++
 sim/aarch64/aclocal.m4         |  1 -
 sim/aarch64/config.in          |  3 ---
 sim/aarch64/configure          | 26 ++------------------------
 sim/aclocal.m4                 |  1 +
 sim/arm/ChangeLog              |  4 ++++
 sim/arm/aclocal.m4             |  1 -
 sim/arm/config.in              |  3 ---
 sim/arm/configure              | 26 ++------------------------
 sim/avr/ChangeLog              |  4 ++++
 sim/avr/aclocal.m4             |  1 -
 sim/avr/config.in              |  3 ---
 sim/avr/configure              | 26 ++------------------------
 sim/bfin/ChangeLog             |  4 ++++
 sim/bfin/aclocal.m4            |  1 -
 sim/bfin/config.in             |  3 ---
 sim/bfin/configure             | 26 ++------------------------
 sim/bpf/ChangeLog              |  4 ++++
 sim/bpf/aclocal.m4             |  1 -
 sim/bpf/config.in              |  3 ---
 sim/bpf/configure              | 26 ++------------------------
 sim/config.h.in                |  3 +++
 sim/configure                  | 23 +++++++++++++++++++++++
 sim/configure.ac               |  2 ++
 sim/cr16/ChangeLog             |  4 ++++
 sim/cr16/aclocal.m4            |  1 -
 sim/cr16/config.in             |  3 ---
 sim/cr16/configure             | 26 ++------------------------
 sim/cris/ChangeLog             |  4 ++++
 sim/cris/aclocal.m4            |  1 -
 sim/cris/config.in             |  3 ---
 sim/cris/configure             | 26 ++------------------------
 sim/d10v/ChangeLog             |  4 ++++
 sim/d10v/aclocal.m4            |  1 -
 sim/d10v/config.in             |  3 ---
 sim/d10v/configure             | 26 ++------------------------
 sim/erc32/ChangeLog            |  4 ++++
 sim/erc32/aclocal.m4           |  1 -
 sim/erc32/config.in            |  3 ---
 sim/erc32/configure            | 26 ++------------------------
 sim/example-synacor/ChangeLog  |  4 ++++
 sim/example-synacor/aclocal.m4 |  1 -
 sim/example-synacor/config.in  |  3 ---
 sim/example-synacor/configure  | 26 ++------------------------
 sim/frv/ChangeLog              |  4 ++++
 sim/frv/aclocal.m4             |  1 -
 sim/frv/config.in              |  3 ---
 sim/frv/configure              | 26 ++------------------------
 sim/ft32/ChangeLog             |  4 ++++
 sim/ft32/aclocal.m4            |  1 -
 sim/ft32/config.in             |  3 ---
 sim/ft32/configure             | 26 ++------------------------
 sim/h8300/ChangeLog            |  4 ++++
 sim/h8300/aclocal.m4           |  1 -
 sim/h8300/config.in            |  3 ---
 sim/h8300/configure            | 26 ++------------------------
 sim/iq2000/ChangeLog           |  4 ++++
 sim/iq2000/aclocal.m4          |  1 -
 sim/iq2000/config.in           |  3 ---
 sim/iq2000/configure           | 26 ++------------------------
 sim/lm32/ChangeLog             |  4 ++++
 sim/lm32/aclocal.m4            |  1 -
 sim/lm32/config.in             |  3 ---
 sim/lm32/configure             | 26 ++------------------------
 sim/m32c/ChangeLog             |  4 ++++
 sim/m32c/aclocal.m4            |  1 -
 sim/m32c/config.in             |  3 ---
 sim/m32c/configure             | 26 ++------------------------
 sim/m32r/ChangeLog             |  4 ++++
 sim/m32r/aclocal.m4            |  1 -
 sim/m32r/config.in             |  3 ---
 sim/m32r/configure             | 26 ++------------------------
 sim/m4/sim_ac_common.m4        |  1 -
 sim/m68hc11/ChangeLog          |  4 ++++
 sim/m68hc11/aclocal.m4         |  1 -
 sim/m68hc11/config.in          |  3 ---
 sim/m68hc11/configure          | 26 ++------------------------
 sim/mcore/ChangeLog            |  4 ++++
 sim/mcore/aclocal.m4           |  1 -
 sim/mcore/config.in            |  3 ---
 sim/mcore/configure            | 26 ++------------------------
 sim/microblaze/ChangeLog       |  4 ++++
 sim/microblaze/aclocal.m4      |  1 -
 sim/microblaze/config.in       |  3 ---
 sim/microblaze/configure       | 26 ++------------------------
 sim/mips/ChangeLog             |  4 ++++
 sim/mips/aclocal.m4            |  1 -
 sim/mips/config.in             |  3 ---
 sim/mips/configure             | 26 ++------------------------
 sim/mn10300/ChangeLog          |  4 ++++
 sim/mn10300/aclocal.m4         |  1 -
 sim/mn10300/config.in          |  3 ---
 sim/mn10300/configure          | 26 ++------------------------
 sim/moxie/ChangeLog            |  4 ++++
 sim/moxie/aclocal.m4           |  1 -
 sim/moxie/config.in            |  3 ---
 sim/moxie/configure            | 26 ++------------------------
 sim/msp430/ChangeLog           |  4 ++++
 sim/msp430/aclocal.m4          |  1 -
 sim/msp430/config.in           |  3 ---
 sim/msp430/configure           | 26 ++------------------------
 sim/or1k/ChangeLog             |  4 ++++
 sim/or1k/aclocal.m4            |  1 -
 sim/or1k/config.in             |  3 ---
 sim/or1k/configure             | 26 ++------------------------
 sim/pru/ChangeLog              |  4 ++++
 sim/pru/aclocal.m4             |  1 -
 sim/pru/config.in              |  3 ---
 sim/pru/configure              | 26 ++------------------------
 sim/riscv/ChangeLog            |  4 ++++
 sim/riscv/aclocal.m4           |  1 -
 sim/riscv/config.in            |  3 ---
 sim/riscv/configure            | 26 ++------------------------
 sim/rl78/ChangeLog             |  4 ++++
 sim/rl78/aclocal.m4            |  1 -
 sim/rl78/config.in             |  3 ---
 sim/rl78/configure             | 26 ++------------------------
 sim/rx/ChangeLog               |  4 ++++
 sim/rx/aclocal.m4              |  1 -
 sim/rx/config.in               |  3 ---
 sim/rx/configure               | 26 ++------------------------
 sim/sh/ChangeLog               |  4 ++++
 sim/sh/aclocal.m4              |  1 -
 sim/sh/config.in               |  3 ---
 sim/sh/configure               | 26 ++------------------------
 sim/v850/ChangeLog             |  4 ++++
 sim/v850/aclocal.m4            |  1 -
 sim/v850/config.in             |  3 ---
 sim/v850/configure             | 26 ++------------------------
 131 files changed, 222 insertions(+), 869 deletions(-)

diff --git a/sim/ChangeLog b/sim/ChangeLog
index b05a2b88eb9..94ba4dedbff 100644
--- a/sim/ChangeLog
+++ b/sim/ChangeLog
@@ -1,3 +1,9 @@
+2021-06-12  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac: Call SIM_AC_OPTION_ASSERT.
+	* m4/sim_ac_common.m4: Delete call to SIM_AC_OPTION_ASSERT.
+	* aclocal.m4, config.h.in, configure, Makefile.in: Regenerate.
+
 2021-06-12  Mike Frysinger  <vapier@gentoo.org>
 
 	* configure.ac: Call AC_CONFIG_HEADERS and SIM_AC_PLATFORM.
diff --git a/sim/Makefile.in b/sim/Makefile.in
index 4104bb85a7d..d8a993af838 100644
--- a/sim/Makefile.in
+++ b/sim/Makefile.in
@@ -197,6 +197,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \
 	$(top_srcdir)/../config/lead-dot.m4 \
 	$(top_srcdir)/../config/override.m4 \
+	$(top_srcdir)/m4/sim_ac_option_assert.m4 \
 	$(top_srcdir)/m4/sim_ac_platform.m4 \
 	$(top_srcdir)/m4/sim_ac_toolchain.m4 \
 	$(top_srcdir)/configure.ac
diff --git a/sim/aarch64/ChangeLog b/sim/aarch64/ChangeLog
index 5ee34d5c10a..28d73faa0d4 100644
--- a/sim/aarch64/ChangeLog
+++ b/sim/aarch64/ChangeLog
@@ -1,3 +1,7 @@
+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.
diff --git a/sim/aarch64/aclocal.m4 b/sim/aarch64/aclocal.m4
index 4300d0eac67..db1cdbfd2e8 100644
--- a/sim/aarch64/aclocal.m4
+++ b/sim/aarch64/aclocal.m4
@@ -112,7 +112,6 @@ m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
 m4_include([../m4/sim_ac_common.m4])
 m4_include([../m4/sim_ac_option_alignment.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
 m4_include([../m4/sim_ac_option_endian.m4])
 m4_include([../m4/sim_ac_option_environment.m4])
 m4_include([../m4/sim_ac_option_hardware.m4])
diff --git a/sim/aarch64/config.in b/sim/aarch64/config.in
index bcc3ce599b0..0b237bf309b 100644
--- a/sim/aarch64/config.in
+++ b/sim/aarch64/config.in
@@ -114,9 +114,6 @@
 #endif
 
 
-/* Sim assert settings */
-#undef WITH_ASSERT
-
 /* Sim debug setting */
 #undef WITH_DEBUG
 
diff --git a/sim/aarch64/configure b/sim/aarch64/configure
index 32e75682105..8fb02f18846 100755
--- a/sim/aarch64/configure
+++ b/sim/aarch64/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
@@ -10784,7 +10782,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10787 "configure"
+#line 10785 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10890,7 +10888,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10893 "configure"
+#line 10891 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11273,26 +11271,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"
diff --git a/sim/aclocal.m4 b/sim/aclocal.m4
index 92499b381bc..d87931af922 100644
--- a/sim/aclocal.m4
+++ b/sim/aclocal.m4
@@ -1170,5 +1170,6 @@ AC_SUBST([am__untar])
 m4_include([../config/depstand.m4])
 m4_include([../config/lead-dot.m4])
 m4_include([../config/override.m4])
+m4_include([m4/sim_ac_option_assert.m4])
 m4_include([m4/sim_ac_platform.m4])
 m4_include([m4/sim_ac_toolchain.m4])
diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog
index 5fe7005842c..83e174af847 100644
--- a/sim/arm/ChangeLog
+++ b/sim/arm/ChangeLog
@@ -1,3 +1,7 @@
+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.
diff --git a/sim/arm/aclocal.m4 b/sim/arm/aclocal.m4
index 4300d0eac67..db1cdbfd2e8 100644
--- a/sim/arm/aclocal.m4
+++ b/sim/arm/aclocal.m4
@@ -112,7 +112,6 @@ m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
 m4_include([../m4/sim_ac_common.m4])
 m4_include([../m4/sim_ac_option_alignment.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
 m4_include([../m4/sim_ac_option_endian.m4])
 m4_include([../m4/sim_ac_option_environment.m4])
 m4_include([../m4/sim_ac_option_hardware.m4])
diff --git a/sim/arm/config.in b/sim/arm/config.in
index bcc3ce599b0..0b237bf309b 100644
--- a/sim/arm/config.in
+++ b/sim/arm/config.in
@@ -114,9 +114,6 @@
 #endif
 
 
-/* Sim assert settings */
-#undef WITH_ASSERT
-
 /* Sim debug setting */
 #undef WITH_DEBUG
 
diff --git a/sim/arm/configure b/sim/arm/configure
index 41d322a3a5f..9d57aa24739 100755
--- a/sim/arm/configure
+++ b/sim/arm/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
@@ -10784,7 +10782,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10787 "configure"
+#line 10785 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10890,7 +10888,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10893 "configure"
+#line 10891 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11273,26 +11271,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"
diff --git a/sim/avr/ChangeLog b/sim/avr/ChangeLog
index 36100103072..a5033fc1be3 100644
--- a/sim/avr/ChangeLog
+++ b/sim/avr/ChangeLog
@@ -1,3 +1,7 @@
+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.
diff --git a/sim/avr/aclocal.m4 b/sim/avr/aclocal.m4
index 4300d0eac67..db1cdbfd2e8 100644
--- a/sim/avr/aclocal.m4
+++ b/sim/avr/aclocal.m4
@@ -112,7 +112,6 @@ m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
 m4_include([../m4/sim_ac_common.m4])
 m4_include([../m4/sim_ac_option_alignment.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
 m4_include([../m4/sim_ac_option_endian.m4])
 m4_include([../m4/sim_ac_option_environment.m4])
 m4_include([../m4/sim_ac_option_hardware.m4])
diff --git a/sim/avr/config.in b/sim/avr/config.in
index bcc3ce599b0..0b237bf309b 100644
--- a/sim/avr/config.in
+++ b/sim/avr/config.in
@@ -114,9 +114,6 @@
 #endif
 
 
-/* Sim assert settings */
-#undef WITH_ASSERT
-
 /* Sim debug setting */
 #undef WITH_DEBUG
 
diff --git a/sim/avr/configure b/sim/avr/configure
index 62d3fc09b9f..5d4faa67f88 100755
--- a/sim/avr/configure
+++ b/sim/avr/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
@@ -10784,7 +10782,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10787 "configure"
+#line 10785 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10890,7 +10888,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10893 "configure"
+#line 10891 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11273,26 +11271,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"
diff --git a/sim/bfin/ChangeLog b/sim/bfin/ChangeLog
index a249ca24e7a..224ec728d78 100644
--- a/sim/bfin/ChangeLog
+++ b/sim/bfin/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-12  Mike Frysinger  <vapier@gentoo.org>
+
+	* aclocal.m4, config.in, configure: Regenerate.
+
 2021-06-12  Mike Frysinger  <vapier@gentoo.org>
 
 	* configure.ac: Delete calls to AC_CHECK_FUNCS_ONCE and
diff --git a/sim/bfin/aclocal.m4 b/sim/bfin/aclocal.m4
index 9337e85b485..eccf6ce9b24 100644
--- a/sim/bfin/aclocal.m4
+++ b/sim/bfin/aclocal.m4
@@ -113,7 +113,6 @@ m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
 m4_include([../m4/sim_ac_common.m4])
 m4_include([../m4/sim_ac_option_alignment.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
 m4_include([../m4/sim_ac_option_default_model.m4])
 m4_include([../m4/sim_ac_option_endian.m4])
 m4_include([../m4/sim_ac_option_environment.m4])
diff --git a/sim/bfin/config.in b/sim/bfin/config.in
index bcc3ce599b0..0b237bf309b 100644
--- a/sim/bfin/config.in
+++ b/sim/bfin/config.in
@@ -114,9 +114,6 @@
 #endif
 
 
-/* Sim assert settings */
-#undef WITH_ASSERT
-
 /* Sim debug setting */
 #undef WITH_DEBUG
 
diff --git a/sim/bfin/configure b/sim/bfin/configure
index 084b9e3071a..9ffef2678dd 100755
--- a/sim/bfin/configure
+++ b/sim/bfin/configure
@@ -780,7 +780,6 @@ enable_sim_debug
 enable_sim_stdio
 enable_sim_trace
 enable_sim_profile
-enable_sim_assert
 enable_sim_environment
 enable_sim_inline
 with_pkgversion
@@ -1440,7 +1439,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
@@ -10804,7 +10802,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10807 "configure"
+#line 10805 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10910,7 +10908,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10913 "configure"
+#line 10911 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11293,26 +11291,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"
diff --git a/sim/bpf/ChangeLog b/sim/bpf/ChangeLog
index 50d075c1c8a..f6d65305e0d 100644
--- a/sim/bpf/ChangeLog
+++ b/sim/bpf/ChangeLog
@@ -1,3 +1,7 @@
+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.
diff --git a/sim/bpf/aclocal.m4 b/sim/bpf/aclocal.m4
index e1659b4fa6a..fcc47b8fffd 100644
--- a/sim/bpf/aclocal.m4
+++ b/sim/bpf/aclocal.m4
@@ -112,7 +112,6 @@ m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
 m4_include([../m4/sim_ac_common.m4])
 m4_include([../m4/sim_ac_option_alignment.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
 m4_include([../m4/sim_ac_option_bitsize.m4])
 m4_include([../m4/sim_ac_option_cgen_maint.m4])
 m4_include([../m4/sim_ac_option_default_model.m4])
diff --git a/sim/bpf/config.in b/sim/bpf/config.in
index bcc3ce599b0..0b237bf309b 100644
--- a/sim/bpf/config.in
+++ b/sim/bpf/config.in
@@ -114,9 +114,6 @@
 #endif
 
 
-/* Sim assert settings */
-#undef WITH_ASSERT
-
 /* Sim debug setting */
 #undef WITH_DEBUG
 
diff --git a/sim/bpf/configure b/sim/bpf/configure
index 40c5b3bb5dc..3eb6cf1f45e 100755
--- a/sim/bpf/configure
+++ b/sim/bpf/configure
@@ -778,7 +778,6 @@ enable_sim_debug
 enable_sim_stdio
 enable_sim_trace
 enable_sim_profile
-enable_sim_assert
 enable_sim_environment
 enable_sim_inline
 with_pkgversion
@@ -1436,7 +1435,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
@@ -10797,7 +10795,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10800 "configure"
+#line 10798 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10903,7 +10901,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10906 "configure"
+#line 10904 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11286,26 +11284,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"
diff --git a/sim/config.h.in b/sim/config.h.in
index 6dc7017062e..850d42cabba 100644
--- a/sim/config.h.in
+++ b/sim/config.h.in
@@ -259,6 +259,9 @@
 /* Version number of package */
 #undef VERSION
 
+/* Sim assert settings */
+#undef WITH_ASSERT
+
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
    significant byte first (like Motorola and SPARC, unlike Intel). */
 #if defined AC_APPLE_UNIVERSAL_BUILD
diff --git a/sim/configure b/sim/configure
index b1035eed318..5cbe2e6c1ff 100755
--- a/sim/configure
+++ b/sim/configure
@@ -750,6 +750,7 @@ enable_silent_rules
 enable_sim
 enable_example_sims
 enable_targets
+enable_sim_assert
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1422,6 +1423,7 @@ Optional Features:
   --enable-sim            Enable the GNU simulator
   --enable-example-sims   enable example GNU simulators
   --enable-targets        alternative target configurations
+  --enable-sim-assert     Specify whether to perform random assertions
 
 Some influential environment variables:
   CC          C compiler command
@@ -5917,6 +5919,27 @@ else
 fi
 
 
+
+{ $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; }
+
+
 ac_config_files="$ac_config_files Makefile"
 
 cat >confcache <<\_ACEOF
diff --git a/sim/configure.ac b/sim/configure.ac
index 0ff49b0b678..700e04d6a60 100644
--- a/sim/configure.ac
+++ b/sim/configure.ac
@@ -99,5 +99,7 @@ if test "${enable_sim}" != no; then
 fi
 AM_CONDITIONAL([SIM_ENABLE_IGEN], [test "$sim_igen" = "yes"])
 
+SIM_AC_OPTION_ASSERT
+
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff --git a/sim/cr16/ChangeLog b/sim/cr16/ChangeLog
index aaf13a2723d..52a2cca4db5 100644
--- a/sim/cr16/ChangeLog
+++ b/sim/cr16/ChangeLog
@@ -1,3 +1,7 @@
+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.
diff --git a/sim/cr16/aclocal.m4 b/sim/cr16/aclocal.m4
index 4300d0eac67..db1cdbfd2e8 100644
--- a/sim/cr16/aclocal.m4
+++ b/sim/cr16/aclocal.m4
@@ -112,7 +112,6 @@ m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
 m4_include([../m4/sim_ac_common.m4])
 m4_include([../m4/sim_ac_option_alignment.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
 m4_include([../m4/sim_ac_option_endian.m4])
 m4_include([../m4/sim_ac_option_environment.m4])
 m4_include([../m4/sim_ac_option_hardware.m4])
diff --git a/sim/cr16/config.in b/sim/cr16/config.in
index bcc3ce599b0..0b237bf309b 100644
--- a/sim/cr16/config.in
+++ b/sim/cr16/config.in
@@ -114,9 +114,6 @@
 #endif
 
 
-/* Sim assert settings */
-#undef WITH_ASSERT
-
 /* Sim debug setting */
 #undef WITH_DEBUG
 
diff --git a/sim/cr16/configure b/sim/cr16/configure
index 9592ae275b9..3303b4db448 100755
--- a/sim/cr16/configure
+++ b/sim/cr16/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
@@ -10784,7 +10782,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10787 "configure"
+#line 10785 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10890,7 +10888,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10893 "configure"
+#line 10891 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11273,26 +11271,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"
diff --git a/sim/cris/ChangeLog b/sim/cris/ChangeLog
index 317eedced1e..15d2baa642b 100644
--- a/sim/cris/ChangeLog
+++ b/sim/cris/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-12  Mike Frysinger  <vapier@gentoo.org>
+
+	* aclocal.m4, config.in, configure: Regenerate.
+
 2021-06-12  Mike Frysinger  <vapier@gentoo.org>
 
 	* configure.ac: Delete call AC_CHECK_HEADERS_ONCE.
diff --git a/sim/cris/aclocal.m4 b/sim/cris/aclocal.m4
index e144fa34265..7ef344a579c 100644
--- a/sim/cris/aclocal.m4
+++ b/sim/cris/aclocal.m4
@@ -112,7 +112,6 @@ m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
 m4_include([../m4/sim_ac_common.m4])
 m4_include([../m4/sim_ac_option_alignment.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
 m4_include([../m4/sim_ac_option_cgen_maint.m4])
 m4_include([../m4/sim_ac_option_default_model.m4])
 m4_include([../m4/sim_ac_option_endian.m4])
diff --git a/sim/cris/config.in b/sim/cris/config.in
index bcc3ce599b0..0b237bf309b 100644
--- a/sim/cris/config.in
+++ b/sim/cris/config.in
@@ -114,9 +114,6 @@
 #endif
 
 
-/* Sim assert settings */
-#undef WITH_ASSERT
-
 /* Sim debug setting */
 #undef WITH_DEBUG
 
diff --git a/sim/cris/configure b/sim/cris/configure
index 49f12af962b..2eee94517ff 100755
--- a/sim/cris/configure
+++ b/sim/cris/configure
@@ -778,7 +778,6 @@ enable_sim_debug
 enable_sim_stdio
 enable_sim_trace
 enable_sim_profile
-enable_sim_assert
 enable_sim_environment
 enable_sim_inline
 with_pkgversion
@@ -1435,7 +1434,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
@@ -10795,7 +10793,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10798 "configure"
+#line 10796 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10901,7 +10899,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10904 "configure"
+#line 10902 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11284,26 +11282,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"
diff --git a/sim/d10v/ChangeLog b/sim/d10v/ChangeLog
index 03ae95a2f9b..aef1a22325f 100644
--- a/sim/d10v/ChangeLog
+++ b/sim/d10v/ChangeLog
@@ -1,3 +1,7 @@
+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.
diff --git a/sim/d10v/aclocal.m4 b/sim/d10v/aclocal.m4
index 4300d0eac67..db1cdbfd2e8 100644
--- a/sim/d10v/aclocal.m4
+++ b/sim/d10v/aclocal.m4
@@ -112,7 +112,6 @@ m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
 m4_include([../m4/sim_ac_common.m4])
 m4_include([../m4/sim_ac_option_alignment.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
 m4_include([../m4/sim_ac_option_endian.m4])
 m4_include([../m4/sim_ac_option_environment.m4])
 m4_include([../m4/sim_ac_option_hardware.m4])
diff --git a/sim/d10v/config.in b/sim/d10v/config.in
index bcc3ce599b0..0b237bf309b 100644
--- a/sim/d10v/config.in
+++ b/sim/d10v/config.in
@@ -114,9 +114,6 @@
 #endif
 
 
-/* Sim assert settings */
-#undef WITH_ASSERT
-
 /* Sim debug setting */
 #undef WITH_DEBUG
 
diff --git a/sim/d10v/configure b/sim/d10v/configure
index 6bf73d29682..7bb50991f74 100755
--- a/sim/d10v/configure
+++ b/sim/d10v/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
@@ -10784,7 +10782,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10787 "configure"
+#line 10785 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10890,7 +10888,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10893 "configure"
+#line 10891 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11273,26 +11271,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"
diff --git a/sim/erc32/ChangeLog b/sim/erc32/ChangeLog
index 2cd3170ce1c..a6cff9f1b59 100644
--- a/sim/erc32/ChangeLog
+++ b/sim/erc32/ChangeLog
@@ -1,3 +1,7 @@
+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.
diff --git a/sim/erc32/aclocal.m4 b/sim/erc32/aclocal.m4
index ed052697cd9..cff614273b5 100644
--- a/sim/erc32/aclocal.m4
+++ b/sim/erc32/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/erc32/config.in b/sim/erc32/config.in
index bcc3ce599b0..0b237bf309b 100644
--- a/sim/erc32/config.in
+++ b/sim/erc32/config.in
@@ -114,9 +114,6 @@
 #endif
 
 
-/* Sim assert settings */
-#undef WITH_ASSERT
-
 /* Sim debug setting */
 #undef WITH_DEBUG
 
diff --git a/sim/erc32/configure b/sim/erc32/configure
index 2d5ff0f15ad..0ac222dc0b4 100755
--- a/sim/erc32/configure
+++ b/sim/erc32/configure
@@ -778,7 +778,6 @@ enable_sim_debug
 enable_sim_stdio
 enable_sim_trace
 enable_sim_profile
-enable_sim_assert
 enable_sim_environment
 enable_sim_inline
 with_pkgversion
@@ -1430,7 +1429,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
@@ -10780,7 +10778,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10783 "configure"
+#line 10781 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10886,7 +10884,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10889 "configure"
+#line 10887 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11269,26 +11267,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"
diff --git a/sim/example-synacor/ChangeLog b/sim/example-synacor/ChangeLog
index a0d204b3f25..9ffd18128f2 100644
--- a/sim/example-synacor/ChangeLog
+++ b/sim/example-synacor/ChangeLog
@@ -1,3 +1,7 @@
+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.
diff --git a/sim/example-synacor/aclocal.m4 b/sim/example-synacor/aclocal.m4
index 4300d0eac67..db1cdbfd2e8 100644
--- a/sim/example-synacor/aclocal.m4
+++ b/sim/example-synacor/aclocal.m4
@@ -112,7 +112,6 @@ m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
 m4_include([../m4/sim_ac_common.m4])
 m4_include([../m4/sim_ac_option_alignment.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
 m4_include([../m4/sim_ac_option_endian.m4])
 m4_include([../m4/sim_ac_option_environment.m4])
 m4_include([../m4/sim_ac_option_hardware.m4])
diff --git a/sim/example-synacor/config.in b/sim/example-synacor/config.in
index bcc3ce599b0..0b237bf309b 100644
--- a/sim/example-synacor/config.in
+++ b/sim/example-synacor/config.in
@@ -114,9 +114,6 @@
 #endif
 
 
-/* Sim assert settings */
-#undef WITH_ASSERT
-
 /* Sim debug setting */
 #undef WITH_DEBUG
 
diff --git a/sim/example-synacor/configure b/sim/example-synacor/configure
index 9f20bf294c3..dcab9c5e00c 100755
--- a/sim/example-synacor/configure
+++ b/sim/example-synacor/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
@@ -10784,7 +10782,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10787 "configure"
+#line 10785 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10890,7 +10888,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10893 "configure"
+#line 10891 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11273,26 +11271,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"
diff --git a/sim/frv/ChangeLog b/sim/frv/ChangeLog
index 084111a9558..6fc7d02690e 100644
--- a/sim/frv/ChangeLog
+++ b/sim/frv/ChangeLog
@@ -1,3 +1,7 @@
+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.
diff --git a/sim/frv/aclocal.m4 b/sim/frv/aclocal.m4
index e144fa34265..7ef344a579c 100644
--- a/sim/frv/aclocal.m4
+++ b/sim/frv/aclocal.m4
@@ -112,7 +112,6 @@ m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
 m4_include([../m4/sim_ac_common.m4])
 m4_include([../m4/sim_ac_option_alignment.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
 m4_include([../m4/sim_ac_option_cgen_maint.m4])
 m4_include([../m4/sim_ac_option_default_model.m4])
 m4_include([../m4/sim_ac_option_endian.m4])
diff --git a/sim/frv/config.in b/sim/frv/config.in
index bcc3ce599b0..0b237bf309b 100644
--- a/sim/frv/config.in
+++ b/sim/frv/config.in
@@ -114,9 +114,6 @@
 #endif
 
 
-/* Sim assert settings */
-#undef WITH_ASSERT
-
 /* Sim debug setting */
 #undef WITH_DEBUG
 
diff --git a/sim/frv/configure b/sim/frv/configure
index 5a72746ed2f..5c527cf1374 100755
--- a/sim/frv/configure
+++ b/sim/frv/configure
@@ -779,7 +779,6 @@ enable_sim_debug
 enable_sim_stdio
 enable_sim_trace
 enable_sim_profile
-enable_sim_assert
 enable_sim_environment
 enable_sim_inline
 with_pkgversion
@@ -1437,7 +1436,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
@@ -10798,7 +10796,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10801 "configure"
+#line 10799 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10904,7 +10902,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10907 "configure"
+#line 10905 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11287,26 +11285,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"
diff --git a/sim/ft32/ChangeLog b/sim/ft32/ChangeLog
index ae00316c783..1b29987d2ef 100644
--- a/sim/ft32/ChangeLog
+++ b/sim/ft32/ChangeLog
@@ -1,3 +1,7 @@
+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.
diff --git a/sim/ft32/aclocal.m4 b/sim/ft32/aclocal.m4
index 4300d0eac67..db1cdbfd2e8 100644
--- a/sim/ft32/aclocal.m4
+++ b/sim/ft32/aclocal.m4
@@ -112,7 +112,6 @@ m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
 m4_include([../m4/sim_ac_common.m4])
 m4_include([../m4/sim_ac_option_alignment.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
 m4_include([../m4/sim_ac_option_endian.m4])
 m4_include([../m4/sim_ac_option_environment.m4])
 m4_include([../m4/sim_ac_option_hardware.m4])
diff --git a/sim/ft32/config.in b/sim/ft32/config.in
index bcc3ce599b0..0b237bf309b 100644
--- a/sim/ft32/config.in
+++ b/sim/ft32/config.in
@@ -114,9 +114,6 @@
 #endif
 
 
-/* Sim assert settings */
-#undef WITH_ASSERT
-
 /* Sim debug setting */
 #undef WITH_DEBUG
 
diff --git a/sim/ft32/configure b/sim/ft32/configure
index 8f9d5e8938e..0b0b8144648 100755
--- a/sim/ft32/configure
+++ b/sim/ft32/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
@@ -10784,7 +10782,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10787 "configure"
+#line 10785 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10890,7 +10888,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10893 "configure"
+#line 10891 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11273,26 +11271,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"
diff --git a/sim/h8300/ChangeLog b/sim/h8300/ChangeLog
index 71de14deaf7..ec06f33335b 100644
--- a/sim/h8300/ChangeLog
+++ b/sim/h8300/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-12  Mike Frysinger  <vapier@gentoo.org>
+
+	* aclocal.m4, config.in, configure: Regenerate.
+
 2021-06-12  Mike Frysinger  <vapier@gentoo.org>
 
 	* configure.ac: Delete call to AC_CHECK_HEADERS_ONCE.
diff --git a/sim/h8300/aclocal.m4 b/sim/h8300/aclocal.m4
index 4300d0eac67..db1cdbfd2e8 100644
--- a/sim/h8300/aclocal.m4
+++ b/sim/h8300/aclocal.m4
@@ -112,7 +112,6 @@ m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
 m4_include([../m4/sim_ac_common.m4])
 m4_include([../m4/sim_ac_option_alignment.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
 m4_include([../m4/sim_ac_option_endian.m4])
 m4_include([../m4/sim_ac_option_environment.m4])
 m4_include([../m4/sim_ac_option_hardware.m4])
diff --git a/sim/h8300/config.in b/sim/h8300/config.in
index bcc3ce599b0..0b237bf309b 100644
--- a/sim/h8300/config.in
+++ b/sim/h8300/config.in
@@ -114,9 +114,6 @@
 #endif
 
 
-/* Sim assert settings */
-#undef WITH_ASSERT
-
 /* Sim debug setting */
 #undef WITH_DEBUG
 
diff --git a/sim/h8300/configure b/sim/h8300/configure
index b6d0921d621..547e538759f 100755
--- a/sim/h8300/configure
+++ b/sim/h8300/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
@@ -10784,7 +10782,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10787 "configure"
+#line 10785 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10890,7 +10888,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10893 "configure"
+#line 10891 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11273,26 +11271,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"
diff --git a/sim/iq2000/ChangeLog b/sim/iq2000/ChangeLog
index a6e1db4a972..bd72159b4a8 100644
--- a/sim/iq2000/ChangeLog
+++ b/sim/iq2000/ChangeLog
@@ -1,3 +1,7 @@
+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.
diff --git a/sim/iq2000/aclocal.m4 b/sim/iq2000/aclocal.m4
index e144fa34265..7ef344a579c 100644
--- a/sim/iq2000/aclocal.m4
+++ b/sim/iq2000/aclocal.m4
@@ -112,7 +112,6 @@ m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
 m4_include([../m4/sim_ac_common.m4])
 m4_include([../m4/sim_ac_option_alignment.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
 m4_include([../m4/sim_ac_option_cgen_maint.m4])
 m4_include([../m4/sim_ac_option_default_model.m4])
 m4_include([../m4/sim_ac_option_endian.m4])
diff --git a/sim/iq2000/config.in b/sim/iq2000/config.in
index bcc3ce599b0..0b237bf309b 100644
--- a/sim/iq2000/config.in
+++ b/sim/iq2000/config.in
@@ -114,9 +114,6 @@
 #endif
 
 
-/* Sim assert settings */
-#undef WITH_ASSERT
-
 /* Sim debug setting */
 #undef WITH_DEBUG
 
diff --git a/sim/iq2000/configure b/sim/iq2000/configure
index 543e5db2f27..68c9f228e5e 100755
--- a/sim/iq2000/configure
+++ b/sim/iq2000/configure
@@ -778,7 +778,6 @@ enable_sim_debug
 enable_sim_stdio
 enable_sim_trace
 enable_sim_profile
-enable_sim_assert
 enable_sim_environment
 enable_sim_inline
 with_pkgversion
@@ -1435,7 +1434,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
@@ -10795,7 +10793,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10798 "configure"
+#line 10796 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10901,7 +10899,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10904 "configure"
+#line 10902 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11284,26 +11282,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"
diff --git a/sim/lm32/ChangeLog b/sim/lm32/ChangeLog
index c9da998acba..b511c3f4336 100644
--- a/sim/lm32/ChangeLog
+++ b/sim/lm32/ChangeLog
@@ -1,3 +1,7 @@
+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.
diff --git a/sim/lm32/aclocal.m4 b/sim/lm32/aclocal.m4
index e144fa34265..7ef344a579c 100644
--- a/sim/lm32/aclocal.m4
+++ b/sim/lm32/aclocal.m4
@@ -112,7 +112,6 @@ m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
 m4_include([../m4/sim_ac_common.m4])
 m4_include([../m4/sim_ac_option_alignment.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
 m4_include([../m4/sim_ac_option_cgen_maint.m4])
 m4_include([../m4/sim_ac_option_default_model.m4])
 m4_include([../m4/sim_ac_option_endian.m4])
diff --git a/sim/lm32/config.in b/sim/lm32/config.in
index bcc3ce599b0..0b237bf309b 100644
--- a/sim/lm32/config.in
+++ b/sim/lm32/config.in
@@ -114,9 +114,6 @@
 #endif
 
 
-/* Sim assert settings */
-#undef WITH_ASSERT
-
 /* Sim debug setting */
 #undef WITH_DEBUG
 
diff --git a/sim/lm32/configure b/sim/lm32/configure
index 732709fed7e..ac283290abb 100755
--- a/sim/lm32/configure
+++ b/sim/lm32/configure
@@ -778,7 +778,6 @@ enable_sim_debug
 enable_sim_stdio
 enable_sim_trace
 enable_sim_profile
-enable_sim_assert
 enable_sim_environment
 enable_sim_inline
 with_pkgversion
@@ -1435,7 +1434,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
@@ -10795,7 +10793,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10798 "configure"
+#line 10796 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10901,7 +10899,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10904 "configure"
+#line 10902 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11284,26 +11282,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"
diff --git a/sim/m32c/ChangeLog b/sim/m32c/ChangeLog
index f3328831ba0..270b5907ffc 100644
--- a/sim/m32c/ChangeLog
+++ b/sim/m32c/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-12  Mike Frysinger  <vapier@gentoo.org>
+
+	* aclocal.m4, config.in, configure: Regenerate.
+
 2021-06-12  Mike Frysinger  <vapier@gentoo.org>
 
 	* configure.ac: Delete call to AC_CHECK_HEADERS_ONCE.
diff --git a/sim/m32c/aclocal.m4 b/sim/m32c/aclocal.m4
index ed052697cd9..cff614273b5 100644
--- a/sim/m32c/aclocal.m4
+++ b/sim/m32c/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/m32c/config.in b/sim/m32c/config.in
index bcc3ce599b0..0b237bf309b 100644
--- a/sim/m32c/config.in
+++ b/sim/m32c/config.in
@@ -114,9 +114,6 @@
 #endif
 
 
-/* Sim assert settings */
-#undef WITH_ASSERT
-
 /* Sim debug setting */
 #undef WITH_DEBUG
 
diff --git a/sim/m32c/configure b/sim/m32c/configure
index dcedd8a0cf2..e9c5d04fed6 100755
--- a/sim/m32c/configure
+++ b/sim/m32c/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
@@ -1427,7 +1426,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
@@ -10777,7 +10775,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10780 "configure"
+#line 10778 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10883,7 +10881,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10886 "configure"
+#line 10884 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11266,26 +11264,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"
diff --git a/sim/m32r/ChangeLog b/sim/m32r/ChangeLog
index 9fe676cec68..4d0e94741e9 100644
--- a/sim/m32r/ChangeLog
+++ b/sim/m32r/ChangeLog
@@ -1,3 +1,7 @@
+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.
diff --git a/sim/m32r/aclocal.m4 b/sim/m32r/aclocal.m4
index e144fa34265..7ef344a579c 100644
--- a/sim/m32r/aclocal.m4
+++ b/sim/m32r/aclocal.m4
@@ -112,7 +112,6 @@ m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
 m4_include([../m4/sim_ac_common.m4])
 m4_include([../m4/sim_ac_option_alignment.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
 m4_include([../m4/sim_ac_option_cgen_maint.m4])
 m4_include([../m4/sim_ac_option_default_model.m4])
 m4_include([../m4/sim_ac_option_endian.m4])
diff --git a/sim/m32r/config.in b/sim/m32r/config.in
index bcc3ce599b0..0b237bf309b 100644
--- a/sim/m32r/config.in
+++ b/sim/m32r/config.in
@@ -114,9 +114,6 @@
 #endif
 
 
-/* Sim assert settings */
-#undef WITH_ASSERT
-
 /* Sim debug setting */
 #undef WITH_DEBUG
 
diff --git a/sim/m32r/configure b/sim/m32r/configure
index 139a2934ed0..a5699be1dc1 100755
--- a/sim/m32r/configure
+++ b/sim/m32r/configure
@@ -780,7 +780,6 @@ enable_sim_debug
 enable_sim_stdio
 enable_sim_trace
 enable_sim_profile
-enable_sim_assert
 enable_sim_environment
 enable_sim_inline
 with_pkgversion
@@ -1437,7 +1436,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
@@ -10797,7 +10795,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10800 "configure"
+#line 10798 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10903,7 +10901,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10906 "configure"
+#line 10904 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11286,26 +11284,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"
diff --git a/sim/m4/sim_ac_common.m4 b/sim/m4/sim_ac_common.m4
index 8ff2e2c7c5a..1df56e4baed 100644
--- a/sim/m4/sim_ac_common.m4
+++ b/sim/m4/sim_ac_common.m4
@@ -163,7 +163,6 @@ AC_DEFINE_UNQUOTED([WITH_PROFILE], [$sim_profile], [Sim profile settings])
 AC_MSG_RESULT($sim_profile)
 
 
-SIM_AC_OPTION_ASSERT
 SIM_AC_OPTION_ENVIRONMENT
 SIM_AC_OPTION_INLINE
 
diff --git a/sim/m68hc11/ChangeLog b/sim/m68hc11/ChangeLog
index cc9a928c78d..9aba1c00a24 100644
--- a/sim/m68hc11/ChangeLog
+++ b/sim/m68hc11/ChangeLog
@@ -1,3 +1,7 @@
+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.
diff --git a/sim/m68hc11/aclocal.m4 b/sim/m68hc11/aclocal.m4
index 4300d0eac67..db1cdbfd2e8 100644
--- a/sim/m68hc11/aclocal.m4
+++ b/sim/m68hc11/aclocal.m4
@@ -112,7 +112,6 @@ m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
 m4_include([../m4/sim_ac_common.m4])
 m4_include([../m4/sim_ac_option_alignment.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
 m4_include([../m4/sim_ac_option_endian.m4])
 m4_include([../m4/sim_ac_option_environment.m4])
 m4_include([../m4/sim_ac_option_hardware.m4])
diff --git a/sim/m68hc11/config.in b/sim/m68hc11/config.in
index bcc3ce599b0..0b237bf309b 100644
--- a/sim/m68hc11/config.in
+++ b/sim/m68hc11/config.in
@@ -114,9 +114,6 @@
 #endif
 
 
-/* Sim assert settings */
-#undef WITH_ASSERT
-
 /* Sim debug setting */
 #undef WITH_DEBUG
 
diff --git a/sim/m68hc11/configure b/sim/m68hc11/configure
index 24ea03f8d19..ab0175b201c 100755
--- a/sim/m68hc11/configure
+++ b/sim/m68hc11/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
@@ -10784,7 +10782,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10787 "configure"
+#line 10785 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10890,7 +10888,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10893 "configure"
+#line 10891 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11273,26 +11271,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"
diff --git a/sim/mcore/ChangeLog b/sim/mcore/ChangeLog
index d727472d46b..42409236ca4 100644
--- a/sim/mcore/ChangeLog
+++ b/sim/mcore/ChangeLog
@@ -1,3 +1,7 @@
+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.
diff --git a/sim/mcore/aclocal.m4 b/sim/mcore/aclocal.m4
index 4300d0eac67..db1cdbfd2e8 100644
--- a/sim/mcore/aclocal.m4
+++ b/sim/mcore/aclocal.m4
@@ -112,7 +112,6 @@ m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
 m4_include([../m4/sim_ac_common.m4])
 m4_include([../m4/sim_ac_option_alignment.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
 m4_include([../m4/sim_ac_option_endian.m4])
 m4_include([../m4/sim_ac_option_environment.m4])
 m4_include([../m4/sim_ac_option_hardware.m4])
diff --git a/sim/mcore/config.in b/sim/mcore/config.in
index bcc3ce599b0..0b237bf309b 100644
--- a/sim/mcore/config.in
+++ b/sim/mcore/config.in
@@ -114,9 +114,6 @@
 #endif
 
 
-/* Sim assert settings */
-#undef WITH_ASSERT
-
 /* Sim debug setting */
 #undef WITH_DEBUG
 
diff --git a/sim/mcore/configure b/sim/mcore/configure
index 6bf73d29682..7bb50991f74 100755
--- a/sim/mcore/configure
+++ b/sim/mcore/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
@@ -10784,7 +10782,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10787 "configure"
+#line 10785 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10890,7 +10888,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10893 "configure"
+#line 10891 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11273,26 +11271,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"
diff --git a/sim/microblaze/ChangeLog b/sim/microblaze/ChangeLog
index 039cd27adb4..f3bf6efa1ce 100644
--- a/sim/microblaze/ChangeLog
+++ b/sim/microblaze/ChangeLog
@@ -1,3 +1,7 @@
+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.
diff --git a/sim/microblaze/aclocal.m4 b/sim/microblaze/aclocal.m4
index 4300d0eac67..db1cdbfd2e8 100644
--- a/sim/microblaze/aclocal.m4
+++ b/sim/microblaze/aclocal.m4
@@ -112,7 +112,6 @@ m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
 m4_include([../m4/sim_ac_common.m4])
 m4_include([../m4/sim_ac_option_alignment.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
 m4_include([../m4/sim_ac_option_endian.m4])
 m4_include([../m4/sim_ac_option_environment.m4])
 m4_include([../m4/sim_ac_option_hardware.m4])
diff --git a/sim/microblaze/config.in b/sim/microblaze/config.in
index bcc3ce599b0..0b237bf309b 100644
--- a/sim/microblaze/config.in
+++ b/sim/microblaze/config.in
@@ -114,9 +114,6 @@
 #endif
 
 
-/* Sim assert settings */
-#undef WITH_ASSERT
-
 /* Sim debug setting */
 #undef WITH_DEBUG
 
diff --git a/sim/microblaze/configure b/sim/microblaze/configure
index 41d322a3a5f..9d57aa24739 100755
--- a/sim/microblaze/configure
+++ b/sim/microblaze/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
@@ -10784,7 +10782,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10787 "configure"
+#line 10785 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10890,7 +10888,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10893 "configure"
+#line 10891 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11273,26 +11271,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"
diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog
index 84f91d9f8a5..7883bfa8cdc 100644
--- a/sim/mips/ChangeLog
+++ b/sim/mips/ChangeLog
@@ -1,3 +1,7 @@
+2021-06-12  Mike Frysinger  <vapier@gentoo.org>
+
+	* aclocal.m4, config.in, configure: Regenerate.
+
 2021-06-12  Mike Frysinger  <vapier@gentoo.org>
 
 	* configure.ac: Delete call to AC_CHECK_FUNCS.
diff --git a/sim/mips/aclocal.m4 b/sim/mips/aclocal.m4
index 5573dade0bb..add447ef166 100644
--- a/sim/mips/aclocal.m4
+++ b/sim/mips/aclocal.m4
@@ -112,7 +112,6 @@ m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
 m4_include([../m4/sim_ac_common.m4])
 m4_include([../m4/sim_ac_option_alignment.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
 m4_include([../m4/sim_ac_option_bitsize.m4])
 m4_include([../m4/sim_ac_option_endian.m4])
 m4_include([../m4/sim_ac_option_environment.m4])
diff --git a/sim/mips/config.in b/sim/mips/config.in
index bcc3ce599b0..0b237bf309b 100644
--- a/sim/mips/config.in
+++ b/sim/mips/config.in
@@ -114,9 +114,6 @@
 #endif
 
 
-/* Sim assert settings */
-#undef WITH_ASSERT
-
 /* Sim debug setting */
 #undef WITH_DEBUG
 
diff --git a/sim/mips/configure b/sim/mips/configure
index cbe5c482098..82f8e04f76c 100755
--- a/sim/mips/configure
+++ b/sim/mips/configure
@@ -786,7 +786,6 @@ enable_sim_debug
 enable_sim_stdio
 enable_sim_trace
 enable_sim_profile
-enable_sim_assert
 enable_sim_environment
 enable_sim_inline
 with_pkgversion
@@ -1449,7 +1448,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
@@ -10812,7 +10810,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10815 "configure"
+#line 10813 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10918,7 +10916,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10921 "configure"
+#line 10919 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11301,26 +11299,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"
diff --git a/sim/mn10300/ChangeLog b/sim/mn10300/ChangeLog
index ac976d0ad26..9aec01e8d61 100644
--- a/sim/mn10300/ChangeLog
+++ b/sim/mn10300/ChangeLog
@@ -1,3 +1,7 @@
+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.
diff --git a/sim/mn10300/aclocal.m4 b/sim/mn10300/aclocal.m4
index 02c11131338..4afbd42aca6 100644
--- a/sim/mn10300/aclocal.m4
+++ b/sim/mn10300/aclocal.m4
@@ -112,7 +112,6 @@ m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
 m4_include([../m4/sim_ac_common.m4])
 m4_include([../m4/sim_ac_option_alignment.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
 m4_include([../m4/sim_ac_option_bitsize.m4])
 m4_include([../m4/sim_ac_option_endian.m4])
 m4_include([../m4/sim_ac_option_environment.m4])
diff --git a/sim/mn10300/config.in b/sim/mn10300/config.in
index bcc3ce599b0..0b237bf309b 100644
--- a/sim/mn10300/config.in
+++ b/sim/mn10300/config.in
@@ -114,9 +114,6 @@
 #endif
 
 
-/* Sim assert settings */
-#undef WITH_ASSERT
-
 /* Sim debug setting */
 #undef WITH_DEBUG
 
diff --git a/sim/mn10300/configure b/sim/mn10300/configure
index a2774edee17..77098d29702 100755
--- a/sim/mn10300/configure
+++ b/sim/mn10300/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
@@ -1431,7 +1430,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
@@ -10790,7 +10788,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10793 "configure"
+#line 10791 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10896,7 +10894,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10899 "configure"
+#line 10897 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11279,26 +11277,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"
diff --git a/sim/moxie/ChangeLog b/sim/moxie/ChangeLog
index d80a314d8ec..96c040beb97 100644
--- a/sim/moxie/ChangeLog
+++ b/sim/moxie/ChangeLog
@@ -1,3 +1,7 @@
+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.
diff --git a/sim/moxie/aclocal.m4 b/sim/moxie/aclocal.m4
index 4300d0eac67..db1cdbfd2e8 100644
--- a/sim/moxie/aclocal.m4
+++ b/sim/moxie/aclocal.m4
@@ -112,7 +112,6 @@ m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
 m4_include([../m4/sim_ac_common.m4])
 m4_include([../m4/sim_ac_option_alignment.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
 m4_include([../m4/sim_ac_option_endian.m4])
 m4_include([../m4/sim_ac_option_environment.m4])
 m4_include([../m4/sim_ac_option_hardware.m4])
diff --git a/sim/moxie/config.in b/sim/moxie/config.in
index bcc3ce599b0..0b237bf309b 100644
--- a/sim/moxie/config.in
+++ b/sim/moxie/config.in
@@ -114,9 +114,6 @@
 #endif
 
 
-/* Sim assert settings */
-#undef WITH_ASSERT
-
 /* Sim debug setting */
 #undef WITH_DEBUG
 
diff --git a/sim/moxie/configure b/sim/moxie/configure
index 40d9a04a655..b4c00bd10d7 100755
--- a/sim/moxie/configure
+++ b/sim/moxie/configure
@@ -776,7 +776,6 @@ enable_sim_debug
 enable_sim_stdio
 enable_sim_trace
 enable_sim_profile
-enable_sim_assert
 enable_sim_environment
 enable_sim_inline
 with_pkgversion
@@ -1430,7 +1429,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
@@ -10785,7 +10783,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10788 "configure"
+#line 10786 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10891,7 +10889,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10894 "configure"
+#line 10892 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11274,26 +11272,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"
diff --git a/sim/msp430/ChangeLog b/sim/msp430/ChangeLog
index 0bebd6cf141..5653de65425 100644
--- a/sim/msp430/ChangeLog
+++ b/sim/msp430/ChangeLog
@@ -1,3 +1,7 @@
+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.
diff --git a/sim/msp430/aclocal.m4 b/sim/msp430/aclocal.m4
index 4300d0eac67..db1cdbfd2e8 100644
--- a/sim/msp430/aclocal.m4
+++ b/sim/msp430/aclocal.m4
@@ -112,7 +112,6 @@ m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
 m4_include([../m4/sim_ac_common.m4])
 m4_include([../m4/sim_ac_option_alignment.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
 m4_include([../m4/sim_ac_option_endian.m4])
 m4_include([../m4/sim_ac_option_environment.m4])
 m4_include([../m4/sim_ac_option_hardware.m4])
diff --git a/sim/msp430/config.in b/sim/msp430/config.in
index bcc3ce599b0..0b237bf309b 100644
--- a/sim/msp430/config.in
+++ b/sim/msp430/config.in
@@ -114,9 +114,6 @@
 #endif
 
 
-/* Sim assert settings */
-#undef WITH_ASSERT
-
 /* Sim debug setting */
 #undef WITH_DEBUG
 
diff --git a/sim/msp430/configure b/sim/msp430/configure
index 62d3fc09b9f..5d4faa67f88 100755
--- a/sim/msp430/configure
+++ b/sim/msp430/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
@@ -10784,7 +10782,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10787 "configure"
+#line 10785 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10890,7 +10888,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10893 "configure"
+#line 10891 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11273,26 +11271,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"
diff --git a/sim/or1k/ChangeLog b/sim/or1k/ChangeLog
index 4b97c9e0784..bf7296b8026 100644
--- a/sim/or1k/ChangeLog
+++ b/sim/or1k/ChangeLog
@@ -1,3 +1,7 @@
+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.
diff --git a/sim/or1k/aclocal.m4 b/sim/or1k/aclocal.m4
index e1659b4fa6a..fcc47b8fffd 100644
--- a/sim/or1k/aclocal.m4
+++ b/sim/or1k/aclocal.m4
@@ -112,7 +112,6 @@ m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
 m4_include([../m4/sim_ac_common.m4])
 m4_include([../m4/sim_ac_option_alignment.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
 m4_include([../m4/sim_ac_option_bitsize.m4])
 m4_include([../m4/sim_ac_option_cgen_maint.m4])
 m4_include([../m4/sim_ac_option_default_model.m4])
diff --git a/sim/or1k/config.in b/sim/or1k/config.in
index bcc3ce599b0..0b237bf309b 100644
--- a/sim/or1k/config.in
+++ b/sim/or1k/config.in
@@ -114,9 +114,6 @@
 #endif
 
 
-/* Sim assert settings */
-#undef WITH_ASSERT
-
 /* Sim debug setting */
 #undef WITH_DEBUG
 
diff --git a/sim/or1k/configure b/sim/or1k/configure
index ef8609f19c9..fd13549b768 100755
--- a/sim/or1k/configure
+++ b/sim/or1k/configure
@@ -778,7 +778,6 @@ enable_sim_debug
 enable_sim_stdio
 enable_sim_trace
 enable_sim_profile
-enable_sim_assert
 enable_sim_environment
 enable_sim_inline
 with_pkgversion
@@ -1436,7 +1435,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
@@ -10797,7 +10795,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10800 "configure"
+#line 10798 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10903,7 +10901,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10906 "configure"
+#line 10904 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11286,26 +11284,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"
diff --git a/sim/pru/ChangeLog b/sim/pru/ChangeLog
index a6b541d982f..260007dbec0 100644
--- a/sim/pru/ChangeLog
+++ b/sim/pru/ChangeLog
@@ -1,3 +1,7 @@
+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.
diff --git a/sim/pru/aclocal.m4 b/sim/pru/aclocal.m4
index 4300d0eac67..db1cdbfd2e8 100644
--- a/sim/pru/aclocal.m4
+++ b/sim/pru/aclocal.m4
@@ -112,7 +112,6 @@ m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
 m4_include([../m4/sim_ac_common.m4])
 m4_include([../m4/sim_ac_option_alignment.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
 m4_include([../m4/sim_ac_option_endian.m4])
 m4_include([../m4/sim_ac_option_environment.m4])
 m4_include([../m4/sim_ac_option_hardware.m4])
diff --git a/sim/pru/config.in b/sim/pru/config.in
index bcc3ce599b0..0b237bf309b 100644
--- a/sim/pru/config.in
+++ b/sim/pru/config.in
@@ -114,9 +114,6 @@
 #endif
 
 
-/* Sim assert settings */
-#undef WITH_ASSERT
-
 /* Sim debug setting */
 #undef WITH_DEBUG
 
diff --git a/sim/pru/configure b/sim/pru/configure
index 62d3fc09b9f..5d4faa67f88 100755
--- a/sim/pru/configure
+++ b/sim/pru/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
@@ -10784,7 +10782,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10787 "configure"
+#line 10785 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10890,7 +10888,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10893 "configure"
+#line 10891 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11273,26 +11271,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"
diff --git a/sim/riscv/ChangeLog b/sim/riscv/ChangeLog
index c460bdf3826..0427805f13b 100644
--- a/sim/riscv/ChangeLog
+++ b/sim/riscv/ChangeLog
@@ -1,3 +1,7 @@
+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.
diff --git a/sim/riscv/aclocal.m4 b/sim/riscv/aclocal.m4
index 9710f3ff176..487fd0797f6 100644
--- a/sim/riscv/aclocal.m4
+++ b/sim/riscv/aclocal.m4
@@ -112,7 +112,6 @@ m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
 m4_include([../m4/sim_ac_common.m4])
 m4_include([../m4/sim_ac_option_alignment.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
 m4_include([../m4/sim_ac_option_bitsize.m4])
 m4_include([../m4/sim_ac_option_default_model.m4])
 m4_include([../m4/sim_ac_option_endian.m4])
diff --git a/sim/riscv/config.in b/sim/riscv/config.in
index bcc3ce599b0..0b237bf309b 100644
--- a/sim/riscv/config.in
+++ b/sim/riscv/config.in
@@ -114,9 +114,6 @@
 #endif
 
 
-/* Sim assert settings */
-#undef WITH_ASSERT
-
 /* Sim debug setting */
 #undef WITH_DEBUG
 
diff --git a/sim/riscv/configure b/sim/riscv/configure
index d627d24baa4..1c59cfafaa0 100755
--- a/sim/riscv/configure
+++ b/sim/riscv/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
@@ -1431,7 +1430,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
@@ -10789,7 +10787,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10792 "configure"
+#line 10790 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10895,7 +10893,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10898 "configure"
+#line 10896 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11278,26 +11276,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"
diff --git a/sim/rl78/ChangeLog b/sim/rl78/ChangeLog
index 54d4d981527..500fe2676b3 100644
--- a/sim/rl78/ChangeLog
+++ b/sim/rl78/ChangeLog
@@ -1,3 +1,7 @@
+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.
diff --git a/sim/rl78/aclocal.m4 b/sim/rl78/aclocal.m4
index ed052697cd9..cff614273b5 100644
--- a/sim/rl78/aclocal.m4
+++ b/sim/rl78/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/rl78/config.in b/sim/rl78/config.in
index bcc3ce599b0..0b237bf309b 100644
--- a/sim/rl78/config.in
+++ b/sim/rl78/config.in
@@ -114,9 +114,6 @@
 #endif
 
 
-/* Sim assert settings */
-#undef WITH_ASSERT
-
 /* Sim debug setting */
 #undef WITH_DEBUG
 
diff --git a/sim/rl78/configure b/sim/rl78/configure
index dcedd8a0cf2..e9c5d04fed6 100755
--- a/sim/rl78/configure
+++ b/sim/rl78/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
@@ -1427,7 +1426,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
@@ -10777,7 +10775,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10780 "configure"
+#line 10778 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10883,7 +10881,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10886 "configure"
+#line 10884 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11266,26 +11264,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[...]

[diff truncated at 100000 bytes]


More information about the Gdb-cvs mailing list