diff mbox

[PATCH/committed] hppa: sigaction.h: change sa_flags to an int

Message ID 1438226063-30545-1-git-send-email-vapier@gentoo.org
State Committed
Delegated to: Mike Frysinger
Headers show

Commit Message

Mike Frysinger July 30, 2015, 3:14 a.m. UTC
This fixes the conform test for the sigaction.h header and makes it match
all the other arches.
---
 ChangeLog                                     | 16 ++++++++++++++++
 sysdeps/unix/sysv/linux/hppa/bits/sigaction.h |  7 ++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)
diff mbox

Patch

diff --git a/ChangeLog b/ChangeLog
index 8a19531..b8d1c33 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,21 @@ 
 2015-07-30  Mike Frysinger  <vapier@gentoo.org>
 
+	* sysdeps/unix/sysv/linux/hppa/bits/sigaction.h: Include bits/wordsize.h.
+	(struct sigaction): Change sa_flags from a long to an int, and add
+	__glibc_reserved0 before it for padding when __WORDSIZE is 64.
+
+2015-07-30  Mike Frysinger  <vapier@gentoo.org>
+
+	* hppa/sysdep.h: Delete sys/syscall.h and config.h includes.
+	* sysdeps/unix/sysv/linux/hppa/sysdep-cancel.h: Delete
+	sysdeps/generic/sysdep.h include.
+	* sysdeps/unix/sysv/linux/hppa/sysdep.h: Wrap the whole file in
+	_LINUX_HPPA_SYSDEP_H defines.  Include sysdeps/unix/sysdep.h and
+	sysdeps/hppa/sysdep.h.
+	(ENTRY, PSEUDO): Undefine before defining.
+
+2015-07-30  Mike Frysinger  <vapier@gentoo.org>
+
 	* sysdeps/unix/sysv/linux/hppa/sysdep.h (INLINE_SYSCALL): Rewrite
 	from scratch to use INTERNAL_SYSCALL.
 
diff --git a/sysdeps/unix/sysv/linux/hppa/bits/sigaction.h b/sysdeps/unix/sysv/linux/hppa/bits/sigaction.h
index ee41396..ebe375f 100644
--- a/sysdeps/unix/sysv/linux/hppa/bits/sigaction.h
+++ b/sysdeps/unix/sysv/linux/hppa/bits/sigaction.h
@@ -20,6 +20,8 @@ 
 # error "Never include <bits/sigaction.h> directly; use <signal.h> instead."
 #endif
 
+#include <bits/wordsize.h>
+
 /* Structure describing the action to be taken when a signal arrives.  */
 struct sigaction
   {
@@ -40,7 +42,10 @@  struct sigaction
 #endif
 
     /* Special flags.  */
-    unsigned long int sa_flags;
+#if __WORDSIZE == 64
+    int __glibc_reserved0;
+#endif
+    int sa_flags;
 
     /* Additional set of signals to be blocked.  */
     __sigset_t sa_mask;