[SOL] Adjust SBF customization after upgrading to rust 1.65.0

Author: dmakarov

compiler/rustc_codegen_ssa/src/back/metadata.rs

@@ -249,6 +249,8 @@ pub(crate) fn create_object_file(sess: &Session) -> Option<write::Object<'static
         "loongarch64" => (Architecture::LoongArch64, None),
         "csky" => (Architecture::Csky, None),
         "arm64ec" => (Architecture::Aarch64, Some(SubArchitecture::Arm64EC)),
+        "bpf" => (Architecture::Bpf, None),
+        "sbf" => (Architecture::Bpf, None),
         // Unsupported architecture.
         _ => return None,
     };

compiler/rustc_target/src/callconv/sbf.rs

@@ -26,7 +26,7 @@ pub fn compute_abi_info<Ty>(fn_abi: &mut FnAbi<'_, Ty>) {
         classify_ret(&mut fn_abi.ret);
     }
 
-    for arg in &mut fn_abi.args {
+    for arg in fn_abi.args.iter_mut() {
         if arg.is_ignore() {
             continue;
         }

compiler/rustc_target/src/spec/sbf_base.rs

@@ -1,5 +1,5 @@
 use crate::abi::Endian;
-use super::{LinkArgs, LinkerFlavor, PanicStrategy, TargetOptions, LldFlavor};
+use super::{cvs, LinkArgs, LinkerFlavor, PanicStrategy, TargetOptions, LldFlavor};
 
 pub fn opts() -> TargetOptions {
     let linker_script = r"
@@ -33,6 +33,7 @@ SECTIONS
     lld_args.push("-z".into());
     lld_args.push("notext".into());
     let mut pre_link_args = LinkArgs::new();
+    pre_link_args.insert(LinkerFlavor::Ld, lld_args.clone());
     pre_link_args.insert(LinkerFlavor::Lld(LldFlavor::Ld), lld_args);
 
     TargetOptions {
@@ -46,6 +47,7 @@ SECTIONS
         env: "".into(),
         executables: true,
         features: "+solana".into(),
+        families: cvs!["solana"],
         link_script: Some(linker_script.into()),
         linker: Some("rust-lld".into()),
         linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld),

compiler/rustc_target/src/spec/tests/tests_impl.rs

@@ -28,7 +28,8 @@ impl Target {
             matches!(self.linker_flavor, LinkerFlavor::WasmLld(..))
         );
         assert_eq!(self.os == "emscripten", matches!(self.linker_flavor, LinkerFlavor::EmCc));
-        assert_eq!(self.arch == "bpf", matches!(self.linker_flavor, LinkerFlavor::Bpf));
+        assert_eq!(self.arch == "bpf" && self.features != "+solana",
+                   matches!(self.linker_flavor, LinkerFlavor::Bpf));
         assert_eq!(self.arch == "nvptx64", matches!(self.linker_flavor, LinkerFlavor::Ptx));
 
         for args in [

library/core/benches/lib.rs

@@ -1,7 +1,7 @@
 // wasm32 does not support benches (no time).
 // Disabling in Miri as these would take too long.
 #![cfg(not(miri))]
-#![cfg(not(any(target_arch = "wasm32", target_arch = "bpf", target_arch = "sbf")))]
+#![cfg(not(any(target_arch = "wasm32", target_family = "solana")))]
 #![feature(flt2dec)]
 #![feature(test)]
 #![feature(trusted_random_access)]

library/core/benches/num/int_log/mod.rs

@@ -1,4 +1,4 @@
-#![cfg(all(not(target_arch = "bpf"), not(target_arch = "sbf")))]
+#![cfg(not(target_family = "solana"))]
 use rand::Rng;
 use test::{Bencher, black_box};
 

library/core/src/fmt/num.rs

@@ -542,7 +542,7 @@ mod imp {
     );
 }
 
-#[cfg(not(any(target_pointer_width = "64", target_arch = "wasm32", target_arch = "bpf", target_arch = "sbf")))]
+#[cfg(not(any(target_pointer_width = "64", target_arch = "wasm32", target_family = "solana")))]
 mod imp {
     use super::*;
     impl_Display!(

library/core/tests/array.rs

@@ -514,7 +514,7 @@ fn array_rsplit_array_mut_out_of_bounds() {
 }
 
 #[test]
-#[cfg(all(not(target_arch = "bpf"), not(target_arch = "sbf")))]
+#[cfg(not(target_family = "solana"))]
 fn array_intoiter_advance_by() {
     use std::cell::Cell;
     struct DropCounter<'a>(usize, &'a Cell<usize>);
@@ -568,7 +568,7 @@ fn array_intoiter_advance_by() {
 }
 
 #[test]
-#[cfg(all(not(target_arch = "bpf"), not(target_arch = "sbf")))]
+#[cfg(not(target_family = "solana"))]
 fn array_intoiter_advance_back_by() {
     use std::cell::Cell;
     struct DropCounter<'a>(usize, &'a Cell<usize>);

library/core/tests/atomic.rs

@@ -213,7 +213,7 @@ fn ptr_bitops_tagging() {
 }
 
 // SBF does not support mustable static data
-#[cfg(not(any(target_arch = "bpf", target_arch = "sbf")))]
+#[cfg(not(target_family = "solana"))]
 mod statik {
     use super::*;
 

library/core/tests/lazy.rs

@@ -24,7 +24,7 @@ fn once_cell_get_mut() {
 }
 
 // sbf doesn't have mutable static data
-#[cfg(not(any(target_arch = "bpf", target_arch = "sbf")))]
+#[cfg(not(target_family = "solana"))]
 #[test]
 fn once_cell_drop() {
     static DROP_CNT: AtomicUsize = AtomicUsize::new(0);