Merge rust-embedded#311

311: Duplicate compiler fences around barrier instrs r=adamgreig a=jonas-schievink This should fix rust-embedded#308 Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
ovidiusabou · Jan 7, 2021 · 1261653 · 1261653
2 parents dafbc4e + 5bed907
commit 1261653
Show file tree

Hide file tree

Showing 15 changed files with 3 additions and 0 deletions.
diff --git a/asm/inline.rs b/asm/inline.rs
@@ -64,18 +64,21 @@ pub unsafe fn __delay(cyc: u32) {
 
 #[inline(always)]
 pub unsafe fn __dmb() {
+    compiler_fence(Ordering::SeqCst);
     asm!("dmb");
     compiler_fence(Ordering::SeqCst);
 }
 
 #[inline(always)]
 pub unsafe fn __dsb() {
+    compiler_fence(Ordering::SeqCst);
     asm!("dsb");
     compiler_fence(Ordering::SeqCst);
 }
 
 #[inline(always)]
 pub unsafe fn __isb() {
+    compiler_fence(Ordering::SeqCst);
     asm!("isb");
     compiler_fence(Ordering::SeqCst);
 }

diff --git a/bin/thumbv6m-none-eabi-lto.a b/bin/thumbv6m-none-eabi-lto.a
diff --git a/bin/thumbv6m-none-eabi.a b/bin/thumbv6m-none-eabi.a
diff --git a/bin/thumbv7em-none-eabi-lto.a b/bin/thumbv7em-none-eabi-lto.a
diff --git a/bin/thumbv7em-none-eabi.a b/bin/thumbv7em-none-eabi.a
diff --git a/bin/thumbv7em-none-eabihf-lto.a b/bin/thumbv7em-none-eabihf-lto.a
diff --git a/bin/thumbv7em-none-eabihf.a b/bin/thumbv7em-none-eabihf.a
diff --git a/bin/thumbv7m-none-eabi-lto.a b/bin/thumbv7m-none-eabi-lto.a
diff --git a/bin/thumbv7m-none-eabi.a b/bin/thumbv7m-none-eabi.a
diff --git a/bin/thumbv8m.base-none-eabi-lto.a b/bin/thumbv8m.base-none-eabi-lto.a
diff --git a/bin/thumbv8m.base-none-eabi.a b/bin/thumbv8m.base-none-eabi.a
diff --git a/bin/thumbv8m.main-none-eabi-lto.a b/bin/thumbv8m.main-none-eabi-lto.a
diff --git a/bin/thumbv8m.main-none-eabi.a b/bin/thumbv8m.main-none-eabi.a
diff --git a/bin/thumbv8m.main-none-eabihf-lto.a b/bin/thumbv8m.main-none-eabihf-lto.a
diff --git a/bin/thumbv8m.main-none-eabihf.a b/bin/thumbv8m.main-none-eabihf.a