From: Noah Goldstein <goldstein.w.n@gmail.com>
To: libc-alpha@sourceware.org
Subject: [PATCH v2] x86: Rename strstr_sse2 to strstr_generic as it uses string/strstr.c
Date: Fri, 24 Jun 2022 09:42:13 -0700 [thread overview]
Message-ID: <20220624164216.2129400-2-goldstein.w.n@gmail.com> (raw)
In-Reply-To: <20220624164216.2129400-1-goldstein.w.n@gmail.com>
This is in accordance with other files in the multiarch directory.
---
sysdeps/x86_64/multiarch/ifunc-impl-list.c | 2 +-
sysdeps/x86_64/multiarch/strstr-sse2-unaligned.S | 2 +-
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 ());
--
2.34.1
next prev parent reply other threads:[~2022-06-24 16:42 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-24 16:42 [PATCH v2] x86: Align entry for memrchr to 64-bytes Noah Goldstein
2022-06-24 16:42 ` Noah Goldstein [this message]
2022-06-24 17:06 ` [PATCH v2] x86: Rename strstr_sse2 to strstr_generic as it uses string/strstr.c H.J. Lu
2022-06-24 16:42 ` [PATCH v2] x86: Remove unused file wmemcmp-sse4 Noah Goldstein
2022-06-24 17:03 ` H.J. Lu
2022-06-24 16:42 ` [PATCH v2] x86: Put wcs{n}len-sse4.1 in the sse4.1 text section Noah Goldstein
2022-06-24 17:05 ` H.J. Lu
2022-07-14 3:02 ` Sunil Pandey
2022-06-24 16:42 ` [PATCH v2] x86: Add comment with ISA level for all targets support by GCC12.1 Noah Goldstein
2022-06-24 17:02 ` H.J. Lu
2022-06-24 17:15 ` [PATCH v2] x86: Align entry for memrchr to 64-bytes H.J. Lu
2022-07-14 2:59 ` Sunil Pandey
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220624164216.2129400-2-goldstein.w.n@gmail.com \
--to=goldstein.w.n@gmail.com \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).