diff mbox series

[79/83] sim: build: drop most recursive build deps

Message ID	20230103075605.13606-80-vapier@gentoo.org
State	Committed
Headers	To: gdb-patches@sourceware.org Subject: [PATCH 79/83] sim: build: drop most recursive build deps Date: Tue, 3 Jan 2023 02:56:01 -0500 Message-Id: <20230103075605.13606-80-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:56 a.m. UTC

  Now that we build these objects in the top dir & generate modules.c
there, we don't need to generate them all first -- we can let the
normal dependency graph take care of building things in parallel.
---
 sim/Makefile.in      | 281 +++++++++++++++++++++----------------------
 sim/bpf/local.mk     |   3 +-
 sim/cr16/local.mk    |   3 +-
 sim/cris/local.mk    |   3 +-
 sim/d10v/local.mk    |   3 +-
 sim/frv/local.mk     |   3 +-
 sim/iq2000/local.mk  |   3 +-
 sim/lm32/local.mk    |   3 +-
 sim/m32c/local.mk    |   3 +-
 sim/m32r/local.mk    |   3 +-
 sim/m68hc11/local.mk |   3 +-
 sim/mips/local.mk    |   3 +-
 sim/mn10300/local.mk |   3 +-
 sim/or1k/local.mk    |   3 +-
 sim/sh/local.mk      |   3 +-
 sim/v850/local.mk    |   3 +-
 16 files changed, 153 insertions(+), 173 deletions(-)

diff mbox series

Patch

diff --git a/sim/bpf/local.mk b/sim/bpf/local.mk
index 4218999c7e72..80bf775104ff 100644
--- a/sim/bpf/local.mk
+++ b/sim/bpf/local.mk
@@ -73,8 +73,7 @@  BUILT_SOURCES += \
 	%D%/mloop-be.c \
 	%D%/stamp-mloop-be
 
-## This makes sure build tools are available before building the arch-subdirs.
-SIM_ALL_RECURSIVE_DEPS += $(%C%_BUILD_OUTPUTS)
+## Generating modules.c requires all sources to scan.
 %D%/modules.c: | $(%C%_BUILD_OUTPUTS)
 
 %D%/mloop-le.c %D%/eng-le.h: %D%/stamp-mloop-le ; @true
diff --git a/sim/cr16/local.mk b/sim/cr16/local.mk
index 19446381c9f5..cb5ae553594b 100644
--- a/sim/cr16/local.mk
+++ b/sim/cr16/local.mk
@@ -47,8 +47,7 @@  BUILT_SOURCES += %D%/simops.h
 	%D%/gencode$(EXEEXT) \
 	%D%/table.c
 
-## This makes sure build tools are available before building the arch-subdirs.
-SIM_ALL_RECURSIVE_DEPS += $(%C%_BUILD_OUTPUTS)
+## Generating modules.c requires all sources to scan.
 %D%/modules.c: | $(%C%_BUILD_OUTPUTS)
 
 %C%_gencode_SOURCES = %D%/gencode.c
diff --git a/sim/cris/local.mk b/sim/cris/local.mk
index 14c8644fe070..3976f6836ef3 100644
--- a/sim/cris/local.mk
+++ b/sim/cris/local.mk
@@ -77,8 +77,7 @@  BUILT_SOURCES += \
 	%D%/mloopv32f.c \
 	%D%/stamp-mloop-v32f
 
-## This makes sure build tools are available before building the arch-subdirs.
-SIM_ALL_RECURSIVE_DEPS += $(%C%_BUILD_OUTPUTS)
+## Generating modules.c requires all sources to scan.
 %D%/modules.c: | $(%C%_BUILD_OUTPUTS)
 
 ## FIXME: What is mono and what does "Use of `mono' is wip" mean (other
diff --git a/sim/d10v/local.mk b/sim/d10v/local.mk
index 967d4e7e543c..63ddb6ea0c58 100644
--- a/sim/d10v/local.mk
+++ b/sim/d10v/local.mk
@@ -48,8 +48,7 @@  BUILT_SOURCES += %D%/simops.h
 	%D%/gencode$(EXEEXT) \
 	%D%/table.c
 
