Merge pull request #717 from LinuxHeki/main

Fix compilation for thumbv6m-none-eabi
rhaiscript · May 2, 2023 · 988a35d · 988a35d
2 parents c1d1072 + 4c0a1e9
commit 988a35d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -25,7 +25,7 @@ bitflags = { version = "1", default-features = false }
 smartstring = { version = "1", default-features = false }
 rhai_codegen = { version = "1.5.0", path = "codegen", default-features = false }
 
-no-std-compat = { version = "0.4", default-features = false, features = ["alloc"], optional = true }
+no-std-compat = { git = "https://gitlab.com/jD91mZM2/no-std-compat", default-features = false, features = ["alloc"], optional = true }
 libm = { version = "0.2", default-features = false, optional = true }
 hashbrown = { version = "0.13", optional = true }
 core-error = { version = "0.0", default-features = false, features = ["alloc"], optional = true }

diff --git a/src/config/hashing.rs b/src/config/hashing.rs
@@ -50,7 +50,8 @@ impl HokmaLock {
 
     pub fn write(&'static self) -> WhenTheHokmaSuppression {
         loop {
-            let previous = self.lock.swap(1, Ordering::SeqCst);
+            let previous = self.lock.load(Ordering::SeqCst);
+            self.lock.store(1, Ordering::SeqCst);
 
             if previous != 1 {
                 return WhenTheHokmaSuppression {