Skip to content

Commit 4560394

Browse files
committed
[SOL] Refactor SBPFv3 (anza-xyz#135)
* Bump llvm commit * Update linker script * Remove sbpfv3 from CI * Bump dependencies versions
1 parent bd51ea9 commit 4560394

File tree

6 files changed

+22
-12
lines changed

6 files changed

+22
-12
lines changed

Cargo.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3145,7 +3145,7 @@ dependencies = [
31453145
[[package]]
31463146
name = "rustc-build-sysroot"
31473147
version = "0.5.3"
3148-
source = "git+https://github.com/anza-xyz/rustc-build-sysroot?tag=solana-tools-v1.49#9b36c221db90c5039463c572ccbb903972bda8ce"
3148+
source = "git+https://github.com/anza-xyz/rustc-build-sysroot?tag=solana-tools-v1.50#932133f4069426f6b394a82c011c9fdf08b300ff"
31493149
dependencies = [
31503150
"anyhow",
31513151
"rustc_version",

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,7 @@ SECTIONS
5454
_heap_end = .;
5555
. = ALIGN(8);
5656
} :heap
57-
.dynsym 0xFFFFFFFF00000000 : {
58-
*(.dynsym)
59-
. = ALIGN(8);
60-
} :dynsym
6157
.strtab : { *(.strtab) } :other
62-
.dynstr : { *(.dynstr) } :other
6358
/DISCARD/ : {
6459
*(.comment*)
6560
*(.eh_frame*)
@@ -68,15 +63,16 @@ SECTIONS
6863
*(.data*)
6964
*(.rel.dyn*)
7065
*(.dynamic)
66+
*(.dynsym)
67+
*(.dynstr)
7168
}
7269
}
7370
PHDRS
7471
{
7572
text PT_LOAD FLAGS(1);
7673
rodata PT_LOAD FLAGS(4);
77-
stack PT_GNU_STACK FLAGS(6);
74+
stack PT_LOAD FLAGS(6);
7875
heap PT_LOAD FLAGS(6);
79-
dynsym PT_NULL FLAGS(0);
8076
other PT_NULL FLAGS(0);
8177
}
8278
";

library/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,3 @@ rustc-std-workspace-core = { path = 'rustc-std-workspace-core' }
6161
rustc-std-workspace-alloc = { path = 'rustc-std-workspace-alloc' }
6262
rustc-std-workspace-std = { path = 'rustc-std-workspace-std' }
6363
compiler_builtins = { path = "compiler-builtins/compiler-builtins" }
64-

src/ci/github-actions/jobs.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,21 @@ pr:
153153
<<: *job-linux-4c
154154
- name: x86_64-gnu-miri
155155
<<: *job-linux-4c
156+
- image: sbf-solana-solana
157+
continue_on_error: true
158+
<<: *job-linux-4c
159+
- image: sbpf-solana-solana
160+
continue_on_error: true
161+
<<: *job-linux-4c
162+
- image: sbpfv1-solana-solana
163+
continue_on_error: true
164+
<<: *job-linux-4c
165+
- image: sbpfv2-solana-solana
166+
continue_on_error: true
167+
<<: *job-linux-4c
168+
# - image: sbpfv3-solana-solana
169+
# continue_on_error: true
170+
# <<: *job-linux-4c
156171

157172
# Jobs that run when you perform a try build (@bors try)
158173
# These jobs automatically inherit envs.try, to avoid repeating

src/tools/miri/cargo-miri/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ directories = "6"
1818
rustc_version = "0.4"
1919
serde_json = "1.0.40"
2020
cargo_metadata = "0.19"
21-
rustc-build-sysroot = {git = "https://github.com/anza-xyz/rustc-build-sysroot", tag = "solana-tools-v1.49" }
21+
rustc-build-sysroot = {git = "https://github.com/anza-xyz/rustc-build-sysroot", tag = "solana-tools-v1.50" }
2222

2323
# Enable some feature flags that dev-dependencies need but dependencies
2424
# do not. This makes `./miri install` after `./miri build` faster.

src/tools/tidy/src/extdeps.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ const ALLOWED_SOURCES: &[&str] = &[
88
r#""registry+https://github.com/rust-lang/crates.io-index""#,
99
// This is `rust_team_data` used by `site` in src/tools/rustc-perf,
1010
r#""git+https://github.com/rust-lang/team#a5260e76d3aa894c64c56e6ddc8545b9a98043ec""#,
11-
r#""git+https://github.com/anza-xyz/compiler-builtins?tag=solana-tools-v1.49#759adff89713678bfd9c7630fe0f60088f635085""#,
12-
r#""git+https://github.com/anza-xyz/rustc-build-sysroot?tag=solana-tools-v1.49#9b36c221db90c5039463c572ccbb903972bda8ce""#
11+
r#""git+https://github.com/anza-xyz/compiler-builtins?tag=solana-tools-v1.50#759adff89713678bfd9c7630fe0f60088f635085""#,
12+
r#""git+https://github.com/anza-xyz/rustc-build-sysroot?tag=solana-tools-v1.50#932133f4069426f6b394a82c011c9fdf08b300ff""#
1313
];
1414

1515
/// Checks for external package sources. `root` is the path to the directory that contains the

0 commit comments

Comments
 (0)