From 0c9b4c84ad0ce9e64b70af82075fb57942228d95 Mon Sep 17 00:00:00 2001 From: Erik Verbruggen Date: Wed, 25 Nov 2015 12:49:12 +0100 Subject: [PATCH] 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 --- src/corelib/global/qprocessordetection.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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