From 827e01851f9945a12cd62112b94ff096c968eb5d Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 21 Jul 2015 22:49:22 -0400 Subject: 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. --- ChangeLog | 16 ++++++++++++++++ sysdeps/unix/sysv/linux/hppa/bits/sigaction.h | 7 ++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 8a19531927..b8d1c338c7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +2015-07-30 Mike Frysinger + + * 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 + + * 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 * 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 ee41396394..ebe375fb1e 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 directly; use instead." #endif +#include + /* 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; -- cgit 1.4.1