Skip to content

Commit

Permalink
potential fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
mattstam committed Jul 31, 2024
1 parent d25935e commit 40e7638
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 8 deletions.
8 changes: 4 additions & 4 deletions library/std/src/sys/pal/zkvm/abi.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
//! ABI definitions for symbols exported by risc0-zkvm-platform.
//! ABI definitions for symbols exported by succinct-zkvm-platform.

// Included here so we don't have to depend on risc0-zkvm-platform.
// Included here so we don't have to depend on succinct-zkvm-platform.
//
// FIXME: Should we move this to the "libc" crate? It seems like other
// architectures put a lot of this kind of stuff there. But there's
// currently no risc0 fork of the libc crate, so we'd either have to
// currently no succinct fork of the libc crate, so we'd either have to
// fork it or upstream it.

#![allow(dead_code)]
Expand All @@ -19,7 +19,7 @@ pub mod fileno {
}

extern "C" {
// Wrappers around syscalls provided by risc0-zkvm-platform:
// Wrappers around syscalls provided by succinct-zkvm-platform:
pub fn sys_halt();
pub fn sys_output(output_id: u32, output_value: u32);
pub fn sys_sha_compress(
Expand Down
6 changes: 3 additions & 3 deletions tests/assembly/targets/targets-elf.rs
Original file line number Diff line number Diff line change
Expand Up @@ -363,9 +363,9 @@
//@ revisions: riscv32i_unknown_none_elf
//@ [riscv32i_unknown_none_elf] compile-flags: --target riscv32i-unknown-none-elf
//@ [riscv32i_unknown_none_elf] needs-llvm-components: riscv
//@ revisions: riscv32im_risc0_zkvm_elf
//@ [riscv32im_risc0_zkvm_elf] compile-flags: --target riscv32im-risc0-zkvm-elf
//@ [riscv32im_risc0_zkvm_elf] needs-llvm-components: riscv
//@ revisions: riscv32im_succinct_zkvm_elf
//@ [riscv32im_succinct_zkvm_elf] compile-flags: --target riscv32im-succinct-zkvm-elf
//@ [riscv32im_succinct_zkvm_elf] needs-llvm-components: riscv
//@ revisions: riscv32im_unknown_none_elf
//@ [riscv32im_unknown_none_elf] compile-flags: --target riscv32im-unknown-none-elf
//@ [riscv32im_unknown_none_elf] needs-llvm-components: riscv
Expand Down
17 changes: 17 additions & 0 deletions tests/run-make/target-specs/riscv32im-succinct-zkvm-elf.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"llvm-target": "riscv32-unknown-none-elf",
"data-layout": "e-m:e-p:32:32-i64:64-n32-S128",
"target-endian": "little",
"target-pointer-width": "32",
"target-c-int-width": "32",
"os": "none",
"arch": "riscv32",
"cpu": "generic-rv32",
"features": "+m",
"max-atomic-width": "32",
"linker": "rust-lld",
"linker-flavor": "ld.lld",
"panic-strategy": "abort",
"relocation-model": "static",
"executables": true
}
2 changes: 1 addition & 1 deletion tests/ui/check-cfg/well-known-values.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ warning: unexpected `cfg` condition value: `_UNEXPECTED_VALUE`
LL | target_vendor = "_UNEXPECTED_VALUE",
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= note: expected values for `target_vendor` are: `apple`, `espressif`, `fortanix`, `ibm`, `kmc`, `nintendo`, `nvidia`, `pc`, `risc0`, `sony`, `sun`, `unikraft`, `unknown`, `uwp`, `win7`, `wrs`
= note: expected values for `target_vendor` are: `apple`, `espressif`, `fortanix`, `ibm`, `kmc`, `nintendo`, `nvidia`, `pc`, `succinct`, `sony`, `sun`, `unikraft`, `unknown`, `uwp`, `win7`, `wrs`
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration

warning: unexpected `cfg` condition value: `_UNEXPECTED_VALUE`
Expand Down

0 comments on commit 40e7638

Please sign in to comment.