From: Elliot Berman <eberman@codeaurora.org>
To: Nick Desaulniers <ndesaulniers@google.com>,
Masahiro Yamada <masahiroy@kernel.org>
Cc: Elliot Berman <eberman@codeaurora.org>,
linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org,
Michal Marek <michal.lkml@markovi.net>,
Sami Tolvanen <samitolvanen@google.com>,
Trilok Soni <tsoni@codeaurora.org>,
Mahesh Kumar Kalikot Veetil <mkalikot@codeaurora.org>,
Jeff Johnson <jjohnson@codeaurora.org>
Subject: [RFC 2/2] Kbuild: Support nested composite objects
Date: Fri, 22 Jan 2021 11:27:18 -0800 [thread overview]
Message-ID: <1611343638-28206-3-git-send-email-eberman@codeaurora.org> (raw)
In-Reply-To: <1611343638-28206-1-git-send-email-eberman@codeaurora.org>
Kbuild composite objects only supports one level of composite objects.
That is, a composite object may only be composed of real compilable
source files.
As a simple example, the following Kbuild description is now supported:
bar-a-y := a/bar0.o a/bar1.o
bar-b-y := b/bar2.o b/bar3.o
foo-objs := bar-a.o bar-b.o
obj-m += foo.o
Add such support by recursively searching for composite objects and
listing them in $(multi-used-*) and $(real-obj-*).
Signed-off-by: Elliot Berman <eberman@codeaurora.org>
---
scripts/Makefile.lib | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 93e4f10..5118204 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -59,14 +59,22 @@ endif
# Expand $(foo-objs) $(foo-y) by calling $(call suffix-search,foo.o,-objs -y)
suffix-search = $(foreach s,$(2),$($(1:.o=$s)))
# If $(foo-objs), $(foo-y), $(foo-m), or $(foo-) exists, foo.o is a composite object
-multi-search = $(sort $(foreach m,$(1), $(if $(strip $(call suffix-search,$(m),$(2) -)), $(m))))
+# Do this recursively to find nested composite objects. For backwards compatibility,
+# foo-y may contain foo.o bar.o . We shouldn't recurse further in this case.
+multi-search = $(sort $(foreach m,$(1),$(if $(strip $(call suffix-search,$(m),$(2) -)),\
+ $(m) $(call multi-search,$(filter-out $(m),$(call suffix-search,$(m),$(2))),$(2)))))
multi-used-y := $(call multi-search,$(obj-y),-objs -y)
multi-used-m := $(call multi-search,$(obj-m),-objs -y -m)
multi-used := $(multi-used-y) $(multi-used-m)
# Replace multi-part objects by their individual parts,
# including built-in.a from subdirectories
-real-search = $(foreach m,$(1), $(if $(strip $(call suffix-search,$(m),$(2) -)),$(call suffix-search,$(m),$(2)),$(m)))
+# Recursively search for real files. For backwards compatibility,
+# foo-y may contain foo.o bar.o . foo.o in this context is a real object, and
+# shouldn't be recursed into.
+real-search = $(foreach m,$(1), $(if $(strip $(call suffix-search,$(m),$(2) -)), \
+ $(filter $(m),$(call suffix-search,$(m),$(2))) $(call real-search,$(filter-out $(m),$(call suffix-search,$(m),$(2))),$(2)),\
+ $(m)))
real-obj-y := $(call real-search, $(obj-y),-objs -y)
real-obj-m := $(call real-search, $(obj-m),-objs -y -m)
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
next prev parent reply other threads:[~2021-01-22 19:44 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-22 19:27 [RFC 0/2] Kbuild: Support nested composite objects Elliot Berman
2021-01-22 19:27 ` [RFC 1/2] Kbuild: Make composite object searching more generic Elliot Berman
2021-01-26 18:02 ` Masahiro Yamada
2021-01-22 19:27 ` Elliot Berman [this message]
2021-01-26 17:59 ` [RFC 0/2] Kbuild: Support nested composite objects Masahiro Yamada
2021-01-27 15:51 ` Christoph Hellwig
2021-06-13 16:19 ` Trent Piepho
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=1611343638-28206-3-git-send-email-eberman@codeaurora.org \
--to=eberman@codeaurora.org \
--cc=jjohnson@codeaurora.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=masahiroy@kernel.org \
--cc=michal.lkml@markovi.net \
--cc=mkalikot@codeaurora.org \
--cc=ndesaulniers@google.com \
--cc=samitolvanen@google.com \
--cc=tsoni@codeaurora.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 NNTP newsgroup(s).