From nobody Mon Dec 15 17:00:27 2025 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 4dVRC01qBTz6L1mR for ; Mon, 15 Dec 2025 17:00:28 +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 4dVRBz4mH5z3pmN for ; Mon, 15 Dec 2025 17:00:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765818027; 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=mXOBA6tCluzWWo7jWY4ajQl0WMKZctTWgmaS5LuZaDM=; b=dE2jIn1tZufB81YnLe/u+jHjJOuLWeIyyxa6x54y8q6D/g6HM9AZvnt3o183Mgv7Pt28FJ r9BRRpGBIO7D2sCJHgos/GB58cfHwciy148VqTlCyERdOUJdMceM4V3+1Q7zSJ2JdO6nu6 bE3i4NygL9CqvmC7YAa/IHp8G/0QveKYQhuogKKLtSRWwvur/uVwqGtENdQlutvclL9Dxk 9wqap6W5s4LmxoVkfG1lMwSYDeJbGxkfbmVB2PUcV/bbienC2illKuU8x/qdZDTrlxHI2o sVx3IBhn3eqd+T4yjlByu70mX4a0joXoRoQWLpGwKFk+HO/s8qCr5vK3UJB6hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765818027; 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=mXOBA6tCluzWWo7jWY4ajQl0WMKZctTWgmaS5LuZaDM=; b=D7byhFjPBaZzGSsORLz/FJKFpecRzM1uAsm4cElwQAlxKEKd1yLZdFNOckq38n6oUJmVZB T3UYlnZOVl3WCTm4qq4+OqNlFF5tZRUYp8XovwqUiJomw+LDaz//EQa39G1XtMMeZnr4Xk AhE2p2EW+WdLCZXbjy1iVMuYQ7LwrnNmIFf4Bzh3K43/o05uXoRUw+a+iSm0AEVksIuEIX iwNhxAFMczuNqmUQjQn7hXUE9HfkzeSq6SO68SjsoUoiLGbfw5HBbkca5rf9h1m5T4QoyD cuavpnaVinkHSUmhrC27AFnhrx7cB/JmHALllOP3HnAGWybsRzNv4EltLpkx2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765818027; a=rsa-sha256; cv=none; b=ZMVfaJXdPXIUA5ZsPHb08oK11D/VFJNYBCzFxedhC3JhsiasUFUFAYMjFhzP6Mh1GIMB3l f2U4oRHS/m9ZKhonUAMd5wmEKqHxGRifviDwgTRZ2ZGrD+rbkWOUuz8ASaM8f1xuAX/EU9 fEBJpKwM4pdi7Fp6IKoQXZRwtmjIPCIoJp8Xvj2m6uMLYgq+mRRsBOCuDXGoEShjkB8aG6 AdJW4KlcUHXtS2dUe/R3ebSVfewc6wAP9351TC+nVeH/FZqXOWZKzarCk9pnd9uDylZie1 A0hejhM7Nen5bjzSUlu5BJMR3AvlQDQ00LClOetR5PTmDMoLot2X3bFXFF44XQ== 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 4dVRBz4JspzClP for ; Mon, 15 Dec 2025 17:00:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id e419 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 15 Dec 2025 17:00:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: acf47e5d105e - stable/14 - rtld-elf/riscv: Don't allocate static TLS for dynamic TLS relocations 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: acf47e5d105ef05ea25b635672417a294a933e13 Auto-Submitted: auto-generated Date: Mon, 15 Dec 2025 17:00:27 +0000 Message-Id: <69403eab.e419.5d04c434@gitrepo.freebsd.org> The branch stable/14 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=acf47e5d105ef05ea25b635672417a294a933e13 commit acf47e5d105ef05ea25b635672417a294a933e13 Author: Jessica Clarke AuthorDate: 2025-05-28 20:22:15 +0000 Commit: Jessica Clarke CommitDate: 2025-12-15 16:58:45 +0000 rtld-elf/riscv: Don't allocate static TLS for dynamic TLS relocations Provided you don't run out of extra static TLS space this should work, but it's wholly unnecessary and not how things are supposed to be done. Only static TLS relocations should allocate static TLS. Reviewed by: kib Fixes: 4b1859c0e943 ("Add support for RISC-V architecture.") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D50563 (cherry picked from commit 03801d449a3731cb643a51625c8c4d5d07b2e54c) --- libexec/rtld-elf/riscv/reloc.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/libexec/rtld-elf/riscv/reloc.c b/libexec/rtld-elf/riscv/reloc.c index 8dd225e5a920..03d3c2d0c9ba 100644 --- a/libexec/rtld-elf/riscv/reloc.c +++ b/libexec/rtld-elf/riscv/reloc.c @@ -405,23 +405,6 @@ reloc_non_plt(Obj_Entry *obj, Obj_Entry *obj_rtld, int flags, lockstate); if (def == NULL) return (-1); - /* - * We lazily allocate offsets for static TLS as we - * see the first relocation that references the - * TLS block. This allows us to support (small - * amounts of) static TLS in dynamically loaded - * modules. If we run out of space, we generate an - * error. - */ - if (!defobj->tls_static) { - if (!allocate_tls_offset( - __DECONST(Obj_Entry *, defobj))) { - _rtld_error( - "%s: No space available for static " - "Thread Local Storage", obj->path); - return (-1); - } - } *where += (Elf_Addr)(def->st_value + rela->r_addend - TLS_DTV_OFFSET);