public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sergei Trofimovich" <slyfox@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gcc-patches:master commit in: 4.6.4/gentoo/
Date: Mon, 19 Nov 2018 23:40:20 +0000 (UTC)	[thread overview]
Message-ID: <1542670740.637f374a31cd971c1afff480162fc4ea9b675189.slyfox@gentoo> (raw)

commit:     637f374a31cd971c1afff480162fc4ea9b675189
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 19 23:39:00 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Nov 19 23:39:00 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=637f374a

4.6.4: backport libjava-ucontext.patch: bug #671270

Reported-by: Cyp
Bug: https://bugs.gentoo.org/671270
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 4.6.4/gentoo/95_all_libjava-ucontext.patch | 62 ++++++++++++++++++++++++++++++
 4.6.4/gentoo/README.history                |  3 ++
 2 files changed, 65 insertions(+)

diff --git a/4.6.4/gentoo/95_all_libjava-ucontext.patch b/4.6.4/gentoo/95_all_libjava-ucontext.patch
new file mode 100644
index 0000000..6b823d8
--- /dev/null
+++ b/4.6.4/gentoo/95_all_libjava-ucontext.patch
@@ -0,0 +1,62 @@
+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/s390-signal.h   | 2 +-
+ libjava/include/x86_64-signal.h | 2 +-
+ 4 files changed, 10 insertions(+), 3 deletions(-)
+
+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/s390-signal.h b/libjava/include/s390-signal.h
+index 4ca4c108864..9261b52be6e 100644
+--- a/libjava/include/s390-signal.h
++++ b/libjava/include/s390-signal.h
+@@ -51,7 +51,7 @@ do									\
+   struct                                                                \
+   {                                                                     \
+     unsigned long int uc_flags;                                         \
+-    struct ucontext *uc_link;                                           \
++    ucontext_t *uc_link;                                                \
+     stack_t uc_stack;                                                   \
+     mcontext_t uc_mcontext;                                             \
+     unsigned long sigmask[2];                                           \
+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.6.4/gentoo/README.history b/4.6.4/gentoo/README.history
index fe9dd13..49ed8ec 100644
--- a/4.6.4/gentoo/README.history
+++ b/4.6.4/gentoo/README.history
@@ -1,3 +1,6 @@
+1.5		TODO
+	+ 95_all_libjava-ucontext.patch
+
 1.4		23 Sep 2018
 	- 10_all_default-fortify-source.patch
 	- 11_all_gcc-default-format-security.patch


             reply	other threads:[~2018-11-19 23:40 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-11-19 23:40 Sergei Trofimovich [this message]
  -- strict thread matches above, loose matches on Subject: below --
2019-11-09 23:51 [gentoo-commits] proj/gcc-patches:master commit in: 4.6.4/gentoo/ Sergei Trofimovich
2019-06-01  9:09 Sergei Trofimovich
2019-05-29  6:56 Sergei Trofimovich
2018-09-23 21:39 Sergei Trofimovich
2018-09-15 23:26 Sergei Trofimovich

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1542670740.637f374a31cd971c1afff480162fc4ea9b675189.slyfox@gentoo \
    --to=slyfox@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox