From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7844) id AE5AB3857BB4; Fri, 17 Jun 2022 23:25:56 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AE5AB3857BB4 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Noah Goldstein To: glibc-cvs@sourceware.org Subject: [glibc] i386: Fix include paths for strspn, strcspn, and strpbrk X-Act-Checkin: glibc X-Git-Author: Noah Goldstein X-Git-Refname: refs/heads/master X-Git-Oldrev: 33ead027586c3371e6765f9070b9564a5ba7e89d X-Git-Newrev: e5446dfea11e969212939197b606424a718d9b65 Message-Id: <20220617232556.AE5AB3857BB4@sourceware.org> Date: Fri, 17 Jun 2022 23:25:56 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Jun 2022 23:25:56 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=e5446dfea11e969212939197b606424a718d9b65 commit e5446dfea11e969212939197b606424a718d9b65 Author: Noah Goldstein Date: Fri Jun 17 11:18:32 2022 -0700 i386: Fix include paths for strspn, strcspn, and strpbrk 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. Reviewed-by: Carlos O'Donell Tested-by: Carlos O'Donell Diff: --- 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