Makefile.tpl: Remove surplus whitespace throughout.
2015-04-22 Bernhard Reutner-Fischer <aldot@gcc.gnu.org> * Makefile.tpl: Remove surplus whitespace throughout. * Makefile.in: Regenerate. From-SVN: r222334
This commit is contained in:
Bernhard Reutner-Fischer
parent
cbea306a5e
commit
fafb95a6fe
|
|
@ -1,3 +1,8 @@
|
|||
2015-04-22 Bernhard Reutner-Fischer <aldot@gcc.gnu.org>
|
||||
|
||||
* Makefile.tpl: Remove surplus whitespace throughout.
|
||||
* Makefile.in: Regenerate.
|
||||
|
||||
2015-04-20 Segher Boessenkool <segher@kernel.crashing.org>
|
||||
|
||||
* MAINTAINERS (Various Maintainers): Add myself as instruction
|
||||
|
|
|
|||
4904
Makefile.in
4904
Makefile.in
File diff suppressed because it is too large
Load Diff
104
Makefile.tpl
104
Makefile.tpl
|
|
@ -225,8 +225,8 @@ HOST_EXPORTS = \
|
|||
GMPINC="$(HOST_GMPINC)"; export GMPINC; \
|
||||
ISLLIBS="$(HOST_ISLLIBS)"; export ISLLIBS; \
|
||||
ISLINC="$(HOST_ISLINC)"; export ISLINC; \
|
||||
LIBELFLIBS="$(HOST_LIBELFLIBS)" ; export LIBELFLIBS; \
|
||||
LIBELFINC="$(HOST_LIBELFINC)" ; export LIBELFINC; \
|
||||
LIBELFLIBS="$(HOST_LIBELFLIBS)"; export LIBELFLIBS; \
|
||||
LIBELFINC="$(HOST_LIBELFINC)"; export LIBELFINC; \
|
||||
@if gcc-bootstrap
|
||||
$(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
|
||||
@endif gcc-bootstrap
|
||||
|
|
@ -637,7 +637,7 @@ POSTSTAGE1_FLAGS_TO_PASS = \
|
|||
@if gcc-bootstrap
|
||||
EXTRA_HOST_EXPORTS = if [ $(current_stage) != stage1 ]; then \
|
||||
$(POSTSTAGE1_HOST_EXPORTS) \
|
||||
fi ;
|
||||
fi;
|
||||
|
||||
EXTRA_BOOTSTRAP_FLAGS = CC="$$CC" CXX="$$CXX" LDFLAGS="$$LDFLAGS"
|
||||
@endif gcc-bootstrap
|
||||
|
|
@ -793,9 +793,9 @@ do-info: maybe-all-texinfo
|
|||
|
||||
install-info: do-install-info dir.info
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
if [ -f dir.info ] ; then \
|
||||
$(INSTALL_DATA) dir.info $(DESTDIR)$(infodir)/dir.info ; \
|
||||
else true ; fi
|
||||
if [ -f dir.info ]; then \
|
||||
$(INSTALL_DATA) dir.info $(DESTDIR)$(infodir)/dir.info; \
|
||||
else true; fi
|
||||
|
||||
install-pdf: do-install-pdf
|
||||
|
||||
|
|
@ -921,14 +921,14 @@ uninstall:
|
|||
|
||||
.PHONY: install.all
|
||||
install.all: install-no-fixedincludes
|
||||
@if [ -f ./gcc/Makefile ] ; then \
|
||||
r=`${PWD_COMMAND}` ; export r ; \
|
||||
@if [ -f ./gcc/Makefile ]; then \
|
||||
r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
$(HOST_EXPORTS) \
|
||||
(cd ./gcc && \
|
||||
$(MAKE) $(FLAGS_TO_PASS) install-headers) ; \
|
||||
$(MAKE) $(FLAGS_TO_PASS) install-headers); \
|
||||
else \
|
||||
true ; \
|
||||
true; \
|
||||
fi
|
||||
|
||||
# install-no-fixedincludes is used to allow the elaboration of binary packages
|
||||
|
|
@ -968,10 +968,10 @@ installdirs: mkinstalldirs
|
|||
$(SHELL) $(srcdir)/mkinstalldirs $(MAKEDIRS)
|
||||
|
||||
dir.info: do-install-info
|
||||
if [ -f $(srcdir)/texinfo/gen-info-dir ] ; then \
|
||||
$(srcdir)/texinfo/gen-info-dir $(DESTDIR)$(infodir) $(srcdir)/texinfo/dir.info-template > dir.info.new ; \
|
||||
mv -f dir.info.new dir.info ; \
|
||||
else true ; \
|
||||
if [ -f $(srcdir)/texinfo/gen-info-dir ]; then \
|
||||
$(srcdir)/texinfo/gen-info-dir $(DESTDIR)$(infodir) $(srcdir)/texinfo/dir.info-template > dir.info.new; \
|
||||
mv -f dir.info.new dir.info; \
|
||||
else true; \
|
||||
fi
|
||||
|
||||
dist:
|
||||
|
|
@ -1006,8 +1006,8 @@ configure-[+prefix+][+module+]: [+ IF bootstrap +][+ ELSE +]
|
|||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
[+ IF check_multilibs
|
||||
+]echo "Checking multilib configuration for [+module+]..."; \
|
||||
$(SHELL) $(srcdir)/mkinstalldirs [+subdir+]/[+module+] ; \
|
||||
$(CC_FOR_TARGET) --print-multi-lib > [+subdir+]/[+module+]/multilib.tmp 2> /dev/null ; \
|
||||
$(SHELL) $(srcdir)/mkinstalldirs [+subdir+]/[+module+]; \
|
||||
$(CC_FOR_TARGET) --print-multi-lib > [+subdir+]/[+module+]/multilib.tmp 2> /dev/null; \
|
||||
if test -r [+subdir+]/[+module+]/multilib.out; then \
|
||||
if cmp -s [+subdir+]/[+module+]/multilib.tmp [+subdir+]/[+module+]/multilib.out; then \
|
||||
rm -f [+subdir+]/[+module+]/multilib.tmp; \
|
||||
|
|
@ -1019,7 +1019,7 @@ configure-[+prefix+][+module+]: [+ IF bootstrap +][+ ELSE +]
|
|||
mv [+subdir+]/[+module+]/multilib.tmp [+subdir+]/[+module+]/multilib.out; \
|
||||
fi; \
|
||||
[+ ENDIF check_multilibs +]test ! -f [+subdir+]/[+module+]/Makefile || exit 0; \
|
||||
$(SHELL) $(srcdir)/mkinstalldirs [+subdir+]/[+module+] ; \
|
||||
$(SHELL) $(srcdir)/mkinstalldirs [+subdir+]/[+module+]; \
|
||||
[+exports+] [+extra_exports+] \
|
||||
echo Configuring in [+subdir+]/[+module+]; \
|
||||
cd "[+subdir+]/[+module+]" || exit 1; \
|
||||
|
|
@ -1052,7 +1052,7 @@ configure-stage[+id+]-[+prefix+][+module+]:
|
|||
TFLAGS="$(STAGE[+id+]_TFLAGS)"; \
|
||||
[+ IF check_multilibs
|
||||
+]echo "Checking multilib configuration for [+module+]..."; \
|
||||
$(CC_FOR_TARGET) --print-multi-lib > [+subdir+]/[+module+]/multilib.tmp 2> /dev/null ; \
|
||||
$(CC_FOR_TARGET) --print-multi-lib > [+subdir+]/[+module+]/multilib.tmp 2> /dev/null; \
|
||||
if test -r [+subdir+]/[+module+]/multilib.out; then \
|
||||
if cmp -s [+subdir+]/[+module+]/multilib.tmp [+subdir+]/[+module+]/multilib.out; then \
|
||||
rm -f [+subdir+]/[+module+]/multilib.tmp; \
|
||||
|
|
@ -1074,8 +1074,8 @@ configure-stage[+id+]-[+prefix+][+module+]:
|
|||
LIBCFLAGS="$(STAGE[+id+]_CFLAGS)"[+ ELSE prev +] \
|
||||
LIBCFLAGS="$(LIBCFLAGS)"[+ ENDIF prev +]; export LIBCFLAGS;[+
|
||||
ENDIF prefix +] [+extra_exports+] \
|
||||
echo Configuring stage [+id+] in [+subdir+]/[+module+] ; \
|
||||
$(SHELL) $(srcdir)/mkinstalldirs [+subdir+]/[+module+] ; \
|
||||
echo Configuring stage [+id+] in [+subdir+]/[+module+]; \
|
||||
$(SHELL) $(srcdir)/mkinstalldirs [+subdir+]/[+module+]; \
|
||||
cd [+subdir+]/[+module+] || exit 1; \
|
||||
case $(srcdir) in \
|
||||
/* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
|
||||
|
|
@ -1087,7 +1087,7 @@ configure-stage[+id+]-[+prefix+][+module+]:
|
|||
--srcdir=$${topdir}/$$module_srcdir \
|
||||
[+args+] --build=${build_alias} --host=[+host_alias+] \
|
||||
--target=[+target_alias+] \
|
||||
[+ IF prev +] --with-build-libsubdir=$(HOST_SUBDIR) [+ ENDIF prev +] \
|
||||
[+ IF prev +]--with-build-libsubdir=$(HOST_SUBDIR)[+ ENDIF prev +] \
|
||||
$(STAGE[+id+]_CONFIGURE_FLAGS)[+ IF extra_configure_flags +] \
|
||||
[+extra_configure_flags+][+ ENDIF extra_configure_flags +]
|
||||
@endif [+prefix+][+module+]-bootstrap
|
||||
|
|
@ -1208,7 +1208,7 @@ check-[+module+]:
|
|||
# This module is only tested in a native toolchain.
|
||||
check-[+module+]:
|
||||
@: $(MAKE); $(unstage)
|
||||
@if [ '$(host)' = '$(target)' ] ; then \
|
||||
@if [ '$(host)' = '$(target)' ]; then \
|
||||
r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
$(HOST_EXPORTS) [+ IF bootstrap +]$(EXTRA_HOST_EXPORTS)[+
|
||||
|
|
@ -1286,7 +1286,7 @@ maybe-[+make_target+]-[+module+]: [+make_target+]-[+module+]
|
|||
for flag in $(EXTRA_HOST_FLAGS) [+extra_make_flags+]; do \
|
||||
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
|
||||
done; \
|
||||
echo "Doing [+make_target+] in [+module+]" ; \
|
||||
echo "Doing [+make_target+] in [+module+]"; \
|
||||
(cd $(HOST_SUBDIR)/[+module+] && \
|
||||
$(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
|
||||
"CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
|
||||
|
|
@ -1413,7 +1413,7 @@ maybe-[+make_target+]-target-[+module+]: [+make_target+]-target-[+module+]
|
|||
[+depend+]-target-[+module+] [+
|
||||
ENDFOR depend +]
|
||||
@: $(MAKE); $(unstage)
|
||||
@[ -f $(TARGET_SUBDIR)/[+module+]/Makefile ] || exit 0 ; \
|
||||
@[ -f $(TARGET_SUBDIR)/[+module+]/Makefile ] || exit 0; \
|
||||
r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \[+
|
||||
IF raw_cxx +]
|
||||
|
|
@ -1421,7 +1421,7 @@ IF raw_cxx +]
|
|||
ELSE normal_cxx +]
|
||||
$(NORMAL_TARGET_EXPORTS) \[+
|
||||
ENDIF raw_cxx +]
|
||||
echo "Doing [+make_target+] in $(TARGET_SUBDIR)/[+module+]" ; \
|
||||
echo "Doing [+make_target+] in $(TARGET_SUBDIR)/[+module+]"; \
|
||||
for flag in $(EXTRA_TARGET_FLAGS); do \
|
||||
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
|
||||
done; \
|
||||
|
|
@ -1464,7 +1464,7 @@ cross: all-build all-gas all-ld
|
|||
echo "Building the C and C++ compiler"; \
|
||||
cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) LANGUAGES="c c++"
|
||||
@r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
echo "Building runtime libraries"; \
|
||||
$(MAKE) $(RECURSE_FLAGS_TO_PASS) LANGUAGES="c c++" all
|
||||
@endif gcc-no-bootstrap
|
||||
|
|
@ -1548,31 +1548,31 @@ objext = .o
|
|||
|
||||
stage[+id+]-start::
|
||||
@: $(MAKE); $(stage); \
|
||||
echo stage[+id+] > stage_current ; \
|
||||
echo stage[+id+] > stage_current; \
|
||||
echo stage[+id+] > stage_last; \
|
||||
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)[+
|
||||
FOR host_modules +][+ IF bootstrap +]
|
||||
@if [+ module +]
|
||||
@cd $(HOST_SUBDIR); [ -d stage[+id+]-[+module+] ] || \
|
||||
mkdir stage[+id+]-[+module+]; \
|
||||
mv stage[+id+]-[+module+] [+module+] [+ IF prev +] ; \
|
||||
mv stage[+id+]-[+module+] [+module+][+ IF prev +]; \
|
||||
mv stage[+prev+]-[+module+] prev-[+module+] || test -f stage[+prev+]-lean [+ ENDIF prev +]
|
||||
@endif [+ module +][+ ENDIF bootstrap +][+ ENDFOR host_modules +]
|
||||
@[ -d stage[+id+]-$(TARGET_SUBDIR) ] || \
|
||||
mkdir stage[+id+]-$(TARGET_SUBDIR); \
|
||||
mv stage[+id+]-$(TARGET_SUBDIR) $(TARGET_SUBDIR) [+ IF prev +] ; \
|
||||
mv stage[+id+]-$(TARGET_SUBDIR) $(TARGET_SUBDIR)[+ IF prev +]; \
|
||||
mv stage[+prev+]-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stage[+prev+]-lean [+ ENDIF prev +]
|
||||
|
||||
stage[+id+]-end:: [+ FOR host_modules +][+ IF bootstrap +]
|
||||
@if [+ module +]
|
||||
@if test -d $(HOST_SUBDIR)/[+module+] ; then \
|
||||
cd $(HOST_SUBDIR); mv [+module+] stage[+id+]-[+module+] [+ IF prev +]; \
|
||||
mv prev-[+module+] stage[+prev+]-[+module+] ; : [+ ENDIF prev +] ; \
|
||||
@if test -d $(HOST_SUBDIR)/[+module+]; then \
|
||||
cd $(HOST_SUBDIR); mv [+module+] stage[+id+]-[+module+][+ IF prev +]; \
|
||||
mv prev-[+module+] stage[+prev+]-[+module+]; : [+ ENDIF prev +]; \
|
||||
fi
|
||||
@endif [+ module +][+ ENDIF bootstrap +][+ ENDFOR host_modules +]
|
||||
@if test -d $(TARGET_SUBDIR) ; then \
|
||||
mv $(TARGET_SUBDIR) stage[+id+]-$(TARGET_SUBDIR) [+ IF prev +] ; \
|
||||
mv prev-$(TARGET_SUBDIR) stage[+prev+]-$(TARGET_SUBDIR) ; : [+ ENDIF prev +] ; \
|
||||
@if test -d $(TARGET_SUBDIR); then \
|
||||
mv $(TARGET_SUBDIR) stage[+id+]-$(TARGET_SUBDIR)[+ IF prev +]; \
|
||||
mv prev-$(TARGET_SUBDIR) stage[+prev+]-$(TARGET_SUBDIR); : [+ ENDIF prev +]; \
|
||||
fi
|
||||
rm -f stage_current
|
||||
|
||||
|
|
@ -1584,13 +1584,13 @@ stage[+id+]-bubble:: [+ IF prev +]stage[+prev+]-bubble[+ ENDIF +]
|
|||
@r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
if test -f stage[+id+]-lean [+
|
||||
IF prev +]|| test -f stage[+prev+]-lean [+ ENDIF prev +] ; then \
|
||||
echo Skipping rebuild of stage[+id+] ; \
|
||||
IF prev +]|| test -f stage[+prev+]-lean [+ ENDIF prev +]; then \
|
||||
echo Skipping rebuild of stage[+id+]; \
|
||||
else \
|
||||
$(MAKE) stage[+id+]-start; \[+IF lean +]
|
||||
if $(LEAN); then \
|
||||
rm -rf stage[+lean+]-* ; \
|
||||
$(STAMP) stage[+lean+]-lean ; \
|
||||
rm -rf stage[+lean+]-*; \
|
||||
$(STAMP) stage[+lean+]-lean; \
|
||||
fi; \[+ ENDIF lean +]
|
||||
$(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage[+id+]; \
|
||||
fi[+ IF compare-target +]
|
||||
|
|
@ -1607,16 +1607,16 @@ do-clean: clean-stage[+id+]
|
|||
@r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
if test -f stage[+prev+]-lean; then \
|
||||
echo Cannot compare object files as stage [+prev+] was deleted. ; \
|
||||
exit 0 ; \
|
||||
echo Cannot compare object files as stage [+prev+] was deleted.; \
|
||||
exit 0; \
|
||||
fi; \
|
||||
: $(MAKE); $(stage); \
|
||||
rm -f .bad_compare ; \
|
||||
echo Comparing stages [+prev+] and [+id+] ; \
|
||||
rm -f .bad_compare; \
|
||||
echo Comparing stages [+prev+] and [+id+]; \
|
||||
sed=`echo stage[+id+] | sed 's,^stage,,;s,.,.,g'`; \
|
||||
files=`find stage[+id+]-* -name "*$(objext)" -print | \
|
||||
sed -n s,^stage$$sed-,,p` ; \
|
||||
for file in $${files} ; do \
|
||||
sed -n s,^stage$$sed-,,p`; \
|
||||
for file in $${files}; do \
|
||||
f1=$$r/stage[+prev+]-$$file; f2=$$r/stage[+id+]-$$file; \
|
||||
if test ! -f $$f1; then continue; fi; \
|
||||
$(do-[+compare-target+]) > /dev/null 2>&1; \
|
||||
|
|
@ -1626,16 +1626,16 @@ do-clean: clean-stage[+id+]
|
|||
echo warning: $$file differs ;; \
|
||||
*) \
|
||||
echo $$file differs >> .bad_compare ;; \
|
||||
esac ; \
|
||||
fi ; \
|
||||
done ; \
|
||||
esac; \
|
||||
fi; \
|
||||
done; \
|
||||
if [ -f .bad_compare ]; then \
|
||||
echo "Bootstrap comparison failure!"; \
|
||||
cat .bad_compare; \
|
||||
exit 1; \
|
||||
else \
|
||||
echo Comparison successful.; \
|
||||
fi ; \
|
||||
fi; \
|
||||
$(STAMP) [+compare-target+][+ IF prev +]
|
||||
if $(LEAN); then \
|
||||
rm -rf stage[+prev+]-*; \
|
||||
|
|
@ -1701,10 +1701,10 @@ stagefeedback-start::
|
|||
@r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
for i in prev-*; do \
|
||||
j=`echo $$i | sed s/^prev-//` ; \
|
||||
j=`echo $$i | sed s/^prev-//`; \
|
||||
cd $$r/$$i && \
|
||||
{ find . -type d | sort | sed 's,.*,$(SHELL) '"$$s"'/mkinstalldirs "../'$$j'/&",' | $(SHELL) ; } && \
|
||||
{ find . -name '*.*da' | sed 's,.*,$(LN) -f "&" "../'$$j'/&",' | $(SHELL) ; } ; \
|
||||
{ find . -type d | sort | sed 's,.*,$(SHELL) '"$$s"'/mkinstalldirs "../'$$j'/&",' | $(SHELL); } && \
|
||||
{ find . -name '*.*da' | sed 's,.*,$(LN) -f "&" "../'$$j'/&",' | $(SHELL); }; \
|
||||
done
|
||||
|
||||
@if gcc-bootstrap
|
||||
|
|
|
|||
Loading…
Reference in New Issue