From 40917137b6bb66c8020add0b4083c13b566275ba Mon Sep 17 00:00:00 2001 From: Bernd Edlinger Date: Tue, 8 Jun 2021 22:14:52 +0200 Subject: [PATCH] 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. --- 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 9011140..8215283 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 3ecc50b..0f890d8 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) \ -- 2.7.4