From patchwork Tue Jan 3 07:54:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 62566 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 97ECD385B50F for ; Tue, 3 Jan 2023 07:57:20 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 97ECD385B50F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1672732640; bh=RvvQf2lzDeaJHnPmalYktjqsRnVrw9TDEKSE8slci8A=; 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=SP5993sxFoJApuFht350txsVzMFfKpoXj7/l8cML7xK/9BNP6sMV7BBIvjshq/vI6 v0S5Q1SV9rv979LtCUomYnapZovdRbWr5xJ6Cmh39bHYRhHd3hquuQWU6k1apCijw+ nH20Hfhz1nFGfdOU9jN2LN57J+Gff0Vzpj046v0Q= 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 84AAA3858C60 for ; Tue, 3 Jan 2023 07:56:40 +0000 (GMT) Received: by smtp.gentoo.org (Postfix, from userid 559) id 33E3833BE0A; Tue, 3 Jan 2023 07:56:40 +0000 (UTC) To: gdb-patches@sourceware.org Subject: [PATCH 14/83] sim: frv: move libsim.a creation to top-level Date: Tue, 3 Jan 2023 02:54:56 -0500 Message-Id: <20230103075605.13606-15-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, KAM_SHORT, 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" The objects are still compiled in the subdir, but the creation of the archive itself is in the top-level. This is a required step before we can move compilation itself up, and makes it easier to review. The downside is that each object compile is a recursive make instead of a single one. On my 4 core system, it adds ~100msec to the build per port, so it's not great, but it shouldn't be a big deal. This will go away of course once the top-level compiles objects. --- sim/Makefile.in | 246 +++++++++++++++++++++++++++++--------------- sim/frv/Makefile.in | 12 +-- sim/frv/local.mk | 47 +++++++++ 3 files changed, 209 insertions(+), 96 deletions(-) diff --git a/sim/frv/Makefile.in b/sim/frv/Makefile.in index a13765589da9..12af397f4c1e 100644 --- a/sim/frv/Makefile.in +++ b/sim/frv/Makefile.in @@ -17,17 +17,7 @@ ## COMMON_PRE_CONFIG_FRAG -FRV_OBJS = frv.o cpu.o decode.o sem.o model.o mloop.o cgen-par.o - -SIM_OBJS = \ - $(SIM_NEW_COMMON_OBJS) \ - cgen-utils.o cgen-trace.o cgen-scache.o cgen-fpu.o cgen-accfp.o \ - cgen-run.o \ - sim-if.o arch.o \ - $(FRV_OBJS) \ - traps.o interrupts.o memory.o cache.o pipeline.o \ - profile.o profile-fr400.o profile-fr450.o profile-fr500.o profile-fr550.o options.o \ - reset.o registers.o +SIM_LIBSIM = SIM_EXTRA_CFLAGS = @SIM_FRV_TRAPDUMP_FLAGS@ diff --git a/sim/frv/local.mk b/sim/frv/local.mk index 471b0adc6533..2451235d2385 100644 --- a/sim/frv/local.mk +++ b/sim/frv/local.mk @@ -16,6 +16,53 @@ ## You should have received a copy of the GNU General Public License ## along with this program. If not, see . +%C%_libsim_a_SOURCES = +%C%_libsim_a_LIBADD = \ + $(common_libcommon_a_OBJECTS) \ + $(patsubst %,%D%/%,$(SIM_NEW_COMMON_OBJS)) \ + $(patsubst %,%D%/dv-%.o,$(SIM_HW_DEVICES)) \ + %D%/modules.o \ + \ + %D%/cgen-accfp.o \ + %D%/cgen-fpu.o \ + %D%/cgen-run.o \ + %D%/cgen-scache.o \ + %D%/cgen-trace.o \ + %D%/cgen-utils.o \ + \ + %D%/arch.o \ + %D%/cgen-par.o \ + %D%/cpu.o \ + %D%/decode.o \ + %D%/frv.o \ + %D%/mloop.o \ + %D%/model.o \ + %D%/sem.o \ + \ + %D%/cache.o \ + %D%/interrupts.o \ + %D%/memory.o \ + %D%/options.o \ + %D%/pipeline.o \ + %D%/profile.o \ + %D%/profile-fr400.o \ + %D%/profile-fr450.o \ + %D%/profile-fr500.o \ + %D%/profile-fr550.o \ + %D%/registers.o \ + %D%/reset.o \ + %D%/sim-if.o \ + %D%/traps.o +$(%C%_libsim_a_OBJECTS) $(%C%_libsim_a_LIBADD): %D%/hw-config.h + +noinst_LIBRARIES += %D%/libsim.a + +%D%/%.o: %D%/%.c + $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) + +%D%/%.o: common/%.c + $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) + %C%_run_SOURCES = %C%_run_LDADD = \ %D%/nrun.o \