From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-vs1-xe33.google.com (mail-vs1-xe33.google.com [IPv6:2607:f8b0:4864:20::e33]) by sourceware.org (Postfix) with ESMTPS id 95D103943409; Thu, 12 May 2022 20:05:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 95D103943409 Received: by mail-vs1-xe33.google.com with SMTP id w124so6347097vsb.8; Thu, 12 May 2022 13:05:32 -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=RBJ49pTe/DJ3XV1gYNwrnSNGBdEp0ZQl0ExbX7/qVqM=; b=QdRIyyivkk/loNuO6tAV1lrCwvWpyWV2hg/9pz+p9ErexwK15p//m3KmM+9ujzaVB2 aRZNxZEqp23HGX9hv6L4YlObnN2C3NwsmbBC0HTjjZV4PHtdDiy6S+RAnk29sWYpO8W+ bvaYpXNiyekPQJQ8byjCSxbDTTpAQBcT3xyo9Ccy9hp3pSZPUVgjYh8jwr4hCexb19xt QWAD06BbL0TFRPy4XHfEwUmqKhO/L6y9VVjnmcEkG5FWyV5DSwwy13jN+RYmcW3gnSjE DFXH1V4JCD6gzSf6uxjuoFzi4ihDToV+/P+zRMF4iK+3XiSY0v+i7flgB0B/SC8SOdVu AFOg== X-Gm-Message-State: AOAM532OsgUi/9TFMg/kWilkGNsb00d4Yn9aE+AeL5edOMlphM/ppqqN u63NGKSnQnQdAajttrlq6N7RGZ3ULiTdLbtOC8uu6xuLWv4= X-Google-Smtp-Source: ABdhPJxilvE9FlVnxuBmBuY1jlC1jvAfFnAnWIex9Y3MqaGQJt48960sWYpumTGIZ3KPpNuEw1jnJ7C3aCCsJ/KDgmA= X-Received: by 2002:a67:ef0a:0:b0:32d:4bb9:23f with SMTP id j10-20020a67ef0a000000b0032d4bb9023fmr1008965vsr.47.1652385932017; Thu, 12 May 2022 13:05:32 -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: From: Sunil Pandey Date: Thu, 12 May 2022 13:04:56 -0700 Message-ID: Subject: Re: [PATCH v2] x86: Fix missing __wmemcmp def for disable-multiarch build To: Noah Goldstein , Libc-stable Mailing List Cc: "H.J. Lu" , GNU C Library 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_ENVFROM_END_DIGIT, FREEMAIL_FROM, GIT_PATCH_0, HK_RANDOM_ENVFROM, HK_RANDOM_FROM, 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.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-stable@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-stable mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 May 2022 20:05:34 -0000 On Tue, Apr 19, 2022 at 6:20 PM Noah Goldstein via Libc-alpha wrote: > > On Tue, Apr 19, 2022 at 6:56 PM H.J. Lu wrote: > > > > 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. > > Thanks pushed. > > > > -- > > H.J. I would like to backport this patch to release branches. Any comments or objections? --Sunil