Revert "Fix read_ordered.h inclusion for ARM"

(because it makes load_acquire/read incorrect for multi-core ARM)

This reverts commit fcc838be49c98486c26738764f895d34de0716be.

diff --git a/src/atomic_ops/sysdeps/armcc/arm_v6.h b/src/atomic_ops/sysdeps/armcc/arm_v6.h
index cd3d2f441929d976f571a8f0a93ebfbfdf8bc5d3..59054a7ce5e7836a03737fa5df4954c09b18a144 100644 (file)
--- a/src/atomic_ops/sysdeps/armcc/arm_v6.h
+++ b/src/atomic_ops/sysdeps/armcc/arm_v6.h
@@ -19,7 +19,7 @@
  * modified is included with the above copyright notice.
  *
  */
-
+#include "../read_ordered.h"
 #include "../test_and_set_t_is_ao_t.h" /* Probably suboptimal */
 
 #if __TARGET_ARCH_ARM < 6
@@ -261,5 +261,3 @@ AO_compare_double_and_swap_double(volatile AO_double_t *addr,
 #endif /* __TARGET_ARCH_ARM >= 6 */
 
 #define AO_T_IS_INT
-
-#include "../read_ordered.h"

diff --git a/src/atomic_ops/sysdeps/gcc/arm.h b/src/atomic_ops/sysdeps/gcc/arm.h
index 17cb56814972f985d9764cbd52f196fdc5c9d914..236c54bcb343a802194c7a6714a1d9eb15d1223a 100644 (file)
--- a/src/atomic_ops/sysdeps/gcc/arm.h
+++ b/src/atomic_ops/sysdeps/gcc/arm.h
@@ -15,6 +15,8 @@
  *
  */
 
+#include "../read_ordered.h"
+
 #include "../test_and_set_t_is_ao_t.h" /* Probably suboptimal */
 
 #if defined(__thumb__) && !defined(__thumb2__)
@@ -535,5 +537,3 @@ AO_fetch_compare_and_swap(volatile AO_t *addr, AO_t old_val, AO_t new_val)
 
 /* FIXME: 32-bit ABI is assumed.    */
 #define AO_T_IS_INT
-
-#include "../read_ordered.h"

diff --git a/src/atomic_ops/sysdeps/msftc/arm.h b/src/atomic_ops/sysdeps/msftc/arm.h
index 3f76cc9b1ad51b8b4328e6f590146903a02bf985..fedabae1aa1df11f547e491743b5a602b0a5fec9 100644 (file)
--- a/src/atomic_ops/sysdeps/msftc/arm.h
+++ b/src/atomic_ops/sysdeps/msftc/arm.h
@@ -20,6 +20,8 @@
  * SOFTWARE.
  */
 
+#include "../read_ordered.h"
+
 #ifndef AO_ASSUME_WINDOWS98
   /* CAS is always available */
 # define AO_ASSUME_WINDOWS98
@@ -61,5 +63,3 @@
 #endif /* _M_ARM < 6 */
 
 #define AO_T_IS_INT
-
-#include "../read_ordered.h"