45 lines
1.4 KiB
Diff
45 lines
1.4 KiB
Diff
|
commit 38115446558e6d0976299eb592ba7266681c27d5
|
||
|
|
Author: Noah Goldstein <goldstein.w.n@gmail.com>
|
||
|
|
Date: Wed Mar 23 16:57:27 2022 -0500
|
||
|
|
|
||
|
|
x86: Remove strpbrk-sse2.S and use the generic implementation
|
||
|
|
|
||
|
|
The generic implementation is faster (see strcspn commit).
|
||
|
|
|
||
|
|
All string/memory tests pass.
|
||
|
|
Reviewed-by: H.J. Lu <hjl.tools@gmail.com>
|
||
|
|
|
||
|
|
(cherry picked from commit 653358535280a599382cb6c77538a187dac6a87f)
|
||
|
|
|
||
|
|
diff --git a/sysdeps/x86_64/multiarch/strpbrk-sse2.S b/sysdeps/x86_64/multiarch/strpbrk-sse2.c
|
||
|
|
similarity index 87%
|
||
|
|
rename from sysdeps/x86_64/multiarch/strpbrk-sse2.S
|
||
|
|
rename to sysdeps/x86_64/multiarch/strpbrk-sse2.c
|
||
|
|
index c5b95d08ff09cb27..8a58f051c35163dd 100644
|
||
|
|
--- a/sysdeps/x86_64/multiarch/strpbrk-sse2.S
|
||
|
|
+++ b/sysdeps/x86_64/multiarch/strpbrk-sse2.c
|
||
|
|
@@ -19,11 +19,10 @@
|
||
|
|
#if IS_IN (libc)
|
||
|
|
|
||
|
|
# include <sysdep.h>
|
||
|
|
-# define strcspn __strpbrk_sse2
|
||
|
|
+# define STRPBRK __strpbrk_sse2
|
||
|
|
|
||
|
|
# undef libc_hidden_builtin_def
|
||
|
|
-# define libc_hidden_builtin_def(strpbrk)
|
||
|
|
+# define libc_hidden_builtin_def(STRPBRK)
|
||
|
|
#endif
|
||
|
|
|
||
|
|
-#define USE_AS_STRPBRK
|
||
|
|
-#include <sysdeps/x86_64/strcspn.S>
|
||
|
|
+#include <string/strpbrk.c>
|
||
|
|
diff --git a/sysdeps/x86_64/strpbrk.S b/sysdeps/x86_64/strpbrk.S
|
||
|
|
deleted file mode 100644
|
||
|
|
index 21888a5b923974f9..0000000000000000
|
||
|
|
--- a/sysdeps/x86_64/strpbrk.S
|
||
|
|
+++ /dev/null
|
||
|
|
@@ -1,3 +0,0 @@
|
||
|
|
-#define strcspn strpbrk
|
||
|
|
-#define USE_AS_STRPBRK
|
||
|
|
-#include <sysdeps/x86_64/strcspn.S>
|