From d548adb4ef75dfc9bc1838f46f6c67f11e09906e Mon Sep 17 00:00:00 2001
From: Stan Shebs <stanshebs@google.com>
Date: Tue, 6 Oct 2020 13:08:18 -0700
Subject: [PATCH] Let time and gettimeofday use vdso by removing old clang
 workaround

---
 sysdeps/unix/sysv/linux/x86/gettimeofday.c | 3 +--
 sysdeps/unix/sysv/linux/x86/time.c         | 7 +------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/sysdeps/unix/sysv/linux/x86/gettimeofday.c b/sysdeps/unix/sysv/linux/x86/gettimeofday.c
index 614971bffb0..e125859c1a2 100644
--- a/sysdeps/unix/sysv/linux/x86/gettimeofday.c
+++ b/sysdeps/unix/sysv/linux/x86/gettimeofday.c
@@ -18,8 +18,7 @@
 
 #include <sys/time.h>
 
-/* Clang ifunc support works, but differently enough that this code breaks.  */
-#if defined(SHARED) && !defined(__clang__)
+#ifdef SHARED
 
 # include <dl-vdso.h>
 # include <errno.h>
diff --git a/sysdeps/unix/sysv/linux/x86/time.c b/sysdeps/unix/sysv/linux/x86/time.c
index 8992656bad0..d19cccd6f6c 100644
--- a/sysdeps/unix/sysv/linux/x86/time.c
+++ b/sysdeps/unix/sysv/linux/x86/time.c
@@ -18,8 +18,7 @@
 
 #include <time.h>
 
-/* Clang ifunc support works, but differently enough that this code breaks.  */
-#if defined(SHARED) && !defined(__clang__)
+#ifdef SHARED
 
 #include <dl-vdso.h>
 #include <errno.h>
@@ -58,7 +57,3 @@ time (time_t *t)
 }
 
 #endif
-
-#if defined(__clang__)
-libc_hidden_weak (time)
-#endif
-- 
2.47.2