SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tree-wide: drop workarounds for statx()

Browse Source 
struct statx in glibc header was introduced in glibc-2.28
(fd70af45528d59a00eb3190ef6706cb299488fcd), but at that time,
sys/stat.h conflicts with linux/stat.h. Since glibc-2.30
(5dad6ffbb2b76215cfcd38c3001778536ada8e8a), sys/stat.h includes
linux/stat.h if exists.

Since now our baseline of glibc is 2.31. Hence, we can drop workarounds
for struct statx by importing linux/stat.h from newer kernel (v6.14-rc4).
This commit is contained in:
Yu Watanabe
2025-03-01 00:33:28 +09:00
parent 24845c4ff6
commit 4424e6c811
15 changed files with 298 additions and 317 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/basic/missing_syscall_def.h
-68
View File
@@ -1333,71 +1333,3 @@ assert_cc(__NR_setxattrat == systemd_NR_setxattrat);
# endif
# endif
#endif
#ifndef __IGNORE_statx
# if defined(__aarch64__)
# define systemd_NR_statx 291
# elif defined(__alpha__)
# define systemd_NR_statx 522
# elif defined(__arc__) || defined(__tilegx__)
# define systemd_NR_statx 291
# elif defined(__arm__)
# define systemd_NR_statx 397
# elif defined(__i386__)
# define systemd_NR_statx 383
# elif defined(__ia64__)
# define systemd_NR_statx 1350
# elif defined(__loongarch_lp64)
# define systemd_NR_statx 291
# elif defined(__m68k__)
# define systemd_NR_statx 379
# elif defined(_MIPS_SIM)
# if _MIPS_SIM == _MIPS_SIM_ABI32
# define systemd_NR_statx 4366
# elif _MIPS_SIM == _MIPS_SIM_NABI32
# define systemd_NR_statx 6330
# elif _MIPS_SIM == _MIPS_SIM_ABI64
# define systemd_NR_statx 5326
# else
# error "Unknown MIPS ABI"
# endif
# elif defined(__hppa__)
# define systemd_NR_statx 349
# elif defined(__powerpc__)
# define systemd_NR_statx 383
# elif defined(__riscv)
# if __riscv_xlen == 32
# define systemd_NR_statx 291
# elif __riscv_xlen == 64
# define systemd_NR_statx 291
# else
# error "Unknown RISC-V ABI"
# endif
# elif defined(__s390__)
# define systemd_NR_statx 379
# elif defined(__sparc__)
# define systemd_NR_statx 360
# elif defined(__x86_64__)
# if defined(__ILP32__)
# define systemd_NR_statx (332 | /* __X32_SYSCALL_BIT */ 0x40000000)
# else
# define systemd_NR_statx 332
# endif
# elif !defined(missing_arch_template)
# warning "statx() syscall number is unknown for your architecture"
# endif
/* may be an (invalid) negative number due to libseccomp, see PR 13319 */
# if defined __NR_statx && __NR_statx >= 0
# if defined systemd_NR_statx
assert_cc(__NR_statx == systemd_NR_statx);
# endif
# else
# if defined __NR_statx
# undef __NR_statx
# endif
# if defined systemd_NR_statx && systemd_NR_statx >= 0
# define __NR_statx systemd_NR_statx
# endif
# endif
#endif