From nobody Sat Sep 12 00:28:04 2026 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 4hhXLr6YQ5z6rbFH for ; Sat, 12 Sep 2026 00:28:04 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hhXLr4XLfz4mwB for ; Sat, 12 Sep 2026 00:28:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789172884; 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=bq7XW9dRFmlotsIbCQmzff+Gwy88DickOC2EdsMnvhY=; b=I8d3kjmb1pXxW99FMUJUxSv83UdyjGA9bO5hObT6mYE9dN9pExuie6eN5cYyqHAjbwEgMe mskMqVKA/1t1ceWYOwqSnCwc3UOe7ZaNxvq/2S32zv0coUoFiYp3nMUm8/X2zimG0sbVeT bdxB8A1gTFwfL+TJq0taJ301HRNgaVOdi0D04Yy8QsebOkZZjOdC1HF9eX6QurTWRxvA+R dvWCV3AodSmVB0NEmIwOUn2AHC2vh3hZZfbvaJR0vWDWwept2dH9ns7zIRLwxhacLcpo2R 5U7n4fFpqD+ZmpNgTP4x0LG0jupnF9IUdcy2ftwidUU8zNdeFtcmpaJhI4bKdA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789172884; b=hdrnIn/6UZfTvY2spBVF+C9r+DHAzpc4K7roGCELJCgsyfQctuisk1N++Vki/v/D/lYh3m u2di6r6BP7w4fYY5aXTOvIJRSvhvfMBJtMQ25FEIT9OAKB6zzDHkQh3sz8SvpYklUuoKiY hc5nIXv5kKVtvevEFRDDd1ybzu6njo6FXkx1K5lZ7ct2EDRyCT4w0C3lgQF6uj/geIsPbO 6TSSf7+xyx5kIZ/cMzr6EOnuR1qMoH69gFVENfm+GDPD9ldPo2+6bR6czTfLc2RFMuodRn rGLtXxHHY7Hwl+1u8/SCGvazelidCBo80S5yPc11mLCupaD3n+chEP03+46/bw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789172884; 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=bq7XW9dRFmlotsIbCQmzff+Gwy88DickOC2EdsMnvhY=; b=YgSM+ruSThqLW0bXx+mIMYknXztMzr49TpWW9TZJhCKOoJgEHZz6QwMXb7B2iuY790r6YB 3A4j4GEWW/9vM9VG0jPFEWd5EDQJWBTR3oPWzOarS3L/XiB+IaeUezd31JuVbFXPQqdu4y U4e02ywTsIUh+pf3GkRVGQVm/IxNTnzr7SIr9TVsZUpp+C/7JaqbcptbjIFDFxiT9jLBxB x2lKTqdnXzFtnoCKlPDE/HFMgdlQENZYuCJQkMiBQr86lVwLtvayJ49cAgtBCTVfIP8Yu5 Hh7ftoWRLw8AalxnivA/KbOo4iQPsk7wv1TX7tV1zmxsUAUT0yMRfVJ/ieLsKw== 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 4hhXLr3cJCzctQ for ; Sat, 12 Sep 2026 00:28:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4735b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 12 Sep 2026 00:28:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 6a4450470593 - stable/15 - rtld: allow arches to initialize/finalize objects 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 6a4450470593578194a9c7ab5ab14b2b1df1f2e3 Auto-Submitted: auto-generated Date: Sat, 12 Sep 2026 00:28:04 +0000 Message-Id: <6aa49c94.4735b.507377b@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6a4450470593578194a9c7ab5ab14b2b1df1f2e3 commit 6a4450470593578194a9c7ab5ab14b2b1df1f2e3 Author: Konstantin Belousov AuthorDate: 2026-08-26 11:53:20 +0000 Commit: Konstantin Belousov CommitDate: 2026-09-11 06:59:52 +0000 rtld: allow arches to initialize/finalize objects (cherry picked from commit 6a69d28ee07534c8c0eac328dbbc2529dfceb7fd) --- libexec/rtld-elf/aarch64/rtld_machdep.h | 3 +++ libexec/rtld-elf/amd64/rtld_machdep.h | 3 +++ libexec/rtld-elf/arm/rtld_machdep.h | 3 +++ libexec/rtld-elf/i386/rtld_machdep.h | 3 +++ libexec/rtld-elf/map_object.c | 2 ++ libexec/rtld-elf/powerpc/rtld_machdep.h | 3 +++ libexec/rtld-elf/powerpc64/rtld_machdep.h | 3 +++ libexec/rtld-elf/riscv/rtld_machdep.h | 3 +++ 8 files changed, 23 insertions(+) diff --git a/libexec/rtld-elf/aarch64/rtld_machdep.h b/libexec/rtld-elf/aarch64/rtld_machdep.h index 4b5ad523ee87..4edf374617af 100644 --- a/libexec/rtld-elf/aarch64/rtld_machdep.h +++ b/libexec/rtld-elf/aarch64/rtld_machdep.h @@ -41,6 +41,9 @@ struct Struct_Obj_Entry; #define MD_OBJ_ENTRY \ bool variant_pcs : 1; /* Object has a variant pcs function */ +#define MD_OBJ_ENTRY_INIT(obj) +#define MD_OBJ_ENTRY_FINI(obj) + /* Return the address of the .dynamic section in the dynamic linker. */ #define rtld_dynamic(obj) \ ({ \ diff --git a/libexec/rtld-elf/amd64/rtld_machdep.h b/libexec/rtld-elf/amd64/rtld_machdep.h index 2ee63d566bed..53a3cd29f967 100644 --- a/libexec/rtld-elf/amd64/rtld_machdep.h +++ b/libexec/rtld-elf/amd64/rtld_machdep.h @@ -37,6 +37,9 @@ struct Struct_Obj_Entry; #define MD_OBJ_ENTRY +#define MD_OBJ_ENTRY_INIT(obj) +#define MD_OBJ_ENTRY_FINI(obj) + /* Return the address of the .dynamic section in the dynamic linker. */ Elf_Dyn *rtld_dynamic_addr(void); #define rtld_dynamic(obj) rtld_dynamic_addr() diff --git a/libexec/rtld-elf/arm/rtld_machdep.h b/libexec/rtld-elf/arm/rtld_machdep.h index 88fa18a0c07a..c46b75fca078 100644 --- a/libexec/rtld-elf/arm/rtld_machdep.h +++ b/libexec/rtld-elf/arm/rtld_machdep.h @@ -38,6 +38,9 @@ struct Struct_Obj_Entry; #define MD_OBJ_ENTRY +#define MD_OBJ_ENTRY_INIT(obj) +#define MD_OBJ_ENTRY_FINI(obj) + /* Return the address of the .dynamic section in the dynamic linker. */ #define rtld_dynamic(obj) (&_DYNAMIC) diff --git a/libexec/rtld-elf/i386/rtld_machdep.h b/libexec/rtld-elf/i386/rtld_machdep.h index 079991f913d6..7eb7b1cdfb77 100644 --- a/libexec/rtld-elf/i386/rtld_machdep.h +++ b/libexec/rtld-elf/i386/rtld_machdep.h @@ -37,6 +37,9 @@ struct Struct_Obj_Entry; #define MD_OBJ_ENTRY +#define MD_OBJ_ENTRY_INIT(obj) +#define MD_OBJ_ENTRY_FINI(obj) + /* Return the address of the .dynamic section in the dynamic linker. */ #define rtld_dynamic(obj) \ ((const Elf_Dyn *)((obj)->relocbase + (Elf_Addr)&_DYNAMIC)) diff --git a/libexec/rtld-elf/map_object.c b/libexec/rtld-elf/map_object.c index 0b4e847f407e..7135ba1843fc 100644 --- a/libexec/rtld-elf/map_object.c +++ b/libexec/rtld-elf/map_object.c @@ -477,6 +477,7 @@ obj_free(Obj_Entry *obj) free(obj->path); if (obj->phdr_alloc) free(__DECONST(void *, obj->phdr)); + MD_OBJ_ENTRY_FINI(obj); free(obj); } @@ -489,6 +490,7 @@ obj_new(void) STAILQ_INIT(&obj->dldags); STAILQ_INIT(&obj->dagmembers); STAILQ_INIT(&obj->names); + MD_OBJ_ENTRY_INIT(obj); return (obj); } diff --git a/libexec/rtld-elf/powerpc/rtld_machdep.h b/libexec/rtld-elf/powerpc/rtld_machdep.h index de6a894ac1f5..69a833575a7c 100644 --- a/libexec/rtld-elf/powerpc/rtld_machdep.h +++ b/libexec/rtld-elf/powerpc/rtld_machdep.h @@ -38,6 +38,9 @@ struct Struct_Obj_Entry; #define MD_OBJ_ENTRY \ Elf_Addr *gotptr; /* GOT pointer (secure-plt only) */ +#define MD_OBJ_ENTRY_INIT(obj) +#define MD_OBJ_ENTRY_FINI(obj) + /* Return the address of the .dynamic section in the dynamic linker. */ #define rtld_dynamic(obj) (&_DYNAMIC) diff --git a/libexec/rtld-elf/powerpc64/rtld_machdep.h b/libexec/rtld-elf/powerpc64/rtld_machdep.h index 06eb6d884101..76091895bb5d 100644 --- a/libexec/rtld-elf/powerpc64/rtld_machdep.h +++ b/libexec/rtld-elf/powerpc64/rtld_machdep.h @@ -38,6 +38,9 @@ struct Struct_Obj_Entry; #define MD_OBJ_ENTRY \ Elf_Addr glink; /* GLINK PLT call stub section */ +#define MD_OBJ_ENTRY_INIT(obj) +#define MD_OBJ_ENTRY_FINI(obj) + /* Return the address of the .dynamic section in the dynamic linker. */ #define rtld_dynamic(obj) (&_DYNAMIC) diff --git a/libexec/rtld-elf/riscv/rtld_machdep.h b/libexec/rtld-elf/riscv/rtld_machdep.h index 1f4fe2e928fe..acb6fa4835db 100644 --- a/libexec/rtld-elf/riscv/rtld_machdep.h +++ b/libexec/rtld-elf/riscv/rtld_machdep.h @@ -44,6 +44,9 @@ struct Struct_Obj_Entry; #define MD_OBJ_ENTRY +#define MD_OBJ_ENTRY_INIT(obj) +#define MD_OBJ_ENTRY_FINI(obj) + uint64_t set_gp(struct Struct_Obj_Entry *obj); /* Return the address of the .dynamic section in the dynamic linker. */