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.
This commit is contained in:
Mike Frysinger
2021-11-03 03:13:02 -04:00
parent d54c09b99e
commit 6ed0d0a080
3 changed files with 2 additions and 33 deletions

View File

@ -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) \

18
sim/ppc/configure vendored
View File

@ -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

View File

@ -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])