From patchwork Fri Jun 17 16:24:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Noah Goldstein X-Patchwork-Id: 1644890 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=f5mnzxhw; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LPksr07y8z9s75 for ; Sat, 18 Jun 2022 02:25:19 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 44D1E3858C53 for ; Fri, 17 Jun 2022 16:25:17 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 44D1E3858C53 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1655483117; bh=uyDRQPRrOruqQiz904lmrlZBZrYT4i8itis1Kz0ZxVo=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=f5mnzxhwQIV9Zlc39lOS27WsNuKmNUpEcid6cfBqDH8De0a284RQHm77CMzjnNFx2 MoC7rsAPPcp7Kt02cs/ifYmk5UH6SkPQPy292XJEu5IBn/lixAUkBkHRdUI44OX92i nZH0iTxKTAkKw9R6GmLf0Av/41BqRuyYb7t71U6o= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pj1-x102a.google.com (mail-pj1-x102a.google.com [IPv6:2607:f8b0:4864:20::102a]) by sourceware.org (Postfix) with ESMTPS id C799C3858C53 for ; Fri, 17 Jun 2022 16:25:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C799C3858C53 Received: by mail-pj1-x102a.google.com with SMTP id gd1so4336317pjb.2 for ; Fri, 17 Jun 2022 09:25:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uyDRQPRrOruqQiz904lmrlZBZrYT4i8itis1Kz0ZxVo=; b=vDOWoyTT6+dK4m1EejhnXwq8rFDndR+kbnBRvusqeg98xG/MNCezjMVJODCcAg10DJ eyz4c3OrTRNGhVZCtVeoRaNfvg5nBS+7GGyl140Ohi5lQgnqM9UHxautnIledjRdzrjp usN9QT0Ktm4mK1R5NKBRm1V+w57O/EFOFHNJlp6FwTRlirpH4AuSzagSLBieeCP7m8k8 vSGngyOFvh1qHUt0aqajsgSFpqth16kX9sMTIT9H4R+6QsItG4xqLTh2JjPvMmtSx3y7 OwHfIpPIFvqSCZmgDluhFQOKADkNrn3l9QewyDAohuVSWogssGZLCGe9g7YC7h9b5d7W EcOw== X-Gm-Message-State: AJIora/Ppz39f6qUf5+eCEaD6hgqN+GMZOO2wbgAGFqDxFrCV7+nwI6N vsquWywMRXR00ewCsuRWuHCi7Zd9vKg= X-Google-Smtp-Source: AGRyM1v6TVu3YN9d9Kmr1Jb1bPay36lbwsGEvNnU+yFDSB775A/PbNkXE5OB/fBl+XNlQ+tI5jNbCQ== X-Received: by 2002:a17:90b:4a83:b0:1e6:4b34:b760 with SMTP id lp3-20020a17090b4a8300b001e64b34b760mr22324733pjb.114.1655483099643; Fri, 17 Jun 2022 09:24:59 -0700 (PDT) Received: from noah-tgl.. ([192.55.60.47]) by smtp.gmail.com with ESMTPSA id f19-20020aa782d3000000b0051bc36b7995sm3892771pfn.62.2022.06.17.09.24.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jun 2022 09:24:59 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH v2] x86-32: Fix include paths for strspn, strcspn, and strpbrk Date: Fri, 17 Jun 2022 09:24:56 -0700 Message-Id: <20220617162456.1617093-1-goldstein.w.n@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220617152417.1614990-1-goldstein.w.n@gmail.com> References: <20220617152417.1614990-1-goldstein.w.n@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-12.0 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-Patchwork-Original-From: Noah Goldstein via Libc-alpha From: Noah Goldstein Reply-To: Noah Goldstein Errors-To: libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org Sender: "Libc-alpha" 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 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 +# 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