From patchwork Tue Apr 19 23:52:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Noah Goldstein X-Patchwork-Id: 53058 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 227453857823 for ; Tue, 19 Apr 2022 23:53:38 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 227453857823 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1650412418; bh=mpVSQDUKVnVT+shLt0mmfZXQivVAO3zuLcGEHl2h3mw=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=f4y2FgQZS8NWqvxOiGnl5BdlyvO6Q+8++7XUZvXPEuZsmBaw4iGQKV+rDdQxKksQo n+ZMOmobqXJE8XPl5bH7hfxrFDWvv8jHmOwjgFSrj9uQ4rpbvx0jopLfhy/evawJJd 1zbF9NHXRfSsJwdvhPOlZ+vtTSgvu+qE9QZY1RDc= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oa1-x2a.google.com (mail-oa1-x2a.google.com [IPv6:2001:4860:4864:20::2a]) by sourceware.org (Postfix) with ESMTPS id B61083856DF8 for ; Tue, 19 Apr 2022 23:53:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B61083856DF8 Received: by mail-oa1-x2a.google.com with SMTP id 586e51a60fabf-e5bdd14b59so274329fac.11 for ; Tue, 19 Apr 2022 16:53:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mpVSQDUKVnVT+shLt0mmfZXQivVAO3zuLcGEHl2h3mw=; b=BHJpP0Kv36abnQChtdcbKVahf59M6O/w4jMvynayIdQBS6+hw+D2Yj8kxTvazbuwBx 2zf9ZamPSVYO8fOCbsieqWXkcHMkL+9kip4H42Rfvz/GX0nDvC/IzYaLaBKTGElgDfS/ TBXpSHezWIb71jR73gMa5dO42UuJMVw2byx8Q2kJcC+Koq71FXlmBBzIuSiVkM02Lbxh xNiF4qH5/Eebdb+dCHdZZu8K0PO/i9ogsm9fx+NFfSPVgaYxFxhz7U57Fv00guu16Z0K mLYKGLomL3V/fvDFWyFLdvP++OB0q5kCGYururTn8/JzHMIagPC952sStQt9u1++9jcm Vz8w== X-Gm-Message-State: AOAM530z8UrhNzMhoY6hBRykww2U17vkI/IvUKJQtOYoeF4w2hWjyaxl vbuMMbzZ4O8LTgHHt5enNfxod0x04xg= X-Google-Smtp-Source: ABdhPJzMhDMBD5rrKyXw3pUOpfctocrmNHAisssbQ+lXpTPoOrryZgAZK0AIhVQjvHw33GK5nYpLWw== X-Received: by 2002:a05:6870:b4a7:b0:e5:bff5:b537 with SMTP id y39-20020a056870b4a700b000e5bff5b537mr509875oap.64.1650412384023; Tue, 19 Apr 2022 16:53:04 -0700 (PDT) Received: from localhost.localdomain ([205.185.209.215]) by smtp.googlemail.com with ESMTPSA id nf9-20020a056871460900b000e2c44ca8edsm5580936oab.6.2022.04.19.16.53.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Apr 2022 16:53:03 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH v2] x86: Fix missing __wmemcmp def for disable-multiarch build Date: Tue, 19 Apr 2022 18:52:52 -0500 Message-Id: <20220419235252.765256-1-goldstein.w.n@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220419225550.646821-1-goldstein.w.n@gmail.com> References: <20220419225550.646821-1-goldstein.w.n@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-11.9 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-Patchwork-Original-From: Noah Goldstein via Libc-alpha From: Noah Goldstein Reply-To: Noah Goldstein Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" 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. Reviewed-by: H.J. Lu --- 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)