From: Noah Goldstein Date: Fri, 17 Jun 2022 18:18:32 +0000 (-0700) Subject: i386: Fix include paths for strspn, strcspn, and strpbrk X-Git-Tag: glibc-2.36~142 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e5446dfea11e969212939197b606424a718d9b65;p=thirdparty%2Fglibc.git 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 --git a/sysdeps/i386/i686/multiarch/strcspn-c.c b/sysdeps/i386/i686/multiarch/strcspn-c.c index ec230fb3830..47bfa663690 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 5db62053b38..9ef1708aa8d 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 bea09dea714..ce599c55a46 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