public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Bernd Edlinger <edlinger@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc r12-1307] Fix bootstrap2 breakage due to re-use of obj-c checksum
Date: Tue,  8 Jun 2021 21:07:56 +0000 (GMT)	[thread overview]
Message-ID: <20210608210756.875C33857C75@sourceware.org> (raw)

https://gcc.gnu.org/g:40917137b6bb66c8020add0b4083c13b566275ba

commit r12-1307-g40917137b6bb66c8020add0b4083c13b566275ba
Author: Bernd Edlinger <bernd.edlinger@hotmail.de>
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  <bernd.edlinger@hotmail.de>
    
            * Make-lang.in (cc1-obj-checksum.c): Check previous
            stage checksum exists.
    
    gcc/objcp:
    2021-06-08  Bernd Edlinger  <bernd.edlinger@hotmail.de>
    
            * 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) \


                 reply	other threads:[~2021-06-08 21:07 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210608210756.875C33857C75@sourceware.org \
    --to=edlinger@gcc.gnu.org \
    --cc=gcc-cvs@gcc.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).