[SOL] Adjust BPF customization after upgrading to rust 1.62.0

Author: dmakarov

.github/workflows/ci.yml

@@ -202,7 +202,7 @@ jobs:
       - name: disable git crlf conversion
         run: git config --global core.autocrlf false
       - name: checkout the source code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 2
       - name: configure the PR in which the error message will be posted
@@ -247,6 +247,9 @@ jobs:
       - name: disable git crlf conversion
         run: src/ci/scripts/disable-git-crlf-conversion.sh
         if: success() && !env.SKIP_JOB
+      - name: checkout submodules
+        run: src/ci/scripts/checkout-submodules.sh
+        if: success() && !env.SKIP_JOB
       - name: install MSYS2
         run: src/ci/scripts/install-msys2.sh
         if: success() && !env.SKIP_JOB
@@ -262,9 +265,6 @@ jobs:
       - name: disable git crlf conversion
         run: src/ci/scripts/disable-git-crlf-conversion.sh
         if: success() && !env.SKIP_JOB
-      - name: checkout submodules
-        run: src/ci/scripts/checkout-submodules.sh
-        if: success() && !env.SKIP_JOB
       - name: ensure line endings are correct
         run: src/ci/scripts/verify-line-endings.sh
         if: success() && !env.SKIP_JOB

compiler/rustc_codegen_ssa/src/back/linker.rs

@@ -343,7 +343,7 @@ impl<'a> GccLinker<'a> {
                 } else {
                     self.linker_arg("--entry=entrypoint");
                 }
-                if self.sess.opts.cg.target_cpu.as_ref().unwrap_or(&self.sess.target.cpu) == "sbfv2"
+                if self.sess.opts.cg.target_cpu.as_ref().unwrap_or(&self.sess.target.cpu.as_ref().to_string()) == "sbfv2"
                 {
                     self.linker_arg("--section-start=.text=0x100000000");
                     self.linker_arg("--pack-dyn-relocs=relr");

compiler/rustc_target/src/spec/bpfel_unknown_unknown.rs

@@ -3,10 +3,10 @@ use crate::spec::sbf_base;
 
 pub fn target() -> Target {
     Target {
-        llvm_target: "bpfel".to_string(),
+        llvm_target: "bpfel".into(),
         pointer_width: 64,
-        arch: "bpf".to_string(),
-        data_layout: "e-m:e-p:64:64-i64:64-n32:64-S128".to_string(),
+        arch: "bpf".into(),
+        data_layout: "e-m:e-p:64:64-i64:64-n32:64-S128".into(),
         options: sbf_base::opts(),
     }
 }

compiler/rustc_target/src/spec/sbf_base.rs

@@ -1,6 +1,5 @@
 use crate::abi::Endian;
-use super::{LinkerFlavor, PanicStrategy, TargetOptions, LldFlavor};
-use std::{collections::BTreeMap};
+use super::{LinkArgs, LinkerFlavor, PanicStrategy, TargetOptions, LldFlavor};
 
 pub fn opts() -> TargetOptions {
     let linker_script = r"
@@ -30,38 +29,38 @@ SECTIONS
 }
 ";
     let mut lld_args = Vec::new();
-    lld_args.push("--threads=1".to_string());
-    lld_args.push("-z".to_string());
-    lld_args.push("notext".to_string());
-    let mut pre_link_args = BTreeMap::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::Lld(LldFlavor::Ld), lld_args);
 
     TargetOptions {
         allow_asm: true,
-        c_int_width: "64".to_string(),
-        dll_prefix: "".to_string(),
+        c_int_width: "64".into(),
+        dll_prefix: "".into(),
         dynamic_linking: true,
         eh_frame_header: false,
         emit_debug_gdb_scripts: false,
         endian: Endian::Little,
-        env: String::new(),
+        env: "".into(),
         executables: true,
-        features: "+solana".to_string(),
-        link_script: Some(linker_script.to_string()),
-        linker: Some("rust-lld".to_owned()),
+        features: "+solana".into(),
+        link_script: Some(linker_script.into()),
+        linker: Some("rust-lld".into()),
         linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld),
         linker_is_gnu: true,
         main_needs_argc_argv: false,
         max_atomic_width: Some(64),
         no_default_libraries: true,
         only_cdylib: true,
-        os: "solana".to_string(),
+        os: "solana".into(),
         panic_strategy: PanicStrategy::Abort,
         position_independent_executables: true,
         pre_link_args,
         requires_lto: false,
         singlethread: true,
-        vendor: "solana".to_string(),
+        vendor: "solana".into(),
         .. Default::default()
     }
 }

compiler/rustc_target/src/spec/sbf_solana_solana.rs

@@ -3,10 +3,10 @@ use crate::spec::sbf_base;
 
 pub fn target() -> Target {
     Target {
-        llvm_target: "sbf".to_string(),
+        llvm_target: "sbf".into(),
         pointer_width: 64,
-        arch: "sbf".to_string(),
-        data_layout: "e-m:e-p:64:64-i64:64-n32:64-S128".to_string(),
+        arch: "sbf".into(),
+        data_layout: "e-m:e-p:64:64-i64:64-n32:64-S128".into(),
         options: sbf_base::opts(),
     }
 }

library/core/benches/lib.rs

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