path: root/mkspecs
diff options
authorJanne Koskinen <>2018-12-21 10:25:21 +0100
committerJani Heikkinen <>2019-01-25 11:15:04 +0000
commit63891267c1fe2e483fa305de9102891448c52981 (patch)
treeeac811ceefd8b8f77af630ec79dacf54c15fc26d /mkspecs
parentf8f96d0fa1845365a1a7f1cd8be235fb1a625be8 (diff)
Disable NEON flags from Integrity compiler
Integrity assembler doesn't understand NEON assembly statements. Compiler enables _ARM_NEON_ and _ARM_NEON to indicate that NEON intrinsics are available. _ARM_NEON_ and _ARM_NEON needs to be disabled to skip handwritten assembly code paths in Qt.Auto- vectorization is enabled without the flags enabled. Task-number: QTBUG-72716 Change-Id: I84cfbf98bd2af47740a79f4b300c1801017ee22c Reviewed-by: Tuukka Turunen <> Reviewed-by: Kimmo Ollila <> Reviewed-by: Timo Aarnipuro <> Reviewed-by: Allan Sandfeld Jensen <>
Diffstat (limited to 'mkspecs')
1 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/common/ghs-integrity-armv8.conf b/mkspecs/common/ghs-integrity-armv8.conf
index e454cfd245..ee4ce458de 100644
--- a/mkspecs/common/ghs-integrity-armv8.conf
+++ b/mkspecs/common/ghs-integrity-armv8.conf
@@ -17,8 +17,8 @@ os_directory = $$(INTEGRITY_DIR)
isEmpty(os_directory): \
error("This qmakespec requires $INTEGRITY_DIR to be set")
-QMAKE_CC = cxintarm64 -bsp $$bsp_name -os_dir $$os_directory -non_shared
-QMAKE_CXX = cxintarm64 -bsp $$bsp_name -os_dir $$os_directory -non_shared
+QMAKE_CC = cxintarm64 -U__ARM_NEON__ -U__ARM_NEON -bsp $$bsp_name -os_dir $$os_directory -non_shared
+QMAKE_CXX = cxintarm64 -U__ARM_NEON__ -U__ARM_NEON -bsp $$bsp_name -os_dir $$os_directory -non_shared
QMAKE_AR = $$QMAKE_CXX -archive -o