Move the SSE2/AVX/Neon/etc. flags into the compiler mkspecs

This allows us to have different flags for the compilers for
supporting the same feature. For example, the official flag in GCC to
support AVX2 is -mavx2, but ICC does not support it (yet), requiring
-march=core-avx2 or -xCORE-AVX2. That flag, instead, enables support
for all the features that the "Core-AVX2" processor (codename Haswell)
will support. And clearly, the MSVC flags are different.

Change-Id: I33b6d8617520925e807747180a8dbaafd79b7a9a
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

8 files changed, 61 insertions, 0 deletions

diff --git a/mkspecs/common/clang.conf b/mkspecs/common/clang.conf
index 67fdf4c1f4..54ac56968b 100644
--- a/mkspecs/common/clang.conf
+++ b/mkspecs/common/clang.conf
@@ -18,3 +18,13 @@ QMAKE_CXXFLAGS_USE_PRECOMPILE    = $$QMAKE_CFLAGS_USE_PRECOMPILE
 
 QMAKE_CXXFLAGS_CXX11 = -std=c++11
 QMAKE_LFLAGS_CXX11   =
+
+QMAKE_CFLAGS_SSE2    += -msse2
+QMAKE_CFLAGS_SSE3    += -msse3
+QMAKE_CFLAGS_SSSE3   += -mssse3
+QMAKE_CFLAGS_SSE4_1  += -msse4.1
+QMAKE_CFLAGS_SSE4_2  += -msse4.2
+QMAKE_CFLAGS_AVX     += -mavx
+QMAKE_CFLAGS_AVX2    += -mavx2
+QMAKE_CFLAGS_IWMMXT  += -mcpu=iwmmxt
+QMAKE_CFLAGS_NEON    += -mfpu=neon
diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
index a944dd71a3..43ebc0ab3a 100644
--- a/mkspecs/common/gcc-base.conf
+++ b/mkspecs/common/gcc-base.conf
@@ -63,3 +63,13 @@ QMAKE_LFLAGS_DEBUG   +=
 QMAKE_LFLAGS_APP     +=
 QMAKE_LFLAGS_RELEASE +=
 QMAKE_LFLAGS_EXCEPTIONS_OFF +=
+
+QMAKE_CFLAGS_SSE2    += -msse2
+QMAKE_CFLAGS_SSE3    += -msse3
+QMAKE_CFLAGS_SSSE3   += -mssse3
+QMAKE_CFLAGS_SSE4_1  += -msse4.1
+QMAKE_CFLAGS_SSE4_2  += -msse4.2
+QMAKE_CFLAGS_AVX     += -mavx
+QMAKE_CFLAGS_AVX2    += -mavx2
+QMAKE_CFLAGS_IWMMXT  += -mcpu=iwmmxt
+QMAKE_CFLAGS_NEON    += -mfpu=neon
diff --git a/mkspecs/linux-icc/qmake.conf b/mkspecs/linux-icc/qmake.conf
index eb837254e1..5eb0650fbf 100644
--- a/mkspecs/linux-icc/qmake.conf
+++ b/mkspecs/linux-icc/qmake.conf
@@ -24,6 +24,14 @@ QMAKE_CFLAGS_STATIC_LIB	= $$QMAKE_CFLAGS_SHLIB
 QMAKE_CFLAGS_YACC	=
 QMAKE_CFLAGS_THREAD	= -D_REENTRANT
 
+QMAKE_CFLAGS_SSE2    += -xSSE2
+QMAKE_CFLAGS_SSE3    += -xSSE3
+QMAKE_CFLAGS_SSSE3   += -xSSSE3
+QMAKE_CFLAGS_SSE4_1  += -xSSE4.1
+QMAKE_CFLAGS_SSE4_2  += -xSSE4.2
+QMAKE_CFLAGS_AVX     += -xAVX
+QMAKE_CFLAGS_AVX2    += -xCORE-AVX2
+
 QMAKE_CXX		= icpc
 QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS
 QMAKE_CXXFLAGS_DEPS	= $$QMAKE_CFLAGS_DEPS
diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf
index 2d60d86a8f..1e98789d9d 100644
--- a/mkspecs/win32-g++/qmake.conf
+++ b/mkspecs/win32-g++/qmake.conf
@@ -26,6 +26,15 @@ QMAKE_CFLAGS_WARN_OFF	= -w
 QMAKE_CFLAGS_RELEASE	= -O2
 QMAKE_CFLAGS_DEBUG	= -g
 QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
+QMAKE_CFLAGS_SSE2       = -msse2
+QMAKE_CFLAGS_SSE3       = -msse3
+QMAKE_CFLAGS_SSSE3      = -mssse3
+QMAKE_CFLAGS_SSE4_1     = -msse4.1
+QMAKE_CFLAGS_SSE4_2     = -msse4.2
+QMAKE_CFLAGS_AVX        = -mavx
+QMAKE_CFLAGS_AVX2       = -mavx2
+QMAKE_CFLAGS_IWMMXT     = -mcpu=iwmmxt
+QMAKE_CFLAGS_NEON       = -mfpu=neon
 
 QMAKE_CXX		= g++
 QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS
