From c951c79828e4f1d505da7084da39295bbf202580defdbd7d5567f9bc1644dd35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Li=C5=A1ka?= Date: Fri, 13 Nov 2020 08:24:08 +0000 Subject: [PATCH] Rebase a patch. OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gcc11?expand=0&rev=156 --- gcc9-reproducible-builds-buildid-for-checksum.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gcc9-reproducible-builds-buildid-for-checksum.patch b/gcc9-reproducible-builds-buildid-for-checksum.patch index c64e443..4a2cf5d 100644 --- a/gcc9-reproducible-builds-buildid-for-checksum.patch +++ b/gcc9-reproducible-builds-buildid-for-checksum.patch @@ -1,7 +1,7 @@ Use the binaries build-id as checksum for PCH purposes. diff --git a/gcc/c-family/c-pch.c b/gcc/c-family/c-pch.c -index a2292f46a7d..94d633d139a 100644 +index 9c0bd0b631d..de762517fc3 100644 --- a/gcc/c-family/c-pch.c +++ b/gcc/c-family/c-pch.c @@ -65,6 +65,66 @@ static FILE *pch_outfile; @@ -84,8 +84,8 @@ index a2292f46a7d..94d633d139a 100644 || fwrite (&v, sizeof (v), 1, f) != 1 || fwrite (target_validity, v.target_data_length, 1, f) != 1) fatal_error (input_location, "cannot write to %s: %m", pch_file); -@@ -237,7 +300,10 @@ c_common_valid_pch (cpp_reader *pfile, const char *name, int fd) - } +@@ -232,7 +295,10 @@ c_common_valid_pch (cpp_reader *pfile, const char *name, int fd) + cpp_warning (pfile, CPP_W_INVALID_PCH, "%s: not a PCH file", name); return 2; } - if (memcmp (ident + IDENT_LENGTH, executable_checksum, 16) != 0) @@ -94,8 +94,8 @@ index a2292f46a7d..94d633d139a 100644 + chksum = executable_checksum; + if (memcmp (ident + IDENT_LENGTH, chksum, 16) != 0) { - if (cpp_get_options (pfile)->warn_invalid_pch) - cpp_error (pfile, CPP_DL_WARNING, + cpp_warning (pfile, CPP_W_INVALID_PCH, + "%s: created by a different GCC executable", name); diff --git a/gcc/genchecksum.c b/gcc/genchecksum.c index 09fbb63fa93..ec8b3281d53 100644 --- a/gcc/genchecksum.c