From f10356ead13e39c9501b84ee5e92efe722a2d2c7 Mon Sep 17 00:00:00 2001
From: lpapuga <ljubomir.papuga@gmail.com>
Date: Wed, 20 Nov 2013 17:09:57 +0100
Subject: MIPS DSP build system fix and additional optimizations.

Changed MIPS DSP portion of the mkspecs/features/simd.prf file in order
to fix the corrupted build system for MIPS platforms.

List of the additionally optimized functions

from file src/gui/painting/qdrawhelper.cpp:
- qt_blend_rgb16_on_rgb16
- qt_fetchUntransformed_888
- qt_fetchUntransformed_444
- qt_fetchUntransformed_argb8565

from file src/gui/image/qimage.cpp:
- convert_ARGB_to_ARGB_PM_inplace

from file src/corelib/qstring.cpp:
- ucstrncmp
- toLatin1_helper
- fromLatin1_helper

Change-Id: I5c47a69784917eee29a8dbd2718828a390b27c93
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 mkspecs/features/simd.prf | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'mkspecs')

diff --git a/mkspecs/features/simd.prf b/mkspecs/features/simd.prf
index a98683d929..ad8c545819 100644
--- a/mkspecs/features/simd.prf
+++ b/mkspecs/features/simd.prf
@@ -174,10 +174,19 @@ QT_CPU_FEATURES = $$eval(QT_CPU_FEATURES.$$QT_ARCH)
         mips_dsp_assembler.name = assembling[mips_dsp] ${QMAKE_FILE_IN}
         silent:mips_dsp_assembler.commands = @echo assembling[mips_dsp] ${QMAKE_FILE_IN} && $$mips_dsp_assembler.commands
         QMAKE_EXTRA_COMPILERS += mips_dsp_compiler
+        QMAKE_EXTRA_COMPILERS += mips_dsp_assembler
     }
     mips_dspr2 {
         HEADERS += $$MIPS_DSP_HEADERS
 
+        mips_dspr2_compiler.commands = $$QMAKE_CXX -c
+        mips_dspr2_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
+        mips_dspr2_compiler.dependency_type = TYPE_C
+        mips_dspr2_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
+        mips_dspr2_compiler.input = MIPS_DSPR2_SOURCES
+        mips_dspr2_compiler.variable_out = OBJECTS
+        mips_dspr2_compiler.name = compiling[mips_dspr2] ${QMAKE_FILE_IN}
+        silent:mips_dspr2_compiler.commands = @echo compiling[mips_dspr2] ${QMAKE_FILE_IN} && $$mips_dspr2_compiler.commands
         mips_dspr2_assembler.commands = $$QMAKE_CC -c
         mips_dspr2_assembler.commands += $(CFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
         mips_dspr2_assembler.dependency_type = TYPE_C
@@ -186,6 +195,7 @@ QT_CPU_FEATURES = $$eval(QT_CPU_FEATURES.$$QT_ARCH)
         mips_dspr2_assembler.variable_out = OBJECTS
         mips_dspr2_assembler.name = assembling[mips_dspr2] ${QMAKE_FILE_IN}
         silent:mips_dspr2_assembler.commands = @echo assembling[mips_dspr2] ${QMAKE_FILE_IN} && $$mips_dspr2_assembler.commands
+        QMAKE_EXTRA_COMPILERS += mips_dspr2_compiler
         QMAKE_EXTRA_COMPILERS += mips_dspr2_assembler
     }
 } else:win32-msvc*|winrt {
@@ -297,7 +307,7 @@ QT_CPU_FEATURES = $$eval(QT_CPU_FEATURES.$$QT_ARCH)
         $$AVX_SOURCES $$AVX2_SOURCES \
         $$NEON_SOURCES $$NEON_ASM \
         $$IWMMXT_SOURCES \
-        $$MIPS_DSP_SOURCES $$MIPS_DSP_ASM $$MIPS_DSPR2_ASM
+        $$MIPS_DSP_SOURCES $$MIPS_DSPR2_SOURCES $$MIPS_DSP_ASM $$MIPS_DSPR2_ASM
 
     # Headers are already done in the above sections.
 }
-- 
cgit v1.2.3