diff --git a/mkspecs/win32-msvc11/qmake.conf b/mkspecs/win32-msvc11/qmake.conf
index 3c33182e8c..0603c10f0c 100644
--- a/mkspecs/win32-msvc11/qmake.conf
+++ b/mkspecs/win32-msvc11/qmake.conf
@@ -25,6 +25,13 @@ QMAKE_CFLAGS_DEBUG      = -Zi -MDd
 QMAKE_CFLAGS_YACC       =
 QMAKE_CFLAGS_LTCG       = -GL
 QMAKE_CFLAGS_MP         = -MP
+QMAKE_CFLAGS_SSE2       = -arch:SSE2
+QMAKE_CFLAGS_SSE3       = -arch:SSE2
+QMAKE_CFLAGS_SSSE3      = -arch:SSE2
+QMAKE_CFLAGS_SSE4_1     = -arch:SSE2
+QMAKE_CFLAGS_SSE4_2     = -arch:SSE2
+QMAKE_CFLAGS_AVX        = -arch:AVX
+QMAKE_CFLAGS_AVX2       = -arch:AVX
 
 QMAKE_CXX               = $$QMAKE_CC
 QMAKE_CXXFLAGS          = $$QMAKE_CFLAGS
diff --git a/mkspecs/win32-msvc2005/qmake.conf b/mkspecs/win32-msvc2005/qmake.conf
index 2467dbc163..e093ddfffb 100644
--- a/mkspecs/win32-msvc2005/qmake.conf
+++ b/mkspecs/win32-msvc2005/qmake.conf
@@ -24,6 +24,11 @@ QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -O2 -MD -Zi
 QMAKE_CFLAGS_DEBUG      = -Zi -MDd
 QMAKE_CFLAGS_YACC       =
 QMAKE_CFLAGS_LTCG       = -GL
+QMAKE_CFLAGS_SSE2       = -arch:SSE2
+QMAKE_CFLAGS_SSE3       = -arch:SSE2
+QMAKE_CFLAGS_SSSE3      = -arch:SSE2
+QMAKE_CFLAGS_SSE4_1     = -arch:SSE2
+QMAKE_CFLAGS_SSE4_2     = -arch:SSE2
 
 QMAKE_CXX               = $$QMAKE_CC
 QMAKE_CXXFLAGS          = $$QMAKE_CFLAGS
diff --git a/mkspecs/win32-msvc2008/qmake.conf b/mkspecs/win32-msvc2008/qmake.conf
index 72c9a9eaf6..71969ab6a2 100644
--- a/mkspecs/win32-msvc2008/qmake.conf
+++ b/mkspecs/win32-msvc2008/qmake.conf
@@ -25,6 +25,11 @@ QMAKE_CFLAGS_DEBUG      = -Zi -MDd
 QMAKE_CFLAGS_YACC       =
 QMAKE_CFLAGS_LTCG       = -GL
 QMAKE_CFLAGS_MP         = -MP
+QMAKE_CFLAGS_SSE2       = -arch:SSE2
+QMAKE_CFLAGS_SSE3       = -arch:SSE2
+QMAKE_CFLAGS_SSSE3      = -arch:SSE2
+QMAKE_CFLAGS_SSE4_1     = -arch:SSE2
+QMAKE_CFLAGS_SSE4_2     = -arch:SSE2
 
 QMAKE_CXX               = $$QMAKE_CC
 QMAKE_CXXFLAGS          = $$QMAKE_CFLAGS
diff --git a/mkspecs/win32-msvc2010/qmake.conf b/mkspecs/win32-msvc2010/qmake.conf
index c579257f63..9499cab729 100644
--- a/mkspecs/win32-msvc2010/qmake.conf
+++ b/mkspecs/win32-msvc2010/qmake.conf
@@ -25,6 +25,13 @@ QMAKE_CFLAGS_DEBUG      = -Zi -MDd
 QMAKE_CFLAGS_YACC       =
 QMAKE_CFLAGS_LTCG       = -GL
 QMAKE_CFLAGS_MP         = -MP
+QMAKE_CFLAGS_SSE2       = -arch:SSE2
+QMAKE_CFLAGS_SSE3       = -arch:SSE2
+QMAKE_CFLAGS_SSSE3      = -arch:SSE2
+QMAKE_CFLAGS_SSE4_1     = -arch:SSE2
+QMAKE_CFLAGS_SSE4_2     = -arch:SSE2
+QMAKE_CFLAGS_AVX        = -arch:AVX
+QMAKE_CFLAGS_AVX2       = -arch:AVX
 
 QMAKE_CXX               = $$QMAKE_CC
 QMAKE_CXXFLAGS          = $$QMAKE_CFLAGS