Gentoo Archives: gentoo-commits

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gcc-patches:master commit in: 4.1.2/gentoo/
Date: Sun, 27 Oct 2019 23:17:01
Message-Id: 1572218191.e9af6dfb6aa2a78f9820d5c2e79e57f88c2d73d2.slyfox@gentoo
1 commit: e9af6dfb6aa2a78f9820d5c2e79e57f88c2d73d2
2 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3 AuthorDate: Sun Oct 27 23:16:31 2019 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 27 23:16:31 2019 +0000
6 URL: https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=e9af6dfb
7
8 4.1.2: expand 98_all_cgraph_node-gcc-9.patch to allof gcc-9
9
10 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
11
12 4.1.2/gentoo/98_all_cgraph_node-gcc-9.patch | 6 +++---
13 4.1.2/gentoo/README.history | 3 +++
14 2 files changed, 6 insertions(+), 3 deletions(-)
15
16 diff --git a/4.1.2/gentoo/98_all_cgraph_node-gcc-9.patch b/4.1.2/gentoo/98_all_cgraph_node-gcc-9.patch
17 index 92f27a8..16e99b0 100644
18 --- a/4.1.2/gentoo/98_all_cgraph_node-gcc-9.patch
19 +++ b/4.1.2/gentoo/98_all_cgraph_node-gcc-9.patch
20 @@ -16,7 +16,7 @@ gcc-4.6.4/gcc/pretty-print.h:322:6: error: 'cgraph_node' is not defined as a typ
21 /* This header may be included before diagnostics-core.h, hence the duplicate
22 definitions to allow for GCC-specific formats. */
23 -#if GCC_VERSION >= 3005
24 -+#if (GCC_VERSION >= 3005) && (GCC_VERSION != 9001) /* 9.1.0 is buggy: https://gcc.gnu.org/PR90677 */
25 ++#if (GCC_VERSION >= 3005) && (__GNUC__ != 9) /* gcc-9 is buggy: https://gcc.gnu.org/PR90677 */
26 #define ATTRIBUTE_GCC_PPDIAG(m, n) __attribute__ ((__format__ (__gcc_diag__, m ,n))) ATTRIBUTE_NONNULL(m)
27 #else
28 #define ATTRIBUTE_GCC_PPDIAG(m, n) ATTRIBUTE_NONNULL(m)
29 @@ -27,7 +27,7 @@ gcc-4.6.4/gcc/pretty-print.h:322:6: error: 'cgraph_node' is not defined as a typ
30 diagnostic framework extensions, you must include this file before
31 toplev.h, not after. */
32 -#if GCC_VERSION >= 4001
33 -+#if (GCC_VERSION >= 4001) && (GCC_VERSION != 9001) /* 9.1.0 is buggy: https://gcc.gnu.org/PR90677 */
34 ++#if (GCC_VERSION >= 4001) && (__GNUC__ != 9) /* gcc-9 is buggy: https://gcc.gnu.org/PR90677 */
35 #define ATTRIBUTE_GCC_CDIAG(m, n) __attribute__ ((__format__ (GCC_DIAG_STYLE, m ,n))) ATTRIBUTE_NONNULL(m)
36 #else
37 #define ATTRIBUTE_GCC_CDIAG(m, n) ATTRIBUTE_NONNULL(m)
38 @@ -38,7 +38,7 @@ gcc-4.6.4/gcc/pretty-print.h:322:6: error: 'cgraph_node' is not defined as a typ
39 each language front end can extend them with its own set of format
40 specifiers. We must use custom format checks. */
41 -#if GCC_VERSION >= 4001
42 -+#if (GCC_VERSION >= 4001) && (GCC_VERSION != 9001) /* 9.1.0 is buggy: https://gcc.gnu.org/PR90677 */
43 ++#if (GCC_VERSION >= 4001) && (__GNUC__ != 9) /* gcc-9 is buggy: https://gcc.gnu.org/PR90677 */
44 #define ATTRIBUTE_GCC_DIAG(m, n) __attribute__ ((__format__ (GCC_DIAG_STYLE, m, n))) ATTRIBUTE_NONNULL(m)
45 #else
46 #define ATTRIBUTE_GCC_DIAG(m, n) ATTRIBUTE_NONNULL(m)
47
48 diff --git a/4.1.2/gentoo/README.history b/4.1.2/gentoo/README.history
49 index 202d22b..4536512 100644
50 --- a/4.1.2/gentoo/README.history
51 +++ b/4.1.2/gentoo/README.history
52 @@ -1,3 +1,6 @@
53 +2 27 Oct 2019
54 + U 98_all_cgraph_node-gcc-9.patch
55 +
56 1.8 1 Jun 2019
57 + 97_all_libjava-ucontext.patch
58 + 98_all_cgraph_node-gcc-9.patch