slyfox      18/01/12 07:36:17

  Modified:             README.history
  Added:                97_all_libjava-ucontext.patch
  Log:
  gcc: fix building against glibc-2.26 (ucontext_t change), bug #629502#c20
  
  Reported-by: Andrey Grozin
  Bug: https://bugs.gentoo.org/629502#c20

Revision  Changes    Path
1.5                  src/patchsets/gcc/6.4.0/gentoo/README.history

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/6.4.0/gentoo/README.history?rev=1.5&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/6.4.0/gentoo/README.history?rev=1.5&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/6.4.0/gentoo/README.history?r1=1.4&r2=1.5

Index: README.history
===================================================================
RCS file: /var/cvsroot/gentoo/src/patchsets/gcc/6.4.0/gentoo/README.history,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- README.history      6 Jan 2018 19:34:57 -0000       1.4
+++ README.history      12 Jan 2018 07:36:17 -0000      1.5
@@ -1,3 +1,5 @@
+1.3            12 Jan 2018
+       + 97_all_libjava-ucontext.patch
 1.2            06 Jan 2018
        + 95_all_static_override_pie.patch
        + 96_all_powerpc_pie.patch



1.1                  
src/patchsets/gcc/6.4.0/gentoo/97_all_libjava-ucontext.patch

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/6.4.0/gentoo/97_all_libjava-ucontext.patch?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/6.4.0/gentoo/97_all_libjava-ucontext.patch?rev=1.1&content-type=text/plain

Index: 97_all_libjava-ucontext.patch
===================================================================
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  <d...@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





Reply via email to