This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[COMMITTED] linux/clock_settime: remove unnecessary vDSO definitions
- From: Chris Metcalf <cmetcalf at ezchip dot com>
- To: <libc-alpha at sourceware dot org>
- Date: Fri, 26 Dec 2014 16:34:02 -0500
- Subject: [COMMITTED] linux/clock_settime: remove unnecessary vDSO definitions
- Authentication-results: sourceware.org; auth=none
- Authentication-results: spf=fail (sender IP is 12.216.194.146) smtp dot mailfrom=cmetcalf at ezchip dot com;
These definitions were added back before __ASSUME_POSIX_CPU_TIMERS
was removed. There used to be a vsyscall to clock_getres() in
maybe_syscall_settime_cpu(), but that function was removed in commit
26889eac. The presence of the vsyscall definitions means that platforms
that don't provide clock_getres as a vsyscall hit a symbol redefinition
warning in this file, becoming fatal with -Werror. Removing the
vsyscall definitions is the obvious fix.
No change to generated code on x86_64.
---
ChangeLog | 3 +++
sysdeps/unix/sysv/linux/clock_settime.c | 9 ---------
2 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 1dc4798eb034..5a33871ccff9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2014-12-26 Chris Metcalf <cmetcalf@ezchip.com>
+ * sysdeps/unix/sysv/linux/clock_settime.c (SYSDEP_SETTIME): Remove
+ definitions of INTERNAL_VSYSCALL and INLINE_VSYSCALL.
+
* sysdeps/unix/sysv/linux/tile/sysdep.h
(HAVE_CLOCK_GETTIME_VSYSCALL): Move definition out of
assembly-specific section to avoid a redefinition warning.
diff --git a/sysdeps/unix/sysv/linux/clock_settime.c b/sysdeps/unix/sysv/linux/clock_settime.c
index 0448bfef6946..e8555b431641 100644
--- a/sysdeps/unix/sysv/linux/clock_settime.c
+++ b/sysdeps/unix/sysv/linux/clock_settime.c
@@ -21,15 +21,6 @@
#include "kernel-posix-cpu-timers.h"
-#ifndef HAVE_CLOCK_GETRES_VSYSCALL
-# undef INTERNAL_VSYSCALL
-# define INTERNAL_VSYSCALL INTERNAL_SYSCALL
-# undef INLINE_VSYSCALL
-# define INLINE_VSYSCALL INLINE_SYSCALL
-#else
-# include <bits/libc-vdso.h>
-#endif
-
/* The REALTIME clock is definitely supported in the kernel. */
#define SYSDEP_SETTIME \
--
2.1.2