-## This makes sure build tools are available before building the arch-subdirs.
-SIM_ALL_RECURSIVE_DEPS += $(%C%_BUILD_OUTPUTS)
+## Generating modules.c requires all sources to scan.
 %D%/modules.c: | $(%C%_BUILD_OUTPUTS)
 
 %C%_gencode_SOURCES = %D%/gencode.c
diff --git a/sim/frv/local.mk b/sim/frv/local.mk
index c1a10045a708..7d572fccb6ab 100644
--- a/sim/frv/local.mk
+++ b/sim/frv/local.mk
@@ -83,8 +83,7 @@  BUILT_SOURCES += %D%/eng.h
 	%D%/mloop.c \
 	%D%/stamp-mloop
 
-## This makes sure build tools are available before building the arch-subdirs.
-SIM_ALL_RECURSIVE_DEPS += $(%C%_BUILD_OUTPUTS)
+## Generating modules.c requires all sources to scan.
 %D%/modules.c: | $(%C%_BUILD_OUTPUTS)
 
 ## FIXME: Use of `mono' is wip.
diff --git a/sim/iq2000/local.mk b/sim/iq2000/local.mk
index fa498e485950..77804fe69abe 100644
--- a/sim/iq2000/local.mk
+++ b/sim/iq2000/local.mk
@@ -58,8 +58,7 @@  BUILT_SOURCES += %D%/eng.h
 	%D%/mloop.c \
 	%D%/stamp-mloop
 
-## This makes sure build tools are available before building the arch-subdirs.
-SIM_ALL_RECURSIVE_DEPS += $(%C%_BUILD_OUTPUTS)
+## Generating modules.c requires all sources to scan.
 %D%/modules.c: | $(%C%_BUILD_OUTPUTS)
 
 ## FIXME: Use of `mono' is wip.
diff --git a/sim/lm32/local.mk b/sim/lm32/local.mk
index 4fecaca6a389..40f8d524c952 100644
--- a/sim/lm32/local.mk
+++ b/sim/lm32/local.mk
@@ -63,8 +63,7 @@  BUILT_SOURCES += %D%/eng.h
 	%D%/mloop.c \
 	%D%/stamp-mloop
 
-## This makes sure build tools are available before building the arch-subdirs.
-SIM_ALL_RECURSIVE_DEPS += $(%C%_BUILD_OUTPUTS)
+## Generating modules.c requires all sources to scan.
 %D%/modules.c: | $(%C%_BUILD_OUTPUTS)
 
 ## FIXME: Use of `mono' is wip.
diff --git a/sim/m32c/local.mk b/sim/m32c/local.mk
index 7093e248c7e2..a6d22424929c 100644
--- a/sim/m32c/local.mk
+++ b/sim/m32c/local.mk
@@ -53,8 +53,7 @@  noinst_PROGRAMS += %D%/run
 	%D%/m32c.c \
 	%D%/r8c.c
 
-## This makes sure build tools are available before building the arch-subdirs.
-SIM_ALL_RECURSIVE_DEPS += $(%C%_BUILD_OUTPUTS)
+## Generating modules.c requires all sources to scan.
 %D%/modules.c: | $(%C%_BUILD_OUTPUTS)
 
 %C%_opc2c_SOURCES = %D%/opc2c.c
diff --git a/sim/m32r/local.mk b/sim/m32r/local.mk
index 6a6a6d999128..24ef10ef2bcc 100644
--- a/sim/m32r/local.mk
+++ b/sim/m32r/local.mk
@@ -96,8 +96,7 @@  BUILT_SOURCES += \
 	%D%/mloop2.c \
 	%D%/stamp-mloop-2
 
-## This makes sure build tools are available before building the arch-subdirs.
-SIM_ALL_RECURSIVE_DEPS += $(%C%_BUILD_OUTPUTS)
+## Generating modules.c requires all sources to scan.
 %D%/modules.c: | $(%C%_BUILD_OUTPUTS)
 
 ## FIXME: Use of `mono' is wip.
diff --git a/sim/m68hc11/local.mk b/sim/m68hc11/local.mk
index d5faae40ed53..e094918a3210 100644
--- a/sim/m68hc11/local.mk
+++ b/sim/m68hc11/local.mk
@@ -63,8 +63,7 @@  noinst_PROGRAMS += %D%/run
 	%D%/m68hc11int.c \
 	%D%/m68hc12int.c
 
