diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2020-12-29 13:21:29 +0000 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2021-01-21 14:11:53 -0300 |
| commit | 46c1c765d14c77c6c36df1b51dae6674a4eef06b (patch) | |
| tree | 435a65a76f8d01fbf8a76da7f2fda54c2ce03731 /sysdeps/unix/sysv/linux/xstat.c | |
| parent | 28f2ce27722d890a884cc7fa2f6d2bc0cb418f26 (diff) | |
| download | glibc-46c1c765d14c77c6c36df1b51dae6674a4eef06b.tar.gz glibc-46c1c765d14c77c6c36df1b51dae6674a4eef06b.tar.xz glibc-46c1c765d14c77c6c36df1b51dae6674a4eef06b.zip | |
Revert "linux: Move {f}xstat{at} to compat symbols" for static build
This reverts commit 20b39d59467b0c1d858e89ded8b0cebe55e22f60 for static library. This avoids the need to rebuild the world for the case where libstdc++ (and potentially other libraries) are linked to a old glibc. To avoid requering to provide xstat symbols for newer ABIs (such as riscv32) a new LIB_COMPAT macro is added. It is similar to SHLIB_COMPAT but also works for static case (thus evaluating similar to SHLIB_COMPAT for both shared and static case). Checked with a check-abi on all affected ABIs. I also check if the static library does contains the xstat symbols.
Diffstat (limited to 'sysdeps/unix/sysv/linux/xstat.c')
| -rw-r--r-- | sysdeps/unix/sysv/linux/xstat.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sysdeps/unix/sysv/linux/xstat.c b/sysdeps/unix/sysv/linux/xstat.c index 60d8323580..4ee083514a 100644 --- a/sysdeps/unix/sysv/linux/xstat.c +++ b/sysdeps/unix/sysv/linux/xstat.c @@ -20,13 +20,13 @@ #include <fcntl.h> #include <kernel_stat.h> #include <sysdep.h> -#include <shlib-compat.h> #if !XSTAT_IS_XSTAT64 # include <xstatconv.h> # include <xstatover.h> +# include <shlib-compat.h> -# if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_33) +# if LIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_33) /* Get information about the file NAME in BUF. */ int @@ -61,6 +61,6 @@ __xstat (int vers, const char *name, struct stat *buf) } } -# endif /* SHLIB_COMPAT */ +# endif /* LIB_COMPAT */ #endif /* XSTAT_IS_XSTAT64 */ |