From nobody Sat Sep 05 22:00:37 2026 X-Original-To: dev-commits-src-main@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 4hcnMT2lJVz6rCJl for ; Sat, 05 Sep 2026 22:00:37 +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 4hcnMT1rV8z3xjW for ; Sat, 05 Sep 2026 22:00:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788645637; 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=1m/mQ7Iv3JLBoAHzk16BLuBErrFP3gsD+zaLrHD9ddo=; b=YtstOQsC9X4m4j6NYwdpM0pwrYa7JyxB3qWZd7E10LKYequYt8HYoL1y8s6Upa4GQwb8Uv UMJk/BEKFIrCE7D8W/TL5DzCIlaabyIJWxmm16V/2EmRhgl8IZstbJKvlB8FHUJrxWnGnK mqqbBpyo1iayRbCK3YETMtlsd/q9o9PrInQfpEF6mz6eq95l9D3/cg2lZDSvUdAFgfrGhh WwuR7/vkHWF87PzI2HmcztH9VCMVWbIgnTPAgGTzpJHOyJoR8pzEcneIU7a024Qr6kCa96 MqfcoR4QY3CvtI79OkSpRmdGsO96wXF+9LX+TEnFBesaCpg1n+VkYVuRnvQV7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788645637; a=rsa-sha256; cv=none; b=yOw6Q3/y+hPRcXgc+ZAhXkPhn87WCsPUXUY3+m6lI3lX+NLBO7slf1k33eM4HFOL2SNv0c pEt7o9UA5aOpGiFa0aOJHW8dEtrb5C+AhCgQ2pVasEEwAik/NPAozNI+OvKm3FLJ9ab5bC y734QNWQqF4R9RC1m0E/iP2lNBYAcg1T23hIbfy3RFQlv/rBGWGnljW11pr1av6qkiFbyz FMtOLdp5VAMZqHKZ6d8wtBq6wxo3d52IMRs7ipbK/rQrSsZU8SmA6OFM9eHYyIrByeB6BR yli1b+3hBcxduAoldVDQhD5T8IAJ+gNLnAJ2wKo2LT/nqd3axLwpTFtpb6GN6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788645637; 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=1m/mQ7Iv3JLBoAHzk16BLuBErrFP3gsD+zaLrHD9ddo=; b=UYcRl+YDhY6eeaQ8Fo3K8Ea6Wn/3ABiSkHehTwtkdbvy9wHhONu0T3vWKp4qqw5UXrZ70q z3VUJoOsddeAvsPHs9TKA+GIY61sgeO2oJxsNGWo8x6N90DAeee+2fMS+ZEdPHU2npcXB1 I0Tlz8PTYsrU9xKtrf8cRgdcSzMlIZo0kAAqocQH7xEBndAulGmCy7CCRBWk52AJkjWbjo ZtYEV2AhxI0l4u6MtSTmRP2vqcMyIg0A9V5/bLLJePL6e3H3++JsrRd3u5O26gGSjP+hVn 2h0IcSbSukVqc1D5F2kxAIXmQioBhO19vvSISTRtcpAay8vXhyMeySX9vY3eBA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hcnMT0PQQz130P for ; Sat, 05 Sep 2026 22:00:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1910d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 05 Sep 2026 22:00:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 6a69d28ee075 - main - rtld: allow arches to initialize/finalize objects List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 6a69d28ee07534c8c0eac328dbbc2529dfceb7fd Auto-Submitted: auto-generated Date: Sat, 05 Sep 2026 22:00:37 +0000 Message-Id: <6a9c9105.1910d.4fc96c88@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6a69d28ee07534c8c0eac328dbbc2529dfceb7fd commit 6a69d28ee07534c8c0eac328dbbc2529dfceb7fd Author: Konstantin Belousov AuthorDate: 2026-08-26 11:53:20 +0000 Commit: Konstantin Belousov CommitDate: 2026-09-05 22:00:09 +0000 rtld: allow arches to initialize/finalize objects Discussed with: jrtc27 Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D59269 --- 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 81ed62d99a18..6852daf13d68 100644 --- a/libexec/rtld-elf/map_object.c +++ b/libexec/rtld-elf/map_object.c @@ -482,6 +482,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); } @@ -494,6 +495,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. */