diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2013-09-16 16:59:07 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-16 23:19:26 +0200 |
| commit | ae577e6b8f8b966cf87293b12803bcc813019a2e (patch) | |
| tree | 7cb5709aac1eb30c6ea24215d1d8f14981b177e2 /src | |
| parent | 51da24014949868bbaffe2d98f8500eb5fcb9795 (diff) | |
Don't use ARMv5/6/7 atomics on 64-bit ARM, as they are AArch32 specific
Change-Id: I0c359e62a8cbf560691019187f316561bddbee52
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/thread/qbasicatomic.h | 6 |
1 files 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" |