public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc] i386: Fix include paths for strspn, strcspn, and strpbrk
@ 2022-06-17 23:25 Noah Goldstein
0 siblings, 0 replies; only message in thread
From: Noah Goldstein @ 2022-06-17 23:25 UTC (permalink / raw)
To: glibc-cvs
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>
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-06-17 23:25 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-17 23:25 [glibc] i386: Fix include paths for strspn, strcspn, and strpbrk Noah Goldstein
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).