mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-28 00:21:52 +03:00
linux: Fix vDSO macros build with time64 interfaces
As indicated on libc-help [1] the ec138c67cb
commit broke 32-bit
builds when configured with --enable-kernel=5.1 or higher. The
scenario 10 from [2] might also occur in this configuration and
INLINE_VSYSCALL will try to use the vDSO symbol and
HAVE_CLOCK_GETTIME64_VSYSCALL does not set HAVE_VSYSCALL prior its
usage.
Also, there is no easy way to just enable the code to use one
vDSO symbol since the macro INLINE_VSYSCALL is redefined if
HAVE_VSYSCALL is set.
Instead of adding more pre-processor handling and making the code
even more convoluted, this patch removes the requirement of defining
HAVE_VSYSCALL before including sysdep-vdso.h to enable vDSO usage.
The INLINE_VSYSCALL is now expected to be issued inside a
HAVE_*_VSYSCALL check, since it will try to use the internal vDSO
pointers.
Both clock_getres and clock_gettime vDSO code for time64_t were
removed since there is no vDSO setup code for the symbol (an
architecture can not set HAVE_CLOCK_GETTIME64_VSYSCALL).
Checked on i686-linux-gnu (default and with --enable-kernel=5.1),
x86_64-linux-gnu, aarch64-linux-gnu, and powerpc64le-linux-gnu.
I also checked against a build to mips64-linux-gnu and
sparc64-linux-gnu.
[1] https://sourceware.org/ml/libc-help/2019-12/msg00014.html
[2] https://sourceware.org/ml/libc-alpha/2019-12/msg00142.html
Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
This commit is contained in:
@ -18,20 +18,15 @@
|
||||
#include <errno.h>
|
||||
#include <sched.h>
|
||||
#include <sysdep.h>
|
||||
|
||||
#ifdef HAVE_GETCPU_VSYSCALL
|
||||
# define HAVE_VSYSCALL
|
||||
#endif
|
||||
#include <sysdep-vdso.h>
|
||||
|
||||
int
|
||||
__getcpu (unsigned int *cpu, unsigned int *node)
|
||||
{
|
||||
#ifdef __NR_getcpu
|
||||
#ifdef HAVE_GETCPU_VSYSCALL
|
||||
return INLINE_VSYSCALL (getcpu, 3, cpu, node, NULL);
|
||||
#else
|
||||
__set_errno (ENOSYS);
|
||||
return -1;
|
||||
return INLINE_SYSCALL_CALL (getcpu, cpu, node, NULL);
|
||||
#endif
|
||||
}
|
||||
weak_alias (__getcpu, getcpu)
|
||||
|
Reference in New Issue
Block a user