From 8542dee32588c0a93828eafe12ee857e43cf8e73 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Mon, 5 Mar 2012 19:45:53 +0100 Subject: * sysdeps/unix/sysv/linux/x86_64/gettimeofday.c (gettimeofday_ifunc): Replace gettimeofday with __vdso_gettimeofday. * sysdeps/unix/sysv/linux/x86_64/init-first.c (_libc_vdso_platform_setup): Replace clock_gettime and getcpu with __vdso_clock_gettime and __vdso_getcpu. * sysdeps/unix/sysv/linux/x86_64/time.c (time_ifunc): Replace time with __vdso_time. --- ChangeLog | 12 ++++++++++++ sysdeps/unix/sysv/linux/x86_64/gettimeofday.c | 2 +- sysdeps/unix/sysv/linux/x86_64/init-first.c | 4 ++-- sysdeps/unix/sysv/linux/x86_64/time.c | 2 +- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 38772bb..e91648f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2012-03-0 H.J. Lu + + * sysdeps/unix/sysv/linux/x86_64/gettimeofday.c (gettimeofday_ifunc): + Replace gettimeofday with __vdso_gettimeofday. + + * sysdeps/unix/sysv/linux/x86_64/init-first.c (_libc_vdso_platform_setup): + Replace clock_gettime and getcpu with __vdso_clock_gettime and + __vdso_getcpu. + + * sysdeps/unix/sysv/linux/x86_64/time.c (time_ifunc): Replace + time with __vdso_time. + 2012-03-05 Joseph Myers * manual/lang.texi (size_t): Note types to which size_t may be diff --git a/sysdeps/unix/sysv/linux/x86_64/gettimeofday.c b/sysdeps/unix/sysv/linux/x86_64/gettimeofday.c index a13948b..e41fddb 100644 --- a/sysdeps/unix/sysv/linux/x86_64/gettimeofday.c +++ b/sysdeps/unix/sysv/linux/x86_64/gettimeofday.c @@ -30,7 +30,7 @@ gettimeofday_ifunc (void) PREPARE_VERSION (linux26, "LINUX_2.6", 61765110); /* If the vDSO is not available we fall back on the old vsyscall. */ - return (_dl_vdso_vsym ("gettimeofday", &linux26) + return (_dl_vdso_vsym ("__vdso_gettimeofday", &linux26) ?: (void *) VSYSCALL_ADDR_vgettimeofday); } __asm (".type __gettimeofday, %gnu_indirect_function"); diff --git a/sysdeps/unix/sysv/linux/x86_64/init-first.c b/sysdeps/unix/sysv/linux/x86_64/init-first.c index 0a9948b..e8b52ea 100644 --- a/sysdeps/unix/sysv/linux/x86_64/init-first.c +++ b/sysdeps/unix/sysv/linux/x86_64/init-first.c @@ -36,13 +36,13 @@ _libc_vdso_platform_setup (void) { PREPARE_VERSION (linux26, "LINUX_2.6", 61765110); - void *p = _dl_vdso_vsym ("clock_gettime", &linux26); + void *p = _dl_vdso_vsym ("__vdso_clock_gettime", &linux26); if (p == NULL) p = __syscall_clock_gettime; PTR_MANGLE (p); __GI___vdso_clock_gettime = p; - p = _dl_vdso_vsym ("getcpu", &linux26); + p = _dl_vdso_vsym ("__vdso_getcpu", &linux26); /* If the vDSO is not available we fall back on the old vsyscall. */ #define VSYSCALL_ADDR_vgetcpu 0xffffffffff600800 if (p == NULL) diff --git a/sysdeps/unix/sysv/linux/x86_64/time.c b/sysdeps/unix/sysv/linux/x86_64/time.c index 67afff3..0e05ddd 100644 --- a/sysdeps/unix/sysv/linux/x86_64/time.c +++ b/sysdeps/unix/sysv/linux/x86_64/time.c @@ -28,7 +28,7 @@ time_ifunc (void) PREPARE_VERSION (linux26, "LINUX_2.6", 61765110); /* If the vDSO is not available we fall back on the old vsyscall. */ - return _dl_vdso_vsym ("time", &linux26) ?: (void *) VSYSCALL_ADDR_vtime; + return _dl_vdso_vsym ("__vdso_time", &linux26) ?: (void *) VSYSCALL_ADDR_vtime; } __asm (".type time, %gnu_indirect_function"); -- cgit v1.1