diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2012-02-05 13:14:23 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-08 12:33:26 +0100 |
| commit | 43a6739beb19d33aa1b0b2920bc2fe2c0356194a (patch) | |
| tree | e9cc7d69f3c1db1a6950e6d6bfed3defb7e34272 /src/corelib/thread | |
| parent | eebc124f4c7fd28b3e8da327dcfcda354712cce3 (diff) | |
Use Q_PROCESSOR_* when chosing an atomic implementation
Use the new Q_PROCESSOR_* macros to decide which headers to include in
the atomic implementation. This also removes qatomic_arm.h, which isn't
needed anymore, just select the correct qatomic_armv*.h from
qbasicatomic.h
Change-Id: I954848feafb8c420949d066ffcee1dd2b271e13b
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/thread')
| -rw-r--r-- | src/corelib/thread/qbasicatomic.h | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/corelib/thread/qbasicatomic.h b/src/corelib/thread/qbasicatomic.h index 527031bbd1..fee7561056 100644 --- a/src/corelib/thread/qbasicatomic.h +++ b/src/corelib/thread/qbasicatomic.h @@ -48,15 +48,19 @@ # include <QtCore/qatomic_bootstrap.h> #elif defined(Q_CC_MSVC) # include <QtCore/qatomic_msvc.h> -#elif defined(__arm__) || defined(__TARGET_ARCH_ARM) -# include <QtCore/qatomic_arm.h> -#elif defined(__i386) || defined(__i386__) -# include <QtCore/qatomic_i386.h> -#elif defined(__ia64) || defined(__ia64__) +#elif defined(Q_PROCESSOR_ARM_V7) +# include "QtCore/qatomic_armv7.h" +#elif defined(Q_PROCESSOR_ARM_V6) +# include "QtCore/qatomic_armv6.h" +#elif defined(Q_PROCESSOR_ARM_V5) +# include "QtCore/qatomic_armv5.h" +#elif defined(Q_PROCESSOR_IA64) # include "QtCore/qatomic_ia64.h" -#elif defined(__mips) || defined(__mips__) +#elif defined(Q_PROCESSOR_MIPS) # include "QtCore/qatomic_mips.h" -#elif defined(__x86_64) || defined(__x86_64__) || defined(__amd64) +#elif defined(Q_PROCESSOR_X86_32) +# include <QtCore/qatomic_i386.h> +#elif defined(Q_PROCESSOR_X86_64) # include <QtCore/qatomic_x86_64.h> #elif defined(Q_COMPILER_ATOMICS) && defined(Q_COMPILER_CONSTEXPR) # include <QtCore/qatomic_cxx11.h> |