From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <goldstein.w.n@gmail.com>
Received: from mail-yw1-x112c.google.com (mail-yw1-x112c.google.com
 [IPv6:2607:f8b0:4864:20::112c])
 by sourceware.org (Postfix) with ESMTPS id ED3ED3858D3C
 for <libc-alpha@sourceware.org>; Wed, 20 Apr 2022 01:19:51 +0000 (GMT)
DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org ED3ED3858D3C
Received: by mail-yw1-x112c.google.com with SMTP id
 00721157ae682-2ec0bb4b715so2989697b3.5
 for <libc-alpha@sourceware.org>; Tue, 19 Apr 2022 18:19:51 -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=E4SFlVHXlIAPW04e9Xu7am2rSu0ucEMRK5Y2+PkC2ww=;
 b=wu/dMR3iZvyVznJvlAhHAVRK5sg7tl+6y3quW2vxJIzUmE47ueo6df7ZZYjQvGZOBX
 zolxGuiwoO+fC9j3mQVSTkYTOwhi5uKJCAIlihi9LVHCd+Crk8XWVoAmavxKMyqPQLSk
 xMsBBTvYD0AN0phjlMLue4aFxaHHf4XzkKkpeRXMLD/NPElIM/yzpBVdvkbDmUU6ry32
 jWhApcjMCP92lChZ5HPieuM3nnB5EkionCjamTkn4ug+tPj8J+vwGNAQnNkIHtI/6ImU
 RvzCwJv5gkY/pQmrwzSYHhx7U1tpaQCQYOlKxD+8vsScufclwr4NHayr3GGdSM4ML5Sb
 /7WA==
X-Gm-Message-State: AOAM531LjTUvvnCMOyEKqvYemIqOSYORzseSMVuGBIQub9tpxFab0KTr
 G+hwCMGTutopLfRMRikn+2G97MqS9rUXccEZ6v8=
X-Google-Smtp-Source: ABdhPJw55E+7TmSQVp5DANAy2UfldQe7OreUc6/EKFG0qSUBcGWhN5njcckTExHOttbgKCVgv+Lh3DW3xYMjgb2BJAU=
X-Received: by 2002:a81:316:0:b0:2eb:ed46:e1b6 with SMTP id
 22-20020a810316000000b002ebed46e1b6mr18324964ywd.372.1650417591362; Tue, 19
 Apr 2022 18:19:51 -0700 (PDT)
MIME-Version: 1.0
References: <20220419225550.646821-1-goldstein.w.n@gmail.com>
 <20220419235252.765256-1-goldstein.w.n@gmail.com>
 <CAMe9rOptUX1Ay9hn-y0addiext4ZKH8iYagZcXiHhRfkxiQ9tA@mail.gmail.com>
In-Reply-To: <CAMe9rOptUX1Ay9hn-y0addiext4ZKH8iYagZcXiHhRfkxiQ9tA@mail.gmail.com>
From: Noah Goldstein <goldstein.w.n@gmail.com>
Date: Tue, 19 Apr 2022 20:19:40 -0500
Message-ID: <CAFUsyf+09WpE1BJdGc3stMNuYMy3Q4p7G3CXOCo+Nck9CqurRg@mail.gmail.com>
Subject: Re: [PATCH v2] x86: Fix missing __wmemcmp def for disable-multiarch
 build
To: "H.J. Lu" <hjl.tools@gmail.com>
Cc: GNU C Library <libc-alpha@sourceware.org>,
 "Carlos O'Donell" <carlos@systemhalted.org>
Content-Type: text/plain; charset="UTF-8"
X-Spam-Status: No, score=-7.8 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 <libc-alpha.sourceware.org>
List-Unsubscribe: <https://sourceware.org/mailman/options/libc-alpha>,
 <mailto:libc-alpha-request@sourceware.org?subject=unsubscribe>
List-Archive: <https://sourceware.org/pipermail/libc-alpha/>
List-Post: <mailto:libc-alpha@sourceware.org>
List-Help: <mailto:libc-alpha-request@sourceware.org?subject=help>
List-Subscribe: <https://sourceware.org/mailman/listinfo/libc-alpha>,
 <mailto:libc-alpha-request@sourceware.org?subject=subscribe>
X-List-Received-Date: Wed, 20 Apr 2022 01:19:53 -0000

On Tue, Apr 19, 2022 at 6:56 PM H.J. Lu <hjl.tools@gmail.com> wrote:
>
> On Tue, Apr 19, 2022 at 4:53 PM Noah Goldstein <goldstein.w.n@gmail.com> wrote:
> >
> > 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.
> > ---
> >  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..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
> >     <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)
> > --
> > 2.25.1
> >
>
> LGTM.
>
> Reviewed-by: H.J. Lu <hjl.tools@gmail.com>
>
> Thanks.

Thanks pushed.
>
> --
> H.J.