backport sbpfv3 target

Author: nagisa

build.sh

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

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

@@ -1,8 +1,7 @@
 use crate::abi::Endian;
 use crate::spec::{Cc, cvs, LinkerFlavor, Lld, PanicStrategy, TargetOptions};
 
-pub fn opts() -> TargetOptions {
-    let linker_script = r"
+const V0_LINKER_SCRIPT: &str = r"
 PHDRS
 {
   text PT_LOAD ;
@@ -28,10 +27,64 @@ SECTIONS
     }
 }
 ";
+
+const V3_LINKER_SCRIPT: &str = r"
+SECTIONS
+{
+  .rodata 0x000000000 : SUBALIGN(8) {
+    BYTE(0);
+    *(.rodata*)
+    *(.data.rel.ro*)
+    . = ALIGN(8);
+  } :rodata
+  .text 0x100000000 : {
+     *(.text*)
+  } :text
+  /DISCARD/ : {
+      *(.comment*)
+      *(.eh_frame*)
+      *(*hash*)
+      *(.bss*)
+      *(.data*)
+      *(.rel.dyn*)
+      *(.dynamic)
+      *(.dynsym)
+      *(.dynstr)
+    }
+}
+
+PHDRS
+{
+  rodata PT_LOAD FLAGS(4);
+  text PT_LOAD FLAGS(1);
+  other PT_NULL FLAGS(0);
+}
+
+";
+
+pub(crate) fn opts(version: &'static str) -> TargetOptions {
+    let mut linker_args = vec!["--threads=1", "notext"];
+    let linker_script = if version == "v3" || version == "v4" {
+        V3_LINKER_SCRIPT
+    } else {
+        linker_args.push("-z");
+        linker_args.push("max-page-size=4096");
+        V0_LINKER_SCRIPT
+    };
     let pre_link_args = TargetOptions::link_args(
         LinkerFlavor::Gnu(Cc::No, Lld::No),
-        &["--threads=1", "-z", "notext"],
+        &linker_args,
     );
+    let cpu = if version == "v0" {
+        "generic"
+    } else {
+        version
+    };
+    let features = match version {
+        "v4" => "+solana,+static-syscalls,+abi-v2",
+        "v3" => "+solana,+static-syscalls",
+        _ => "+solana,"
+    };
 
     TargetOptions {
         allow_asm: true,
@@ -44,7 +97,6 @@ SECTIONS
         endian: Endian::Little,
         env: "".into(),
         executables: true,
-        features: "+solana".into(),
         families: cvs!["solana"],
         link_script: Some(linker_script.into()),
         linker: Some("rust-lld".into()),
@@ -61,6 +113,8 @@ SECTIONS
         singlethread: true,
         vendor: "solana".into(),
         c_enum_min_bits: Some(32),
+        cpu: cpu.into(),
+        features: features.into(),
         .. Default::default()
     }
 }

compiler/rustc_target/src/spec/mod.rs

@@ -1693,6 +1693,7 @@ supported_targets! {
     ("bpfel-unknown-none", bpfel_unknown_none),
     ("bpfel-unknown-unknown", bpfel_unknown_unknown),
     ("sbf-solana-solana", sbf_solana_solana),
+    ("sbpfv3-solana-solana", sbpfv3_solana_solana),
 
     ("armv6k-nintendo-3ds", armv6k_nintendo_3ds),
 

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

@@ -7,6 +7,6 @@ pub fn target() -> Target {
         pointer_width: 64,
         arch: "bpf".into(),
         data_layout: "e-m:e-p:64:64-i64:64-n32:64-S128".into(),
-        options: sbf_base::opts(),
+        options: sbf_base::opts("v0"),
     }
 }

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

@@ -7,6 +7,6 @@ pub fn target() -> Target {
         pointer_width: 64,
         arch: "sbf".into(),
         data_layout: "e-m:e-p:64:64-i64:64-n32:64-S128".into(),
-        options: sbf_base::opts(),
+        options: sbf_base::opts("v0"),
     }
 }