From: Mike Frysinger <vapier@gentoo.org>
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 [thread overview]
Message-ID: <20230103075605.13606-80-vapier@gentoo.org> (raw)
In-Reply-To: <20230103075605.13606-1-vapier@gentoo.org>
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 --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
--
2.39.0
next prev parent reply other threads:[~2023-01-03 7:58 UTC|newest]
Thread overview: 84+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-03 7:54 [PATCH 00/83] sim: merge subdir makefiles into top-level Mike Frysinger
2023-01-03 7:54 ` [PATCH 01/83] sim: mips: add multi source to built sources Mike Frysinger
2023-01-03 7:54 ` [PATCH 02/83] sim: modules: trigger generation from top-level Mike Frysinger
2023-01-03 7:54 ` [PATCH 03/83] sim: build: drop support for subdir extra deps Mike Frysinger
2023-01-03 7:54 ` [PATCH 04/83] sim: aarch64: move libsim.a creation to top-level Mike Frysinger
2023-01-03 7:54 ` [PATCH 05/83] sim: arm: " Mike Frysinger
2023-01-03 7:54 ` [PATCH 06/83] sim: avr: " Mike Frysinger
2023-01-03 7:54 ` [PATCH 07/83] sim: bfin: " Mike Frysinger
2023-01-03 7:54 ` [PATCH 08/83] sim: bpf: " Mike Frysinger
2023-01-03 7:54 ` [PATCH 09/83] sim: cr16: " Mike Frysinger
2023-01-03 7:54 ` [PATCH 10/83] sim: cris: " Mike Frysinger
2023-01-03 7:54 ` [PATCH 11/83] sim: d10v: " Mike Frysinger
2023-01-03 7:54 ` [PATCH 12/83] sim: erc32: " Mike Frysinger
2023-01-03 7:54 ` [PATCH 13/83] sim: example-synacor: " Mike Frysinger
2023-01-03 7:54 ` [PATCH 14/83] sim: frv: " Mike Frysinger
2023-01-03 7:54 ` [PATCH 15/83] sim: ft32: " Mike Frysinger
2023-01-03 7:54 ` [PATCH 16/83] sim: h8300: " Mike Frysinger
2023-01-03 7:54 ` [PATCH 17/83] sim: iq2000: " Mike Frysinger
2023-01-03 7:55 ` [PATCH 18/83] sim: lm32: " Mike Frysinger
2023-01-03 7:55 ` [PATCH 19/83] sim: m32c: " Mike Frysinger
2023-01-03 7:55 ` [PATCH 20/83] sim: m32r: " Mike Frysinger
2023-01-03 7:55 ` [PATCH 21/83] sim: m68hc11: " Mike Frysinger
2023-01-03 7:55 ` [PATCH 22/83] sim: mcore: " Mike Frysinger
2023-01-03 7:55 ` [PATCH 23/83] sim: microblaze: " Mike Frysinger
2023-01-03 7:55 ` [PATCH 24/83] sim: mips: " Mike Frysinger
2023-01-03 7:55 ` [PATCH 25/83] sim: mn10300: " Mike Frysinger
2023-01-03 7:55 ` [PATCH 26/83] sim: moxie: " Mike Frysinger
2023-01-03 7:55 ` [PATCH 27/83] sim: msp430: " Mike Frysinger
2023-01-03 7:55 ` [PATCH 28/83] sim: or1k: " Mike Frysinger
2023-01-03 7:55 ` [PATCH 29/83] sim: pru: " Mike Frysinger
2023-01-03 7:55 ` [PATCH 30/83] sim: riscv: " Mike Frysinger
2023-01-03 7:55 ` [PATCH 31/83] sim: rl78: " Mike Frysinger
2023-01-03 7:55 ` [PATCH 32/83] sim: rx: " Mike Frysinger
2023-01-03 7:55 ` [PATCH 33/83] sim: sh: " Mike Frysinger
2023-01-03 7:55 ` [PATCH 34/83] sim: v850: " Mike Frysinger
2023-01-03 7:55 ` [PATCH 35/83] sim: build: drop support for creating libsim.a in subdirs Mike Frysinger
2023-01-03 7:55 ` [PATCH 36/83] sim: build: drop common/nrun.o subdir hack Mike Frysinger
2023-01-03 7:55 ` [PATCH 37/83] sim: modules.c: move generation to top-level Mike Frysinger
2023-01-03 7:55 ` [PATCH 38/83] sim: build: add basic framework for compiling arch objects in top-level Mike Frysinger
2023-01-03 7:55 ` [PATCH 39/83] sim: aarch64: move arch-specific file compilation to top-level Mike Frysinger
2023-01-03 7:55 ` [PATCH 40/83] sim: arm: " Mike Frysinger
2023-01-03 7:55 ` [PATCH 41/83] sim: avr: " Mike Frysinger
2023-01-03 7:55 ` [PATCH 42/83] sim: bpf: " Mike Frysinger
2023-01-03 7:55 ` [PATCH 43/83] sim: bfin: " Mike Frysinger
2023-01-03 7:55 ` [PATCH 44/83] sim: cr16: " Mike Frysinger
2023-01-03 7:55 ` [PATCH 45/83] sim: cris: " Mike Frysinger
2023-01-03 7:55 ` [PATCH 46/83] sim: d10v: " Mike Frysinger
2023-01-03 7:55 ` [PATCH 47/83] sim: erc32: " Mike Frysinger
2023-01-03 7:55 ` [PATCH 48/83] sim: example-synacor: " Mike Frysinger
2023-01-03 7:55 ` [PATCH 49/83] sim: frv: " Mike Frysinger
2023-01-03 7:55 ` [PATCH 50/83] sim: ft32: " Mike Frysinger
2023-01-03 7:55 ` [PATCH 51/83] sim: h8300: " Mike Frysinger
2023-01-03 7:55 ` [PATCH 52/83] sim: iq2000: " Mike Frysinger
2023-01-03 7:55 ` [PATCH 53/83] sim: lm32: " Mike Frysinger
2023-01-03 7:55 ` [PATCH 54/83] sim: m32c: " Mike Frysinger
2023-01-03 7:55 ` [PATCH 55/83] sim: m32r: " Mike Frysinger
2023-01-03 7:55 ` [PATCH 56/83] sim: m68hc11: " Mike Frysinger
2023-01-03 7:55 ` [PATCH 57/83] sim: mcore: " Mike Frysinger
2023-01-03 7:55 ` [PATCH 58/83] sim: microblaze: " Mike Frysinger
2023-01-03 7:55 ` [PATCH 59/83] sim: mips: " Mike Frysinger
2023-01-03 7:55 ` [PATCH 60/83] sim: mn10300: " Mike Frysinger
2023-01-03 7:55 ` [PATCH 61/83] sim: moxie: " Mike Frysinger
2023-01-03 7:55 ` [PATCH 62/83] sim: msp430: " Mike Frysinger
2023-01-03 7:55 ` [PATCH 63/83] sim: or1k: " Mike Frysinger
2023-01-03 7:55 ` [PATCH 64/83] sim: pru: " Mike Frysinger
2023-01-03 7:55 ` [PATCH 65/83] sim: riscv: " Mike Frysinger
2023-01-03 7:55 ` [PATCH 66/83] sim: rl78: " Mike Frysinger
2023-01-03 7:55 ` [PATCH 67/83] sim: rx: " Mike Frysinger
2023-01-03 7:55 ` [PATCH 68/83] sim: sh: " Mike Frysinger
2023-01-03 7:55 ` [PATCH 69/83] sim: v850: " Mike Frysinger
2023-01-03 7:55 ` [PATCH 70/83] sim: move arch-specific file compilation of common/ files " Mike Frysinger
2023-01-03 7:55 ` [PATCH 71/83] sim: common: move test-hw-events to top-level build Mike Frysinger
2023-01-03 7:55 ` [PATCH 72/83] sim: disable recursive make in (most) subdirs Mike Frysinger
2023-01-03 7:55 ` [PATCH 73/83] sim: build: drop subdir Makefile.in files Mike Frysinger
2023-01-03 7:55 ` [PATCH 74/83] sim: build: delete Make-common.in logic Mike Frysinger
2023-01-03 7:55 ` [PATCH 75/83] sim: build: drop AM_MAKEFLAGS settings Mike Frysinger
2023-01-03 7:55 ` [PATCH 76/83] sim: common: simplify hw-config.h deps Mike Frysinger
2023-01-03 7:55 ` [PATCH 77/83] sim: igen: simplify build dep Mike Frysinger
2023-01-03 7:56 ` [PATCH 78/83] sim: common: move libcommon.a objects to sources Mike Frysinger
2023-01-03 7:56 ` Mike Frysinger [this message]
2023-01-03 7:56 ` [PATCH 80/83] sim: common: move libcommon.a dep to ppc code Mike Frysinger
2023-01-03 7:56 ` [PATCH 81/83] sim: common: move modules.c to source tracking Mike Frysinger
2023-01-03 7:56 ` [PATCH 82/83] sim: common: simplify modules.c deps Mike Frysinger
2023-01-03 7:56 ` [PATCH 83/83] sim: build: drop depdir subdir hack Mike Frysinger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230103075605.13606-80-vapier@gentoo.org \
--to=vapier@gentoo.org \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).