commit: 19551ec41327da90fedac6b21b726121b269303e
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 9 23:06:41 2019 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Nov 9 23:06:41 2019 +0000
URL: https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=19551ec4
4.0.4: expand 98_all_cgraph_node-gcc-9.patch to allow gcc-9
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
4.0.4/gentoo/88_all_cgraph_node-gcc-9.patch | 6 +++---
4.0.4/gentoo/README.history | 3 +++
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/4.0.4/gentoo/88_all_cgraph_node-gcc-9.patch
b/4.0.4/gentoo/88_all_cgraph_node-gcc-9.patch
index fe95a0d..86a675c 100644
--- a/4.0.4/gentoo/88_all_cgraph_node-gcc-9.patch
+++ b/4.0.4/gentoo/88_all_cgraph_node-gcc-9.patch
@@ -16,7 +16,7 @@ gcc-4.6.4/gcc/pretty-print.h:322:6: error: 'cgraph_node' is
not defined as a typ
toplev.h, not after. */
#define GCC_DIAG_STYLE __gcc_cdiag__
-#if GCC_VERSION >= 3005
-+#if (GCC_VERSION >= 3005) && (GCC_VERSION != 9001) /* 9.1.0 is buggy:
https://gcc.gnu.org/PR90677 */
++#if (GCC_VERSION >= 3005) && (__GNUC__ != 9) /* gcc-9 is buggy:
https://gcc.gnu.org/PR90677 */
#define ATTRIBUTE_GCC_CDIAG(m, n) __attribute__ ((__format__ (GCC_DIAG_STYLE,
m ,n))) ATTRIBUTE_NONNULL(m)
#else
#define ATTRIBUTE_GCC_CDIAG(m, n) ATTRIBUTE_NONNULL(m)
@@ -27,7 +27,7 @@ gcc-4.6.4/gcc/pretty-print.h:322:6: error: 'cgraph_node' is
not defined as a typ
/* This header may be included before toplev.h, hence the duplicate
definitions to allow for GCC-specific formats. */
-#if GCC_VERSION >= 3005
-+#if (GCC_VERSION >= 3005) && (GCC_VERSION != 9001) /* 9.1.0 is buggy:
https://gcc.gnu.org/PR90677 */
++#if (GCC_VERSION >= 3005) && (__GNUC__ != 9) /* gcc-9 is buggy:
https://gcc.gnu.org/PR90677 */
#define ATTRIBUTE_GCC_PPDIAG(m, n) __attribute__ ((__format__ (__gcc_diag__,
m ,n))) ATTRIBUTE_NONNULL(m)
#else
#define ATTRIBUTE_GCC_PPDIAG(m, n) ATTRIBUTE_NONNULL(m)
@@ -38,7 +38,7 @@ gcc-4.6.4/gcc/pretty-print.h:322:6: error: 'cgraph_node' is
not defined as a typ
the front-end %D specifier is used in non-front-end code with some
functions, and those formats can only be checked in front-end code. */
-#if GCC_VERSION >= 3005
-+#if (GCC_VERSION >= 3005) && (GCC_VERSION != 9001) /* 9.1.0 is buggy:
https://gcc.gnu.org/PR90677 */
++#if (GCC_VERSION >= 3005) && (__GNUC__ != 9) /* gcc-9 is buggy:
https://gcc.gnu.org/PR90677 */
#define ATTRIBUTE_GCC_DIAG(m, n) __attribute__ ((__format__ (GCC_DIAG_STYLE,
m, n))) ATTRIBUTE_NONNULL(m)
#ifdef NO_FRONT_END_DIAG
#define ATTRIBUTE_GCC_FE_DIAG(m, n) ATTRIBUTE_NONNULL(m)
diff --git a/4.0.4/gentoo/README.history b/4.0.4/gentoo/README.history
index f00b0db..57d3651 100644
--- a/4.0.4/gentoo/README.history
+++ b/4.0.4/gentoo/README.history
@@ -1,3 +1,6 @@
+2 9 Nov 2019
+ U 88_all_cgraph_node-gcc-9.patch
+
1.5 1 Jun 2019
+ 87_all_libjava-ucontext.patch
+ 88_all_cgraph_node-gcc-9.patch
