yggdrasil/binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sync Makefile.tpl with GCC

Browse Source 
* Makefile.in: Regenerated.

	Sync with GCC
	2015-05-21  Jason Merrill  <jason@redhat.com>

	* Makefile.tpl: Update comments.

	2015-04-22  Bernhard Reutner-Fischer  <aldot@gcc.gnu.org>

	* Makefile.tpl: Remove surplus whitespace throughout.

	2015-03-25  Martin Liska  <mliska@suse.cz>
		    Yury Gribov  <y.gribov@samsung.com>

	* Makefile.tpl: Fix ln source location for vimrc file.
This commit is contained in:
H.J. Lu 2015-07-14 09:52:36 -07:00
parent dc2edb520a
commit 22121df01f
3 changed files with 2538 additions and 2520 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ChangeLog
View File

@ -1,3 +1,21 @@
2015-07-14 H.J. Lu <hongjiu.lu@intel.com>
* Makefile.in: Regenerated.
Sync with GCC
2015-05-21 Jason Merrill <jason@redhat.com>
* Makefile.tpl: Update comments.
2015-04-22 Bernhard Reutner-Fischer <aldot@gcc.gnu.org>
* Makefile.tpl: Remove surplus whitespace throughout.
2015-03-25 Martin Liska <mliska@suse.cz>
Yury Gribov <y.gribov@samsung.com>
* Makefile.tpl: Fix ln source location for vimrc file.
2015-07-14 H.J. Lu <hongjiu.lu@intel.com> 2015-07-14 H.J. Lu <hongjiu.lu@intel.com>
Sync with GCC Sync with GCC

4920
Makefile.in
View File

File diff suppressed because it is too large Load Diff

120
Makefile.tpl
View File

