diff options
| author | Aliaksey Kandratsenka <alk@tut.by> | 2014-10-11 15:09:18 -0700 |
|---|---|---|
| committer | Aliaksey Kandratsenka <alk@tut.by> | 2014-11-02 18:29:38 -0800 |
| commit | 6efe96b41c9531f68f806faa0464445f884178ce (patch) | |
| tree | 978ec1b994d6531c43a0d57b7949214944a3baec | |
| parent | 8e97626378d5c4151a480dea1964e25969c9311d (diff) | |
| download | gperftools-6efe96b41c9531f68f806faa0464445f884178ce.tar.gz | |
issue-493: correctly detect __ARM_ARCH_6ZK__ for MemoryBarrier
Which should fix issue reported by user pedronavf
| -rw-r--r-- | src/base/atomicops-internals-arm-v6plus.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 |