From 3fd2f0b7d8c5139eff9020062ed66c897eac32e7 Mon Sep 17 00:00:00 2001 From: Erik Verbruggen Date: Wed, 25 Jun 2014 12:11:02 +0200 Subject: ARM: do not use the clang integrated assembler in some cases. The integrated assembler of clang does not understand some/all of the ARM macro assembler syntax used in pixman-arm-neon-asm.S. By default, this integrated assembler is used when using the "clang" command as a driver. This patch turns off the integrated assembler of clang for that file. Change-Id: Ic06801266b5a4b097ca835d815bcc5d5fc672946 Reviewed-by: Oswald Buddenhagen Reviewed-by: Thiago Macieira --- src/gui/painting/painting.pri | 1 + 1 file changed, 1 insertion(+) (limited to 'src') 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 -- cgit v1.2.3