From patchwork Wed May 22 13:13:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 1937837 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=CoZEeuq2; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=8.43.85.97; helo=server2.sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VksFk57z5z20PS for ; Wed, 22 May 2024 23:14:02 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D4482386C5B0 for ; Wed, 22 May 2024 13:13:59 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pl1-x630.google.com (mail-pl1-x630.google.com [IPv6:2607:f8b0:4864:20::630]) by sourceware.org (Postfix) with ESMTPS id AF95338432D6 for ; Wed, 22 May 2024 13:13:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org AF95338432D6 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org AF95338432D6 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::630 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1716383621; cv=none; b=kJjIaaT/1YZA+qAHhAymI4PP7WQFdwoGMyNuhOyM+f6NGx7TXR/ACONNtLy2/CRv4InJ338owJiF6NAvMqbZZHEVkKug2FtxAtUdjGvuJEH740PKlvOQJZuFHcAwY1SiXkfEVzy6VUZhHNbmA4YbtXzKJ/b90/mqbJlHno1l47k= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1716383621; c=relaxed/simple; bh=48GFY4+0ZrH28llR5hyktLIKPJKH6YVcu9hcJ/cVQLA=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=gUW/kQqph3iWwbW5agDw8AKAstd/tGTA91RfA6n2fdTt7MNACslf3O0zFHocpZr+CTgmGz4sAzo9I4a0iEHx1FVzeQgay31c4a2dx3+Syw2frc7MsNkw/y3DCPpYK7GC8AAnR36+Mifad/9jWlh7xrZPyB3LTRnzMXxtkzwHaWA= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pl1-x630.google.com with SMTP id d9443c01a7336-1f32864bcc7so3698165ad.3 for ; Wed, 22 May 2024 06:13:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1716383615; x=1716988415; darn=sourceware.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=/TWpQAjA9eBoVYC5jzzfZCeTNGPjBf3a6T2/mCp2dJM=; b=CoZEeuq2NzP3l1ncRjbUhWqJCNskgZbFa6hreBc4sBpWlCijYp5/od11MSEvoMXnfr wlxWUOnPQNw/Ak35zKxSOAQ0ucSE/sYcok//K/klyyaGmXqQWWlpGP52uPlg042SJY4x NPY4o4AbUsphYRtiqSiD1TjKFl1xV2E9xrUYT0ATADBrRJ9XnzvxjTfUjY4xJtbpyCM+ 6mp8XNBSaY/scnbws+3ptym+YV4VhJAn3h5jbn3g66C//0HZchGjcm23z455Crkc4nFL p84kjaUbZWbScThfMRILoDHk+t/3BcQTob6UHZ037TLfny5njNFHIBOVKds2eGdTrpQU 3lWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716383615; x=1716988415; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=/TWpQAjA9eBoVYC5jzzfZCeTNGPjBf3a6T2/mCp2dJM=; b=cdEc9fMDFDeNit/gjUrMuT4lrCWhcndI6MHp+nSeMYi32OPpARDAbdFu4CqGCarrbn wYl76tmIZSc3Mpx1N86hD1GahA3B6d0k55bIHDI5NPW/j8cyidEymiDGlGemxEdCdgdS pvJBq5ArnSVdJSEv1/bk7xxi/ezqbwxVKTP0BxljDuYJEpLaSSWg06hGu6QinhSf1DVr jOob7SXZhGLhd0ApVO+TlTGTfB0sujaQncGDcztYXYv18gThNFh9gH/30nU7pA+yri+b WvPMNUvgrC1qXQnS4MVhWj4MSTP6Xe1j+nNHBf9mXjovFkxWOqdtZOV7ruy2BF6xI127 T3PA== X-Gm-Message-State: AOJu0Yxbso22wnTkfcUNKqtcaMwv2k3q/Cbtp1Iq54fNRiF0gN5TTM9M W8rsbaehjhwvsT5Sn9BpzFw73IUis4g2QTOUd+8cO9wpZOsBo0MOA/Scu+jnzQnboX1BAOwErPX sL8Q= X-Google-Smtp-Source: AGHT+IFNhkq74ZV0MkgQI1XMMR0Vvaiiafie4oIGP58gZaNjDgXBRE4hhpO+6PsO9/9J5xwUvoUYEg== X-Received: by 2002:a17:902:d2ce:b0:1f3:ea4:7ed6 with SMTP id d9443c01a7336-1f31c9f681cmr22553855ad.61.1716383615078; Wed, 22 May 2024 06:13:35 -0700 (PDT) Received: from mandiga.. ([2804:1b3:a7c3:7718:cb55:8353:f3c4:f762]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1f2fae63efbsm61204265ad.181.2024.05.22.06.13.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 May 2024 06:13:34 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org Cc: "H . J . Lu" Subject: [PATCH] aarch64: Remove duplicate memchr/strlen in libc.a (BZ 31777) Date: Wed, 22 May 2024 10:13:21 -0300 Message-ID: <20240522131330.492245-1-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Spam-Status: No, score=-12.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP 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-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org The generic version provides weak definitions of memchr/strlen, which are already provided by the ifunc resolvers. Reviewed-by: H.J. Lu --- sysdeps/aarch64/multiarch/memchr_generic.S | 3 +++ sysdeps/aarch64/multiarch/strlen_generic.S | 3 +++ 2 files changed, 6 insertions(+) diff --git a/sysdeps/aarch64/multiarch/memchr_generic.S b/sysdeps/aarch64/multiarch/memchr_generic.S index 0ed5811745..8d554275ba 100644 --- a/sysdeps/aarch64/multiarch/memchr_generic.S +++ b/sysdeps/aarch64/multiarch/memchr_generic.S @@ -24,6 +24,9 @@ # undef libc_hidden_builtin_def # define libc_hidden_builtin_def(name) +# undef weak_alias +# define weak_alias(a, b) + /* Add a hidden definition for use within libc.so. */ # ifdef SHARED .globl __GI_memchr; __GI_memchr = __memchr_generic diff --git a/sysdeps/aarch64/multiarch/strlen_generic.S b/sysdeps/aarch64/multiarch/strlen_generic.S index f980a9a68f..ceeafe920c 100644 --- a/sysdeps/aarch64/multiarch/strlen_generic.S +++ b/sysdeps/aarch64/multiarch/strlen_generic.S @@ -30,6 +30,9 @@ # undef libc_hidden_builtin_def # define libc_hidden_builtin_def(name) +# undef weak_alias +# define weak_alias(a, b) + # ifdef SHARED /* It doesn't make sense to send libc-internal strlen calls through a PLT. */ .globl __GI_strlen; __GI_strlen = __strlen_generic