path: root/tools
diff options
authorThiago Macieira <>2014-06-24 17:03:53 -0700
committerThiago Macieira <>2014-07-25 17:48:39 +0200
commit86ac3a98b50a29882e896a0703ec9201e71fe989 (patch)
tree1b3fb36e1b221a1ff415b9a40ae190492b9bc3bf /tools
parent875ba6e80c9a70dd1fc0f6026f41450cb6fb8adb (diff)
Restore Neon "detection" in Qt
We don't actually detect whether the compiler can create Neon code or provides Neon intrinsics. Most of them do, so that test would be mostly moot. We removed the detection previously because we couldn't automatically enable Neon due to leakage of instructions outside the areas protected at runtime. Instead, we rely on the mkspec properly passing the necessary flags that enable Neon support. This commit does not change that. All it does is verify whether the arch detection found "neon" as part of the target CPU features. In other words, it moves the test that was in simd.prf to configure. It does fix the Neon detection in configure.exe, which was always failing for trying to run a test that didn't exist (config.tests/unix/neon). Change-Id: Id561dfb2db7d3dca7b8c29afef63181693bdc0aa Reviewed-by: Oswald Buddenhagen <>
Diffstat (limited to 'tools')
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 21bc896769..33531252bf 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -2280,7 +2280,7 @@ bool Configure::checkAvailability(const QString &part)
available = (platform() == QNX || platform() == BLACKBERRY)
&& tryCompileProject("unix/lgmon");
} else if (part == "NEON") {
- available = (dictionary["QT_ARCH"] == "arm") && tryCompileProject("unix/neon");
+ available = dictionary["QT_CPU_FEATURES"].contains("neon");
} else if (part == "FONT_CONFIG") {
available = tryCompileProject("unix/fontconfig");