[SOL] Create sbpfv4 target for ABIv2 (anza-xyz#130)

LucasSte · LucasSte · commit fe0d868f47ee · 2025-08-21T18:08:48.000-03:00
* [SOL] Create sbpfv4 target for ABIv2

* Bump compiler builtins version

* Fix platform-support.md typo
diff --git a/Cargo.lock b/Cargo.lock
@@ -3145,7 +3145,7 @@ dependencies = [
 [[package]]
 name = "rustc-build-sysroot"
 version = "0.5.3"
-source = "git+https://github.com/anza-xyz/rustc-build-sysroot?tag=solana-tools-v1.44#4f19dfe109fc80efbe62b6de9781125bc7ce7485"
+source = "git+https://github.com/anza-xyz/rustc-build-sysroot?tag=solana-tools-v1.48#0e6a6c1127ca9b33158334029693344e2638ec57"
 dependencies = [
  "anyhow",
  "rustc_version",
diff --git a/build.sh b/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
diff --git a/compiler/rustc_target/src/spec/base/sbf_base.rs b/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 {
diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs
@@ -2052,6 +2052,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),
diff --git a/compiler/rustc_target/src/spec/targets/sbpfv4_solana_solana.rs b/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")
+}
diff --git a/compiler/rustc_target/src/target_features.rs b/compiler/rustc_target/src/target_features.rs
@@ -653,6 +653,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)] = &[
diff --git a/library/Cargo.toml b/library/Cargo.toml
@@ -60,4 +60,8 @@ rustflags = ["-Cpanic=abort"]
 rustc-std-workspace-core = { path = 'rustc-std-workspace-core' }
 rustc-std-workspace-alloc = { path = 'rustc-std-workspace-alloc' }
 rustc-std-workspace-std = { path = 'rustc-std-workspace-std' }
+<<<<<<< HEAD
 compiler_builtins = { path = "compiler-builtins/compiler-builtins" }
+=======
+compiler_builtins = { git = "https://github.com/anza-xyz/compiler-builtins", tag = "solana-tools-v1.48" }
+>>>>>>> 293a1b6c60a ([SOL] Create sbpfv4 target for ABIv2 (#130))
diff --git a/src/bootstrap/src/core/sanity.rs b/src/bootstrap/src/core/sanity.rs
@@ -42,6 +42,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
diff --git a/src/bootstrap/src/utils/cc_detect.rs b/src/bootstrap/src/utils/cc_detect.rs
@@ -215,7 +215,8 @@ fn default_compiler(
         | "sbpfv0-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()))
         }
 
diff --git a/src/doc/rustc/src/platform-support.md b/src/doc/rustc/src/platform-support.md
@@ -396,6 +396,7 @@ target | std | host | notes
 `sbpfv1-solana-solana` | ✓ |  | SBPF v1
 `sbpfv2-solana-solana` | ✓ |  | SBPF v2
 `sbpfv3-solana-solana` | ✓ |  | SBPF v3
+`sbpfv4-solana-solana` | ✓ |  | SBPF v4
 `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
diff --git a/src/tools/build-manifest/src/main.rs b/src/tools/build-manifest/src/main.rs
@@ -160,6 +160,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",
diff --git a/src/tools/miri/cargo-miri/Cargo.toml b/src/tools/miri/cargo-miri/Cargo.toml
@@ -18,7 +18,7 @@ directories = "6"
 rustc_version = "0.4"
 serde_json = "1.0.40"
 cargo_metadata = "0.19"
-rustc-build-sysroot = {git = "https://github.com/anza-xyz/rustc-build-sysroot", tag = "solana-tools-v1.44"  }
+rustc-build-sysroot = {git = "https://github.com/anza-xyz/rustc-build-sysroot", tag = "solana-tools-v1.48"  }
 
 # Enable some feature flags that dev-dependencies need but dependencies
 # do not.  This makes `./miri install` after `./miri build` faster.
diff --git a/src/tools/tidy/src/extdeps.rs b/src/tools/tidy/src/extdeps.rs
@@ -8,8 +8,8 @@ const ALLOWED_SOURCES: &[&str] = &[
     r#""registry+https://github.com/rust-lang/crates.io-index""#,
     // This is `rust_team_data` used by `site` in src/tools/rustc-perf,
     r#""git+https://github.com/rust-lang/team#a5260e76d3aa894c64c56e6ddc8545b9a98043ec""#,
-    r#""git+https://github.com/anza-xyz/compiler-builtins?tag=solana-tools-v1.47#bf501f2f0a7d38d6dca6aab067017a288d2bf2dd""#,
-    r#""git+https://github.com/anza-xyz/rustc-build-sysroot?tag=solana-tools-v1.47#0d6d7ae18aaecf45f0a6e87bcf83b2293263f5bd""#,
+    r#""git+https://github.com/anza-xyz/compiler-builtins?tag=solana-tools-v1.48#759adff89713678bfd9c7630fe0f60088f635085""#,
+    r#""git+https://github.com/anza-xyz/rustc-build-sysroot?tag=solana-tools-v1.48#0e6a6c1127ca9b33158334029693344e2638ec57""#
 ];
 
 /// Checks for external package sources. `root` is the path to the directory that contains the
diff --git a/tests/assembly/targets/targets-elf.rs b/tests/assembly/targets/targets-elf.rs
@@ -733,6 +733,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.
 

Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,8 @@ fn default_compiler(`
`215`	`215`	`\| "sbpfv0-solana-solana"`
`216`	`216`	`\| "sbpfv1-solana-solana"`
`217`	`217`	`\| "sbpfv2-solana-solana"`
`218`		`- \| "sbpfv3-solana-solana" => {`
	`218`	`+ \| "sbpfv3-solana-solana"`
	`219`	`+ \| "sbpfv4-solana-solana" => {`
`219`	`220`	`Some(build.llvm_bin(target).join(compiler.clang()))`
`220`	`221`	`}`
`221`	`222`