From 6efe96b41c9531f68f806faa0464445f884178ce Mon Sep 17 00:00:00 2001 From: Aliaksey Kandratsenka Date: Sat, 11 Oct 2014 15:09:18 -0700 Subject: issue-493: correctly detect __ARM_ARCH_6ZK__ for MemoryBarrier Which should fix issue reported by user pedronavf --- src/base/atomicops-internals-arm-v6plus.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/base/atomicops-internals-arm-v6plus.h b/src/base/atomicops-internals-arm-v6plus.h index cd1b698..35f1048 100644 --- a/src/base/atomicops-internals-arm-v6plus.h +++ b/src/base/atomicops-internals-arm-v6plus.h @@ -96,7 +96,7 @@ inline Atomic32 NoBarrier_AtomicExchange(volatile Atomic32* ptr, } inline void MemoryBarrier() { -#if defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6KZ__) || defined(__ARM_ARCH_6T2__) +#if !defined(ARMV7) uint32_t dest = 0; __asm__ __volatile__("mcr p15,0,%0,c7,c10,5" :"=&r"(dest) : : "memory"); #else -- cgit v1.2.1