[gentoo-commits] proj/gcc-patches:master commit in: 4.6.4/gentoo/

[gentoo-commits] proj/gcc-patches:master commit in: 4.6.4/gentoo/

[Sergei Trofimovich]

commit:     f103dc3d200d6c68d334eb95704f8f687ede63e0
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 15 23:23:37 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Sep 15 23:23:37 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=f103dc3d

4.6.4: backport 'struct ucontext' to 'ucontext_t' rename in glibc

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

 4.6.4/gentoo/94_all_ucontext-to-ucontext_t.patch | 152 +++++++++++++++++++++++
 4.6.4/gentoo/README.history                      |   1 +
 2 files changed, 153 insertions(+)

diff --git a/4.6.4/gentoo/94_all_ucontext-to-ucontext_t.patch b/4.6.4/gentoo/94_all_ucontext-to-ucontext_t.patch
new file mode 100644
index 0000000..8b0a008
--- /dev/null
+++ b/4.6.4/gentoo/94_all_ucontext-to-ucontext_t.patch
@@ -0,0 +1,152 @@
+https://bugs.gentoo.org/629502
+
+From ecf0d1a107133c715763940c2b197aa814710e1b Mon Sep 17 00:00:00 2001
+From: jsm28 <jsm28@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Tue, 4 Jul 2017 10:25:10 +0000
+Subject: [PATCH] Use ucontext_t not struct ucontext in linux-unwind.h files.
+
+Current glibc no longer gives the ucontext_t type the tag struct
+ucontext, to conform with POSIX namespace rules.  This requires
+various linux-unwind.h files in libgcc, that were previously using
+struct ucontext, to be fixed to use ucontext_t instead.  This is
+similar to the removal of the struct siginfo tag from siginfo_t some
+years ago.
+
+This patch changes those files to use ucontext_t instead.  As the
+standard name that should be unconditionally safe, so this is not
+restricted to architectures supported by glibc, or conditioned on the
+glibc version.
+
+Tested compilation together with current glibc with glibc's
+build-many-glibcs.py.
+
+	* config/aarch64/linux-unwind.h (aarch64_fallback_frame_state),
+	config/alpha/linux-unwind.h (alpha_fallback_frame_state),
+	config/bfin/linux-unwind.h (bfin_fallback_frame_state),
+	config/i386/linux-unwind.h (x86_64_fallback_frame_state,
+	x86_fallback_frame_state), config/m68k/linux-unwind.h (struct
+	uw_ucontext), config/nios2/linux-unwind.h (struct nios2_ucontext),
+	config/pa/linux-unwind.h (pa32_fallback_frame_state),
+	config/sh/linux-unwind.h (sh_fallback_frame_state),
+	config/tilepro/linux-unwind.h (tile_fallback_frame_state),
+	config/xtensa/linux-unwind.h (xtensa_fallback_frame_state): Use
+	ucontext_t instead of struct ucontext.
+
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-5-branch@249958 138bc75d-0d04-0410-961f-82ee72b054a4
+---
+ libgcc/config/aarch64/linux-unwind.h |  2 +-
+ libgcc/config/alpha/linux-unwind.h   |  2 +-
+ libgcc/config/bfin/linux-unwind.h    |  2 +-
+ libgcc/config/i386/linux-unwind.h    |  4 ++--
+ libgcc/config/m68k/linux-unwind.h    |  2 +-
+ libgcc/config/nios2/linux-unwind.h   |  2 +-
+ libgcc/config/pa/linux-unwind.h      |  2 +-
+ libgcc/config/sh/linux-unwind.h      |  2 +-
+ libgcc/config/tilepro/linux-unwind.h |  2 +-
+ libgcc/config/xtensa/linux-unwind.h  |  2 +-
+ 11 files changed, 25 insertions(+), 11 deletions(-)
+
+diff --git a/libgcc/config/alpha/linux-unwind.h b/libgcc/config/alpha/linux-unwind.h
+index d65474fec12..9a226b195b5 100644
+--- a/gcc/config/alpha/linux-unwind.h
++++ b/gcc/config/alpha/linux-unwind.h
+@@ -51,7 +51,7 @@ alpha_fallback_frame_state (struct _Unwind_Context *context,
+     {
+       struct rt_sigframe {
+ 	siginfo_t info;
+-	struct ucontext uc;
++	ucontext_t uc;
+       } *rt_ = context->cfa;
+       sc = &rt_->uc.uc_mcontext;
+     }
+diff --git a/libgcc/config/bfin/linux-unwind.h b/libgcc/config/bfin/linux-unwind.h
+index 0c270e435c7..7fa95d2dc96 100644
+--- a/gcc/config/bfin/linux-unwind.h
++++ b/gcc/config/bfin/linux-unwind.h
+@@ -52,7 +52,7 @@ bfin_fallback_frame_state (struct _Unwind_Context *context,
+ 	void *puc;
+ 	char retcode[8];
+ 	siginfo_t info;
+-	struct ucontext uc;
++	ucontext_t uc;
+       } *rt_ = context->cfa;
+ 
+       /* The void * cast is necessary to avoid an aliasing warning.
+diff --git a/libgcc/config/i386/linux-unwind.h b/libgcc/config/i386/linux-unwind.h
+index e54bf73b1fd..d35fc4566ce 100644
+--- a/gcc/config/i386/linux-unwind.h
++++ b/gcc/config/i386/linux-unwind.h
+@@ -58,7 +58,7 @@ x86_64_fallback_frame_state (struct _Unwind_Context *context,
+   if (*(unsigned char *)(pc+0) == 0x48
+       && *(unsigned long long *)(pc+1) == RT_SIGRETURN_SYSCALL)
+     {
+-      struct ucontext *uc_ = context->cfa;
++      ucontext_t *uc_ = context->cfa;
+       /* The void * cast is necessary to avoid an aliasing warning.
+          The aliasing warning is correct, but should not be a problem
+          because it does not alias anything.  */
+@@ -138,7 +138,7 @@ x86_fallback_frame_state (struct _Unwind_Context *context,
+ 	siginfo_t *pinfo;
+ 	void *puc;
+ 	siginfo_t info;
+-	struct ucontext uc;
++	ucontext_t uc;
+       } *rt_ = context->cfa;
+       /* The void * cast is necessary to avoid an aliasing warning.
+          The aliasing warning is correct, but should not be a problem
+diff --git a/libgcc/config/m68k/linux-unwind.h b/libgcc/config/m68k/linux-unwind.h
+index fb79a4d63cd..b2f5ea4cd7c 100644
+--- a/gcc/config/m68k/linux-unwind.h
++++ b/gcc/config/m68k/linux-unwind.h
+@@ -33,7 +33,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+ /* <sys/ucontext.h> is unfortunately broken right now.  */
+ struct uw_ucontext {
+ 	unsigned long	  uc_flags;
+-	struct ucontext  *uc_link;
++	ucontext_t	 *uc_link;
+ 	stack_t		  uc_stack;
+ 	mcontext_t	  uc_mcontext;
+ 	unsigned long	  uc_filler[80];
+diff --git a/libgcc/config/pa/linux-unwind.h b/libgcc/config/pa/linux-unwind.h
+index 01494685ea4..91575356803 100644
+--- a/gcc/config/pa/linux-unwind.h
++++ b/gcc/config/pa/linux-unwind.h
+@@ -80,7 +80,7 @@ pa32_fallback_frame_state (struct _Unwind_Context *context,
+   struct sigcontext *sc;
+   struct rt_sigframe {
+     siginfo_t info;
+-    struct ucontext uc;
++    ucontext_t uc;
+   } *frame;
+ 
+   /* rt_sigreturn trampoline:
+diff --git a/libgcc/config/sh/linux-unwind.h b/libgcc/config/sh/linux-unwind.h
+index e63091f287c..67033f06b4b 100644
+--- a/gcc/config/sh/linux-unwind.h
++++ b/gcc/config/sh/linux-unwind.h
+@@ -180,7 +180,7 @@ sh_fallback_frame_state (struct _Unwind_Context *context,
+     {
+       struct rt_sigframe {
+ 	siginfo_t info;
+-	struct ucontext uc;
++	ucontext_t uc;
+       } *rt_ = context->cfa;
+       /* The void * cast is necessary to avoid an aliasing warning.
+          The aliasing warning is correct, but should not be a problem
+diff --git a/libgcc/config/xtensa/linux-unwind.h b/libgcc/config/xtensa/linux-unwind.h
+index 9a67b5d2b46..98b7ea60e81 100644
+--- a/gcc/config/xtensa/linux-unwind.h
++++ b/gcc/config/xtensa/linux-unwind.h
+@@ -67,7 +67,7 @@ xtensa_fallback_frame_state (struct _Unwind_Context *context,
+ 
+   struct rt_sigframe {
+     siginfo_t info;
+-    struct ucontext uc;
++    ucontext_t uc;
+   } *rt_;
+ 
+   /* movi a2, __NR_rt_sigreturn; syscall */
+-- 
+2.14.1
+

diff --git a/4.6.4/gentoo/README.history b/4.6.4/gentoo/README.history
index 8ff72d0..b3ff314 100644
--- a/4.6.4/gentoo/README.history
+++ b/4.6.4/gentoo/README.history
@@ -4,6 +4,7 @@
 	- 12_all_default-warn-trampolines.patch
 	+ 34_all_libjava-classpath-locale-sort.patch
 	- 99_all_testsuite-01-Wformat.patch
+	+ 94_all_ucontext-to-ucontext_t.patch
 
 1.3		27 May 2015
 	+ 45_all_linux-pthread-reentrant.patch

[gentoo-commits] proj/gcc-patches:master commit in: 4.6.4/gentoo/

[Sergei Trofimovich]

commit:     aa1f626c1bbaedcd234ff6e9f67cfe0319890155
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 23 21:31:54 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Sep 23 21:31:54 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=aa1f626c

4.6.4: cut 1.4 release

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

 4.6.4/gentoo/README.history | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/4.6.4/gentoo/README.history b/4.6.4/gentoo/README.history
index b3ff314..fe9dd13 100644
--- a/4.6.4/gentoo/README.history
+++ b/4.6.4/gentoo/README.history
@@ -1,4 +1,4 @@
-1.4		[pending]
+1.4		23 Sep 2018
 	- 10_all_default-fortify-source.patch
 	- 11_all_gcc-default-format-security.patch
 	- 12_all_default-warn-trampolines.patch

[gentoo-commits] proj/gcc-patches:master commit in: 4.6.4/gentoo/

[Sergei Trofimovich]

commit:     637f374a31cd971c1afff480162fc4ea9b675189
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 19 23:39:00 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Nov 19 23:39:00 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=637f374a

4.6.4: backport libjava-ucontext.patch: bug #671270

Reported-by: Cyp
Bug: https://bugs.gentoo.org/671270
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 4.6.4/gentoo/95_all_libjava-ucontext.patch | 62 ++++++++++++++++++++++++++++++
 4.6.4/gentoo/README.history                |  3 ++
 2 files changed, 65 insertions(+)

diff --git a/4.6.4/gentoo/95_all_libjava-ucontext.patch b/4.6.4/gentoo/95_all_libjava-ucontext.patch
new file mode 100644
index 0000000..6b823d8
--- /dev/null
+++ b/4.6.4/gentoo/95_all_libjava-ucontext.patch
@@ -0,0 +1,62 @@
+https://bugs.gentoo.org/629502
+
+From 9b9287cde20ea57578cf07efb2a96ed4cc0da36f Mon Sep 17 00:00:00 2001
+From: doko <doko@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Thu, 7 Sep 2017 07:22:07 +0000
+Subject: [PATCH] 2017-09-07  Matthias Klose  <doko@ubuntu.com>
+
+        * include/x86_64-signal.h (HANDLE_DIVIDE_OVERFLOW): Replace
+        'struct ucontext' with ucontext_t.
+        * include/i386-signal.h (HANDLE_DIVIDE_OVERFLOW): Likewise.
+        * include/s390-signal.h (HANDLE_DIVIDE_OVERFLOW): Likewise.
+
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-5-branch@251832 138bc75d-0d04-0410-961f-82ee72b054a4
+---
+ libjava/include/i386-signal.h   | 2 +-
+ libjava/include/s390-signal.h   | 2 +-
+ libjava/include/x86_64-signal.h | 2 +-
+ 4 files changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/libjava/include/i386-signal.h b/libjava/include/i386-signal.h
+index c2409b0e301..ef77e7e99ae 100644
+--- a/libjava/include/i386-signal.h
++++ b/libjava/include/i386-signal.h
+@@ -29,7 +29,7 @@ static void _Jv_##_name (int, siginfo_t *,			\
+ #define HANDLE_DIVIDE_OVERFLOW						\
+ do									\
+ {									\
+-  struct ucontext *_uc = (struct ucontext *)_p;				\
++  ucontext_t *_uc = (ucontext_t *)_p;					\
+   gregset_t &_gregs = _uc->uc_mcontext.gregs;				\
+   unsigned char *_eip = (unsigned char *)_gregs[REG_EIP];		\
+ 									\
+diff --git a/libjava/include/s390-signal.h b/libjava/include/s390-signal.h
+index 4ca4c108864..9261b52be6e 100644
+--- a/libjava/include/s390-signal.h
++++ b/libjava/include/s390-signal.h
+@@ -51,7 +51,7 @@ do									\
+   struct                                                                \
+   {                                                                     \
+     unsigned long int uc_flags;                                         \
+-    struct ucontext *uc_link;                                           \
++    ucontext_t *uc_link;                                                \
+     stack_t uc_stack;                                                   \
+     mcontext_t uc_mcontext;                                             \
+     unsigned long sigmask[2];                                           \
+diff --git a/libjava/include/x86_64-signal.h b/libjava/include/x86_64-signal.h
+index 12383b5485a..e36c5a32a64 100644
+--- a/libjava/include/x86_64-signal.h
++++ b/libjava/include/x86_64-signal.h
+@@ -28,7 +28,7 @@ static void _Jv_##_name (int, siginfo_t *,			\
+ #define HANDLE_DIVIDE_OVERFLOW						\
+ do									\
+ {									\
+-  struct ucontext *_uc = (struct ucontext *)_p;				\
++  ucontext_t *_uc = (ucontext_t *)_p;					\
+   gregset_t &_gregs = _uc->uc_mcontext.gregs;				\
+   unsigned char *_rip = (unsigned char *)_gregs[REG_RIP];		\
+ 									\
+-- 
+2.15.1
+

diff --git a/4.6.4/gentoo/README.history b/4.6.4/gentoo/README.history
index fe9dd13..49ed8ec 100644
--- a/4.6.4/gentoo/README.history
+++ b/4.6.4/gentoo/README.history
@@ -1,3 +1,6 @@
+1.5		TODO
+	+ 95_all_libjava-ucontext.patch
+
 1.4		23 Sep 2018
 	- 10_all_default-fortify-source.patch
 	- 11_all_gcc-default-format-security.patch

[gentoo-commits] proj/gcc-patches:master commit in: 4.6.4/gentoo/

[Sergei Trofimovich]

commit:     5ea5abd9862ba73faa75e620e1055818fed794c7
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Wed May 29 06:56:21 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed May 29 06:56:21 2019 +0000
URL:        https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=5ea5abd9

4.6.4: backport gperf-gnu-inline patch

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

 4.6.4/gentoo/96_all_gcc-gperf-gnu-inline.patch | 64 ++++++++++++++++++++++++++
 4.6.4/gentoo/README.history                    |  1 +
 2 files changed, 65 insertions(+)

diff --git a/4.6.4/gentoo/96_all_gcc-gperf-gnu-inline.patch b/4.6.4/gentoo/96_all_gcc-gperf-gnu-inline.patch
new file mode 100644
index 0000000..b26647a
--- /dev/null
+++ b/4.6.4/gentoo/96_all_gcc-gperf-gnu-inline.patch
@@ -0,0 +1,64 @@
+https://gcc.gnu.org/ml/gcc-patches/2015-08/msg00375.html
+
+From 1de9842cba4749376b545a09ef0b4fc195d319a6 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Thu, 6 Aug 2015 23:32:54 -0400
+Subject: [PATCH] cfns: fix mismatch in gnu_inline attributes
+
+Since the 3.0.3 release of gperf (made in May 2007), the generated func
+has had the gnu_inline attribute applied to it.  The gcc source however
+has not been updated to include that which has lead to a mismatch.
+
+In practice, this hasn't been an issue for two reasons:
+(1) Before gcc-5, the default standard was (gnu) C89, and gcc does not
+warn or throw an error in this mode.
+(2) Starting with gcc-4.8, the compiler driver used to build gcc was
+changed to C++, and g++ does not warn or throw an error in this mode.
+
+This error does show up though when using gcc-5 to build gcc-4.7 or
+older as then the default is (gnu) C11 and the C compiler driver is
+used.  That failure looks like:
+In file included from .../gcc-4.7.4/gcc/cp/except.c:990:0:
+cfns.gperf: At top level:
+cfns.gperf:101:1: error: 'gnu_inline' attribute present on 'libc_name_p'
+cfns.gperf:26:14: error: but not here
+
+Whether the compiler should always emit this error regardless of the
+active standard or compiler driver is debatable (I think it should be
+consistent -- either always do it or never do it).
+---
+ gcc/cp/cfns.gperf | 3 +++
+ gcc/cp/cfns.h     | 3 +++
+ 2 files changed, 6 insertions(+)
+
+diff --git a/gcc/cp/cfns.gperf b/gcc/cp/cfns.gperf
+index 68acd3d..953262f 100644
+--- a/gcc/cp/cfns.gperf
++++ b/gcc/cp/cfns.gperf
+@@ -22,6 +22,9 @@ __inline
+ static unsigned int hash (const char *, unsigned int);
+ #ifdef __GNUC__
+ __inline
++#ifdef __GNUC_STDC_INLINE__
++__attribute__ ((__gnu_inline__)) static
++#endif
+ #endif
+ const char * libc_name_p (const char *, unsigned int);
+ %}
+diff --git a/gcc/cp/cfns.h b/gcc/cp/cfns.h
+index 1c6665d..6d00c0e 100644
+--- a/gcc/cp/cfns.h
++++ b/gcc/cp/cfns.h
+@@ -53,6 +53,9 @@ __inline
+ static unsigned int hash (const char *, unsigned int);
+ #ifdef __GNUC__
+ __inline
++#ifdef __GNUC_STDC_INLINE__
++__attribute__ ((__gnu_inline__)) static
++#endif
+ #endif
+ const char * libc_name_p (const char *, unsigned int);
+ /* maximum key range = 391, duplicates = 0 */
+-- 
+2.4.4
+

diff --git a/4.6.4/gentoo/README.history b/4.6.4/gentoo/README.history
index 49ed8ec..af8339f 100644
--- a/4.6.4/gentoo/README.history
+++ b/4.6.4/gentoo/README.history
@@ -1,5 +1,6 @@
 1.5		TODO
 	+ 95_all_libjava-ucontext.patch
+	+ 96_all_gcc-gperf-gnu-inline.patch
 
 1.4		23 Sep 2018
 	- 10_all_default-fortify-source.patch

[gentoo-commits] proj/gcc-patches:master commit in: 4.6.4/gentoo/

[Sergei Trofimovich]

commit:     83395c7f691bcba3e5a4312edbbc25fce755ef33
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  1 08:39:30 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Jun  1 08:39:30 2019 +0000
URL:        https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=83395c7f

4.6.4: cut 1.5 patchset

Three new patches:
95_all_libjava-ucontext.patch: fix libjava build on modern glibc
96_all_gcc-gperf-gnu-inline.patch: fix inline declaration for modern gcc
97_all_cgraph_node-gcc-9.patch: workaround buid failure against gcc-9.1.0

Bug: https://bugs.gentoo.org/629502
Bug: https://gcc.gnu.org/PR90677
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 4.6.4/gentoo/README.history | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/4.6.4/gentoo/README.history b/4.6.4/gentoo/README.history
index 247ea24..5ea9032 100644
--- a/4.6.4/gentoo/README.history
+++ b/4.6.4/gentoo/README.history
@@ -1,4 +1,4 @@
-1.5		TODO
+1.5		1 Jun 2019
 	+ 95_all_libjava-ucontext.patch
 	+ 96_all_gcc-gperf-gnu-inline.patch
 	+ 97_all_cgraph_node-gcc-9.patch

[gentoo-commits] proj/gcc-patches:master commit in: 4.6.4/gentoo/

[Sergei Trofimovich]

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