summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorErik Verbruggen <erik.verbruggen@digia.com>2014-06-25 12:11:02 +0200
committerErik Verbruggen <erik.verbruggen@digia.com>2014-07-03 10:10:30 +0200
commit3fd2f0b7d8c5139eff9020062ed66c897eac32e7 (patch)
treeed896df906e163e23004596250ac176c253d83d8 /mkspecs
parentde1d5815c15ba1f944752cf7d441442efeb0accb (diff)
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 <oswald.buddenhagen@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/features/simd.prf1
1 files changed, 1 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