Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/lints.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
components: rustfmt, clippy
targets: riscv32im-unknown-none-elf
# TODO: figure out way to keep this in sync with rust-toolchain.toml automatically
toolchain: nightly-2025-08-18
toolchain: nightly-2025-11-20
- name: Cargo cache
uses: actions/cache@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
with:
targets: riscv32im-unknown-none-elf
# TODO: figure out way to keep this in sync with rust-toolchain.toml automatically
toolchain: nightly-2025-08-18
toolchain: nightly-2025-11-20
- name: Cargo cache
uses: actions/cache@v4
with:
Expand Down
5 changes: 3 additions & 2 deletions ceno_cli/src/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,13 @@ pub fn search_workspace_root<P: AsRef<Path>>(path: P) -> anyhow::Result<PathBuf>
pub fn get_rust_flags() -> String {
const BASE_RUST_FLAGS: &[&str] = &[
"-C",
"panic=abort",
"panic=immediate-abort",
"-C",
"link-arg=-Tmemory.x",
"-C",
"link-arg=-Tceno_link.x",
"-Zlocation-detail=none",
"-Zunstable-options",
"-C",
"passes=lower-atomic",
"--cfg",
Expand All @@ -104,7 +105,7 @@ pub fn apply_cargo_build_std_args(command: &mut Command) {
"-Z",
"build-std=alloc,core,compiler_builtins,std,panic_abort,proc_macro",
"-Z",
"build-std-features=compiler-builtins-mem,panic_immediate_abort,default",
"build-std-features=compiler-builtins-mem,default",
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

panic_immediate_abort is default in nightly-2025-11-20.

];
command.args(BASE_CARGO_ARGS);
}
Expand Down
2 changes: 1 addition & 1 deletion ceno_rt/riscv32im-ceno-zkvm-elf.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@
"singlethread": true,
"target-c-int-width": 32,
"target-endian": "little",
"target-pointer-width": "32"
"target-pointer-width": 32
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's an integer rather than a string like target-c-int-width.

}
7 changes: 5 additions & 2 deletions examples/.cargo/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,15 @@ build-std = [
]
build-std-features = [
"compiler-builtins-mem",
"panic_immediate_abort",
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

panic_immediate_abort is default in nightly-2025-11-20.

"default",
]
panic-immediate-abort = true

[profile.dev]
panic = "abort"
panic = "immediate-abort"

[profile.release]
panic = "immediate-abort"

[build]
rustflags = [
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[toolchain]
channel = "nightly-2025-08-18"
channel = "nightly-2025-11-20"
targets = ["riscv32im-unknown-none-elf"]
# We need the sources for build-std.
components = ["rust-src"]
Loading