sim: move sim-inline to the common code

This will allow us to build the common code with the same inline
settings as the arch subdirs, and only do the test once.

4 files changed, 7 insertions, 79 deletions

diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog
index ec248cb..b41d202 100644
--- a/sim/ppc/ChangeLog
+++ b/sim/ppc/ChangeLog
@@ -1,3 +1,9 @@
+2021-06-20  Mike Frysinger  <vapier@gentoo.org>
+
+	* Makefile.in (INLINE_CFLAGS): Change to $(SIM_INLINE).
+	* configure.ac: Delete sim-inline logic.
+	* configure: Regenerate.
+
 2021-06-19  Mike Frysinger  <vapier@gentoo.org>
 
 	* configure.ac: Replace ALL_INLINE with ALL_C_INLINE and
diff --git a/sim/ppc/Makefile.in b/sim/ppc/Makefile.in
index a621e99..964d667 100644
--- a/sim/ppc/Makefile.in
+++ b/sim/ppc/Makefile.in
@@ -58,7 +58,7 @@ SHELL = /bin/sh
 BISON = bison
 MAKEINFO = makeinfo
 
-INLINE_CFLAGS = @sim_inline@
+INLINE_CFLAGS = $(SIM_INLINE)
 SMP_CFLAGS = @sim_smp@
 XOR_ENDIAN_CFLAGS = @sim_xor_endian@
 BITSIZE_CFLAGS = @sim_bitsize@
diff --git a/sim/ppc/configure b/sim/ppc/configure
index 6228d17..a3b7b30 100755
--- a/sim/ppc/configure
+++ b/sim/ppc/configure
@@ -639,7 +639,6 @@ sim_bitsize
 sim_igen_smp
 sim_smp
 sim_xor_endian
-sim_inline
 sim_pk_obj
 sim_pk_src
 sim_hw_obj
@@ -718,7 +717,6 @@ enable_sim_float
 enable_sim_hardware
 enable_sim_hostbitsize
 enable_sim_icache
-enable_sim_inline
 enable_sim_jump
 enable_sim_line_nr
 enable_sim_model
@@ -1359,7 +1357,6 @@ Optional Features:
   --enable-sim-hardware=list		Specify the hardware to be included in the build.
   --enable-sim-hostbitsize=32|64	Specify host bitsize (32 or 64).
   --enable-sim-icache=size		Specify instruction-decode cache size and type.
-  --enable-sim-inline=inlines		Specify which functions should be inlined.
   --enable-sim-jump		Jump between semantic code (instead of call/return).
   --enable-sim-line-nr=opts		Generate extra CPP code that references source rather than generated code
   --enable-sim-model=which		Specify PowerPC to model.
@@ -3305,44 +3302,6 @@ fi
 fi
 
 
-# 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
-else
-  if test x"$GCC" != ""; then
-  sim_inline="-DDEFAULT_INLINE=INLINE_LOCALS"
-  if test x"$silent" != x"yes"; then
-    echo "Setting inline flags = $sim_inline" 6>&1
-  fi
-else
-  sim_inline=""
-fi
-fi
-
-
 # Check whether --enable-sim-jump was given.
 if test "${enable_sim_jump+set}" = set; then :
   enableval=$enable_sim_jump; case "${enableval}" in
@@ -4320,7 +4279,6 @@ fi
 
 
 
-
 ac_config_files="$ac_config_files Makefile"
 
 ac_config_commands="$ac_config_commands default"
diff --git a/sim/ppc/configure.ac b/sim/ppc/configure.ac
index 19dbd77..30952f3 100644
--- a/sim/ppc/configure.ac
+++ b/sim/ppc/configure.ac
@@ -269,41 +269,6 @@ if test x"$silent" != x"yes"; then
 fi])dnl
 
 
-AC_ARG_ENABLE(sim-inline,
-[  --enable-sim-inline=inlines		Specify which functions should be inlined.],
-[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],[if test x"$GCC" != ""; then
-  sim_inline="-DDEFAULT_INLINE=INLINE_LOCALS"
-  if test x"$silent" != x"yes"; then
-    echo "Setting inline flags = $sim_inline" 6>&1
-  fi
-else
-  sim_inline=""
-fi])dnl
-
-
 AC_ARG_ENABLE(sim-jump,
 [  --enable-sim-jump		Jump between semantic code (instead of call/return).],
 [case "${enableval}" in
@@ -693,7 +658,6 @@ AC_SUBST(sim_hw_src)
 AC_SUBST(sim_hw_obj)
 AC_SUBST(sim_pk_src)
 AC_SUBST(sim_pk_obj)
-AC_SUBST(sim_inline)
 AC_SUBST(sim_xor_endian)
 AC_SUBST(sim_smp)
 AC_SUBST(sim_igen_smp)