diff options
| author | Szabolcs Nagy <szabolcs.nagy@arm.com> | 2023-11-27 13:15:45 +0000 |
|---|---|---|
| committer | Szabolcs Nagy <szabolcs.nagy@arm.com> | 2023-12-04 14:41:26 +0000 |
| commit | 8e755f5bc8f57d0034c12f34c11ce8a83103dc65 (patch) | |
| tree | 9a0526df32a6effd96d547e1e9c5b9247e77757d /sysdeps/aarch64/multiarch | |
| parent | b9390ba93676c4b1e87e218af5e7e4bb596312ac (diff) | |
| download | glibc-8e755f5bc8f57d0034c12f34c11ce8a83103dc65.tar.gz glibc-8e755f5bc8f57d0034c12f34c11ce8a83103dc65.tar.xz glibc-8e755f5bc8f57d0034c12f34c11ce8a83103dc65.zip | |
aarch64: fix tested ifunc variants
Don't test a64fx string functions when BTI is enabled since they are not BTI compatible.
Diffstat (limited to 'sysdeps/aarch64/multiarch')
| -rw-r--r-- | sysdeps/aarch64/multiarch/ifunc-impl-list.c | 6 |
1 files 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)) |