Makefile.in: Don't cat ../stage_current if it does not exist.

	* Makefile.in: Don't cat ../stage_current if it does not exist.
c/
	* Make-lang.in: Don't cat ../stage_current if it does not exist.
cp/
	* Make-lang.in: Don't cat ../stage_current if it does not exist.
lto/
	* Make-lang.in: Don't cat ../stage_current if it does not exist.

From-SVN: r237817

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4e833d478a621d398765ebb884d8efb2c294a907..52b3e1c5ac60cfd435ed233c22595883eb840935 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,7 @@
 2016-06-28  Jakub Jelinek  <jakub@redhat.com>
 
+       * Makefile.in: Don't cat ../stage_current if it does not exist.
+
        * doc/extend.texi (__builtin_add_overflow_p): Clarify behavior when
        last argument is a bit-field.
 

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 878fcd0555255def6308cc994ce66115af0e8f69..5e7422da0c0c4aacd980a3d3f959b3c35ce1ae13 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -1569,7 +1569,8 @@ ALL_HOST_BACKEND_OBJS = $(GCC_OBJS) $(OBJS) $(OBJS-libcommon) \
 
 # for anything that is shared use the cc1plus profile data, as that
 # is likely the most exercised during the build
-ifeq ($(shell cat ../stage_current),stageautofeedback)
+ifeq ($(if $(wildcard ../stage_current),$(shell cat \
+  ../stage_current)),stageautofeedback)
 $(ALL_HOST_BACKEND_OBJS): ALL_COMPILERFLAGS += -fauto-profile=cc1plus.fda
 $(ALL_HOST_BACKEND_OBJS): cc1plus.fda
 endif

diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index dc6ceccd020d390285de716afa5c5d7f5c1257ec..d32049c13e6a2b9c82359fb42d0612be88bf510e 100644 (file)
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,7 @@
+2016-06-28  Jakub Jelinek  <jakub@redhat.com>
+
+       * Make-lang.in: Don't cat ../stage_current if it does not exist.
+
 2016-06-23  Andi Kleen  <ak@linux.intel.com>
 
        * Make-lang.in: Add support for autofdo.

diff --git a/gcc/c/Make-lang.in b/gcc/c/Make-lang.in
index 5b14ba395c725ac21bf3d19121ca5d8e5db406f0..72c9ae74f87e149ef5d7860bcbe38cab9994b760 100644 (file)
--- a/gcc/c/Make-lang.in
+++ b/gcc/c/Make-lang.in
@@ -60,7 +60,8 @@ c_OBJS = $(C_OBJS) cc1-checksum.o c/gccspec.o
 # Use strict warnings for this front end.
 c-warn = $(STRICT_WARN)
 
-ifeq ($(shell cat ../stage_current),stageautofeedback)
+ifeq ($(if $(wildcard ../stage_current),$(shell cat \
+  ../stage_current)),stageautofeedback)
 $(C_OBJS): ALL_COMPILERFLAGS += -fauto-profile=cc1.fda
 $(C_OBJS): cc1.fda
 endif

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 33e10baf9f1fa91dd367696f9a66b6041298b4b9..76b86a4a2d64a00f5171dd5c06141edb57e5ee20 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2016-06-28  Jakub Jelinek  <jakub@redhat.com>
+
+       * Make-lang.in: Don't cat ../stage_current if it does not exist.
+
 2016-06-24  Jason Merrill  <jason@redhat.com>
 
        P0145R2: Refining Expression Order for C++.

diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in
index c1f26eacb94d54e8f40f9fd4e10fc5a9f959ee67..cc3337d7effcfc8d96e02dbd1acf960a7e76c3f0 100644 (file)
--- a/gcc/cp/Make-lang.in
+++ b/gcc/cp/Make-lang.in
@@ -81,7 +81,8 @@ CXX_AND_OBJCXX_OBJS = cp/call.o cp/decl.o cp/expr.o cp/pt.o cp/typeck2.o \
  cp/vtable-class-hierarchy.o cp/constexpr.o cp/cp-ubsan.o \
  cp/constraint.o cp/logic.o $(CXX_C_OBJS)
 
-ifeq ($(shell cat ../stage_current),stageautofeedback)
+ifeq ($(if $(wildcard ../stage_current),$(shell cat \
+  ../stage_current)),stageautofeedback)
 $(CXX_AND_OBJCXX_OBJS): CFLAGS += -fauto-profile=cc1plus.fda
 $(CXX_AND_OBJCXX_OBJS): cc1plus.fda
 endif

diff --git a/gcc/lto/ChangeLog b/gcc/lto/ChangeLog
index f2e56a99162df8ee03dc8d2d21df3431af777c05..49699096606505c272b1fcf1627e1e3d582fea08 100644 (file)
--- a/gcc/lto/ChangeLog
+++ b/gcc/lto/ChangeLog
@@ -1,3 +1,7 @@
+2016-06-28  Jakub Jelinek  <jakub@redhat.com>
+
+       * Make-lang.in: Don't cat ../stage_current if it does not exist.
+
 2016-06-23  Andi Kleen  <ak@linux.intel.com>
 
        * Make-lang.in: Add support for autofdo (disabled for now)

diff --git a/gcc/lto/Make-lang.in b/gcc/lto/Make-lang.in
index 9b952767e139d390eb39d0896088b3b98fe3aa15..696c5f36a5fa59504cce77c8136993d2af25b47f 100644 (file)
--- a/gcc/lto/Make-lang.in
+++ b/gcc/lto/Make-lang.in
@@ -29,7 +29,8 @@ lto_OBJS = $(LTO_OBJS)
 # now. Should reenable after this is fixed, but only when LTO bootstrap
 # is enabled.
 
-#ifeq ($(shell cat ../stage_current),stageautofeedback)
+#ifeq ($(if $(wildcard ../stage_current),$(shell cat \
+#  ../stage_current)),stageautofeedback)
 #$(LTO_OBJS): CFLAGS += -fauto-profile=lto1.fda
 #$(LTO_OBJS): lto1.fda
 #endif