Sync Makefile.tpl with GCC

* 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

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

View File

@ -482,11 +482,9 @@ STAGEfeedback_TFLAGS = $(STAGE_TFLAGS)
STAGEfeedback_CONFIGURE_FLAGS = $(STAGE_CONFIGURE_FLAGS) STAGEfeedback_CONFIGURE_FLAGS = $(STAGE_CONFIGURE_FLAGS)
# 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@
@ -677,7 +675,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 = \ BASE_FLAGS_TO_PASS = \
"DESTDIR=$(DESTDIR)" \ "DESTDIR=$(DESTDIR)" \
"RPATH_ENVVAR=$(RPATH_ENVVAR)" \ "RPATH_ENVVAR=$(RPATH_ENVVAR)" \
@ -2450,10 +2450,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

View File

@ -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 +] \
@ -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