libc,shared: detect newer library symbols at runtime
For libc syscall wrappers (pidfd_open, fsopen, openat2, etc.) we previously gated the calls behind build-time HAVE_* checks. Replace these with shim functions in src/libc/ that fall back to the raw syscall at runtime when the loaded glibc lacks the symbol. The infrastructure lives in src/libc/libc-shim.h: DEFINE_SYSCALL_SHIM falls back to a direct syscall, DEFINE_LIBC_SHIM returns ENOSYS (for posix_spawn-family helpers that have no corresponding syscall), and DEFINE_LIBC_ERRNO_SHIM sets errno=ENOSYS and returns -1 (for read/write-style helpers). The weak reference to the libc symbol is bound via __asm__(\"name\") rename so the bare libc identifier never appears as a C token — this avoids both #undef boilerplate against override-header redirects and the resulting -Wredundant-decls warning. Drop the corresponding cc.has_function() loop from meson.build. For optional libraries (libcryptsetup, libdw, libarchive), drop the per-symbol HAVE_* checks. Always declare the prototypes, suppressing the redundant-decl warnings via DISABLE_WARNING_REDUNDANT_DECLS and NOLINT, and resolve the symbols after the main dlopen via a new DLSYM_OPTIONAL() helper that only assigns on success. libcryptsetup's crypt_set_keyring_to_link / crypt_token_set_external_path and libarchive's *_is_set wrappers use fallback functions as their pointer initializers (returning -ENOSYS and 0 respectively), so call sites can invoke the symbol unconditionally and just check for -ENOSYS where the \"not supported\" distinction matters. The same shim treatment applies to pidfd_spawn / posix_spawnattr_setcgroup_np (src/libc/spawn.c) and epoll_pwait2 (src/libc/epoll.c), with corresponding override headers in src/include/override/spawn.h and src/include/override/sys/epoll.h. posix_spawn_wrapper() in process-util.c and epoll_wait_usec() in sd-event.c now detect ENOSYS in the return value instead of checking the function pointer, falling back to plain posix_spawn() and epoll_wait() respectively. coredump-config and coredump-submit get a dlopen_dw_has_dwfl_set_sysroot() helper. The kexec arch gate now uses defined(__NR_kexec_file_load) directly; pidfd.h uses __has_include_next() to decide whether to pull in glibc's header. This lets binaries built against newer glibc / libcryptsetup / libdw / libarchive headers still load and run on older targets where these symbols are absent.
This commit is contained in:
@@ -4629,19 +4629,9 @@ static int epoll_wait_usec(
|
||||
int maxevents,
|
||||
usec_t timeout) {
|
||||
|
||||
int msec;
|
||||
/* A wrapper that uses epoll_pwait2() if available, and falls back to epoll_wait() if not. */
|
||||
|
||||
#if HAVE_EPOLL_PWAIT2
|
||||
static bool epoll_pwait2_absent = false;
|
||||
int r;
|
||||
|
||||
/* epoll_pwait2() was added to Linux 5.11 (2021-02-14) and to glibc in 2.35 (2022-02-03). In contrast
|
||||
* to other syscalls we don't bother with our own fallback syscall wrappers on old libcs, since this
|
||||
* is not that obvious to implement given the libc and kernel definitions differ in the last
|
||||
* argument. Moreover, the only reason to use it is the more accurate timeouts (which is not a
|
||||
* biggie), let's hence rely on glibc's definitions, and fallback to epoll_pwait() when that's
|
||||
* missing. */
|
||||
int r, msec;
|
||||
/* A wrapper that uses epoll_pwait2() if available, and falls back to epoll_wait() if not. */
|
||||
|
||||
if (!epoll_pwait2_absent && timeout != USEC_INFINITY) {
|
||||
r = epoll_pwait2(fd,
|
||||
@@ -4657,7 +4647,6 @@ static int epoll_wait_usec(
|
||||
|
||||
epoll_pwait2_absent = true;
|
||||
}
|
||||
#endif
|
||||
|
||||
if (timeout == USEC_INFINITY)
|
||||
msec = -1;
|
||||
|
||||
Reference in New Issue
Block a user