From nobody Mon Feb 9 16:28:32 2026 X-Original-To: dev-commits-src-branches@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 4f8qrJ4v4Cz6Rg38 for ; Mon, 09 Feb 2026 16:28:32 +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 4f8qrJ11Qgz3PDX for ; Mon, 09 Feb 2026 16:28:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770654512; 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=7UOUMF/+R6PDEl+Ys8lBp8MfIIndu3kYOVyLiqst+T8=; b=RtSV3FuXt+6oBY/ircdhPyu1GRuVF5+WvHP7dOs+vt1buOfA/Vyoh9eFg/VIxWcpPU3dMU +pgggKE3Fxq8pLizFxftvxrGbCH9WD04UfFSMFsOr6FJWh9fXJ1FVwBk6B7S9Sb5etw+mu qxrmlvggcelxyrmaUxIK2WwYWLjnOfpL6G5ZXsHBJkXo+/ZmbQhX5uEUN7YM9EZiuo74V9 oqVv4bR3PZMs8oG6A+94DXniOLy2z7LmwyVgWUGgwzx3v7bL9r+h+K0IH/LYquRj/O31K7 aP5YadH9zX9x8aBY+xbkigQQPbP+GX5n0AjDFwLJfAA5VHug7EFPxbBOjTg0oQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770654512; a=rsa-sha256; cv=none; b=lQZyx0fq6BQHDEXP/sE1Uk+Ke+81s9tEB/WDE/gitMrZ3MKFOmnHVTjFH3qcmInHWqcJD3 Yo+UMXV25RVv2DpR6DE4k5+InhMLJ9LHYIazeKsW1mQ2HpKjvXoJaEZ7Z1OrYNK8xqQ4Om auzS/8GPf7Jw3fv3qiSVRsHhquniJ4+m6XzQab06JCTkTttyanw08mcTwweFnol0KRmGb+ dYEH30CVaqmBm3s6pqlOvS7mI0thR+4S98OEaTIWIAIlRYmW6JZuzg0i0aAtad9jVN7Ymw pmdf/2JkRF3QOXZV/TfTHHAbYeqpzOHg1tBHeSlFPFhO9aL4Cxs9iP9gK8levw== 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=1770654512; 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=7UOUMF/+R6PDEl+Ys8lBp8MfIIndu3kYOVyLiqst+T8=; b=T4A7dZHQF9cwH2lkofaQd8R0EIA25boLiBWOflnF6z3mCthd2rcf+yRO2r25TFdmlLHQiS JlZrcM1hsbuCC6t8Vt7rSpGrI7QxP48UZ2z4ai3VOjxV1upSOfqfKlbMtNstWeezNmkh/K qsv5UXZvU+si5G7qNdjXUXlK5x5haKXu9ymZNX3Jb9ukLxEaf721uQqfIGVKlITHanmoR7 VO20UJkqZNAvGrXkMCOcYPZMTiEXlQ4nGNfzNy/YC8GM04d4xh+vbiJD9ijlydJEmk2VfQ KdetorFm1E9ds9o12I2oWyMqSC32vi0PMg/reXXcPwGh8rF7bBuPmrF79FUBKw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8qrJ0ZX4zgY7 for ; Mon, 09 Feb 2026 16:28:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1cae1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 16:28:32 +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: dd8075045315 - stable/15 - rtld-elf: Pass HWCAP flags to ifunc resolver functions List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: dd80750453156ea0af5c1e203b09cec6e2e9e36e Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 16:28:32 +0000 Message-Id: <698a0b30.1cae1.449d9c43@gitrepo.freebsd.org> The branch stable/15 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=dd80750453156ea0af5c1e203b09cec6e2e9e36e commit dd80750453156ea0af5c1e203b09cec6e2e9e36e Author: Sarah Walker AuthorDate: 2026-01-13 14:23:03 +0000 Commit: Andrew Turner CommitDate: 2026-02-09 14:50:03 +0000 rtld-elf: 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: kib, andrew Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D54559 (cherry picked from commit a652357fb59f03bee85d61814002f9c60ea52340) --- libexec/rtld-elf/aarch64/reloc.c | 15 +++++++++++++-- libexec/rtld-elf/aarch64/rtld_machdep.h | 10 +++++++--- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/libexec/rtld-elf/aarch64/reloc.c b/libexec/rtld-elf/aarch64/reloc.c index 62d664f8fb80..85f7c1b4022a 100644 --- a/libexec/rtld-elf/aarch64/reloc.c +++ b/libexec/rtld-elf/aarch64/reloc.c @@ -444,10 +444,21 @@ reloc_jmpslot(Elf_Addr *where, Elf_Addr target, return (target); } +__ifunc_arg_t ifunc_arg = { + ._size = sizeof(__ifunc_arg_t) +}; + void -ifunc_init(Elf_Auxinfo *aux_info[__min_size(AT_COUNT)] __unused) +ifunc_init(Elf_Auxinfo *aux_info[__min_size(AT_COUNT)]) { - + ifunc_arg._hwcap = aux_info[AT_HWCAP] != NULL ? + (aux_info[AT_HWCAP]->a_un.a_val | _IFUNC_ARG_HWCAP) : 0; + ifunc_arg._hwcap2 = aux_info[AT_HWCAP2] != NULL ? + aux_info[AT_HWCAP2]->a_un.a_val : 0; + ifunc_arg._hwcap3 = aux_info[AT_HWCAP3] != NULL ? + aux_info[AT_HWCAP3]->a_un.a_val : 0; + ifunc_arg._hwcap4 = aux_info[AT_HWCAP4] != NULL ? + aux_info[AT_HWCAP4]->a_un.a_val : 0; } /* diff --git a/libexec/rtld-elf/aarch64/rtld_machdep.h b/libexec/rtld-elf/aarch64/rtld_machdep.h index d689ae354c49..4b5ad523ee87 100644 --- a/libexec/rtld-elf/aarch64/rtld_machdep.h +++ b/libexec/rtld-elf/aarch64/rtld_machdep.h @@ -33,6 +33,7 @@ #include #include +#include #include struct Struct_Obj_Entry; @@ -67,6 +68,8 @@ Elf_Addr reloc_jmpslot(Elf_Addr *where, Elf_Addr target, #define call_init_pointer(obj, target) \ (((InitArrFunc)(target))(main_argc, main_argv, environ)) +extern struct __ifunc_arg_t ifunc_arg; + /* * Pass zeros into the ifunc resolver so we can change them later. The first * 8 arguments on arm64 are passed in registers so make them known values @@ -74,9 +77,10 @@ Elf_Addr reloc_jmpslot(Elf_Addr *where, Elf_Addr target, * no arguments are passed in, and if this changes later will be able to * compare the argument with 0 to see if it is set. */ -#define call_ifunc_resolver(ptr) \ - (((Elf_Addr (*)(uint64_t, uint64_t, uint64_t, uint64_t, uint64_t, \ - uint64_t, uint64_t, uint64_t))ptr)(0, 0, 0, 0, 0, 0, 0, 0)) +#define call_ifunc_resolver(ptr) \ + (((Elf_Addr (*)(uint64_t, const struct __ifunc_arg_t *, uint64_t, \ + uint64_t, uint64_t, uint64_t, uint64_t, uint64_t))ptr)( \ + ifunc_arg._hwcap, &ifunc_arg, 0, 0, 0, 0, 0, 0)) #define round(size, align) \ (((size) + (align) - 1) & ~((align) - 1))