diff mbox series

[05/83] sim: arm: move libsim.a creation to top-level

Message ID	20230103075605.13606-6-vapier@gentoo.org
State	Committed
Headers	To: gdb-patches@sourceware.org Subject: [PATCH 05/83] sim: arm: move libsim.a creation to top-level Date: Tue, 3 Jan 2023 02:54:47 -0500 Message-Id: <20230103075605.13606-6-vapier@gentoo.org> In-Reply-To: <20230103075605.13606-1-vapier@gentoo.org> References: <20230103075605.13606-1-vapier@gentoo.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: list From: Mike Frysinger via Gdb-patches <gdb-patches@sourceware.org> Reply-To: Mike Frysinger <vapier@gentoo.org> Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" <gdb-patches-bounces+patchwork=sourceware.org@sourceware.org>
Series	sim: merge subdir makefiles into top-level \| [00/83] sim: merge subdir makefiles into top-level [01/83] sim: mips: add multi source to built sources [02/83] sim: modules: trigger generation from top-level [03/83] sim: build: drop support for subdir extra deps [04/83] sim: aarch64: move libsim.a creation to top-level [05/83] sim: arm: move libsim.a creation to top-level [06/83] sim: avr: move libsim.a creation to top-level [07/83] sim: bfin: move libsim.a creation to top-level [08/83] sim: bpf: move libsim.a creation to top-level [09/83] sim: cr16: move libsim.a creation to top-level [10/83] sim: cris: move libsim.a creation to top-level [11/83] sim: d10v: move libsim.a creation to top-level [12/83] sim: erc32: move libsim.a creation to top-level [13/83] sim: example-synacor: move libsim.a creation to top-level [14/83] sim: frv: move libsim.a creation to top-level [15/83] sim: ft32: move libsim.a creation to top-level [16/83] sim: h8300: move libsim.a creation to top-level [17/83] sim: iq2000: move libsim.a creation to top-level [18/83] sim: lm32: move libsim.a creation to top-level [19/83] sim: m32c: move libsim.a creation to top-level [20/83] sim: m32r: move libsim.a creation to top-level [21/83] sim: m68hc11: move libsim.a creation to top-level [22/83] sim: mcore: move libsim.a creation to top-level [23/83] sim: microblaze: move libsim.a creation to top-level [24/83] sim: mips: move libsim.a creation to top-level [25/83] sim: mn10300: move libsim.a creation to top-level [26/83] sim: moxie: move libsim.a creation to top-level [27/83] sim: msp430: move libsim.a creation to top-level [28/83] sim: or1k: move libsim.a creation to top-level [29/83] sim: pru: move libsim.a creation to top-level [30/83] sim: riscv: move libsim.a creation to top-level [31/83] sim: rl78: move libsim.a creation to top-level [32/83] sim: rx: move libsim.a creation to top-level [33/83] sim: sh: move libsim.a creation to top-level [34/83] sim: v850: move libsim.a creation to top-level [35/83] sim: build: drop support for creating libsim.a in subdirs [36/83] sim: build: drop common/nrun.o subdir hack [37/83] sim: modules.c: move generation to top-level [38/83] sim: build: add basic framework for compiling arch objects in top-level [39/83] sim: aarch64: move arch-specific file compilation to top-level [40/83] sim: arm: move arch-specific file compilation to top-level [41/83] sim: avr: move arch-specific file compilation to top-level [42/83] sim: bpf: move arch-specific file compilation to top-level [43/83] sim: bfin: move arch-specific file compilation to top-level [44/83] sim: cr16: move arch-specific file compilation to top-level [45/83] sim: cris: move arch-specific file compilation to top-level [46/83] sim: d10v: move arch-specific file compilation to top-level [47/83] sim: erc32: move arch-specific file compilation to top-level [48/83] sim: example-synacor: move arch-specific file compilation to top-level [49/83] sim: frv: move arch-specific file compilation to top-level [50/83] sim: ft32: move arch-specific file compilation to top-level [51/83] sim: h8300: move arch-specific file compilation to top-level [52/83] sim: iq2000: move arch-specific file compilation to top-level [53/83] sim: lm32: move arch-specific file compilation to top-level [54/83] sim: m32c: move arch-specific file compilation to top-level [55/83] sim: m32r: move arch-specific file compilation to top-level [56/83] sim: m68hc11: move arch-specific file compilation to top-level [57/83] sim: mcore: move arch-specific file compilation to top-level [58/83] sim: microblaze: move arch-specific file compilation to top-level [59/83] sim: mips: move arch-specific file compilation to top-level [60/83] sim: mn10300: move arch-specific file compilation to top-level [61/83] sim: moxie: move arch-specific file compilation to top-level [62/83] sim: msp430: move arch-specific file compilation to top-level [63/83] sim: or1k: move arch-specific file compilation to top-level [64/83] sim: pru: move arch-specific file compilation to top-level [65/83] sim: riscv: move arch-specific file compilation to top-level [66/83] sim: rl78: move arch-specific file compilation to top-level [67/83] sim: rx: move arch-specific file compilation to top-level [68/83] sim: sh: move arch-specific file compilation to top-level [69/83] sim: v850: move arch-specific file compilation to top-level [70/83] sim: move arch-specific file compilation of common/ files to top-level [71/83] sim: common: move test-hw-events to top-level build [72/83] sim: disable recursive make in (most) subdirs [73/83] sim: build: drop subdir Makefile.in files [74/83] sim: build: delete Make-common.in logic [75/83] sim: build: drop AM_MAKEFLAGS settings [76/83] sim: common: simplify hw-config.h deps [77/83] sim: igen: simplify build dep [78/83] sim: common: move libcommon.a objects to sources [79/83] sim: build: drop most recursive build deps [80/83] sim: common: move libcommon.a dep to ppc code [81/83] sim: common: move modules.c to source tracking [82/83] sim: common: simplify modules.c deps [83/83] sim: build: drop depdir subdir hack

