From 46c1c765d14c77c6c36df1b51dae6674a4eef06b Mon Sep 17 00:00:00 2001
From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
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/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 +++--
8 files changed, 17 insertions(+), 16 deletions(-)
(limited to 'sysdeps/unix/sysv/linux')
diff --git a/sysdeps/unix/sysv/linux/fxstat.c b/sysdeps/unix/sysv/linux/fxstat.c
index 216ec7d19a..f3917e3609 100644
--- a/sysdeps/unix/sysv/linux/fxstat.c
+++ b/sysdeps/unix/sysv/linux/fxstat.c
@@ -26,7 +26,7 @@
# 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 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 ede7ac0f57..be12798273 100644
--- a/sysdeps/unix/sysv/linux/fxstat64.c
+++ b/sysdeps/unix/sysv/linux/fxstat64.c
@@ -26,7 +26,7 @@
#include <statx_cp.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 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 7217bbdc4f..853328d053 100644
--- a/sysdeps/unix/sysv/linux/fxstatat.c
+++ b/sysdeps/unix/sysv/linux/fxstatat.c
@@ -26,7 +26,7 @@
# include <xstatover.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 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 71cc593e5b..f442bff624 100644
--- a/sysdeps/unix/sysv/linux/fxstatat64.c
+++ b/sysdeps/unix/sysv/linux/fxstatat64.c
@@ -26,7 +26,7 @@
#include <statx_cp.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 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 e9833e7c95..7a644dc519 100644
--- a/sysdeps/unix/sysv/linux/lxstat.c
+++ b/sysdeps/unix/sysv/linux/lxstat.c
@@ -26,7 +26,7 @@
# include <xstatconv.h>
# include <xstatover.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
diff --git a/sysdeps/unix/sysv/linux/lxstat64.c b/sysdeps/unix/sysv/linux/lxstat64.c
index e2415f4fa2..37c70bac27 100644
--- a/sysdeps/unix/sysv/linux/lxstat64.c
+++ b/sysdeps/unix/sysv/linux/lxstat64.c
@@ -26,7 +26,7 @@
#include <statx_cp.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 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 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 */
diff --git a/sysdeps/unix/sysv/linux/xstat64.c b/sysdeps/unix/sysv/linux/xstat64.c
index b75a0fa26b..36947ed128 100644
--- a/sysdeps/unix/sysv/linux/xstat64.c
+++ b/sysdeps/unix/sysv/linux/xstat64.c
@@ -26,7 +26,7 @@
#include <statx_cp.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. */
@@ -92,4 +92,5 @@ compat_symbol (libc, __old__xstat64, __xstat64, GLIBC_2_1);
strong_alias (___xstat64, __xstat64)
#endif
-#endif /* SHLIB_COMPAT */
+
+#endif /* LIB_COMPAT */
--
cgit v1.2.3-70-g09d2