From patchwork Tue Apr 19 22:55:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Noah Goldstein X-Patchwork-Id: 53057 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 9D8FC3857418 for ; Tue, 19 Apr 2022 22:56:19 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9D8FC3857418 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1650408979; bh=eq3JCCDMabjZXhxI4APdsrL2/P8H3HnqfqnCbdJ3V1k=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=ygJFGawQY0nbF381iN08YuzK+gGcgsL98I3fmoH0qgMaig/pNPhufw4tO8+9bLanr s1qT9xUSLq7sdnNcSOqCwRVkH4M+GhVJ0JcizleGsvwrb1p2QbqWtoR0M4Wj/pFC7Q N6pjq5vh0HSEGZWpiDiCi33njrOaAn4uN1+48Mtc= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oa1-x30.google.com (mail-oa1-x30.google.com [IPv6:2001:4860:4864:20::30]) by sourceware.org (Postfix) with ESMTPS id 021F43858D3C for ; Tue, 19 Apr 2022 22:55:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 021F43858D3C Received: by mail-oa1-x30.google.com with SMTP id 586e51a60fabf-e2a00f2cc8so196230fac.4 for ; Tue, 19 Apr 2022 15:55:57 -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:mime-version :content-transfer-encoding; bh=eq3JCCDMabjZXhxI4APdsrL2/P8H3HnqfqnCbdJ3V1k=; b=bSObWbukpGSe4DIl5C3JGae/xwQM/0yfaFADJz0zSneR4ZsP/itERCZBvzzr/yCid2 FCoD5rKRL331fSNIuiwZcPX9ajeT5rYLgzm7yasyAu25MPRrWfIO6fisGuQbKS7up5hO fKmnSu6UYLAcN7MkihbRNOfYFo5Htude0vXr+xIWz1bZoC9j59L9LJf6St35MhKrs8Oq Jk5lxJTzglglxyKzGwGXXYpHUN6FrbKr2X3S6L+K5jXEYwdaEr2MCfgIGnrJe04ySUq1 W2jeFz/7D1nn6s5VI+s9PLZerJmDYKLIhAlkHH33yzzgaV4Yw67iDw5DbgRQa9GM4k6s DgIg== X-Gm-Message-State: AOAM533Kiu9T+4WdriZOaIK6FDw4vRs8mjU7A9pwsND8hflFy6MeiqKb Xcdj8v5Hoswyp0TFIcb6iFPbn/Hye6w= X-Google-Smtp-Source: ABdhPJxiNBVManvlUPSR+FxfLlB0LqdOOaif3hu4jn98+VM29kXK6IjfFEfIsjG/W0w8y0f64hWG2Q== X-Received: by 2002:a05:6870:d58a:b0:e6:358f:203d with SMTP id u10-20020a056870d58a00b000e6358f203dmr396079oao.284.1650408956922; Tue, 19 Apr 2022 15:55:56 -0700 (PDT) Received: from localhost.localdomain ([205.185.209.215]) by smtp.googlemail.com with ESMTPSA id 6-20020a9d0006000000b0060152dd63a6sm5818255ota.55.2022.04.19.15.55.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Apr 2022 15:55:56 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH v1] x86: Fix missing __wmemcmp def for disable-multiarch build Date: Tue, 19 Apr 2022 17:55:50 -0500 Message-Id: <20220419225550.646821-1-goldstein.w.n@gmail.com> X-Mailer: git-send-email 2.25.1 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. --- 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 . */ +#define USE_AS_WMEMCMP 1 #if IS_IN (libc) # 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 . */ -#define MEMCMP wmemcmp +#define MEMCMP __wmemcmp #define USE_AS_WMEMCMP 1 -#include "multiarch/memcmp-sse2.S" +#include "memcmp.S" + +weak_alias (__wmemcmp, wmemcmp)