From 3e00f8ddb729913831e494f87207b658292e6c2b Mon Sep 17 00:00:00 2001 From: Bernd Edlinger Date: Fri, 28 May 2021 06:54:13 +0200 Subject: For obj-c stage-final re-use the checksum from the previous stage This silences the stage compare. gcc/objc: 2021-06-07 Bernd Edlinger * Make-lang.in (cc1obj-checksum.c): For stage-final re-use the checksum from the previous stage. gcc/objcp: 2021-06-07 Bernd Edlinger * Make-lang.in (cc1objplus-checksum.c): For stage-final re-use the checksum from the previous stage. --- gcc/objcp/Make-lang.in | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'gcc/objcp') diff --git a/gcc/objcp/Make-lang.in b/gcc/objcp/Make-lang.in index dfa4d23..3ecc50b 100644 --- a/gcc/objcp/Make-lang.in +++ b/gcc/objcp/Make-lang.in @@ -60,12 +60,19 @@ OBJCXX_OBJS = objcp/objcp-act.o objcp/objcp-lang.o objcp/objcp-decl.o \ obj-c++_OBJS = $(OBJCXX_OBJS) cc1objplus-checksum.o +# compute checksum over all object files and the options +# re-use the checksum from the prev-final stage so it passes +# the bootstrap comparison and allows comparing of the cc1 binary cc1objplus-checksum.c : build/genchecksum$(build_exeext) checksum-options \ $(OBJCXX_OBJS) $(BACKEND) $(CODYLIB) $(LIBDEPS) - build/genchecksum$(build_exeext) $(OBJCXX_OBJS) $(BACKEND) $(CODYLIB) \ - $(LIBDEPS) checksum-options > cc1objplus-checksum.c.tmp && \ - $(srcdir)/../move-if-change cc1objplus-checksum.c.tmp \ - cc1objplus-checksum.c + if [ -f ../stage_final ] \ + && cmp -s ../stage_current ../stage_final; then \ + cp ../prev-gcc/$@ $@; \ + else \ + build/genchecksum$(build_exeext) $(OBJCXX_OBJS) $(BACKEND) \ + $(CODYLIB) $(LIBDEPS) checksum-options > $@.tmp && \ + $(srcdir)/../move-if-change $@.tmp $@; \ + fi cc1objplus$(exeext): $(OBJCXX_OBJS) cc1objplus-checksum.o $(BACKEND) \ $(CODYLIB) $(LIBDEPS) $(obj-c++.prev) -- cgit v1.1