diff options
| author | Noah Goldstein <goldstein.w.n@gmail.com> | 2022-06-24 09:42:13 -0700 |
|---|---|---|
| committer | Noah Goldstein <goldstein.w.n@gmail.com> | 2022-06-27 08:35:51 -0700 |
| commit | d912127bdea8fcd13f6b2f47b53393c9da1357f8 (patch) | |
| tree | 8fb2b105670f03f846b3ccaecb8e1a564530d48f /sysdeps/x86_64/multiarch | |
| parent | d1e931125baca83251871d7c335e28519074a24f (diff) | |
| download | glibc-d912127bdea8fcd13f6b2f47b53393c9da1357f8.tar.gz glibc-d912127bdea8fcd13f6b2f47b53393c9da1357f8.tar.xz glibc-d912127bdea8fcd13f6b2f47b53393c9da1357f8.zip | |
x86: Rename strstr_sse2 to strstr_generic as it uses string/strstr.c
This is in accordance with other files in the multiarch directory.
Diffstat (limited to 'sysdeps/x86_64/multiarch')
| -rw-r--r-- | sysdeps/x86_64/multiarch/ifunc-impl-list.c | 2 | ||||
| -rw-r--r-- | sysdeps/x86_64/multiarch/strstr-sse2-unaligned.S | 2 | ||||
| -rw-r--r-- | sysdeps/x86_64/multiarch/strstr.c | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sysdeps/x86_64/multiarch/ifunc-impl-list.c b/sysdeps/x86_64/multiarch/ifunc-impl-list.c index bf52cf96d0..0d28319905 100644 --- a/sysdeps/x86_64/multiarch/ifunc-impl-list.c +++ b/sysdeps/x86_64/multiarch/ifunc-impl-list.c @@ -627,7 +627,7 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, && CPU_FEATURE_USABLE (BMI2)), __strstr_avx512) IFUNC_IMPL_ADD (array, i, strstr, 1, __strstr_sse2_unaligned) - IFUNC_IMPL_ADD (array, i, strstr, 1, __strstr_sse2)) + IFUNC_IMPL_ADD (array, i, strstr, 1, __strstr_generic)) /* Support sysdeps/x86_64/multiarch/wcschr.c. */ IFUNC_IMPL (i, name, wcschr, diff --git a/sysdeps/x86_64/multiarch/strstr-sse2-unaligned.S b/sysdeps/x86_64/multiarch/strstr-sse2-unaligned.S index 3d12ffdf1e..c6aa8f45a6 100644 --- a/sysdeps/x86_64/multiarch/strstr-sse2-unaligned.S +++ b/sysdeps/x86_64/multiarch/strstr-sse2-unaligned.S @@ -267,7 +267,7 @@ L(next_pair3): .p2align 4 L(switch_strstr): movq %rdi, %rdi - jmp __strstr_sse2 + jmp __strstr_generic .p2align 4 L(cross_page): diff --git a/sysdeps/x86_64/multiarch/strstr.c b/sysdeps/x86_64/multiarch/strstr.c index 2fb8b169b6..2b83199245 100644 --- a/sysdeps/x86_64/multiarch/strstr.c +++ b/sysdeps/x86_64/multiarch/strstr.c @@ -24,17 +24,17 @@ #include <string.h> #undef strstr -#define STRSTR __strstr_sse2 +#define STRSTR __strstr_generic #ifdef SHARED # undef libc_hidden_builtin_def # define libc_hidden_builtin_def(name) \ - __hidden_ver1 (__strstr_sse2, __GI_strstr, __strstr_sse2); + __hidden_ver1 (__strstr_generic, __GI_strstr, __strstr_generic); #endif #include "string/strstr.c" extern __typeof (__redirect_strstr) __strstr_sse2_unaligned attribute_hidden; -extern __typeof (__redirect_strstr) __strstr_sse2 attribute_hidden; +extern __typeof (__redirect_strstr) __strstr_generic attribute_hidden; extern __typeof (__redirect_strstr) __strstr_avx512 attribute_hidden; #include "init-arch.h" @@ -58,7 +58,7 @@ IFUNC_SELECTOR (void) if (CPU_FEATURES_ARCH_P (cpu_features, Fast_Unaligned_Load)) return __strstr_sse2_unaligned; - return __strstr_sse2; + return __strstr_generic; } libc_ifunc_redirected (__redirect_strstr, __libc_strstr, IFUNC_SELECTOR ()); |