From nobody Wed Oct 23 00:38:38 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1729528618; cv=none; d=zohomail.com; s=zohoarc; b=KH7d7tQsTeyufSYFoU9Crqce7aUU+kN+xJWgZCyHaC03bbmHiiD7TXQVjm017+eeeXIW1t0rBHoulX82uYFyFeYulSlpHYcF3Kfo4xPEBFV8XIui3J3TexcsjAOT5BUBu59Q8d6vsiw3aCB0n1CBv9DJGiALvOUtop8MAXr57lI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1729528618; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=LC3eZXbf/MgMolpo8tNMzb8FwxljpvkDw9TXTcaEtG4=; b=McdsbI080g2gjaAJA1MbEJwPer22If8uBqiZO7z5GMT2PzTzhToLXZa5aR2Axh2hUagsjh5cV4Y/TeoL9DebuyO9bAA3c9W6Lkmsh42xD2lpGT2ltN6Fk5n0GPad3/cYrEoBQGB7d2x/jpkI8F5iWBp0kGi+qxsDJqUZ9gcOw7c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 172952861861544.38267441738674; Mon, 21 Oct 2024 09:36:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t2vOF-0006Aq-68; Mon, 21 Oct 2024 12:36:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t2vO4-000622-JQ for qemu-devel@nongnu.org; Mon, 21 Oct 2024 12:36:11 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t2vO2-0006JG-Hy for qemu-devel@nongnu.org; Mon, 21 Oct 2024 12:36:08 -0400 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-524-W5rTGtOQMS-wBgFLAVDLwA-1; Mon, 21 Oct 2024 12:36:04 -0400 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-4316300bb15so25077875e9.2 for ; Mon, 21 Oct 2024 09:36:03 -0700 (PDT) Received: from avogadro.local ([151.95.144.54]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37ee0a47b07sm4700072f8f.25.2024.10.21.09.36.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Oct 2024 09:36:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1729528565; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LC3eZXbf/MgMolpo8tNMzb8FwxljpvkDw9TXTcaEtG4=; b=a0SeJMUqcC0uc6KyUlYgiH74upYCbDi5JvUEco9lGIrUmoXA1yfq+DxsOtiow+cxwl5F+O V0aacUJzdUsTNs7SCLN0seR7YtpLHgWRu0+4YY6O4KDIEevyOVee34u3muj5kAY/eCz0Ww FhbVmhQyVOm50w2cUuWge+q4k2IUVSE= X-MC-Unique: W5rTGtOQMS-wBgFLAVDLwA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729528562; x=1730133362; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LC3eZXbf/MgMolpo8tNMzb8FwxljpvkDw9TXTcaEtG4=; b=bvrXJieR7NxIKBUdfAf0dgzkLI1tVcrCMnzKFiSV1jtOMZXwvNavL6JKivybmCoft/ FOM2YhLF2jrVYIgva40XwiTrQh3mgopvb+5zhwFBdlXRHYlp5JXVbwtE78e6e57WlFRQ IcuK1/7YxiDq3HLPJEaDfR3+DoIdy2adsV3r9zIf6vJj6Riu40OOJ1dOqxG19Blh9h37 cR8/Q1d3SO6d6GtSnKKfXrJsWtRM9mDwfgWcCJI/6PiP3jOFZvFg/crh5PB3J7gpckNQ ACSM38pjAnj503wwCjOaiWbmjXDLdWnS24uCdlEBIm6BM5G0Pi6aXQLgGm6iApoTu1/d jS/g== X-Gm-Message-State: AOJu0YxOYz11BX0Z+/XUOKUA601+KC9pnQ5fwa4z76YR7UYk0YFf9EXn 33xOmCmhQR9WaZ2UAdqIWOAhszoNO4fpCo0zYxQ5boz60HBsoc0CLEw2qGCF6tLiP0+G8hBDFf0 8TyzZ95tx2fHCdUpMwLGWTxWPbWvXvNbClMjH5bm29SFsziS0gBBOsdn4vBjqz1f2f426E2S5UC eqG4C24/C7Csxpch8g+xCtYsR7s67IwA6zvzr/LGw= X-Received: by 2002:a05:600c:1d04:b0:431:43c6:e868 with SMTP id 5b1f17b1804b1-4316168989amr96211185e9.23.1729528562426; Mon, 21 Oct 2024 09:36:02 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFysiBm3yf0tbZkEr5nT0eHMMCE9Z/zmUvvYl+CWpu6d66CLnxg2DilTYfF7Q1Kp1VDLVTd3w== X-Received: by 2002:a05:600c:1d04:b0:431:43c6:e868 with SMTP id 5b1f17b1804b1-4316168989amr96210875e9.23.1729528561868; Mon, 21 Oct 2024 09:36:01 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Manos Pitsidianakis , Junjie Mao Subject: [PATCH v2 06/13] rust: modernize link_section usage for ELF platforms Date: Mon, 21 Oct 2024 18:35:31 +0200 Message-ID: <20241021163538.136941-7-pbonzini@redhat.com> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241021163538.136941-1-pbonzini@redhat.com> References: <20241021163538.136941-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.421, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1729528619364116600 Content-Type: text/plain; charset="utf-8" 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 Signed-off-by: Paolo Bonzini --- 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 =3D quote! { #[allow(non_upper_case_globals)] #[used] - #[cfg_attr(target_os =3D "linux", link_section =3D ".ctors")] - #[cfg_attr(target_os =3D "macos", link_section =3D "__DATA,__mod_i= nit_func")] + #[cfg_attr( + not(any(target_vendor =3D "apple", target_os =3D "windows")), + link_section =3D ".init_array" + )] + #[cfg_attr(target_vendor =3D "apple", link_section =3D "__DATA,__m= od_init_func")] #[cfg_attr(target_os =3D "windows", link_section =3D ".CRT$XCU")] pub static #module_static: extern "C" fn() =3D { extern "C" fn __register() { diff --git a/rust/qemu-api/src/definitions.rs b/rust/qemu-api/src/definitio= ns.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) =3D> { #[used] - #[cfg_attr(target_os =3D "linux", link_section =3D ".ctors")] - #[cfg_attr(target_os =3D "macos", link_section =3D "__DATA,__mod_i= nit_func")] + #[cfg_attr( + not(any(target_vendor =3D "apple", target_os =3D "windows")), + link_section =3D ".init_array" + )] + #[cfg_attr(target_vendor =3D "apple", link_section =3D "__DATA,__m= od_init_func")] #[cfg_attr(target_os =3D "windows", link_section =3D ".CRT$XCU")] pub static LOAD_MODULE: extern "C" fn() =3D { extern "C" fn __load() { @@ -48,8 +51,11 @@ extern "C" fn __load() { // NOTE: To have custom identifiers for the ctor func we need to e= ither supply // them directly as a macro argument or create them with a proc ma= cro. #[used] - #[cfg_attr(target_os =3D "linux", link_section =3D ".ctors")] - #[cfg_attr(target_os =3D "macos", link_section =3D "__DATA,__mod_i= nit_func")] + #[cfg_attr( + not(any(target_vendor =3D "apple", target_os =3D "windows")), + link_section =3D ".init_array" + )] + #[cfg_attr(target_vendor =3D "apple", link_section =3D "__DATA,__m= od_init_func")] #[cfg_attr(target_os =3D "windows", link_section =3D ".CRT$XCU")] pub static LOAD_MODULE: extern "C" fn() =3D { extern "C" fn __load() { --=20 2.46.2