From patchwork Thu Jul 30 03:14:23 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 7929 X-Patchwork-Delegate: vapier@gentoo.org Received: (qmail 98843 invoked by alias); 30 Jul 2015 03:14:24 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 98831 invoked by uid 89); 30 Jul 2015 03:14:23 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.6 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 X-HELO: smtp.gentoo.org From: Mike Frysinger To: libc-alpha@sourceware.org Subject: [PATCH/committed] hppa: sigaction.h: change sa_flags to an int Date: Wed, 29 Jul 2015 23:14:23 -0400 Message-Id: <1438226063-30545-1-git-send-email-vapier@gentoo.org> 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 8a19531..b8d1c33 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,21 @@ 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 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 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;