aarch64: fix tested ifunc variants

Don't test a64fx string functions when BTI is enabled since they are
not BTI compatible.

diff --git a/sysdeps/aarch64/multiarch/ifunc-impl-list.c b/sysdeps/aarch64/multiarch/ifunc-impl-list.c
index 73038ac8102b1ef8a58a51ca19638720f26e6a66..afb563b3c7638c20238a670b3e57576cfd716f3f 100644 (file)
--- 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))