From 46f0c0c6cc1b46702152343a3801023e348d7b13 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Tue, 15 Jun 2021 21:17:55 -0400
Subject: [PATCH] sim: ppc: use common sim-assert setting

The common sim code already sets this up for us, so no need to
duplicate the logic.
---
 sim/ppc/ChangeLog    |  5 +++++
 sim/ppc/config.in    |  3 ---
 sim/ppc/configure    | 22 ----------------------
 sim/ppc/configure.ac | 13 -------------
 4 files changed, 5 insertions(+), 38 deletions(-)

diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog
index 3ef5b228e46..c166e449102 100644
--- a/sim/ppc/ChangeLog
+++ b/sim/ppc/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-16  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac: Delete sim-assert logic.
+	* config.in, configure: Regenerate.
+
 2021-06-16  Mike Frysinger  <vapier@gentoo.org>
 
 	* altivec.igen: Change BIG_ENDIAN to BFD_ENDIAN_BIG.
diff --git a/sim/ppc/config.in b/sim/ppc/config.in
index c6182ae0e86..1067e029790 100644
--- a/sim/ppc/config.in
+++ b/sim/ppc/config.in
@@ -71,6 +71,3 @@
    Windows, we use the Windows API when building for MinGW, but the POSIX API
    when building for Cygwin. */
 #undef USE_WIN32API
-
-/* Sim assert settings */
-#undef WITH_ASSERT
diff --git a/sim/ppc/configure b/sim/ppc/configure
index 10903a0f13c..f81d83a9f47 100755
--- a/sim/ppc/configure
+++ b/sim/ppc/configure
@@ -740,7 +740,6 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
-enable_sim_assert
 enable_sim_bitsize
 enable_sim_config
 enable_sim_decode_mechanism
@@ -1396,7 +1395,6 @@ Optional Features:
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-sim-assert			Specify whether to perform random assertions.
   --enable-sim-bitsize=n		Specify target bitsize (32 or 64).
   --enable-sim-config=file		Override default config file
   --enable-sim-decode-mechanism=which		Specify the instruction decode mechanism.
@@ -3114,26 +3112,6 @@ $as_echo "$LINGUAS" >&6; }
 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; }
-
-
 # Check whether --enable-sim-bitsize was given.
 if test "${enable_sim_bitsize+set}" = set; then :
   enableval=$enable_sim_bitsize; case "${enableval}" in
diff --git a/sim/ppc/configure.ac b/sim/ppc/configure.ac
index 376c3ce07fa..ed59e05c786 100644
--- a/sim/ppc/configure.ac
+++ b/sim/ppc/configure.ac
@@ -19,19 +19,6 @@ ALL_LINGUAS=
 ZW_GNU_GETTEXT_SISTER_DIR(../../intl)
 
 
-AC_MSG_CHECKING([whether to enable sim asserts])
-sim_assert="1"
-AC_ARG_ENABLE(sim-assert,
-[  --enable-sim-assert			Specify whether to perform random assertions.],
-[case "${enableval}" in
-  yes)	sim_assert="1";;
-  no)	sim_assert="0";;
-  *)	AC_MSG_ERROR([--enable-sim-assert does not take a value]);;
-esac])dnl
-AC_DEFINE_UNQUOTED([WITH_ASSERT], [$sim_assert], [Sim assert settings])
-AC_MSG_RESULT($sim_assert)
-
-
 AC_ARG_ENABLE(sim-bitsize,
 [  --enable-sim-bitsize=n		Specify target bitsize (32 or 64).],
 [case "${enableval}" in
-- 
2.30.2