public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Noah Goldstein <nwg@sourceware.org>
To: glibc-cvs@sourceware.org
Subject: [glibc] i386: Fix include paths for strspn, strcspn, and strpbrk
Date: Fri, 17 Jun 2022 23:25:56 +0000 (GMT) [thread overview]
Message-ID: <20220617232556.AE5AB3857BB4@sourceware.org> (raw)
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=e5446dfea11e969212939197b606424a718d9b65
commit e5446dfea11e969212939197b606424a718d9b65
Author: Noah Goldstein <goldstein.w.n@gmail.com>
Date: Fri Jun 17 11:18:32 2022 -0700
i386: Fix include paths for strspn, strcspn, and strpbrk
commit c22eb807b0c8125101f6a274795425be2bbd0386
Author: Noah Goldstein <goldstein.w.n@gmail.com>
Date: Thu Jun 16 15:07:12 2022 -0700
x86: Rename generic functions with unique postfix for clarity
Changed the names of the strspn-c, strcspn-c, and strpbrk-c files
in a general refactor. It didn't change the include paths for the
i386 files breaking the i386 build. This commit fixes that.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Tested-by: Carlos O'Donell <carlos@redhat.com>
Diff:
---
sysdeps/i386/i686/multiarch/strcspn-c.c | 4 ++--
sysdeps/i386/i686/multiarch/strpbrk-c.c | 4 ++--
sysdeps/i386/i686/multiarch/strspn-c.c | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/sysdeps/i386/i686/multiarch/strcspn-c.c b/sysdeps/i386/i686/multiarch/strcspn-c.c
index ec230fb383..47bfa66369 100644
--- a/sysdeps/i386/i686/multiarch/strcspn-c.c
+++ b/sysdeps/i386/i686/multiarch/strcspn-c.c
@@ -1,4 +1,4 @@
#if IS_IN (libc)
-# define __strcspn_sse2 __strcspn_ia32
-# include <sysdeps/x86_64/multiarch/strcspn-c.c>
+# define __strcspn_generic __strcspn_ia32
+# include <sysdeps/x86_64/multiarch/strcspn-sse4.c>
#endif
diff --git a/sysdeps/i386/i686/multiarch/strpbrk-c.c b/sysdeps/i386/i686/multiarch/strpbrk-c.c
index 5db62053b3..9ef1708aa8 100644
--- a/sysdeps/i386/i686/multiarch/strpbrk-c.c
+++ b/sysdeps/i386/i686/multiarch/strpbrk-c.c
@@ -1,2 +1,2 @@
-#define __strpbrk_sse2 __strpbrk_ia32
-#include <sysdeps/x86_64/multiarch/strpbrk-c.c>
+#define __strpbrk_generic __strpbrk_ia32
+#include <sysdeps/x86_64/multiarch/strpbrk-sse4.c>
diff --git a/sysdeps/i386/i686/multiarch/strspn-c.c b/sysdeps/i386/i686/multiarch/strspn-c.c
index bea09dea71..ce599c55a4 100644
--- a/sysdeps/i386/i686/multiarch/strspn-c.c
+++ b/sysdeps/i386/i686/multiarch/strspn-c.c
@@ -1,2 +1,2 @@
-#define __strspn_sse2 __strspn_ia32
-#include <sysdeps/x86_64/multiarch/strspn-c.c>
+#define __strspn_generic __strspn_ia32
+#include <sysdeps/x86_64/multiarch/strspn-sse4.c>
reply other threads:[~2022-06-17 23:25 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20220617232556.AE5AB3857BB4@sourceware.org \
--to=nwg@sourceware.org \
--cc=glibc-cvs@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).