From patchwork Tue May 21 14:37:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 1937467 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=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=NEJj7AfM; 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 4VkH920t0Hz1ynR for ; Wed, 22 May 2024 00:37:58 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 2D8E33858D33 for ; Tue, 21 May 2024 14:37:56 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pf1-x42a.google.com (mail-pf1-x42a.google.com [IPv6:2607:f8b0:4864:20::42a]) by sourceware.org (Postfix) with ESMTPS id DF9153858D1E for ; Tue, 21 May 2024 14:37:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DF9153858D1E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org DF9153858D1E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::42a ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1716302258; cv=none; b=x6jPTUwhSrfHy6WIrtCnhXCDP2DNvEPurT7z++h4IkFZ8/Mhln+GofYB1x5AASqmu4fs8EH0QOJOfZwgiMSGVF3D9jSC5nLn7tD3qkt4wNWdXOKJ30RCtUyHv/XmfDNP+Bf589P07aiehh4WiE1booJQKRicvljlQQxaTr8tcYg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1716302258; c=relaxed/simple; bh=muYt9mQaNYZHolzfNdW9GZgNPlEPo5YJ0opmNgSh14g=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=EPRcMswuWO5yXIh6SbI32wM0wVsUnWslH5j8pBioEt4+GY+EDX0kgw6PUIT+83hL5KFTb0/p6FZ9bPXqxbPuFFKW6vLVOwW94fQu1IdwrnvJJXBl3CVx093gFgDpBNMbslSMM67tCLKHW5M195Y/mnsMYHeBdtFd7g9QGvPRfgQ= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pf1-x42a.google.com with SMTP id d2e1a72fcca58-6f4603237e0so2597468b3a.0 for ; Tue, 21 May 2024 07:37:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716302255; x=1716907055; darn=sourceware.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=yg3hYo6TST38TVLHThdrJ3aS/gDOcoACIia4nPaH7cQ=; b=NEJj7AfM0T+uzzKFB3H2YdfvxquE/B9QbVaHABhICRwT6zQNh62YcSjo459sZp6eMx G95Y8WVuvnPnzfuzyTB5iotiT+9UXTtEpOH0X0rdoKSO79cPLHNwi8RrRBEynNfKjyya r/gnMePCBmHnKPk6B6azNpvofts7V7nZknLOy4csoBvpQ5A7Pm74ztbl18yA/2xXcqf8 cpQJ3pjRe5x+SDI7TyYcBQXXOqqI6A5daP/QxCvjee6qsBQVoN4bkQoDtWtceighBxxF gxgye2drwr5lb7X1ovBt0fnfkTUD4vAsbtu09rxKdguEOTuHhdImu3tTvaT0TdZlxiY4 K5OA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716302255; x=1716907055; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=yg3hYo6TST38TVLHThdrJ3aS/gDOcoACIia4nPaH7cQ=; b=neDX6t6aONAWkfAZa7llhYANwe4pNoVoadzP275XgKAlqXw3iB2zbZEB3GaiUKAhKY YByyhuAiDNSKcS6DSigsTRLfHoZB0TSCkdbOtef/COAOeCsPOK58AhQ4DXwI6eAwoJ+k YO9OXAQtRZtI+/Tm5OL92ONmxZatxZ7ScQoheu1IndbA4V7CAGTBQsEWXq1v7LoNxy1F Ks1roRbtvKwl//qzFRk1eIko3u2A/ucQ+6Lp+YRpkKOOmlmM9mcS40sDJL5cARI5O2pC xjPCNkGidI0DocC7R7wD30pnZd07QQcBeqUKx16AjvOCQpwOVwueMZtMRR/xOTGmiuIn NjoQ== X-Gm-Message-State: AOJu0YyFsMwq+ftosGj3XZx4mSjhtYMgrCxxu0SeVcQcXK7b/GlN8RRg WRJhuDhLT5W/d2KHNiOHO0/iKc/lE54xqcSsJQUWpLOfmiDz/3CW8UuA0g== X-Google-Smtp-Source: AGHT+IFlAR21wQoWBq+iHzuSU+RdiDTM6eW1LeoO/ipUI5owHSPU/91RcCU0lBxWmyERLBNt9qUhxg== X-Received: by 2002:a05:6a00:3c89:b0:6f4:d5d8:e0a3 with SMTP id d2e1a72fcca58-6f69fbe0465mr13757628b3a.9.1716302255600; Tue, 21 May 2024 07:37:35 -0700 (PDT) Received: from gnu-tgl-3.localdomain ([172.56.168.158]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-6f4d2ae0fc9sm20830601b3a.132.2024.05.21.07.37.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 May 2024 07:37:35 -0700 (PDT) Received: from gnu-tgl-3.. (localhost [IPv6:::1]) by gnu-tgl-3.localdomain (Postfix) with ESMTP id CE4BDC00BF for ; Tue, 21 May 2024 07:37:33 -0700 (PDT) From: "H.J. Lu" To: libc-alpha@sourceware.org Subject: [PATCH] aarch64: Don't define memchr/strlen when used in IFUNC [BZ #31777] Date: Tue, 21 May 2024 07:37:33 -0700 Message-ID: <20240521143733.3285523-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.45.1 MIME-Version: 1.0 X-Spam-Status: No, score=-3022.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, 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 Fix BZ #31777 by not defining memchr/strlen aliases when used in IFUNC. Signed-off-by: H.J. Lu --- sysdeps/aarch64/memchr.S | 3 +++ sysdeps/aarch64/strlen.S | 3 +++ 2 files changed, 6 insertions(+) diff --git a/sysdeps/aarch64/memchr.S b/sysdeps/aarch64/memchr.S index a9fa40519c..6aa93a344b 100644 --- a/sysdeps/aarch64/memchr.S +++ b/sysdeps/aarch64/memchr.S @@ -28,6 +28,7 @@ #ifndef MEMCHR # define MEMCHR __memchr +# define NEED_memchr #endif #define srcin x0 @@ -124,5 +125,7 @@ L(nomatch): ret END (MEMCHR) +#ifdef NEED_memchr weak_alias (MEMCHR, memchr) +#endif libc_hidden_builtin_def (memchr) diff --git a/sysdeps/aarch64/strlen.S b/sysdeps/aarch64/strlen.S index ab2a576cdb..ef8db695e6 100644 --- a/sysdeps/aarch64/strlen.S +++ b/sysdeps/aarch64/strlen.S @@ -26,6 +26,7 @@ #ifndef STRLEN # define STRLEN __strlen +# define NEED_strlen #endif #define srcin x0 @@ -89,5 +90,7 @@ L(loop_end): ret END (STRLEN) +#ifdef NEED_strlen weak_alias (STRLEN, strlen) +#endif libc_hidden_builtin_def (strlen)