From patchwork Fri Jun 17 15:24:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Noah Goldstein X-Patchwork-Id: 55173 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B51C9386C583 for ; Fri, 17 Jun 2022 15:24:50 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B51C9386C583 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1655479490; bh=X033e9kS247ubn2n83YH1UkYWWSPu9fKU6PjIs2oUvk=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=jpPCFM/+Y+xXTvUaj2GBkGJLM1Xfd8/YWpTvdLN/opF7q1d2wVOUvKVsQiPGB7K1D N1FosXmsfJvZhI7L55CXw3Bsc8wJmiVzQNyDc7s2STjq+tcTpoQgCPWI+pDfSXbdSa 82bBQ3WE3cnazZ50kjBiISJJPqOgZZkDYLLTy4oY= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pl1-x635.google.com (mail-pl1-x635.google.com [IPv6:2607:f8b0:4864:20::635]) by sourceware.org (Postfix) with ESMTPS id 49618386F0D5 for ; Fri, 17 Jun 2022 15:24:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 49618386F0D5 Received: by mail-pl1-x635.google.com with SMTP id u18so4161212plb.3 for ; Fri, 17 Jun 2022 08:24:22 -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:mime-version :content-transfer-encoding; bh=X033e9kS247ubn2n83YH1UkYWWSPu9fKU6PjIs2oUvk=; b=eNorK3DDIe7TQOgDDSMMejtWHuudPhUFt1EOJOgDMYEWvvJKBJwP5RlPjSkEjhfLlZ H8dR8iioplkTH/VhFBOistNxvn2goHHicqMeiuvX+tsLh3nQofJotOHbAAwOu7cWDueD S814T36RkQVgqq1EVr1i5zDF/CVfQ2QyMBg2l0WFl6eXRNXgL/AgA8fp3GJJNWoDSWgU Y/dvR8MKdnmhCG+vjZjcKtMw5R88AlvO4AY6ZEi70XYBBKcqVMMrmcXw6lTQbO6Ykk// hBb/TmgEMdDpbktD77jZ0r38dOy9mqLOrUwnEgSMFhfRPuUFyroL8D+BQ61RnNJrw6I7 TY3g== X-Gm-Message-State: AJIora8BolT9d/Dh/wtlRexeLzA1ui3BW2GvAk976IsnLSFjqaf+Y222 UZsU1ke0rBKd22dtyQZ6LaghQI09UuI= X-Google-Smtp-Source: AGRyM1uaoavsLpUi1ZfsTIRXAzuvVGTqG9e8hIwHq7LhbP5QD4E1fYMe0+SZA4UUU32t0o4BbK7jsg== X-Received: by 2002:a17:902:aa4b:b0:164:11ad:af0f with SMTP id c11-20020a170902aa4b00b0016411adaf0fmr10260411plr.54.1655479461003; Fri, 17 Jun 2022 08:24:21 -0700 (PDT) Received: from noah-tgl.. ([192.55.60.47]) by smtp.gmail.com with ESMTPSA id ih15-20020a17090b430f00b001ead6fca7e0sm3479154pjb.4.2022.06.17.08.24.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jun 2022 08:24:20 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH v1] x86-32: Fix include paths for strspn, strcspn, and strpbrk Date: Fri, 17 Jun 2022 08:24:17 -0700 Message-Id: <20220617152417.1614990-1-goldstein.w.n@gmail.com> X-Mailer: git-send-email 2.34.1 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+patchwork=sourceware.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 x32 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