| Message ID | 20200403203201.7494-22-adhemerval.zanella@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | nptl: Fix Race conditions in pthread cancellation [BZ#12683] | expand |
diff --git a/elf/dl-close.c b/elf/dl-close.c index 73b2817bbf..eb3aa6daae 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 12a229f06c..54216db4fa 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 7b3b177aa6..a771c76dcd 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 cf5f1d3e82..58679fd3e0 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 b20a882799..637b3a2639 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 361b926ea9..4134145cac 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> #include <dl-sym-post.h> diff --git a/io/creat.c b/io/creat.c index cf72a9451a..4dab1f3a19 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 2b880426fc..2871623775 100644 --- a/io/ppoll.c +++ b/io/ppoll.c @@ -21,8 +21,6 @@ #include <signal.h> #include <stddef.h> /* For NULL. */ #include <sys/poll.h> -#include <sysdep-cancel.h> -#include <time.h> int diff --git a/malloc/malloc.c b/malloc/malloc.c index 6acb5ad43a..2e165c00fa 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/posix/nanosleep.c b/posix/nanosleep.c index 120a288322..afe1733a16 100644 --- a/posix/nanosleep.c +++ b/posix/nanosleep.c @@ -18,7 +18,6 @@ #include <errno.h> #include <time.h> - /* Pause execution for a number of nanoseconds. */ int __nanosleep (const struct timespec *requested_time, diff --git a/sysdeps/generic/sysdep-cancel.h b/sysdeps/generic/sysdep-cancel.h deleted file mode 100644 index 5c84b4499a..0000000000 --- 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/mips/dl-trampoline.c b/sysdeps/mips/dl-trampoline.c index 3289e04ff5..7ba1fd98bf 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/nptl/lowlevellock-futex.h b/sysdeps/nptl/lowlevellock-futex.h index 4b72deda95..2260b55ada 100644 --- a/sysdeps/nptl/lowlevellock-futex.h +++ b/sysdeps/nptl/lowlevellock-futex.h @@ -21,7 +21,6 @@ #ifndef __ASSEMBLER__ # include <sysdep.h> -# include <sysdep-cancel.h> # include <kernel-features.h> #endif diff --git a/sysdeps/posix/open64.c b/sysdeps/posix/open64.c index abd6ef3709..371905c0e9 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 42aa2598f2..2ad2b771f9 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 ad803cca93..d45063323b 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 64c6054caa..e7741bec78 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/pthread/thrd_sleep.c b/sysdeps/pthread/thrd_sleep.c index c9805d5fd1..5103959997 100644 --- a/sysdeps/pthread/thrd_sleep.c +++ b/sysdeps/pthread/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/unix/sysv/linux/accept.c b/sysdeps/unix/sysv/linux/accept.c index f6021a75e7..aec5b6f470 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 85cdeef0e8..691e04165b 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 d5e8949013..026d791b16 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 7793dfd6b1..ee1991067c 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 cc7a09569d..479c21fd52 100644 --- a/sysdeps/unix/sysv/linux/clock_nanosleep.c +++ b/sysdeps/unix/sysv/linux/clock_nanosleep.c @@ -19,7 +19,6 @@ #include <kernel-features.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 602ab558e6..df70725e95 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 23ebcd0df5..988c1a5424 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 0e970b41ed..ac94e02832 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 a73c89f079..2bb445e7df 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 184e5f55f7..c74ac75c4f 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 d29323ad64..7423e5b579 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 66f04482c7..28622e10ce 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> /* Wait for events on an epoll instance "epfd". Returns the number of diff --git a/sysdeps/unix/sysv/linux/epoll_wait.c b/sysdeps/unix/sysv/linux/epoll_wait.c index 4e343b9344..f8403cc95d 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 e40d0c4a23..a21e997c2d 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 b2d2fab797..2be1711673 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 14ac328cf5..0ea45b51f0 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 783f564cba..bed464ff33 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 ed9211001f..3a552e75fc 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 87175b47d1..28a9dcfed1 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 afcca6e862..3b7e51acc1 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/generic/inotify_init.c b/sysdeps/unix/sysv/linux/generic/inotify_init.c index 7f84124850..25a323f7e7 100644 --- a/sysdeps/unix/sysv/linux/generic/inotify_init.c +++ b/sysdeps/unix/sysv/linux/generic/inotify_init.c @@ -16,11 +16,8 @@ License along with the GNU C Library. If not, see <https://www.gnu.org/licenses/>. */ -#include <stddef.h> -#include <errno.h> -#include <unistd.h> -#include <sys/types.h> #include <sys/inotify.h> +#include <sysdep.h> libc_hidden_proto (inotify_init) diff --git a/sysdeps/unix/sysv/linux/getrandom.c b/sysdeps/unix/sysv/linux/getrandom.c index 63b8d36bf4..4739852ea0 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> /* Write up to LENGTH bytes of randomness starting at BUFFER. Return the number of bytes written, or -1 on error. */ diff --git a/sysdeps/unix/sysv/linux/microblaze/pselect.c b/sysdeps/unix/sysv/linux/microblaze/pselect.c index 1dfc3b8fc9..cd089f99ff 100644 --- a/sysdeps/unix/sysv/linux/microblaze/pselect.c +++ b/sysdeps/unix/sysv/linux/microblaze/pselect.c @@ -20,7 +20,6 @@ #include <signal.h> #include <time.h> #include <sys/poll.h> -#include <sysdep-cancel.h> #ifndef __ASSUME_PSELECT # define __pselect __pselect_syscall diff --git a/sysdeps/unix/sysv/linux/mq_timedreceive.c b/sysdeps/unix/sysv/linux/mq_timedreceive.c index 73a1d63e41..56ce3bc184 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 888ec6744a..77d482d586 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 95edc7a787..e43bbc4255 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 554516f2ca..7923738b6a 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 de1dd2ac5e..327371beaf 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/open.c b/sysdeps/unix/sysv/linux/open.c index 0c006fb22e..d626365c3d 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 f2d0c55810..c4e7ae89ae 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 6c9c53291a..b5a21fe575 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 cec8609916..a5f4a90951 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 af72c0214c..d032559fe8 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 46da3ecc04..f50187b5a3 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 80fe66210d..afcd161a29 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 caba9e0f88..22388d7d6f 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 02042ebb83..c384565dcf 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/poll.c b/sysdeps/unix/sysv/linux/poll.c index 1c41ade1b7..d85ad2f160 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 4ffb23710e..6fa843c2cb 100644 --- a/sysdeps/unix/sysv/linux/ppoll.c +++ b/sysdeps/unix/sysv/linux/ppoll.c @@ -20,9 +20,6 @@ #include <signal.h> #include <time.h> #include <sys/poll.h> -#include <sysdep-cancel.h> -#include <kernel-features.h> - int __ppoll64 (struct pollfd *fds, nfds_t nfds, const struct __timespec64 *timeout, diff --git a/sysdeps/unix/sysv/linux/pread.c b/sysdeps/unix/sysv/linux/pread.c index 8dd87b3976..8872ad9b80 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 3d4ffbafc1..da5cff4167 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> ssize_t __libc_pread64 (int fd, void *buf, size_t count, off64_t offset) diff --git a/sysdeps/unix/sysv/linux/pread64_nocancel.c b/sysdeps/unix/sysv/linux/pread64_nocancel.c index af33985959..6ef4bf25b3 100644 --- a/sysdeps/unix/sysv/linux/pread64_nocancel.c +++ b/sysdeps/unix/sysv/linux/pread64_nocancel.c @@ -17,7 +17,6 @@ <http://www.gnu.org/licenses/>. */ #include <unistd.h> -#include <sysdep-cancel.h> #include <not-cancel.h> ssize_t diff --git a/sysdeps/unix/sysv/linux/preadv.c b/sysdeps/unix/sysv/linux/preadv.c index 9fccb917a1..bc55607109 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 4e3aa923da..e3dd0121d9 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 9fe43522a5..91a96cf736 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 1bf1a4c696..8a91f13292 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> ssize_t preadv64v2 (int fd, const struct iovec *vector, int count, off64_t offset, diff --git a/sysdeps/unix/sysv/linux/pselect.c b/sysdeps/unix/sysv/linux/pselect.c index d7c6ff8fdb..91a2094da1 100644 --- a/sysdeps/unix/sysv/linux/pselect.c +++ b/sysdeps/unix/sysv/linux/pselect.c @@ -17,7 +17,10 @@ <https://www.gnu.org/licenses/>. */ #include <sys/select.h> -#include <sysdep-cancel.h> +#include <signal.h> +#include <stddef.h> +#include <stdint.h> +#include <sysdep.h> int __pselect (int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, diff --git a/sysdeps/unix/sysv/linux/pwrite.c b/sysdeps/unix/sysv/linux/pwrite.c index 17964686e5..9a1cb401d6 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 709775c207..2baf8bf48a 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> ssize_t __libc_pwrite64 (int fd, const void *buf, size_t count, off64_t offset) diff --git a/sysdeps/unix/sysv/linux/pwritev.c b/sysdeps/unix/sysv/linux/pwritev.c index d6cb3c8d5c..ce5787d442 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 a179654970..4899508821 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 08bda27d4f..7d812fd426 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 8df32528b7..cac7dd9d14 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> ssize_t pwritev64v2 (int fd, const struct iovec *vector, int count, off64_t offset, diff --git a/sysdeps/unix/sysv/linux/read.c b/sysdeps/unix/sysv/linux/read.c index 64f558a587..b81e47b159 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 f9d8a3b563..2b5a261859 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 1a4305c597..40ba701800 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 79fb3c32d1..7e8a05f1d7 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 70532529c9..ba89cec82d 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 42c80c59c3..ee303f558a 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 a86d502922..6c430780b2 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 54c50edba2..aa799c83c8 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 aed7d06585..39472a8b52 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 378de59c64..1790a37574 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 f8f955098f..0a06ff67ae 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 670d0679ea..d34590297b 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 dd5df5af25..9887524e70 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 6b3d8f705f..b3509e5d0c 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 dcfcdc767c..770317e7ef 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 80b9ed313a..ff20a108f6 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 64af566e18..6cf21a55ad 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 fe21cf1988..90f69d64a1 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 18c43c54a8..086ee80c14 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 20824bc096..0000000000 --- a/sysdeps/unix/sysv/linux/sysdep-cancel.h +++ /dev/null @@ -1,25 +0,0 @@ -/* Single-thread optimization definitions. Linux version. - Copyright (C) 2017-2020 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> - -#endif diff --git a/sysdeps/unix/sysv/linux/tcdrain.c b/sysdeps/unix/sysv/linux/tcdrain.c index 14ae76884d..6e65cb5d9e 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 0e62c226dd..6c898d9779 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 63083f6f91..07eb5fdca6 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 17cc7bf8e7..7c2c0b6817 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/wait4.c b/sysdeps/unix/sysv/linux/wait4.c index d14bd4da27..98ca3f55e9 100644 --- a/sysdeps/unix/sysv/linux/wait4.c +++ b/sysdeps/unix/sysv/linux/wait4.c @@ -19,8 +19,8 @@ #include <sys/wait.h> #include <sys/resource.h> #include <sys/types.h> -#include <sysdep-cancel.h> #include <tv32-compat.h> +#include <sysdep.h> pid_t __wait4_time64 (pid_t pid, int *stat_loc, int options, struct __rusage64 *usage) diff --git a/sysdeps/unix/sysv/linux/waitid.c b/sysdeps/unix/sysv/linux/waitid.c index 023fa95f4f..9de60beccb 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/write.c b/sysdeps/unix/sysv/linux/write.c index 7848f7de27..025bdfca09 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 36d406cf74..011b3ebdf5 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 8d628535f8..10c295ecea 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)