aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2019-10-27 23:16:31 +0000
committerSergei Trofimovich <slyfox@gentoo.org>2019-10-27 23:16:31 +0000
commite9af6dfb6aa2a78f9820d5c2e79e57f88c2d73d2 (patch)
tree70b8e5a0b265d6de3b31ee6806f9b36971ea9960
parent3.4.6: cut 3 patchset, drop arch-specific patches (diff)
downloadgcc-patches-e9af6dfb.tar.gz
gcc-patches-e9af6dfb.tar.bz2
gcc-patches-e9af6dfb.zip
4.1.2: expand 98_all_cgraph_node-gcc-9.patch to allof gcc-9
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
-rw-r--r--4.1.2/gentoo/98_all_cgraph_node-gcc-9.patch6
-rw-r--r--4.1.2/gentoo/README.history3
2 files changed, 6 insertions, 3 deletions
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
index 92f27a8..16e99b0 100644
--- a/4.1.2/gentoo/98_all_cgraph_node-gcc-9.patch
+++ b/4.1.2/gentoo/98_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
/* This header may be included before diagnostics-core.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)
@@ -27,7 +27,7 @@ gcc-4.6.4/gcc/pretty-print.h:322:6: error: 'cgraph_node' is not defined as a typ
diagnostic framework extensions, you must include this file before
toplev.h, not after. */
-#if GCC_VERSION >= 4001
-+#if (GCC_VERSION >= 4001) && (GCC_VERSION != 9001) /* 9.1.0 is buggy: https://gcc.gnu.org/PR90677 */
++#if (GCC_VERSION >= 4001) && (__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)
@@ -38,7 +38,7 @@ gcc-4.6.4/gcc/pretty-print.h:322:6: error: 'cgraph_node' is not defined as a typ
each language front end can extend them with its own set of format
specifiers. We must use custom format checks. */
-#if GCC_VERSION >= 4001
-+#if (GCC_VERSION >= 4001) && (GCC_VERSION != 9001) /* 9.1.0 is buggy: https://gcc.gnu.org/PR90677 */
++#if (GCC_VERSION >= 4001) && (__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)
#else
#define ATTRIBUTE_GCC_DIAG(m, n) ATTRIBUTE_NONNULL(m)
diff --git a/4.1.2/gentoo/README.history b/4.1.2/gentoo/README.history
index 202d22b..4536512 100644
--- a/4.1.2/gentoo/README.history
+++ b/4.1.2/gentoo/README.history
@@ -1,3 +1,6 @@
+2 27 Oct 2019
+ U 98_all_cgraph_node-gcc-9.patch
+
1.8 1 Jun 2019
+ 97_all_libjava-ucontext.patch
+ 98_all_cgraph_node-gcc-9.patch