From: Mike Frysinger <vapier@gentoo.org>
Date: Wed, 22 Jul 2015 02:49:22 +0000 (-0400)
Subject: hppa: sigaction.h: change sa_flags to an int
X-Git-Tag: glibc-2.22~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=827e01851f9945a12cd62112b94ff096c968eb5d;p=thirdparty%2Fglibc.git

hppa: sigaction.h: change sa_flags to an int

This fixes the conform test for the sigaction.h header and makes it match
all the other arches.
---

diff --git a/ChangeLog b/ChangeLog
index 8a195319275..b8d1c338c71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+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
diff --git a/sysdeps/unix/sysv/linux/hppa/bits/sigaction.h b/sysdeps/unix/sysv/linux/hppa/bits/sigaction.h
index ee41396394d..ebe375fb1eb 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;