-## This makes sure build tools are available before building the arch-subdirs.
-SIM_ALL_RECURSIVE_DEPS += $(%C%_BUILD_OUTPUTS)
+## Generating modules.c requires all sources to scan.
 %D%/modules.c: | $(%C%_BUILD_OUTPUTS)
 
 %C%_gencode_SOURCES = %D%/gencode.c
diff --git a/sim/mips/local.mk b/sim/mips/local.mk
index 942997240c8e..5f32eee573f0 100644
--- a/sim/mips/local.mk
+++ b/sim/mips/local.mk
@@ -154,8 +154,7 @@  if SIM_MIPS_GEN_MODE_MULTI
 	%D%/stamp-gen-mode-multi-run
 endif
 
-## This makes sure build tools are available before building the arch-subdirs.
-SIM_ALL_RECURSIVE_DEPS += $(%C%_BUILD_OUTPUTS)
+## Generating modules.c requires all sources to scan.
 %D%/modules.c: | $(%C%_BUILD_OUTPUTS)
 
 $(%C%_BUILT_SRC_FROM_IGEN_ITABLE): %D%/stamp-igen-itable
diff --git a/sim/mn10300/local.mk b/sim/mn10300/local.mk
index 2abd093e8343..1eae112642d4 100644
--- a/sim/mn10300/local.mk
+++ b/sim/mn10300/local.mk
@@ -83,8 +83,7 @@  BUILT_SOURCES += \
 	$(%C%_BUILT_SRC_FROM_IGEN) \
 	%D%/stamp-igen
 
-## This makes sure build tools are available before building the arch-subdirs.
-SIM_ALL_RECURSIVE_DEPS += $(%C%_BUILD_OUTPUTS)
+## Generating modules.c requires all sources to scan.
 %D%/modules.c: | $(%C%_BUILD_OUTPUTS)
 
 $(%C%_BUILT_SRC_FROM_IGEN): %D%/stamp-igen
diff --git a/sim/or1k/local.mk b/sim/or1k/local.mk
index 71a34db21d8d..a5989d51ddaf 100644
--- a/sim/or1k/local.mk
+++ b/sim/or1k/local.mk
@@ -65,8 +65,7 @@  BUILT_SOURCES += %D%/eng.h
 	%D%/mloop.c \
 	%D%/stamp-mloop
 
-## This makes sure build tools are available before building the arch-subdirs.
-SIM_ALL_RECURSIVE_DEPS += $(%C%_BUILD_OUTPUTS)
+## Generating modules.c requires all sources to scan.
 %D%/modules.c: | $(%C%_BUILD_OUTPUTS)
 
 ## FIXME: Use of `mono' is wip.
diff --git a/sim/sh/local.mk b/sim/sh/local.mk
index b197fa4c7c37..4f6a4c5e6617 100644
--- a/sim/sh/local.mk
+++ b/sim/sh/local.mk
@@ -49,8 +49,7 @@  BUILT_SOURCES += \
 	%D%/gencode$(EXEEXT) \
 	%D%/table.c
 
-## This makes sure build tools are available before building the arch-subdirs.
-SIM_ALL_RECURSIVE_DEPS += $(%C%_BUILD_OUTPUTS)
+## Generating modules.c requires all sources to scan.
 %D%/modules.c: | $(%C%_BUILD_OUTPUTS)
 
 %C%_gencode_SOURCES = %D%/gencode.c
diff --git a/sim/v850/local.mk b/sim/v850/local.mk
index 68f61f89505c..973e83c42789 100644
--- a/sim/v850/local.mk
+++ b/sim/v850/local.mk
@@ -78,8 +78,7 @@  BUILT_SOURCES += \
 	$(%C%_BUILT_SRC_FROM_IGEN) \
 	%D%/stamp-igen
 
-## This makes sure build tools are available before building the arch-subdirs.
-SIM_ALL_RECURSIVE_DEPS += $(%C%_BUILD_OUTPUTS)
+## Generating modules.c requires all sources to scan.
 %D%/modules.c: | $(%C%_BUILD_OUTPUTS)
 
 $(%C%_BUILT_SRC_FROM_IGEN): %D%/stamp-igen