From patchwork Tue Jan 3 07:55:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 62582 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 C33C038432D9 for ; Tue, 3 Jan 2023 07:59:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C33C038432D9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1672732774; bh=Ie3D7IaeHBABGaWVEPp4VBcCwd2sOWCDEaSpctw6byg=; 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=OAcYmu8OwZhHADu2AeW5/PwxFCZ6Jh9ZzNSqOYL3S3pMi2uvXrh0/gDmH1OJyeGwB 43hQl67TEuz5FBQU1/vHplgrhvSIxXneKG/o0RU27Gz+0oPzG2FM8n6NrD5xU5n4bE o0erfZcXupLBJJ0vFvAFITs08f9FehbmDkA3oYvw= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id 0AA883858023 for ; Tue, 3 Jan 2023 07:57:10 +0000 (GMT) Received: by smtp.gentoo.org (Postfix, from userid 559) id B53BD335D79; Tue, 3 Jan 2023 07:57:09 +0000 (UTC) To: gdb-patches@sourceware.org Subject: [PATCH 28/83] sim: or1k: move libsim.a creation to top-level Date: Tue, 3 Jan 2023 02:55:10 -0500 Message-Id: <20230103075605.13606-29-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, 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 | 118 +++++++++++++++++++++++++++++++------------ sim/or1k/Makefile.in | 22 +------- sim/or1k/local.mk | 34 +++++++++++++ 3 files changed, 122 insertions(+), 52 deletions(-) diff --git a/sim/or1k/Makefile.in b/sim/or1k/Makefile.in index ca5bf1ae4eee..19eed022932d 100644 --- a/sim/or1k/Makefile.in +++ b/sim/or1k/Makefile.in @@ -18,27 +18,7 @@ ## COMMON_PRE_CONFIG_FRAG -OR1K_OBJS = \ - or1k.o \ - arch.o \ - cpu.o \ - decode.o \ - model.o \ - sem.o \ - mloop.o \ - sim-if.o \ - traps.o - -SIM_OBJS = \ - $(SIM_NEW_COMMON_OBJS) \ - cgen-utils.o \ - cgen-trace.o \ - cgen-scache.o \ - cgen-run.o \ - cgen-fpu.o \ - cgen-accfp.o - -SIM_OBJS += $(OR1K_OBJS) +SIM_LIBSIM = SIM_EXTRA_CFLAGS = -DWITH_TARGET_WORD_BITSIZE=32 -DWITH_TARGET_WORD_MSB=31 diff --git a/sim/or1k/local.mk b/sim/or1k/local.mk index 7d999f6f3aa4..a7412bfa07ce 100644 --- a/sim/or1k/local.mk +++ b/sim/or1k/local.mk @@ -15,6 +15,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)) \ + %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%/cpu.o \ + %D%/decode.o \ + %D%/mloop.o \ + %D%/model.o \ + %D%/sem.o \ + \ + %D%/or1k.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 \