fix all features

taiki-e · Dec 17, 2022 · d946bc2 · d946bc2
1 parent de040ba
commit d946bc2
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 9 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -65,6 +65,7 @@ serde = { version = "1.0.103", optional = true, default-features = false }
 critical-section = { version = "1", optional = true }
 
 [dev-dependencies]
+critical-section = { version = "1", features = ["std"] }
 crossbeam-utils = "0.8"
 fastrand = "1"
 paste = "1"

diff --git a/src/imp/interrupt/mod.rs b/src/imp/interrupt/mod.rs
@@ -22,6 +22,8 @@
 // [^avr1]: https://github.com/llvm/llvm-project/blob/llvmorg-15.0.0/llvm/lib/Target/AVR/AVRExpandPseudoInsts.cpp#L1008
 // [^avr2]: https://github.com/llvm/llvm-project/blob/llvmorg-15.0.0/llvm/test/CodeGen/AVR/atomics/load16.ll#L5
 
+#![cfg_attr(test, allow(dead_code))]
+
 // On some platforms, atomic load/store can be implemented in a more efficient
 // way than disabling interrupts. On MSP430, some RMWs that do not return the
 // previous value can also be optimized.

diff --git a/src/imp/mod.rs b/src/imp/mod.rs
@@ -5,14 +5,17 @@
 #[cfg(not(any(
     portable_atomic_no_atomic_load_store,
     portable_atomic_unsafe_assume_single_core,
-    feature = "critical-section",
     target_arch = "avr",
     target_arch = "msp430",
 )))]
+#[cfg_attr(
+    portable_atomic_no_cfg_target_has_atomic,
+    cfg(not(all(feature = "critical-section", portable_atomic_no_atomic_cas)))
+)]
 #[cfg_attr(
     not(portable_atomic_no_cfg_target_has_atomic),
     cfg(not(all(
-        any(target_arch = "riscv32", target_arch = "riscv64"),
+        any(target_arch = "riscv32", target_arch = "riscv64", feature = "critical-section"),
         not(target_has_atomic = "ptr")
     )))
 )]
@@ -147,14 +150,17 @@ pub(crate) mod float;
 #[cfg(not(any(
     portable_atomic_no_atomic_load_store,
     portable_atomic_unsafe_assume_single_core,
-    feature = "critical-section",
     target_arch = "avr",
     target_arch = "msp430",
 )))]
+#[cfg_attr(
+    portable_atomic_no_cfg_target_has_atomic,
+    cfg(not(all(feature = "critical-section", portable_atomic_no_atomic_cas)))
+)]
 #[cfg_attr(
     not(portable_atomic_no_cfg_target_has_atomic),
     cfg(not(all(
-        any(target_arch = "riscv32", target_arch = "riscv64"),
+        any(target_arch = "riscv32", target_arch = "riscv64", feature = "critical-section"),
         not(target_has_atomic = "ptr")
     )))
 )]
@@ -186,14 +192,17 @@ pub(crate) use self::interrupt::{
 #[cfg(not(any(
     portable_atomic_no_atomic_load_store,
     portable_atomic_unsafe_assume_single_core,
-    feature = "critical-section",
     target_arch = "avr",
     target_arch = "msp430",
 )))]
+#[cfg_attr(
+    portable_atomic_no_cfg_target_has_atomic,
+    cfg(not(all(feature = "critical-section", portable_atomic_no_atomic_cas)))
+)]
 #[cfg_attr(
     not(portable_atomic_no_cfg_target_has_atomic),
     cfg(not(all(
-        any(target_arch = "riscv32", target_arch = "riscv64"),
+        any(target_arch = "riscv32", target_arch = "riscv64", feature = "critical-section"),
         not(target_has_atomic = "ptr")
     )))
 )]
@@ -220,17 +229,26 @@ pub(crate) use self::interrupt::{AtomicI32, AtomicU32};
 #[cfg(not(any(
     portable_atomic_no_atomic_load_store,
     portable_atomic_unsafe_assume_single_core,
-    feature = "critical-section",
 )))]
-#[cfg_attr(portable_atomic_no_cfg_target_has_atomic, cfg(not(portable_atomic_no_atomic_64)))]
+#[cfg_attr(
+    portable_atomic_no_cfg_target_has_atomic,
+    cfg(not(any(
+        portable_atomic_no_atomic_64,
+        not(all(feature = "critical-section", portable_atomic_no_atomic_cas))
+    )))
+)]
 #[cfg_attr(
     not(portable_atomic_no_cfg_target_has_atomic),
     cfg(any(
         target_has_atomic = "64",
         all(
             not(any(target_pointer_width = "16", target_pointer_width = "32")),
             not(all(
-                any(target_arch = "riscv32", target_arch = "riscv64"),
+                any(
+                    target_arch = "riscv32",
+                    target_arch = "riscv64",
+                    feature = "critical-section"
+                ),
                 not(target_has_atomic = "ptr")
             ))
         )