From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id 225A73858C60 for ; Wed, 3 Nov 2021 23:47:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 225A73858C60 Received: by smtp.gentoo.org (Postfix, from userid 559) id E5373342EB2; Wed, 3 Nov 2021 23:47:13 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH 2/2] sim: ppc: inline common sim-fpu.c logic Date: Wed, 3 Nov 2021 19:47:07 -0400 Message-Id: <20211103234707.5692-2-vapier@gentoo.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211103234707.5692-1-vapier@gentoo.org> References: <20211103234707.5692-1-vapier@gentoo.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Nov 2021 23:47:17 -0000 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