commit:     804174e0b59cba153e1b232bfdaba1016dd1615c
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  9 23:47:27 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Nov  9 23:51:18 2019 +0000
URL:        https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=804174e0

4.6.4: expand 97_all_cgraph_node-gcc-9.patch to allow gcc-9

Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 4.6.4/gentoo/97_all_cgraph_node-gcc-9.patch | 2 +-
 4.6.4/gentoo/README.history                 | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/4.6.4/gentoo/97_all_cgraph_node-gcc-9.patch 
b/4.6.4/gentoo/97_all_cgraph_node-gcc-9.patch
index 77c9a1d..e6334bc 100644
--- a/4.6.4/gentoo/97_all_cgraph_node-gcc-9.patch
+++ b/4.6.4/gentoo/97_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)

diff --git a/4.6.4/gentoo/README.history b/4.6.4/gentoo/README.history
index 5ea9032..1d39625 100644
--- a/4.6.4/gentoo/README.history
+++ b/4.6.4/gentoo/README.history
@@ -1,3 +1,6 @@
+2              9 Nov 2019
+       U 97_all_cgraph_node-gcc-9.patch
+
 1.5            1 Jun 2019
        + 95_all_libjava-ucontext.patch
        + 96_all_gcc-gperf-gnu-inline.patch

Reply via email to