diff options
author | Tero Alamäki <tero.alamaki@qt.io> | 2017-04-26 10:51:39 +0300 |
---|---|---|
committer | Tero Alamaki <tero.alamaki@qt.io> | 2017-05-29 09:46:20 +0000 |
commit | 5a01b586653d4d0346f5b918792c21ae29db0346 (patch) | |
tree | 6a58b8b0435c899c359827d33c79eba5c6d11737 /src | |
parent | aea4e3823dc52618767ab7ebf0bce53696a4b80b (diff) |
Add Integrity ARMv8 detection
Change-Id: I352c9b16077011aad1175e31ffaadfa44d2403ea
Reviewed-by: Nikola Velinov <nvelinov@ghs.com>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/corelib/global/qprocessordetection.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/corelib/global/qprocessordetection.h b/src/corelib/global/qprocessordetection.h index ed11e013f2..0b260d01e3 100644 --- a/src/corelib/global/qprocessordetection.h +++ b/src/corelib/global/qprocessordetection.h @@ -94,8 +94,8 @@ ARM is bi-endian, detect using __ARMEL__ or __ARMEB__, falling back to auto-detection implemented below. */ -#if defined(__arm__) || defined(__TARGET_ARCH_ARM) || defined(_M_ARM) || defined(__aarch64__) -# if defined(__aarch64__) +#if defined(__arm__) || defined(__TARGET_ARCH_ARM) || defined(_M_ARM) || defined(__aarch64__) || defined(__ARM64__) +# if defined(__aarch64__) || defined(__ARM64__) # define Q_PROCESSOR_ARM_64 # define Q_PROCESSOR_WORDSIZE 8 # else @@ -109,7 +109,8 @@ # define Q_PROCESSOR_ARM _M_ARM # elif defined(__ARM64_ARCH_8__) \ || defined(__aarch64__) \ - || defined(__CORE_CORTEXAV8__) // GHS-specific for INTEGRITY + || defined(__ARMv8__) \ + || defined(__ARMv8_A__) # define Q_PROCESSOR_ARM 8 # elif defined(__ARM_ARCH_7__) \ || defined(__ARM_ARCH_7A__) \ @@ -117,7 +118,7 @@ || defined(__ARM_ARCH_7M__) \ || defined(__ARM_ARCH_7S__) \ || defined(_ARM_ARCH_7) \ - || defined(__CORE_CORTEXA__) // GHS-specific for INTEGRITY + || defined(__CORE_CORTEXA__) # define Q_PROCESSOR_ARM 7 # elif defined(__ARM_ARCH_6__) \ || defined(__ARM_ARCH_6J__) \ |