Skip to content

[SOL] Create sbpfv0 target #129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 9, 2025
Merged

[SOL] Create sbpfv0 target #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions compiler/rustc_target/src/spec/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1909,6 +1909,7 @@ supported_targets! {
("bpfel-unknown-none", bpfel_unknown_none),
("sbf-solana-solana", sbf_solana_solana),
("sbpf-solana-solana", sbpf_solana_solana),
("sbpfv0-solana-solana", sbpfv0_solana_solana),
("sbpfv1-solana-solana", sbpfv1_solana_solana),
("sbpfv2-solana-solana", sbpfv2_solana_solana),
("sbpfv3-solana-solana", sbpfv3_solana_solana),
Expand Down
6 changes: 6 additions & 0 deletions compiler/rustc_target/src/spec/targets/sbpfv0_solana_solana.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
use crate::spec::Target;
use crate::spec::base::sbf_base;

pub(crate) fn target() -> Target {
sbf_base::sbf_target("v0")
}
1 change: 1 addition & 0 deletions src/bootstrap/src/core/sanity.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ const STAGE0_MISSING_TARGETS: &[&str] = &[
// just a dummy comment so the list doesn't get onelined
"sbf-solana-solana",
"sbpf-solana-solana",
"sbpfv0-solana-solana",
"sbpfv1-solana-solana",
"sbpfv2-solana-solana",
"sbpfv3-solana-solana",
Expand Down
1 change: 1 addition & 0 deletions src/bootstrap/src/utils/cc_detect.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,7 @@ fn default_compiler(

"sbf-solana-solana"
| "sbpf-solana-solana"
| "sbpfv0-solana-solana"
| "sbpfv1-solana-solana"
| "sbpfv2-solana-solana"
| "sbpfv3-solana-solana" => {
Expand Down
3 changes: 2 additions & 1 deletion src/ci/docker/host-x86_64/sbpf-solana-solana/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ ENV RUST_CONFIGURE_ARGS \
--set llvm.clang

ENV SCRIPT CARGO_TARGET_SBPF_SOLANA_SOLANA_RUNNER=\"cargo-run-solana-tests --heap-size 204857600\" \
CARGO_TARGET_SBPFV0_SOLANA_SOLANA_RUNNER=\"cargo-run-solana-tests --heap-size 204857600\" \
LLVM_HOME=/checkout/obj/build/x86_64-unknown-linux-gnu/llvm \
PATH="${HOME}/.cargo/bin:${PATH}" \
python3 /checkout/x.py --stage 1 test --host='' --target sbpf-solana-solana \
python3 /checkout/x.py --stage 1 test --host='' --target sbpf-solana-solana,sbpfv0-solana-solana \
library/core
1 change: 1 addition & 0 deletions src/doc/rustc/src/platform-support.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,6 +370,7 @@ target | std | host | notes
[`s390x-unknown-linux-musl`](platform-support/s390x-unknown-linux-musl.md) | | | S390x Linux (kernel 3.2, musl 1.2.3)
`sbf-solana-solana` | ✓ | | SBF
`sbpf-solana-solana` | ✓ | | SBPF
`sbpfv0-solana-solana` | ✓ | | SBPF v0
`sbpfv1-solana-solana` | ✓ | | SBPF v1
`sbpfv2-solana-solana` | ✓ | | SBPF v2
`sbpfv3-solana-solana` | ✓ | | SBPF v3
Expand Down
2 changes: 1 addition & 1 deletion src/llvm-project
Open in desktop
Submodule llvm-project updated 16 files
+2 −0 lldb/include/lldb/Utility/ArchSpec.h
+2 −0 lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
+3 −0 lldb/source/Utility/ArchSpec.cpp
+1 −0 llvm/include/llvm/BinaryFormat/ELF.h
+2 −0 llvm/include/llvm/TargetParser/Triple.h
+2 −0 llvm/lib/Target/SBF/MCTargetDesc/SBFMCTargetDesc.cpp
+1 −1 llvm/lib/Target/SBF/SBFRegisterInfo.cpp
+2 −1 llvm/lib/Target/SBF/SBFSubtarget.cpp
+3 −0 llvm/lib/Target/SBF/SBFSubtarget.h
+12 −1 llvm/lib/Target/SBF/SBFTargetFeatures.td
+6 −0 llvm/lib/Target/SBF/TargetInfo/SBFTargetInfo.cpp
+5 −2 llvm/lib/TargetParser/Triple.cpp
+2 −0 llvm/test/CodeGen/SBF/ninline_asm.ll
+13 −1 llvm/test/MC/SBF/elf-flags.s
+3 −0 llvm/tools/llvm-objdump/llvm-objdump.cpp
+14 −0 llvm/unittests/TargetParser/TripleTest.cpp
1 change: 1 addition & 0 deletions src/tools/build-manifest/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ static TARGETS: &[&str] = &[
"s390x-unknown-linux-gnu",
"sbf-solana-solana",
"sbpf-solana-solana",
"sbpfv0-solana-solana",
"sbpfv1-solana-solana",
"sbpfv2-solana-solana",
"sbpfv3-solana-solana",
Expand Down
3 changes: 3 additions & 0 deletions tests/assembly/targets/targets-elf.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -672,6 +672,9 @@
//@ revisions: sbpf_solana_solana
//@ [sbpf_solana_solana] compile-flags: --target sbpf-solana-solana
//@ [sbpf_solana_solana] needs-llvm-components: sbf
//@ revisions: sbpfv0_solana_solana
//@ [sbpfv0_solana_solana] compile-flags: --target sbpfv0-solana-solana
//@ [sbpfv0_solana_solana] needs-llvm-components: sbf
//@ revisions: sbpfv1_solana_solana
//@ [sbpfv1_solana_solana] compile-flags: --target sbpfv1-solana-solana
//@ [sbpfv1_solana_solana] needs-llvm-components: sbf
Expand Down
Loading