diff options
| author | Erik Verbruggen <erik.verbruggen@theqtcompany.com> | 2015-11-25 12:49:12 +0100 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@theqtcompany.com> | 2015-11-26 16:18:30 +0000 |
| commit | 0c9b4c84ad0ce9e64b70af82075fb57942228d95 (patch) | |
| tree | 172b69ee6830800e319e62c4e49abd2ed4666e49 /src/corelib/global | |
| parent | bd30cb2a91031afdae32f060fc79ada15fc9b13b (diff) | |
Aarch64: fix Q_PROCESSOR_ARM_V8 detection.
The macro __ARM64_ARCH_8 is only set by Apple's flavor of clang. GCC and
mainline clang set __ARM_ARCH to 8, and set __ARM_ARCH_8A (when
applicable).
Change-Id: I356b785ffdbfedf8f1ed682840db431db2779ba5
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qprocessordetection.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/corelib/global/qprocessordetection.h b/src/corelib/global/qprocessordetection.h index 4b75872bb6..619c1dd544 100644 --- a/src/corelib/global/qprocessordetection.h +++ b/src/corelib/global/qprocessordetection.h @@ -95,7 +95,9 @@ # else # define Q_PROCESSOR_ARM_32 # endif -# if defined(__ARM64_ARCH_8__) +# if defined(__ARM64_ARCH_8__) \ + || defined(__ARM_ARCH_8A) \ + || (defined(__ARM_ARCH) && __ARM_ARCH == 8) # define Q_PROCESSOR_ARM_V8 # define Q_PROCESSOR_ARM_V7 # define Q_PROCESSOR_ARM_V6 |