From 6d90347b5dcbb10ecb410b1246613c0caf511bd9 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 10 Jan 2016 02:49:15 -0500
Subject: [PATCH] sim: mips: drop SIM_AC_OPTION_SMP call

No other port calls this macro directly, and mips has it hardcoded
to the default -- disabling smp.  In the future we'll enable this
for all targets in common code, so tidy up the mips code now.
---
 sim/mips/ChangeLog    |  5 +++++
 sim/mips/configure    | 35 ++---------------------------------
 sim/mips/configure.ac | 10 ----------
 3 files changed, 7 insertions(+), 43 deletions(-)

diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog
index 21e832cb757..9d886946fe8 100644
--- a/sim/mips/ChangeLog
+++ b/sim/mips/ChangeLog
@@ -1,3 +1,8 @@
+2016-01-10  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (SIM_AC_OPTION_SMP): Delete call.
+	* configure: Regenerate.
+
 2016-01-10  Mike Frysinger  <vapier@gentoo.org>
 
 	* configure.ac (SIM_AC_OPTION_INLINE): Delete call.
diff --git a/sim/mips/configure b/sim/mips/configure
index acd36b23d47..91820554675 100755
--- a/sim/mips/configure
+++ b/sim/mips/configure
@@ -776,7 +776,6 @@ enable_sim_reserved_bits
 enable_sim_endian
 enable_sim_bitsize
 enable_sim_float
-enable_sim_smp
 enable_sim_hardware
 with_x
 '
@@ -1445,8 +1444,6 @@ Optional Features:
   --enable-sim-bitsize=N  Specify target bitsize (32 or 64)
   --enable-sim-float      Specify that the target processor has floating point
                           hardware
-  --enable-sim-smp=n      Specify number of processors to configure for
-                          (default ${default_sim_smp})
   --enable-sim-hardware=LIST
                           Specify the hardware to be included in the build.
 
@@ -12878,7 +12875,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12881 "configure"
+#line 12878 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12984,7 +12981,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12987 "configure"
+#line 12984 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13841,34 +13838,6 @@ fi
 
 
 
-#
-# Select the level of SMP support
-#
-case "${target}" in
-  *)                    mips_smp=0 ;;
-esac
-
-default_sim_smp="$mips_smp"
-# Check whether --enable-sim-smp was given.
-if test "${enable_sim_smp+set}" = set; then :
-  enableval=$enable_sim_smp; case "${enableval}" in
-  yes)	sim_smp="-DWITH_SMP=5" ; sim_igen_smp="-N 5";;
-  no)	sim_smp="-DWITH_SMP=0" ; sim_igen_smp="-N 0";;
-  *)	sim_smp="-DWITH_SMP=$enableval" ; sim_igen_smp="-N $enableval";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_smp" != x""; then
-  echo "Setting smp flags = $sim_smp" 6>&1
-fi
-else
-  sim_smp="-DWITH_SMP=${default_sim_smp}" ; sim_igen_smp="-N ${default_sim_smp}"
-if test x"$silent" != x"yes"; then
-  echo "Setting smp flags = $sim_smp" 6>&1
-fi
-fi
-
-
-
-
 #
 # Select the IGEN architecture
 #
diff --git a/sim/mips/configure.ac b/sim/mips/configure.ac
index c21faaf671d..476fc3562f6 100644
--- a/sim/mips/configure.ac
+++ b/sim/mips/configure.ac
@@ -86,16 +86,6 @@ SIM_AC_OPTION_FLOAT($mips_fpu,$mips_fpu_bitsize)
 
 
 
-#
-# Select the level of SMP support
-#
-case "${target}" in
-  *)                    mips_smp=0 ;;
-esac
-SIM_AC_OPTION_SMP($mips_smp)
-
-
-
 #
 # Select the IGEN architecture
 #
-- 
2.30.2