From 6569f7302f9c4b4d68822905bbe89be7b187ca7c Mon Sep 17 00:00:00 2001 From: Laurent Cheylus Date: Wed, 5 Jun 2024 12:49:18 +0200 Subject: [PATCH] Add support for OpenBSD - Add support for OpenBSD, same as for FreeBSD - Tests OK with RUSTFLAGS="-Clink-arg=-fuse-ld=lld -Clink-arg=-z -Clink-arg=nostart-stop-gc" See https://github.com/dtolnay/linkme/issues/49 for explanations Signed-off-by: Laurent Cheylus --- impl/src/declaration.rs | 19 +++++++++++++++++++ impl/src/linker.rs | 16 ++++++++++++++++ src/distributed_slice.rs | 1 + src/lib.rs | 4 ++-- 4 files changed, 38 insertions(+), 2 deletions(-) diff --git a/impl/src/declaration.rs b/impl/src/declaration.rs index 6d9ac1e..ab55e19 100644 --- a/impl/src/declaration.rs +++ b/impl/src/declaration.rs @@ -109,6 +109,13 @@ pub fn expand(input: TokenStream) -> TokenStream { let freebsd_dupcheck_start = freebsd_section_start.replacen("linkme", "linkm2", 1); let freebsd_dupcheck_stop = freebsd_section_stop.replacen("linkme", "linkm2", 1); + let openbsd_section = linker::openbsd::section(&ident); + let openbsd_section_start = linker::openbsd::section_start(&ident); + let openbsd_section_stop = linker::openbsd::section_stop(&ident); + let openbsd_dupcheck = openbsd_section.replacen("linkme", "linkm2", 1); + let openbsd_dupcheck_start = openbsd_section_start.replacen("linkme", "linkm2", 1); + let openbsd_dupcheck_stop = openbsd_section_stop.replacen("linkme", "linkm2", 1); + let call_site = Span::call_site(); let link_section_macro_str = format!("_linkme_macro_{}", ident); let link_section_macro = Ident::new(&link_section_macro_str, call_site); @@ -126,6 +133,7 @@ pub fn expand(input: TokenStream) -> TokenStream { target_os = "fuchsia", target_os = "illumos", target_os = "freebsd", + target_os = "openbsd", target_os = "psp", ))] extern "Rust" { @@ -133,24 +141,28 @@ pub fn expand(input: TokenStream) -> TokenStream { #[cfg_attr(any(target_os = "macos", target_os = "ios", target_os = "tvos"), link_name = #macho_section_start)] #[cfg_attr(target_os = "illumos", link_name = #illumos_section_start)] #[cfg_attr(target_os = "freebsd", link_name = #freebsd_section_start)] + #[cfg_attr(target_os = "openbsd", link_name = #openbsd_section_start)] static LINKME_START: <#ty as #linkme_path::__private::Slice>::Element; #[cfg_attr(any(target_os = "none", target_os = "linux", target_os = "android", target_os = "fuchsia", target_os = "psp"), link_name = #linux_section_stop)] #[cfg_attr(any(target_os = "macos", target_os = "ios", target_os = "tvos"), link_name = #macho_section_stop)] #[cfg_attr(target_os = "illumos", link_name = #illumos_section_stop)] #[cfg_attr(target_os = "freebsd", link_name = #freebsd_section_stop)] + #[cfg_attr(target_os = "openbsd", link_name = #openbsd_section_stop)] static LINKME_STOP: <#ty as #linkme_path::__private::Slice>::Element; #[cfg_attr(any(target_os = "none", target_os = "linux", target_os = "android", target_os = "fuchsia", target_os = "psp"), link_name = #linux_dupcheck_start)] #[cfg_attr(any(target_os = "macos", target_os = "ios", target_os = "tvos"), link_name = #macho_dupcheck_start)] #[cfg_attr(target_os = "illumos", link_name = #illumos_dupcheck_start)] #[cfg_attr(target_os = "freebsd", link_name = #freebsd_dupcheck_start)] + #[cfg_attr(target_os = "openbsd", link_name = #openbsd_dupcheck_start)] static DUPCHECK_START: #linkme_path::__private::usize; #[cfg_attr(any(target_os = "none", target_os = "linux", target_os = "android", target_os = "fuchsia", target_os = "psp"), link_name = #linux_dupcheck_stop)] #[cfg_attr(any(target_os = "macos", target_os = "ios", target_os = "tvos"), link_name = #macho_dupcheck_stop)] #[cfg_attr(target_os = "illumos", link_name = #illumos_dupcheck_stop)] #[cfg_attr(target_os = "freebsd", link_name = #freebsd_dupcheck_stop)] + #[cfg_attr(target_os = "openbsd", link_name = #openbsd_dupcheck_stop)] static DUPCHECK_STOP: #linkme_path::__private::usize; } @@ -175,6 +187,7 @@ pub fn expand(input: TokenStream) -> TokenStream { #[cfg_attr(any(target_os = "none", target_os = "linux", target_os = "android", target_os = "fuchsia", target_os = "psp"), link_section = #linux_section)] #[cfg_attr(target_os = "illumos", link_section = #illumos_section)] #[cfg_attr(target_os = "freebsd", link_section = #freebsd_section)] + #[cfg_attr(target_os = "openbsd", link_section = #openbsd_section)] static mut LINKME_PLEASE: [<#ty as #linkme_path::__private::Slice>::Element; 0] = []; #used @@ -183,6 +196,7 @@ pub fn expand(input: TokenStream) -> TokenStream { #[cfg_attr(target_os = "windows", link_section = #windows_dupcheck)] #[cfg_attr(target_os = "illumos", link_section = #illumos_dupcheck)] #[cfg_attr(target_os = "freebsd", link_section = #freebsd_dupcheck)] + #[cfg_attr(target_os = "openbsd", link_section = #openbsd_dupcheck)] static DUPCHECK: #linkme_path::__private::usize = 1; #[cfg(not(any( @@ -196,6 +210,7 @@ pub fn expand(input: TokenStream) -> TokenStream { target_os = "fuchsia", target_os = "illumos", target_os = "freebsd", + target_os = "openbsd", target_os = "psp", )))] #unsupported_platform @@ -229,6 +244,7 @@ pub fn expand(input: TokenStream) -> TokenStream { #![linkme_windows_section = concat!(#windows_section, $key)] #![linkme_illumos_section = concat!(#illumos_section, $key)] #![linkme_freebsd_section = concat!(#freebsd_section, $key)] + #![linkme_openbsd_section = concat!(#openbsd_section, $key)] $item } }; @@ -238,6 +254,7 @@ pub fn expand(input: TokenStream) -> TokenStream { #![linkme_windows_section = $windows_section:expr] #![linkme_illumos_section = $illumos_section:expr] #![linkme_freebsd_section = $freebsd_section:expr] + #![linkme_openbsd_section = $openbsd_section:expr] $item:item ) => { #used @@ -246,6 +263,7 @@ pub fn expand(input: TokenStream) -> TokenStream { #[cfg_attr(target_os = "windows", link_section = $windows_section)] #[cfg_attr(target_os = "illumos", link_section = $illumos_section)] #[cfg_attr(target_os = "freebsd", link_section = $freebsd_section)] + #[cfg_attr(target_os = "openbsd", link_section = $openbsd_section)] $item }; ($item:item) => { @@ -255,6 +273,7 @@ pub fn expand(input: TokenStream) -> TokenStream { #[cfg_attr(target_os = "windows", link_section = #windows_section)] #[cfg_attr(target_os = "illumos", link_section = #illumos_section)] #[cfg_attr(target_os = "freebsd", link_section = #freebsd_section)] + #[cfg_attr(target_os = "openbsd", link_section = #openbsd_section)] $item }; } diff --git a/impl/src/linker.rs b/impl/src/linker.rs index 75affe2..09156a9 100644 --- a/impl/src/linker.rs +++ b/impl/src/linker.rs @@ -30,6 +30,22 @@ pub mod freebsd { } } +pub mod openbsd { + use syn::Ident; + + pub fn section(ident: &Ident) -> String { + format!("linkme_{}", ident) + } + + pub fn section_start(ident: &Ident) -> String { + format!("__start_linkme_{}", ident) + } + + pub fn section_stop(ident: &Ident) -> String { + format!("__stop_linkme_{}", ident) + } +} + pub mod macho { use syn::Ident; diff --git a/src/distributed_slice.rs b/src/distributed_slice.rs index 757daf9..79f6bf8 100644 --- a/src/distributed_slice.rs +++ b/src/distributed_slice.rs @@ -164,6 +164,7 @@ impl DistributedSlice<[T]> { target_os = "fuchsia", target_os = "illumos", target_os = "freebsd", + target_os = "openbsd", target_os = "psp", ))] pub const unsafe fn private_new( diff --git a/src/lib.rs b/src/lib.rs index 1f4b2f2..835994f 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -12,9 +12,9 @@ //! //! # Platform support //! -//! | Component | Linux | macOS | Windows | FreeBSD | illumos | Other...† | +//! | Component | Linux | macOS | Windows | FreeBSD | OpenBSD | illumos | Other...† | //! |:---|:---:|:---:|:---:|:---:|:---:|:---:| -//! | Distributed slice | 💚 | 💚 | 💚 | 💚 | 💚 | | +//! | Distributed slice | 💚 | 💚 | 💚 | 💚 | 💚 | 💚 | | //! //!
***†*** We welcome PRs adding support for any platforms not //! listed here.