From 6ed0d0a080bc6e755d1e983366b4a59f471ee808 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Wed, 3 Nov 2021 03:13:02 -0400
Subject: [PATCH] sim: ppc: inline common sim-fpu.c logic

We will never bother building w/out a ../common/ sim directory,
so drop ancient logic supporting that method.
---
 sim/ppc/Makefile.in  |  4 ++--
 sim/ppc/configure    | 18 ------------------
 sim/ppc/configure.ac | 13 -------------
 3 files changed, 2 insertions(+), 33 deletions(-)

diff --git a/sim/ppc/Makefile.in b/sim/ppc/Makefile.in
index 2f8fe9b20b0..b9918954f37 100644
--- a/sim/ppc/Makefile.in
+++ b/sim/ppc/Makefile.in
@@ -86,7 +86,7 @@ CONFIG_CFLAGS = \
   $(MODEL_CFLAGS) \
   $(TERMIO_CFLAGS) \
   $(DEVZERO_CFLAGS)
-SIM_FPU_CFLAGS = @sim_fpu_cflags@
+SIM_FPU_CFLAGS = -DHAVE_COMMON_FPU -I../common -I${srcdir}/../common
 
 STD_CFLAGS	= $(CFLAGS) $(WERROR_CFLAGS) $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(WARN_CFLAGS) $(INCLUDES) $(INCGNU) $(INTL_CFLAGS) $(SIM_FPU_CFLAGS)
 NOWARN_CFLAGS	= $(CFLAGS) $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(INCLUDES) $(SIM_FPU_CFLAGS)
@@ -507,7 +507,7 @@ LIB_OBJ = \
 	semantics.o \
 	idecode.o \
 	support.o \
-	@sim_fpu@ \
+	sim-fpu.o \
 	psim.o \
 	$(COMMON_OBJS) \
 	$(PACKAGE_OBJ) \
diff --git a/sim/ppc/configure b/sim/ppc/configure
index 24531ee1820..1e5283771fa 100755
--- a/sim/ppc/configure
+++ b/sim/ppc/configure
@@ -621,8 +621,6 @@ ac_includes_default="\
 
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
-sim_fpu
-sim_fpu_cflags
 sim_devzero
 sim_termio
 sim_model_issue
@@ -4121,20 +4119,6 @@ else
   sim_devzero=""
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for common simulator directory fpu implementation" >&5
-$as_echo_n "checking for common simulator directory fpu implementation... " >&6; }
-if test -f "${srcdir}/../common/sim-fpu.c"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  sim_fpu_cflags="-DHAVE_COMMON_FPU -I../common -I${srcdir}/../common"
-  sim_fpu="sim-fpu.o"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  sim_fpu_cflags=
-  sim_fpu=
-fi
-
 # Since we run commands on the build system, we have to create a
 # separate config header for the build system if build != host.
 if test x$host = x$build; then
@@ -4190,8 +4174,6 @@ fi
 
 
 
-
-
 
 
 
diff --git a/sim/ppc/configure.ac b/sim/ppc/configure.ac
index 8d5d78ce1dc..75232006e94 100644
--- a/sim/ppc/configure.ac
+++ b/sim/ppc/configure.ac
@@ -545,17 +545,6 @@ else
   sim_devzero=""
 fi
 
-AC_MSG_CHECKING(for common simulator directory fpu implementation)
-if test -f "${srcdir}/../common/sim-fpu.c"; then
-  AC_MSG_RESULT(yes)
-  sim_fpu_cflags="-DHAVE_COMMON_FPU -I../common -I${srcdir}/../common"
-  sim_fpu="sim-fpu.o"
-else
-  AC_MSG_RESULT(no)
-  sim_fpu_cflags=
-  sim_fpu=
-fi
-
 # Since we run commands on the build system, we have to create a
 # separate config header for the build system if build != host.
 if test x$host = x$build; then
@@ -612,8 +601,6 @@ AC_SUBST(sim_default_model)
 AC_SUBST(sim_model_issue)
 AC_SUBST(sim_termio)
 AC_SUBST(sim_devzero)
-AC_SUBST(sim_fpu_cflags)
-AC_SUBST(sim_fpu)
 
 AC_OUTPUT(Makefile,
 [case x$CONFIG_HEADERS in xconfig.h:config.in) echo > stamp-h ;; esac])
-- 
2.30.2