From 52555044892c434c30846a1885ad39dd4f79fce8 Mon Sep 17 00:00:00 2001 From: Ivan Maidanski Date: Thu, 14 Feb 2013 14:08:47 +0400 Subject: [PATCH] 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. --- src/atomic_ops/sysdeps/armcc/arm_v6.h | 2 +- src/atomic_ops/sysdeps/gcc/arm.h | 2 -- src/atomic_ops/sysdeps/msftc/arm.h | 2 -- 3 files changed, 1 insertion(+), 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 -- 2.40.0