summaryrefslogtreecommitdiff
path: root/src/basic/missing_syscall_def.h
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2022-11-22 15:38:52 +0100
committerLuca Boccassi <luca.boccassi@gmail.com>2022-11-23 00:54:23 +0100
commit0c14c45e5c00bbaed81566ace8f0d0c70cfe6392 (patch)
treeff5e3cdb85325f6927bde512838f15eabc1e2709 /src/basic/missing_syscall_def.h
parentc9bb7438dba715deb8c068cbd7d6dc0e09e44ca9 (diff)
downloadsystemd-0c14c45e5c00bbaed81566ace8f0d0c70cfe6392.tar.gz
sd-event: reenable epoll_pwait2()
This reenables epoll_pwait2() use, i.e. undoes the effect of 39f756d3ae4765b8bf017567a12b8a4b358eaaf5. Instead of just reverting that, this PR will change things so that we strictly rely on glibc's new epoll_pwait2() wrapper (which was added earlier this year), and drop our own manual fallback syscall wrapper. That should nicely side-step any issues with correct syscall wrapping definitions (which on some arch seem not to be easy, given the sigset_t size final argument), by making this a glibc problem, not ours. Given that the only benefit this delivers are time-outs more granular than msec, it shouldn't really matter that we'll miss out on support for this on systems with older glibcs.
Diffstat (limited to 'src/basic/missing_syscall_def.h')
-rw-r--r--src/basic/missing_syscall_def.h68
1 files changed, 0 insertions, 68 deletions
diff --git a/src/basic/missing_syscall_def.h b/src/basic/missing_syscall_def.h
index 67cae7098d..402fdd00dc 100644
--- a/src/basic/missing_syscall_def.h
+++ b/src/basic/missing_syscall_def.h
@@ -246,74 +246,6 @@ assert_cc(__NR_copy_file_range == systemd_NR_copy_file_range);
# endif
#endif
-#ifndef __IGNORE_epoll_pwait2
-# if defined(__aarch64__)
-# define systemd_NR_epoll_pwait2 441
-# elif defined(__alpha__)
-# define systemd_NR_epoll_pwait2 551
-# elif defined(__arc__) || defined(__tilegx__)
-# define systemd_NR_epoll_pwait2 441
-# elif defined(__arm__)
-# define systemd_NR_epoll_pwait2 441
-# elif defined(__i386__)
-# define systemd_NR_epoll_pwait2 441
-# elif defined(__ia64__)
-# define systemd_NR_epoll_pwait2 1465
-# elif defined(__loongarch64)
-# define systemd_NR_epoll_pwait2 441
-# elif defined(__m68k__)
-# define systemd_NR_epoll_pwait2 441
-# elif defined(_MIPS_SIM)
-# if _MIPS_SIM == _MIPS_SIM_ABI32
-# define systemd_NR_epoll_pwait2 4441
-# elif _MIPS_SIM == _MIPS_SIM_NABI32
-# define systemd_NR_epoll_pwait2 6441
-# elif _MIPS_SIM == _MIPS_SIM_ABI64
-# define systemd_NR_epoll_pwait2 5441
-# else
-# error "Unknown MIPS ABI"
-# endif
-# elif defined(__hppa__)
-# define systemd_NR_epoll_pwait2 441
-# elif defined(__powerpc__)
-# define systemd_NR_epoll_pwait2 441
-# elif defined(__riscv)
-# if __riscv_xlen == 32
-# define systemd_NR_epoll_pwait2 441
-# elif __riscv_xlen == 64
-# define systemd_NR_epoll_pwait2 441
-# else
-# error "Unknown RISC-V ABI"
-# endif
-# elif defined(__s390__)
-# define systemd_NR_epoll_pwait2 441
-# elif defined(__sparc__)
-# define systemd_NR_epoll_pwait2 441
-# elif defined(__x86_64__)
-# if defined(__ILP32__)
-# define systemd_NR_epoll_pwait2 (441 | /* __X32_SYSCALL_BIT */ 0x40000000)
-# else
-# define systemd_NR_epoll_pwait2 441
-# endif
-# elif !defined(missing_arch_template)
-# warning "epoll_pwait2() syscall number is unknown for your architecture"
-# endif
-
-/* may be an (invalid) negative number due to libseccomp, see PR 13319 */
-# if defined __NR_epoll_pwait2 && __NR_epoll_pwait2 >= 0
-# if defined systemd_NR_epoll_pwait2
-assert_cc(__NR_epoll_pwait2 == systemd_NR_epoll_pwait2);
-# endif
-# else
-# if defined __NR_epoll_pwait2
-# undef __NR_epoll_pwait2
-# endif
-# if defined systemd_NR_epoll_pwait2 && systemd_NR_epoll_pwait2 >= 0
-# define __NR_epoll_pwait2 systemd_NR_epoll_pwait2
-# endif
-# endif
-#endif
-
#ifndef __IGNORE_getrandom
# if defined(__aarch64__)
# define systemd_NR_getrandom 278