Newer Rust and LLVM

Codegen support for RV32E was added to mainline LLVM. Upgrade to newer
Rust and newer LLVM, and drop most of the patches.

Author: lrettig

clone.sh

@@ -4,7 +4,7 @@ set -euo pipefail
 
 source config.sh -rust_commit
 
-git clone "https://github.com/succinctlabs/rust.git" --depth 1 --single-branch --branch succinct
+git clone "https://github.com/rust-lang/rust.git" --depth 1
 cd rust
 git fetch --depth 1 origin $RUST_COMMIT
 git checkout FETCH_HEAD

config.sh

@@ -2,7 +2,7 @@
 
 param1=${1:-}
 
-export RUST_COMMIT=295b693dfe72d0ac2d0924eb84af39e364d9c3e3
+export RUST_COMMIT=9b00956e56009bab2aa15d7bff10916599e3d6d6
 
 # If -rust_commit specified then only export the rust commit variable
 if [ "$param1" == "-rust_commit" ]; then

patch.sh

@@ -5,7 +5,3 @@ set -euo pipefail
 cd rust
 patch -p1 < ../patches/rust.patch
 cp ../patches/config.toml ./
-
-cd src/llvm-project
-patch -p1 < ../../../patches/llvm-D70401.patch
-patch -p1 < ../../../patches/compiler-rt.patch

patches/config.toml

@@ -1,4 +1,4 @@
-change-id = 116881
+change-id = 121754
 
 [build]
 target = ["riscv32em-athena-zkvm-elf"]

patches/rust.patch

@@ -1,53 +1,46 @@
 diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs
-index 235ab0b6e7d..87b204d711a 100644
+index 941d767b..1b4004c4 100644
 --- a/compiler/rustc_target/src/spec/mod.rs
 +++ b/compiler/rustc_target/src/spec/mod.rs
-@@ -1635,6 +1635,7 @@ fn $module() {
+@@ -1618,6 +1618,7 @@ fn $module() {
 
      ("x86_64-unikraft-linux-musl", x86_64_unikraft_linux_musl),
 
 +    ("riscv32em-athena-zkvm-elf", riscv32em_athena_zkvm_elf),
      ("riscv32i-unknown-none-elf", riscv32i_unknown_none_elf),
-     ("riscv32im-succinct-zkvm-elf", riscv32im_succinct_zkvm_elf),
+     ("riscv32im-risc0-zkvm-elf", riscv32im_risc0_zkvm_elf),
      ("riscv32im-unknown-none-elf", riscv32im_unknown_none_elf),
-diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs
-index 8e9d342e65d..d2dae37d73a 100644
---- a/src/bootstrap/src/lib.rs
-+++ b/src/bootstrap/src/lib.rs
-@@ -101,7 +101,7 @@
-     // #[cfg(bootstrap)] zkvm
-     (Some(Mode::Std), "target_os", Some(&["zkvm"])),
-     // #[cfg(bootstrap)] succinct
--    (Some(Mode::Std), "target_vendor", Some(&["succinct"])),
-+    (Some(Mode::Std), "target_vendor", Some(&["athena", "succinct"])),
-     (Some(Mode::Std), "target_arch", Some(&["asmjs", "spirv", "nvptx", "xtensa"])),
-     /* Extra names used by dependencies */
-     // FIXME: Used by serde_json, but we should not be triggering on external dependencies.
 diff --git a/src/tools/build-manifest/src/main.rs b/src/tools/build-manifest/src/main.rs
-index ea620c64f3c..28363a2cb8a 100644
+index eab9138b..60507063 100644
 --- a/src/tools/build-manifest/src/main.rs
 +++ b/src/tools/build-manifest/src/main.rs
-@@ -119,6 +119,7 @@
+@@ -123,6 +123,7 @@
      "powerpc-unknown-linux-gnu",
      "powerpc64-unknown-linux-gnu",
      "powerpc64le-unknown-linux-gnu",
 +    "riscv32e-athena-zkvm-elf",
      "riscv32i-unknown-none-elf",
-     "riscv32im-succinct-zkvm-elf",
+     "riscv32im-risc0-zkvm-elf",
      "riscv32im-unknown-none-elf",
 diff --git a/compiler/rustc_target/src/spec/targets/riscv32em_athena_zkvm_elf.rs b/compiler/rustc_target/src/spec/targets/riscv32em_athena_zkvm_elf.rs
 new file mode 100644
-index 00000000000..0ac603543b9
+index 00000000..2a95006c
 --- /dev/null
 +++ b/compiler/rustc_target/src/spec/targets/riscv32em_athena_zkvm_elf.rs
-@@ -0,0 +1,38 @@
+@@ -0,0 +1,44 @@
 +use crate::spec::{Cc, LinkerFlavor, Lld, PanicStrategy, RelocModel};
 +use crate::spec::{Target, TargetOptions};
 +
 +pub fn target() -> Target {
 +    Target {
 +        data_layout: "e-m:e-p:32:32-i64:64-n32-S128".into(),
 +        llvm_target: "riscv32".into(),
++        metadata: crate::spec::TargetMetadata {
++            description: None,
++            tier: None,
++            host_tools: None,
++            std: None,
++        },
 +        pointer_width: 32,
 +        arch: "riscv32".into(),
 +