diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2018-01-12 07:36:16 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2018-01-12 07:36:16 +0000 |
| commit | d87f5f48e7b5d3b097d38a01f6d678301c977313 (patch) | |
| tree | a125c4d386cb38eb64f53df6ad072cbaf671f491 /4.9.4 | |
| parent | make-tarball.sh: tweak patch generation for PORTDIR!=/usr/portage (diff) | |
| download | gcc-patches-d87f5f48e7b5d3b097d38a01f6d678301c977313.tar.gz gcc-patches-d87f5f48e7b5d3b097d38a01f6d678301c977313.tar.bz2 gcc-patches-d87f5f48e7b5d3b097d38a01f6d678301c977313.zip | |
gcc: fix building against glibc-2.26 (ucontext_t change), bug #629502#c20
Reported-by: Andrey Grozin
Bug: https://bugs.gentoo.org/629502#c20
Diffstat (limited to '4.9.4')
| -rw-r--r-- | 4.9.4/gentoo/98_all_libjava-ucontext.patch | 62 | ||||
| -rw-r--r-- | 4.9.4/gentoo/README.history | 2 |
2 files changed, 64 insertions, 0 deletions
diff --git a/4.9.4/gentoo/98_all_libjava-ucontext.patch b/4.9.4/gentoo/98_all_libjava-ucontext.patch new file mode 100644 index 0000000..6b823d8 --- /dev/null +++ b/4.9.4/gentoo/98_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.9.4/gentoo/README.history b/4.9.4/gentoo/README.history index 4a4a1fa..eec3b4a 100644 --- a/4.9.4/gentoo/README.history +++ b/4.9.4/gentoo/README.history @@ -1,3 +1,5 @@ +1.3 12 Jan 2018 + + 98_all_libjava-ucontext.patch 1.2 27 Oct 2017 + 95_all_asan-signal_h.patch + 96_all_ucontext-to-ucontext_t.patch |