From nobody Mon Feb 9 16:28:33 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 4f8qrK539pz6RgG3 for ; Mon, 09 Feb 2026 16:28:33 +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 4f8qrK2B7Tz3PDm for ; Mon, 09 Feb 2026 16:28:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770654513; 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=E6VZeG59rvFy8PXLCepV0TZ3z+QcqDhEQtniNXpeZuA=; b=CC6jQph4E8fC2io/ZsCxD+sLrIg4bKYECMtfSwTWoCAuSp4gXuBgmWL3Pb624rhFVhtD56 w0fcufxtvg3FMbfHo6W9JNMy8MFT+L8o5E5QUI9IQHkhbKZuvfswqqfCNLeEBjyEqgfDRu CCB/T7XjNwBzEyBMlcG3RriH6g2cB3Wmnx0Gfrwtnq1X0s0RLp9l2h49+LYIa97Z0/B7zP BZaCpp3erreahMhx4C3NIBBshTvweTg/IPEVHSs3H70ffE7FIVdAzinl5KAPzhbX2CvfQ7 lGYI5cf3L3S655BZPx0+2lQZrRRs7pKd/JyWLmQQZG0FdEEHAAR+kJcya6jaww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770654513; a=rsa-sha256; cv=none; b=InT2fhYZQuxwBQUrIsNYff7SHqcyXpJsJy9n7Y7r72PJSXuotYTa9cKME0kiIZOZ0CUt3x UfB4IqA9A8Az3MPQ2Jcf5vvee4M0fjrcAheRcb8Eb7c1EUUu8VsSIcgbY9O4QoAhBrgITt anmbJiCppZFiC+BhasS4Fv2oTC1HXYNBMiLdEygocjsrdXLhaKIm56MPWUidZ1FmhV2XNf vaQA+EoNMPzPq0WM5pD2GfhyBsacH3e52FRaVHnFnmQZ2ooXXRnuoCsDdF7oa0NrjouDN+ 5MiZ7r3lRikZLcE7WHnW/xRPGR2Q/eYbqerG5aYvPo/39HkaMF0krpc0QjXisg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770654513; 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=E6VZeG59rvFy8PXLCepV0TZ3z+QcqDhEQtniNXpeZuA=; b=IYAxcuYOhix8ZNMyw0JAD3vpQfqPQj/BdkLU8RCfzNqaG6KkGT+wBBUSPVx88tgKf+4Sp8 ZnI5C/Hk2N5ugk6h9/+KLBnUWGxXxtPrQ0OkFkggyv5wLaMkoDw4N3sWkUcS5X3cWhihDT nE4nQtwyL1iTkt2PortYKVKK7l4ZvRoXiJduoFeZAtR/BsOti4XbtSeRZs6t+ULo5IBMJ1 ifQyuhXai+OdQNu3WmS2wXbhEzOPtI+13llet5p3Of00wvoIdVqHb30OpcCkiLZTNSrIti ZYf9hGu4zHlIrI4tGsoCaGTfEud6lpbPY59QBgmuz9V3lh0J1rM+mdl4KLjUUA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8qrK1MKrzgyv for ; Mon, 09 Feb 2026 16:28:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d520 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 16:28:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Sarah Walker From: Andrew Turner Subject: git: dee5c2665452 - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: dee5c26654529566712f8cde2f8d81fa17d6e03c Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 16:28:33 +0000 Message-Id: <698a0b31.1d520.4b787361@gitrepo.freebsd.org> The branch stable/15 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=dee5c26654529566712f8cde2f8d81fa17d6e03c commit dee5c26654529566712f8cde2f8d81fa17d6e03c Author: Sarah Walker AuthorDate: 2026-01-13 14:24:00 +0000 Commit: Andrew Turner CommitDate: 2026-02-09 14:50:03 +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 (cherry picked from commit 5eec3531204bd93426642a9c45b0c292a01447e4) --- 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; }