diff options
| -rw-r--r-- | mkspecs/features/simd.prf | 1 | ||||
| -rw-r--r-- | src/gui/painting/painting.pri | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/mkspecs/features/simd.prf b/mkspecs/features/simd.prf index fc336f9326..f9c7486317 100644 --- a/mkspecs/features/simd.prf +++ b/mkspecs/features/simd.prf @@ -132,6 +132,7 @@ gcc { # includes intel_icc and clang variants neon_assembler.commands = $$QMAKE_CC -c $(CFLAGS) !contains(QT_CPU_FEATURES, neon):neon_assembler.commands += $$QMAKE_CFLAGS_NEON neon_assembler.commands += $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} + clang:no_clang_integrated_as:neon_assembler.commands += -fno-integrated-as neon_assembler.dependency_type = TYPE_C neon_assembler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)} neon_assembler.input = NEON_ASM diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri index ed45b8ea17..bc4b2f27d8 100644 --- a/src/gui/painting/painting.pri +++ b/src/gui/painting/painting.pri @@ -98,6 +98,7 @@ contains(QT_CPU_FEATURES.$$QT_ARCH, sse2) { IWMMXT_SOURCES += painting/qdrawhelper_iwmmxt.cpp !ios:contains(QT_CPU_FEATURES.$$QT_ARCH, neon) { + CONFIG += no_clang_integrated_as SOURCES += painting/qdrawhelper_neon.cpp HEADERS += painting/qdrawhelper_neon_p.h NEON_ASM += ../3rdparty/pixman/pixman-arm-neon-asm.S painting/qdrawhelper_neon_asm.S |