From nobody Tue Jan 13 17:00:51 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4drFr41Dx6z6NQ7t for ; Tue, 13 Jan 2026 17:00:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4drFr35qlpz3cSv for ; Tue, 13 Jan 2026 17:00:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768323651; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mGJ773VFBJ2ykLygL5cmLIFlhA6Mcb0sm5X4Syia7XY=; b=EfrO1KuvSVpga4aSGPQqwIeaJgu8ykzTT3j3DiTSCE3pKClM2DJS6NqJCkFcr7XnQUeCGX otD2CT2VrRBlZmXTexc8ths3vQCNRqlkqwoB2QGrXDAfcNr7/vCEwFLAn4vEG8oWSH3kvx E2OLVvH5Fx0aJbbSvEydkihKcF2SGnGxnLGwZm9+XGa1GDV1XWdsaUHY6ZeY9O/nw+TPMP hblp2b1xU6X6mpieVxAZRmxPSlEyY8BEcP4lf31S5Nd6l1qFX3E81P3fTru/b0xEAriu/+ FuoNL51YxdarU3P9bUfByaC8Ll27rDHFkjPupFamcuLggjo22PT2JR5p4qajPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768323651; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mGJ773VFBJ2ykLygL5cmLIFlhA6Mcb0sm5X4Syia7XY=; b=ppUIpV4kZ6a6VJgzR8L3JB/7fK8sp3kNucoqqEVlg/M/6fIjuGDd7E35osEJgZoTV28OJG rJ7dFB8gBqxCZiRuvvDnfdW2e4cdDUadypcOV0Xg6/uPG7TE5F5IZtD3NXX202SJ7mKbdp 7r9iC0B8B73MduX1gZYSI/QL8j0ahAgjNPG0c4bLcnOSPD8nTZ++hiTPRb4RQld63m27Pg l0Tyhtglouy5uJFxSgP8+2Ymw9OdWHwvdppID+nCGjr8Zek6xC0E3nDUYYJYrC5nSOUf2P KWLjAfD0W5OWIb4Yf3CN8aXnQwO4fmKCgpudQgIvM9ZvoEpKlm0W/ujjOgujMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768323651; a=rsa-sha256; cv=none; b=OxkXCM81JsN61dAVKVflJlVsV7XJVE7SXByzNPXnPtXsuO49eNZWsXaI1UZ6Mk8Xw4xBXu gul+uVv2yEYbuFOxp/cFnKY4sSspDGA7KhTw6kPC2Xo2FaF7KwgILU8zIDIDGVRlk6yahh 27bbaHsUqASscc/oHkEIeZywQEFtKdJqZnRCo/0f6Y4oEKhu0tPj+N7mgpUkg4IocokJ6t Eh8pZN2papaO0vWbN7eVG7b3MxuNOLEOAX8LxJlPibRGvu/f/KvCv3PhGXQ8kVTt6pCGyh 3Z0bTl2x5fmmmcJSYVhK5W8ZRdwX/6M+nkeqJemJ8kuo3xngnqWNfJx2ktVxHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4drFr35R83z5Kl for ; Tue, 13 Jan 2026 17:00:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 347ad by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 13 Jan 2026 17:00:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Sarah Walker From: Andrew Turner Subject: git: 5eec3531204b - main - libc/csu: Pass HWCAP flags to ifunc resolver functions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5eec3531204bd93426642a9c45b0c292a01447e4 Auto-Submitted: auto-generated Date: Tue, 13 Jan 2026 17:00:51 +0000 Message-Id: <69667a43.347ad.7c56ae80@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=5eec3531204bd93426642a9c45b0c292a01447e4 commit 5eec3531204bd93426642a9c45b0c292a01447e4 Author: Sarah Walker AuthorDate: 2026-01-13 14:24:00 +0000 Commit: Andrew Turner CommitDate: 2026-01-13 15:28:04 +0000 libc/csu: Pass HWCAP flags to ifunc resolver functions Function arguments are based on Section 9.4.1 "GNU C Library IFUNC interface" from "System V ABI for the Arm 64-bit Architecture (AArch64)", 2025Q1. (https://github.com/ARM-software/abi-aa/releases/download/2025Q1/sysvabi64.pdf) Reviewed by: andrew Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D54599 --- lib/libc/csu/aarch64/reloc.c | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/lib/libc/csu/aarch64/reloc.c b/lib/libc/csu/aarch64/reloc.c index 4ba7920bcb07..77e8a38176ce 100644 --- a/lib/libc/csu/aarch64/reloc.c +++ b/lib/libc/csu/aarch64/reloc.c @@ -25,17 +25,42 @@ */ #include +#include + +static __ifunc_arg_t ifunc_arg; static void -ifunc_init(const Elf_Auxinfo *aux __unused) +ifunc_init(const Elf_Auxinfo *aux) { + ifunc_arg._size = sizeof(ifunc_arg); + ifunc_arg._hwcap = 0; + ifunc_arg._hwcap2 = 0; + ifunc_arg._hwcap3 = 0; + ifunc_arg._hwcap4 = 0; + + for (; aux->a_type != AT_NULL; aux++) { + switch (aux->a_type) { + case AT_HWCAP: + ifunc_arg._hwcap = aux->a_un.a_val | _IFUNC_ARG_HWCAP; + break; + case AT_HWCAP2: + ifunc_arg._hwcap2 = aux->a_un.a_val; + break; + case AT_HWCAP3: + ifunc_arg._hwcap3 = aux->a_un.a_val; + break; + case AT_HWCAP4: + ifunc_arg._hwcap4 = aux->a_un.a_val; + break; + } + } } static void crt1_handle_rela(const Elf_Rela *r) { typedef Elf_Addr (*ifunc_resolver_t)( - uint64_t, uint64_t, uint64_t, uint64_t, + uint64_t, const __ifunc_arg_t *, uint64_t, uint64_t, uint64_t, uint64_t, uint64_t, uint64_t); Elf_Addr *ptr, *where, target; @@ -43,7 +68,7 @@ crt1_handle_rela(const Elf_Rela *r) case R_AARCH64_IRELATIVE: ptr = (Elf_Addr *)r->r_addend; where = (Elf_Addr *)r->r_offset; - target = ((ifunc_resolver_t)ptr)(0, 0, 0, 0, 0, 0, 0, 0); + target = ((ifunc_resolver_t)ptr)(ifunc_arg._hwcap, &ifunc_arg, 0, 0, 0, 0, 0, 0); *where = target; break; }