1 |
commit: 637f374a31cd971c1afff480162fc4ea9b675189 |
2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Nov 19 23:39:00 2018 +0000 |
4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Nov 19 23:39:00 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=637f374a |
7 |
|
8 |
4.6.4: backport libjava-ucontext.patch: bug #671270 |
9 |
|
10 |
Reported-by: Cyp |
11 |
Bug: https://bugs.gentoo.org/671270 |
12 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
13 |
|
14 |
4.6.4/gentoo/95_all_libjava-ucontext.patch | 62 ++++++++++++++++++++++++++++++ |
15 |
4.6.4/gentoo/README.history | 3 ++ |
16 |
2 files changed, 65 insertions(+) |
17 |
|
18 |
diff --git a/4.6.4/gentoo/95_all_libjava-ucontext.patch b/4.6.4/gentoo/95_all_libjava-ucontext.patch |
19 |
new file mode 100644 |
20 |
index 0000000..6b823d8 |
21 |
--- /dev/null |
22 |
+++ b/4.6.4/gentoo/95_all_libjava-ucontext.patch |
23 |
@@ -0,0 +1,62 @@ |
24 |
+https://bugs.gentoo.org/629502 |
25 |
+ |
26 |
+From 9b9287cde20ea57578cf07efb2a96ed4cc0da36f Mon Sep 17 00:00:00 2001 |
27 |
+From: doko <doko@138bc75d-0d04-0410-961f-82ee72b054a4> |
28 |
+Date: Thu, 7 Sep 2017 07:22:07 +0000 |
29 |
+Subject: [PATCH] 2017-09-07 Matthias Klose <doko@××××××.com> |
30 |
+ |
31 |
+ * include/x86_64-signal.h (HANDLE_DIVIDE_OVERFLOW): Replace |
32 |
+ 'struct ucontext' with ucontext_t. |
33 |
+ * include/i386-signal.h (HANDLE_DIVIDE_OVERFLOW): Likewise. |
34 |
+ * include/s390-signal.h (HANDLE_DIVIDE_OVERFLOW): Likewise. |
35 |
+ |
36 |
+ |
37 |
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-5-branch@251832 138bc75d-0d04-0410-961f-82ee72b054a4 |
38 |
+--- |
39 |
+ libjava/include/i386-signal.h | 2 +- |
40 |
+ libjava/include/s390-signal.h | 2 +- |
41 |
+ libjava/include/x86_64-signal.h | 2 +- |
42 |
+ 4 files changed, 10 insertions(+), 3 deletions(-) |
43 |
+ |
44 |
+diff --git a/libjava/include/i386-signal.h b/libjava/include/i386-signal.h |
45 |
+index c2409b0e301..ef77e7e99ae 100644 |
46 |
+--- a/libjava/include/i386-signal.h |
47 |
++++ b/libjava/include/i386-signal.h |
48 |
+@@ -29,7 +29,7 @@ static void _Jv_##_name (int, siginfo_t *, \ |
49 |
+ #define HANDLE_DIVIDE_OVERFLOW \ |
50 |
+ do \ |
51 |
+ { \ |
52 |
+- struct ucontext *_uc = (struct ucontext *)_p; \ |
53 |
++ ucontext_t *_uc = (ucontext_t *)_p; \ |
54 |
+ gregset_t &_gregs = _uc->uc_mcontext.gregs; \ |
55 |
+ unsigned char *_eip = (unsigned char *)_gregs[REG_EIP]; \ |
56 |
+ \ |
57 |
+diff --git a/libjava/include/s390-signal.h b/libjava/include/s390-signal.h |
58 |
+index 4ca4c108864..9261b52be6e 100644 |
59 |
+--- a/libjava/include/s390-signal.h |
60 |
++++ b/libjava/include/s390-signal.h |
61 |
+@@ -51,7 +51,7 @@ do \ |
62 |
+ struct \ |
63 |
+ { \ |
64 |
+ unsigned long int uc_flags; \ |
65 |
+- struct ucontext *uc_link; \ |
66 |
++ ucontext_t *uc_link; \ |
67 |
+ stack_t uc_stack; \ |
68 |
+ mcontext_t uc_mcontext; \ |
69 |
+ unsigned long sigmask[2]; \ |
70 |
+diff --git a/libjava/include/x86_64-signal.h b/libjava/include/x86_64-signal.h |
71 |
+index 12383b5485a..e36c5a32a64 100644 |
72 |
+--- a/libjava/include/x86_64-signal.h |
73 |
++++ b/libjava/include/x86_64-signal.h |
74 |
+@@ -28,7 +28,7 @@ static void _Jv_##_name (int, siginfo_t *, \ |
75 |
+ #define HANDLE_DIVIDE_OVERFLOW \ |
76 |
+ do \ |
77 |
+ { \ |
78 |
+- struct ucontext *_uc = (struct ucontext *)_p; \ |
79 |
++ ucontext_t *_uc = (ucontext_t *)_p; \ |
80 |
+ gregset_t &_gregs = _uc->uc_mcontext.gregs; \ |
81 |
+ unsigned char *_rip = (unsigned char *)_gregs[REG_RIP]; \ |
82 |
+ \ |
83 |
+-- |
84 |
+2.15.1 |
85 |
+ |
86 |
|
87 |
diff --git a/4.6.4/gentoo/README.history b/4.6.4/gentoo/README.history |
88 |
index fe9dd13..49ed8ec 100644 |
89 |
--- a/4.6.4/gentoo/README.history |
90 |
+++ b/4.6.4/gentoo/README.history |
91 |
@@ -1,3 +1,6 @@ |
92 |
+1.5 TODO |
93 |
+ + 95_all_libjava-ucontext.patch |
94 |
+ |
95 |
1.4 23 Sep 2018 |
96 |
- 10_all_default-fortify-source.patch |
97 |
- 11_all_gcc-default-format-security.patch |