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/mach | |
| parent | 28f2ce27722d890a884cc7fa2f6d2bc0cb418f26 (diff) | |
| download | glibc-46c1c765d14c77c6c36df1b51dae6674a4eef06b.tar glibc-46c1c765d14c77c6c36df1b51dae6674a4eef06b.tar.gz glibc-46c1c765d14c77c6c36df1b51dae6674a4eef06b.tar.bz2 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/mach')
| -rw-r--r-- | sysdeps/mach/hurd/fxstat.c | 4 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/fxstat64.c | 2 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/fxstatat.c | 3 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/fxstatat64.c | 3 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/lxstat.c | 2 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/lxstat64.c | 3 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/xstat.c | 2 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/xstat64.c | 2 |
8 files changed, 9 insertions, 12 deletions
diff --git a/sysdeps/mach/hurd/fxstat.c b/sysdeps/mach/hurd/fxstat.c index 8568d0d593..fff521fa29 100644 --- a/sysdeps/mach/hurd/fxstat.c +++ b/sysdeps/mach/hurd/fxstat.c @@ -21,7 +21,7 @@ #include <hurd.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 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 cb5161fdc9..c116655f69 100644 --- a/sysdeps/mach/hurd/fxstat64.c +++ b/sysdeps/mach/hurd/fxstat64.c @@ -21,7 +21,7 @@ #include <hurd.h> #include <shlib-compat.h> -#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 825e080b18..995b0ad922 100644 --- a/sysdeps/mach/hurd/fxstatat.c +++ b/sysdeps/mach/hurd/fxstatat.c @@ -22,7 +22,7 @@ #include <hurd.h> #include <shlib-compat.h> -#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 c787f98784..f24e272041 100644 --- a/sysdeps/mach/hurd/fxstatat64.c +++ b/sysdeps/mach/hurd/fxstatat64.c @@ -23,7 +23,7 @@ #include <hurd.h> #include <shlib-compat.h> -#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 440c0ef778..b9ad6b46da 100644 --- a/sysdeps/mach/hurd/lxstat.c +++ b/sysdeps/mach/hurd/lxstat.c @@ -21,7 +21,7 @@ #include <hurd.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) 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 2ee81ecf21..2b8f2abc26 100644 --- a/sysdeps/mach/hurd/lxstat64.c +++ b/sysdeps/mach/hurd/lxstat64.c @@ -22,7 +22,7 @@ #include <hurd.h> #include <shlib-compat.h> -#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 fe52d297e3..3c36f98919 100644 --- a/sysdeps/mach/hurd/xstat.c +++ b/sysdeps/mach/hurd/xstat.c @@ -20,7 +20,7 @@ #include <hurd.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 file information about FILE in BUF. */ int diff --git a/sysdeps/mach/hurd/xstat64.c b/sysdeps/mach/hurd/xstat64.c index 7a68d6a1f5..dd1c6c38eb 100644 --- a/sysdeps/mach/hurd/xstat64.c +++ b/sysdeps/mach/hurd/xstat64.c @@ -21,7 +21,7 @@ #include <hurd.h> #include <shlib-compat.h> -#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 |