From nobody Thu Jan 15 18:24:25 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 4dsWbZ2fd6z6PH70 for ; Thu, 15 Jan 2026 18:24:26 +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 4dsWbZ0wB8z3n72 for ; Thu, 15 Jan 2026 18:24:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768501466; 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=T8IwvAj+McSNTx6LX51zrHbNzIl2eXw2Sj3QXchOwY4=; b=YhRl/0klSc9k9ZC5qWiyaMecx4+lNgSFtlLqL3ggS26+yTlbahCvBEYIc3f5Vdx8/5AB89 kn2UCEu5CdBbPBWetAe5AvoFjVbN4RwNgNr0xxxN2LxQJUnI4JmKXGWJfhKkQVFd81+TMM HjMjsEEV9Lo1i/cJ2oWIF4Xrkb5B06EVZmX/EZf3RS9d9jOXAYFjO4Rq+yXY2kRZlk16Iz P/sP7DZ9P5zubUe9LJRHpvR5f3RU6qlzkeQndBJFgfqMdbDyf92rny+TLIRcKfmgnYcJ4L lylc6BlIJl81Rsg48i9aTHtV/Tq1PuL/XfZjQaHGJVFWD7W2NdUWM8M12q0VLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768501466; 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=T8IwvAj+McSNTx6LX51zrHbNzIl2eXw2Sj3QXchOwY4=; b=Db4Z5CCdyETjBcIgMUyhT2BCjXySEsUqhKpxL6DBFKfOtrrfrJ6XVahX6QZqOPvSw/zRJm 5HbA6WaJAoTKytFlefJgdHHegvPH+W/EkXS6edzEBEA2HRVGKmFG46Nhqyod2Ya8XGAUB6 jOsV0K/f5bU5IAU72FHDrEqxFk9e3JIyV6fd0TP4qn6MXUW31YjY/BKl4JLy/feLx6bh0C lUNrDgHG0zknRFgdRUsX89AuU13v3wBF6TIyb7taGJacwlG+9kqPNLhnflzDnbL5uEP5vU EyqsrmmY4i0J9+nazOhyhpegFEDruMvp/qCi5AAfcP8tnmhmYf6l+hihhLAgKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768501466; a=rsa-sha256; cv=none; b=aaRMqKhzGjYxd2kmQgNP03hSFEQkTUmCL0tKtzIDMPlOIOjsuF4I8ZVfCJX6n8TtbzZLBb L76YSOMJ+g8D6z29oeGDO/6423ht9iuoz8RC+zkhbMkqDQaOe5oVDXYfnyBC7EJO+/yZ2d GqpC6N6RS7QM3CEWpA6ybo6wnha2QbNz7LaKRf6iRuDtVqEvwmDDKjfEIHG0Vy9NbIJ9Xs wQgdl7rAW6Sut2hYbGOVPhswf/jxlo9CgYe2wWJFz26CNnxpnODVuxTFMUQZ7vwk9F8OQJ QOrAUcZvrEsm3itfAnSdnfo5p8Jt4++61NHgAzH/89nz+xkrhwk1XtQk1HxGcw== 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 4dsWbZ04zFzgJK for ; Thu, 15 Jan 2026 18:24:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 40112 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 15 Jan 2026 18:24:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 6d6bf4a892d6 - main - rtld: Use a helper variable to simplify a few lines 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6d6bf4a892d6be84ec59fce5419eab616bcabb40 Auto-Submitted: auto-generated Date: Thu, 15 Jan 2026 18:24:25 +0000 Message-Id: <696930d9.40112.516e168b@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=6d6bf4a892d6be84ec59fce5419eab616bcabb40 commit 6d6bf4a892d6be84ec59fce5419eab616bcabb40 Author: John Baldwin AuthorDate: 2026-01-15 18:23:42 +0000 Commit: John Baldwin CommitDate: 2026-01-15 18:23:42 +0000 rtld: Use a helper variable to simplify a few lines Reviewed by: kib Sponsored by: AFRL, DARPA Differential Revision: https://reviews.freebsd.org/D54507 --- libexec/rtld-elf/rtld.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 78a111095400..5e15ba996ec8 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -5496,7 +5496,7 @@ allocate_tls(Obj_Entry *objs, void *oldtcb, size_t tcbsize, size_t tcbalign) char *addr; size_t i; size_t extra_size, maxalign, post_size, pre_size, tls_block_size; - size_t tls_init_align, tls_init_offset; + size_t tls_init_align, tls_init_offset, tls_bss_offset; if (oldtcb != NULL && tcbsize == TLS_TCB_SIZE) return (oldtcb); @@ -5554,11 +5554,10 @@ allocate_tls(Obj_Entry *objs, void *oldtcb, size_t tcbsize, size_t tcbalign) obj->tlsinitsize); } if (obj->tlssize > obj->tlsinitsize) { - memset(addr + tls_init_offset + - obj->tlsinitsize, - 0, - obj->tlssize - obj->tlsinitsize - - tls_init_offset); + tls_bss_offset = tls_init_offset + + obj->tlsinitsize; + memset(addr + tls_bss_offset, 0, + obj->tlssize - tls_bss_offset); } dtv->dtv_slots[obj->tlsindex - 1].dtvs_tls = addr; }