Merge pull request #306 from rust-embedded/rv-no-build

`riscv`: remove custom build script

Author: romancardenas

riscv/CHANGELOG.md

@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+### Changed
+
+- Use `cfg(any(target_arch = "riscv32", target_arch = "riscv64"))` instead of `cfg(riscv)`.
+
+### Removed
+
+- Removed custom build script, as `cfg(riscv)` is no longer necessary.
+
 ## [v0.14.0] - 2025-06-10
 
 ### Added

riscv/build.rs

@@ -53,7 +53,10 @@ pub use riscv_pac::*;
 #[macro_use]
 mod macros;
 
-#[cfg(all(riscv, feature = "critical-section-single-hart"))]
+#[cfg(all(
+    any(target_arch = "riscv32", target_arch = "riscv64"),
+    feature = "critical-section-single-hart"
+))]
 mod critical_section;
 
 /// Used to reexport items for use in macros. Do not use directly.

riscv/src/lib.rs

@@ -438,9 +438,9 @@ pub unsafe fn set_vs(vs: VS) {
 #[inline]
 pub unsafe fn set_sbe(endianness: Endianness) {
     match () {
-        #[cfg(riscv32)]
+        #[cfg(target_arch = "riscv32")]
         () => super::mstatush::set_sbe(endianness),
-        #[cfg(not(riscv32))]
+        #[cfg(not(target_arch = "riscv32"))]
         () => match endianness {
             Endianness::BigEndian => _set(1 << 36),
             Endianness::LittleEndian => _clear(1 << 36),
@@ -456,9 +456,9 @@ pub unsafe fn set_sbe(endianness: Endianness) {
 #[inline]
 pub unsafe fn set_mbe(endianness: Endianness) {
     match () {
-        #[cfg(riscv32)]
+        #[cfg(target_arch = "riscv32")]
         () => super::mstatush::set_mbe(endianness),
-        #[cfg(not(riscv32))]
+        #[cfg(not(target_arch = "riscv32"))]
         () => match endianness {
             Endianness::BigEndian => _set(1 << 37),
             Endianness::LittleEndian => _clear(1 << 37),

riscv/src/register/mstatus.rs

@@ -79,11 +79,11 @@ impl Pmpcsr {
     #[inline]
     pub fn try_into_config(&self, index: usize) -> Result<Pmp> {
         let max = match () {
-            #[cfg(riscv32)]
+            #[cfg(target_arch = "riscv32")]
             () => Ok(4usize),
-            #[cfg(riscv64)]
+            #[cfg(target_arch = "riscv64")]
             () => Ok(8usize),
-            #[cfg(not(any(riscv32, riscv64)))]
+            #[cfg(not(any(target_arch = "riscv32", target_arch = "riscv64")))]
             () => Err(Error::Unimplemented),
         }?;
 
@@ -122,7 +122,7 @@ pub mod pmpcfg0 {
 
 /// Physical memory protection configuration
 /// pmpcfg1 struct contains pmp4cfg - pmp7cfg for RV32 only
-#[cfg(riscv32)]
+#[cfg(target_arch = "riscv32")]
 pub mod pmpcfg1 {
     use super::{Permission, Pmpcsr, Range};
 
@@ -147,7 +147,7 @@ pub mod pmpcfg2 {
 
 /// Physical memory protection configuration
 /// pmpcfg3 struct contains pmp12cfg - pmp15cfg for RV32 only
-#[cfg(riscv32)]
+#[cfg(target_arch = "riscv32")]
 pub mod pmpcfg3 {
     use super::{Permission, Pmpcsr, Range};
 
@@ -172,7 +172,7 @@ pub mod pmpcfg4 {
 
 /// Physical memory protection configuration
 /// pmpcfg5 struct contains pmp20cfg - pmp23cfg for RV32 only
-#[cfg(riscv32)]
+#[cfg(target_arch = "riscv32")]
 pub mod pmpcfg5 {
     use super::{Permission, Pmpcsr, Range};
 
@@ -197,7 +197,7 @@ pub mod pmpcfg6 {
 
 /// Physical memory protection configuration
 /// pmpcfg7 struct contains pmp28cfg - pmp31cfg for RV32 only
-#[cfg(riscv32)]
+#[cfg(target_arch = "riscv32")]
 pub mod pmpcfg7 {
     use super::{Permission, Pmpcsr, Range};
 
@@ -222,7 +222,7 @@ pub mod pmpcfg8 {
 
 /// Physical memory protection configuration
 /// pmpcfg9 struct contains pmp36cfg - pmp39cfg for RV32 only
-#[cfg(riscv32)]
+#[cfg(target_arch = "riscv32")]
 pub mod pmpcfg9 {
     use super::{Permission, Pmpcsr, Range};
 
@@ -247,7 +247,7 @@ pub mod pmpcfg10 {
 
 /// Physical memory protection configuration
 /// pmpcfg11 struct contains pmp44cfg - pmp47cfg for RV32 only
-#[cfg(riscv32)]
+#[cfg(target_arch = "riscv32")]
 pub mod pmpcfg11 {
     use super::{Permission, Pmpcsr, Range};
 
@@ -272,7 +272,7 @@ pub mod pmpcfg12 {
 
 /// Physical memory protection configuration
 /// pmpcfg13 struct contains pmp52cfg - pmp55cfg for RV32 only
-#[cfg(riscv32)]
+#[cfg(target_arch = "riscv32")]
 pub mod pmpcfg13 {
     use super::{Permission, Pmpcsr, Range};
 
@@ -297,7 +297,7 @@ pub mod pmpcfg14 {
 
 /// Physical memory protection configuration
 /// pmpcfg15 struct contains pmp60cfg - pmp63cfg for RV32 only
-#[cfg(riscv32)]
+#[cfg(target_arch = "riscv32")]
 pub mod pmpcfg15 {
     use super::{Permission, Pmpcsr, Range};