[PATCH 2/2] sim: ppc: inline common sim-fpu.c logic

Mike Frysinger via Gdb-patches
2021-11-03T23:48:02Z

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 2f8fe9b20b0e..b9918954f37e 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.ac b/sim/ppc/configure.ac
index 8d5d78ce1dcd..75232006e94a 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.33.0