Fix missing compiler barrier in AO_nop_full for uniprocessor ARM

* src/atomic_ops/sysdeps/armcc/arm_v6.h (AO_nop_full): Insert
AO_compiler_barrier for AO_UNIPROCESSOR case.
* src/atomic_ops/sysdeps/gcc/arm.h (AO_nop_full): Likewise.
* src/atomic_ops/sysdeps/msftc/arm.h (AO_nop_full): Likewise.
* src/atomic_ops/sysdeps/msftc/arm.h (AO_nop_full): Refine comment.

diff --git a/src/atomic_ops/sysdeps/armcc/arm_v6.h b/src/atomic_ops/sysdeps/armcc/arm_v6.h
index 4c965b1590f47fb750a421e44c2655bb6226fa19..7c3f6e5decc9888933e364aef28f121acace9539 100644 (file)
--- a/src/atomic_ops/sysdeps/armcc/arm_v6.h
+++ b/src/atomic_ops/sysdeps/armcc/arm_v6.h
@@ -50,6 +50,8 @@ AO_nop_full(void)
     __asm {
             mcr p15,0,dest,c7,c10,5
             };
+# else
+    AO_compiler_barrier();
 # endif
 }
 #define AO_HAVE_nop_full

diff --git a/src/atomic_ops/sysdeps/gcc/arm.h b/src/atomic_ops/sysdeps/gcc/arm.h
index 37bc811a2106bb14dbc493a61c8b962ce3429efd..ab0b42ff9bbda6d45e8be05a264210e93590127b 100644 (file)
--- a/src/atomic_ops/sysdeps/gcc/arm.h
+++ b/src/atomic_ops/sysdeps/gcc/arm.h
@@ -97,6 +97,8 @@ AO_nop_full(void)
       : "=&r"(dest)
       : /* empty */
       : AO_THUMB_SWITCH_CLOBBERS "memory");
+# else
+    AO_compiler_barrier();
 # endif
 }
 #define AO_HAVE_nop_full

diff --git a/src/atomic_ops/sysdeps/msftc/arm.h b/src/atomic_ops/sysdeps/msftc/arm.h
index 68727cc32ea3174ea05c505627d3a527d65f1225..5a96ee7c3b21118cbe14d3a7dd9c6739c51d96c8 100644 (file)
--- a/src/atomic_ops/sysdeps/msftc/arm.h
+++ b/src/atomic_ops/sysdeps/msftc/arm.h
@@ -33,10 +33,12 @@
 #if _M_ARM >= 6
 /* ARMv6 is the first architecture providing support for simple LL/SC.  */
 
-/* If only a single processor is used, we can define AO_UNIPROCESSOR    */
-/* and do not need to access CP15 for ensuring a DMB at all.            */
+/* If only a single processor is used, we can define AO_UNIPROCESSOR.   */
 #ifdef AO_UNIPROCESSOR
-  AO_INLINE void AO_nop_full(void) {}
+  AO_INLINE void AO_nop_full(void)
+  {
+    AO_compiler_barrier();
+  }
 # define AO_HAVE_nop_full
 #else
 /* AO_nop_full() is emulated using AO_test_and_set_full().              */