@ -225,8 +225,8 @@ HOST_EXPORTS = \
GMPINC="$(HOST_GMPINC)"; export GMPINC; \ GMPINC="$(HOST_GMPINC)"; export GMPINC; \
ISLLIBS="$(HOST_ISLLIBS)"; export ISLLIBS; \ ISLLIBS="$(HOST_ISLLIBS)"; export ISLLIBS; \
ISLINC="$(HOST_ISLINC)"; export ISLINC; \ ISLINC="$(HOST_ISLINC)"; export ISLINC; \
LIBELFLIBS="$(HOST_LIBELFLIBS)" ; export LIBELFLIBS; \ LIBELFLIBS="$(HOST_LIBELFLIBS)"; export LIBELFLIBS; \
LIBELFINC="$(HOST_LIBELFINC)" ; export LIBELFINC; \ LIBELFINC="$(HOST_LIBELFINC)"; export LIBELFINC; \
@if gcc-bootstrap @if gcc-bootstrap
$(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \ $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
@endif gcc-bootstrap @endif gcc-bootstrap
@ -435,11 +435,9 @@ STAGE[+id+]_TFLAGS = $(STAGE_TFLAGS)
STAGE[+id+]_CONFIGURE_FLAGS = $(STAGE_CONFIGURE_FLAGS) STAGE[+id+]_CONFIGURE_FLAGS = $(STAGE_CONFIGURE_FLAGS)
[+ ENDFOR bootstrap-stage +] [+ ENDFOR bootstrap-stage +]
# Only build the C compiler for stage1, because that is the only one that # By default, C and C++ are the only stage1 languages, because they are the
# we can guarantee will build with the native compiler, and also it is the # only ones we require to build with the bootstrap compiler, and also the
# only thing useful for building stage2. STAGE1_CFLAGS (via CFLAGS), # only ones useful for building stage2.
# MAKEINFO and MAKEINFOFLAGS are explicitly passed here to make them
# overrideable (for a bootstrap build stage1 also builds gcc.info).
STAGE1_CFLAGS = @stage1_cflags@ STAGE1_CFLAGS = @stage1_cflags@
STAGE1_CHECKING = @stage1_checking@ STAGE1_CHECKING = @stage1_checking@
@ -579,7 +577,9 @@ CXX_FOR_TARGET_FLAG_TO_PASS = \
$(shell if echo "$(CXX_FOR_TARGET)" | grep " -funconfigured-" > /dev/null; then :; else echo '"CXX_FOR_TARGET=$(CXX_FOR_TARGET)"'; fi) $(shell if echo "$(CXX_FOR_TARGET)" | grep " -funconfigured-" > /dev/null; then :; else echo '"CXX_FOR_TARGET=$(CXX_FOR_TARGET)"'; fi)
@endif target-libstdc++-v3 @endif target-libstdc++-v3
# Flags to pass down to all sub-makes. # Flags to pass down to all sub-makes. STAGE*FLAGS,
# MAKEINFO and MAKEINFOFLAGS are explicitly passed here to make them
# overrideable (for a bootstrap build stage1 also builds gcc.info).
BASE_FLAGS_TO_PASS =[+ FOR flags_to_pass +][+ IF optional +] \ BASE_FLAGS_TO_PASS =[+ FOR flags_to_pass +][+ IF optional +] \
"`echo '[+flag+]=$([+flag+])' | sed -e s'/[^=][^=]*=$$/XFOO=/'`"[+ ELSE optional +] \ "`echo '[+flag+]=$([+flag+])' | sed -e s'/[^=][^=]*=$$/XFOO=/'`"[+ ELSE optional +] \
"[+flag+]=$([+flag+])"[+ ENDIF optional+][+ ENDFOR flags_to_pass +][+ FOR bootstrap-stage +] \ "[+flag+]=$([+flag+])"[+ ENDIF optional+][+ ENDFOR flags_to_pass +][+ FOR bootstrap-stage +] \
@ -637,7 +637,7 @@ POSTSTAGE1_FLAGS_TO_PASS = \
@if gcc-bootstrap @if gcc-bootstrap
EXTRA_HOST_EXPORTS = if [ $(current_stage) != stage1 ]; then \ EXTRA_HOST_EXPORTS = if [ $(current_stage) != stage1 ]; then \
$(POSTSTAGE1_HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \
fi ; fi;
EXTRA_BOOTSTRAP_FLAGS = CC="$$CC" CXX="$$CXX" LDFLAGS="$$LDFLAGS" EXTRA_BOOTSTRAP_FLAGS = CC="$$CC" CXX="$$CXX" LDFLAGS="$$LDFLAGS"
@endif gcc-bootstrap @endif gcc-bootstrap
@ -793,9 +793,9 @@ do-info: maybe-all-texinfo
install-info: do-install-info dir.info install-info: do-install-info dir.info
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
if [ -f dir.info ] ; then \ if [ -f dir.info ]; then \
$(INSTALL_DATA) dir.info $(DESTDIR)$(infodir)/dir.info ; \ $(INSTALL_DATA) dir.info $(DESTDIR)$(infodir)/dir.info; \
else true ; fi else true; fi
install-pdf: do-install-pdf install-pdf: do-install-pdf
@ -880,10 +880,10 @@ mail-report-with-warnings.log: warning.log
# Local Vim config # Local Vim config
$(srcdir)/.local.vimrc: $(srcdir)/.local.vimrc:
$(LN_S) $(srcdir)/contrib/vimrc $@ $(LN_S) contrib/vimrc $@
$(srcdir)/.lvimrc: $(srcdir)/.lvimrc:
$(LN_S) $(srcdir)/contrib/vimrc $@ $(LN_S) contrib/vimrc $@
vimrc: $(srcdir)/.local.vimrc $(srcdir)/.lvimrc vimrc: $(srcdir)/.local.vimrc $(srcdir)/.lvimrc
@ -921,14 +921,14 @@ uninstall:
.PHONY: install.all .PHONY: install.all
install.all: install-no-fixedincludes install.all: install-no-fixedincludes
@if [ -f ./gcc/Makefile ] ; then \ @if [ -f ./gcc/Makefile ]; then \
r=`${PWD_COMMAND}` ; export r ; \ r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \ $(HOST_EXPORTS) \
(cd ./gcc && \ (cd ./gcc && \
$(MAKE) $(FLAGS_TO_PASS) install-headers) ; \ $(MAKE) $(FLAGS_TO_PASS) install-headers); \
else \ else \
true ; \ true; \
fi fi
# install-no-fixedincludes is used to allow the elaboration of binary packages # install-no-fixedincludes is used to allow the elaboration of binary packages
@ -968,10 +968,10 @@ installdirs: mkinstalldirs
$(SHELL) $(srcdir)/mkinstalldirs $(MAKEDIRS) $(SHELL) $(srcdir)/mkinstalldirs $(MAKEDIRS)
dir.info: do-install-info dir.info: do-install-info
if [ -f $(srcdir)/texinfo/gen-info-dir ] ; then \ if [ -f $(srcdir)/texinfo/gen-info-dir ]; then \
$(srcdir)/texinfo/gen-info-dir $(DESTDIR)$(infodir) $(srcdir)/texinfo/dir.info-template > dir.info.new ; \ $(srcdir)/texinfo/gen-info-dir $(DESTDIR)$(infodir) $(srcdir)/texinfo/dir.info-template > dir.info.new; \
mv -f dir.info.new dir.info ; \ mv -f dir.info.new dir.info; \
else true ; \ else true; \
fi fi
dist: dist:
@ -1006,8 +1006,8 @@ configure-[+prefix+][+module+]: [+ IF bootstrap +][+ ELSE +]
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
[+ IF check_multilibs [+ IF check_multilibs
+]echo "Checking multilib configuration for [+module+]..."; \ +]echo "Checking multilib configuration for [+module+]..."; \
$(SHELL) $(srcdir)/mkinstalldirs [+subdir+]/[+module+] ; \ $(SHELL) $(srcdir)/mkinstalldirs [+subdir+]/[+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 test -r [+subdir+]/[+module+]/multilib.out; then \
if cmp -s [+subdir+]/[+module+]/multilib.tmp [+subdir+]/[+module+]/multilib.out; then \ if cmp -s [+subdir+]/[+module+]/multilib.tmp [+subdir+]/[+module+]/multilib.out; then \
rm -f [+subdir+]/[+module+]/multilib.tmp; \ 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; \ mv [+subdir+]/[+module+]/multilib.tmp [+subdir+]/[+module+]/multilib.out; \
fi; \ fi; \
[+ ENDIF check_multilibs +]test ! -f [+subdir+]/[+module+]/Makefile || exit 0; \ [+ ENDIF check_multilibs +]test ! -f [+subdir+]/[+module+]/Makefile || exit 0; \
$(SHELL) $(srcdir)/mkinstalldirs [+subdir+]/[+module+] ; \ $(SHELL) $(srcdir)/mkinstalldirs [+subdir+]/[+module+]; \
[+exports+] [+extra_exports+] \ [+exports+] [+extra_exports+] \
echo Configuring in [+subdir+]/[+module+]; \ echo Configuring in [+subdir+]/[+module+]; \
cd "[+subdir+]/[+module+]" || exit 1; \ cd "[+subdir+]/[+module+]" || exit 1; \
@ -1052,7 +1052,7 @@ configure-stage[+id+]-[+prefix+][+module+]:
TFLAGS="$(STAGE[+id+]_TFLAGS)"; \ TFLAGS="$(STAGE[+id+]_TFLAGS)"; \
[+ IF check_multilibs [+ IF check_multilibs
+]echo "Checking multilib configuration for [+module+]..."; \ +]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 test -r [+subdir+]/[+module+]/multilib.out; then \
if cmp -s [+subdir+]/[+module+]/multilib.tmp [+subdir+]/[+module+]/multilib.out; then \ if cmp -s [+subdir+]/[+module+]/multilib.tmp [+subdir+]/[+module+]/multilib.out; then \
rm -f [+subdir+]/[+module+]/multilib.tmp; \ rm -f [+subdir+]/[+module+]/multilib.tmp; \
@ -1074,8 +1074,8 @@ configure-stage[+id+]-[+prefix+][+module+]:
LIBCFLAGS="$(STAGE[+id+]_CFLAGS)"[+ ELSE prev +] \ LIBCFLAGS="$(STAGE[+id+]_CFLAGS)"[+ ELSE prev +] \
LIBCFLAGS="$(LIBCFLAGS)"[+ ENDIF prev +]; export LIBCFLAGS;[+ LIBCFLAGS="$(LIBCFLAGS)"[+ ENDIF prev +]; export LIBCFLAGS;[+
ENDIF prefix +] [+extra_exports+] \ ENDIF prefix +] [+extra_exports+] \
echo Configuring stage [+id+] in [+subdir+]/[+module+] ; \ echo Configuring stage [+id+] in [+subdir+]/[+module+]; \
$(SHELL) $(srcdir)/mkinstalldirs [+subdir+]/[+module+] ; \ $(SHELL) $(srcdir)/mkinstalldirs [+subdir+]/[+module+]; \
cd [+subdir+]/[+module+] || exit 1; \ cd [+subdir+]/[+module+] || exit 1; \
case $(srcdir) in \ case $(srcdir) in \
/* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@ -1087,7 +1087,7 @@ configure-stage[+id+]-[+prefix+][+module+]:
--srcdir=$${topdir}/$$module_srcdir \ --srcdir=$${topdir}/$$module_srcdir \
[+args+] --build=${build_alias} --host=[+host_alias+] \ [+args+] --build=${build_alias} --host=[+host_alias+] \
--target=[+target_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 +] \ $(STAGE[+id+]_CONFIGURE_FLAGS)[+ IF extra_configure_flags +] \
[+extra_configure_flags+][+ ENDIF extra_configure_flags +] [+extra_configure_flags+][+ ENDIF extra_configure_flags +]
@endif [+prefix+][+module+]-bootstrap @endif [+prefix+][+module+]-bootstrap
@ -1208,7 +1208,7 @@ check-[+module+]:
# This module is only tested in a native toolchain. # This module is only tested in a native toolchain.
check-[+module+]: check-[+module+]:
@: $(MAKE); $(unstage) @: $(MAKE); $(unstage)
@if [ '$(host)' = '$(target)' ] ; then \ @if [ '$(host)' = '$(target)' ]; then \
r=`${PWD_COMMAND}`; export r; \ r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) [+ IF bootstrap +]$(EXTRA_HOST_EXPORTS)[+ $(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 \ for flag in $(EXTRA_HOST_FLAGS) [+extra_make_flags+]; do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \ done; \
echo "Doing [+make_target+] in [+module+]" ; \ echo "Doing [+make_target+] in [+module+]"; \
(cd $(HOST_SUBDIR)/[+module+] && \ (cd $(HOST_SUBDIR)/[+module+] && \
$(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
"CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@ -1413,7 +1413,7 @@ maybe-[+make_target+]-target-[+module+]: [+make_target+]-target-[+module+]
[+depend+]-target-[+module+] [+ [+depend+]-target-[+module+] [+
ENDFOR depend +] ENDFOR depend +]
@: $(MAKE); $(unstage) @: $(MAKE); $(unstage)
@[ -f $(TARGET_SUBDIR)/[+module+]/Makefile ] || exit 0 ; \ @[ -f $(TARGET_SUBDIR)/[+module+]/Makefile ] || exit 0; \
r=`${PWD_COMMAND}`; export r; \ r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \[+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \[+
IF raw_cxx +] IF raw_cxx +]
@ -1421,7 +1421,7 @@ IF raw_cxx +]
ELSE normal_cxx +] ELSE normal_cxx +]
$(NORMAL_TARGET_EXPORTS) \[+ $(NORMAL_TARGET_EXPORTS) \[+
ENDIF raw_cxx +] 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 \ for flag in $(EXTRA_TARGET_FLAGS); do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \ done; \
@ -1464,7 +1464,7 @@ cross: all-build all-gas all-ld
echo "Building the C and C++ compiler"; \ echo "Building the C and C++ compiler"; \
cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) LANGUAGES="c c++" cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) LANGUAGES="c c++"
@r=`${PWD_COMMAND}`; export r; \ @r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
echo "Building runtime libraries"; \ echo "Building runtime libraries"; \
$(MAKE) $(RECURSE_FLAGS_TO_PASS) LANGUAGES="c c++" all $(MAKE) $(RECURSE_FLAGS_TO_PASS) LANGUAGES="c c++" all
@endif gcc-no-bootstrap @endif gcc-no-bootstrap
@ -1548,31 +1548,31 @@ objext = .o
stage[+id+]-start:: stage[+id+]-start::
@: $(MAKE); $(stage); \ @: $(MAKE); $(stage); \
echo stage[+id+] > stage_current ; \ echo stage[+id+] > stage_current; \
echo stage[+id+] > stage_last; \ echo stage[+id+] > stage_last; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)[+ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)[+
FOR host_modules +][+ IF bootstrap +] FOR host_modules +][+ IF bootstrap +]
@if [+ module +] @if [+ module +]
@cd $(HOST_SUBDIR); [ -d stage[+id+]-[+module+] ] || \ @cd $(HOST_SUBDIR); [ -d stage[+id+]-[+module+] ] || \
mkdir 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 +] mv stage[+prev+]-[+module+] prev-[+module+] || test -f stage[+prev+]-lean [+ ENDIF prev +]
@endif [+ module +][+ ENDIF bootstrap +][+ ENDFOR host_modules +] @endif [+ module +][+ ENDIF bootstrap +][+ ENDFOR host_modules +]
@[ -d stage[+id+]-$(TARGET_SUBDIR) ] || \ @[ -d stage[+id+]-$(TARGET_SUBDIR) ] || \
mkdir 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 +] mv stage[+prev+]-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stage[+prev+]-lean [+ ENDIF prev +]
stage[+id+]-end:: [+ FOR host_modules +][+ IF bootstrap +] stage[+id+]-end:: [+ FOR host_modules +][+ IF bootstrap +]
@if [+ module +] @if [+ module +]
@if test -d $(HOST_SUBDIR)/[+module+] ; then \ @if test -d $(HOST_SUBDIR)/[+module+]; then \
cd $(HOST_SUBDIR); mv [+module+] stage[+id+]-[+module+] [+ IF prev +]; \ cd $(HOST_SUBDIR); mv [+module+] stage[+id+]-[+module+][+ IF prev +]; \
mv prev-[+module+] stage[+prev+]-[+module+] ; : [+ ENDIF prev +] ; \ mv prev-[+module+] stage[+prev+]-[+module+]; : [+ ENDIF prev +]; \
fi fi
@endif [+ module +][+ ENDIF bootstrap +][+ ENDFOR host_modules +] @endif [+ module +][+ ENDIF bootstrap +][+ ENDFOR host_modules +]
@if test -d $(TARGET_SUBDIR) ; then \ @if test -d $(TARGET_SUBDIR); then \
mv $(TARGET_SUBDIR) stage[+id+]-$(TARGET_SUBDIR) [+ IF prev +] ; \ mv $(TARGET_SUBDIR) stage[+id+]-$(TARGET_SUBDIR)[+ IF prev +]; \
mv prev-$(TARGET_SUBDIR) stage[+prev+]-$(TARGET_SUBDIR) ; : [+ ENDIF prev +] ; \ mv prev-$(TARGET_SUBDIR) stage[+prev+]-$(TARGET_SUBDIR); : [+ ENDIF prev +]; \
fi fi
rm -f stage_current rm -f stage_current
@ -1584,13 +1584,13 @@ stage[+id+]-bubble:: [+ IF prev +]stage[+prev+]-bubble[+ ENDIF +]
@r=`${PWD_COMMAND}`; export r; \ @r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
if test -f stage[+id+]-lean [+ if test -f stage[+id+]-lean [+
IF prev +]|| test -f stage[+prev+]-lean [+ ENDIF prev +] ; then \ IF prev +]|| test -f stage[+prev+]-lean [+ ENDIF prev +]; then \
echo Skipping rebuild of stage[+id+] ; \ echo Skipping rebuild of stage[+id+]; \
else \ else \
$(MAKE) stage[+id+]-start; \[+IF lean +] $(MAKE) stage[+id+]-start; \[+IF lean +]
if $(LEAN); then \ if $(LEAN); then \
rm -rf stage[+lean+]-* ; \ rm -rf stage[+lean+]-*; \
$(STAMP) stage[+lean+]-lean ; \ $(STAMP) stage[+lean+]-lean; \
fi; \[+ ENDIF lean +] fi; \[+ ENDIF lean +]
$(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage[+id+]; \ $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage[+id+]; \
fi[+ IF compare-target +] fi[+ IF compare-target +]
@ -1607,16 +1607,16 @@ do-clean: clean-stage[+id+]
@r=`${PWD_COMMAND}`; export r; \ @r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
if test -f stage[+prev+]-lean; then \ if test -f stage[+prev+]-lean; then \
echo Cannot compare object files as stage [+prev+] was deleted. ; \ echo Cannot compare object files as stage [+prev+] was deleted.; \
exit 0 ; \ exit 0; \
fi; \ fi; \
: $(MAKE); $(stage); \ : $(MAKE); $(stage); \
rm -f .bad_compare ; \ rm -f .bad_compare; \
echo Comparing stages [+prev+] and [+id+] ; \ echo Comparing stages [+prev+] and [+id+]; \
sed=`echo stage[+id+] | sed 's,^stage,,;s,.,.,g'`; \ sed=`echo stage[+id+] | sed 's,^stage,,;s,.,.,g'`; \
files=`find stage[+id+]-* -name "*$(objext)" -print | \ files=`find stage[+id+]-* -name "*$(objext)" -print | \
sed -n s,^stage$$sed-,,p` ; \ sed -n s,^stage$$sed-,,p`; \
for file in $${files} ; do \ for file in $${files}; do \
f1=$$r/stage[+prev+]-$$file; f2=$$r/stage[+id+]-$$file; \ f1=$$r/stage[+prev+]-$$file; f2=$$r/stage[+id+]-$$file; \
if test ! -f $$f1; then continue; fi; \ if test ! -f $$f1; then continue; fi; \
$(do-[+compare-target+]) > /dev/null 2>&1; \ $(do-[+compare-target+]) > /dev/null 2>&1; \
@ -1626,16 +1626,16 @@ do-clean: clean-stage[+id+]
echo warning: $$file differs ;; \ echo warning: $$file differs ;; \
*) \ *) \
echo $$file differs >> .bad_compare ;; \ echo $$file differs >> .bad_compare ;; \
esac ; \ esac; \
fi ; \ fi; \
done ; \ done; \
if [ -f .bad_compare ]; then \ if [ -f .bad_compare ]; then \
echo "Bootstrap comparison failure!"; \ echo "Bootstrap comparison failure!"; \
cat .bad_compare; \ cat .bad_compare; \
exit 1; \ exit 1; \
else \ else \
echo Comparison successful.; \ echo Comparison successful.; \
fi ; \ fi; \
$(STAMP) [+compare-target+][+ IF prev +] $(STAMP) [+compare-target+][+ IF prev +]
if $(LEAN); then \ if $(LEAN); then \
rm -rf stage[+prev+]-*; \ rm -rf stage[+prev+]-*; \
@ -1701,10 +1701,10 @@ stagefeedback-start::
@r=`${PWD_COMMAND}`; export r; \ @r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
for i in prev-*; do \ for i in prev-*; do \
j=`echo $$i | sed s/^prev-//` ; \ j=`echo $$i | sed s/^prev-//`; \
cd $$r/$$i && \ cd $$r/$$i && \
{ find . -type d | sort | sed 's,.*,$(SHELL) '"$$s"'/mkinstalldirs "../'$$j'/&",' | $(SHELL) ; } && \ { find . -type d | sort | sed 's,.*,$(SHELL) '"$$s"'/mkinstalldirs "../'$$j'/&",' | $(SHELL); } && \
{ find . -name '*.*da' | sed 's,.*,$(LN) -f "&" "../'$$j'/&",' | $(SHELL) ; } ; \ { find . -name '*.*da' | sed 's,.*,$(LN) -f "&" "../'$$j'/&",' | $(SHELL); }; \
done done
@if gcc-bootstrap @if gcc-bootstrap