From a1201cf2b99f8f4149c0971c04c655adbf1753c4 Mon Sep 17 00:00:00 2001
From: James Wainwright <james.wainwright@lowrisc.org>
Date: Thu, 22 Aug 2024 11:20:09 +0100
Subject: [PATCH] Enable supported bitmanip extensions for Rust demos

Ibex supports a few more bitmanip extensions but they're not supported
in upstream LLVM / Rust.
---
 sw/rust/.cargo/config.toml  | 3 +++
 sw/rust/rust-toolchain.toml | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/sw/rust/.cargo/config.toml b/sw/rust/.cargo/config.toml
index 60b2a756..f98cc883 100644
--- a/sw/rust/.cargo/config.toml
+++ b/sw/rust/.cargo/config.toml
@@ -5,6 +5,9 @@
 [build]
 target = "riscv32imc-unknown-none-elf"
 
+# Enable supported bitmanip extension features.
+rustflags = ["-Ctarget-feature=+zba,+zbb,+zbc,+zbs"]
+
 [target.riscv32imc-unknown-none-elf]
 runner = "../../util/load_demo_system.sh run"
 
diff --git a/sw/rust/rust-toolchain.toml b/sw/rust/rust-toolchain.toml
index 5269f09c..f70d2254 100644
--- a/sw/rust/rust-toolchain.toml
+++ b/sw/rust/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
-targets = ["riscv32imc-unknown-none-elf"]
 channel = "nightly"
+components = ["rust-src"]