From f631b79abeda4dc7ee08850885bda63f7616f84c Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Tue, 12 Jan 2021 03:34:24 -0500
Subject: [PATCH] sim: or1k: delete redundant SIM_AC_OPTION_INLINE call

This was merged into the common code a long time ago, so ports
shouldn't be calling this themselves.
---
 sim/or1k/ChangeLog    |  5 +++++
 sim/or1k/configure    | 44 +++++++++++--------------------------------
 sim/or1k/configure.ac |  1 -
 3 files changed, 16 insertions(+), 34 deletions(-)

diff --git a/sim/or1k/ChangeLog b/sim/or1k/ChangeLog
index 016ffd039cf..d305cb32264 100644
--- a/sim/or1k/ChangeLog
+++ b/sim/or1k/ChangeLog
@@ -1,3 +1,8 @@
+2021-01-12  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (SIM_AC_OPTION_INLINE): Delete call.
+	* configure: Regenerate.
+
 2021-01-11  Mike Frysinger  <vapier@gentoo.org>
 
 	* configure.ac: Call SIM_AC_OPTION_WARNINGS.
diff --git a/sim/or1k/configure b/sim/or1k/configure
index 8d8746e4e9a..7fbd748c8e0 100755
--- a/sim/or1k/configure
+++ b/sim/or1k/configure
@@ -6918,7 +6918,15 @@ fi
 test -z "$AR" && AR=ar
 if test -n "$plugin_option"; then
   if $AR --help 2>&1 | grep -q "\--plugin"; then
-    AR="$AR $plugin_option"
+    touch conftest.c
+    $AR $plugin_option rc conftest.a conftest.c
+    if test "$?" != 0; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
+$as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;}
+    else
+      AR="$AR $plugin_option"
+    fi
+    rm -f conftest.*
   fi
 fi
 test -z "$AR_FLAGS" && AR_FLAGS=cru
@@ -12942,7 +12950,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12945 "configure"
+#line 12953 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13048,7 +13056,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 13051 "configure"
+#line 13059 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13904,36 +13912,6 @@ _ACEOF
 $as_echo "$sim_environment" >&6; }
 
 
-sim_inline="-DDEFAULT_INLINE=0"
-# Check whether --enable-sim-inline was given.
-if test "${enable_sim_inline+set}" = set; then :
-  enableval=$enable_sim_inline; sim_inline=""
-case "$enableval" in
-  no)		sim_inline="-DDEFAULT_INLINE=0";;
-  0)		sim_inline="-DDEFAULT_INLINE=0";;
-  yes | 2)	sim_inline="-DDEFAULT_INLINE=ALL_C_INLINE";;
-  1)		sim_inline="-DDEFAULT_INLINE=INLINE_LOCALS";;
-  *) for x in `echo "$enableval" | sed -e "s/,/ /g"`; do
-       new_flag=""
-       case "$x" in
-	 *_INLINE=*)	new_flag="-D$x";;
-	 *=*)		new_flag=`echo "$x" | sed -e "s/=/_INLINE=/" -e "s/^/-D/"`;;
-	 *_INLINE)	new_flag="-D$x=ALL_C_INLINE";;
-	 *)		new_flag="-D$x""_INLINE=ALL_C_INLINE";;
-       esac
-       if test x"$sim_inline" = x""; then
-	 sim_inline="$new_flag"
-       else
-	 sim_inline="$sim_inline $new_flag"
-       fi
-     done;;
-esac
-if test x"$silent" != x"yes" && test x"$sim_inline" != x""; then
-  echo "Setting inline flags = $sim_inline" 6>&1
-fi
-fi
-
-
 cgen_maint=no
 cgen=guile
 cgendir='$(srcdir)/../../cgen'
diff --git a/sim/or1k/configure.ac b/sim/or1k/configure.ac
index 19a1da319bc..ad5d93428c2 100644
--- a/sim/or1k/configure.ac
+++ b/sim/or1k/configure.ac
@@ -11,7 +11,6 @@ SIM_AC_OPTION_SCACHE(16384)
 SIM_AC_OPTION_DEFAULT_MODEL([or1200])
 SIM_AC_OPTION_WARNINGS(no)
 SIM_AC_OPTION_ENVIRONMENT
-SIM_AC_OPTION_INLINE()
 SIM_AC_OPTION_CGEN_MAINT
 
 SIM_AC_OUTPUT
-- 
2.30.2