diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2014-01-22 15:18:57 -0800 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-01 00:58:58 +0100 |
| commit | 8930839acbfb5cbc231cc73cbbe2d1f83236fb58 (patch) | |
| tree | 28b80cf2f19376edeed9cde22e8de7cbb630c0e7 /mkspecs/features/simd.prf | |
| parent | 2c985e8048110fa0ba8ca36c015929d77545a254 (diff) | |
Update the macro that MSVC 2013 defines for AVX code generation
http://msdn.microsoft.com/en-us/library/b0084kay(v=vs.120).aspx says:
__AVX__ Defined when /arch:AVX is specified.
Now we know what flag it is, we don't need to use our _M_AVX flag
anymore. We're also now assuming that Microsoft will follow the same
pattern for AVX2 (i.e., __AVX2__), so this commit also removes the
check for _M_AVX2.
The other defines that were defined alongside AVX2 are removed because
they have no use currently in Qt.
Change-Id: I64a026b2206dbd0d2dffa7c803bee969c9b94a94
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'mkspecs/features/simd.prf')
| -rw-r--r-- | mkspecs/features/simd.prf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/features/simd.prf b/mkspecs/features/simd.prf index ad8c545819..a8ce097b64 100644 --- a/mkspecs/features/simd.prf +++ b/mkspecs/features/simd.prf @@ -289,7 +289,7 @@ QT_CPU_FEATURES = $$eval(QT_CPU_FEATURES.$$QT_ARCH) avx2 { HEADERS += $$AVX2_HEADERS - avx2_compiler.commands = $$QMAKE_CXX -c $(CXXFLAGS) -D_M_AVX2 + avx2_compiler.commands = $$QMAKE_CXX -c $(CXXFLAGS) !contains(QT_CPU_FEATURES, avx):avx2_compiler.commands += $$QMAKE_CFLAGS_AVX2 avx2_compiler.commands += $(INCPATH) ${QMAKE_FILE_IN} -Fo${QMAKE_FILE_OUT} avx2_compiler.dependency_type = TYPE_C |