From e9ac1f86bf70e0ca794fed6ba3b8fe3026da063e Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Tue, 28 Jun 2016 10:38:38 +0200 Subject: 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 --- gcc/ChangeLog | 2 ++ gcc/Makefile.in | 3 ++- gcc/c/ChangeLog | 4 ++++ gcc/c/Make-lang.in | 3 ++- gcc/cp/ChangeLog | 4 ++++ gcc/cp/Make-lang.in | 3 ++- gcc/lto/ChangeLog | 4 ++++ gcc/lto/Make-lang.in | 3 ++- 8 files changed, 22 insertions(+), 4 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 4e833d4..52b3e1c 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,7 @@ 2016-06-28 Jakub Jelinek + * 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 878fcd0..5e7422d 100644 --- 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 dc6cecc..d32049c 100644 --- a/gcc/c/ChangeLog +++ b/gcc/c/ChangeLog @@ -1,3 +1,7 @@ +2016-06-28 Jakub Jelinek + + * Make-lang.in: Don't cat ../stage_current if it does not exist. + 2016-06-23 Andi Kleen * Make-lang.in: Add support for autofdo. diff --git a/gcc/c/Make-lang.in b/gcc/c/Make-lang.in index 5b14ba3..72c9ae7 100644 --- 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 33e10ba..76b86a4 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +2016-06-28 Jakub Jelinek + + * Make-lang.in: Don't cat ../stage_current if it does not exist. + 2016-06-24 Jason Merrill P0145R2: Refining Expression Order for C++. diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in index c1f26ea..cc3337d 100644 --- 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 f2e56a9..4969909 100644 --- a/gcc/lto/ChangeLog +++ b/gcc/lto/ChangeLog @@ -1,3 +1,7 @@ +2016-06-28 Jakub Jelinek + + * Make-lang.in: Don't cat ../stage_current if it does not exist. + 2016-06-23 Andi Kleen * 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 9b95276..696c5f3 100644 --- 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 -- cgit v1.1