picnoir/glibc
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

x86: Rename strstr_sse2 to strstr_generic as it uses string/strstr.c

Browse source 
This is in accordance with other files in the multiarch directory.
This commit is contained in:
Noah Goldstein 2022-06-24 09:42:13 -07:00
parent d1e931125b
commit d912127bde
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sysdeps/x86_64/multiarch/ifunc-impl-list.c
View file

@ -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,

2
sysdeps/x86_64/multiarch/strstr-sse2-unaligned.S
View file

@ -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):

8
sysdeps/x86_64/multiarch/strstr.c
View file

@ -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 ());