about summary refs log tree commit diff
path: root/sysdeps
diff options
context:
space:
mode:
authorNoah Goldstein <goldstein.w.n@gmail.com>2022-03-23 16:57:27 -0500
committerNoah Goldstein <goldstein.w.n@gmail.com>2022-03-25 11:46:13 -0500
commit653358535280a599382cb6c77538a187dac6a87f (patch)
treef7375b7bc149f1a1edb38de9bdf2eecadf901cf7 /sysdeps
parentfe28e7d9d9535ebab4081d195c553b4fbf39d9ae (diff)
downloadglibc-653358535280a599382cb6c77538a187dac6a87f.tar.gz
glibc-653358535280a599382cb6c77538a187dac6a87f.tar.xz
glibc-653358535280a599382cb6c77538a187dac6a87f.zip
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>
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/x86_64/multiarch/strpbrk-sse2.c (renamed from sysdeps/x86_64/multiarch/strpbrk-sse2.S)9
-rw-r--r--sysdeps/x86_64/strpbrk.S3
2 files changed, 4 insertions, 8 deletions
diff --git a/sysdeps/x86_64/multiarch/strpbrk-sse2.S b/sysdeps/x86_64/multiarch/strpbrk-sse2.c
index d537b6c27b..d03214c4fb 100644
--- a/sysdeps/x86_64/multiarch/strpbrk-sse2.S
+++ b/sysdeps/x86_64/multiarch/strpbrk-sse2.c
@@ -1,4 +1,4 @@
-/* strpbrk optimized with SSE2.
+/* strpbrk.
    Copyright (C) 2017-2022 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -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 21888a5b92..0000000000
--- 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>