From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id 1DAD33858C98; Mon, 4 Dec 2023 14:41:49 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1DAD33858C98 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1701700909; bh=fZZOuiTbkTwaMq7Yi1zJ720SV9w8m6OpYZQBWNFvZkU=; h=From:To:Subject:Date:From; b=YwbgDd6at5aii3jWK18qoeVGjYUYAdpBmQ7uZrbmBDYsx16uU1GzYit/wGbW8vgL/ H7UGu+5Kvg1Mc+N3dNDbc1A7RHIwvU0E+g9W73lDl6nlhXp9RGlgGyr/tGThA2aErj wueA/I2Ie16PmQmtX82V5ugoMe73+3TqMqI0MgBQ= 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] aarch64: fix tested ifunc variants X-Act-Checkin: glibc X-Git-Author: Szabolcs Nagy X-Git-Refname: refs/heads/master X-Git-Oldrev: b9390ba93676c4b1e87e218af5e7e4bb596312ac X-Git-Newrev: 8e755f5bc8f57d0034c12f34c11ce8a83103dc65 Message-Id: <20231204144149.1DAD33858C98@sourceware.org> Date: Mon, 4 Dec 2023 14:41:49 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=8e755f5bc8f57d0034c12f34c11ce8a83103dc65 commit 8e755f5bc8f57d0034c12f34c11ce8a83103dc65 Author: Szabolcs Nagy Date: Mon Nov 27 13:15:45 2023 +0000 aarch64: fix tested ifunc variants Don't test a64fx string functions when BTI is enabled since they are not BTI compatible. Diff: --- sysdeps/aarch64/multiarch/ifunc-impl-list.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sysdeps/aarch64/multiarch/ifunc-impl-list.c b/sysdeps/aarch64/multiarch/ifunc-impl-list.c index 73038ac810..afb563b3c7 100644 --- a/sysdeps/aarch64/multiarch/ifunc-impl-list.c +++ b/sysdeps/aarch64/multiarch/ifunc-impl-list.c @@ -37,7 +37,7 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, IFUNC_IMPL_ADD (array, i, memcpy, 1, __memcpy_thunderx) IFUNC_IMPL_ADD (array, i, memcpy, !bti, __memcpy_thunderx2) #if HAVE_AARCH64_SVE_ASM - IFUNC_IMPL_ADD (array, i, memcpy, sve, __memcpy_a64fx) + IFUNC_IMPL_ADD (array, i, memcpy, sve && !bti, __memcpy_a64fx) IFUNC_IMPL_ADD (array, i, memcpy, sve, __memcpy_sve) #endif IFUNC_IMPL_ADD (array, i, memcpy, mops, __memcpy_mops) @@ -46,7 +46,7 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, IFUNC_IMPL_ADD (array, i, memmove, 1, __memmove_thunderx) IFUNC_IMPL_ADD (array, i, memmove, !bti, __memmove_thunderx2) #if HAVE_AARCH64_SVE_ASM - IFUNC_IMPL_ADD (array, i, memmove, sve, __memmove_a64fx) + IFUNC_IMPL_ADD (array, i, memmove, sve && !bti, __memmove_a64fx) IFUNC_IMPL_ADD (array, i, memmove, sve, __memmove_sve) #endif IFUNC_IMPL_ADD (array, i, memmove, mops, __memmove_mops) @@ -56,7 +56,7 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, IFUNC_IMPL_ADD (array, i, memset, 1, __memset_emag) IFUNC_IMPL_ADD (array, i, memset, 1, __memset_kunpeng) #if HAVE_AARCH64_SVE_ASM - IFUNC_IMPL_ADD (array, i, memset, sve && zva_size == 256, __memset_a64fx) + IFUNC_IMPL_ADD (array, i, memset, sve && !bti && zva_size == 256, __memset_a64fx) #endif IFUNC_IMPL_ADD (array, i, memset, mops, __memset_mops) IFUNC_IMPL_ADD (array, i, memset, 1, __memset_generic))