From 113977dd073c928b137985dd9a5ace3f5526c70c Mon Sep 17 00:00:00 2001 From: Szabolcs Nagy Date: Wed, 11 May 2022 10:30:36 +0100 Subject: [PATCH] aarch64: fix VDSO setup to only apply to known ABIs New syscall ABI requires different VDSO support code. --- sysdeps/unix/sysv/linux/aarch64/sysdep.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sysdeps/unix/sysv/linux/aarch64/sysdep.h b/sysdeps/unix/sysv/linux/aarch64/sysdep.h index f1853e012ff..f5b488921f0 100644 --- a/sysdeps/unix/sysv/linux/aarch64/sysdep.h +++ b/sysdeps/unix/sysv/linux/aarch64/sysdep.h @@ -154,15 +154,17 @@ # ifdef __LP64__ # define VDSO_NAME "LINUX_2.6.39" # define VDSO_HASH 123718537 -# else +# elif defined __ILP32__ # define VDSO_NAME "LINUX_4.9" # define VDSO_HASH 61765625 # endif +# ifdef VDSO_NAME /* List of system calls which are supported as vsyscalls. */ # define HAVE_CLOCK_GETRES64_VSYSCALL "__kernel_clock_getres" # define HAVE_CLOCK_GETTIME64_VSYSCALL "__kernel_clock_gettime" # define HAVE_GETTIMEOFDAY_VSYSCALL "__kernel_gettimeofday" +# endif # undef INTERNAL_SYSCALL_RAW # define INTERNAL_SYSCALL_RAW(name, nr, args...) \ -- 2.47.2