From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) by sourceware.org (Postfix) with ESMTP id 1F0F03857C45 for ; Tue, 3 Jan 2023 07:56:32 +0000 (GMT) Received: by smtp.gentoo.org (Postfix, from userid 559) id C61A0335D79; Tue, 3 Jan 2023 07:56:31 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH 10/83] sim: cris: move libsim.a creation to top-level Date: Tue, 3 Jan 2023 02:54:52 -0500 Message-Id: <20230103075605.13606-11-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 Content-Transfer-Encoding: 8bit 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 List-Id: 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 | 271 ++++++++++++++++++++++++++----------------- sim/cris/Makefile.in | 12 +- sim/cris/local.mk | 37 ++++++ 3 files changed, 205 insertions(+), 115 deletions(-) diff --git a/sim/cris/Makefile.in b/sim/cris/Makefile.in index 0a045ca06778..142825fa26d3 100644 --- a/sim/cris/Makefile.in +++ b/sim/cris/Makefile.in @@ -21,16 +21,6 @@ arch = cris -CRISV10F_OBJS = crisv10f.o cpuv10.o decodev10.o modelv10.o mloopv10f.o -CRISV32F_OBJS = crisv32f.o cpuv32.o decodev32.o modelv32.o mloopv32f.o - -SIM_OBJS = \ - $(SIM_NEW_COMMON_OBJS) \ - cgen-utils.o cgen-trace.o cgen-scache.o \ - cgen-run.o \ - sim-if.o arch.o \ - $(CRISV10F_OBJS) \ - $(CRISV32F_OBJS) \ - traps.o +SIM_LIBSIM = ## COMMON_POST_CONFIG_FRAG diff --git a/sim/cris/local.mk b/sim/cris/local.mk index d55e7b84e25b..912ca12a32f4 100644 --- a/sim/cris/local.mk +++ b/sim/cris/local.mk @@ -16,6 +16,43 @@ ## 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%/crisv10f.o \ + %D%/cpuv10.o \ + %D%/decodev10.o \ + %D%/modelv10.o \ + %D%/mloopv10f.o \ + %D%/crisv32f.o \ + %D%/cpuv32.o \ + %D%/decodev32.o \ + %D%/modelv32.o \ + %D%/mloopv32f.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 \ -- 2.39.0