From ae577e6b8f8b966cf87293b12803bcc813019a2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Mon, 16 Sep 2013 16:59:07 +0200 Subject: Don't use ARMv5/6/7 atomics on 64-bit ARM, as they are AArch32 specific Change-Id: I0c359e62a8cbf560691019187f316561bddbee52 Reviewed-by: Thiago Macieira --- src/corelib/thread/qbasicatomic.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/corelib/thread/qbasicatomic.h b/src/corelib/thread/qbasicatomic.h index cf0a6a55e4..ddcc25f7b7 100644 --- a/src/corelib/thread/qbasicatomic.h +++ b/src/corelib/thread/qbasicatomic.h @@ -60,11 +60,11 @@ // Processor dependent implementation #elif defined(Q_PROCESSOR_ALPHA) # include "QtCore/qatomic_alpha.h" -#elif defined(Q_PROCESSOR_ARM_V7) +#elif defined(Q_PROCESSOR_ARM_V7) && defined(Q_PROCESSOR_ARM_32) # include "QtCore/qatomic_armv7.h" -#elif defined(Q_PROCESSOR_ARM_V6) +#elif defined(Q_PROCESSOR_ARM_V6) && defined(Q_PROCESSOR_ARM_32) # include "QtCore/qatomic_armv6.h" -#elif defined(Q_PROCESSOR_ARM_V5) +#elif defined(Q_PROCESSOR_ARM_V5) && defined(Q_PROCESSOR_ARM_32) # include "QtCore/qatomic_armv5.h" #elif defined(Q_PROCESSOR_BFIN) # include "QtCore/qatomic_bfin.h" -- cgit v1.2.3