From c701bcc6f4b0077e544ac100338343ac6cc4cb8a Mon Sep 17 00:00:00 2001
From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Mon, 16 Dec 2019 09:45:55 -0300
Subject: linux: Consolidate Linux gettimeofday

The IFUNC bypass to vDSO is used when USE_IFUNC_GETTIMEOFDAY is set.
Currently aarch64, powerpc*, and x86 defines it.  Otherwise the
generic implementation is used, which calls clock_gettime.

Checked on aarch64-linux-gnu, powerpc64le-linux-gnu,
powerpc64-linux-gnu, powerpc-linux-gnu-power4, x86_64-linux-gnu,
and i686-linux-gnu.

Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
---
 sysdeps/unix/sysv/linux/x86/gettimeofday.c | 33 ++----------------------------
 1 file changed, 2 insertions(+), 31 deletions(-)

(limited to 'sysdeps/unix/sysv/linux/x86')

diff --git a/sysdeps/unix/sysv/linux/x86/gettimeofday.c b/sysdeps/unix/sysv/linux/x86/gettimeofday.c
index 3fb4e8d1c4..1b7aa880a2 100644
--- a/sysdeps/unix/sysv/linux/x86/gettimeofday.c
+++ b/sysdeps/unix/sysv/linux/x86/gettimeofday.c
@@ -16,34 +16,5 @@
    License along with the GNU C Library; if not, see
    <https://www.gnu.org/licenses/>.  */
 
-#include <time.h>
-#include <sysdep.h>
-#include <sysdep-vdso.h>
-
-static int
-__gettimeofday_syscall (struct timeval *restrict tv, void *restrict tz)
-{
-  if (__glibc_unlikely (tz != 0))
-    memset (tz, 0, sizeof *tz);
-
-  return INLINE_VSYSCALL (gettimeofday, 2, tv, tz);
-}
-
-#ifdef SHARED
-# include <dl-vdso.h>
-# include <libc-vdso.h>
-
-# define INIT_ARCH()
-/* If the vDSO is not available we fall back to syscall.  */
-libc_ifunc (__gettimeofday,
-	    (get_vdso_symbol (HAVE_GETTIMEOFDAY_VSYSCALL)
-	    ?: __gettimeofday_syscall));
-
-#else
-int
-__gettimeofday (struct timeval *restrict tv, void *restrict tz)
-{
-  return __gettimeofday_syscall (tv, tz);
-}
-#endif
-weak_alias (__gettimeofday, gettimeofday)
+#define USE_IFUNC_GETTIMEOFDAY
+#include <sysdeps/unix/sysv/linux/gettimeofday.c>
-- 
cgit 1.4.1