| Message ID | 20220617162456.1617093-1-goldstein.w.n@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v2] x86-32: Fix include paths for strspn, strcspn, and strpbrk | expand |
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 >
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.
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>
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(-)