Athena-specific fixes

Uses a slightly newer Rust build, which includes zkvm
Include a few important patches that came after this

Author: lrettig

build.sh

@@ -6,4 +6,4 @@ source config.sh
 
 # Will create component archives (dists) ./rust/build/dist
 cd rust
-./x dist rustc rust-std cargo rust-src rustfmt clippy --target $TOOLCHAIN_HOST_TRIPLET,riscv32em-unknown-none-elf,riscv32ema-unknown-none-elf,riscv64ema-unknown-none-elf
+./x dist rustc rust-std cargo rust-src rustfmt clippy --target $TOOLCHAIN_HOST_TRIPLET,riscv32em-athena-zkvm-elf

config.sh

@@ -2,7 +2,7 @@
 
 param1=${1:-}
 
-export RUST_COMMIT=5113ed28ea1451a13eae3a05dca0dbabfd56f587
+export RUST_COMMIT=aedd173a2c086e558c2b66d3743b344f977621a7
 
 # If -rust_commit specified then only export the rust commit variable
 if [ "$param1" == "-rust_commit" ]; then
@@ -27,7 +27,7 @@ fi
 
 # Toolchain itself does not need to be versioned by default. It makes referencing it from
 # various other projects harder while things are in development. Version can be queried by
-# calling `rustc --version anyways`. If someone needs to keep an older version they can 
+# calling `rustc --version anyways`. If someone needs to keep an older version they can
 # always rename the folder at install time.
 export TOOLCHAIN_NAME=rve-nightly
 

package.sh

@@ -28,9 +28,7 @@ cd unpack
 
 inst "rustc-nightly-$TOOLCHAIN_HOST_TRIPLET"
 inst "rust-std-nightly-$TOOLCHAIN_HOST_TRIPLET"
-inst "rust-std-nightly-riscv32em-unknown-none-elf"
-inst "rust-std-nightly-riscv32ema-unknown-none-elf"
-inst "rust-std-nightly-riscv64ema-unknown-none-elf"
+inst "rust-std-nightly-riscv32em-athena-zkvm-elf"
 inst "cargo-nightly-$TOOLCHAIN_HOST_TRIPLET"
 inst "rust-src-nightly"
 inst "rustfmt-nightly-$TOOLCHAIN_HOST_TRIPLET"