From nobody Tue Jan 13 17:00:50 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 4drFr32rlGz6NQM7 for ; Tue, 13 Jan 2026 17:00:51 +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 4drFr26H7Fz3c6q for ; Tue, 13 Jan 2026 17:00:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768323650; 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=cBbchOX9SjYjsgSMj0qTbPpJUFLjF5Hewfpb3v3zWZA=; b=DrComUlVbowICj1OB7ppjyEsYQHbVYiXyH8TMk4cHMalH4DC/juAVvRyz21Y/76BAUHAM3 wG0z2w4OHbMsEC8PruwYkBSZZx2IwqaZK7GAx0HBwOiKEi7iaS6aiohpSOHnZZPxf14zfY F3i1dT2JoMhDuXcR6YaGISm8mlCMXdcU9cPdVQdjeeOQJ8JEE2fiHpRwnn8grA/DykggLM uo6uRCDjzSnwJpxBfiTAD5v4/3HPg7cg8LNuIgEjC5Yeacq7dzm9Cduc5av6/bgRU2aGaq PN/8rZ0BzWgIpjq7ADzQ+U9uJ+cqrwtesDA8zTLmt0hNQYgvwtUyMkt8mv+9kQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768323650; 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=cBbchOX9SjYjsgSMj0qTbPpJUFLjF5Hewfpb3v3zWZA=; b=c+XdNWn5LDr+51xI2N26z1zaltAvYLzsX962kLXQNsMq8RTaOuNVggfFV7EkRmiO82PaJ4 NjESkBOz+LIxpC0DavUr14Eyl1s6V7oyHwJonriwPqaPCwMqBYJvuRUL6n51PtBZxNmQFR VX2X8/CZjhL4AIi4zIGNHlHm3H4ly7Qa+GSdF14+86mw2uBoLuTYs3zCSLnS/sfTkD43C+ CIzm9W4UaJiGZYRzkXb1dNdY/mEvWqHnhF+6CK32IMTwvTaSIRuCEDXMP6nRDV3Zj0iK9R xOxN3IytdGeB29PP3CRNIr2NV/pg50bkWOVDVmKvezTiNd2okuuDn+KikQGizQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768323650; a=rsa-sha256; cv=none; b=ljitoXAwWknAlD7EuhRV351wvUtD16nBiXhyZSQHw49nHb4u/NzKxxMGp7leKNWI86STf5 KtQMSCF+ffjl9StZPR9IDqMqVLOQ/c0PjilyViDHNFRkEIORbDz6zhFG59enlhLxTAS773 hPsQ3zqd+m60NVFqXW17XVlvkHidvU3E4SbpflX/j2nxln06KjbXqH/jkuZmwADu2kBluF j5famXf4ct2yk9pt4c5h56d/FpZOLSHUS1j/scRvWcluqZ9KV52rs9T9Z/4TOjDKKkwBSQ ktpk/apXY9YdYS5WHC9rE00CfhUStvjHvdiNFkp/yHYeHse7+9xjYiVMr70ZYA== 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 4drFr24htnz5rZ for ; Tue, 13 Jan 2026 17:00:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3440d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 13 Jan 2026 17:00:50 +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: a652357fb59f - main - rtld-elf: 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: a652357fb59f03bee85d61814002f9c60ea52340 Auto-Submitted: auto-generated Date: Tue, 13 Jan 2026 17:00:50 +0000 Message-Id: <69667a42.3440d.6c29bdec@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=a652357fb59f03bee85d61814002f9c60ea52340 commit a652357fb59f03bee85d61814002f9c60ea52340 Author: Sarah Walker AuthorDate: 2026-01-13 14:23:03 +0000 Commit: Andrew Turner CommitDate: 2026-01-13 15:28:04 +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 --- 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))