From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id 4FE0B385153C; Thu, 27 Oct 2022 13:53:07 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4FE0B385153C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1666878787; bh=gAk232CeCEWa20BXsCdQZmatx+EpbU+DyFXsNcTHXcA=; h=From:To:Subject:Date:From; b=XyEeIwy8L2669rQudMRUO57UzNgSXmna63ccKaKtC0Sbej8na1G0i2nMCzD+OQ43S hPLPjzNtXe6Ecb9cogRNmi8QYLjkmQ18AttvyXsBt3WIhphh8rvv7srFELd01Mgtoc yHH1PYC+0S/5g2VnHOW8nO4qUkz62WEarGfnQWH8= 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: 9733f57ff3f664c735dbe15f4839c534aeecf41c X-Git-Newrev: 113977dd073c928b137985dd9a5ace3f5526c70c Message-Id: <20221027135307.4FE0B385153C@sourceware.org> Date: Thu, 27 Oct 2022 13:53:07 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=113977dd073c928b137985dd9a5ace3f5526c70c commit 113977dd073c928b137985dd9a5ace3f5526c70c 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...) \