From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <hjl.tools@gmail.com>
Received: from mail-pj1-x1033.google.com (mail-pj1-x1033.google.com
 [IPv6:2607:f8b0:4864:20::1033])
 by sourceware.org (Postfix) with ESMTPS id 274113858D3C
 for <libc-alpha@sourceware.org>; Tue, 19 Apr 2022 23:36:59 +0000 (GMT)
DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 274113858D3C
Received: by mail-pj1-x1033.google.com with SMTP id
 mp16-20020a17090b191000b001cb5efbcab6so3338371pjb.4
 for <libc-alpha@sourceware.org>; Tue, 19 Apr 2022 16:36:59 -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=P5b1AwASBY0Lig6SRJiMIg8TY6JKc4SPwYyUCXI0LSw=;
 b=rczqBZvBitLNGzyRhb39EqnENtRPlgWXKO/zdMx8G/IoWa1yfRZ8ee6SSbZicE5BCx
 NiXHf1T8Q+2niwQrVn1/qqvgQOo9wXLfv5VaamNwwvPm/hW5B21pxa1r6ta3V8ooDqnd
 AnK/q3elOc948UuF0StB3VbPvxhsHWhXe+niVfWT2tHtwGTQODNb8uI6Le7PjTZv+HXV
 lyuBArMxJMZ6++0ZdJhMsjbsMmv632caXme43D4iiXIvfZuwTaNRc//4+0WlO+VeC3Vw
 RRSjlTzf3vxJQ/nOlFduWV9LMV6qIhyndvUeVdM8CH1Gc0G714hndoarUHd/hajWXT6+
 E3eQ==
X-Gm-Message-State: AOAM5331ksridlLU2DYshg0ApfcaPuZTy3csZaAeeY4Yvlmz2QXubW2W
 bmpN7MLy6hOmdHwWL322/6KNpqvLbhj2bfK/l9ezt3+jC6c=
X-Google-Smtp-Source: ABdhPJyX1vLZTf7bZBkRYCZSF9bstohBw9+55V2WVSB9BGkMol7J8MVABP1iLS8djdngLnl4UxLmtcZDtyEvH9ZZla4=
X-Received: by 2002:a17:90b:4c8f:b0:1d2:90e4:26ef with SMTP id
 my15-20020a17090b4c8f00b001d290e426efmr1156157pjb.120.1650411418086; Tue, 19
 Apr 2022 16:36:58 -0700 (PDT)
MIME-Version: 1.0
References: <20220419225550.646821-1-goldstein.w.n@gmail.com>
In-Reply-To: <20220419225550.646821-1-goldstein.w.n@gmail.com>
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Tue, 19 Apr 2022 16:36:22 -0700
Message-ID: <CAMe9rOr6bTmCvG0pFvkThNseEP9e=S15ch9NQJw3CfwUgdPdtw@mail.gmail.com>
Subject: Re: [PATCH v1] x86: Fix missing __wmemcmp def for disable-multiarch
 build
To: Noah Goldstein <goldstein.w.n@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=-3026.0 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: Tue, 19 Apr 2022 23:37:01 -0000

On Tue, Apr 19, 2022 at 3:55 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, 9 insertions(+), 5 deletions(-)
>
> diff --git a/sysdeps/x86_64/multiarch/wmemcmp-sse2.S b/sysdeps/x86_64/multiarch/wmemcmp-sse2.S
> index 57be1c446e..92d6819cb3 100644
> --- a/sysdeps/x86_64/multiarch/wmemcmp-sse2.S
> +++ b/sysdeps/x86_64/multiarch/wmemcmp-sse2.S
> @@ -16,10 +16,12 @@
>     License along with the GNU C Library; if not, see
>     <https://www.gnu.org/licenses/>.  */
>
> +#define USE_AS_WMEMCMP 1
>  #if IS_IN (libc)

Do we need to check "IS_IN (libc)" here?

>  # define MEMCMP        __wmemcmp_sse2
> +# include "memcmp-sse2.S"
>  #else
> -# define MEMCMP        wmemcmp
> +# define MEMCMP        __wmemcmp
> +# include "../memcmp.S"
> +weak_alias (__wmemcmp, wmemcmp)
>  #endif
> -#define USE_AS_WMEMCMP 1
> -#include "memcmp-sse2.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
>


-- 
H.J.