fix: apply 1.85 diffs

Author: leruaa

compiler/rustc_target/src/spec/targets/riscv32im_succinct_zkvm_elf.rs

@@ -7,7 +7,7 @@ pub(crate) fn target() -> Target {
         data_layout: "e-m:e-p:32:32-i64:64-n32-S128".into(),
         llvm_target: "riscv32".into(),
         metadata: TargetMetadata {
-            description: Some("RISC Zero's zero-knowledge Virtual Machine (RV32IM ISA)".into()),
+            description: Some("Succinct's zero-knowledge Virtual Machine (RV32IM ISA)".into()),
             tier: Some(3),
             host_tools: Some(false),
             std: None, // ?

library/panic_abort/src/zkvm.rs

@@ -12,9 +12,6 @@ pub(crate) unsafe fn zkvm_set_abort_message(payload: &mut dyn PanicPayload) {
             None => &[],
         },
     };
-    if msg.is_empty() {
-        return;
-    }
 
     unsafe extern "C" {
         fn sys_panic(msg_ptr: *const u8, len: usize) -> !;

library/std/src/sys/pal/zkvm/abi.rs

@@ -20,34 +20,15 @@ pub mod fileno {
 
 unsafe extern "C" {
     // Wrappers around syscalls provided by sp1-zkvm-platform:
-    pub fn sys_halt();
-    pub fn sys_output(output_id: u32, output_value: u32);
-    pub fn sys_sha_compress(
-        out_state: *mut [u32; DIGEST_WORDS],
-        in_state: *const [u32; DIGEST_WORDS],
-        block1_ptr: *const [u32; DIGEST_WORDS],
-        block2_ptr: *const [u32; DIGEST_WORDS],
-    );
-    pub fn sys_sha_buffer(
-        out_state: *mut [u32; DIGEST_WORDS],
-        in_state: *const [u32; DIGEST_WORDS],
-        buf: *const u8,
-        count: u32,
-    );
     pub fn sys_rand(recv_buf: *mut u8, words: usize);
     pub fn sys_panic(msg_ptr: *const u8, len: usize) -> !;
-    pub fn sys_log(msg_ptr: *const u8, len: usize);
-    pub fn sys_cycle_count() -> usize;
-    pub fn sys_read(fd: u32, recv_buf: *mut u8, nrequested: usize) -> usize;
     pub fn sys_write(fd: u32, write_buf: *const u8, nbytes: usize);
     pub fn sys_getenv(
         recv_buf: *mut u32,
         words: usize,
         varname: *const u8,
         varname_len: usize,
     ) -> usize;
-    pub fn sys_argc() -> usize;
-    pub fn sys_argv(out_words: *mut u32, out_nwords: usize, arg_index: usize) -> usize;
 
     // Allocate memory from global HEAP.
     pub fn sys_alloc_words(nwords: usize) -> *mut u32;

library/std/src/sys/pal/zkvm/args.rs

@@ -1,8 +1,5 @@
-use super::{WORD_SIZE, abi};
 use crate::ffi::OsString;
 use crate::fmt;
-use crate::sys::os_str;
-use crate::sys_common::FromInner;
 
 pub struct Args {
     i_forward: usize,
@@ -11,30 +8,13 @@ pub struct Args {
 }
 
 pub fn args() -> Args {
-    let count = unsafe { abi::sys_argc() };
-    Args { i_forward: 0, i_back: 0, count }
+    Args { i_forward: 0, i_back: 0, count: 0 }
 }
 
 impl Args {
-    /// Use sys_argv to get the arg at the requested index. Does not check that i is less than argc
-    /// and will not return if the index is out of bounds.
-    fn argv(i: usize) -> OsString {
-        let arg_len = unsafe { abi::sys_argv(crate::ptr::null_mut(), 0, i) };
-
-        let arg_len_words = (arg_len + WORD_SIZE - 1) / WORD_SIZE;
-        let words = unsafe { abi::sys_alloc_words(arg_len_words) };
-
-        let arg_len2 = unsafe { abi::sys_argv(words, arg_len_words, i) };
-        debug_assert_eq!(arg_len, arg_len2);
-
-        // Convert to OsString.
-        //
-        // FIXME: We can probably get rid of the extra copy here if we
-        // reimplement "os_str" instead of just using the generic unix
-        // "os_str".
-        let arg_bytes: &[u8] =
-            unsafe { crate::slice::from_raw_parts(words.cast() as *const u8, arg_len) };
-        OsString::from_inner(os_str::Buf { inner: arg_bytes.to_vec() })
+    /// Args::argv is currently not implemented.
+    fn argv(_i: usize) -> OsString {
+        panic!("Args::argv is currently not implemented");
     }
 }
 

library/std/src/sys/random/zkvm.rs

@@ -1,21 +1,23 @@
 use crate::sys::pal::abi;
 
 pub fn fill_bytes(bytes: &mut [u8]) {
-    let (pre, words, post) = unsafe { bytes.align_to_mut::<u8>() };
-    if !words.is_empty() {
-        unsafe {
-            abi::sys_rand(words.as_mut_ptr(), words.len());
-        }
-    }
+    unsafe { abi::sys_rand(bytes.as_mut_ptr(), bytes.len()) };
+}
 
-    let mut buf = [0u8; 8];
-    let len = (pre.len() + post.len() + size_of::<u32>() - 1) / size_of::<u32>();
-    if len != 0 {
-        unsafe { abi::sys_rand(buf.as_mut_ptr(), len) };
-    }
+// pub fn fill_bytes(bytes: &mut [u8]) {
+//     let (pre, words, post) = unsafe { bytes.align_to_mut::<u32>() };
+//     if !words.is_empty() {
+//         unsafe { abi::sys_rand(words.as_mut_ptr(), words.len()) };
+//         }
+//     }
+//     let mut buf = [0u32; 2];
+//     let len = (pre.len() + post.len() + size_of::<u32>() - 1) / size_of::<u32>();
+//     if len != 0 {
+//         unsafe { abi::sys_rand(buf.as_mut_ptr(), len) };
+//     }
 
-    let buf = buf.map(u8::to_ne_bytes);
-    let buf = buf.as_flattened();
-    pre.copy_from_slice(&buf[..pre.len()]);
-    post.copy_from_slice(&buf[pre.len()..pre.len() + post.len()]);
-}
+//     let buf = buf.map(u32::to_ne_bytes);
+//     let buf = buf.as_flattened();
+//     pre.copy_from_slice(&buf[..pre.len()]);
+//     post.copy_from_slice(&buf[pre.len()..pre.len() + post.len()]);
+// }

library/std/src/sys/stdio/zkvm.rs

@@ -1,4 +1,4 @@
-use crate::io::{self, BorrowedCursor};
+use crate::io;
 use crate::sys::pal::abi::{self, fileno};
 
 pub struct Stdin;
@@ -12,16 +12,11 @@ impl Stdin {
 }
 
 impl io::Read for Stdin {
-    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
-        Ok(unsafe { abi::sys_read(fileno::STDIN, buf.as_mut_ptr(), buf.len()) })
-    }
-
-    fn read_buf(&mut self, mut buf: BorrowedCursor<'_>) -> io::Result<()> {
-        unsafe {
-            let n = abi::sys_read(fileno::STDIN, buf.as_mut().as_mut_ptr().cast(), buf.capacity());
-            buf.advance_unchecked(n);
-        }
-        Ok(())
+    fn read(&mut self, _buf: &mut [u8]) -> io::Result<usize> {
+        return Err(io::Error::new(
+            io::ErrorKind::Other,
+            "io::Read for Stdin is currently not implemented",
+        ));
     }
 }
 

src/bootstrap/Cargo.lock

@@ -89,8 +89,7 @@ dependencies = [
 [[package]]
 name = "cc"
 version = "1.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fcb57c740ae1daf453ae85f16e37396f672b039e00d9d866e07ddb24e328e3a"
+source = "git+https://github.com/leruaa/cc-rs?branch=aurelien%2Fadd-succinct-target#1cdaea42e4044e135817d49005f8b7e812e4cbfa"
 dependencies = [
  "shlex",
 ]

src/bootstrap/Cargo.toml

@@ -92,3 +92,6 @@ debug = 0
 [profile.dev.package]
 # Only use debuginfo=1 to further reduce compile times.
 bootstrap.debug = 1
+
+[patch.crates-io]
+cc = { git = "https://github.com/leruaa/cc-rs", branch = "aurelien/add-succinct-target" }

src/bootstrap/src/core/sanity.rs

@@ -34,6 +34,7 @@ pub struct Finder {
 // Targets can be removed from this list once they are present in the stage0 compiler (usually by updating the beta compiler of the bootstrap).
 const STAGE0_MISSING_TARGETS: &[&str] = &[
     // just a dummy comment so the list doesn't get onelined
+    "riscv32im-succinct-zkvm-elf",
     "wasm32-wali-linux-musl",
 ];
 

src/doc/rustc/src/platform-support.md

@@ -366,7 +366,7 @@ target | std | host | notes
 [`riscv32emc-unknown-none-elf`](platform-support/riscv32e-unknown-none-elf.md) | * |  | Bare RISC-V (RV32EMC ISA)
 `riscv32gc-unknown-linux-gnu` | ✓ |   | RISC-V Linux (kernel 5.4, glibc 2.33)
 `riscv32gc-unknown-linux-musl` | ? |   | RISC-V Linux (kernel 5.4, musl 1.2.3 + RISCV32 support patches)
-[`riscv32im-succinct-zkvm-elf`](platform-support/riscv32im-succinct-zkvm-elf.md) | ? |  | RISC Zero's zero-knowledge Virtual Machine (RV32IM ISA)
+[`riscv32im-succinct-zkvm-elf`](platform-support/riscv32im-succinct-zkvm-elf.md) | ? |  | Succinct's zero-knowledge Virtual Machine (RV32IM ISA)
 [`riscv32ima-unknown-none-elf`](platform-support/riscv32-unknown-none-elf.md) | * |  | Bare RISC-V (RV32IMA ISA)
 [`riscv32imac-esp-espidf`](platform-support/esp-idf.md) | ✓ |  | RISC-V ESP-IDF
 [`riscv32imac-unknown-nuttx-elf`](platform-support/nuttx.md) | ✓ |  | RISC-V 32bit with NuttX