[SOL] Adjust SBF customization after upgrading to rust 1.68.0

Author: dmakarov

.github/workflows/ci.yml

@@ -63,6 +63,7 @@ jobs:
             os: ubuntu-20.04-16core-64gb
             env: {}
           - name: sbf-solana-solana
+            tidy: false
             os: ubuntu-latest
             env: {}
           - name: x86_64-gnu-tools
@@ -239,6 +240,9 @@ jobs:
       - name: install sccache
         run: src/ci/scripts/install-sccache.sh
         if: success() && !env.SKIP_JOB
+      - name: select Xcode
+        run: src/ci/scripts/select-xcode.sh
+        if: success() && !env.SKIP_JOB
       - name: install clang
         run: src/ci/scripts/install-clang.sh
         if: success() && !env.SKIP_JOB

compiler/rustc_target/src/spec/sbf_base.rs

@@ -1,5 +1,5 @@
 use crate::abi::Endian;
-use super::{cvs, LinkArgs, LinkerFlavor, PanicStrategy, TargetOptions, LldFlavor};
+use super::{Cc, cvs, LinkerFlavor, Lld, PanicStrategy, TargetOptions};
 
 pub fn opts() -> TargetOptions {
     let linker_script = r"
@@ -28,13 +28,10 @@ SECTIONS
     }
 }
 ";
-    let mut lld_args = Vec::new();
-    lld_args.push("--threads=1".into());
-    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);
+    let pre_link_args = TargetOptions::link_args(
+        LinkerFlavor::Gnu(Cc::No, Lld::No),
+        &["--threads=1", "-z", "notext"],
+    );
 
     TargetOptions {
         allow_asm: true,
@@ -50,8 +47,7 @@ SECTIONS
         families: cvs!["solana"],
         link_script: Some(linker_script.into()),
         linker: Some("rust-lld".into()),
-        linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld),
-        linker_is_gnu: true,
+        linker_flavor: LinkerFlavor::Gnu(Cc::No, Lld::Yes),
         main_needs_argc_argv: false,
         max_atomic_width: Some(64),
         no_default_libraries: true,

config.toml

@@ -108,6 +108,8 @@ link-shared = false
 # Which LLVM projects to build along with the LLVM base libraries/tools
 enable-projects = "clang;lld;lldb"
 
+download-ci-llvm = false
+
 # =============================================================================
 # General build configuration options
 # =============================================================================

library/core/tests/slice.rs

@@ -1802,19 +1802,19 @@ fn brute_force_rotate_test_1() {
 }
 
 #[test]
