diff options
| author | Ivan Maidanski <ivmai@mail.ru> | 2013-02-14 10:59:38 +0100 |
|---|---|---|
| committer | Ivan Maidanski <ivmai@mail.ru> | 2013-02-14 10:59:38 +0100 |
| commit | 04f188409b49345b61e47980c4e963b7559ba25f (patch) | |
| tree | 56c656cd670f356f34bc6216274eab9a22e2123a /src | |
| parent | 14cd39ac400ad8fbb36a700efef4615a901c28f8 (diff) | |
| download | libatomic_ops-04f188409b49345b61e47980c4e963b7559ba25f.tar.gz | |
Revert "Fix read_ordered.h inclusion for ARM"
(because it makes load_acquire/read incorrect for multi-core ARM)
This reverts commit fcc838be49c98486c26738764f895d34de0716be.
Diffstat (limited to 'src')
| -rw-r--r-- | src/atomic_ops/sysdeps/armcc/arm_v6.h | 4 | ||||
| -rw-r--r-- | src/atomic_ops/sysdeps/gcc/arm.h | 4 | ||||
| -rw-r--r-- | 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 cd3d2f4..59054a7 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 @@ -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 17cb568..236c54b 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 */ #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 3f76cc9..fedabae 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 @@ -61,5 +63,3 @@ #endif /* _M_ARM < 6 */ #define AO_T_IS_INT - -#include "../read_ordered.h" |