aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2018-11-19 23:39:19 +0000
committerSergei Trofimovich <slyfox@gentoo.org>2018-11-19 23:39:19 +0000
commitdaa311067ebdc86178b5a7d3f413c369b46e7a7e (patch)
tree2f76c70bfe77a2aafe356b99a8aae048246711a4
parent4.6.4: backport libjava-ucontext.patch: bug #671270 (diff)
downloadgcc-patches-daa311067ebdc86178b5a7d3f413c369b46e7a7e.tar.gz
gcc-patches-daa311067ebdc86178b5a7d3f413c369b46e7a7e.tar.bz2
gcc-patches-daa311067ebdc86178b5a7d3f413c369b46e7a7e.zip
4.5.4: backport libjava-ucontext.patch: bug #671270
Reported-by: Cyp Bug: https://bugs.gentoo.org/671270 Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
-rw-r--r--4.5.4/gentoo/101_all_libjava-ucontext.patch47
-rw-r--r--4.5.4/gentoo/README.history3
2 files changed, 50 insertions, 0 deletions
diff --git a/4.5.4/gentoo/101_all_libjava-ucontext.patch b/4.5.4/gentoo/101_all_libjava-ucontext.patch
new file mode 100644
index 0000000..a4b0fb4
--- /dev/null
+++ b/4.5.4/gentoo/101_all_libjava-ucontext.patch
@@ -0,0 +1,47 @@
+https://bugs.gentoo.org/629502
+
+From 9b9287cde20ea57578cf07efb2a96ed4cc0da36f Mon Sep 17 00:00:00 2001
+From: doko <doko@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Thu, 7 Sep 2017 07:22:07 +0000
+Subject: [PATCH] 2017-09-07 Matthias Klose <doko@ubuntu.com>
+
+ * include/x86_64-signal.h (HANDLE_DIVIDE_OVERFLOW): Replace
+ 'struct ucontext' with ucontext_t.
+ * include/i386-signal.h (HANDLE_DIVIDE_OVERFLOW): Likewise.
+ * include/s390-signal.h (HANDLE_DIVIDE_OVERFLOW): Likewise.
+
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-5-branch@251832 138bc75d-0d04-0410-961f-82ee72b054a4
+---
+ libjava/include/i386-signal.h | 2 +-
+ libjava/include/x86_64-signal.h | 2 +-
+
+diff --git a/libjava/include/i386-signal.h b/libjava/include/i386-signal.h
+index c2409b0e301..ef77e7e99ae 100644
+--- a/libjava/include/i386-signal.h
++++ b/libjava/include/i386-signal.h
+@@ -29,7 +29,7 @@ static void _Jv_##_name (int, siginfo_t *, \
+ #define HANDLE_DIVIDE_OVERFLOW \
+ do \
+ { \
+- struct ucontext *_uc = (struct ucontext *)_p; \
++ ucontext_t *_uc = (ucontext_t *)_p; \
+ gregset_t &_gregs = _uc->uc_mcontext.gregs; \
+ unsigned char *_eip = (unsigned char *)_gregs[REG_EIP]; \
+ \
+diff --git a/libjava/include/x86_64-signal.h b/libjava/include/x86_64-signal.h
+index 12383b5485a..e36c5a32a64 100644
+--- a/libjava/include/x86_64-signal.h
++++ b/libjava/include/x86_64-signal.h
+@@ -28,7 +28,7 @@ static void _Jv_##_name (int, siginfo_t *, \
+ #define HANDLE_DIVIDE_OVERFLOW \
+ do \
+ { \
+- struct ucontext *_uc = (struct ucontext *)_p; \
++ ucontext_t *_uc = (ucontext_t *)_p; \
+ gregset_t &_gregs = _uc->uc_mcontext.gregs; \
+ unsigned char *_rip = (unsigned char *)_gregs[REG_RIP]; \
+ \
+--
+2.15.1
+
diff --git a/4.5.4/gentoo/README.history b/4.5.4/gentoo/README.history
index d1c5286..851fc67 100644
--- a/4.5.4/gentoo/README.history
+++ b/4.5.4/gentoo/README.history
@@ -1,3 +1,6 @@
+1.5 TODO
+ + 101_all_libjava-ucontext.patch
+
1.4 23 Sep 2018
U 93_all_gcc-4.5-cloog-dl.patch
+ 100_all_ucontext-to-ucontext_t.patch