This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
[glibc/azanella/bz12683] Remove sysdep-cancel header
- From: Adhemerval Zanella <azanella at sourceware dot org>
- To: glibc-cvs at sourceware dot org
- Date: 17 Oct 2019 13:58:35 -0000
- Subject: [glibc/azanella/bz12683] Remove sysdep-cancel header
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=63bec17cad1d5cc100ac62abe9db62208f4cdab5
commit 63bec17cad1d5cc100ac62abe9db62208f4cdab5
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Wed Aug 14 09:57:37 2019 -0300
Remove sysdep-cancel header
Now that single-thread optimization is provided by single-thread.h
header and the enable/disable asynchronous cancellation functions are
no longer used on cancellable syscalls, the header can be removed.
Checked with a build for all major Linux architectures and for hurd.
Diff:
---
elf/dl-close.c | 1 -
elf/dl-lookup.c | 1 -
elf/dl-open.c | 1 -
elf/dl-runtime.c | 1 -
elf/dl-scope.c | 1 -
elf/dl-sym.c | 1 -
io/creat.c | 1 -
io/ppoll.c | 1 -
malloc/malloc.c | 3 --
misc/pselect.c | 1 -
nptl/thrd_sleep.c | 1 -
sysdeps/generic/sysdep-cancel.h | 5 ---
sysdeps/mach/hurd/sysdep-cancel.h | 8 ----
sysdeps/mips/dl-trampoline.c | 1 -
sysdeps/posix/open64.c | 1 -
sysdeps/posix/pause.c | 1 -
sysdeps/posix/sigpause.c | 1 -
sysdeps/posix/sigwait.c | 1 -
sysdeps/posix/waitid.c | 1 -
sysdeps/unix/clock_nanosleep.c | 1 -
sysdeps/unix/sysv/linux/accept.c | 1 -
sysdeps/unix/sysv/linux/accept4.c | 1 -
sysdeps/unix/sysv/linux/access.c | 2 +-
sysdeps/unix/sysv/linux/alpha/select.c | 1 -
sysdeps/unix/sysv/linux/clock_nanosleep.c | 1 -
sysdeps/unix/sysv/linux/close.c | 1 -
sysdeps/unix/sysv/linux/close_nocancel.c | 1 -
sysdeps/unix/sysv/linux/connect.c | 1 -
sysdeps/unix/sysv/linux/copy_file_range.c | 1 -
sysdeps/unix/sysv/linux/creat.c | 1 -
sysdeps/unix/sysv/linux/creat64.c | 1 -
sysdeps/unix/sysv/linux/epoll_pwait.c | 1 -
sysdeps/unix/sysv/linux/epoll_wait.c | 1 -
sysdeps/unix/sysv/linux/fallocate.c | 1 -
sysdeps/unix/sysv/linux/fallocate64.c | 1 -
sysdeps/unix/sysv/linux/fcntl.c | 1 -
sysdeps/unix/sysv/linux/fcntl64.c | 1 -
sysdeps/unix/sysv/linux/fcntl_nocancel.c | 1 -
sysdeps/unix/sysv/linux/fdatasync.c | 2 +-
sysdeps/unix/sysv/linux/fsync.c | 2 +-
sysdeps/unix/sysv/linux/futex-internal.h | 1 -
sysdeps/unix/sysv/linux/getrandom.c | 1 -
sysdeps/unix/sysv/linux/lowlevellock-futex.h | 1 -
sysdeps/unix/sysv/linux/mq_timedreceive.c | 2 +-
sysdeps/unix/sysv/linux/mq_timedsend.c | 2 +-
sysdeps/unix/sysv/linux/msgrcv.c | 2 +-
sysdeps/unix/sysv/linux/msgsnd.c | 2 +-
sysdeps/unix/sysv/linux/msync.c | 2 +-
sysdeps/unix/sysv/linux/nanosleep.c | 3 +-
sysdeps/unix/sysv/linux/nanosleep_nocancel.c | 1 -
sysdeps/unix/sysv/linux/open.c | 3 +-
sysdeps/unix/sysv/linux/open64.c | 4 +-
sysdeps/unix/sysv/linux/open_by_handle_at.c | 2 +-
sysdeps/unix/sysv/linux/open_nocancel.c | 1 -
sysdeps/unix/sysv/linux/openat.c | 3 +-
sysdeps/unix/sysv/linux/openat64.c | 3 +-
sysdeps/unix/sysv/linux/openat64_nocancel.c | 1 -
sysdeps/unix/sysv/linux/openat_nocancel.c | 1 -
sysdeps/unix/sysv/linux/pause.c | 2 +-
sysdeps/unix/sysv/linux/pause_nocancel.c | 1 -
sysdeps/unix/sysv/linux/poll.c | 1 -
sysdeps/unix/sysv/linux/ppoll.c | 2 -
sysdeps/unix/sysv/linux/pread.c | 2 +-
sysdeps/unix/sysv/linux/pread64.c | 2 +-
sysdeps/unix/sysv/linux/preadv.c | 2 +-
sysdeps/unix/sysv/linux/preadv2.c | 2 +-
sysdeps/unix/sysv/linux/preadv64.c | 2 +-
sysdeps/unix/sysv/linux/preadv64v2.c | 2 +-
sysdeps/unix/sysv/linux/pselect.c | 2 -
sysdeps/unix/sysv/linux/pwrite.c | 2 +-
sysdeps/unix/sysv/linux/pwrite64.c | 2 +-
sysdeps/unix/sysv/linux/pwritev.c | 2 +-
sysdeps/unix/sysv/linux/pwritev2.c | 2 +-
sysdeps/unix/sysv/linux/pwritev64.c | 2 +-
sysdeps/unix/sysv/linux/pwritev64v2.c | 2 +-
sysdeps/unix/sysv/linux/read.c | 2 +-
sysdeps/unix/sysv/linux/read_nocancel.c | 1 -
sysdeps/unix/sysv/linux/readv.c | 2 +-
sysdeps/unix/sysv/linux/recv.c | 1 -
sysdeps/unix/sysv/linux/recvfrom.c | 1 -
sysdeps/unix/sysv/linux/recvmmsg.c | 1 -
sysdeps/unix/sysv/linux/recvmsg.c | 1 -
sysdeps/unix/sysv/linux/select.c | 1 -
sysdeps/unix/sysv/linux/send.c | 1 -
sysdeps/unix/sysv/linux/sendmmsg.c | 1 -
sysdeps/unix/sysv/linux/sendmsg.c | 1 -
sysdeps/unix/sysv/linux/sendto.c | 1 -
sysdeps/unix/sysv/linux/sigsuspend.c | 2 +-
sysdeps/unix/sysv/linux/sigtimedwait.c | 1 -
sysdeps/unix/sysv/linux/sigwait.c | 1 -
sysdeps/unix/sysv/linux/sigwaitinfo.c | 1 -
sysdeps/unix/sysv/linux/socketcall.h | 2 +
sysdeps/unix/sysv/linux/splice.c | 2 +-
sysdeps/unix/sysv/linux/sync_file_range.c | 2 +-
sysdeps/unix/sysv/linux/sysdep-cancel.h | 67 ----------------------------
sysdeps/unix/sysv/linux/tcdrain.c | 1 -
sysdeps/unix/sysv/linux/tee.c | 2 +-
sysdeps/unix/sysv/linux/timer_routines.c | 1 -
sysdeps/unix/sysv/linux/vmsplice.c | 2 +-
sysdeps/unix/sysv/linux/wait.c | 1 -
sysdeps/unix/sysv/linux/waitid.c | 1 -
sysdeps/unix/sysv/linux/waitpid.c | 1 -
sysdeps/unix/sysv/linux/waitpid_nocancel.c | 1 -
sysdeps/unix/sysv/linux/write.c | 2 +-
sysdeps/unix/sysv/linux/write_nocancel.c | 1 -
sysdeps/unix/sysv/linux/writev.c | 2 +-
106 files changed, 38 insertions(+), 192 deletions(-)
diff --git a/elf/dl-close.c b/elf/dl-close.c
index de91c28..dfe2bc9 100644
--- a/elf/dl-close.c
+++ b/elf/dl-close.c
@@ -29,7 +29,6 @@
#include <ldsodefs.h>
#include <sys/types.h>
#include <sys/mman.h>
-#include <sysdep-cancel.h>
#include <tls.h>
#include <stap-probe.h>
diff --git a/elf/dl-lookup.c b/elf/dl-lookup.c
index fd44cd4..ff5c811 100644
--- a/elf/dl-lookup.c
+++ b/elf/dl-lookup.c
@@ -24,7 +24,6 @@
#include <ldsodefs.h>
#include <dl-hash.h>
#include <dl-machine.h>
-#include <sysdep-cancel.h>
#include <libc-lock.h>
#include <tls.h>
#include <atomic.h>
diff --git a/elf/dl-open.c b/elf/dl-open.c
index a9fd4cb..2b35209 100644
--- a/elf/dl-open.c
+++ b/elf/dl-open.c
@@ -28,7 +28,6 @@
#include <sys/param.h>
#include <libc-lock.h>
#include <ldsodefs.h>
-#include <sysdep-cancel.h>
#include <tls.h>
#include <stap-probe.h>
#include <atomic.h>
diff --git a/elf/dl-runtime.c b/elf/dl-runtime.c
index 342b794..9dedd19 100644
--- a/elf/dl-runtime.c
+++ b/elf/dl-runtime.c
@@ -23,7 +23,6 @@
#include <unistd.h>
#include <sys/param.h>
#include <ldsodefs.h>
-#include <sysdep-cancel.h>
#include "dynamic-link.h"
#include <tls.h>
#include <dl-irel.h>
diff --git a/elf/dl-scope.c b/elf/dl-scope.c
index f4ba089..dff4b1b 100644
--- a/elf/dl-scope.c
+++ b/elf/dl-scope.c
@@ -18,7 +18,6 @@
#include <stdlib.h>
#include <ldsodefs.h>
-#include <sysdep-cancel.h>
int
diff --git a/elf/dl-sym.c b/elf/dl-sym.c
index 8209342..af1f854 100644
--- a/elf/dl-sym.c
+++ b/elf/dl-sym.c
@@ -25,7 +25,6 @@
#include <dlfcn.h>
#include <ldsodefs.h>
#include <dl-hash.h>
-#include <sysdep-cancel.h>
#include <dl-tls.h>
#include <dl-irel.h>
diff --git a/io/creat.c b/io/creat.c
index 8e4f0cf..3a93b09 100644
--- a/io/creat.c
+++ b/io/creat.c
@@ -17,7 +17,6 @@
#include <fcntl.h>
#include <sys/types.h>
-#include <sysdep-cancel.h>
#undef creat
diff --git a/io/ppoll.c b/io/ppoll.c
index a387924..f66913f 100644
--- a/io/ppoll.c
+++ b/io/ppoll.c
@@ -21,7 +21,6 @@
#include <signal.h>
#include <stddef.h> /* For NULL. */
#include <sys/poll.h>
-#include <sysdep-cancel.h>
int
diff --git a/malloc/malloc.c b/malloc/malloc.c
index 5d3e82a..69dac97 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -244,9 +244,6 @@
#include <malloc/malloc-internal.h>
-/* For SINGLE_THREAD_P. */
-#include <sysdep-cancel.h>
-
/*
Debugging:
diff --git a/misc/pselect.c b/misc/pselect.c
index 76ded85..f3939c9 100644
--- a/misc/pselect.c
+++ b/misc/pselect.c
@@ -21,7 +21,6 @@
#include <stddef.h> /* For NULL. */
#include <sys/time.h>
#include <sys/select.h>
-#include <sysdep-cancel.h>
/* Check the first NFDS descriptors each in READFDS (if not NULL) for read
diff --git a/nptl/thrd_sleep.c b/nptl/thrd_sleep.c
index 75c0d53..cfae149 100644
--- a/nptl/thrd_sleep.c
+++ b/nptl/thrd_sleep.c
@@ -17,7 +17,6 @@
<https://www.gnu.org/licenses/>. */
#include <time.h>
-#include <sysdep-cancel.h>
#include "thrd_priv.h"
diff --git a/sysdeps/generic/sysdep-cancel.h b/sysdeps/generic/sysdep-cancel.h
deleted file mode 100644
index 5c84b44..0000000
--- a/sysdeps/generic/sysdep-cancel.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <sysdep.h>
-
-/* No multi-thread handling enabled. */
-#define SINGLE_THREAD_P (1)
-#define RTLD_SINGLE_THREAD_P (1)
diff --git a/sysdeps/mach/hurd/sysdep-cancel.h b/sysdeps/mach/hurd/sysdep-cancel.h
deleted file mode 100644
index f686a39..0000000
--- a/sysdeps/mach/hurd/sysdep-cancel.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <sysdep.h>
-
-/* Always multi-thread (since there's at least the sig handler), but no
- handling enabled. */
-#define SINGLE_THREAD_P (0)
-#define RTLD_SINGLE_THREAD_P (0)
-#define LIBC_CANCEL_ASYNC() 0 /* Just a dummy value. */
-#define LIBC_CANCEL_RESET(val) ((void)(val)) /* Nothing, but evaluate it. */
diff --git a/sysdeps/mips/dl-trampoline.c b/sysdeps/mips/dl-trampoline.c
index 74a2bff..9655ec6 100644
--- a/sysdeps/mips/dl-trampoline.c
+++ b/sysdeps/mips/dl-trampoline.c
@@ -24,7 +24,6 @@
#include <elf.h>
#include <ldsodefs.h>
#include <dl-machine.h>
-#include <sysdep-cancel.h>
/* Get link map for callers object containing STUB_PC. */
static inline struct link_map *
diff --git a/sysdeps/posix/open64.c b/sysdeps/posix/open64.c
index d163b59..34b78a6 100644
--- a/sysdeps/posix/open64.c
+++ b/sysdeps/posix/open64.c
@@ -17,7 +17,6 @@
#include <fcntl.h>
#include <stdarg.h>
-#include <sysdep-cancel.h>
/* Open FILE with access OFLAG. If O_CREAT or O_TMPFILE is in OFLAG,
a third argument is the file protection. */
diff --git a/sysdeps/posix/pause.c b/sysdeps/posix/pause.c
index a3c050d..601a596 100644
--- a/sysdeps/posix/pause.c
+++ b/sysdeps/posix/pause.c
@@ -18,7 +18,6 @@
#include <signal.h>
#include <unistd.h>
-#include <sysdep-cancel.h>
#include <sigsetops.h>
/* Suspend the process until a signal arrives.
diff --git a/sysdeps/posix/sigpause.c b/sysdeps/posix/sigpause.c
index 2d11e01..a9e1576 100644
--- a/sysdeps/posix/sigpause.c
+++ b/sysdeps/posix/sigpause.c
@@ -22,7 +22,6 @@
#undef sigpause
#include <sigset-cvt-mask.h>
-#include <sysdep-cancel.h>
int
__sigpause (int sig_or_mask, int is_sig)
diff --git a/sysdeps/posix/sigwait.c b/sysdeps/posix/sigwait.c
index 675e59f..886fbab 100644
--- a/sysdeps/posix/sigwait.c
+++ b/sysdeps/posix/sigwait.c
@@ -20,7 +20,6 @@
#include <errno.h>
#include <signal.h>
#include <stddef.h> /* For NULL. */
-#include <sysdep-cancel.h>
/* This is our dummy signal handler we use here. */
static void ignore_signal (int sig);
diff --git a/sysdeps/posix/waitid.c b/sysdeps/posix/waitid.c
index 0942623..3dc0a7c 100644
--- a/sysdeps/posix/waitid.c
+++ b/sysdeps/posix/waitid.c
@@ -24,7 +24,6 @@
#include <stddef.h>
#include <sys/wait.h>
#include <sys/types.h>
-#include <sysdep-cancel.h>
#ifdef DO_WAITID
diff --git a/sysdeps/unix/clock_nanosleep.c b/sysdeps/unix/clock_nanosleep.c
index 95b4956..014a24a 100644
--- a/sysdeps/unix/clock_nanosleep.c
+++ b/sysdeps/unix/clock_nanosleep.c
@@ -19,7 +19,6 @@
#include <assert.h>
#include <errno.h>
#include <time.h>
-#include <sysdep-cancel.h>
#include <shlib-compat.h>
/* This implementation assumes that these is only a `nanosleep' system
diff --git a/sysdeps/unix/sysv/linux/accept.c b/sysdeps/unix/sysv/linux/accept.c
index 9fb6966..6dc00de 100644
--- a/sysdeps/unix/sysv/linux/accept.c
+++ b/sysdeps/unix/sysv/linux/accept.c
@@ -16,7 +16,6 @@
<https://www.gnu.org/licenses/>. */
#include <sys/socket.h>
-#include <sysdep-cancel.h>
#include <socketcall.h>
int
diff --git a/sysdeps/unix/sysv/linux/accept4.c b/sysdeps/unix/sysv/linux/accept4.c
index 963be98..e305ef4 100644
--- a/sysdeps/unix/sysv/linux/accept4.c
+++ b/sysdeps/unix/sysv/linux/accept4.c
@@ -20,7 +20,6 @@
#include <signal.h>
#include <sys/socket.h>
-#include <sysdep-cancel.h>
#include <sys/syscall.h>
#include <socketcall.h>
#include <kernel-features.h>
diff --git a/sysdeps/unix/sysv/linux/access.c b/sysdeps/unix/sysv/linux/access.c
index 690c99a..ef34824 100644
--- a/sysdeps/unix/sysv/linux/access.c
+++ b/sysdeps/unix/sysv/linux/access.c
@@ -18,7 +18,7 @@
#include <fcntl.h>
#include <unistd.h>
-#include <sysdep-cancel.h>
+#include <sysdep.h>
int
__access (const char *file, int type)
diff --git a/sysdeps/unix/sysv/linux/alpha/select.c b/sysdeps/unix/sysv/linux/alpha/select.c
index 2c4fc4c..e4ed853 100644
--- a/sysdeps/unix/sysv/linux/alpha/select.c
+++ b/sysdeps/unix/sysv/linux/alpha/select.c
@@ -20,7 +20,6 @@
#include <sys/types.h>
#include <sys/select.h>
#include <errno.h>
-#include <sysdep-cancel.h>
#include <shlib-compat.h>
int
diff --git a/sysdeps/unix/sysv/linux/clock_nanosleep.c b/sysdeps/unix/sysv/linux/clock_nanosleep.c
index 6cd2f20..7a5a735 100644
--- a/sysdeps/unix/sysv/linux/clock_nanosleep.c
+++ b/sysdeps/unix/sysv/linux/clock_nanosleep.c
@@ -18,7 +18,6 @@
#include <time.h>
#include <errno.h>
-#include <sysdep-cancel.h>
#include "kernel-posix-cpu-timers.h"
#include <shlib-compat.h>
diff --git a/sysdeps/unix/sysv/linux/close.c b/sysdeps/unix/sysv/linux/close.c
index 0e387a3..58818ea 100644
--- a/sysdeps/unix/sysv/linux/close.c
+++ b/sysdeps/unix/sysv/linux/close.c
@@ -17,7 +17,6 @@
<https://www.gnu.org/licenses/>. */
#include <unistd.h>
-#include <sysdep-cancel.h>
#include <not-cancel.h>
/* Close the file descriptor FD. */
diff --git a/sysdeps/unix/sysv/linux/close_nocancel.c b/sysdeps/unix/sysv/linux/close_nocancel.c
index bb28819..171dfc3 100644
--- a/sysdeps/unix/sysv/linux/close_nocancel.c
+++ b/sysdeps/unix/sysv/linux/close_nocancel.c
@@ -17,7 +17,6 @@
<https://www.gnu.org/licenses/>. */
#include <unistd.h>
-#include <sysdep-cancel.h>
#include <not-cancel.h>
int
diff --git a/sysdeps/unix/sysv/linux/connect.c b/sysdeps/unix/sysv/linux/connect.c
index 4ada430..ec95e4a 100644
--- a/sysdeps/unix/sysv/linux/connect.c
+++ b/sysdeps/unix/sysv/linux/connect.c
@@ -16,7 +16,6 @@
<https://www.gnu.org/licenses/>. */
#include <sys/socket.h>
-#include <sysdep-cancel.h>
#include <socketcall.h>
int
diff --git a/sysdeps/unix/sysv/linux/copy_file_range.c b/sysdeps/unix/sysv/linux/copy_file_range.c
index 9bbed6b..9361b8e 100644
--- a/sysdeps/unix/sysv/linux/copy_file_range.c
+++ b/sysdeps/unix/sysv/linux/copy_file_range.c
@@ -17,7 +17,6 @@
<https://www.gnu.org/licenses/>. */
#include <errno.h>
-#include <sysdep-cancel.h>
#include <unistd.h>
ssize_t
diff --git a/sysdeps/unix/sysv/linux/creat.c b/sysdeps/unix/sysv/linux/creat.c
index e555149..35ad075 100644
--- a/sysdeps/unix/sysv/linux/creat.c
+++ b/sysdeps/unix/sysv/linux/creat.c
@@ -19,7 +19,6 @@
#include <fcntl.h>
#include <sys/types.h>
-#include <sysdep-cancel.h>
#ifndef __OFF_T_MATCHES_OFF64_T
diff --git a/sysdeps/unix/sysv/linux/creat64.c b/sysdeps/unix/sysv/linux/creat64.c
index 6b95e7e..721ae13 100644
--- a/sysdeps/unix/sysv/linux/creat64.c
+++ b/sysdeps/unix/sysv/linux/creat64.c
@@ -18,7 +18,6 @@
#include <fcntl.h>
#include <sys/types.h>
-#include <sysdep-cancel.h>
/* Create FILE with protections MODE. */
int
diff --git a/sysdeps/unix/sysv/linux/epoll_pwait.c b/sysdeps/unix/sysv/linux/epoll_pwait.c
index 74d845f..ab7edb4 100644
--- a/sysdeps/unix/sysv/linux/epoll_pwait.c
+++ b/sysdeps/unix/sysv/linux/epoll_pwait.c
@@ -20,7 +20,6 @@
#include <unistd.h>
#include <sys/epoll.h>
-#include <sysdep-cancel.h>
#include <sys/syscall.h>
#ifdef __NR_epoll_pwait
diff --git a/sysdeps/unix/sysv/linux/epoll_wait.c b/sysdeps/unix/sysv/linux/epoll_wait.c
index 32406d4..5972990 100644
--- a/sysdeps/unix/sysv/linux/epoll_wait.c
+++ b/sysdeps/unix/sysv/linux/epoll_wait.c
@@ -21,7 +21,6 @@
#include <sys/types.h>
#include <sys/epoll.h>
-#include <sysdep-cancel.h>
int
epoll_wait (int epfd, struct epoll_event *events, int maxevents, int timeout)
diff --git a/sysdeps/unix/sysv/linux/fallocate.c b/sysdeps/unix/sysv/linux/fallocate.c
index bf1eefb..784fb09 100644
--- a/sysdeps/unix/sysv/linux/fallocate.c
+++ b/sysdeps/unix/sysv/linux/fallocate.c
@@ -17,7 +17,6 @@
#include <errno.h>
#include <fcntl.h>
-#include <sysdep-cancel.h>
#ifndef __OFF_T_MATCHES_OFF64_T
/* Reserve storage for the data of the file associated with FD. */
diff --git a/sysdeps/unix/sysv/linux/fallocate64.c b/sysdeps/unix/sysv/linux/fallocate64.c
index 3ffc4bc..b803b28 100644
--- a/sysdeps/unix/sysv/linux/fallocate64.c
+++ b/sysdeps/unix/sysv/linux/fallocate64.c
@@ -17,7 +17,6 @@
#include <errno.h>
#include <fcntl.h>
-#include <sysdep-cancel.h>
/* Reserve storage for the data of the file associated with FD. */
diff --git a/sysdeps/unix/sysv/linux/fcntl.c b/sysdeps/unix/sysv/linux/fcntl.c
index 48bda0d..19d688b 100644
--- a/sysdeps/unix/sysv/linux/fcntl.c
+++ b/sysdeps/unix/sysv/linux/fcntl.c
@@ -19,7 +19,6 @@
#include <fcntl.h>
#include <stdarg.h>
#include <errno.h>
-#include <sysdep-cancel.h>
#ifndef __OFF_T_MATCHES_OFF64_T
diff --git a/sysdeps/unix/sysv/linux/fcntl64.c b/sysdeps/unix/sysv/linux/fcntl64.c
index c66f1c4..42f0379 100644
--- a/sysdeps/unix/sysv/linux/fcntl64.c
+++ b/sysdeps/unix/sysv/linux/fcntl64.c
@@ -23,7 +23,6 @@
#undef __fcntl
#include <stdarg.h>
#include <errno.h>
-#include <sysdep-cancel.h>
#ifndef __NR_fcntl64
# define __NR_fcntl64 __NR_fcntl
diff --git a/sysdeps/unix/sysv/linux/fcntl_nocancel.c b/sysdeps/unix/sysv/linux/fcntl_nocancel.c
index d2f5c4f..187d27f 100644
--- a/sysdeps/unix/sysv/linux/fcntl_nocancel.c
+++ b/sysdeps/unix/sysv/linux/fcntl_nocancel.c
@@ -19,7 +19,6 @@
#include <fcntl.h>
#include <stdarg.h>
#include <errno.h>
-#include <sysdep-cancel.h>
#include <not-cancel.h>
#ifndef __NR_fcntl64
diff --git a/sysdeps/unix/sysv/linux/fdatasync.c b/sysdeps/unix/sysv/linux/fdatasync.c
index c6a02f2..afd4500 100644
--- a/sysdeps/unix/sysv/linux/fdatasync.c
+++ b/sysdeps/unix/sysv/linux/fdatasync.c
@@ -18,7 +18,7 @@
<https://www.gnu.org/licenses/>. */
#include <unistd.h>
-#include <sysdep-cancel.h>
+#include <sysdep.h>
/* Synchronize at least the data part of a file with the underlying
media. */
diff --git a/sysdeps/unix/sysv/linux/fsync.c b/sysdeps/unix/sysv/linux/fsync.c
index e4b6ee7..24789e2 100644
--- a/sysdeps/unix/sysv/linux/fsync.c
+++ b/sysdeps/unix/sysv/linux/fsync.c
@@ -18,7 +18,7 @@
<https://www.gnu.org/licenses/>. */
#include <unistd.h>
-#include <sysdep-cancel.h>
+#include <sysdep.h>
/* Make all changes done to FD actually appear on disk. */
int
diff --git a/sysdeps/unix/sysv/linux/futex-internal.h b/sysdeps/unix/sysv/linux/futex-internal.h
index b41a4d9..8b7ad1f 100644
--- a/sysdeps/unix/sysv/linux/futex-internal.h
+++ b/sysdeps/unix/sysv/linux/futex-internal.h
@@ -22,7 +22,6 @@
#include <sysdeps/nptl/futex-internal.h>
#include <errno.h>
#include <lowlevellock-futex.h>
-#include <sysdep-cancel.h>
/* See sysdeps/nptl/futex-internal.h for documentation; this file only
contains Linux-specific comments.
diff --git a/sysdeps/unix/sysv/linux/getrandom.c b/sysdeps/unix/sysv/linux/getrandom.c
index 122c695..c69a4c1 100644
--- a/sysdeps/unix/sysv/linux/getrandom.c
+++ b/sysdeps/unix/sysv/linux/getrandom.c
@@ -19,7 +19,6 @@
#include <sys/random.h>
#include <errno.h>
#include <unistd.h>
-#include <sysdep-cancel.h>
#ifdef __NR_getrandom
/* Write up to LENGTH bytes of randomness starting at BUFFER.
diff --git a/sysdeps/unix/sysv/linux/lowlevellock-futex.h b/sysdeps/unix/sysv/linux/lowlevellock-futex.h
index 0645e4e..11b6eb2 100644
--- a/sysdeps/unix/sysv/linux/lowlevellock-futex.h
+++ b/sysdeps/unix/sysv/linux/lowlevellock-futex.h
@@ -21,7 +21,6 @@
#ifndef __ASSEMBLER__
#include <sysdep.h>
-#include <sysdep-cancel.h>
#include <time.h>
#include <sysdeps/unix/sysdep.h>
#include <kernel-features.h>
diff --git a/sysdeps/unix/sysv/linux/mq_timedreceive.c b/sysdeps/unix/sysv/linux/mq_timedreceive.c
index 9957de4..4417d36 100644
--- a/sysdeps/unix/sysv/linux/mq_timedreceive.c
+++ b/sysdeps/unix/sysv/linux/mq_timedreceive.c
@@ -17,7 +17,7 @@
<https://www.gnu.org/licenses/>. */
#include <mqueue.h>
-#include <sysdep-cancel.h>
+#include <sysdep.h>
/* Receive the oldest from highest priority messages in message queue
MQDES, stop waiting if ABS_TIMEOUT expires. */
diff --git a/sysdeps/unix/sysv/linux/mq_timedsend.c b/sysdeps/unix/sysv/linux/mq_timedsend.c
index cd8f77d..1befb6b 100644
--- a/sysdeps/unix/sysv/linux/mq_timedsend.c
+++ b/sysdeps/unix/sysv/linux/mq_timedsend.c
@@ -17,7 +17,7 @@
<https://www.gnu.org/licenses/>. */
#include <mqueue.h>
-#include <sysdep-cancel.h>
+#include <sysdep.h>
/* Add message pointed by MSG_PTR to message queue MQDES, stop blocking
on full message queue if ABS_TIMEOUT expires. */
diff --git a/sysdeps/unix/sysv/linux/msgrcv.c b/sysdeps/unix/sysv/linux/msgrcv.c
index 1b06bd6..277c26d 100644
--- a/sysdeps/unix/sysv/linux/msgrcv.c
+++ b/sysdeps/unix/sysv/linux/msgrcv.c
@@ -18,7 +18,7 @@
#include <sys/msg.h>
#include <ipc_priv.h>
-#include <sysdep-cancel.h>
+#include <sysdep.h>
ssize_t
__libc_msgrcv (int msqid, void *msgp, size_t msgsz, long int msgtyp,
diff --git a/sysdeps/unix/sysv/linux/msgsnd.c b/sysdeps/unix/sysv/linux/msgsnd.c
index 28d46bd..2a4603f 100644
--- a/sysdeps/unix/sysv/linux/msgsnd.c
+++ b/sysdeps/unix/sysv/linux/msgsnd.c
@@ -18,7 +18,7 @@
#include <sys/msg.h>
#include <ipc_priv.h>
-#include <sysdep-cancel.h>
+#include <sysdep.h>
int
__libc_msgsnd (int msqid, const void *msgp, size_t msgsz, int msgflg)
diff --git a/sysdeps/unix/sysv/linux/msync.c b/sysdeps/unix/sysv/linux/msync.c
index 7a597b1..33a007a 100644
--- a/sysdeps/unix/sysv/linux/msync.c
+++ b/sysdeps/unix/sysv/linux/msync.c
@@ -17,7 +17,7 @@
<https://www.gnu.org/licenses/>. */
#include <sys/mman.h>
-#include <sysdep-cancel.h>
+#include <sysdep.h>
int
msync (void *addr, size_t length, int flags)
diff --git a/sysdeps/unix/sysv/linux/nanosleep.c b/sysdeps/unix/sysv/linux/nanosleep.c
index 6787909..4e08c67 100644
--- a/sysdeps/unix/sysv/linux/nanosleep.c
+++ b/sysdeps/unix/sysv/linux/nanosleep.c
@@ -17,8 +17,7 @@
<https://www.gnu.org/licenses/>. */
#include <time.h>
-#include <sysdep-cancel.h>
-#include <not-cancel.h>
+#include <sysdep.h>
/* Pause execution for a number of nanoseconds. */
int
diff --git a/sysdeps/unix/sysv/linux/nanosleep_nocancel.c b/sysdeps/unix/sysv/linux/nanosleep_nocancel.c
index d6442bf..74c9992 100644
--- a/sysdeps/unix/sysv/linux/nanosleep_nocancel.c
+++ b/sysdeps/unix/sysv/linux/nanosleep_nocancel.c
@@ -17,7 +17,6 @@
<https://www.gnu.org/licenses/>. */
#include <time.h>
-#include <sysdep-cancel.h>
#include <not-cancel.h>
int
diff --git a/sysdeps/unix/sysv/linux/open.c b/sysdeps/unix/sysv/linux/open.c
index a65aec4..0e14aa0 100644
--- a/sysdeps/unix/sysv/linux/open.c
+++ b/sysdeps/unix/sysv/linux/open.c
@@ -21,8 +21,7 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <stdarg.h>
-
-#include <sysdep-cancel.h>
+#include <sysdep.h>
#ifndef __OFF_T_MATCHES_OFF64_T
diff --git a/sysdeps/unix/sysv/linux/open64.c b/sysdeps/unix/sysv/linux/open64.c
index d6cefb0..d10609d 100644
--- a/sysdeps/unix/sysv/linux/open64.c
+++ b/sysdeps/unix/sysv/linux/open64.c
@@ -20,9 +20,7 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <stdarg.h>
-
-#include <sysdep-cancel.h>
-
+#include <sysdep.h>
#ifdef __OFF_T_MATCHES_OFF64_T
# define EXTRA_OPEN_FLAGS 0
diff --git a/sysdeps/unix/sysv/linux/open_by_handle_at.c b/sysdeps/unix/sysv/linux/open_by_handle_at.c
index 0888157..cfb5773 100644
--- a/sysdeps/unix/sysv/linux/open_by_handle_at.c
+++ b/sysdeps/unix/sysv/linux/open_by_handle_at.c
@@ -19,7 +19,7 @@
#include <fcntl.h>
#include <sys/types.h>
#include <sys/stat.h>
-#include <sysdep-cancel.h>
+#include <sysdep.h>
int
open_by_handle_at (int mount_fd, struct file_handle *handle, int flags)
diff --git a/sysdeps/unix/sysv/linux/open_nocancel.c b/sysdeps/unix/sysv/linux/open_nocancel.c
index 9926218..232423b 100644
--- a/sysdeps/unix/sysv/linux/open_nocancel.c
+++ b/sysdeps/unix/sysv/linux/open_nocancel.c
@@ -21,7 +21,6 @@
#include <fcntl.h>
#include <stdarg.h>
-#include <sysdep-cancel.h>
#include <not-cancel.h>
#ifndef __OFF_T_MATCHES_OFF64_T
diff --git a/sysdeps/unix/sysv/linux/openat.c b/sysdeps/unix/sysv/linux/openat.c
index a445044..0983ed9 100644
--- a/sysdeps/unix/sysv/linux/openat.c
+++ b/sysdeps/unix/sysv/linux/openat.c
@@ -18,8 +18,7 @@
#include <fcntl.h>
#include <stdarg.h>
-
-#include <sysdep-cancel.h>
+#include <sysdep.h>
#ifndef __OFF_T_MATCHES_OFF64_T
diff --git a/sysdeps/unix/sysv/linux/openat64.c b/sysdeps/unix/sysv/linux/openat64.c
index dbd893e..96d9608 100644
--- a/sysdeps/unix/sysv/linux/openat64.c
+++ b/sysdeps/unix/sysv/linux/openat64.c
@@ -18,8 +18,7 @@
#include <fcntl.h>
#include <stdarg.h>
-
-#include <sysdep-cancel.h>
+#include <sysdep.h>
#ifdef __OFF_T_MATCHES_OFF64_T
# define EXTRA_OPEN_FLAGS 0
diff --git a/sysdeps/unix/sysv/linux/openat64_nocancel.c b/sysdeps/unix/sysv/linux/openat64_nocancel.c
index cd077f2..97f4af4 100644
--- a/sysdeps/unix/sysv/linux/openat64_nocancel.c
+++ b/sysdeps/unix/sysv/linux/openat64_nocancel.c
@@ -19,7 +19,6 @@
#include <fcntl.h>
#include <stdarg.h>
-#include <sysdep-cancel.h>
#include <not-cancel.h>
#ifdef __OFF_T_MATCHES_OFF64_T
diff --git a/sysdeps/unix/sysv/linux/openat_nocancel.c b/sysdeps/unix/sysv/linux/openat_nocancel.c
index 25db90c..17c8d29 100644
--- a/sysdeps/unix/sysv/linux/openat_nocancel.c
+++ b/sysdeps/unix/sysv/linux/openat_nocancel.c
@@ -19,7 +19,6 @@
#include <fcntl.h>
#include <stdarg.h>
-#include <sysdep-cancel.h>
#include <not-cancel.h>
#ifndef __OFF_T_MATCHES_OFF64_T
diff --git a/sysdeps/unix/sysv/linux/pause.c b/sysdeps/unix/sysv/linux/pause.c
index c2b9f4f..2f5861f 100644
--- a/sysdeps/unix/sysv/linux/pause.c
+++ b/sysdeps/unix/sysv/linux/pause.c
@@ -18,7 +18,7 @@
#include <signal.h>
#include <unistd.h>
-#include <sysdep-cancel.h>
+#include <sysdep.h>
/* Suspend the process until a signal arrives.
This always returns -1 and sets errno to EINTR. */
diff --git a/sysdeps/unix/sysv/linux/pause_nocancel.c b/sysdeps/unix/sysv/linux/pause_nocancel.c
index 04f6fcf..dffb075 100644
--- a/sysdeps/unix/sysv/linux/pause_nocancel.c
+++ b/sysdeps/unix/sysv/linux/pause_nocancel.c
@@ -18,7 +18,6 @@
#include <signal.h>
#include <unistd.h>
-#include <sysdep-cancel.h>
#include <not-cancel.h>
int
diff --git a/sysdeps/unix/sysv/linux/poll.c b/sysdeps/unix/sysv/linux/poll.c
index 8ea0056..8f66655 100644
--- a/sysdeps/unix/sysv/linux/poll.c
+++ b/sysdeps/unix/sysv/linux/poll.c
@@ -19,7 +19,6 @@
#include <errno.h>
#include <sys/poll.h>
-#include <sysdep-cancel.h>
#include <sys/syscall.h>
int
diff --git a/sysdeps/unix/sysv/linux/ppoll.c b/sysdeps/unix/sysv/linux/ppoll.c
index 8a6ccd1..e9ffd51 100644
--- a/sysdeps/unix/sysv/linux/ppoll.c
+++ b/sysdeps/unix/sysv/linux/ppoll.c
@@ -20,8 +20,6 @@
#include <signal.h>
#include <time.h>
#include <sys/poll.h>
-#include <sysdep-cancel.h>
-
int
ppoll (struct pollfd *fds, nfds_t nfds, const struct timespec *timeout,
diff --git a/sysdeps/unix/sysv/linux/pread.c b/sysdeps/unix/sysv/linux/pread.c
index d9faf3c..cfc6859 100644
--- a/sysdeps/unix/sysv/linux/pread.c
+++ b/sysdeps/unix/sysv/linux/pread.c
@@ -17,7 +17,7 @@
<https://www.gnu.org/licenses/>. */
#include <unistd.h>
-#include <sysdep-cancel.h>
+#include <sysdep.h>
#ifndef __OFF_T_MATCHES_OFF64_T
diff --git a/sysdeps/unix/sysv/linux/pread64.c b/sysdeps/unix/sysv/linux/pread64.c
index 3641029..db452ba 100644
--- a/sysdeps/unix/sysv/linux/pread64.c
+++ b/sysdeps/unix/sysv/linux/pread64.c
@@ -17,7 +17,7 @@
<https://www.gnu.org/licenses/>. */
#include <unistd.h>
-#include <sysdep-cancel.h>
+#include <sysdep.h>
#ifndef __NR_pread64
# define __NR_pread64 __NR_pread
diff --git a/sysdeps/unix/sysv/linux/preadv.c b/sysdeps/unix/sysv/linux/preadv.c
index 61007df..8794c2b 100644
--- a/sysdeps/unix/sysv/linux/preadv.c
+++ b/sysdeps/unix/sysv/linux/preadv.c
@@ -16,7 +16,7 @@
<https://www.gnu.org/licenses/>. */
#include <sys/uio.h>
-#include <sysdep-cancel.h>
+#include <sysdep.h>
#ifndef __OFF_T_MATCHES_OFF64_T
diff --git a/sysdeps/unix/sysv/linux/preadv2.c b/sysdeps/unix/sysv/linux/preadv2.c
index 9e3205b..5c2c375 100644
--- a/sysdeps/unix/sysv/linux/preadv2.c
+++ b/sysdeps/unix/sysv/linux/preadv2.c
@@ -17,7 +17,7 @@
<https://www.gnu.org/licenses/>. */
#include <sys/uio.h>
-#include <sysdep-cancel.h>
+#include <sysdep.h>
#ifndef __OFF_T_MATCHES_OFF64_T
diff --git a/sysdeps/unix/sysv/linux/preadv64.c b/sysdeps/unix/sysv/linux/preadv64.c
index 4b0a66f..3f99ed2 100644
--- a/sysdeps/unix/sysv/linux/preadv64.c
+++ b/sysdeps/unix/sysv/linux/preadv64.c
@@ -16,7 +16,7 @@
<https://www.gnu.org/licenses/>. */
#include <sys/uio.h>
-#include <sysdep-cancel.h>
+#include <sysdep.h>
#ifdef __ASSUME_PREADV
diff --git a/sysdeps/unix/sysv/linux/preadv64v2.c b/sysdeps/unix/sysv/linux/preadv64v2.c
index 724f03d..44cd74e 100644
--- a/sysdeps/unix/sysv/linux/preadv64v2.c
+++ b/sysdeps/unix/sysv/linux/preadv64v2.c
@@ -17,7 +17,7 @@
<https://www.gnu.org/licenses/>. */
#include <sys/uio.h>
-#include <sysdep-cancel.h>
+#include <sysdep.h>
#if !defined(__NR_preadv64v2) && defined(__NR_preadv2)
# define __NR_preadv64v2 __NR_preadv2
diff --git a/sysdeps/unix/sysv/linux/pselect.c b/sysdeps/unix/sysv/linux/pselect.c
index d07d641..f929ff2 100644
--- a/sysdeps/unix/sysv/linux/pselect.c
+++ b/sysdeps/unix/sysv/linux/pselect.c
@@ -21,8 +21,6 @@
#include <time.h>
#include <sys/poll.h>
#include <kernel-features.h>
-#include <sysdep-cancel.h>
-
#ifdef __NR_pselect6
# ifndef __ASSUME_PSELECT
diff --git a/sysdeps/unix/sysv/linux/pwrite.c b/sysdeps/unix/sysv/linux/pwrite.c
index ddfbdef..c59290d 100644
--- a/sysdeps/unix/sysv/linux/pwrite.c
+++ b/sysdeps/unix/sysv/linux/pwrite.c
@@ -17,7 +17,7 @@
<https://www.gnu.org/licenses/>. */
#include <unistd.h>
-#include <sysdep-cancel.h>
+#include <sysdep.h>
#ifndef __OFF_T_MATCHES_OFF64_T
diff --git a/sysdeps/unix/sysv/linux/pwrite64.c b/sysdeps/unix/sysv/linux/pwrite64.c
index db8661c..d5ba778 100644
--- a/sysdeps/unix/sysv/linux/pwrite64.c
+++ b/sysdeps/unix/sysv/linux/pwrite64.c
@@ -17,7 +17,7 @@
<https://www.gnu.org/licenses/>. */
#include <unistd.h>
-#include <sysdep-cancel.h>
+#include <sysdep.h>
#ifndef __NR_pwrite64
# define __NR_pwrite64 __NR_pwrite
diff --git a/sysdeps/unix/sysv/linux/pwritev.c b/sysdeps/unix/sysv/linux/pwritev.c
index ed25289..45a8018 100644
--- a/sysdeps/unix/sysv/linux/pwritev.c
+++ b/sysdeps/unix/sysv/linux/pwritev.c
@@ -16,7 +16,7 @@
<https://www.gnu.org/licenses/>. */
#include <sys/uio.h>
-#include <sysdep-cancel.h>
+#include <sysdep.h>
#ifndef __OFF_T_MATCHES_OFF64_T
diff --git a/sysdeps/unix/sysv/linux/pwritev2.c b/sysdeps/unix/sysv/linux/pwritev2.c
index a415b2f..ccd099a 100644
--- a/sysdeps/unix/sysv/linux/pwritev2.c
+++ b/sysdeps/unix/sysv/linux/pwritev2.c
@@ -17,7 +17,7 @@
<https://www.gnu.org/licenses/>. */
#include <sys/uio.h>
-#include <sysdep-cancel.h>
+#include <sysdep.h>
#ifndef __OFF_T_MATCHES_OFF64_T
diff --git a/sysdeps/unix/sysv/linux/pwritev64.c b/sysdeps/unix/sysv/linux/pwritev64.c
index ec9987f..50f7774 100644
--- a/sysdeps/unix/sysv/linux/pwritev64.c
+++ b/sysdeps/unix/sysv/linux/pwritev64.c
@@ -16,7 +16,7 @@
<https://www.gnu.org/licenses/>. */
#include <sys/uio.h>
-#include <sysdep-cancel.h>
+#include <sysdep.h>
#ifdef __ASSUME_PWRITEV
diff --git a/sysdeps/unix/sysv/linux/pwritev64v2.c b/sysdeps/unix/sysv/linux/pwritev64v2.c
index 5683220..329bb82 100644
--- a/sysdeps/unix/sysv/linux/pwritev64v2.c
+++ b/sysdeps/unix/sysv/linux/pwritev64v2.c
@@ -17,7 +17,7 @@
<https://www.gnu.org/licenses/>. */
#include <sys/uio.h>
-#include <sysdep-cancel.h>
+#include <sysdep.h>
#if !defined(__NR_pwritev64v2) && defined(__NR_pwritev2)
# define __NR_pwritev64v2 __NR_pwritev2
diff --git a/sysdeps/unix/sysv/linux/read.c b/sysdeps/unix/sysv/linux/read.c
index 147d45f..4d49efa 100644
--- a/sysdeps/unix/sysv/linux/read.c
+++ b/sysdeps/unix/sysv/linux/read.c
@@ -17,7 +17,7 @@
<https://www.gnu.org/licenses/>. */
#include <unistd.h>
-#include <sysdep-cancel.h>
+#include <sysdep.h>
/* Read NBYTES into BUF from FD. Return the number read or -1. */
ssize_t
diff --git a/sysdeps/unix/sysv/linux/read_nocancel.c b/sysdeps/unix/sysv/linux/read_nocancel.c
index 9d2a5ee..71f7b87 100644
--- a/sysdeps/unix/sysv/linux/read_nocancel.c
+++ b/sysdeps/unix/sysv/linux/read_nocancel.c
@@ -17,7 +17,6 @@
<https://www.gnu.org/licenses/>. */
#include <unistd.h>
-#include <sysdep-cancel.h>
#include <not-cancel.h>
ssize_t
diff --git a/sysdeps/unix/sysv/linux/readv.c b/sysdeps/unix/sysv/linux/readv.c
index c0bd1ed..0ed6d91 100644
--- a/sysdeps/unix/sysv/linux/readv.c
+++ b/sysdeps/unix/sysv/linux/readv.c
@@ -18,7 +18,7 @@
#include <unistd.h>
#include <sys/uio.h>
-#include <sysdep-cancel.h>
+#include <sysdep.h>
ssize_t
__readv (int fd, const struct iovec *iov, int iovcnt)
diff --git a/sysdeps/unix/sysv/linux/recv.c b/sysdeps/unix/sysv/linux/recv.c
index 5b28449..de4dbc4 100644
--- a/sysdeps/unix/sysv/linux/recv.c
+++ b/sysdeps/unix/sysv/linux/recv.c
@@ -16,7 +16,6 @@
<https://www.gnu.org/licenses/>. */
#include <sys/socket.h>
-#include <sysdep-cancel.h>
#include <socketcall.h>
ssize_t
diff --git a/sysdeps/unix/sysv/linux/recvfrom.c b/sysdeps/unix/sysv/linux/recvfrom.c
index 59115ec..6fabaea 100644
--- a/sysdeps/unix/sysv/linux/recvfrom.c
+++ b/sysdeps/unix/sysv/linux/recvfrom.c
@@ -16,7 +16,6 @@
<https://www.gnu.org/licenses/>. */
#include <sys/socket.h>
-#include <sysdep-cancel.h>
#include <socketcall.h>
ssize_t
diff --git a/sysdeps/unix/sysv/linux/recvmmsg.c b/sysdeps/unix/sysv/linux/recvmmsg.c
index bcb5a97..157899c 100644
--- a/sysdeps/unix/sysv/linux/recvmmsg.c
+++ b/sysdeps/unix/sysv/linux/recvmmsg.c
@@ -19,7 +19,6 @@
#include <errno.h>
#include <sys/socket.h>
-#include <sysdep-cancel.h>
#include <sys/syscall.h>
#include <socketcall.h>
#include <kernel-features.h>
diff --git a/sysdeps/unix/sysv/linux/recvmsg.c b/sysdeps/unix/sysv/linux/recvmsg.c
index f7ae2b9..a0c17b5 100644
--- a/sysdeps/unix/sysv/linux/recvmsg.c
+++ b/sysdeps/unix/sysv/linux/recvmsg.c
@@ -17,7 +17,6 @@
<https://www.gnu.org/licenses/>. */
#include <sys/socket.h>
-#include <sysdep-cancel.h>
#include <socketcall.h>
#include <shlib-compat.h>
diff --git a/sysdeps/unix/sysv/linux/select.c b/sysdeps/unix/sysv/linux/select.c
index 0498970..ef19288 100644
--- a/sysdeps/unix/sysv/linux/select.c
+++ b/sysdeps/unix/sysv/linux/select.c
@@ -20,7 +20,6 @@
#include <sys/types.h>
#include <sys/select.h>
#include <errno.h>
-#include <sysdep-cancel.h>
/* Check the first NFDS descriptors each in READFDS (if not NULL) for read
readiness, in WRITEFDS (if not NULL) for write readiness, and in EXCEPTFDS
diff --git a/sysdeps/unix/sysv/linux/send.c b/sysdeps/unix/sysv/linux/send.c
index 0eaca76..bee607d 100644
--- a/sysdeps/unix/sysv/linux/send.c
+++ b/sysdeps/unix/sysv/linux/send.c
@@ -16,7 +16,6 @@
<https://www.gnu.org/licenses/>. */
#include <sys/socket.h>
-#include <sysdep-cancel.h>
#include <socketcall.h>
ssize_t
diff --git a/sysdeps/unix/sysv/linux/sendmmsg.c b/sysdeps/unix/sysv/linux/sendmmsg.c
index c53c1b2..94d7850 100644
--- a/sysdeps/unix/sysv/linux/sendmmsg.c
+++ b/sysdeps/unix/sysv/linux/sendmmsg.c
@@ -19,7 +19,6 @@
#include <errno.h>
#include <sys/socket.h>
-#include <sysdep-cancel.h>
#include <sys/syscall.h>
#include <socketcall.h>
#include <kernel-features.h>
diff --git a/sysdeps/unix/sysv/linux/sendmsg.c b/sysdeps/unix/sysv/linux/sendmsg.c
index 42c4250..827418a 100644
--- a/sysdeps/unix/sysv/linux/sendmsg.c
+++ b/sysdeps/unix/sysv/linux/sendmsg.c
@@ -17,7 +17,6 @@
<https://www.gnu.org/licenses/>. */
#include <sys/socket.h>
-#include <sysdep-cancel.h>
#include <socketcall.h>
#include <shlib-compat.h>
diff --git a/sysdeps/unix/sysv/linux/sendto.c b/sysdeps/unix/sysv/linux/sendto.c
index 78e3b6b..8e91187 100644
--- a/sysdeps/unix/sysv/linux/sendto.c
+++ b/sysdeps/unix/sysv/linux/sendto.c
@@ -16,7 +16,6 @@
<https://www.gnu.org/licenses/>. */
#include <sys/socket.h>
-#include <sysdep-cancel.h>
#include <socketcall.h>
ssize_t
diff --git a/sysdeps/unix/sysv/linux/sigsuspend.c b/sysdeps/unix/sysv/linux/sigsuspend.c
index 40e1e25..e707099 100644
--- a/sysdeps/unix/sysv/linux/sigsuspend.c
+++ b/sysdeps/unix/sysv/linux/sigsuspend.c
@@ -16,7 +16,7 @@
<https://www.gnu.org/licenses/>. */
#include <signal.h>
-#include <sysdep-cancel.h>
+#include <sysdep.h>
/* Change the set of blocked signals to SET,
wait until a signal arrives, and restore the set of blocked signals. */
diff --git a/sysdeps/unix/sysv/linux/sigtimedwait.c b/sysdeps/unix/sysv/linux/sigtimedwait.c
index 30fc82a..b69705e 100644
--- a/sysdeps/unix/sysv/linux/sigtimedwait.c
+++ b/sysdeps/unix/sysv/linux/sigtimedwait.c
@@ -18,7 +18,6 @@
#include <errno.h>
#include <signal.h>
#include <string.h>
-#include <sysdep-cancel.h>
int
__sigtimedwait (const sigset_t *set, siginfo_t *info,
diff --git a/sysdeps/unix/sysv/linux/sigwait.c b/sysdeps/unix/sysv/linux/sigwait.c
index 360a4d0..420642a 100644
--- a/sysdeps/unix/sysv/linux/sigwait.c
+++ b/sysdeps/unix/sysv/linux/sigwait.c
@@ -16,7 +16,6 @@
<https://www.gnu.org/licenses/>. */
#include <signal.h>
-#include <sysdep-cancel.h>
#include <errno.h>
int
diff --git a/sysdeps/unix/sysv/linux/sigwaitinfo.c b/sysdeps/unix/sysv/linux/sigwaitinfo.c
index 64735e4..8a95b20 100644
--- a/sysdeps/unix/sysv/linux/sigwaitinfo.c
+++ b/sysdeps/unix/sysv/linux/sigwaitinfo.c
@@ -16,7 +16,6 @@
<https://www.gnu.org/licenses/>. */
#include <signal.h>
-#include <sysdep-cancel.h>
/* Return any pending signal or wait for one for the given time. */
int
diff --git a/sysdeps/unix/sysv/linux/socketcall.h b/sysdeps/unix/sysv/linux/socketcall.h
index 38af55f..5d345b6 100644
--- a/sysdeps/unix/sysv/linux/socketcall.h
+++ b/sysdeps/unix/sysv/linux/socketcall.h
@@ -19,6 +19,8 @@
#ifndef _SYS_SOCKETCALL_H
#define _SYS_SOCKETCALL_H 1
+#include <sysdep.h>
+
/* Define unique numbers for the operations permitted on socket. Linux
uses a single system call for all these functions. The relevant code
file is /usr/include/linux/net.h.
diff --git a/sysdeps/unix/sysv/linux/splice.c b/sysdeps/unix/sysv/linux/splice.c
index d9be756..804e91d 100644
--- a/sysdeps/unix/sysv/linux/splice.c
+++ b/sysdeps/unix/sysv/linux/splice.c
@@ -17,7 +17,7 @@
<https://www.gnu.org/licenses/>. */
#include <fcntl.h>
-#include <sysdep-cancel.h>
+#include <sysdep.h>
ssize_t
splice (int fd_in, loff_t *off_in, int fd_out, loff_t *off_out, size_t len,
diff --git a/sysdeps/unix/sysv/linux/sync_file_range.c b/sysdeps/unix/sysv/linux/sync_file_range.c
index 48ef674..4649afe 100644
--- a/sysdeps/unix/sysv/linux/sync_file_range.c
+++ b/sysdeps/unix/sysv/linux/sync_file_range.c
@@ -17,7 +17,7 @@
<https://www.gnu.org/licenses/>. */
#include <fcntl.h>
-#include <sysdep-cancel.h>
+#include <sysdep.h>
int
sync_file_range (int fd, __off64_t offset, __off64_t len, unsigned int flags)
diff --git a/sysdeps/unix/sysv/linux/sysdep-cancel.h b/sysdeps/unix/sysv/linux/sysdep-cancel.h
deleted file mode 100644
index c861303..0000000
--- a/sysdeps/unix/sysv/linux/sysdep-cancel.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Single-thread optimization definitions. Linux version.
- Copyright (C) 2017-2019 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
- <https://www.gnu.org/licenses/>. */
-
-#ifndef _SYSDEP_CANCEL_H
-#define _SYSDEP_CANCEL_H
-
-#include <sysdep.h>
-#include <tls.h>
-#include <errno.h>
-
-/* The two functions are in libc.so and not exported. */
-extern int __libc_enable_asynccancel (void) attribute_hidden;
-extern void __libc_disable_asynccancel (int oldtype) attribute_hidden;
-
-/* The two functions are in librt.so and not exported. */
-extern int __librt_enable_asynccancel (void) attribute_hidden;
-extern void __librt_disable_asynccancel (int oldtype) attribute_hidden;
-
-/* The two functions are in libpthread.so and not exported. */
-extern int __pthread_enable_asynccancel (void) attribute_hidden;
-extern void __pthread_disable_asynccancel (int oldtype) attribute_hidden;
-
-/* Set cancellation mode to asynchronous. */
-#define CANCEL_ASYNC() \
- __pthread_enable_asynccancel ()
-/* Reset to previous cancellation mode. */
-#define CANCEL_RESET(oldtype) \
- __pthread_disable_asynccancel (oldtype)
-
-#if IS_IN (libc)
-/* Same as CANCEL_ASYNC, but for use in libc.so. */
-# define LIBC_CANCEL_ASYNC() \
- __libc_enable_asynccancel ()
-/* Same as CANCEL_RESET, but for use in libc.so. */
-# define LIBC_CANCEL_RESET(oldtype) \
- __libc_disable_asynccancel (oldtype)
-#elif IS_IN (libpthread)
-# define LIBC_CANCEL_ASYNC() CANCEL_ASYNC ()
-# define LIBC_CANCEL_RESET(val) CANCEL_RESET (val)
-#elif IS_IN (librt)
-# define LIBC_CANCEL_ASYNC() \
- __librt_enable_asynccancel ()
-# define LIBC_CANCEL_RESET(val) \
- __librt_disable_asynccancel (val)
-#else
-# define LIBC_CANCEL_ASYNC() 0 /* Just a dummy value. */
-# define LIBC_CANCEL_RESET(val) ((void)(val)) /* Nothing, but evaluate it. */
-#endif
-
-
-#endif
diff --git a/sysdeps/unix/sysv/linux/tcdrain.c b/sysdeps/unix/sysv/linux/tcdrain.c
index b3691d0..70519f2 100644
--- a/sysdeps/unix/sysv/linux/tcdrain.c
+++ b/sysdeps/unix/sysv/linux/tcdrain.c
@@ -18,7 +18,6 @@
#include <errno.h>
#include <termios.h>
#include <sys/ioctl.h>
-#include <sysdep-cancel.h>
/* Wait for pending output to be written on FD. */
int
diff --git a/sysdeps/unix/sysv/linux/tee.c b/sysdeps/unix/sysv/linux/tee.c
index 97228e3..4eba39c 100644
--- a/sysdeps/unix/sysv/linux/tee.c
+++ b/sysdeps/unix/sysv/linux/tee.c
@@ -17,7 +17,7 @@
<https://www.gnu.org/licenses/>. */
#include <fcntl.h>
-#include <sysdep-cancel.h>
+#include <sysdep.h>
ssize_t
tee (int src, int dest, size_t len, unsigned int flags)
diff --git a/sysdeps/unix/sysv/linux/timer_routines.c b/sysdeps/unix/sysv/linux/timer_routines.c
index d96d963..40e3460 100644
--- a/sysdeps/unix/sysv/linux/timer_routines.c
+++ b/sysdeps/unix/sysv/linux/timer_routines.c
@@ -20,7 +20,6 @@
#include <setjmp.h>
#include <signal.h>
#include <stdbool.h>
-#include <sysdep-cancel.h>
#include <nptl/pthreadP.h>
#include "kernel-posix-timers.h"
diff --git a/sysdeps/unix/sysv/linux/vmsplice.c b/sysdeps/unix/sysv/linux/vmsplice.c
index 706b933..cff5aff 100644
--- a/sysdeps/unix/sysv/linux/vmsplice.c
+++ b/sysdeps/unix/sysv/linux/vmsplice.c
@@ -18,7 +18,7 @@
#include <fcntl.h>
#include <sys/uio.h>
-#include <sysdep-cancel.h>
+#include <sysdep.h>
ssize_t
vmsplice (int fd, const struct iovec *iov, size_t count, unsigned int flags)
diff --git a/sysdeps/unix/sysv/linux/wait.c b/sysdeps/unix/sysv/linux/wait.c
index c2385c7..36deddf 100644
--- a/sysdeps/unix/sysv/linux/wait.c
+++ b/sysdeps/unix/sysv/linux/wait.c
@@ -19,7 +19,6 @@
#include <errno.h>
#include <sys/resource.h>
#include <stddef.h>
-#include <sysdep-cancel.h>
/* Wait for a child to die. When one does, put its status in *STAT_LOC
and return its process ID. For errors, return (pid_t) -1. */
diff --git a/sysdeps/unix/sysv/linux/waitid.c b/sysdeps/unix/sysv/linux/waitid.c
index e563d3e..45b7baf 100644
--- a/sysdeps/unix/sysv/linux/waitid.c
+++ b/sysdeps/unix/sysv/linux/waitid.c
@@ -19,7 +19,6 @@
#include <stddef.h>
#include <errno.h>
#include <sys/wait.h>
-#include <sysdep-cancel.h>
int
__waitid (idtype_t idtype, id_t id, siginfo_t *infop, int options)
diff --git a/sysdeps/unix/sysv/linux/waitpid.c b/sysdeps/unix/sysv/linux/waitpid.c
index d35aac0..dbd816d 100644
--- a/sysdeps/unix/sysv/linux/waitpid.c
+++ b/sysdeps/unix/sysv/linux/waitpid.c
@@ -17,7 +17,6 @@
<https://www.gnu.org/licenses/>. */
#include <errno.h>
-#include <sysdep-cancel.h>
#include <stdlib.h>
#include <sys/wait.h>
diff --git a/sysdeps/unix/sysv/linux/waitpid_nocancel.c b/sysdeps/unix/sysv/linux/waitpid_nocancel.c
index 3697c6b..82e4fc6 100644
--- a/sysdeps/unix/sysv/linux/waitpid_nocancel.c
+++ b/sysdeps/unix/sysv/linux/waitpid_nocancel.c
@@ -17,7 +17,6 @@
<https://www.gnu.org/licenses/>. */
#include <errno.h>
-#include <sysdep-cancel.h>
#include <stdlib.h>
#include <sys/wait.h>
#include <not-cancel.h>
diff --git a/sysdeps/unix/sysv/linux/write.c b/sysdeps/unix/sysv/linux/write.c
index 1dfb5de..15dc0fd 100644
--- a/sysdeps/unix/sysv/linux/write.c
+++ b/sysdeps/unix/sysv/linux/write.c
@@ -17,7 +17,7 @@
<https://www.gnu.org/licenses/>. */
#include <unistd.h>
-#include <sysdep-cancel.h>
+#include <sysdep.h>
/* Write NBYTES of BUF to FD. Return the number written, or -1. */
ssize_t
diff --git a/sysdeps/unix/sysv/linux/write_nocancel.c b/sysdeps/unix/sysv/linux/write_nocancel.c
index f57b53e..589ec6d 100644
--- a/sysdeps/unix/sysv/linux/write_nocancel.c
+++ b/sysdeps/unix/sysv/linux/write_nocancel.c
@@ -17,7 +17,6 @@
<https://www.gnu.org/licenses/>. */
#include <unistd.h>
-#include <sysdep-cancel.h>
#include <not-cancel.h>
ssize_t
diff --git a/sysdeps/unix/sysv/linux/writev.c b/sysdeps/unix/sysv/linux/writev.c
index 77fc9c9..e0621c8 100644
--- a/sysdeps/unix/sysv/linux/writev.c
+++ b/sysdeps/unix/sysv/linux/writev.c
@@ -18,7 +18,7 @@
#include <unistd.h>
#include <sys/uio.h>
-#include <sysdep-cancel.h>
+#include <sysdep.h>
ssize_t
__writev (int fd, const struct iovec *iov, int iovcnt)