-#[cfg(not(target_arch = "wasm32"))]
+#[cfg(not(any(target_arch = "wasm32", target_family = "solana")))]
 fn sort_unstable() {
     use core::cmp::Ordering::{Equal, Greater, Less};
     use core::slice::heapsort;
     use rand::{seq::SliceRandom, Rng};
 
     // Miri is too slow (but still need to `chain` to make the types match)
-    let lens = if cfg!(miri) { (2..20).chain(0..0) } else { (2..25).chain(200..210) };
+    let lens = if cfg!(miri) { (2..20).chain(0..0) } else { (2..25).chain(500..510) };
     let rounds = if cfg!(miri) { 1 } else { 100 };
 
-    let mut v = [0; 300];
-    let mut tmp = [0; 300];
-    let mut rng = StdRng::seed_from_u64(0);
+    let mut v = [0; 600];
+    let mut tmp = [0; 600];
+    let mut rng = crate::test_rng();
 
     for len in lens {
         let v = &mut v[0..len];
@@ -1876,16 +1876,16 @@ fn sort_unstable() {
 }
 
 #[test]
-#[cfg(not(target_arch = "wasm32"))]
+#[cfg(not(any(target_arch = "wasm32", target_family = "solana")))]
 #[cfg_attr(miri, ignore)] // Miri is too slow
 fn select_nth_unstable() {
     use core::cmp::Ordering::{Equal, Greater, Less};
     use rand::seq::SliceRandom;
     use rand::Rng;
 
-    let mut rng = StdRng::seed_from_u64(0);
+    let mut rng = crate::test_rng();
 
-    for len in (2..21).chain(200..201) {
+    for len in (2..21).chain(500..501) {
         let mut orig = vec![0; len];
 
         for &modulus in &[5, 10, 1000] {

library/std/Cargo.toml

@@ -24,7 +24,7 @@ hashbrown = { version = "0.14", default-features = false, features = ['rustc-dep
 std_detect = { path = "../stdarch/crates/std_detect", default-features = false, features = ['rustc-dep-of-std'] }
 
 # Dependencies of the `backtrace` crate
-[target.'cfg(all(not(target_arch = "bpf"), not(target_arch = "sbf")))'.dependencies]
+[target.'cfg(not(target_family = "solana"))'.dependencies]
 addr2line = { version = "0.21.0", optional = true, default-features = false }
 rustc-demangle = { version = "0.1.21", features = ['rustc-dep-of-std'] }
 

library/std/src/error.rs

@@ -4,7 +4,7 @@
 #[cfg(test)]
 mod tests;
 
-#[cfg(not(target_os = "solana"))]
+#[cfg(not(target_family = "solana"))]
 use crate::backtrace::Backtrace;
 use crate::fmt::{self, Write};
 
@@ -458,6 +458,7 @@ impl<E> Report<E>
 where
     E: Error,
 {
+    #[cfg(not(target_family = "solana"))]
     fn backtrace(&self) -> Option<&Backtrace> {
         // have to grab the backtrace on the first error directly since that error may not be
         // 'static
@@ -508,6 +509,7 @@ where
             }
         }
 
+        #[cfg(not(target_family = "solana"))]
         if self.show_backtrace {
             let backtrace = self.backtrace();
 

library/std/src/io/mod.rs

@@ -310,6 +310,7 @@ use crate::sys_common::memchr;
 pub use self::buffered::WriterPanicked;
 #[unstable(feature = "raw_os_error_ty", issue = "107792")]
 pub use self::error::RawOsError;
+#[cfg(not(target_family = "solana"))]
 pub(crate) use self::stdio::attempt_print_to_stderr;
 #[unstable(feature = "internal_output_capture", issue = "none")]
 #[doc(no_inline, hidden)]

library/std/src/io/stdio.rs

@@ -8,10 +8,11 @@ use crate::io::prelude::*;
 #[cfg(not(target_family = "solana"))]
 use crate::cell::{Cell, RefCell};
 use crate::fmt;
+#[cfg(not(target_family = "solana"))]
 use crate::fs::File;
-#[cfg(not(target_os = "solana"))]
+#[cfg(not(target_family = "solana"))]
 use crate::io::{self, BorrowedCursor, BufReader, IoSlice, IoSliceMut, LineWriter, Lines};
-#[cfg(target_os = "solana")]
+#[cfg(target_family = "solana")]
 use crate::io::{self, BufReader, IoSlice, IoSliceMut};
 #[cfg(not(target_family = "solana"))]
 use crate::sync::atomic::{AtomicBool, Ordering};
@@ -1240,6 +1241,7 @@ where
     }
 }
 
+#[cfg(not(target_family = "solana"))]
 fn print_to_buffer_if_capture_used(args: fmt::Arguments<'_>) -> bool {
     OUTPUT_CAPTURE_USED.load(Ordering::Relaxed)
         && OUTPUT_CAPTURE.try_with(|s| {
@@ -1256,6 +1258,7 @@ fn print_to_buffer_if_capture_used(args: fmt::Arguments<'_>) -> bool {
 /// Used by impl Termination for Result to print error after `main` or a test
 /// has returned. Should avoid panicking, although we can't help it if one of
 /// the Display impls inside args decides to.
+#[cfg(not(target_family = "solana"))]
 pub(crate) fn attempt_print_to_stderr(args: fmt::Arguments<'_>) {
     if print_to_buffer_if_capture_used(args) {
         return;
@@ -1287,6 +1290,7 @@ pub trait IsTerminal: crate::sealed::Sealed {
     fn is_terminal(&self) -> bool;
 }
 
+#[cfg(not(target_family = "solana"))]
 macro_rules! impl_is_terminal {
     ($($t:ty),*$(,)?) => {$(
         #[unstable(feature = "sealed", issue = "none")]
@@ -1302,6 +1306,7 @@ macro_rules! impl_is_terminal {
     )*}
 }
 
+#[cfg(not(target_family = "solana"))]
 impl_is_terminal!(File, Stdin, StdinLock<'_>, Stdout, StdoutLock<'_>, Stderr, StderrLock<'_>);
 
 #[unstable(

library/std/src/panicking.rs

@@ -25,14 +25,13 @@ use crate::mem;
 use crate::process;
 #[cfg(not(target_family = "solana"))]
 use crate::sync::atomic::{AtomicBool, Ordering};
+#[cfg(not(target_family = "solana"))]
 use crate::sync::{PoisonError, RwLock};
-#[cfg(not(target_os = "solana"))]
+#[cfg(not(target_family = "solana"))]
 use crate::sys::stdio::panic_output;
 #[cfg(not(target_family = "solana"))]
 use crate::sys_common::backtrace;
 #[cfg(not(target_family = "solana"))]
-use crate::sys_common::rwlock::StaticRwLock;
-#[cfg(not(target_family = "solana"))]
 use crate::sys_common::thread_info;
 #[cfg(not(target_family = "solana"))]
 use crate::thread;
@@ -83,7 +82,7 @@ extern "C" fn __rust_foreign_exception() -> ! {
     rtabort!("Rust cannot catch foreign exceptions");
 }
 
-#[cfg(not(target_os = "solana"))]
+#[cfg(not(target_family = "solana"))]
 enum Hook {
     Default,
     Custom(Box<dyn Fn(&PanicInfo<'_>) + 'static + Sync + Send>),
@@ -100,15 +99,15 @@ impl Hook {
     }
 }
 
-#[cfg(not(target_os = "solana"))]
+#[cfg(not(target_family = "solana"))]
 impl Default for Hook {
     #[inline]
     fn default() -> Hook {
         Hook::Default
     }
 }
 
-#[cfg(not(target_os = "solana"))]
+#[cfg(not(target_family = "solana"))]
 static HOOK: RwLock<Hook> = RwLock::new(Hook::Default);
 
 /// Registers a custom panic hook, replacing the previously registered hook.
@@ -441,7 +440,7 @@ pub mod panic_count {
     //
     // This also updates thread-local state to keep track of whether a panic
     // hook is currently executing.
-    #[cfg(not(target_os = "solana"))]
+    #[cfg(not(target_family = "solana"))]
     pub fn increase(run_panic_hook: bool) -> Option<MustAbort> {
         let global_count = GLOBAL_PANIC_COUNT.fetch_add(1, Ordering::Relaxed);
         if global_count & ALWAYS_ABORT_FLAG != 0 {
@@ -508,7 +507,7 @@ pub mod panic_count {
 
     // Slow path is in a separate function to reduce the amount of code
     // inlined from `count_is_zero`.
-    #[cfg(not(target_os = "solana"))]
+    #[cfg(not(target_family = "solana"))]
     #[inline(never)]
     #[cold]
     fn is_zero_slow_path() -> bool {
@@ -661,7 +660,7 @@ pub fn panicking() -> bool {
 }
 
 /// Entry point of panics from the core crate (`panic_impl` lang item).
-#[cfg(not(any(test, target_os = "solana")))]
+#[cfg(not(any(test, target_family = "solana")))]
 #[panic_handler]
 pub fn begin_panic_handler(info: &PanicInfo<'_>) -> ! {
     struct FormatStringPayload<'a> {

library/std/src/process.rs

@@ -2361,10 +2361,15 @@ impl<T: Termination, E: fmt::Debug> Termination for Result<T, E> {
     fn report(self) -> ExitCode {
         match self {
             Ok(val) => val.report(),
+            #[cfg(not(target_family = "solana"))]
             Err(err) => {
                 io::attempt_print_to_stderr(format_args_nl!("Error: {err:?}"));
                 ExitCode::FAILURE
             }
+            #[cfg(target_family = "solana")]
+            Err(_err) => {
+                ExitCode::FAILURE
+            }
         }
     }
 }