From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-yb1-xb29.google.com (mail-yb1-xb29.google.com [IPv6:2607:f8b0:4864:20::b29]) by sourceware.org (Postfix) with ESMTPS id 8CCAE3857BB7 for ; Sat, 18 Jun 2022 04:02:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 8CCAE3857BB7 Received: by mail-yb1-xb29.google.com with SMTP id l11so10208614ybu.13 for ; Fri, 17 Jun 2022 21:02:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=QDhwqpe/OqMTDbhNoAINmC8DEXUcCUWkyabhl92xdUs=; b=fLeXgArTCtV6w9fEK5eHSjmWYBJluNjW/5ZrLHB2RpiXymxFxzR3xmO/Ng11NkaXor J7x+Hovg08Q8JGYzEl3DBBVkRP9DZMi6PjyMdboSQd6Gu7p1pb5ltj5MmGeR0z9o3Mg6 EgLNhgf/kz1/rDgjUAK5pb54G2NGmoWNtGGsNycYlF7/7bWR8wuRHsxLc6GLJmqKobdM KXGzxpCSOLKQaErOqt3w4X0ek40myyzTYep9idqrbHFG2cHzKuB+kpuAvohZqKJnkOHZ tha115/NpldkwoUktfeH5785ehQ6eS2K2erEZLz+5kit/0wXS/0ZBdp33US+SovqxhkA mb4w== X-Gm-Message-State: AJIora8ClXW1dhQzq3YdjGvpohcHCAnKxnQC4rFOVn20SPa4tO9a1N4I voDdrSvkQIlkZBlOEsRyUFadxEXV7Nh7QJrIISc= X-Google-Smtp-Source: AGRyM1uKP2YNVzu9vjKbWyylYirb9wT9IbGAP6mXIb1ZxJvUBVqQbtvCMZgFMY2GlGXdxIUkbvsRAr/beUVR4BIlKGg= X-Received: by 2002:a25:6a09:0:b0:668:ca3e:e0f8 with SMTP id f9-20020a256a09000000b00668ca3ee0f8mr4005475ybc.249.1655524961825; Fri, 17 Jun 2022 21:02:41 -0700 (PDT) MIME-Version: 1.0 References: <20220617152417.1614990-1-goldstein.w.n@gmail.com> <20220617181832.1647010-1-goldstein.w.n@gmail.com> In-Reply-To: From: Noah Goldstein Date: Fri, 17 Jun 2022 21:02:30 -0700 Message-ID: Subject: Re: [PATCH v3] i386: Fix include paths for strspn, strcspn, and strpbrk To: "Carlos O'Donell" Cc: GNU C Library , DJ Delorie Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-8.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Jun 2022 04:02:45 -0000 On Fri, Jun 17, 2022 at 2:49 PM Carlos O'Donell wrote: > > On 6/17/22 14:18, Noah Goldstein via Libc-alpha wrote: > > commit c22eb807b0c8125101f6a274795425be2bbd0386 > > Author: Noah Goldstein > > 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 > Tested-by: Carlos O'Donell 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 > > +# define __strcspn_generic __strcspn_ia32 > > +# include > > #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 > > +#define __strpbrk_generic __strpbrk_ia32 > > +#include > > 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 > > +#define __strspn_generic __strspn_ia32 > > +#include > > > -- > Cheers, > Carlos. >