From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7852) id B41ED385E02C; Mon, 16 May 2022 20:20:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B41ED385E02C Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Sunil Pandey To: glibc-cvs@sourceware.org Subject: [glibc/release/2.35/master] x86: Fix missing __wmemcmp def for disable-multiarch build X-Act-Checkin: glibc X-Git-Author: Noah Goldstein X-Git-Refname: refs/heads/release/2.35/master X-Git-Oldrev: cee9939f67607483110bad9db84c62ce9d71721b X-Git-Newrev: 4d1841deb740f23ab063a65fd875e53934b65883 Message-Id: <20220516202012.B41ED385E02C@sourceware.org> Date: Mon, 16 May 2022 20:20:12 +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: Mon, 16 May 2022 20:20:12 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=4d1841deb740f23ab063a65fd875e53934b65883 commit 4d1841deb740f23ab063a65fd875e53934b65883 Author: Noah Goldstein Date: Tue Apr 19 17:52:33 2022 -0500 x86: Fix missing __wmemcmp def for disable-multiarch build commit 8804157ad9da39631703b92315460808eac86b0c Author: Noah Goldstein Date: Fri Apr 15 12:27:59 2022 -0500 x86: Optimize memcmp SSE2 in memcmp.S Only defined wmemcmp and missed __wmemcmp. This commit fixes that by defining __wmemcmp and setting wmemcmp as a weak alias to __wmemcmp. Both multiarch and disable-multiarch builds succeed and full xchecks pass. Reviewed-by: H.J. Lu (cherry picked from commit c72a1a062a1ded52719802c07ab459e1fd54d2a6) Diff: --- sysdeps/x86_64/multiarch/wmemcmp-sse2.S | 8 ++------ sysdeps/x86_64/wmemcmp.S | 6 ++++-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/sysdeps/x86_64/multiarch/wmemcmp-sse2.S b/sysdeps/x86_64/multiarch/wmemcmp-sse2.S index 57be1c446e..f09192ed77 100644 --- a/sysdeps/x86_64/multiarch/wmemcmp-sse2.S +++ b/sysdeps/x86_64/multiarch/wmemcmp-sse2.S @@ -16,10 +16,6 @@ License along with the GNU C Library; if not, see . */ -#if IS_IN (libc) -# define MEMCMP __wmemcmp_sse2 -#else -# define MEMCMP wmemcmp -#endif #define USE_AS_WMEMCMP 1 -#include "memcmp-sse2.S" +#define MEMCMP __wmemcmp_sse2 +#include "../memcmp.S" diff --git a/sysdeps/x86_64/wmemcmp.S b/sysdeps/x86_64/wmemcmp.S index 032f389158..815b999e4e 100644 --- a/sysdeps/x86_64/wmemcmp.S +++ b/sysdeps/x86_64/wmemcmp.S @@ -16,6 +16,8 @@ License along with the GNU C Library; if not, see . */ -#define MEMCMP wmemcmp +#define MEMCMP __wmemcmp #define USE_AS_WMEMCMP 1 -#include "multiarch/memcmp-sse2.S" +#include "memcmp.S" + +weak_alias (__wmemcmp, wmemcmp)