From f4a46f969d105ecf1cd8c38d6c5ff657fcf3958e Mon Sep 17 00:00:00 2001
From: Ivan Maidanski <ivmai@mail.ru>
Date: Mon, 25 Feb 2013 19:00:03 +0400
Subject: [PATCH] Revert "Fix read_ordered.h inclusion for ARM" (because it
 makes load_acquire/read incorrect for multi-core ARM)

This reverts commit 53f2152e00d4bf7d395f9de408c71ee2aa9a9bc4.
---
 src/atomic_ops/sysdeps/armcc/arm_v6.h | 4 +---
 src/atomic_ops/sysdeps/gcc/arm.h      | 4 ++--
 src/atomic_ops/sysdeps/msftc/arm.h    | 4 ++--
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/atomic_ops/sysdeps/armcc/arm_v6.h b/src/atomic_ops/sysdeps/armcc/arm_v6.h
index 2ce4bef..fd6113d 100644
--- 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
@@ -232,5 +232,3 @@ AO_compare_double_and_swap_double(volatile AO_double_t *addr,
 #define AO_HAVE_compare_double_and_swap_double
 
 #endif // __TARGET_ARCH_ARM
-
-#include "../read_ordered.h"
diff --git a/src/atomic_ops/sysdeps/gcc/arm.h b/src/atomic_ops/sysdeps/gcc/arm.h
index dd47eb7..0d7a93f 100644
--- 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 */
 
 /* NEC LE-IT: ARMv6 is the first architecture providing support for     */
@@ -352,5 +354,3 @@ AO_compare_and_swap(volatile AO_t *addr, AO_t old_val, AO_t new_val)
   }
 # define AO_HAVE_test_and_set_full
 #endif /* !AO_HAVE_test_and_set[_full] */
-
-#include "../read_ordered.h"
diff --git a/src/atomic_ops/sysdeps/msftc/arm.h b/src/atomic_ops/sysdeps/msftc/arm.h
index 927d686..9391cee 100644
--- 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
@@ -88,5 +90,3 @@ AO_store_full(volatile AO_t *addr, AO_t value)
 /* AO_test_and_set_full() is emulated using CAS.                        */
 
 #endif /* _M_ARM < 6 */
-
-#include "../read_ordered.h"
-- 
2.50.1