1 |
commit: 98b63243a86963135a7adff5507a5bed67b42c79 |
2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Sep 30 12:26:42 2018 +0000 |
4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Sep 30 12:26:42 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=98b63243 |
7 |
|
8 |
3.4.6: expand 'struct ucontext' to 'ucontext_t' rename in glibc |
9 |
|
10 |
Fixed forgotten 'sh' and 'libjava' entries. |
11 |
|
12 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
13 |
|
14 |
3.4.6/gentoo/91_all_ucontext-to-ucontext_t.patch | 22 ++++++++++++++++++++++ |
15 |
1 file changed, 22 insertions(+) |
16 |
|
17 |
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 |
18 |
index 00ea653..0ce1ed4 100644 |
19 |
--- a/3.4.6/gentoo/91_all_ucontext-to-ucontext_t.patch |
20 |
+++ b/3.4.6/gentoo/91_all_ucontext-to-ucontext_t.patch |
21 |
@@ -42,3 +42,25 @@ https://bugs.gentoo.org/664486 |
22 |
} *rt_ = (CONTEXT)->cfa; \ |
23 |
sc_ = (struct sigcontext *) &rt_->uc.uc_mcontext; \ |
24 |
} \ |
25 |
+--- a/gcc/config/sh/linux.h |
26 |
++++ b/gcc/config/sh/linux.h |
27 |
+@@ -251,7 +251,7 @@ do { \ |
28 |
+ { \ |
29 |
+ struct rt_sigframe { \ |
30 |
+ siginfo_t info; \ |
31 |
+- struct ucontext uc; \ |
32 |
++ ucontext_t uc; \ |
33 |
+ } *rt_ = (CONTEXT)->cfa; \ |
34 |
+ sc_ = (struct sigcontext *) &rt_->uc.uc_mcontext; \ |
35 |
+ } \ |
36 |
+--- a/libjava/include/x86_64-signal.h |
37 |
++++ b/libjava/include/x86_64-signal.h |
38 |
+@@ -40,7 +40,7 @@ do \ |
39 |
+ /* Advance the program counter so that it is after the start of the \ |
40 |
+ instruction: the x86_64 exception handler expects \ |
41 |
+ the PC to point to the instruction after a call. */ \ |
42 |
+- struct ucontext *_uc = (struct ucontext *)_p; \ |
43 |
++ ucontext_t *_uc = (struct ucontext *)_p; \ |
44 |
+ volatile struct sigcontext *_sc = (struct sigcontext *) &_uc->uc_mcontext; \ |
45 |
+ _sc->rip += 2; \ |
46 |
+ } \ |