about summary refs log tree commit diff
path: root/sysdeps
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2016-03-21 16:30:05 +0000
committerJoseph Myers <joseph@codesourcery.com>2016-03-21 16:30:05 +0000
commit238d60ac9b0fb8262b18a44a23d14de4b59f2f23 (patch)
tree3ee8b0994ef57c9281baabb8f8d62ec27998d7e8 /sysdeps
parent67b23376fb72cdc3fbef37837f6fb5ebe8f0f034 (diff)
downloadglibc-238d60ac9b0fb8262b18a44a23d14de4b59f2f23.tar.gz
glibc-238d60ac9b0fb8262b18a44a23d14de4b59f2f23.tar.xz
glibc-238d60ac9b0fb8262b18a44a23d14de4b59f2f23.zip
Remove __ASSUME_SIGNALFD4.
Current Linux kernel version requirements mean the signalfd4 syscall
can always be assumed to be available.  This patch removes
__ASSUME_SIGNALFD4 and associated conditionals.

Tested for x86_64 and x86 that installed stripped shared libraries are
unchanged by the patch.

	* sysdeps/unix/sysv/linux/kernel-features.h (__ASSUME_SIGNALFD4):
	Remove macro.
	* sysdeps/unix/sysv/linux/signalfd.c: Do not include
	<kernel-features.h>.
	(signalfd) [__NR_signalfd4]: Make code unconditional.
	(signalfd) [!__ASSUME_SIGNALFD4]: Remove conditional code.
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/unix/sysv/linux/kernel-features.h1
-rw-r--r--sysdeps/unix/sysv/linux/signalfd.c26
2 files changed, 1 insertions, 26 deletions
diff --git a/sysdeps/unix/sysv/linux/kernel-features.h b/sysdeps/unix/sysv/linux/kernel-features.h
index 34a7bd23a2..28195e5629 100644
--- a/sysdeps/unix/sysv/linux/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/kernel-features.h
@@ -83,7 +83,6 @@
    2.6.27.  */
 #define __ASSUME_IN_NONBLOCK	1
 #define __ASSUME_PIPE2		1
-#define __ASSUME_SIGNALFD4	1
 #define __ASSUME_DUP3		1
 
 /* Support for accept4 functionality was added in 2.6.28, but for some
diff --git a/sysdeps/unix/sysv/linux/signalfd.c b/sysdeps/unix/sysv/linux/signalfd.c
index ba64dad801..99ecf6e0d7 100644
--- a/sysdeps/unix/sysv/linux/signalfd.c
+++ b/sysdeps/unix/sysv/linux/signalfd.c
@@ -19,34 +19,10 @@
 #include <signal.h>
 #include <sys/signalfd.h>
 #include <sysdep.h>
-#include <kernel-features.h>
 
 
 int
 signalfd (int fd, const sigset_t *mask, int flags)
 {
-#ifdef __NR_signalfd4
-  int res = INLINE_SYSCALL (signalfd4, 4, fd, mask, _NSIG / 8, flags);
-# ifndef __ASSUME_SIGNALFD4
-  if (res != -1 || errno != ENOSYS)
-# endif
-    return res;
-#endif
-
-#ifndef __ASSUME_SIGNALFD4
-  /* The old system call has no flag parameter which is bad.  So we have
-     to wait until we have to support to pass additional values to the
-     kernel (sys_indirect) before implementing setting flags like
-     O_NONBLOCK etc.  */
-  if (flags != 0)
-    return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL);
-
-# ifdef __NR_signalfd
-  return INLINE_SYSCALL (signalfd, 3, fd, mask, _NSIG / 8);
-# else
-  return INLINE_SYSCALL_ERROR_RETURN_VALUE (ENOSYS);
-# endif
-#elif !defined __NR_signalfd4
-# error "__ASSUME_SIGNALFD4 defined but not __NR_signalfd4"
-#endif
+  return INLINE_SYSCALL (signalfd4, 4, fd, mask, _NSIG / 8, flags);
 }