qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>,
	Junjie Mao <junjie.mao@hotmail.com>
Subject: [PATCH v2 06/13] rust: modernize link_section usage for ELF platforms
Date: Mon, 21 Oct 2024 18:35:31 +0200	[thread overview]
Message-ID: <20241021163538.136941-7-pbonzini@redhat.com> (raw)
In-Reply-To: <20241021163538.136941-1-pbonzini@redhat.com>

Some newer ABI implementations do not provide .ctors; and while
some linkers rewrite .ctors into .init_array, not all of them do.
Use the newer .init_array ABI, which works more reliably, and
apply it to all non-Apple, non-Windows platforms.

This is similar to how the ctor crate operates; without this change,
"#[derive(Object)]" does not work on Fedora 41.

Reviewed-by: Junjie Mao <junjie.mao@hotmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 rust/qemu-api-macros/src/lib.rs  |  7 +++++--
 rust/qemu-api/src/definitions.rs | 14 ++++++++++----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/rust/qemu-api-macros/src/lib.rs b/rust/qemu-api-macros/src/lib.rs
index 59aba592d9a..70e3f920460 100644
--- a/rust/qemu-api-macros/src/lib.rs
+++ b/rust/qemu-api-macros/src/lib.rs
@@ -16,8 +16,11 @@ pub fn derive_object(input: TokenStream) -> TokenStream {
     let expanded = quote! {
         #[allow(non_upper_case_globals)]
         #[used]
-        #[cfg_attr(target_os = "linux", link_section = ".ctors")]
-        #[cfg_attr(target_os = "macos", link_section = "__DATA,__mod_init_func")]
+        #[cfg_attr(
+            not(any(target_vendor = "apple", target_os = "windows")),
+            link_section = ".init_array"
+        )]
+        #[cfg_attr(target_vendor = "apple", link_section = "__DATA,__mod_init_func")]
         #[cfg_attr(target_os = "windows", link_section = ".CRT$XCU")]
         pub static #module_static: extern "C" fn() = {
             extern "C" fn __register() {
diff --git a/rust/qemu-api/src/definitions.rs b/rust/qemu-api/src/definitions.rs
index 49ac59af123..3323a665d92 100644
--- a/rust/qemu-api/src/definitions.rs
+++ b/rust/qemu-api/src/definitions.rs
@@ -31,8 +31,11 @@ pub trait Class {
 macro_rules! module_init {
     ($func:expr, $type:expr) => {
         #[used]
-        #[cfg_attr(target_os = "linux", link_section = ".ctors")]
-        #[cfg_attr(target_os = "macos", link_section = "__DATA,__mod_init_func")]
+        #[cfg_attr(
+            not(any(target_vendor = "apple", target_os = "windows")),
+            link_section = ".init_array"
+        )]
+        #[cfg_attr(target_vendor = "apple", link_section = "__DATA,__mod_init_func")]
         #[cfg_attr(target_os = "windows", link_section = ".CRT$XCU")]
         pub static LOAD_MODULE: extern "C" fn() = {
             extern "C" fn __load() {
@@ -48,8 +51,11 @@ extern "C" fn __load() {
         // NOTE: To have custom identifiers for the ctor func we need to either supply
         // them directly as a macro argument or create them with a proc macro.
         #[used]
-        #[cfg_attr(target_os = "linux", link_section = ".ctors")]
-        #[cfg_attr(target_os = "macos", link_section = "__DATA,__mod_init_func")]
+        #[cfg_attr(
+            not(any(target_vendor = "apple", target_os = "windows")),
+            link_section = ".init_array"
+        )]
+        #[cfg_attr(target_vendor = "apple", link_section = "__DATA,__mod_init_func")]
         #[cfg_attr(target_os = "windows", link_section = ".CRT$XCU")]
         pub static LOAD_MODULE: extern "C" fn() = {
             extern "C" fn __load() {
-- 
2.46.2



  parent reply	other threads:[~2024-10-21 16:36 UTC|newest]

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-10-21 16:35 [PATCH v2 00/13] rust: miscellaneous cleanups + QOM integration tests Paolo Bonzini
2024-10-21 16:35 ` [PATCH v2 01/13] meson: import rust module into a global variable Paolo Bonzini
2024-10-23 10:29   ` Manos Pitsidianakis
2024-10-21 16:35 ` [PATCH v2 02/13] meson: remove repeated search for rust_root_crate.sh Paolo Bonzini
2024-10-21 16:35 ` [PATCH v2 03/13] meson: pass rustc_args when building all crates Paolo Bonzini
2024-10-22  2:35   ` Junjie Mao
2024-10-22 15:35   ` Zhao Liu
2024-10-21 16:35 ` [PATCH v2 04/13] rust: do not use --no-size_t-is-usize Paolo Bonzini
2024-10-22  2:38   ` Junjie Mao
2024-10-23  4:24   ` Zhao Liu
2024-10-21 16:35 ` [PATCH v2 05/13] rust: remove uses of #[no_mangle] Paolo Bonzini
2024-10-23 10:48   ` Paolo Bonzini
2024-10-23 14:06     ` Zhao Liu
2024-10-23 14:13   ` Zhao Liu
2024-10-21 16:35 ` Paolo Bonzini [this message]
2024-10-23 15:31   ` [PATCH v2 06/13] rust: modernize link_section usage for ELF platforms Zhao Liu
2024-10-24  6:04     ` Paolo Bonzini
2024-10-21 16:35 ` [PATCH v2 07/13] rust: build integration test for the qemu_api crate Paolo Bonzini
2024-10-22  1:52   ` Junjie Mao
2024-10-24 17:23   ` Zhao Liu
2024-10-21 16:35 ` [PATCH v2 08/13] rust: cleanup module_init!, use it from #[derive(Object)] Paolo Bonzini
2024-10-22  2:02   ` Junjie Mao
2024-10-22  5:16     ` Paolo Bonzini
2024-10-22  6:00       ` Junjie Mao
2024-10-22  7:20         ` Paolo Bonzini
2024-10-22 20:32         ` Kevin Wolf
2024-10-23  6:46           ` Junjie Mao
2024-10-25  8:59   ` Zhao Liu
2024-10-25  9:12     ` Paolo Bonzini
2024-10-21 16:35 ` [PATCH v2 09/13] rust: clean up define_property macro Paolo Bonzini
2024-10-22 19:46   ` Kevin Wolf
2024-10-23  7:10     ` Paolo Bonzini
2024-10-23 10:38   ` Manos Pitsidianakis
2024-10-23 11:23     ` Paolo Bonzini
2024-10-25  9:17   ` Zhao Liu
2024-10-21 16:35 ` [PATCH v2 10/13] qdev: make properties array "const" Paolo Bonzini
2024-10-22  4:31   ` Philippe Mathieu-Daudé
2024-10-22  5:23     ` Paolo Bonzini
2024-10-22 21:43       ` Philippe Mathieu-Daudé
2024-10-23  7:06         ` Paolo Bonzini
2024-10-21 16:35 ` [PATCH v2 11/13] rust: make properties array immutable Paolo Bonzini
2024-10-25 11:27   ` Zhao Liu
2024-10-21 16:35 ` [PATCH v2 12/13] rust: provide safe wrapper for MaybeUninit::zeroed() Paolo Bonzini
2024-10-25 10:10   ` Zhao Liu
2024-10-21 16:35 ` [PATCH v2 13/13] rust: do not use TYPE_CHARDEV unnecessarily Paolo Bonzini
2024-10-25 10:05   ` Zhao Liu
2024-10-22 20:46 ` [PATCH v2 00/13] rust: miscellaneous cleanups + QOM integration tests Kevin Wolf
2024-10-23  7:14   ` Paolo Bonzini

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20241021163538.136941-7-pbonzini@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=junjie.mao@hotmail.com \
    --cc=manos.pitsidianakis@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).