From: Matthias Klose <doko@ubuntu.com>
To: GCC Patches <gcc-patches@gcc.gnu.org>,
GCJ-patches <java-patches@gcc.gnu.org>
Subject: [patch] [5/6] fix libjava build failure with glibc-2.26
Date: Thu, 07 Sep 2017 07:01:00 -0000 [thread overview]
Message-ID: <3cbc1a38-0c68-f99d-78b0-55fe18566842@ubuntu.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 416 bytes --]
Fix libjava build failure with glibc-2.26, replacing 'struct ucontext' with
ucontext_t. Ok for the gcc-5 and gcc-6 branches? Doesn't apply to 7 and trunk,
because libjava is removed.
Matthias
* 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.
[-- Attachment #2: libjava-ucontext.diff --]
[-- Type: text/x-patch, Size: 1529 bytes --]
# DP: Fix libjava build failure with glibc-2.26
--- a/src/libjava/include/x86_64-signal.h
+++ a/src/libjava/include/x86_64-signal.h
@@ -28,7 +28,7 @@
#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]; \
\
--- a/src/libjava/include/i386-signal.h
+++ a/src/libjava/include/i386-signal.h
@@ -29,7 +29,7 @@
#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]; \
\
--- a/src/libjava/include/s390-signal.h
+++ a/src/libjava/include/s390-signal.h
@@ -51,7 +51,7 @@
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]; \
next reply other threads:[~2017-09-07 7:01 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-07 7:01 Matthias Klose [this message]
2017-09-07 7:08 ` Richard Biener
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=3cbc1a38-0c68-f99d-78b0-55fe18566842@ubuntu.com \
--to=doko@ubuntu.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=java-patches@gcc.gnu.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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).