lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-30 22:43:12 +03:00
Code Activity

linux/clock_settime: remove unnecessary vDSO definitions

Browse Source 
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.
This commit is contained in:
Chris Metcalf
2014-12-26 16:34:02 -05:00
parent 5d24aa6056
commit d8aaf74be9
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2014-12-26 Chris Metcalf <cmetcalf@ezchip.com> 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 * sysdeps/unix/sysv/linux/tile/sysdep.h
(HAVE_CLOCK_GETTIME_VSYSCALL): Move definition out of (HAVE_CLOCK_GETTIME_VSYSCALL): Move definition out of
assembly-specific section to avoid a redefinition warning. assembly-specific section to avoid a redefinition warning.

9
sysdeps/unix/sysv/linux/clock_settime.c
View File

@ -21,15 +21,6 @@
#include "kernel-posix-cpu-timers.h" #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. */ /* The REALTIME clock is definitely supported in the kernel. */
#define SYSDEP_SETTIME \ #define SYSDEP_SETTIME \