This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[COMMITTED] alpha: Fix static gettimeofday symbol
- From: Adhemerval Zanella <adhemerval dot zanella at linaro dot org>
- To: libc-alpha at sourceware dot org
- Date: Thu, 13 Feb 2020 08:38:24 -0300
- Subject: [COMMITTED] alpha: Fix static gettimeofday symbol
By undef strong_alias on alpha implementation, the
default_symbol_version macro becomes an empty macro on static build.
It fixes the issue introduced at c953219420.
Checked on alpha-linux-gnu with a 'make check run-built-tests=no'.
---
sysdeps/unix/sysv/linux/alpha/gettimeofday.c | 7 ++-----
time/gettimeofday.c | 4 +++-
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/sysdeps/unix/sysv/linux/alpha/gettimeofday.c b/sysdeps/unix/sysv/linux/alpha/gettimeofday.c
index 7ad3c6a412..25e86410fd 100644
--- a/sysdeps/unix/sysv/linux/alpha/gettimeofday.c
+++ b/sysdeps/unix/sysv/linux/alpha/gettimeofday.c
@@ -18,12 +18,9 @@
/* We can use the generic implementation, but we have to override its
default symbol version. */
-#undef weak_alias
-#define weak_alias(a,b)
-#undef strong_alias
-#define strong_alias(a, b)
+#define SET_VERSION
#include <time/gettimeofday.c>
-_weak_alias (___gettimeofday, __wgettimeofday);
+weak_alias (___gettimeofday, __wgettimeofday);
default_symbol_version (___gettimeofday, __gettimeofday, GLIBC_2.1);
default_symbol_version (__wgettimeofday, gettimeofday, GLIBC_2.1);
diff --git a/time/gettimeofday.c b/time/gettimeofday.c
index 07c6e10d12..e4671edd13 100644
--- a/time/gettimeofday.c
+++ b/time/gettimeofday.c
@@ -35,6 +35,8 @@ ___gettimeofday (struct timeval *restrict tv, void *restrict tz)
TIMESPEC_TO_TIMEVAL (tv, &ts);
return 0;
}
-
+/* Define to override default symbol version. */
+#ifndef SET_VERSION
strong_alias (___gettimeofday, __gettimeofday)
weak_alias (___gettimeofday, gettimeofday)
+#endif
--
2.17.1