From 46c1c765d14c77c6c36df1b51dae6674a4eef06b Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Tue, 29 Dec 2020 13:21:29 +0000 Subject: 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. --- sysdeps/mach/hurd/lxstat64.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'sysdeps/mach/hurd/lxstat64.c') diff --git a/sysdeps/mach/hurd/lxstat64.c b/sysdeps/mach/hurd/lxstat64.c index 2ee81ecf21..2b8f2abc26 100644 --- a/sysdeps/mach/hurd/lxstat64.c +++ b/sysdeps/mach/hurd/lxstat64.c @@ -22,7 +22,7 @@ #include #include -#if SHLIB_COMPAT(libc, GLIBC_2_1, GLIBC_2_33) +#if LIB_COMPAT(libc, GLIBC_2_1, GLIBC_2_33) /* Get information about the file descriptor FD in BUF. */ int @@ -33,5 +33,4 @@ __lxstat64 (int vers, const char *file, struct stat64 *buf) return __lstat64 (file, buf); } - #endif -- cgit 1.4.1