From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1521) id 452A43858414; Fri, 25 Feb 2022 00:13:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 452A43858414 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Michael Frysinger To: newlib-cvs@sourceware.org Subject: [newlib-cygwin] libgloss: document & localize custom multi-do rule X-Act-Checkin: newlib-cygwin X-Git-Author: Mike Frysinger X-Git-Refname: refs/heads/master X-Git-Oldrev: 15d7e0d417004570db92e7c75b72747bce75dda5 X-Git-Newrev: e56bdf902bd77ef66f25985a8ae3b0ecbc4ef196 Message-Id: <20220225001351.452A43858414@sourceware.org> Date: Fri, 25 Feb 2022 00:13:51 +0000 (GMT) X-BeenThere: newlib-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Newlib GIT logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Feb 2022 00:13:51 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3De56bdf902bd= 77ef66f25985a8ae3b0ecbc4ef196 commit e56bdf902bd77ef66f25985a8ae3b0ecbc4ef196 Author: Mike Frysinger Date: Fri Feb 18 23:26:51 2022 -0500 libgloss: document & localize custom multi-do rule =20 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). Diff: --- 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 82a0e3717..e84aa6927 100644 --- a/libgloss/aarch64/Makefile.in +++ b/libgloss/aarch64/Makefile.in @@ -152,7 +152,7 @@ $(RDIMON_BSP): $(RDIMON_OBJS) ${RANLIB} $@ =20 # Multilib support. -.PHONY: multi-do all-multi clean-multi install-multi +.PHONY: libgloss-multi-do all-multi clean-multi install-multi =20 all-recursive: all-multi clean-recursive: clean-multi @@ -160,13 +160,13 @@ install-recursive: install-multi =20 # The $(MAKE) comments below are to enable parallel building. all-multi: - $(MAKE) $(AM_MAKEFLAGS) DO=3Dall multi-do + $(MAKE) $(AM_MAKEFLAGS) DO=3Dall libgloss-multi-do =20 clean-multi: - $(MAKE) $(AM_MAKEFLAGS) DO=3Dclean multi-do + $(MAKE) $(AM_MAKEFLAGS) DO=3Dclean libgloss-multi-do =20 install-multi: - $(MAKE) $(AM_MAKEFLAGS) DO=3Dinstall multi-do + $(MAKE) $(AM_MAKEFLAGS) DO=3Dinstall libgloss-multi-do =20 clean mostlyclean: rm -f a.out core *.i *.o *-test *.srec *.dis *.x $(SIM_BSP) ${RDIMON_SCRI= PTS} diff --git a/libgloss/arm/Makefile.in b/libgloss/arm/Makefile.in index 9201a1b0c..45d889409 100644 --- a/libgloss/arm/Makefile.in +++ b/libgloss/arm/Makefile.in @@ -175,7 +175,7 @@ $(RDIMON_BSP): $(RDIMON_OBJS) ${RANLIB} $@ =20 # Multilib support. -.PHONY: multi-do all-multi clean-multi install-multi +.PHONY: libgloss-multi-do all-multi clean-multi install-multi =20 all-recursive: all-multi clean-recursive: clean-multi @@ -183,13 +183,13 @@ install-recursive: install-multi =20 # The $(MAKE) comments below are to enable parallel building. all-multi: - $(MAKE) $(AM_MAKEFLAGS) DO=3Dall multi-do + $(MAKE) $(AM_MAKEFLAGS) DO=3Dall libgloss-multi-do =20 clean-multi: - $(MAKE) $(AM_MAKEFLAGS) DO=3Dclean multi-do + $(MAKE) $(AM_MAKEFLAGS) DO=3Dclean libgloss-multi-do =20 install-multi: - $(MAKE) $(AM_MAKEFLAGS) DO=3Dinstall multi-do + $(MAKE) $(AM_MAKEFLAGS) DO=3Dinstall libgloss-multi-do =20 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 52aeeec26..80919ed6f 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 m= ashed +# into one file. It relies on some custom hardcoded MULTI* variables in t= he +# respective Makefile.in instead of dynamic compiler probing that ../multi= lib.am +# does. + PWD_COMMAND=3D$${PWDCMD-pwd} =20 # 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 \