From 40e7638726558bb39fe5f1633bde324a5d58674b Mon Sep 17 00:00:00 2001
From: mattstam <codeguy0112358@gmail.com>
Date: Wed, 31 Jul 2024 13:55:33 -0700
Subject: [PATCH] potential fixes

---
 library/std/src/sys/pal/zkvm/abi.rs             |  8 ++++----
 tests/assembly/targets/targets-elf.rs           |  6 +++---
 .../riscv32im-succinct-zkvm-elf.json            | 17 +++++++++++++++++
 tests/ui/check-cfg/well-known-values.stderr     |  2 +-
 4 files changed, 25 insertions(+), 8 deletions(-)
 create mode 100644 tests/run-make/target-specs/riscv32im-succinct-zkvm-elf.json

diff --git a/library/std/src/sys/pal/zkvm/abi.rs b/library/std/src/sys/pal/zkvm/abi.rs
index 53332d90e02c..0e5338ae35a5 100644
--- a/library/std/src/sys/pal/zkvm/abi.rs
+++ b/library/std/src/sys/pal/zkvm/abi.rs
@@ -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)]
@@ -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(
diff --git a/tests/assembly/targets/targets-elf.rs b/tests/assembly/targets/targets-elf.rs
index 3563aec6d807..cf1c5485dcd0 100644
--- a/tests/assembly/targets/targets-elf.rs
+++ b/tests/assembly/targets/targets-elf.rs
@@ -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
diff --git a/tests/run-make/target-specs/riscv32im-succinct-zkvm-elf.json b/tests/run-make/target-specs/riscv32im-succinct-zkvm-elf.json
new file mode 100644
index 000000000000..40c3158a765a
--- /dev/null
+++ b/tests/run-make/target-specs/riscv32im-succinct-zkvm-elf.json
@@ -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
+}
\ No newline at end of file
diff --git a/tests/ui/check-cfg/well-known-values.stderr b/tests/ui/check-cfg/well-known-values.stderr
index 1863032c3865..c5bda7320785 100644
--- a/tests/ui/check-cfg/well-known-values.stderr
+++ b/tests/ui/check-cfg/well-known-values.stderr
@@ -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`