GNU C Library master sources branch master updated. glibc-2.24-159-gaea5c83

[sthibaul at sourceware dot org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  aea5c83461dac53b8619b7bf2ef1fb348ecb4ef1 (commit)
      from  2c46d1148650edf5d02051c3794227d52618db0c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=aea5c83461dac53b8619b7bf2ef1fb348ecb4ef1

commit aea5c83461dac53b8619b7bf2ef1fb348ecb4ef1
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date:   Tue Sep 20 21:58:36 2016 +0200

    Fix exc2signal.c template
    
    As a follow-up to 0e3426bbcf2ff61d06d580fc9362fde79953a281
    
    	* hurd/exc2signal.c: #include <hurd/signal.h>
    	(_hurd_exception2signal): Replace 'exception', 'code', 'subcode',
    	'sigcode', 'error' parameters with 'detail' parameter.  Fix code
    	accordingly.

diff --git a/ChangeLog b/ChangeLog
index 338777b..7f96066 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2016-09-20  Samuel Thibault  <samuel.thibault@ens-lyon.org>
+
+	* hurd/exc2signal.c: #include <hurd/signal.h>
+	(_hurd_exception2signal): Replace 'exception', 'code', 'subcode',
+	'sigcode', 'error' parameters with 'detail' parameter.  Fix code
+	accordingly.
+
 2016-09-20  Paul E. Murphy  <murphyp@linux.vnet.ibm.com>
 
 	* math/Makefile (libm-calls): Remove s_nanF.
diff --git a/hurd/exc2signal.c b/hurd/exc2signal.c
index 3a2ec08..2527d83 100644
--- a/hurd/exc2signal.c
+++ b/hurd/exc2signal.c
@@ -17,6 +17,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <hurd.h>
+#include <hurd/signal.h>
 
 /* This file must be modified with machine-dependent details.  */
 #error "need to write sysdeps/mach/hurd/MACHINE/exc2signal.c"
@@ -25,46 +26,45 @@
    into a signal number and signal subcode.  */
 
 void
-_hurd_exception2signal (int exception, int code, int subcode,
-			int *signo, int *sigcode, int *error)
+_hurd_exception2signal (struct hurd_signal_detail *detail, int *signo)
 {
-  *error = 0;
+  detail->error = 0;
 
-  switch (exception)
+  switch (detail->exc)
     {
     default:
       *signo = SIGIOT;
-      *sigcode = exception;
+      detail->code = detail->exc;
       break;
 
     case EXC_BAD_ACCESS:
-      if (code == KERN_PROTECTION_FAILURE)
+      if (detail->exc_code == KERN_PROTECTION_FAILURE)
 	*signo = SIGSEGV;
       else
 	*signo = SIGBUS;
-      *sigcode = subcode;
-      *error = code;
+      detail->code = detail->exc_subcode;
+      detail->error = detail->exc_code;
       break;
 
     case EXC_BAD_INSTRUCTION:
       *signo = SIGILL;
-      *sigcode = 0;
+      detail->code = 0;
       break;
 
     case EXC_ARITHMETIC:
       *signo = SIGFPE;
-      *sigcode = 0;
+      detail->code = 0;
       break;
 
     case EXC_EMULATION:
     case EXC_SOFTWARE:
       *signo = SIGEMT;
-      *sigcode = 0;
+      detail->code = 0;
       break;
 
     case EXC_BREAKPOINT:
       *signo = SIGTRAP;
-      *sigcode = 0;
+      detail->code = 0;
       break;
     }
 }

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog         |    7 +++++++
 hurd/exc2signal.c |   24 ++++++++++++------------
 2 files changed, 19 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources