From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id 76EB6385F021 for ; Sat, 19 Feb 2022 04:43:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 76EB6385F021 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gentoo.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gentoo.org Received: by smtp.gentoo.org (Postfix, from userid 559) id EA1CF343775; Sat, 19 Feb 2022 04:43:47 +0000 (UTC) From: Mike Frysinger To: newlib@sourceware.org Subject: [PATCH] libgloss: document & localize custom multi-do rule Date: Fri, 18 Feb 2022 23:43:46 -0500 Message-Id: <20220219044346.9368-1-vapier@gentoo.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.4 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: newlib@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Newlib mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Feb 2022 04:43:51 -0000 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