From nobody Mon Dec 15 17:00:11 2025 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 4dVRBh0nvpz6L1Mx for ; Mon, 15 Dec 2025 17:00:12 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dVRBg3gLRz3pHm for ; Mon, 15 Dec 2025 17:00:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765818011; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tqa/qfdrWuup8Cd/2d4x996kaWz6nioAg9LuVZf0iZs=; b=ipelZPuYBLhObu8A5egXhdC9g14Nzf3R6rBMr2j3JpCKiWHy0ZLJb6ThNkA13kstIuyA2u phVFk0UE5SZ8LnKRPf4suMFT5X95lLRCnMs20C32LdEcBycRO7JQIfxagssLV3cGcntmfN JJw/xIxdUvpJnPClCA+T/lqdwJD6B5HUHA4RWq2f8+LjNla3VcZfI9kUAx0kcskRHyARq2 MXnh8O+tiBF2Tx9VHCuhRyXrl8X8CNG8oyFinV4V8nwqf6kVDvWUMB0O9PkjCHuo0T2Nj0 sHhT62PGMMEa6UO/yFhkjiipGkzFN0hvtWcfWYNtJ9zXBb9VBrnbmTq0MHmmLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765818011; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tqa/qfdrWuup8Cd/2d4x996kaWz6nioAg9LuVZf0iZs=; b=mMnPWrnhm7j2ZUUnKlGWtVb8Wb+AJSGkG2dSIBrqAGAvRZ6gW8/poEEElIwbLi/52qCZsS aXaBaQCiL69pvYWPiaAdN8Y4wx6CgVYbaebTkZ/trXfnerG+esp6arBp8gzKvA2QlsFMmu fN31gGG7HVcEkl4Pcu+RZwygFpUSVITskZaI/KkoGJP3h4PwFAmBo4Nky5lXI+U7ElyIvk PD3dw+zMNMlprA4p8WHdJ2EWbTId30wUFuPojfkM1jDu/TpHFXsZVy+dUXyFvpsq7miUcv qrZfR2CrFcNK6B8gP2LbyxaZFnSVICjdV6OfEOiboJgPX6x9VnHf4DCJBgRZag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765818011; a=rsa-sha256; cv=none; b=F9h2s+7VEX1s40jZud0wfFnz6FhTY44yz1Qeimg8ByS2kWdQof09HKwmGwAYYNVM5UAoD7 FVRPFZCZ1fiaTk42q5EtC+OxuJG48UqiESraWMwXVBE03sSuphfLwUqcEmg+VfrifJqtnR 6LDFqyh+hkFL+hnP4mOCfyt9o8KvbLX5X4UPsgNL1LUqSN4BiQVsLVnxAZTLV0vhG/0qb/ 5dxKc+vuScTTJG1b81r2jm5mpIvqxUR0VjEF4waXWopXhLPAdDx+G2Rqk7PV46tquqXr4P PnRvxKnMLBV/G+pzw02DRKnbldoZRVI/0TB+wiBx7SVd8KnLOmOI/FUPSrpsVA== 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 4dVRBg3D3dzCqy for ; Mon, 15 Dec 2025 17:00:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id e18b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 15 Dec 2025 17:00:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: a06143795a22 - stable/14 - libc/csu: Support IFUNCs on riscv 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a06143795a22d8d99f1736656eaff754e81d8ab1 Auto-Submitted: auto-generated Date: Mon, 15 Dec 2025 17:00:11 +0000 Message-Id: <69403e9b.e18b.24cc0f39@gitrepo.freebsd.org> The branch stable/14 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=a06143795a22d8d99f1736656eaff754e81d8ab1 commit a06143795a22d8d99f1736656eaff754e81d8ab1 Author: Jessica Clarke AuthorDate: 2024-10-18 18:14:58 +0000 Commit: Jessica Clarke CommitDate: 2025-12-15 16:58:44 +0000 libc/csu: Support IFUNCs on riscv When adding support to rtld-elf I neglected the fact that static binaries can have IFUNCs. Add support for this too. Fixes: 729d2b16b74f ("rtld-elf: Support IFUNCs on riscv") MFC after: 1 week (cherry picked from commit 1363acbf25de4c36e183cfa0b0e801d4dd9bf2ad) --- lib/libc/csu/riscv/Makefile.inc | 4 +-- lib/libc/csu/riscv/reloc.c | 63 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 2 deletions(-) diff --git a/lib/libc/csu/riscv/Makefile.inc b/lib/libc/csu/riscv/Makefile.inc index 2534e6579f38..5d59d40eb393 100644 --- a/lib/libc/csu/riscv/Makefile.inc +++ b/lib/libc/csu/riscv/Makefile.inc @@ -1,4 +1,4 @@ # -CFLAGS+= -DCRT_IRELOC_SUPPRESS \ - -DINIT_IRELOCS="" +CFLAGS+= -DCRT_IRELOC_RELA \ + -DINIT_IRELOCS="init_cpu_features(env)" diff --git a/lib/libc/csu/riscv/reloc.c b/lib/libc/csu/riscv/reloc.c new file mode 100644 index 000000000000..036ea3de8701 --- /dev/null +++ b/lib/libc/csu/riscv/reloc.c @@ -0,0 +1,63 @@ +/*- + * Copyright (c) 2019 Leandro Lupori + * Copyright (c) 2024 Jessica Clarke + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +static unsigned long elf_hwcap; + +static void +init_cpu_features(char **env) +{ + const Elf_Auxinfo *aux; + + /* Find the auxiliary vector on the stack. */ + while (*env++ != 0) /* Skip over environment, and NULL terminator */ + ; + aux = (const Elf_Auxinfo *)env; + + /* Digest the auxiliary vector. */ + for (; aux->a_type != AT_NULL; aux++) { + switch (aux->a_type) { + case AT_HWCAP: + elf_hwcap = (uint32_t)aux->a_un.a_val; + break; + } + } +} + +static void +crt1_handle_rela(const Elf_Rela *r) +{ + typedef Elf_Addr (*ifunc_resolver_t)( + unsigned long, unsigned long, unsigned long, unsigned long, + unsigned long, unsigned long, unsigned long, unsigned long); + Elf_Addr *ptr, *where, target; + + switch (ELF_R_TYPE(r->r_info)) { + case R_RISCV_IRELATIVE: + ptr = (Elf_Addr *)r->r_addend; + where = (Elf_Addr *)r->r_offset; + target = ((ifunc_resolver_t)ptr)(elf_hwcap, + 0, 0, 0, 0, 0, 0, 0); + *where = target; + break; + } +}