diff options
| author | Ivan Maidanski <ivmai@mail.ru> | 2013-02-14 14:08:47 +0400 |
|---|---|---|
| committer | Ivan Maidanski <ivmai@mail.ru> | 2013-02-14 14:08:47 +0400 |
| commit | 52555044892c434c30846a1885ad39dd4f79fce8 (patch) | |
| tree | 8f7ee8ceaae5ed504fcfc77118c941e35e8fae04 /src | |
| parent | 04f188409b49345b61e47980c4e963b7559ba25f (diff) | |
| download | libatomic_ops-52555044892c434c30846a1885ad39dd4f79fce8.tar.gz | |
Fix (remove) invalid include of read_ordered.h for ARM
(fix commit 2df9c1e partially)
* src/atomic_ops/sysdeps/gcc/arm.h: Do not include read_ordered.h
(because load_acquire should contain a DMB instruction in a multi-core
case, new load_acquire/read primitives implementation is generalized
using nop_full/read which either contain a DMB instruction, or is just
a compiler barrier for uniprocessor).
* src/atomic_ops/sysdeps/armcc/arm_v6.h: Likewise.
* src/atomic_ops/sysdeps/msftc/arm.h: Likewise.
Diffstat (limited to 'src')
| -rw-r--r-- | src/atomic_ops/sysdeps/armcc/arm_v6.h | 2 | ||||
| -rw-r--r-- | src/atomic_ops/sysdeps/gcc/arm.h | 2 | ||||
| -rw-r--r-- | src/atomic_ops/sysdeps/msftc/arm.h | 2 |
3 files changed, 1 insertions, 5 deletions
diff --git a/src/atomic_ops/sysdeps/armcc/arm_v6.h b/src/atomic_ops/sysdeps/armcc/arm_v6.h index 59054a7..9376e5b 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 diff --git a/src/atomic_ops/sysdeps/gcc/arm.h b/src/atomic_ops/sysdeps/gcc/arm.h index 236c54b..95d2f6b 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__) diff --git a/src/atomic_ops/sysdeps/msftc/arm.h b/src/atomic_ops/sysdeps/msftc/arm.h index fedabae..647373b 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 |