[SOL] Create sbpfv4 target for ABIv2

Author: LucasSte

build.sh

@@ -24,4 +24,4 @@ esac
 if [ "$1" == "--llvm" ]; then
     rm -f build/${HOST_TRIPLE}/llvm/llvm-finished-building;
 fi
-./x.py build --stage 1 --target ${HOST_TRIPLE},sbf-solana-solana,sbpf-solana-solana,sbpfv1-solana-solana,sbpfv2-solana-solana,sbpfv3-solana-solana
+./x.py build --stage 1 --target ${HOST_TRIPLE},sbf-solana-solana,sbpf-solana-solana,sbpfv1-solana-solana,sbpfv2-solana-solana,sbpfv3-solana-solana,sbpfv4-solana-solana

compiler/rustc_target/src/spec/base/sbf_base.rs

@@ -96,7 +96,7 @@ pub(crate) fn opts(version: &'static str) -> TargetOptions {
         linker_args.as_slice(),
     );
 
-    let linker_script = if version == "v3" {
+    let linker_script = if version == "v3" || version == "v4" {
         V3_LINKER_SCRIPT
     } else {
         V0_LINKER_SCRIPT
@@ -107,12 +107,11 @@ pub(crate) fn opts(version: &'static str) -> TargetOptions {
         version
     };
 
-    let features = if version == "v3" {
-        "+static-syscalls"
-    } else if version == "v0" {
-        "+store-imm,+jmp-ext"
-    } else {
-        ""
+    let features = match version {
+        "v4" => "+static-syscalls,+abi-v2",
+        "v3" => "+static-syscalls",
+        "v0" => "+store-imm,+jmp-ext",
+        _ => ""
     };
 
     TargetOptions {

compiler/rustc_target/src/spec/mod.rs

@@ -1912,6 +1912,7 @@ supported_targets! {
     ("sbpfv1-solana-solana", sbpfv1_solana_solana),
     ("sbpfv2-solana-solana", sbpfv2_solana_solana),
     ("sbpfv3-solana-solana", sbpfv3_solana_solana),
+    ("sbpfv4-solana-solana", sbpfv4_solana_solana),
 
 
     ("armv6k-nintendo-3ds", armv6k_nintendo_3ds),

compiler/rustc_target/src/spec/targets/sbpfv4_solana_solana.rs

@@ -0,0 +1,6 @@
+use crate::spec::Target;
+use crate::spec::base::sbf_base;
+
+pub(crate) fn target() -> Target {
+    sbf_base::sbf_target("v4")
+}

compiler/rustc_target/src/target_features.rs

@@ -487,6 +487,7 @@ const SBF_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
     ("alu32", Unstable(sym::sbf_target_feature), &[]),
     ("static-syscalls", Stable, &[]),
     ("dynamic-frames", Stable, &[]),
+    ("abi-v2", Stable, &[]),
 ];
 
 const CSKY_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[

src/bootstrap/src/core/sanity.rs

@@ -39,6 +39,7 @@ const STAGE0_MISSING_TARGETS: &[&str] = &[
     "sbpfv1-solana-solana",
     "sbpfv2-solana-solana",
     "sbpfv3-solana-solana",
+    "sbpfv4-solana-solana",
 ];
 
 /// Minimum version threshold for libstdc++ required when using prebuilt LLVM

src/bootstrap/src/utils/cc_detect.rs

@@ -233,7 +233,8 @@ fn default_compiler(
         | "sbpf-solana-solana"
         | "sbpfv1-solana-solana"
         | "sbpfv2-solana-solana"
-        | "sbpfv3-solana-solana" => {
+        | "sbpfv3-solana-solana"
+        | "sbpfv4-solana-solana" => {
             Some(build.llvm_bin(target).join(compiler.clang()))
         }
 

src/doc/rustc/src/platform-support.md

@@ -373,6 +373,7 @@ target | std | host | notes
 `sbpfv1-solana-solana` | ✓ |  | SBPF v1
 `sbpfv2-solana-solana` | ✓ |  | SBPF v2
 `sbpfv3-solana-solana` | ✓ |  | SBPF v3
+`sbpfv4-solana-solana` | ✓ |  | SBPF v3
 `sparc-unknown-linux-gnu` | ✓ |  | 32-bit SPARC Linux
 [`sparc-unknown-none-elf`](./platform-support/sparc-unknown-none-elf.md) | * |  | Bare 32-bit SPARC V7+
 [`sparc64-unknown-netbsd`](platform-support/netbsd.md) | ✓ | ✓ | NetBSD/sparc64

src/llvm-project

@@ -150,6 +150,7 @@ static TARGETS: &[&str] = &[
     "sbpfv1-solana-solana",
     "sbpfv2-solana-solana",
     "sbpfv3-solana-solana",
+    "sbpfv4-solana-solana",
     "sparc64-unknown-linux-gnu",
     "sparcv9-sun-solaris",
     "sparc-unknown-none-elf",

src/tools/build-manifest/src/main.rs

@@ -681,6 +681,9 @@
 //@ revisions: sbpfv3_solana_solana
 //@ [sbpfv3_solana_solana] compile-flags: --target sbpfv3-solana-solana
 //@ [sbpfv3_solana_solana] needs-llvm-components: sbf
+//@ revisions: sbpfv4_solana_solana
+//@ [sbpfv4_solana_solana] compile-flags: --target sbpfv4-solana-solana
+//@ [sbpfv4_solana_solana] needs-llvm-components: sbf
 
 // Sanity-check that each target can produce assembly code.