From nobody Mon Dec 15 18:18:54 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 4dVSxW3YSZz6L7Gj for ; Mon, 15 Dec 2025 18:18:55 +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 4dVSxW0dR3z4LVY for ; Mon, 15 Dec 2025 18:18:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765822735; 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=xvz57wV4zW7pKH/YDGTdnAzCunuDtV6iTZ80IwviyBQ=; b=nFrvYsoJMjfpiKpr58kxWO6bPIoam1TEuT0tGHab8YTd5sA4mEARC9qC4Frs83TCux/b0F NuWUPPrsdBobB/hF0iEOfQUeIADuJxCbv+QV+fteJqNTqrPuNvFw/sWvAJDCOqRVvKIYyX AvQPmGvMzXZ48O6K9iXAJIHJT8v35al6r0io6ADy/7f384UOSGK6nYGDxKnF3EDYCFCKYY 7px1Ogrg2YaAT2iB1j+mM0TFa4vDwUTuN5ZqTlI0w0Wxa/0qo2yZv+MOUnLZQ5j3k1TJ0f 6CYg9ye2Lg9fhWKPWWsoeVKtUTU/AyJDTehzAAa6BX8vcvkXAm86pJqHeatmBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765822735; 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=xvz57wV4zW7pKH/YDGTdnAzCunuDtV6iTZ80IwviyBQ=; b=CtRy3JvZvN+79ITEX/LQZcE7W+iPPx+BHAvSAWFy0S2YdbyLb9JiiD1dY1NZIPWE3AnIPF VpDOuMCH9BsG+Jmiy4SkKJAao0v8punBhh1X6+9iL/U98WpXUFScjD9BMoHwJdjoqjx8Ly yOdD1bemiULwrc1HfmlCp6+kRAIsUySawAcz86AaK/RaUzDjMJy8CzfppHK4CFAPnxmIcs v6DSCGdebJrypxzIAY/i4COAfcK8+j0CBXv7Gr+M+MWuU494ZwLt4GyqfTLqvmf1gzbdH3 HtQ1jKXovg1Mn60ztYNRwOwRoQ0aStoi60avacWpjCtRryBuWKcHKfbrJCk4rQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765822735; a=rsa-sha256; cv=none; b=RIU9uN6lKWwFWAbL58ar2r4zV2d//ewqoxIkgdHJCchDJNwO4thXC79I5AINqXWfv3HtNf S017n2jK0IG402OzgQ7eyHc6kGv0g3y3RvXPc6VOuYOFS0L3+IXpppRLinsUrTCWhwzvHc YhOE+7JZXzVoV6uY8BfvgQbu5jVdpEXqHg390EXVN+B9K7NDZ+b7Vpbjp26OHV7duRP3OW 73RdGs5xdAhemUULxXSRun0M6+7FjdSiu/u+iFaoLegwRcaY2Q8keLW6Fo//PjVJxtVN1N 7Jqdgdp2UAJXQQqc95aEbP1JT9gyV8tJyCS67MXdeMfMfN7iTctQ2p90JeBygg== 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 4dVSxW0052zWbQ for ; Mon, 15 Dec 2025 18:18:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 237e5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 15 Dec 2025 18:18:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: a85ba2eca4d6 - stable/13 - rtld-elf/riscv: Don't allocate static TLS for dynamic TLS relocations 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/13 X-Git-Reftype: branch X-Git-Commit: a85ba2eca4d6f7a958e3d4b139723e5116e0a623 Auto-Submitted: auto-generated Date: Mon, 15 Dec 2025 18:18:54 +0000 Message-Id: <6940510e.237e5.4f8fdc14@gitrepo.freebsd.org> The branch stable/13 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=a85ba2eca4d6f7a958e3d4b139723e5116e0a623 commit a85ba2eca4d6f7a958e3d4b139723e5116e0a623 Author: Jessica Clarke AuthorDate: 2025-05-28 20:22:15 +0000 Commit: Jessica Clarke CommitDate: 2025-12-15 17:56:36 +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);