* [PATCH v1] x86-32: Fix include paths for strspn, strcspn, and strpbrk
@ 2022-06-17 15:24 Noah Goldstein
2022-06-17 16:13 ` Florian Weimer
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Noah Goldstein @ 2022-06-17 15:24 UTC (permalink / raw)
To: 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.
---
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>
--
2.34.1
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v1] x86-32: Fix include paths for strspn, strcspn, and strpbrk
2022-06-17 15:24 [PATCH v1] x86-32: Fix include paths for strspn, strcspn, and strpbrk Noah Goldstein
@ 2022-06-17 16:13 ` Florian Weimer
2022-06-17 16:25 ` Noah Goldstein
2022-06-17 16:24 ` [PATCH v2] " Noah Goldstein
2022-06-17 18:18 ` [PATCH v3] i386: " Noah Goldstein
2 siblings, 1 reply; 9+ messages in thread
From: Florian Weimer @ 2022-06-17 16:13 UTC (permalink / raw)
To: Noah Goldstein via Libc-alpha
* 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
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v2] x86-32: Fix include paths for strspn, strcspn, and strpbrk
2022-06-17 15:24 [PATCH v1] x86-32: Fix include paths for strspn, strcspn, and strpbrk Noah Goldstein
2022-06-17 16:13 ` Florian Weimer
@ 2022-06-17 16:24 ` Noah Goldstein
2022-06-17 17:47 ` H.J. Lu
2022-06-17 18:18 ` [PATCH v3] i386: " Noah Goldstein
2 siblings, 1 reply; 9+ messages in thread
From: Noah Goldstein @ 2022-06-17 16:24 UTC (permalink / raw)
To: 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 i386 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(-)
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>
--
2.34.1
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v1] x86-32: Fix include paths for strspn, strcspn, and strpbrk
2022-06-17 16:13 ` Florian Weimer
@ 2022-06-17 16:25 ` Noah Goldstein
0 siblings, 0 replies; 9+ messages in thread
From: Noah Goldstein @ 2022-06-17 16:25 UTC (permalink / raw)
To: Florian Weimer; +Cc: Noah Goldstein via Libc-alpha
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
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2] x86-32: Fix include paths for strspn, strcspn, and strpbrk
2022-06-17 16:24 ` [PATCH v2] " Noah Goldstein
@ 2022-06-17 17:47 ` H.J. Lu
2022-06-17 18:18 ` Noah Goldstein
0 siblings, 1 reply; 9+ messages in thread
From: H.J. Lu @ 2022-06-17 17:47 UTC (permalink / raw)
To: Noah Goldstein; +Cc: GNU C Library, Carlos O'Donell
On Fri, Jun 17, 2022 at 9:25 AM Noah Goldstein <goldstein.w.n@gmail.com> wrote:
>
> 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 i386 build. This commit fixes that.
Please use i386 instead of x86-32. OK with this change.
Thanks.
> ---
> 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>
> --
> 2.34.1
>
--
H.J.
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v3] i386: Fix include paths for strspn, strcspn, and strpbrk
2022-06-17 15:24 [PATCH v1] x86-32: Fix include paths for strspn, strcspn, and strpbrk Noah Goldstein
2022-06-17 16:13 ` Florian Weimer
2022-06-17 16:24 ` [PATCH v2] " Noah Goldstein
@ 2022-06-17 18:18 ` Noah Goldstein
2022-06-17 21:49 ` Carlos O'Donell
2 siblings, 1 reply; 9+ messages in thread
From: Noah Goldstein @ 2022-06-17 18:18 UTC (permalink / raw)
To: 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
i386 files breaking the i386 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(-)
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>
--
2.34.1
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2] x86-32: Fix include paths for strspn, strcspn, and strpbrk
2022-06-17 17:47 ` H.J. Lu
@ 2022-06-17 18:18 ` Noah Goldstein
0 siblings, 0 replies; 9+ messages in thread
From: Noah Goldstein @ 2022-06-17 18:18 UTC (permalink / raw)
To: H.J. Lu; +Cc: GNU C Library, Carlos O'Donell
On Fri, Jun 17, 2022 at 10:47 AM H.J. Lu <hjl.tools@gmail.com> wrote:
>
> On Fri, Jun 17, 2022 at 9:25 AM Noah Goldstein <goldstein.w.n@gmail.com> wrote:
> >
> > 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 i386 build. This commit fixes that.
>
> Please use i386 instead of x86-32. OK with this change.
Fixed in V3.
>
> Thanks.
>
> > ---
> > 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>
> > --
> > 2.34.1
> >
>
>
> --
> H.J.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v3] i386: Fix include paths for strspn, strcspn, and strpbrk
2022-06-17 18:18 ` [PATCH v3] i386: " Noah Goldstein
@ 2022-06-17 21:49 ` Carlos O'Donell
2022-06-18 4:02 ` Noah Goldstein
0 siblings, 1 reply; 9+ messages in thread
From: Carlos O'Donell @ 2022-06-17 21:49 UTC (permalink / raw)
To: Noah Goldstein, libc-alpha, DJ Delorie
On 6/17/22 14:18, Noah Goldstein via Libc-alpha wrote:
> 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.
Thank you :-)
This fixes my regtester and CI/CD (which has gone red since this commit).
CI/CD caught the i686 build failure:
https://patchwork.sourceware.org/project/glibc/patch/20220610005840.557184-1-goldstein.w.n@gmail.com/
DJ and I are working to get CI/CD to notify patch submissions
by email when a regression is detected. My apologies that this
isn't well integrated yet. We're trying to make this better for
developers and reviewers.
LGTM.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Tested-by: Carlos O'Donell <carlos@redhat.com>
> ---
> 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>
--
Cheers,
Carlos.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v3] i386: Fix include paths for strspn, strcspn, and strpbrk
2022-06-17 21:49 ` Carlos O'Donell
@ 2022-06-18 4:02 ` Noah Goldstein
0 siblings, 0 replies; 9+ messages in thread
From: Noah Goldstein @ 2022-06-18 4:02 UTC (permalink / raw)
To: Carlos O'Donell; +Cc: GNU C Library, DJ Delorie
On Fri, Jun 17, 2022 at 2:49 PM Carlos O'Donell <carlos@redhat.com> wrote:
>
> On 6/17/22 14:18, Noah Goldstein via Libc-alpha wrote:
> > 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.
>
> Thank you :-)
Sorry for pushing the bug :(
>
> This fixes my regtester and CI/CD (which has gone red since this commit).
>
> CI/CD caught the i686 build failure:
> https://patchwork.sourceware.org/project/glibc/patch/20220610005840.557184-1-goldstein.w.n@gmail.com/
>
> DJ and I are working to get CI/CD to notify patch submissions
> by email when a regression is detected. My apologies that this
> isn't well integrated yet. We're trying to make this better for
> developers and reviewers.
>
> LGTM.
>
> Reviewed-by: Carlos O'Donell <carlos@redhat.com>
> Tested-by: Carlos O'Donell <carlos@redhat.com>
Thanks and pushed.
>
> > ---
> > 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>
>
>
> --
> Cheers,
> Carlos.
>
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2022-06-18 4:02 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-17 15:24 [PATCH v1] x86-32: Fix include paths for strspn, strcspn, and strpbrk Noah Goldstein
2022-06-17 16:13 ` Florian Weimer
2022-06-17 16:25 ` Noah Goldstein
2022-06-17 16:24 ` [PATCH v2] " Noah Goldstein
2022-06-17 17:47 ` H.J. Lu
2022-06-17 18:18 ` Noah Goldstein
2022-06-17 18:18 ` [PATCH v3] i386: " Noah Goldstein
2022-06-17 21:49 ` Carlos O'Donell
2022-06-18 4:02 ` 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).