From 55b14dda4375b7b8f80f09a791bdf3cf7e0f3e08 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Fri, 14 Aug 2015 22:14:16 -0400 Subject: hppa: signalfd.h: move to common sys/signalfd.h Use the common sys/signalfd.h to avoid duplication and move the arch-specific settings into bits/signalfd.h. --- ChangeLog | 5 +++ sysdeps/unix/sysv/linux/hppa/bits/signalfd.h | 29 +++++++++++++ sysdeps/unix/sysv/linux/hppa/sys/signalfd.h | 65 ---------------------------- 3 files changed, 34 insertions(+), 65 deletions(-) create mode 100644 sysdeps/unix/sysv/linux/hppa/bits/signalfd.h delete mode 100644 sysdeps/unix/sysv/linux/hppa/sys/signalfd.h diff --git a/ChangeLog b/ChangeLog index 915cae846e..1212089138 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-08-18 Mike Frysinger + + * sysdeps/unix/sysv/linux/hppa/bits/signalfd.h: New file. + * sysdeps/unix/sysv/linux/hppa/sys/signalfd.h: Delete. + 2015-08-18 Mike Frysinger * sysdeps/unix/sysv/linux/hppa/bits/inotify.h: New file. diff --git a/sysdeps/unix/sysv/linux/hppa/bits/signalfd.h b/sysdeps/unix/sysv/linux/hppa/bits/signalfd.h new file mode 100644 index 0000000000..abb2a23cd5 --- /dev/null +++ b/sysdeps/unix/sysv/linux/hppa/bits/signalfd.h @@ -0,0 +1,29 @@ +/* Copyright (C) 2007-2015 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#ifndef _SYS_SIGNALFD_H +# error "Never use directly; include instead." +#endif + +/* Flags for signalfd. */ +enum + { + SFD_CLOEXEC = 010000000, +#define SFD_CLOEXEC SFD_CLOEXEC + SFD_NONBLOCK = 00200004 /* HPUX has separate NDELAY & NONBLOCK */ +#define SFD_NONBLOCK SFD_NONBLOCK + }; diff --git a/sysdeps/unix/sysv/linux/hppa/sys/signalfd.h b/sysdeps/unix/sysv/linux/hppa/sys/signalfd.h deleted file mode 100644 index 1a4a197c72..0000000000 --- a/sysdeps/unix/sysv/linux/hppa/sys/signalfd.h +++ /dev/null @@ -1,65 +0,0 @@ -/* Copyright (C) 2007-2015 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library. If not, see - . */ - -#ifndef _SYS_SIGNALFD_H -#define _SYS_SIGNALFD_H 1 - -#define __need_sigset_t -#include -#include - - -struct signalfd_siginfo -{ - uint32_t ssi_signo; - int32_t ssi_errno; - int32_t ssi_code; - uint32_t ssi_pid; - uint32_t ssi_uid; - int32_t ssi_fd; - uint32_t ssi_tid; - uint32_t ssi_band; - uint32_t ssi_overrun; - uint32_t ssi_trapno; - int32_t ssi_status; - int32_t ssi_int; - uint64_t ssi_ptr; - uint64_t ssi_utime; - uint64_t ssi_stime; - uint64_t ssi_addr; - uint8_t __pad[48]; -}; - -/* Flags for signalfd. */ -enum - { - SFD_CLOEXEC = 010000000, -#define SFD_CLOEXEC SFD_CLOEXEC - SFD_NONBLOCK = 00200004 /* HPUX has separate NDELAY & NONBLOCK */ -#define SFD_NONBLOCK SFD_NONBLOCK - }; - -__BEGIN_DECLS - -/* Request notification for delivery of signals in MASK to be - performed using descriptor FD.*/ -extern int signalfd (int __fd, const sigset_t *__mask, int __flags) - __THROW __nonnull ((2)); - -__END_DECLS - -#endif /* sys/signalfd.h */ -- cgit 1.4.1