aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2018-09-30 13:26:42 +0100
committerSergei Trofimovich <slyfox@gentoo.org>2018-09-30 13:26:42 +0100
commit98b63243a86963135a7adff5507a5bed67b42c79 (patch)
treeed863342c323380e34ffd7f9a0f4d756097f1d31
parent3.3.6: add 90_all_libtool-pass-all.patch (diff)
downloadgcc-patches-98b63243.tar.gz
gcc-patches-98b63243.tar.bz2
gcc-patches-98b63243.zip
3.4.6: expand 'struct ucontext' to 'ucontext_t' rename in glibc
Fixed forgotten 'sh' and 'libjava' entries. Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
-rw-r--r--3.4.6/gentoo/91_all_ucontext-to-ucontext_t.patch22
1 files changed, 22 insertions, 0 deletions
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; \
+ } \