This is an automated email from the git hooks/post-receive script.

sthibault pushed a commit to branch sid
in repository glibc.

commit 268e65416cdd05ddb439cb252454e24126c66b3c
Author: Samuel Thibault <samuel.thiba...@ens-lyon.org>
Date:   Tue Sep 20 22:12:20 2016 +0200

    hurd-i386/tg-hurdsig-SA_SIGINFO.diff: Fix preemptors
    
    and thus hurd_safe_*
---
 debian/changelog                                   |  2 ++
 .../patches/hurd-i386/tg-hurdsig-SA_SIGINFO.diff   | 26 +++++++++++++++++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 78bbc8f..fcd4c8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ glibc (2.24-4) UNRELEASED; urgency=medium
 
   [ Samuel Thibault ]
   * testsuite-xfail-debian.mk: Clear fixed hurd-i386 test.
+  * hurd-i386/tg-hurdsig-SA_SIGINFO.diff: Fix preemptors and thus
+    hurd_safe_*.
 
  -- Aurelien Jarno <aure...@debian.org>  Sat, 17 Sep 2016 20:03:04 +0200
 
diff --git a/debian/patches/hurd-i386/tg-hurdsig-SA_SIGINFO.diff 
b/debian/patches/hurd-i386/tg-hurdsig-SA_SIGINFO.diff
index 6a01e33..f002216 100644
--- a/debian/patches/hurd-i386/tg-hurdsig-SA_SIGINFO.diff
+++ b/debian/patches/hurd-i386/tg-hurdsig-SA_SIGINFO.diff
@@ -7,7 +7,9 @@ Subject: [PATCH] implement SA_SIGINFO signal handlers.
 
 ---
  hurd/hurd/signal.h                       |    5 +
- hurd/hurdinit.c                          |    2 
+ hurd/hurdfault.c                         |    2 +-
+ hurd/hurdinit.c                          |    2 +-
+ hurd/hurdsig.c                           |    2 +-
  sysdeps/mach/hurd/bits/sigaction.h       |   81 ++++++++++++++++++++
  sysdeps/mach/hurd/i386/bits/sigcontext.h |    4 +
  sysdeps/mach/hurd/i386/exc2signal.c      |  123 
+++++++++++++++++++------------
@@ -30,6 +32,17 @@ Subject: [PATCH] implement SA_SIGINFO signal handlers.
  
  /* Make the thread described by SS take the signal described by SIGNO and
     DETAIL.  If the process is traced, this will in fact stop with a SIGNO
+--- a/hurd/hurdfault.c
++++ b/hurd/hurdfault.c
+@@ -70,7 +70,7 @@ _hurdsig_fault_catch_exception_raise (mach_port_t port,
+      codes into a signal number and subcode.  */
+   _hurd_exception2signal (&d, &signo);
+ 
+-  return HURD_PREEMPT_SIGNAL_P (&_hurdsig_fault_preemptor, signo, d.code)
++  return HURD_PREEMPT_SIGNAL_P (&_hurdsig_fault_preemptor, signo, 
d.exc_subcode)
+     ? 0 : EGREGIOUS;
+ }
+ 
 --- a/hurd/hurdinit.c
 +++ b/hurd/hurdinit.c
 @@ -174,7 +174,7 @@ _hurd_new_proc_init (char **argv,
@@ -41,6 +54,17 @@ Subject: [PATCH] implement SA_SIGINFO signal handlers.
  }
  
  #include <shlib-compat.h>
+--- a/hurd/hurdsig.c
++++ b/hurd/hurdsig.c
+@@ -710,7 +710,7 @@ post_signal (struct hurd_sigstate *ss,
+       {                               /* PE cannot be null.  */
+       do
+         {
+-          if (HURD_PREEMPT_SIGNAL_P (pe, signo, detail->code))
++          if (HURD_PREEMPT_SIGNAL_P (pe, signo, detail->exc_subcode))
+             {
+               if (pe->preemptor)
+                 {
 --- /dev/null
 +++ b/sysdeps/mach/hurd/bits/sigaction.h
 @@ -0,0 +1,81 @@

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-glibc/glibc.git

Reply via email to