From d8aaf74be9d16990085c66b1f85f59e1aec65df4 Mon Sep 17 00:00:00 2001 From: Chris Metcalf Date: Fri, 26 Dec 2014 16:34:02 -0500 Subject: 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. --- sysdeps/unix/sysv/linux/clock_settime.c | 9 --------- 1 file changed, 9 deletions(-) (limited to 'sysdeps/unix/sysv/linux') 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 -#endif - /* The REALTIME clock is definitely supported in the kernel. */ #define SYSDEP_SETTIME \ -- cgit 1.4.1