commit:     a980d0914a363bcf99c36dadc120f9057f5f389d
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 30 23:41:32 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Nov 30 23:41:32 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=a980d091

3.3.6: backport libjava ucontext fix

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

 3.3.6/gentoo/92_all_ucontext-to-ucontext_t.patch | 13 +++++++++++++
 3.3.6/gentoo/README.history                      |  3 +++
 2 files changed, 16 insertions(+)

diff --git a/3.3.6/gentoo/92_all_ucontext-to-ucontext_t.patch 
b/3.3.6/gentoo/92_all_ucontext-to-ucontext_t.patch
new file mode 100644
index 0000000..f1439df
--- /dev/null
+++ b/3.3.6/gentoo/92_all_ucontext-to-ucontext_t.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/664486
+
+--- 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 = (ucontext_t *)_p;                         \
+   volatile struct sigcontext *_sc = (struct sigcontext *) &_uc->uc_mcontext; \
+   _sc->rip += 2;                                                      \
+ }                                                                     \

diff --git a/3.3.6/gentoo/README.history b/3.3.6/gentoo/README.history
index c7e6497..72369ca 100644
--- a/3.3.6/gentoo/README.history
+++ b/3.3.6/gentoo/README.history
@@ -1,3 +1,6 @@
+1.11           TODO
+       + 92_all_ucontext-to-ucontext_t.patch
+
 1.10           30 Sep 2018
        + 89_all_gcc-3.3.x-ucontext.patch
        + 90_all_libtool-pass-all.patch

Reply via email to