From patchwork Tue Jan 3 07:55:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 62587 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 454DF3896C19 for ; Tue, 3 Jan 2023 08:00:26 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 454DF3896C19 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1672732826; bh=aQ74/BfeBcsFYVWpWps2O1cfxkAw+uWcByvjnESt9wU=; 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=SKW90i9Lrc5seDTxvklpzVARA/Co5zsaReJ0UgV7KhBs3mfW9Pjh9XPDTgggsdntC bHIHoj+K2s5IZoYzjsO0fOE1C3zybSE68WVJsD5HodmOHtP9SRtrsKOyYqrf5m/rGm zLRGbCOhknyURpgJrqSCSWQUdmntCCBdLhAWV+d4= 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 026563858428 for ; Tue, 3 Jan 2023 07:56:49 +0000 (GMT) Received: by smtp.gentoo.org (Postfix, from userid 559) id A8DCF335D7D; Tue, 3 Jan 2023 07:56:48 +0000 (UTC) To: gdb-patches@sourceware.org Subject: [PATCH 18/83] sim: lm32: move libsim.a creation to top-level Date: Tue, 3 Jan 2023 02:55:00 -0500 Message-Id: <20230103075605.13606-19-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 | 206 +++++++++++++++++++++++++++---------------- sim/lm32/Makefile.in | 9 +- sim/lm32/local.mk | 34 +++++++ 3 files changed, 167 insertions(+), 82 deletions(-) diff --git a/sim/lm32/Makefile.in b/sim/lm32/Makefile.in index a39420f59270..cee1935ba341 100644 --- a/sim/lm32/Makefile.in +++ b/sim/lm32/Makefile.in @@ -5,13 +5,6 @@ arch = lm32 -# List of object files, less common parts. -SIM_OBJS = \ - $(SIM_NEW_COMMON_OBJS) \ - cgen-utils.o cgen-trace.o cgen-scache.o \ - cgen-run.o \ - sim-if.o arch.o \ - cpu.o decode.o sem.o model.o mloop.o \ - lm32.o traps.o user.o +SIM_LIBSIM = ## COMMON_POST_CONFIG_FRAG diff --git a/sim/lm32/local.mk b/sim/lm32/local.mk index 311de7df47e8..987f2ac25b83 100644 --- a/sim/lm32/local.mk +++ b/sim/lm32/local.mk @@ -16,6 +16,40 @@ ## 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)) \ + $(patsubst %,%D%/dv-%.o,$(%C%_SIM_EXTRA_HW_DEVICES)) \ + %D%/modules.o \ + \ + %D%/cgen-run.o \ + %D%/cgen-scache.o \ + %D%/cgen-trace.o \ + %D%/cgen-utils.o \ + \ + %D%/arch.o \ + %D%/cpu.o \ + %D%/decode.o \ + %D%/sem.o \ + %D%/mloop.o \ + %D%/model.o \ + \ + %D%/lm32.o \ + %D%/sim-if.o \ + %D%/traps.o \ + %D%/user.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 \