* [patch] [5/6] fix libjava build failure with glibc-2.26
@ 2017-09-07 7:01 Matthias Klose
2017-09-07 7:08 ` Richard Biener
0 siblings, 1 reply; 2+ messages in thread
From: Matthias Klose @ 2017-09-07 7:01 UTC (permalink / raw)
To: GCC Patches, GCJ-patches
[-- 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]; \
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [patch] [5/6] fix libjava build failure with glibc-2.26
2017-09-07 7:01 [patch] [5/6] fix libjava build failure with glibc-2.26 Matthias Klose
@ 2017-09-07 7:08 ` Richard Biener
0 siblings, 0 replies; 2+ messages in thread
From: Richard Biener @ 2017-09-07 7:08 UTC (permalink / raw)
To: Matthias Klose; +Cc: GCC Patches, GCJ-patches
On Thu, Sep 7, 2017 at 9:01 AM, Matthias Klose <doko@ubuntu.com> wrote:
> 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.
Ok.
Richard.
> 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.
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-09-07 7:08 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-09-07 7:01 [patch] [5/6] fix libjava build failure with glibc-2.26 Matthias Klose
2017-09-07 7:08 ` Richard Biener
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).