[v1] x86-32: Fix include paths for strspn, strcspn, and strpbrk
Checks
Context |
Check |
Description |
dj/TryBot-apply_patch |
success
|
Patch applied to master at the time it was sent
|
dj/TryBot-32bit |
fail
|
Patch series failed to build
|
Commit Message
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
x86-32 files breaking the x32 build. This commit fixes that.
---
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(-)
Comments
* Noah Goldstein via Libc-alpha:
> 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
> x86-32 files breaking the x32 build. This commit fixes that.
“i386 build” I think. We generally use x32 for the 32-bit architecture
with the x86-64 instruction set.
Thanks,
Florian
On Fri, Jun 17, 2022 at 9:13 AM Florian Weimer <fweimer@redhat.com> wrote:
>
> * Noah Goldstein via Libc-alpha:
>
> > 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
> > x86-32 files breaking the x32 build. This commit fixes that.
>
> “i386 build” I think. We generally use x32 for the 32-bit architecture
> with the x86-64 instruction set.
Fixed in V2.
>
> Thanks,
> Florian
>
@@ -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
@@ -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>
@@ -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>