From 46c1c765d14c77c6c36df1b51dae6674a4eef06b Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Tue, 29 Dec 2020 13:21:29 +0000 Subject: [PATCH] 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. --- include/shlib-compat.h | 23 ++++++++++++++--------- sysdeps/mach/hurd/fxstat.c | 4 ++-- sysdeps/mach/hurd/fxstat64.c | 2 +- sysdeps/mach/hurd/fxstatat.c | 3 +-- sysdeps/mach/hurd/fxstatat64.c | 3 +-- sysdeps/mach/hurd/lxstat.c | 2 +- sysdeps/mach/hurd/lxstat64.c | 3 +-- sysdeps/mach/hurd/xstat.c | 2 +- sysdeps/mach/hurd/xstat64.c | 2 +- sysdeps/unix/sysv/linux/fxstat.c | 4 ++-- sysdeps/unix/sysv/linux/fxstat64.c | 4 ++-- sysdeps/unix/sysv/linux/fxstatat.c | 4 ++-- sysdeps/unix/sysv/linux/fxstatat64.c | 4 ++-- sysdeps/unix/sysv/linux/lxstat.c | 2 +- sysdeps/unix/sysv/linux/lxstat64.c | 4 ++-- sysdeps/unix/sysv/linux/xstat.c | 6 +++--- sysdeps/unix/sysv/linux/xstat64.c | 5 +++-- 17 files changed, 40 insertions(+), 37 deletions(-) diff --git a/include/shlib-compat.h b/include/shlib-compat.h index 43583bbe2ef..28baef1ea42 100644 --- a/include/shlib-compat.h +++ b/include/shlib-compat.h @@ -21,8 +21,6 @@ # include -#ifdef SHARED - /* The file abi-versions.h (generated by scripts/abi-versions.awk) defines symbols like `ABI_libm_GLIBC_2_0' for each version set in the source code for each library. For a version set that is subsumed by a later @@ -34,17 +32,24 @@ when the two version sets named are in fact two different ABIs we are supporting. If these do not differ, then there is no need to compile in extra code to support this version set where it has been superseded by a - newer version. The compatibility code should be conditionalized with - e.g. `#if SHLIB_COMPAT (libm, GLIBC_2_0, GLIBC_2_2)' for code introduced - in the GLIBC_2.0 version and obsoleted in the GLIBC_2.2 version. */ - -# define SHLIB_COMPAT(lib, introduced, obsoleted) \ - _SHLIB_COMPAT (lib, introduced, obsoleted) -# define _SHLIB_COMPAT(lib, introduced, obsoleted) \ + newer version. */ +#define LIB_COMPAT(lib, introduced, obsoleted) \ + _LIB_COMPAT (lib, introduced, obsoleted) +#define _LIB_COMPAT(lib, introduced, obsoleted) \ (IS_IN (lib) \ && (!(ABI_##lib##_##obsoleted - 0) \ || ((ABI_##lib##_##introduced - 0) < (ABI_##lib##_##obsoleted - 0)))) +#ifdef SHARED + +/* Similar to LIB_COMPAT, but evaluate to 0 for static build. The + compatibility code should be conditionalized with e.g. + `#if SHLIB_COMPAT (libm, GLIBC_2_0, GLIBC_2_2)' for code introduced + in the GLIBC_2.0 version and obsoleted in the GLIBC_2.2 version. */ + +# define SHLIB_COMPAT(lib, introduced, obsoleted) \ + _LIB_COMPAT (lib, introduced, obsoleted) + /* That header also defines symbols like `VERSION_libm_GLIBC_2_1' to the version set name to use for e.g. symbols first introduced into libm in the GLIBC_2.1 version. Definitions of symbols with explicit diff --git a/sysdeps/mach/hurd/fxstat.c b/sysdeps/mach/hurd/fxstat.c index 8568d0d593e..fff521fa291 100644 --- a/sysdeps/mach/hurd/fxstat.c +++ b/sysdeps/mach/hurd/fxstat.c @@ -21,7 +21,7 @@ #include #include -#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 descriptor FD in BUF. */ int @@ -34,4 +34,4 @@ __fxstat (int vers, int fd, struct stat *buf) } weak_alias (__fxstat, _fxstat) -#endif +#endif /* LIB_COMPAT */ diff --git a/sysdeps/mach/hurd/fxstat64.c b/sysdeps/mach/hurd/fxstat64.c index cb5161fdc93..c116655f693 100644 --- a/sysdeps/mach/hurd/fxstat64.c +++ b/sysdeps/mach/hurd/fxstat64.c @@ -21,7 +21,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 diff --git a/sysdeps/mach/hurd/fxstatat.c b/sysdeps/mach/hurd/fxstatat.c index 825e080b180..995b0ad9227 100644 --- a/sysdeps/mach/hurd/fxstatat.c +++ b/sysdeps/mach/hurd/fxstatat.c @@ -22,7 +22,7 @@ #include #include -#if SHLIB_COMPAT(libc, GLIBC_2_4, GLIBC_2_33) +#if LIB_COMPAT(libc, GLIBC_2_4, GLIBC_2_33) int __fxstatat (int vers, int fd, const char *filename, struct stat *buf, int flag) @@ -32,5 +32,4 @@ __fxstatat (int vers, int fd, const char *filename, struct stat *buf, int flag) return __fstatat (fd, filename, buf, flag); } - #endif diff --git a/sysdeps/mach/hurd/fxstatat64.c b/sysdeps/mach/hurd/fxstatat64.c index c787f98784c..f24e272041c 100644 --- a/sysdeps/mach/hurd/fxstatat64.c +++ b/sysdeps/mach/hurd/fxstatat64.c @@ -23,7 +23,7 @@ #include #include -#if SHLIB_COMPAT(libc, GLIBC_2_4, GLIBC_2_33) +#if LIB_COMPAT(libc, GLIBC_2_4, GLIBC_2_33) /* Get information about the file descriptor FD in BUF. */ int @@ -35,5 +35,4 @@ __fxstatat64 (int vers, int fd, const char *filename, struct stat64 *buf, return __fstatat64 (fd, filename, buf, flag); } - #endif diff --git a/sysdeps/mach/hurd/lxstat.c b/sysdeps/mach/hurd/lxstat.c index 440c0ef7780..b9ad6b46dab 100644 --- a/sysdeps/mach/hurd/lxstat.c +++ b/sysdeps/mach/hurd/lxstat.c @@ -21,7 +21,7 @@ #include #include -#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_33) +#if LIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_33) int __lxstat (int vers, const char *file, struct stat *buf) diff --git a/sysdeps/mach/hurd/lxstat64.c b/sysdeps/mach/hurd/lxstat64.c index 2ee81ecf21b..2b8f2abc266 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 diff --git a/sysdeps/mach/hurd/xstat.c b/sysdeps/mach/hurd/xstat.c index fe52d297e39..3c36f989191 100644 --- a/sysdeps/mach/hurd/xstat.c +++ b/sysdeps/mach/hurd/xstat.c @@ -20,7 +20,7 @@ #include #include -#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_33) +#if LIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_33) /* Get file information about FILE in BUF. */ int diff --git a/sysdeps/mach/hurd/xstat64.c b/sysdeps/mach/hurd/xstat64.c index 7a68d6a1f58..dd1c6c38eb9 100644 --- a/sysdeps/mach/hurd/xstat64.c +++ b/sysdeps/mach/hurd/xstat64.c @@ -21,7 +21,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 diff --git a/sysdeps/unix/sysv/linux/fxstat.c b/sysdeps/unix/sysv/linux/fxstat.c index 216ec7d19ac..f3917e3609c 100644 --- a/sysdeps/unix/sysv/linux/fxstat.c +++ b/sysdeps/unix/sysv/linux/fxstat.c @@ -26,7 +26,7 @@ # include # include -# 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 FD in BUF. */ int @@ -61,6 +61,6 @@ __fxstat (int vers, int fd, struct stat *buf) } } -# endif /* SHLIB_COMPAT */ +# endif /* LIB_COMPAT */ #endif /* XSTAT_IS_XSTAT64 */ diff --git a/sysdeps/unix/sysv/linux/fxstat64.c b/sysdeps/unix/sysv/linux/fxstat64.c index ede7ac0f57e..be127982730 100644 --- a/sysdeps/unix/sysv/linux/fxstat64.c +++ b/sysdeps/unix/sysv/linux/fxstat64.c @@ -26,7 +26,7 @@ #include #include -#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 FD in BUF. */ @@ -78,4 +78,4 @@ strong_alias (___fxstat64, __fxstat64) strong_alias (___fxstat64, __fxstat) #endif -#endif /* SHLIB_COMPAT */ +#endif /* LIB_COMPAT */ diff --git a/sysdeps/unix/sysv/linux/fxstatat.c b/sysdeps/unix/sysv/linux/fxstatat.c index 7217bbdc4f5..853328d053b 100644 --- a/sysdeps/unix/sysv/linux/fxstatat.c +++ b/sysdeps/unix/sysv/linux/fxstatat.c @@ -26,7 +26,7 @@ # include # include -# if SHLIB_COMPAT(libc, GLIBC_2_4, GLIBC_2_33) +# if LIB_COMPAT(libc, GLIBC_2_4, GLIBC_2_33) /* Get information about the file FD in BUF. */ int @@ -50,6 +50,6 @@ __fxstatat (int vers, int fd, const char *file, struct stat *st, int flag) #endif } -# endif /* SHLIB_COMPAT */ +# endif /* LIB_COMPAT */ #endif /* XSTAT_IS_XSTAT64 */ diff --git a/sysdeps/unix/sysv/linux/fxstatat64.c b/sysdeps/unix/sysv/linux/fxstatat64.c index 71cc593e5bf..f442bff6241 100644 --- a/sysdeps/unix/sysv/linux/fxstatat64.c +++ b/sysdeps/unix/sysv/linux/fxstatat64.c @@ -26,7 +26,7 @@ #include #include -#if SHLIB_COMPAT(libc, GLIBC_2_4, GLIBC_2_33) +#if LIB_COMPAT(libc, GLIBC_2_4, GLIBC_2_33) /* Get information about the file FD in BUF. */ @@ -69,4 +69,4 @@ __fxstatat64 (int vers, int fd, const char *file, struct stat64 *st, int flag) strong_alias (__fxstatat64, __fxstatat) #endif -#endif /* SHLIB_COMPAT(libc, GLIBC_2_4, GLIBC_2_33) */ +#endif /* LIB_COMPAT(libc, GLIBC_2_4, GLIBC_2_33) */ diff --git a/sysdeps/unix/sysv/linux/lxstat.c b/sysdeps/unix/sysv/linux/lxstat.c index e9833e7c950..7a644dc5196 100644 --- a/sysdeps/unix/sysv/linux/lxstat.c +++ b/sysdeps/unix/sysv/linux/lxstat.c @@ -26,7 +26,7 @@ # include # include -# 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 diff --git a/sysdeps/unix/sysv/linux/lxstat64.c b/sysdeps/unix/sysv/linux/lxstat64.c index e2415f4fa2d..37c70bac274 100644 --- a/sysdeps/unix/sysv/linux/lxstat64.c +++ b/sysdeps/unix/sysv/linux/lxstat64.c @@ -26,7 +26,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 NAME in BUF. */ @@ -95,4 +95,4 @@ strong_alias (___lxstat64, __lxstat64); strong_alias (___lxstat64,__lxstat) #endif -#endif /* SHLIB_COMPAT */ +#endif /* LIB_COMPAT */ diff --git a/sysdeps/unix/sysv/linux/xstat.c b/sysdeps/unix/sysv/linux/xstat.c index 60d8323580c..4ee083514a1 100644 --- a/sysdeps/unix/sysv/linux/xstat.c +++ b/sysdeps/unix/sysv/linux/xstat.c @@ -20,13 +20,13 @@ #include #include #include -#include #if !XSTAT_IS_XSTAT64 # include # include +# include -# 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 */ diff --git a/sysdeps/unix/sysv/linux/xstat64.c b/sysdeps/unix/sysv/linux/xstat64.c index b75a0fa26b2..36947ed128d 100644 --- a/sysdeps/unix/sysv/linux/xstat64.c +++ b/sysdeps/unix/sysv/linux/xstat64.c @@ -26,7 +26,7 @@ #include #include -#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. */ @@ -92,4 +92,5 @@ compat_symbol (libc, __old__xstat64, __xstat64, GLIBC_2_1); strong_alias (___xstat64, __xstat64) #endif -#endif /* SHLIB_COMPAT */ + +#endif /* LIB_COMPAT */ -- 2.39.5