drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libgloss: document & localize custom multi-do rule 

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).
This commit is contained in:
Mike Frysinger 2022-02-18 23:26:51 -05:00
parent 15d7e0d417
commit e56bdf902b
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libgloss/aarch64/Makefile.in
View File

@ -152,7 +152,7 @@ $(RDIMON_BSP): $(RDIMON_OBJS)
${RANLIB} $@ ${RANLIB} $@
# Multilib support. # 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 all-recursive: all-multi
clean-recursive: clean-multi clean-recursive: clean-multi
@ -160,13 +160,13 @@ install-recursive: install-multi
# The $(MAKE) comments below are to enable parallel building. # The $(MAKE) comments below are to enable parallel building.
all-multi: all-multi:
$(MAKE) $(AM_MAKEFLAGS) DO=all multi-do $(MAKE) $(AM_MAKEFLAGS) DO=all libgloss-multi-do
clean-multi: clean-multi:
$(MAKE) $(AM_MAKEFLAGS) DO=clean multi-do $(MAKE) $(AM_MAKEFLAGS) DO=clean libgloss-multi-do
install-multi: install-multi:
$(MAKE) $(AM_MAKEFLAGS) DO=install multi-do $(MAKE) $(AM_MAKEFLAGS) DO=install libgloss-multi-do
clean mostlyclean: clean mostlyclean:
rm -f a.out core *.i *.o *-test *.srec *.dis *.x $(SIM_BSP) ${RDIMON_SCRIPTS} rm -f a.out core *.i *.o *-test *.srec *.dis *.x $(SIM_BSP) ${RDIMON_SCRIPTS}

8
libgloss/arm/Makefile.in
View File

@ -175,7 +175,7 @@ $(RDIMON_BSP): $(RDIMON_OBJS)
${RANLIB} $@ ${RANLIB} $@
# Multilib support. # 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 all-recursive: all-multi
clean-recursive: clean-multi clean-recursive: clean-multi
@ -183,13 +183,13 @@ install-recursive: install-multi
# The $(MAKE) comments below are to enable parallel building. # The $(MAKE) comments below are to enable parallel building.
all-multi: all-multi:
$(MAKE) $(AM_MAKEFLAGS) DO=all multi-do $(MAKE) $(AM_MAKEFLAGS) DO=all libgloss-multi-do
clean-multi: clean-multi:
$(MAKE) $(AM_MAKEFLAGS) DO=clean multi-do $(MAKE) $(AM_MAKEFLAGS) DO=clean libgloss-multi-do
install-multi: install-multi:
$(MAKE) $(AM_MAKEFLAGS) DO=install multi-do $(MAKE) $(AM_MAKEFLAGS) DO=install libgloss-multi-do
clean mostlyclean: clean mostlyclean:
rm -f a.out core *.i *.o *-test *.srec *.dis *.x $(SIM_BSP) $(IQ80310_BSP) rm -f a.out core *.i *.o *-test *.srec *.dis *.x $(SIM_BSP) $(IQ80310_BSP)

7
libgloss/multi-build.in
View File

@ -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} PWD_COMMAND=$${PWDCMD-pwd}
# FIXME: There should be an @-sign in front of the `if'. # FIXME: There should be an @-sign in front of the `if'.
# Leave out until this is tested a bit more. # Leave out until this is tested a bit more.
multi-do: libgloss-multi-do:
if [ -z "$(MULTIDIRS)" ]; then \ if [ -z "$(MULTIDIRS)" ]; then \
true; \ true; \
else \ else \