about summary refs log tree commit diff
path: root/sysdeps/unix/sysv
diff options
context:
space:
mode:
authorChris Metcalf <cmetcalf@ezchip.com>2014-12-26 16:34:02 -0500
committerChris Metcalf <cmetcalf@ezchip.com>2014-12-26 16:34:02 -0500
commitd8aaf74be9d16990085c66b1f85f59e1aec65df4 (patch)
treeff353db87b5739343da643d2502b0b632c8048e7 /sysdeps/unix/sysv
parent5d24aa6056c7e70dc96948c6c6c84ed4a523ec65 (diff)
downloadglibc-d8aaf74be9d16990085c66b1f85f59e1aec65df4.tar.gz
glibc-d8aaf74be9d16990085c66b1f85f59e1aec65df4.tar.xz
glibc-d8aaf74be9d16990085c66b1f85f59e1aec65df4.zip
linux/clock_settime: remove unnecessary vDSO definitions
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.
Diffstat (limited to 'sysdeps/unix/sysv')
-rw-r--r--sysdeps/unix/sysv/linux/clock_settime.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/sysdeps/unix/sysv/linux/clock_settime.c b/sysdeps/unix/sysv/linux/clock_settime.c
index 0448bfef69..e8555b4316 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 \