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

["Sergei Trofimovich" <slyfox@gentoo.org>]

commit:     98b63243a86963135a7adff5507a5bed67b42c79
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 30 12:26:42 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Sep 30 12:26:42 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=98b63243

3.4.6: expand 'struct ucontext' to 'ucontext_t' rename in glibc

Fixed forgotten 'sh' and 'libjava' entries.

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

 3.4.6/gentoo/91_all_ucontext-to-ucontext_t.patch | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/3.4.6/gentoo/91_all_ucontext-to-ucontext_t.patch b/3.4.6/gentoo/91_all_ucontext-to-ucontext_t.patch
index 00ea653..0ce1ed4 100644
--- a/3.4.6/gentoo/91_all_ucontext-to-ucontext_t.patch
+++ b/3.4.6/gentoo/91_all_ucontext-to-ucontext_t.patch
@@ -42,3 +42,25 @@ https://bugs.gentoo.org/664486
  	} *rt_ = (CONTEXT)->cfa;					\
  	sc_ = (struct sigcontext *) &rt_->uc.uc_mcontext;		\
        }									\
+--- a/gcc/config/sh/linux.h
++++ b/gcc/config/sh/linux.h
+@@ -251,7 +251,7 @@ do { \
+       {									\
+ 	struct rt_sigframe {						\
+ 	  siginfo_t info;						\
+-	  struct ucontext uc;						\
++	  ucontext_t uc;						\
+ 	} *rt_ = (CONTEXT)->cfa;					\
+ 	sc_ = (struct sigcontext *) &rt_->uc.uc_mcontext;		\
+       }									\
+--- a/libjava/include/x86_64-signal.h
++++ b/libjava/include/x86_64-signal.h
+@@ -40,7 +40,7 @@ do									     \
+   /* Advance the program counter so that it is after the start of the	     \
+      instruction:  the x86_64 exception handler expects			     \
+      the PC to point to the instruction after a call. */		     \
+-  struct ucontext *_uc = (struct ucontext *)_p;				     \
++  ucontext_t *_uc = (struct ucontext *)_p;				     \
+   volatile struct sigcontext *_sc = (struct sigcontext *) &_uc->uc_mcontext; \
+   _sc->rip += 2;							     \
+ }									     \