Commit Message

Mike Frysinger Jan. 3, 2023, 7:54 a.m. UTC

  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     | 278 +++++++++++++++++++++++++-------------------
 sim/arm/Makefile.in |   7 +-
 sim/arm/local.mk    |  21 ++++
 3 files changed, 181 insertions(+), 125 deletions(-)

diff mbox series

Patch

diff --git a/sim/arm/Makefile.in b/sim/arm/Makefile.in
index 9dda82be86f1..cdf371d844c7 100644
--- a/sim/arm/Makefile.in
+++ b/sim/arm/Makefile.in
@@ -19,11 +19,6 @@ 
 
 SIM_EXTRA_CFLAGS = -DMODET
 
-SIM_OBJS = \
-	wrapper.o \
-	$(SIM_NEW_COMMON_OBJS) \
-	armemu.o armemu32.o arminit.o armos.o armsupp.o \
-	armvirt.o thumbemu.o \
-	armcopro.o maverick.o iwmmxt.o
+SIM_LIBSIM =
 
 ## COMMON_POST_CONFIG_FRAG
diff --git a/sim/arm/local.mk b/sim/arm/local.mk
index 4bbbf92cc741..e3ce50fc81ab 100644
--- a/sim/arm/local.mk
+++ b/sim/arm/local.mk
@@ -16,6 +16,27 @@ 
 ## You should have received a copy of the GNU General Public License
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+%C%_libsim_a_SOURCES =
+%C%_libsim_a_LIBADD = \
+	$(common_libcommon_a_OBJECTS) \
+	%D%/wrapper.o \
+	$(patsubst %,%D%/%,$(SIM_NEW_COMMON_OBJS)) \
+	$(patsubst %,%D%/dv-%.o,$(SIM_HW_DEVICES)) \
+	%D%/armemu.o \
+	%D%/armemu32.o %D%/arminit.o %D%/armos.o %D%/armsupp.o \
+	%D%/armvirt.o %D%/thumbemu.o \
+	%D%/armcopro.o %D%/maverick.o %D%/iwmmxt.o \
+	%D%/modules.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 \