From: Szabolcs Nagy <szabolcs.nagy@arm.com>
Date: Wed, 11 May 2022 09:30:36 +0000 (+0100)
Subject: aarch64: fix VDSO setup to only apply to known ABIs
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ef71c0be0d8b7f50f987d2d96198757e4356ad5;p=thirdparty%2Fglibc.git

aarch64: fix VDSO setup to only apply to known ABIs

New syscall ABI requires different VDSO support code.
---

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...)		\