| 1 |
commit: 8159e7afa0ad8e8508811eb9e49368f112bbd59a |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Nov 29 21:48:40 2018 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Nov 29 21:48:40 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=8159e7af |
| 7 |
|
| 8 |
4.0.4: backport libjava ucontext fix |
| 9 |
|
| 10 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
| 11 |
|
| 12 |
4.0.4/gentoo/87_all_libjava-ucontext.patch | 37 ++++++++++++++++++++++++++++++ |
| 13 |
4.0.4/gentoo/README.history | 3 +++ |
| 14 |
2 files changed, 40 insertions(+) |
| 15 |
|
| 16 |
diff --git a/4.0.4/gentoo/87_all_libjava-ucontext.patch b/4.0.4/gentoo/87_all_libjava-ucontext.patch |
| 17 |
new file mode 100644 |
| 18 |
index 0000000..ab9ea96 |
| 19 |
--- /dev/null |
| 20 |
+++ b/4.0.4/gentoo/87_all_libjava-ucontext.patch |
| 21 |
@@ -0,0 +1,37 @@ |
| 22 |
+https://bugs.gentoo.org/629502 |
| 23 |
+ |
| 24 |
+From 9b9287cde20ea57578cf07efb2a96ed4cc0da36f Mon Sep 17 00:00:00 2001 |
| 25 |
+From: doko <doko@138bc75d-0d04-0410-961f-82ee72b054a4> |
| 26 |
+Date: Thu, 7 Sep 2017 07:22:07 +0000 |
| 27 |
+Subject: [PATCH] 2017-09-07 Matthias Klose <doko@××××××.com> |
| 28 |
+ |
| 29 |
+ * include/x86_64-signal.h (HANDLE_DIVIDE_OVERFLOW): Replace |
| 30 |
+ 'struct ucontext' with ucontext_t. |
| 31 |
+ * include/i386-signal.h (HANDLE_DIVIDE_OVERFLOW): Likewise. |
| 32 |
+ * include/s390-signal.h (HANDLE_DIVIDE_OVERFLOW): Likewise. |
| 33 |
+ |
| 34 |
+ |
| 35 |
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-5-branch@251832 138bc75d-0d04-0410-961f-82ee72b054a4 |
| 36 |
+ |
| 37 |
+--- a/libjava/include/pa-signal.h |
| 38 |
++++ b/libjava/include/pa-signal.h |
| 39 |
+@@ -24,7 +24,7 @@ static void _Jv_##_name (int _dummy, siginfo_t *_info, void *arg) |
| 40 |
+ #define MAKE_THROW_FRAME(_exception) \ |
| 41 |
+ do \ |
| 42 |
+ { \ |
| 43 |
+- struct ucontext *uc = (struct ucontext *)arg; \ |
| 44 |
++ ucontext_t *uc = (ucontext_t *)arg; \ |
| 45 |
+ struct sigcontext *sc = &uc->uc_mcontext; \ |
| 46 |
+ (void)_dummy; \ |
| 47 |
+ (void)_info; \ |
| 48 |
+--- a/libjava/include/x86_64-signal.h |
| 49 |
++++ b/libjava/include/x86_64-signal.h |
| 50 |
+@@ -40,7 +40,7 @@ do \ |
| 51 |
+ /* Advance the program counter so that it is after the start of the \ |
| 52 |
+ instruction: the x86_64 exception handler expects \ |
| 53 |
+ the PC to point to the instruction after a call. */ \ |
| 54 |
+- struct ucontext *_uc = (struct ucontext *)_p; \ |
| 55 |
++ ucontext_t *_uc = (ucontext_t *)_p; \ |
| 56 |
+ volatile struct sigcontext *_sc = (struct sigcontext *) &_uc->uc_mcontext; \ |
| 57 |
+ _sc->rip += 2; \ |
| 58 |
+ } \ |
| 59 |
|
| 60 |
diff --git a/4.0.4/gentoo/README.history b/4.0.4/gentoo/README.history |
| 61 |
index 4f44ae8..4d92217 100644 |
| 62 |
--- a/4.0.4/gentoo/README.history |
| 63 |
+++ b/4.0.4/gentoo/README.history |
| 64 |
@@ -1,3 +1,6 @@ |
| 65 |
+1.5 TODO |
| 66 |
+ + 87_all_libjava-ucontext.patch |
| 67 |
+ |
| 68 |
1.4 23 Sep 2018 |
| 69 |
+ 86_all_ucontext-to-ucontext_t.patch |
Archives