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.

diff --git a/ChangeLog b/ChangeLog
index 1dc4798..5a33871 100644 (file)
--- 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 0448bfe..e8555b4 100644 (file)
--- 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 \