From 647a0a28e5c9aed2f1fa59bbb7595133e7a4e62f Mon Sep 17 00:00:00 2001 From: caiyinyu Date: Mon, 24 Apr 2023 18:09:55 +0800 Subject: [PATCH 03/14] glibc-2.28: Fix ifunc str/mem functions xfail problems. Change-Id: Ibff4229fcfef23c0b19fb94b21a4d17b49eceec6 Signed-off-by: ticat_fp --- .../lp64/multiarch/ifunc-impl-list.c | 76 +++++++++---------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/sysdeps/loongarch/lp64/multiarch/ifunc-impl-list.c b/sysdeps/loongarch/lp64/multiarch/ifunc-impl-list.c index c2b6bbf7..fdeae797 100644 --- a/sysdeps/loongarch/lp64/multiarch/ifunc-impl-list.c +++ b/sysdeps/loongarch/lp64/multiarch/ifunc-impl-list.c @@ -36,105 +36,105 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, size_t i = 0; IFUNC_IMPL (i, name, memcpy, - IFUNC_IMPL_ADD (array, i, memcpy, 1, __memcpy_lasx) - IFUNC_IMPL_ADD (array, i, memcpy, 1, __memcpy_lsx) + IFUNC_IMPL_ADD (array, i, memcpy, SUPPORT_LASX, __memcpy_lasx) + IFUNC_IMPL_ADD (array, i, memcpy, SUPPORT_LSX, __memcpy_lsx) + IFUNC_IMPL_ADD (array, i, memcpy, SUPPORT_UAL, __memcpy_unaligned) IFUNC_IMPL_ADD (array, i, memcpy, 1, __memcpy_aligned) - IFUNC_IMPL_ADD (array, i, memcpy, 1, __memcpy_unaligned) ) IFUNC_IMPL (i, name, memmove, - IFUNC_IMPL_ADD (array, i, memmove, 1, __memmove_lasx) - IFUNC_IMPL_ADD (array, i, memmove, 1, __memmove_lsx) + IFUNC_IMPL_ADD (array, i, memmove, SUPPORT_LASX, __memmove_lasx) + IFUNC_IMPL_ADD (array, i, memmove, SUPPORT_LSX, __memmove_lsx) + IFUNC_IMPL_ADD (array, i, memmove, SUPPORT_UAL, __memmove_unaligned) IFUNC_IMPL_ADD (array, i, memmove, 1, __memmove_aligned) - IFUNC_IMPL_ADD (array, i, memmove, 1, __memmove_unaligned) ) IFUNC_IMPL (i, name, memset, - IFUNC_IMPL_ADD (array, i, memset, 1, __memset_lasx) - IFUNC_IMPL_ADD (array, i, memset, 1, __memset_lsx) + IFUNC_IMPL_ADD (array, i, memset, SUPPORT_LASX, __memset_lasx) + IFUNC_IMPL_ADD (array, i, memset, SUPPORT_LSX, __memset_lsx) + IFUNC_IMPL_ADD (array, i, memset, SUPPORT_UAL, __memset_unaligned) IFUNC_IMPL_ADD (array, i, memset, 1, __memset_aligned) - IFUNC_IMPL_ADD (array, i, memset, 1, __memset_unaligned) ) IFUNC_IMPL (i, name, memchr, - IFUNC_IMPL_ADD (array, i, memchr, 1, __memchr_lasx) - IFUNC_IMPL_ADD (array, i, memchr, 1, __memchr_lsx) + IFUNC_IMPL_ADD (array, i, memchr, SUPPORT_LASX, __memchr_lasx) + IFUNC_IMPL_ADD (array, i, memchr, SUPPORT_LSX, __memchr_lsx) IFUNC_IMPL_ADD (array, i, memchr, 1, __memchr_aligned) ) IFUNC_IMPL (i, name, memrchr, - IFUNC_IMPL_ADD (array, i, memrchr, 1, __memrchr_lasx) - IFUNC_IMPL_ADD (array, i, memrchr, 1, __memrchr_lsx) + IFUNC_IMPL_ADD (array, i, memrchr, SUPPORT_LASX, __memrchr_lasx) + IFUNC_IMPL_ADD (array, i, memrchr, SUPPORT_LSX, __memrchr_lsx) IFUNC_IMPL_ADD (array, i, memrchr, 1, __memrchr_generic) ) IFUNC_IMPL (i, name, memcmp, - IFUNC_IMPL_ADD (array, i, memcmp, 1, __memcmp_lasx) - IFUNC_IMPL_ADD (array, i, memcmp, 1, __memcmp_lsx) + IFUNC_IMPL_ADD (array, i, memcmp, SUPPORT_LASX, __memcmp_lasx) + IFUNC_IMPL_ADD (array, i, memcmp, SUPPORT_LSX, __memcmp_lsx) IFUNC_IMPL_ADD (array, i, memcmp, 1, __memcmp_aligned) ) IFUNC_IMPL (i, name, rawmemchr, - IFUNC_IMPL_ADD (array, i, rawmemchr, 1, __rawmemchr_lasx) - IFUNC_IMPL_ADD (array, i, rawmemchr, 1, __rawmemchr_lsx) + IFUNC_IMPL_ADD (array, i, rawmemchr, SUPPORT_LASX, __rawmemchr_lasx) + IFUNC_IMPL_ADD (array, i, rawmemchr, SUPPORT_LSX, __rawmemchr_lsx) IFUNC_IMPL_ADD (array, i, rawmemchr, 1, __rawmemchr_aligned) ) IFUNC_IMPL (i, name, strchr, - IFUNC_IMPL_ADD (array, i, strchr, 1, __strchr_lasx) - IFUNC_IMPL_ADD (array, i, strchr, 1, __strchr_lsx) + IFUNC_IMPL_ADD (array, i, strchr, SUPPORT_LASX, __strchr_lasx) + IFUNC_IMPL_ADD (array, i, strchr, SUPPORT_LSX, __strchr_lsx) + IFUNC_IMPL_ADD (array, i, strchr, SUPPORT_UAL, __strchr_unaligned) IFUNC_IMPL_ADD (array, i, strchr, 1, __strchr_aligned) - IFUNC_IMPL_ADD (array, i, strchr, 1, __strchr_unaligned) ) IFUNC_IMPL (i, name, strrchr, - IFUNC_IMPL_ADD (array, i, strrchr, 1, __strrchr_lasx) - IFUNC_IMPL_ADD (array, i, strrchr, 1, __strrchr_lsx) + IFUNC_IMPL_ADD (array, i, strrchr, SUPPORT_LASX, __strrchr_lasx) + IFUNC_IMPL_ADD (array, i, strrchr, SUPPORT_LSX, __strrchr_lsx) IFUNC_IMPL_ADD (array, i, strrchr, 1, __strrchr_aligned) ) IFUNC_IMPL (i, name, strlen, - IFUNC_IMPL_ADD (array, i, strlen, 1, __strlen_lasx) - IFUNC_IMPL_ADD (array, i, strlen, 1, __strlen_lsx) + IFUNC_IMPL_ADD (array, i, strlen, SUPPORT_LASX, __strlen_lasx) + IFUNC_IMPL_ADD (array, i, strlen, SUPPORT_LSX, __strlen_lsx) + IFUNC_IMPL_ADD (array, i, strlen, SUPPORT_UAL, __strlen_unaligned) IFUNC_IMPL_ADD (array, i, strlen, 1, __strlen_aligned) - IFUNC_IMPL_ADD (array, i, strlen, 1, __strlen_unaligned) ) IFUNC_IMPL (i, name, strnlen, - IFUNC_IMPL_ADD (array, i, strnlen, 1, __strnlen_lasx) - IFUNC_IMPL_ADD (array, i, strnlen, 1, __strnlen_lsx) + IFUNC_IMPL_ADD (array, i, strnlen, SUPPORT_LASX, __strnlen_lasx) + IFUNC_IMPL_ADD (array, i, strnlen, SUPPORT_LSX, __strnlen_lsx) + IFUNC_IMPL_ADD (array, i, strnlen, SUPPORT_UAL, __strnlen_unaligned) IFUNC_IMPL_ADD (array, i, strnlen, 1, __strnlen_aligned) - IFUNC_IMPL_ADD (array, i, strnlen, 1, __strnlen_unaligned) ) IFUNC_IMPL (i, name, strchrnul, - IFUNC_IMPL_ADD (array, i, strchrnul, 1, __strchrnul_lasx) - IFUNC_IMPL_ADD (array, i, strchrnul, 1, __strchrnul_lsx) + IFUNC_IMPL_ADD (array, i, strchrnul, SUPPORT_LASX, __strchrnul_lasx) + IFUNC_IMPL_ADD (array, i, strchrnul, SUPPORT_LSX, __strchrnul_lsx) + IFUNC_IMPL_ADD (array, i, strchrnul, SUPPORT_UAL, __strchrnul_unaligned) IFUNC_IMPL_ADD (array, i, strchrnul, 1, __strchrnul_aligned) - IFUNC_IMPL_ADD (array, i, strchrnul, 1, __strchrnul_unaligned) ) IFUNC_IMPL (i, name, strncmp, - IFUNC_IMPL_ADD (array, i, strncmp, 1, __strncmp_lsx) + IFUNC_IMPL_ADD (array, i, strncmp, SUPPORT_LSX, __strncmp_lsx) + IFUNC_IMPL_ADD (array, i, strncmp, SUPPORT_UAL, __strncmp_unaligned) IFUNC_IMPL_ADD (array, i, strncmp, 1, __strncmp_aligned) - IFUNC_IMPL_ADD (array, i, strncmp, 1, __strncmp_unaligned) ) IFUNC_IMPL (i, name, strcpy, - IFUNC_IMPL_ADD (array, i, strcpy, 1, __strcpy_lsx) + IFUNC_IMPL_ADD (array, i, strcpy, SUPPORT_LSX, __strcpy_lsx) + IFUNC_IMPL_ADD (array, i, strcpy, SUPPORT_UAL, __strcpy_unaligned) IFUNC_IMPL_ADD (array, i, strcpy, 1, __strcpy_aligned) - IFUNC_IMPL_ADD (array, i, strcpy, 1, __strcpy_unaligned) ) IFUNC_IMPL (i, name, stpcpy, - IFUNC_IMPL_ADD (array, i, stpcpy, 1, __stpcpy_lsx) + IFUNC_IMPL_ADD (array, i, stpcpy, SUPPORT_LSX, __stpcpy_lsx) IFUNC_IMPL_ADD (array, i, stpcpy, 1, __stpcpy_aligned) ) IFUNC_IMPL (i, name, strcmp, - IFUNC_IMPL_ADD (array, i, strcmp, 1, __strcmp_lsx) + IFUNC_IMPL_ADD (array, i, strcmp, SUPPORT_LSX, __strcmp_lsx) + IFUNC_IMPL_ADD (array, i, strcmp, SUPPORT_UAL, __strcmp_unaligned) IFUNC_IMPL_ADD (array, i, strcmp, 1, __strcmp_aligned) - IFUNC_IMPL_ADD (array, i, strcmp, 1, __strcmp_unaligned) ) return i; -- 2.33.0