public inbox for glibc-cvs@sourceware.org help / color / mirror / Atom feed
From: Noah Goldstein <nwg@sourceware.org> To: glibc-cvs@sourceware.org Subject: [glibc] x86: Fix missing __wmemcmp def for disable-multiarch build Date: Wed, 20 Apr 2022 01:19:30 +0000 (GMT) [thread overview] Message-ID: <20220420011930.CEB7D3858D3C@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=c72a1a062a1ded52719802c07ab459e1fd54d2a6 commit c72a1a062a1ded52719802c07ab459e1fd54d2a6 Author: Noah Goldstein <goldstein.w.n@gmail.com> Date: Tue Apr 19 17:52:33 2022 -0500 x86: Fix missing __wmemcmp def for disable-multiarch build commit 8804157ad9da39631703b92315460808eac86b0c Author: Noah Goldstein <goldstein.w.n@gmail.com> 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 <hjl.tools@gmail.com> 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 <https://www.gnu.org/licenses/>. */ -#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 <https://www.gnu.org/licenses/>. */ -#define MEMCMP wmemcmp +#define MEMCMP __wmemcmp #define USE_AS_WMEMCMP 1 -#include "multiarch/memcmp-sse2.S" +#include "memcmp.S" + +weak_alias (__wmemcmp, wmemcmp)
reply other threads:[~2022-04-20 1:19 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220420011930.CEB7D3858D3C@sourceware.org \ --to=nwg@sourceware.org \ --cc=glibc-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).