From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id A3E09385B518 for ; Tue, 3 Jan 2023 07:57:22 +0000 (GMT) Received: by smtp.gentoo.org (Postfix, from userid 559) id 59BE7340CD7; Tue, 3 Jan 2023 07:57:22 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH 34/83] sim: v850: move libsim.a creation to top-level Date: Tue, 3 Jan 2023 02:55:16 -0500 Message-Id: <20230103075605.13606-35-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,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 | 76 +++++++++++++++++++++++++++++++++++--------- sim/v850/Makefile.in | 6 +--- sim/v850/local.mk | 26 +++++++++++++++ 3 files changed, 88 insertions(+), 20 deletions(-) diff --git a/sim/v850/Makefile.in b/sim/v850/Makefile.in index e23e644aec57..61df283a31c2 100644 --- a/sim/v850/Makefile.in +++ b/sim/v850/Makefile.in @@ -17,11 +17,7 @@ ## COMMON_PRE_CONFIG_FRAG -SIM_OBJS = \ - $(SIM_NEW_COMMON_OBJS) \ - simops.o interp.o \ - itable.o semantics.o idecode.o icache.o engine.o irun.o support.o \ - sim-resume.o +SIM_LIBSIM = SIM_EXTRA_CFLAGS = -DWITH_TARGET_WORD_BITSIZE=32 -DWITH_TARGET_WORD_MSB=31 diff --git a/sim/v850/local.mk b/sim/v850/local.mk index 2c27d0c6d7ea..769c6030d6ef 100644 --- a/sim/v850/local.mk +++ b/sim/v850/local.mk @@ -16,6 +16,32 @@ ## 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%/simops.o \ + %D%/interp.o \ + %D%/itable.o \ + %D%/semantics.o \ + %D%/idecode.o \ + %D%/icache.o \ + %D%/engine.o \ + %D%/irun.o \ + %D%/support.o \ + %D%/modules.o \ + %D%/sim-resume.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