From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1853) id 875C33857C75; Tue, 8 Jun 2021 21:07:56 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 875C33857C75 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Bernd Edlinger To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-1307] Fix bootstrap2 breakage due to re-use of obj-c checksum X-Act-Checkin: gcc X-Git-Author: Bernd Edlinger X-Git-Refname: refs/heads/master X-Git-Oldrev: 924e02553af64b10c485711d635c0bc0265a8743 X-Git-Newrev: 40917137b6bb66c8020add0b4083c13b566275ba Message-Id: <20210608210756.875C33857C75@sourceware.org> Date: Tue, 8 Jun 2021 21:07:56 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jun 2021 21:07:56 -0000 https://gcc.gnu.org/g:40917137b6bb66c8020add0b4083c13b566275ba commit r12-1307-g40917137b6bb66c8020add0b4083c13b566275ba Author: Bernd Edlinger Date: Tue Jun 8 22:14:52 2021 +0200 Fix bootstrap2 breakage due to re-use of obj-c checksum gcc/objc: 2021-06-08 Bernd Edlinger * Make-lang.in (cc1-obj-checksum.c): Check previous stage checksum exists. gcc/objcp: 2021-06-08 Bernd Edlinger * Make-lang.in (cc1objplus-checksum.c): Check previous stage checksum exists. Diff: --- gcc/objc/Make-lang.in | 3 ++- gcc/objcp/Make-lang.in | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gcc/objc/Make-lang.in b/gcc/objc/Make-lang.in index 901114066d5..82152831a40 100644 --- a/gcc/objc/Make-lang.in +++ b/gcc/objc/Make-lang.in @@ -63,7 +63,8 @@ objc_OBJS = $(OBJC_OBJS) cc1obj-checksum.o cc1obj-checksum.c : build/genchecksum$(build_exeext) checksum-options \ $(OBJC_OBJS) $(C_AND_OBJC_OBJS) $(BACKEND) $(LIBDEPS) if [ -f ../stage_final ] \ - && cmp -s ../stage_current ../stage_final; then \ + && cmp -s ../stage_current ../stage_final \ + && [ -f ../prev-gcc/$@ ]; then \ cp ../prev-gcc/$@ $@; \ else \ build/genchecksum$(build_exeext) $(OBJC_OBJS) $(C_AND_OBJC_OBJS) \ diff --git a/gcc/objcp/Make-lang.in b/gcc/objcp/Make-lang.in index 3ecc50b53bd..0f890d88f3f 100644 --- a/gcc/objcp/Make-lang.in +++ b/gcc/objcp/Make-lang.in @@ -66,7 +66,8 @@ obj-c++_OBJS = $(OBJCXX_OBJS) cc1objplus-checksum.o cc1objplus-checksum.c : build/genchecksum$(build_exeext) checksum-options \ $(OBJCXX_OBJS) $(BACKEND) $(CODYLIB) $(LIBDEPS) if [ -f ../stage_final ] \ - && cmp -s ../stage_current ../stage_final; then \ + && cmp -s ../stage_current ../stage_final \ + && [ -f ../prev-gcc/$@ ]; then \ cp ../prev-gcc/$@ $@; \ else \ build/genchecksum$(build_exeext) $(OBJCXX_OBJS) $(BACKEND) \