From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 00DF938582B0 for ; Fri, 17 Jun 2022 21:49:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 00DF938582B0 Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-474-1bWwzV1FNtOaPaEP5cUTWQ-1; Fri, 17 Jun 2022 17:49:49 -0400 X-MC-Unique: 1bWwzV1FNtOaPaEP5cUTWQ-1 Received: by mail-qv1-f71.google.com with SMTP id w18-20020a0ce112000000b0046e7f2c5a06so4787097qvk.0 for ; Fri, 17 Jun 2022 14:49:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:references:from:organization:in-reply-to :content-transfer-encoding; bh=uC2GT10hDj+7ul4wMKAv/JPS+GSHBYbA5VU/7wlt3Ug=; b=jc+6hS5ANTKtLWykT541H90ZPMolrdMhONZx9cNvtcB9V7eYOrpidhym92i3oIndNw +L6mKKxOOwPcCVzwvKt5OlYsufVmUDmJoK2kj8lgP9Hi5MCTay3pRjlioee78wuqKchm TYTd7zSNYtNDadnYqe7RFdQ0S9BZoazxykUiRyGtLRKA4VnKg1l4BYmOR15kxqT82r8d CaXu9xEOWIPEJU+c/6qR/bNS+J+qcEQTNW+HIeBDBcMd3/DalaNw/4LZJWjUasSNUtOX KkmY0Xb+yLDRvUQjVg84i9gA8Imw+resiL1WA50UJUaXZJr4X/mN8j+xLmDpP92OYWL+ qSEw== X-Gm-Message-State: AJIora/1bYkiNVvDDXgQXnok+mbCEni1Q/+Y5UxN9S4o+c+7MfJbu7zl XekIi3CU48VsQ6VOYvVKsKBFD0VnIPcNtyTOifMgT1IZXYf6lGUqg7re1FTQv2fBBRlOMtIawee gD7a8L/3EXUhq80+MLMyH X-Received: by 2002:a05:620a:191e:b0:6a7:1373:30c7 with SMTP id bj30-20020a05620a191e00b006a7137330c7mr8612418qkb.404.1655502589308; Fri, 17 Jun 2022 14:49:49 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tfuB4bNaUO6oOUSRvRI1TsWS32zq4jFiRICrrnqv7IxbHfcymQLKTO5VM3YkWiVNK+tleY/g== X-Received: by 2002:a05:620a:191e:b0:6a7:1373:30c7 with SMTP id bj30-20020a05620a191e00b006a7137330c7mr8612404qkb.404.1655502589075; Fri, 17 Jun 2022 14:49:49 -0700 (PDT) Received: from [192.168.0.241] (135-23-175-80.cpe.pppoe.ca. [135.23.175.80]) by smtp.gmail.com with ESMTPSA id n80-20020a37a453000000b006a79f9d6521sm5108305qke.74.2022.06.17.14.49.48 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 17 Jun 2022 14:49:48 -0700 (PDT) Message-ID: Date: Fri, 17 Jun 2022 17:49:47 -0400 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.9.0 Subject: Re: [PATCH v3] i386: Fix include paths for strspn, strcspn, and strpbrk To: Noah Goldstein , libc-alpha@sourceware.org, DJ Delorie References: <20220617152417.1614990-1-goldstein.w.n@gmail.com> <20220617181832.1647010-1-goldstein.w.n@gmail.com> From: Carlos O'Donell Organization: Red Hat In-Reply-To: <20220617181832.1647010-1-goldstein.w.n@gmail.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-17.7 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, NICE_REPLY_A, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_NONE, 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: Fri, 17 Jun 2022 21:49:52 -0000 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 :-) 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 > --- > 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.