From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id 6C0A63852C5B; Wed, 23 Nov 2022 14:43:00 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6C0A63852C5B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1669214580; bh=835DBZhXecesbXqHeUSZe1Pdt9LgC0z3SwujZiaAbrU=; h=From:To:Subject:Date:From; b=Q8hUedbVp8D9W459XzcZq6cgRcWliya9D1ldoDDYYinJFtgv1T72uTqtufUFXQVtM RXp67YduT6rtU7/xZPMrxN8Tr31XACzud/roCIJc9gu6u6cXo7aCQy48cdZKrjgcHL IOSIiRbVIyRCDZupQtK3z3RXCRXY2OMx85uU4Uck= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Szabolcs Nagy To: glibc-cvs@sourceware.org Subject: [glibc/arm/morello/main] aarch64: fix VDSO setup to only apply to known ABIs X-Act-Checkin: glibc X-Git-Author: Szabolcs Nagy X-Git-Refname: refs/heads/arm/morello/main X-Git-Oldrev: e1a82e398439df8fbdb33faf540f91fd68de3c20 X-Git-Newrev: 666bf6a0fa8f5828ede637125c5ea0bb646d8392 Message-Id: <20221123144300.6C0A63852C5B@sourceware.org> Date: Wed, 23 Nov 2022 14:43:00 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=666bf6a0fa8f5828ede637125c5ea0bb646d8392 commit 666bf6a0fa8f5828ede637125c5ea0bb646d8392 Author: Szabolcs Nagy Date: Wed May 11 10:30:36 2022 +0100 aarch64: fix VDSO setup to only apply to known ABIs New syscall ABI requires different VDSO support code. Diff: --- 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 f1853e012f..f5b488921f 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...) \