From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pl1-x632.google.com (mail-pl1-x632.google.com [IPv6:2607:f8b0:4864:20::632]) by sourceware.org (Postfix) with ESMTPS id 13EA33858D3C for ; Tue, 19 Apr 2022 23:56:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 13EA33858D3C Received: by mail-pl1-x632.google.com with SMTP id 12so188417pll.12 for ; Tue, 19 Apr 2022 16:56:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=9KLy1bj3RBqSEkyliMqp2mw59VMG+Inj7aXyHfFTYMc=; b=OhCKZ7AA9wduEzg9zMBqsENzP/pMrQV2TVfuX+8FitiO0GMMa7JCCwEG6Bb3nFVKsL oQX8+jC/pXdSueAijFKat/muLidwcbL+6n3F5eXJqaOXTJxSYu2vhKwJJQX5fOyAp9Ez phRYo7vz167HeZaGT6Z52C6JnM0RfhvPrnSlCXkm/r92COqaM6L59TvwGKmwAyOHrTk/ E4k4x9gc7u2JnosY4yVeCxChtWups0qqivem/xwEGbfBntysJMp5CLnY8P6IhO5MpONz fgdj1hW0n29fPvezGlSgiDKVpC2WkQEMpcumchwmzdNeV2+2lztKgR5E+tG4VGYtsY70 HNgw== X-Gm-Message-State: AOAM532nJUHl7Jcg+8BA1gVC6RWJQmeaOH3+vTSDkhuAA8bNhpSZKrse ao8+9azG2hfGcdAhMZQGUy6M5qqGD+1MYqWyT8s= X-Google-Smtp-Source: ABdhPJzIr1IN0q4zYIKyKmoWhf46YQEC7onfwOLlgtQQxqthTXw+0WUIZiVYS7F1lul5dUh0SE/OL34SKP8KQuSWL9g= X-Received: by 2002:a17:902:d2d2:b0:159:118:e10e with SMTP id n18-20020a170902d2d200b001590118e10emr11323032plc.102.1650412599029; Tue, 19 Apr 2022 16:56:39 -0700 (PDT) MIME-Version: 1.0 References: <20220419225550.646821-1-goldstein.w.n@gmail.com> <20220419235252.765256-1-goldstein.w.n@gmail.com> In-Reply-To: <20220419235252.765256-1-goldstein.w.n@gmail.com> From: "H.J. Lu" Date: Tue, 19 Apr 2022 16:56:03 -0700 Message-ID: Subject: Re: [PATCH v2] x86: Fix missing __wmemcmp def for disable-multiarch build To: Noah Goldstein Cc: GNU C Library , "Carlos O'Donell" Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-3025.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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-List-Received-Date: Tue, 19 Apr 2022 23:56:41 -0000 On Tue, Apr 19, 2022 at 4:53 PM Noah Goldstein wrote: > > 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. > --- > 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..8bd3cf80db 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) > -- > 2.25.1 > LGTM. Reviewed-by: H.J. Lu Thanks. -- H.J.