From fcc838be49c98486c26738764f895d34de0716be Mon Sep 17 00:00:00 2001 From: Ivan Maidanski Date: Sun, 13 Jan 2013 20:04:36 +0400 Subject: [PATCH] Fix read_ordered.h inclusion for ARM * src/atomic_ops/sysdeps/armcc/arm_v6.h: Move include of read_ordered.h down to the end of the file to be after AO_load/store definition (since read_ordered.h depends on these primitives). * src/atomic_ops/sysdeps/gcc/arm.h: Likewise. * src/atomic_ops/sysdeps/msftc/arm.h: Likewise. --- 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, 7 insertions(+), 5 deletions(-) diff --git a/src/atomic_ops/sysdeps/armcc/arm_v6.h b/src/atomic_ops/sysdeps/armcc/arm_v6.h index 7c3f6e5..657916f 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 @@ -264,3 +264,5 @@ 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 3f19cc0..3245ce0 100644 --- a/src/atomic_ops/sysdeps/gcc/arm.h +++ b/src/atomic_ops/sysdeps/gcc/arm.h @@ -15,8 +15,6 @@ * */ -#include "../read_ordered.h" - #include "../test_and_set_t_is_ao_t.h" /* Probably suboptimal */ #if defined(__thumb__) && !defined(__thumb2__) @@ -427,3 +425,5 @@ 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 1e73fcb..cd7500a 100644 --- a/src/atomic_ops/sysdeps/msftc/arm.h +++ b/src/atomic_ops/sysdeps/msftc/arm.h @@ -20,8 +20,6 @@ * SOFTWARE. */ -#include "../read_ordered.h" - #ifndef AO_ASSUME_WINDOWS98 /* CAS is always available */ # define AO_ASSUME_WINDOWS98 @@ -74,3 +72,5 @@ AO_load(const volatile AO_t *addr) #endif /* _M_ARM < 6 */ #define AO_T_IS_INT + +#include "../read_ordered.h" -- 2.7.4