From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id DCBB13857361; Fri, 5 Aug 2022 19:32:37 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DCBB13857361 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: 2d17978865e853744c9b30416251a9a0e6931908 X-Git-Newrev: 9ef71c0be0d8b7f50f987d2d96198757e4356ad5 Message-Id: <20220805193237.DCBB13857361@sourceware.org> Date: Fri, 5 Aug 2022 19:32:37 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Aug 2022 19:32:38 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=9ef71c0be0d8b7f50f987d2d96198757e4356ad5 commit 9ef71c0be0d8b7f50f987d2d96198757e4356ad5 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...) \