From patchwork Tue Jan 3 07:56:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 62642 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 2B6573846414 for ; Tue, 3 Jan 2023 08:10:01 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2B6573846414 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1672733401; bh=lCTDZ78tHZZHrx7oIil5ensxivUcKvKY2WUfm/1Oo5Y=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=y5k/N0HObSuTqojSNAyONK0E3cW9BEGwfZjm2zpV898ksmMe9MUpVocQS6gKVAqlp bnjxprD3YInLRTnu8LAiNBeCXSK7LKW6/oeHrPsVGpGON+YzmP6BLEtip+isUzD9KA H+iA/kp7pZ3KZV4cDsog0cZfYkT3PxgE2BzEhv3E= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) by sourceware.org (Postfix) with ESMTP id E9C95382FCA3 for ; Tue, 3 Jan 2023 07:58:59 +0000 (GMT) Received: by smtp.gentoo.org (Postfix, from userid 559) id 7F0B4340CEE; Tue, 3 Jan 2023 07:58:59 +0000 (UTC) To: gdb-patches@sourceware.org Subject: [PATCH 80/83] sim: common: move libcommon.a dep to ppc code Date: Tue, 3 Jan 2023 02:56:02 -0500 Message-Id: <20230103075605.13606-81-vapier@gentoo.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230103075605.13606-1-vapier@gentoo.org> References: <20230103075605.13606-1-vapier@gentoo.org> MIME-Version: 1.0 X-Spam-Status: No, score=-11.2 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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-Patchwork-Original-From: Mike Frysinger via Gdb-patches From: Mike Frysinger Reply-To: Mike Frysinger Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" Rather than force this to be built ahead of time for all targets, move the dep to the ppc code since it's the only user of it now. --- sim/Makefile.in | 53 ++++++++++++++++++++++++--------------------- sim/common/local.mk | 5 ----- sim/ppc/local.mk | 6 +++++ 3 files changed, 34 insertions(+), 30 deletions(-) diff --git a/sim/common/local.mk b/sim/common/local.mk index 18b85cfd9418..5905266dd80b 100644 --- a/sim/common/local.mk +++ b/sim/common/local.mk @@ -23,11 +23,6 @@ AM_CPPFLAGS += \ AM_CPPFLAGS_%C% = -DSIM_COMMON_BUILD AM_CPPFLAGS_FOR_BUILD += -I$(srcdir)/%D% -## This makes sure common parts are available before building the arch-subdirs -## which will refer to these. -SIM_ALL_RECURSIVE_DEPS += \ - %D%/libcommon.a - ## NB: libcommon.a isn't used directly by ports. We need a target for common ## objects to be a part of, and ports use the individual objects directly. ## We can delete this once ppc/Makefile.in is merged into ppc/local.mk. diff --git a/sim/ppc/local.mk b/sim/ppc/local.mk index d8a4cacb152b..fca3b4f6b2ec 100644 --- a/sim/ppc/local.mk +++ b/sim/ppc/local.mk @@ -24,6 +24,12 @@ %D%/psim$(EXEEXT): %D%/run$(EXEEXT) $(AM_V_GEN)ln $< $@ 2>/dev/null || $(LN_S) $< $@ 2>/dev/null || cp -p $< $@ +## This makes sure common parts are available before building the arch-subdirs +## which will refer to these. +SIM_ALL_RECURSIVE_DEPS += common/libcommon.a +%D%/libsim.a: common/libcommon.a + $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) + ## Helper targets for running make from the top-level due to run's sis.o. %D%/%.o: %D%/%.c | %D%/libsim.a $(SIM_ALL_RECURSIVE_DEPS) $(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)