public inbox for glibc-cvs@sourceware.org help / color / mirror / Atom feed
From: Adhemerval Zanella <azanella@sourceware.org> To: glibc-cvs@sourceware.org Subject: [glibc/azanella/y2038] linux: Move {f}xstat{at} to compat symbols Date: Thu, 30 Jul 2020 13:27:34 +0000 (GMT) [thread overview] Message-ID: <20200730132734.41173388A838@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=bc3571cdcab59598f8c53313b4e72e7e7fa8a679 commit bc3571cdcab59598f8c53313b4e72e7e7fa8a679 Author: Adhemerval Zanella <adhemerval.zanella@linaro.org> Date: Sat Jul 18 10:21:25 2020 -0300 linux: Move {f}xstat{at} to compat symbols They are not used internally anymore. Checked with a build for all affected Linux ABIs. I checked also on x86_64-linux-gnu and i686-linux-gnu. Diff: --- sysdeps/unix/sysv/linux/alpha/fxstat64.c | 12 +++++++++++- sysdeps/unix/sysv/linux/alpha/fxstatat64.c | 9 ++++++++- sysdeps/unix/sysv/linux/alpha/lxstat64.c | 12 +++++++++++- sysdeps/unix/sysv/linux/alpha/xstat64.c | 12 +++++++++++- sysdeps/unix/sysv/linux/fxstat.c | 8 ++++++++ sysdeps/unix/sysv/linux/fxstat64.c | 14 ++++++++++---- sysdeps/unix/sysv/linux/fxstatat.c | 8 ++++++++ sysdeps/unix/sysv/linux/fxstatat64.c | 12 +++++++++++- sysdeps/unix/sysv/linux/lxstat.c | 8 ++++++++ sysdeps/unix/sysv/linux/lxstat64.c | 21 +++++++++++++-------- sysdeps/unix/sysv/linux/mips/fxstat.c | 8 ++++++++ sysdeps/unix/sysv/linux/mips/lxstat.c | 8 ++++++++ sysdeps/unix/sysv/linux/mips/mips64/fxstat64.c | 8 ++++++++ sysdeps/unix/sysv/linux/mips/mips64/fxstatat.c | 8 ++++++++ sysdeps/unix/sysv/linux/mips/mips64/fxstatat64.c | 8 ++++++++ sysdeps/unix/sysv/linux/mips/mips64/lxstat64.c | 8 ++++++++ sysdeps/unix/sysv/linux/mips/mips64/xstat64.c | 9 ++++++++- sysdeps/unix/sysv/linux/mips/xstat.c | 8 ++++++++ sysdeps/unix/sysv/linux/xstat.c | 8 ++++++++ sysdeps/unix/sysv/linux/xstat64.c | 15 ++++++++++----- 20 files changed, 181 insertions(+), 23 deletions(-) diff --git a/sysdeps/unix/sysv/linux/alpha/fxstat64.c b/sysdeps/unix/sysv/linux/alpha/fxstat64.c index 9d6b8eca32..bcfb55050c 100644 --- a/sysdeps/unix/sysv/linux/alpha/fxstat64.c +++ b/sysdeps/unix/sysv/linux/alpha/fxstat64.c @@ -22,9 +22,11 @@ #include <kernel_stat.h> #include <sysdep.h> #include <xstatconv.h> +#include <shlib-compat.h> /* Get information about the file NAME in BUF. */ int +attribute_compat_text_section __fxstat64 (int vers, int fd, struct stat64 *buf) { switch (vers) @@ -42,4 +44,12 @@ __fxstat64 (int vers, int fd, struct stat64 *buf) } } } -strong_alias (__fxstat64, __fxstat); + +#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_33) +strong_alias (__fxstat64, __fxstat_compat) +compat_symbol (libc, __fxstat_compat, __fxstat, GLIBC_2_0); +#endif + +#if SHLIB_COMPAT(libc, GLIBC_2_1, GLIBC_2_33) +compat_symbol (libc, __fxstat64, __fxstat64, GLIBC_2_1); +#endif diff --git a/sysdeps/unix/sysv/linux/alpha/fxstatat64.c b/sysdeps/unix/sysv/linux/alpha/fxstatat64.c index 997fb87ac6..fa3074eeca 100644 --- a/sysdeps/unix/sysv/linux/alpha/fxstatat64.c +++ b/sysdeps/unix/sysv/linux/alpha/fxstatat64.c @@ -22,11 +22,18 @@ #include <kernel_stat.h> #include <sysdep.h> #include <xstatconv.h> +#include <shlib-compat.h> +#if SHLIB_COMPAT(libc, GLIBC_2_4, GLIBC_2_33) /* Get information about the file NAME in BUF. */ int +attribute_compat_text_section __fxstatat64 (int vers, int fd, const char *file, struct stat64 *st, int flag) { return INLINE_SYSCALL_CALL (fstatat64, fd, file, st, flag); } -strong_alias (__fxstatat64, __fxstatat); +strong_alias (__fxstatat64, __fxstatat_compat) +compat_symbol (libc, __fxstatat_compat, __fxstatat, GLIBC_2_4); + +compat_symbol (libc, __fxstatat64, __fxstatat64, GLIBC_2_4); +#endif diff --git a/sysdeps/unix/sysv/linux/alpha/lxstat64.c b/sysdeps/unix/sysv/linux/alpha/lxstat64.c index 38f132f15e..7424b2f621 100644 --- a/sysdeps/unix/sysv/linux/alpha/lxstat64.c +++ b/sysdeps/unix/sysv/linux/alpha/lxstat64.c @@ -23,9 +23,11 @@ #include <kernel_stat.h> #include <sysdep.h> #include <xstatconv.h> +#include <shlib-compat.h> /* Get information about the file NAME in BUF. */ int +attribute_compat_text_section __lxstat64 (int vers, const char *name, struct stat64 *buf) { switch (vers) @@ -43,4 +45,12 @@ __lxstat64 (int vers, const char *name, struct stat64 *buf) } } } -weak_alias (__lxstat64, __lxstat); + +#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_33) +strong_alias (__lxstat64, __lxstat_compat) +compat_symbol (libc, __lxstat_compat, __lxstat, GLIBC_2_0); +#endif + +#if SHLIB_COMPAT(libc, GLIBC_2_1, GLIBC_2_33) +compat_symbol (libc, __lxstat64, __lxstat64, GLIBC_2_1); +#endif diff --git a/sysdeps/unix/sysv/linux/alpha/xstat64.c b/sysdeps/unix/sysv/linux/alpha/xstat64.c index c856c95dc5..59f7ddae7f 100644 --- a/sysdeps/unix/sysv/linux/alpha/xstat64.c +++ b/sysdeps/unix/sysv/linux/alpha/xstat64.c @@ -23,9 +23,11 @@ #include <kernel_stat.h> #include <sysdep.h> #include <xstatconv.h> +#include <shlib-compat.h> /* Get information about the file NAME in BUF. */ int +attribute_compat_text_section __xstat64 (int vers, const char *name, struct stat64 *buf) { switch (vers) @@ -43,4 +45,12 @@ __xstat64 (int vers, const char *name, struct stat64 *buf) } } } -weak_alias (__xstat64, __xstat); + +#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_33) +strong_alias (__xstat64, __xstat_compat) +compat_symbol (libc, __xstat_compat, __xstat, GLIBC_2_0); +#endif + +#if SHLIB_COMPAT(libc, GLIBC_2_1, GLIBC_2_33) +compat_symbol (libc, __xstat64, __xstat64, GLIBC_2_1); +#endif diff --git a/sysdeps/unix/sysv/linux/fxstat.c b/sysdeps/unix/sysv/linux/fxstat.c index f78497ea92..649bb95252 100644 --- a/sysdeps/unix/sysv/linux/fxstat.c +++ b/sysdeps/unix/sysv/linux/fxstat.c @@ -24,9 +24,13 @@ #if !XSTAT_IS_XSTAT64 # include <xstatconv.h> # include <xstatover.h> +# include <shlib-compat.h> + +# if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_33) /* Get information about the file FD in BUF. */ int +attribute_compat_text_section __fxstat (int vers, int fd, struct stat *buf) { switch (vers) @@ -57,4 +61,8 @@ __fxstat (int vers, int fd, struct stat *buf) } } } + +compat_symbol (libc, __fxstat, __fxstat, GLIBC_2_0); +# endif /* SHLIB_COMPAT */ + #endif /* XSTAT_IS_XSTAT64 */ diff --git a/sysdeps/unix/sysv/linux/fxstat64.c b/sysdeps/unix/sysv/linux/fxstat64.c index 6ae7babccc..726dfd0ad6 100644 --- a/sysdeps/unix/sysv/linux/fxstat64.c +++ b/sysdeps/unix/sysv/linux/fxstat64.c @@ -24,10 +24,14 @@ #include <sysdep.h> #include <xstatconv.h> #include <statx_cp.h> +#include <shlib-compat.h> + +#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_33) /* Get information about the file FD in BUF. */ int +attribute_compat_text_section ___fxstat64 (int vers, int fd, struct stat64 *buf) { #if XSTAT_IS_XSTAT64 @@ -53,16 +57,18 @@ ___fxstat64 (int vers, int fd, struct stat64 *buf) #endif /* XSTAT_IS_XSTAT64 */ } -#include <shlib-compat.h> - #if SHLIB_COMPAT(libc, GLIBC_2_1, GLIBC_2_2) -versioned_symbol (libc, ___fxstat64, __fxstat64, GLIBC_2_2); +compat_symbol (libc, ___fxstat64, __fxstat64, GLIBC_2_2); strong_alias (___fxstat64, __old__fxstat64) compat_symbol (libc, __old__fxstat64, __fxstat64, GLIBC_2_1); #else strong_alias (___fxstat64, __fxstat64) +compat_symbol (libc, ___fxstat64, __fxstat64, GLIBC_2_2); #endif #if XSTAT_IS_XSTAT64 -strong_alias (__fxstat64, __fxstat); +strong_alias (___fxstat64, __fxstat_compat) +compat_symbol (libc, __fxstat_compat, __fxstat, GLIBC_2_2); #endif + +#endif /* SHLIB_COMPAT */ diff --git a/sysdeps/unix/sysv/linux/fxstatat.c b/sysdeps/unix/sysv/linux/fxstatat.c index 1a60fc10e3..2083e18eac 100644 --- a/sysdeps/unix/sysv/linux/fxstatat.c +++ b/sysdeps/unix/sysv/linux/fxstatat.c @@ -24,9 +24,13 @@ #if !XSTAT_IS_XSTAT64 # include <xstatconv.h> # include <xstatover.h> +# include <shlib-compat.h> + +# if SHLIB_COMPAT(libc, GLIBC_2_4, GLIBC_2_33) /* Get information about the file FD in BUF. */ int +attribute_compat_text_section __fxstatat (int vers, int fd, const char *file, struct stat *st, int flag) { #if STAT_IS_KERNEL_STAT @@ -46,4 +50,8 @@ __fxstatat (int vers, int fd, const char *file, struct stat *st, int flag) return r ?: __xstat32_conv (vers, &st64, st); #endif } + +compat_symbol (libc, __fxstatat, __fxstatat, GLIBC_2_4); +# endif /* SHLIB_COMPAT */ + #endif /* XSTAT_IS_XSTAT64 */ diff --git a/sysdeps/unix/sysv/linux/fxstatat64.c b/sysdeps/unix/sysv/linux/fxstatat64.c index 7fe034809c..8a505451d9 100644 --- a/sysdeps/unix/sysv/linux/fxstatat64.c +++ b/sysdeps/unix/sysv/linux/fxstatat64.c @@ -24,10 +24,14 @@ #include <sysdep.h> #include <xstatconv.h> #include <statx_cp.h> +#include <shlib-compat.h> + +#if SHLIB_COMPAT(libc, GLIBC_2_4, GLIBC_2_33) /* Get information about the file FD in BUF. */ int +attribute_compat_text_section __fxstatat64 (int vers, int fd, const char *file, struct stat64 *st, int flag) { #if XSTAT_IS_XSTAT64 @@ -61,6 +65,12 @@ __fxstatat64 (int vers, int fd, const char *file, struct stat64 *st, int flag) #endif return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL); } + +compat_symbol (libc, __fxstatat64, __fxstatat64, GLIBC_2_4); + #if XSTAT_IS_XSTAT64 -strong_alias (__fxstatat64, __fxstatat); +strong_alias (__fxstatat64, __fxstatat_compat) +compat_symbol (libc, __fxstatat_compat, __fxstatat, GLIBC_2_4); #endif + +#endif /* SHLIB_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 156173a4e1..f307aa4942 100644 --- a/sysdeps/unix/sysv/linux/lxstat.c +++ b/sysdeps/unix/sysv/linux/lxstat.c @@ -20,13 +20,17 @@ #include <fcntl.h> #include <kernel_stat.h> #include <sysdep.h> +#include <shlib-compat.h> #if !XSTAT_IS_XSTAT64 # include <xstatconv.h> # include <xstatover.h> +# if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_33) + /* Get information about the file NAME in BUF. */ int +attribute_compat_text_section __lxstat (int vers, const char *name, struct stat *buf) { switch (vers) @@ -58,4 +62,8 @@ __lxstat (int vers, const char *name, struct stat *buf) } } } + +compat_symbol (libc, __lxstat, __lxstat, GLIBC_2_0); +# endif /* SHLIB_COMPAT */ + #endif /* XSTAT_IS_XSTAT64 */ diff --git a/sysdeps/unix/sysv/linux/lxstat64.c b/sysdeps/unix/sysv/linux/lxstat64.c index 29bd1cdf72..660d59aea3 100644 --- a/sysdeps/unix/sysv/linux/lxstat64.c +++ b/sysdeps/unix/sysv/linux/lxstat64.c @@ -24,10 +24,14 @@ #include <sysdep.h> #include <xstatconv.h> #include <statx_cp.h> +#include <shlib-compat.h> + +#if SHLIB_COMPAT(libc, GLIBC_2_1, GLIBC_2_33) /* Get information about the file NAME in BUF. */ int +attribute_compat_text_section ___lxstat64 (int vers, const char *name, struct stat64 *buf) { #if XSTAT_IS_XSTAT64 @@ -70,17 +74,18 @@ ___lxstat64 (int vers, const char *name, struct stat64 *buf) return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL); } -#if XSTAT_IS_XSTAT64 -weak_alias (___lxstat64, __lxstat); -weak_alias (___lxstat64, __GI___lxstat); -#endif - -#include <shlib-compat.h> - #if SHLIB_COMPAT(libc, GLIBC_2_1, GLIBC_2_2) -versioned_symbol (libc, ___lxstat64, __lxstat64, GLIBC_2_2); +compat_symbol (libc, ___lxstat64, __lxstat64, GLIBC_2_2); strong_alias (___lxstat64, __old__lxstat64) compat_symbol (libc, __old__lxstat64, __lxstat64, GLIBC_2_1); #else strong_alias (___lxstat64, __lxstat64); +compat_symbol (libc, ___lxstat64, __lxstat64, GLIBC_2_2); #endif + +#if XSTAT_IS_XSTAT64 +strong_alias (___lxstat64,__lxstat_compat) +compat_symbol (libc, __lxstat_compat, __lxstat, GLIBC_2_2); +#endif + +#endif /* SHLIB_COMPAT */ diff --git a/sysdeps/unix/sysv/linux/mips/fxstat.c b/sysdeps/unix/sysv/linux/mips/fxstat.c index 4585c2362b..cb9f656628 100644 --- a/sysdeps/unix/sysv/linux/mips/fxstat.c +++ b/sysdeps/unix/sysv/linux/mips/fxstat.c @@ -21,9 +21,13 @@ #include <kernel_stat.h> #include <sysdep.h> #include <xstatconv.h> +#include <shlib-compat.h> + +#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_33) /* Get information about the file NAME in BUF. */ int +attribute_compat_text_section __fxstat (int vers, int fd, struct stat *buf) { switch (vers) @@ -39,3 +43,7 @@ __fxstat (int vers, int fd, struct stat *buf) } } } + +compat_symbol (libc, __fxstat, __fxstat, GLIBC_2_0); + +#endif diff --git a/sysdeps/unix/sysv/linux/mips/lxstat.c b/sysdeps/unix/sysv/linux/mips/lxstat.c index 62a3b15b32..ebd05cca50 100644 --- a/sysdeps/unix/sysv/linux/mips/lxstat.c +++ b/sysdeps/unix/sysv/linux/mips/lxstat.c @@ -21,9 +21,13 @@ #include <kernel_stat.h> #include <sysdep.h> #include <xstatconv.h> +#include <shlib-compat.h> + +#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_33) /* Get information about the file NAME in BUF. */ int +attribute_compat_text_section __lxstat (int vers, const char *name, struct stat *buf) { switch (vers) @@ -39,3 +43,7 @@ __lxstat (int vers, const char *name, struct stat *buf) } } } + +compat_symbol (libc, __lxstat, __lxstat, GLIBC_2_0); + +#endif diff --git a/sysdeps/unix/sysv/linux/mips/mips64/fxstat64.c b/sysdeps/unix/sysv/linux/mips/mips64/fxstat64.c index e6c1cacd4b..855c650814 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/fxstat64.c +++ b/sysdeps/unix/sysv/linux/mips/mips64/fxstat64.c @@ -20,10 +20,14 @@ #include <kernel_stat.h> #include <sysdep.h> #include <xstatconv.h> +#include <shlib-compat.h> + +#if SHLIB_COMPAT(libc, GLIBC_2_2, GLIBC_2_33) /* Get information about the file FD in BUF. */ int +attribute_compat_text_section __fxstat64 (int vers, int fd, struct stat64 *buf) { struct kernel_stat kbuf; @@ -31,3 +35,7 @@ __fxstat64 (int vers, int fd, struct stat64 *buf) return r ?: __xstat64_conv (vers, &kbuf, buf); } + +compat_symbol (libc, __fxstat64, __fxstat64, GLIBC_2_2); + +#endif diff --git a/sysdeps/unix/sysv/linux/mips/mips64/fxstatat.c b/sysdeps/unix/sysv/linux/mips/mips64/fxstatat.c index e384dbab8b..1c1fbb02c2 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/fxstatat.c +++ b/sysdeps/unix/sysv/linux/mips/mips64/fxstatat.c @@ -21,12 +21,20 @@ #include <kernel_stat.h> #include <sysdep.h> #include <xstatconv.h> +#include <shlib-compat.h> + +#if SHLIB_COMPAT(libc, GLIBC_2_4, GLIBC_2_33) /* Get information about the file FD in BUF. */ int +attribute_compat_text_section __fxstatat (int vers, int fd, const char *file, struct stat *st, int flag) { struct kernel_stat kst; int r = INLINE_SYSCALL_CALL (newfstatat, fd, file, &kst, flag); return r ?: __xstat_conv (vers, &kst, st); } + +compat_symbol (libc, __fxstatat, __fxstatat, GLIBC_2_4); + +#endif diff --git a/sysdeps/unix/sysv/linux/mips/mips64/fxstatat64.c b/sysdeps/unix/sysv/linux/mips/mips64/fxstatat64.c index cfd172d301..f40a2c5aa8 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/fxstatat64.c +++ b/sysdeps/unix/sysv/linux/mips/mips64/fxstatat64.c @@ -19,10 +19,14 @@ #include <kernel_stat.h> #include <sysdep.h> #include <xstatconv.h> +#include <shlib-compat.h> + +#if SHLIB_COMPAT(libc, GLIBC_2_4, GLIBC_2_33) /* Get information about the file NAME in BUF. */ int +attribute_compat_text_section __fxstatat64 (int vers, int fd, const char *file, struct stat64 *st, int flag) { if (vers == _STAT_VER_LINUX) @@ -33,3 +37,7 @@ __fxstatat64 (int vers, int fd, const char *file, struct stat64 *st, int flag) } return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL); } + +compat_symbol (libc, __fxstatat64, __fxstatat64, GLIBC_2_4); + +#endif diff --git a/sysdeps/unix/sysv/linux/mips/mips64/lxstat64.c b/sysdeps/unix/sysv/linux/mips/mips64/lxstat64.c index 0f3934f8c8..752c5284a7 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/lxstat64.c +++ b/sysdeps/unix/sysv/linux/mips/mips64/lxstat64.c @@ -20,12 +20,20 @@ #include <kernel_stat.h> #include <sysdep.h> #include <xstatconv.h> +#include <shlib-compat.h> + +#if SHLIB_COMPAT(libc, GLIBC_2_2, GLIBC_2_33) /* Get information about the file NAME in BUF. */ int +attribute_compat_text_section __lxstat64 (int vers, const char *name, struct stat64 *buf) { struct kernel_stat kbuf; int r = INLINE_SYSCALL_CALL (lstat, name, &kbuf); return r ?: __xstat64_conv (vers, &kbuf, buf); } + +compat_symbol (libc, __lxstat64, __lxstat64, GLIBC_2_2); + +#endif diff --git a/sysdeps/unix/sysv/linux/mips/mips64/xstat64.c b/sysdeps/unix/sysv/linux/mips/mips64/xstat64.c index 64d2952276..a620ba2f1f 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/xstat64.c +++ b/sysdeps/unix/sysv/linux/mips/mips64/xstat64.c @@ -20,13 +20,20 @@ #include <kernel_stat.h> #include <sysdep.h> #include <xstatconv.h> +#include <shlib-compat.h> -/* Get information about the file NAME in BUF. */ +#if SHLIB_COMPAT(libc, GLIBC_2_2, GLIBC_2_33) +/* Get information about the file NAME in BUF. */ int +attribute_compat_text_section __xstat64 (int vers, const char *name, struct stat64 *buf) { struct kernel_stat kbuf; int r = INLINE_SYSCALL_CALL (stat, name, &kbuf); return r ?: __xstat64_conv (vers, &kbuf, buf); } + +compat_symbol (libc, __xstat64, __xstat64, GLIBC_2_2); + +#endif diff --git a/sysdeps/unix/sysv/linux/mips/xstat.c b/sysdeps/unix/sysv/linux/mips/xstat.c index d6ff5ccbe0..0748a3422d 100644 --- a/sysdeps/unix/sysv/linux/mips/xstat.c +++ b/sysdeps/unix/sysv/linux/mips/xstat.c @@ -21,9 +21,13 @@ #include <kernel_stat.h> #include <sysdep.h> #include <xstatconv.h> +#include <shlib-compat.h> + +#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_33) /* Get information about the file NAME in BUF. */ int +attribute_compat_text_section __xstat (int vers, const char *name, struct stat *buf) { switch (vers) @@ -39,3 +43,7 @@ __xstat (int vers, const char *name, struct stat *buf) } } } + +compat_symbol (libc, __xstat, __xstat, GLIBC_2_0); + +#endif diff --git a/sysdeps/unix/sysv/linux/xstat.c b/sysdeps/unix/sysv/linux/xstat.c index a971e8cf6a..3eb2d8c51b 100644 --- a/sysdeps/unix/sysv/linux/xstat.c +++ b/sysdeps/unix/sysv/linux/xstat.c @@ -20,13 +20,17 @@ #include <fcntl.h> #include <kernel_stat.h> #include <sysdep.h> +#include <shlib-compat.h> #if !XSTAT_IS_XSTAT64 # include <xstatconv.h> # include <xstatover.h> +# if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_33) + /* Get information about the file NAME in BUF. */ int +attribute_compat_text_section __xstat (int vers, const char *name, struct stat *buf) { switch (vers) @@ -57,4 +61,8 @@ __xstat (int vers, const char *name, struct stat *buf) } } } + +compat_symbol (libc, __xstat, __xstat, GLIBC_2_0); +# endif /* SHLIB_COMPAT */ + #endif /* XSTAT_IS_XSTAT64 */ diff --git a/sysdeps/unix/sysv/linux/xstat64.c b/sysdeps/unix/sysv/linux/xstat64.c index e3a42966f5..4872d24694 100644 --- a/sysdeps/unix/sysv/linux/xstat64.c +++ b/sysdeps/unix/sysv/linux/xstat64.c @@ -24,10 +24,14 @@ #include <sysdep.h> #include <xstatconv.h> #include <statx_cp.h> +#include <shlib-compat.h> + +#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_33) /* Get information about the file NAME in BUF. */ int +attribute_compat_text_section ___xstat64 (int vers, const char *name, struct stat64 *buf) { #if XSTAT_IS_XSTAT64 @@ -68,16 +72,17 @@ ___xstat64 (int vers, const char *name, struct stat64 *buf) } #if XSTAT_IS_XSTAT64 -weak_alias (___xstat64, __xstat); -weak_alias (___xstat64, __GI___xstat); +strong_alias (___xstat64, __xstat_compat) +compat_symbol (libc, __xstat_compat, __xstat, GLIBC_2_2); #endif -#include <shlib-compat.h> - #if SHLIB_COMPAT(libc, GLIBC_2_1, GLIBC_2_2) -versioned_symbol (libc, ___xstat64, __xstat64, GLIBC_2_2); +compat_symbol (libc, ___xstat64, __xstat64, GLIBC_2_2); strong_alias (___xstat64, __old__xstat64) compat_symbol (libc, __old__xstat64, __xstat64, GLIBC_2_1); #else strong_alias (___xstat64, __xstat64) +compat_symbol (libc, ___xstat64, __xstat64, GLIBC_2_2); #endif + +#endif /* SHLIB_COMPAT */
reply other threads:[~2020-07-30 13:27 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200730132734.41173388A838@sourceware.org \ --to=azanella@sourceware.org \ --cc=glibc-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).