[PATCH 4/4] signalfd.h: Use new "bits/" scheme for arch-specific flags
Kevin Cernekee
cernekee at gmail.com
Sun Apr 8 18:43:02 UTC 2012
glibc has split off the arch-specific flag definitions (like
SFD_NONBLOCK) into <arch>/bits/signalfd.h, so that there are no longer
multiple redundant copies of the entire header file. We will adopt the
same scheme in uClibc.
Special cases are included for: alpha mips sparc
hppa was omitted because it has not been updated in glibc.
All others use the common definition.
Signed-off-by: Kevin Cernekee <cernekee at gmail.com>
---
Makefile.in | 1 +
include/.gitignore | 1 +
libc/sysdeps/linux/alpha/bits/signalfd.h | 29 +++++++++++
libc/sysdeps/linux/common/bits/signalfd.h | 29 +++++++++++
.../sysdeps/linux/common}/sys/signalfd.h | 53 +++-----------------
libc/sysdeps/linux/mips/bits/signalfd.h | 29 +++++++++++
libc/sysdeps/linux/sparc/bits/signalfd.h | 29 +++++++++++
7 files changed, 126 insertions(+), 45 deletions(-)
create mode 100644 libc/sysdeps/linux/alpha/bits/signalfd.h
create mode 100644 libc/sysdeps/linux/common/bits/signalfd.h
rename {include => libc/sysdeps/linux/common}/sys/signalfd.h (57%)
create mode 100644 libc/sysdeps/linux/mips/bits/signalfd.h
create mode 100644 libc/sysdeps/linux/sparc/bits/signalfd.h
diff --git a/Makefile.in b/Makefile.in
index ccb988a..9af8498 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -279,6 +279,7 @@ HEADERS_RM-$(UCLIBC_LINUX_SPECIFIC) += sys/eventfd.h sys/fsuid.h \
sys/prctl.h \
sys/reboot.h \
sys/sendfile.h \
+ bits/signalfd.h \
sys/signalfd.h \
bits/statfs.h \
sys/statfs.h \
diff --git a/include/.gitignore b/include/.gitignore
index 2d096d1..34589e3 100644
--- a/include/.gitignore
+++ b/include/.gitignore
@@ -36,6 +36,7 @@
/sys/ptrace.h
/sys/reg.h
/sys/regdef.h
+/sys/signalfd.h
/sys/sysmips.h
/sys/tas.h
/sys/timerfd.h
diff --git a/libc/sysdeps/linux/alpha/bits/signalfd.h b/libc/sysdeps/linux/alpha/bits/signalfd.h
new file mode 100644
index 0000000..7ea70fa
--- /dev/null
+++ b/libc/sysdeps/linux/alpha/bits/signalfd.h
@@ -0,0 +1,29 @@
+/* Copyright (C) 2007-2012 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
+ <http://www.gnu.org/licenses/>. */
+
+#ifndef _SYS_SIGNALFD_H
+# error "Never use <bits/signalfd.h> directly; include <sys/signalfd.h> instead."
+#endif
+
+/* Flags for signalfd. */
+enum
+ {
+ SFD_CLOEXEC = 010000000,
+#define SFD_CLOEXEC SFD_CLOEXEC
+ SFD_NONBLOCK = 000000004
+#define SFD_NONBLOCK SFD_NONBLOCK
+ };
diff --git a/libc/sysdeps/linux/common/bits/signalfd.h b/libc/sysdeps/linux/common/bits/signalfd.h
new file mode 100644
index 0000000..f2c0dde
--- /dev/null
+++ b/libc/sysdeps/linux/common/bits/signalfd.h
@@ -0,0 +1,29 @@
+/* Copyright (C) 2007-2012 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
+ <http://www.gnu.org/licenses/>. */
+
+#ifndef _SYS_SIGNALFD_H
+# error "Never use <bits/signalfd.h> directly; include <sys/signalfd.h> instead."
+#endif
+
+/* Flags for signalfd. */
+enum
+ {
+ SFD_CLOEXEC = 02000000,
+#define SFD_CLOEXEC SFD_CLOEXEC
+ SFD_NONBLOCK = 00004000
+#define SFD_NONBLOCK SFD_NONBLOCK
+ };
diff --git a/include/sys/signalfd.h b/libc/sysdeps/linux/common/sys/signalfd.h
similarity index 57%
rename from include/sys/signalfd.h
rename to libc/sysdeps/linux/common/sys/signalfd.h
index f1cb63a..46a8d47 100644
--- a/include/sys/signalfd.h
+++ b/libc/sysdeps/linux/common/sys/signalfd.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2007, 2008 Free Software Foundation, Inc.
+/* Copyright (C) 2007-2012 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
@@ -12,17 +12,18 @@
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, write to the Free
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307 USA. */
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
-#ifndef _SYS_SIGNALFD_H
-#define _SYS_SIGNALFD_H 1
+#ifndef _SYS_SIGNALFD_H
+#define _SYS_SIGNALFD_H 1
#define __need_sigset_t
#include <signal.h>
#include <stdint.h>
+/* Get the platform-dependent flags. */
+#include <bits/signalfd.h>
struct signalfd_siginfo
{
@@ -45,50 +46,12 @@ struct signalfd_siginfo
uint8_t __pad[48];
};
-/* Flags for signalfd. */
-#if defined __sparc__ || defined __sparc64__
-enum
- {
- SFD_CLOEXEC = 0x400000,
-# define SFD_CLOEXEC SFD_CLOEXEC
- SFD_NONBLOCK = 0x4000
-# define SFD_NONBLOCK SFD_NONBLOCK
- };
-
-#elif defined __alpha__
-enum
- {
- SFD_CLOEXEC = 010000000,
-# define SFD_CLOEXEC SFD_CLOEXEC
- SFD_NONBLOCK = 04
-# define SFD_NONBLOCK SFD_NONBLOCK
- };
-
-#elif defined __mips__
-enum
- {
- SFD_CLOEXEC = 02000000,
-# define SFD_CLOEXEC SFD_CLOEXEC
- SFD_NONBLOCK = 0200
-# define SFD_NONBLOCK SFD_NONBLOCK
- };
-
-#else
-enum
- {
- SFD_CLOEXEC = 02000000,
-# define SFD_CLOEXEC SFD_CLOEXEC
- SFD_NONBLOCK = 04000
-# define SFD_NONBLOCK SFD_NONBLOCK
- };
-#endif
-
__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)
- __nonnull ((2)) __THROW;
+ __THROW __nonnull ((2));
__END_DECLS
diff --git a/libc/sysdeps/linux/mips/bits/signalfd.h b/libc/sysdeps/linux/mips/bits/signalfd.h
new file mode 100644
index 0000000..c2bea76
--- /dev/null
+++ b/libc/sysdeps/linux/mips/bits/signalfd.h
@@ -0,0 +1,29 @@
+/* Copyright (C) 2007-2012 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
+ <http://www.gnu.org/licenses/>. */
+
+#ifndef _SYS_SIGNALFD_H
+# error "Never use <bits/signalfd.h> directly; include <sys/signalfd.h> instead."
+#endif
+
+/* Flags for signalfd. */
+enum
+ {
+ SFD_CLOEXEC = 02000000,
+#define SFD_CLOEXEC SFD_CLOEXEC
+ SFD_NONBLOCK = 00000200
+#define SFD_NONBLOCK SFD_NONBLOCK
+ };
diff --git a/libc/sysdeps/linux/sparc/bits/signalfd.h b/libc/sysdeps/linux/sparc/bits/signalfd.h
new file mode 100644
index 0000000..1271e34
--- /dev/null
+++ b/libc/sysdeps/linux/sparc/bits/signalfd.h
@@ -0,0 +1,29 @@
+/* Copyright (C) 2007-2012 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
+ <http://www.gnu.org/licenses/>. */
+
+#ifndef _SYS_SIGNALFD_H
+# error "Never use <bits/signalfd.h> directly; include <sys/signalfd.h> instead."
+#endif
+
+/* Flags for signalfd. */
+enum
+ {
+ SFD_CLOEXEC = 0x400000,
+#define SFD_CLOEXEC SFD_CLOEXEC
+ SFD_NONBLOCK = 0x004000
+#define SFD_NONBLOCK SFD_NONBLOCK
+ };
--
1.7.8.3
More information about the uClibc
mailing list