update dependencies

Author: romancardenas

.github/workflows/ci.yml

@@ -8,6 +8,7 @@ on:
 
 env:
   CARGO_TERM_COLOR: always
+  RUSTFLAGS: "-C link-arg=-Thifive1-link.x --cfg portable_atomic_target_feature=\"zaamo\""
 
 jobs:
   # On Linux, we check that the crate builds and links for all the toolchains and targets.
@@ -18,9 +19,10 @@ jobs:
         toolchain: 
         - stable
         - nightly
-        - 1.75.0
+        - 1.76.0
         cargo_flags:
           - "clint-backend"
+          - "mecall-backend"
         include:
           # Nightly is only for reference and allowed to fail
           - rust: nightly
@@ -34,10 +36,10 @@ jobs:
         toolchain: ${{ matrix.toolchain }}
         targets: riscv32i-unknown-none-elf,riscv32imc-unknown-none-elf,riscv32imac-unknown-none-elf,riscv64gc-unknown-none-elf
     - name: Build riscv32i-unknown-none-elf
-      run: RUSTFLAGS="-C link-arg=-Thifive1-link.x" cargo build --workspace --target riscv32i-unknown-none-elf --features=${{ matrix.cargo_flags }}
+      run: RUSTFLAGS=$RUSTFLAGS cargo build --workspace --target riscv32i-unknown-none-elf --features=${{ matrix.cargo_flags }}
     - name: Build riscv32imc-unknown-none-elf
-      run: RUSTFLAGS="-C link-arg=-Thifive1-link.x" cargo build --workspace --target riscv32imc-unknown-none-elf --features=${{ matrix.cargo_flags }}
+      run: RUSTFLAGS=$RUSTFLAGS cargo build --workspace --target riscv32imc-unknown-none-elf --features=${{ matrix.cargo_flags }}
     - name: Build riscv32imac-unknown-none-elf
-      run: RUSTFLAGS="-C link-arg=-Thifive1-link.x" cargo build --target riscv32imac-unknown-none-elf --workspace --features=${{ matrix.cargo_flags }}
+      run: RUSTFLAGS=$RUSTFLAGS cargo build --target riscv32imac-unknown-none-elf --workspace --features=${{ matrix.cargo_flags }}
     - name: Build riscv64gc-unknown-none-elf (no example)
       run: cargo build --target riscv64gc-unknown-none-elf --features=${{ matrix.cargo_flags }}

hifive1-test/.cargo/config.toml

@@ -4,6 +4,7 @@ runner = "qemu-system-riscv32 -machine sifive_e,revb=true -nographic -kernel"
 # runner = "probe-run --chip fe310-g002 --verbose"
 rustflags = [
   "-C", "link-arg=-Thifive1-link.x",
+    "--cfg", "portable_atomic_target_feature=\"zaamo\"",
 ]
 
 [build]

hifive1-test/Cargo.toml

@@ -8,8 +8,7 @@ edition = "2021"
 [dependencies]
 riscv-slic = { path = "../riscv-slic" }
 riscv-rt = "0.13.0"
-hifive1 = { git = "https://github.com/greenlsi/hifive1.git", branch = "master", features = ["board-redv"] } # TODO use crates.io
-bare-metal = "0.2"
+hifive1 = { git = "https://github.com/riscv-rust/e310x.git", branch = "ehv1", features = ["board-redv"] }
 panic-halt = "0.2.0"
 
 [features]
@@ -23,3 +22,7 @@ required-features = ["clint"]
 [[example]]
 name = "mecall"
 required-features = ["mecall"]
+
+[[example]]
+name = "mecall_nested"
+required-features = ["mecall"]

riscv-slic/Cargo.toml

@@ -17,7 +17,7 @@ features = ["clint-backend"]
 [dependencies]
 critical-section = "1.2.0"
 heapless = "0.8.0"
-riscv = "0.12.0"
+riscv = "0.12.1"
 riscv-slic-macros = { path = "../riscv-slic-macros", version = "0.1.0" }
 
 [features]