From: Mike Frysinger <vapier@gentoo.org>
To: newlib@sourceware.org
Subject: [PATCH] libgloss: document & localize custom multi-do rule
Date: Fri, 18 Feb 2022 23:43:46 -0500 [thread overview]
Message-ID: <20220219044346.9368-1-vapier@gentoo.org> (raw)
The multi-build.in file in libgloss duplicates common multilib logic
in the root source tree. Document it a bit, and rename the rule so
it doesn't clash with the common multi-do rule. This will let us use
them in the same makefile so we can merge aarch64/ & arm/ up (as the
only targets that use this local multi-build.in atm).
---
libgloss/aarch64/Makefile.in | 8 ++++----
libgloss/arm/Makefile.in | 8 ++++----
libgloss/multi-build.in | 7 ++++++-
3 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/libgloss/aarch64/Makefile.in b/libgloss/aarch64/Makefile.in
index 82a0e3717cc2..e84aa6927a74 100644
--- a/libgloss/aarch64/Makefile.in
+++ b/libgloss/aarch64/Makefile.in
@@ -152,7 +152,7 @@ $(RDIMON_BSP): $(RDIMON_OBJS)
${RANLIB} $@
# Multilib support.
-.PHONY: multi-do all-multi clean-multi install-multi
+.PHONY: libgloss-multi-do all-multi clean-multi install-multi
all-recursive: all-multi
clean-recursive: clean-multi
@@ -160,13 +160,13 @@ install-recursive: install-multi
# The $(MAKE) comments below are to enable parallel building.
all-multi:
- $(MAKE) $(AM_MAKEFLAGS) DO=all multi-do
+ $(MAKE) $(AM_MAKEFLAGS) DO=all libgloss-multi-do
clean-multi:
- $(MAKE) $(AM_MAKEFLAGS) DO=clean multi-do
+ $(MAKE) $(AM_MAKEFLAGS) DO=clean libgloss-multi-do
install-multi:
- $(MAKE) $(AM_MAKEFLAGS) DO=install multi-do
+ $(MAKE) $(AM_MAKEFLAGS) DO=install libgloss-multi-do
clean mostlyclean:
rm -f a.out core *.i *.o *-test *.srec *.dis *.x $(SIM_BSP) ${RDIMON_SCRIPTS}
diff --git a/libgloss/arm/Makefile.in b/libgloss/arm/Makefile.in
index 9201a1b0c36d..45d889409aa0 100644
--- a/libgloss/arm/Makefile.in
+++ b/libgloss/arm/Makefile.in
@@ -175,7 +175,7 @@ $(RDIMON_BSP): $(RDIMON_OBJS)
${RANLIB} $@
# Multilib support.
-.PHONY: multi-do all-multi clean-multi install-multi
+.PHONY: libgloss-multi-do all-multi clean-multi install-multi
all-recursive: all-multi
clean-recursive: clean-multi
@@ -183,13 +183,13 @@ install-recursive: install-multi
# The $(MAKE) comments below are to enable parallel building.
all-multi:
- $(MAKE) $(AM_MAKEFLAGS) DO=all multi-do
+ $(MAKE) $(AM_MAKEFLAGS) DO=all libgloss-multi-do
clean-multi:
- $(MAKE) $(AM_MAKEFLAGS) DO=clean multi-do
+ $(MAKE) $(AM_MAKEFLAGS) DO=clean libgloss-multi-do
install-multi:
- $(MAKE) $(AM_MAKEFLAGS) DO=install multi-do
+ $(MAKE) $(AM_MAKEFLAGS) DO=install libgloss-multi-do
clean mostlyclean:
rm -f a.out core *.i *.o *-test *.srec *.dis *.x $(SIM_BSP) $(IQ80310_BSP)
diff --git a/libgloss/multi-build.in b/libgloss/multi-build.in
index 52aeeec26d62..80919ed6f8a7 100644
--- a/libgloss/multi-build.in
+++ b/libgloss/multi-build.in
@@ -1,8 +1,13 @@
+# This is like ../multilib.am and ../config-ml.in and ../config/multi.m4 mashed
+# into one file. It relies on some custom hardcoded MULTI* variables in the
+# respective Makefile.in instead of dynamic compiler probing that ../multilib.am
+# does.
+
PWD_COMMAND=$${PWDCMD-pwd}
# FIXME: There should be an @-sign in front of the `if'.
# Leave out until this is tested a bit more.
-multi-do:
+libgloss-multi-do:
if [ -z "$(MULTIDIRS)" ]; then \
true; \
else \
--
2.34.1
next reply other threads:[~2022-02-19 4:43 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-19 4:43 Mike Frysinger [this message]
2022-02-24 9:49 ` Corinna Vinschen
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=20220219044346.9368-1-vapier@gentoo.org \
--to=vapier@gentoo.org \
--cc=newlib@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).