diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-10-18 09:57:36 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-18 15:41:15 (GMT) |
| commit | 8fced55b717b7659866e268ab4a09ccb8bec2841 (patch) | |
| tree | 24e9d2a5d6fe6601e944d0062b19a29dbb50f95f | |
| parent | cf851c8577e796edac462fe3e060e80b11ec025f (diff) | |
| download | Qt-8fced55b717b7659866e268ab4a09ccb8bec2841.zip Qt-8fced55b717b7659866e268ab4a09ccb8bec2841.tar.gz Qt-8fced55b717b7659866e268ab4a09ccb8bec2841.tar.bz2 | |
correctly fix compilation of NEON_ASM sources
This reverts commit 7a6cee83e15ab8e0b84603d100cafda7a592b126, as
assembler files in SOURCES break compiling with -pch, as we don't create
a respective PCH.
instead, compile assembler code with QMAKE_CC, not QMAKE_CXX.
the reason why this change is needed in the first place is not clear to
me, but i guess that CXX defines some c++-related macros when
preprocessing the file, which breaks further down the line. this is
counter-intuitive, as the g++ frontend should treat the same sources the
same way as the gcc frontend (differences should be limited the the ld
invocation).
(partial cherry-pick from qtbase/77196b9dc3caa7dda1072a64ed953bf7231b1af3)
Task-number: QTBUG-29765
Change-Id: Ic0116b3a5fa621f12ac41cadf3062ff00b538e85
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| -rw-r--r-- | src/gui/gui.pro | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/gui/gui.pro b/src/gui/gui.pro index 5a9e57c..63e3ccd 100644 --- a/src/gui/gui.pro +++ b/src/gui/gui.pro @@ -63,7 +63,6 @@ symbian { neon:if(*-g++*|*-qcc*) { DEFINES += QT_HAVE_NEON HEADERS += $$NEON_HEADERS - SOURCES += $$NEON_ASM neon_compiler.commands = $$QMAKE_CXX -c neon_compiler.commands += $(CXXFLAGS) -mfpu=neon $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} @@ -73,7 +72,15 @@ neon:if(*-g++*|*-qcc*) { neon_compiler.variable_out = OBJECTS neon_compiler.name = compiling[neon] ${QMAKE_FILE_IN} silent:neon_compiler.commands = @echo compiling[neon] ${QMAKE_FILE_IN} && $$neon_compiler.commands - QMAKE_EXTRA_COMPILERS += neon_compiler + neon_assembler.commands = $$QMAKE_CC -c + neon_assembler.commands += $(CFLAGS) -mfpu=neon $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} + 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 + neon_assembler.variable_out = OBJECTS + neon_assembler.name = assembling[neon] ${QMAKE_FILE_IN} + silent:neon_assembler.commands = @echo assembling[neon] ${QMAKE_FILE_IN} && $$neon_assembler.commands + QMAKE_EXTRA_COMPILERS += neon_compiler neon_assembler } win32:!contains(QT_CONFIG, directwrite) { |