From: Carlos O'Donell <carlos@redhat.com>
To: Noah Goldstein <goldstein.w.n@gmail.com>,
libc-alpha@sourceware.org, DJ Delorie <dj@redhat.com>
Subject: Re: [PATCH v3] i386: Fix include paths for strspn, strcspn, and strpbrk
Date: Fri, 17 Jun 2022 17:49:47 -0400 [thread overview]
Message-ID: <bae8a241-9210-ae1f-2e51-ce37b55e2c40@redhat.com> (raw)
In-Reply-To: <20220617181832.1647010-1-goldstein.w.n@gmail.com>
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.
next prev parent reply other threads:[~2022-06-17 21:49 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-17 15:24 [PATCH v1] x86-32: " 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 [this message]
2022-06-18 4:02 ` Noah Goldstein
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=bae8a241-9210-ae1f-2e51-ce37b55e2c40@redhat.com \
--to=carlos@redhat.com \
--cc=dj@redhat.com \
--cc=goldstein.w.n@gmail.com \
--cc=libc-alpha@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).