diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2021-10-12 13:39:37 -0700 |
---|---|---|
committer | Thiago Macieira <thiago.macieira@intel.com> | 2021-10-13 12:49:49 -0700 |
commit | cb0ea3989598a83b2326f63e7da1669018a965e5 (patch) | |
tree | 7c2a85ef1ad971e2e653b986457117bf95e25c55 /cmake/QtCompilerOptimization.cmake | |
parent | 63d80c7c4b23b5802f1f20e6b322ccf4cdff5b12 (diff) |
CMake: remove support for building Qt with the old Intel compiler
This hasn't worked for some time. It's not in our CI and I don't think
it was working at all. When I tried to build it, I ran into several
problems with C++17 and an Internal Compiler Error I did not have any
interest in working around.
After discussing with the Intel compiler team, it was decided that
fixing those issues in the old compiler is not going to happen. Instead,
their recommendation is to adopt the new LLVM-based compiler, which
the last commit added support for.
This commit does not remove qmake support for the old ICC. It's possible
someone is using qmake with a non-Qt6 project and ICC.
Change-Id: Icb2516126f674e7b8bb3fffd16ad6350ddbd49e5
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake/QtCompilerOptimization.cmake')
-rw-r--r-- | cmake/QtCompilerOptimization.cmake | 56 |
1 files changed, 1 insertions, 55 deletions
diff --git a/cmake/QtCompilerOptimization.cmake b/cmake/QtCompilerOptimization.cmake index 69029a59de..f2ae3c3143 100644 --- a/cmake/QtCompilerOptimization.cmake +++ b/cmake/QtCompilerOptimization.cmake @@ -85,50 +85,6 @@ if (winrt) # FIXME: Correct variable set(QT_CFLAGS_SHANI "-arch:SSE2") endif() -if (ICC) - if (MSVC) - set(QT_CFLAGS_SSE2 "-QxSSE2") - set(QT_CFLAGS_SSE3 "-QxSSE3") - set(QT_CFLAGS_SSSE3 "-QxSSSE3") - set(QT_CFLAGS_SSE4_1 "-QxSSE4.1") - set(QT_CFLAGS_SSE4_2 "-QxSSE4.2") - set(QT_CFLAGS_AVX "-QxAVX") - set(QT_CFLAGS_AVX2 "-QxCORE-AVX2") - set(QT_CFLAGS_AVX512F "-QxCOMMON-AVX512") - set(QT_CFLAGS_AVX512CD "-QxCOMMON-AVX512") - set(QT_CFLAGS_AVX512ER "-QxMIC-AVX512") - set(QT_CFLAGS_AVX512PF "-QxMIC-AVX512") - set(QT_CFLAGS_AVX512DQ "-QxCORE-AVX512") - set(QT_CFLAGS_AVX512BW "-QxCORE-AVX512") - set(QT_CFLAGS_AVX512VL "-QxCORE-AVX512") - set(QT_CFLAGS_F16C "${QT_CFLAGS_AVX2}") - set(QT_CFLAGS_AESNI "-QxSSE2") - set(QT_CFLAGS_RDRND "") - set(QT_CFLAGS_RDSEED "") - set(QT_CFLAGS_SHANI "-QxSSE4.2") - else() - set(QT_CFLAGS_SSE2 "-msse2") - set(QT_CFLAGS_SSE3 "-msse3") - set(QT_CFLAGS_SSSE3 "-mssse3") - set(QT_CFLAGS_SSE4_1 "-msse4.1") - set(QT_CFLAGS_SSE4_2 "-msse4.2") - set(QT_CFLAGS_AVX "-march=core-avx") - set(QT_CFLAGS_AVX2 "-march=core-avx2") - set(QT_CFLAGS_AVX512F "-march=broadwell -xCOMMON-AVX512") - set(QT_CFLAGS_AVX512CD "-march=broadwell -xCOMMON-AVX512") - set(QT_CFLAGS_AVX512ER "-march=knl") - set(QT_CFLAGS_AVX512PF "-march=knl") - set(QT_CFLAGS_AVX512DQ "-march=skylake-avx512") - set(QT_CFLAGS_AVX512BW "-march=skylake-avx512") - set(QT_CFLAGS_AVX512VL "-march=skylake-avx512") - set(QT_CFLAGS_AESNI "-maes") - set(QT_CFLAGS_F16C "${QT_CFLAGS_AVX2}") - set(QT_CFLAGS_RDRND "-mrdrnd") - set(QT_CFLAGS_RDSEED "-mrdseed") - set(QT_CFLAGS_SHANI "-msha") - endif() -endif() - # Fall through is important, so that more specific flags that might be missing are set by the # previous base cases. # This mirrors qmake's mkspecs QMAKE_CFLAGS_OPTIMIZE assignments (mostly). @@ -148,7 +104,7 @@ if(GCC OR CLANG AND NOT WASM) endif() # Flags that CMake might set, aka flags the compiler would see as valid values. -if(GCC OR CLANG OR QCC OR ICC) +if(GCC OR CLANG OR QCC) set(QT_CFLAGS_OPTIMIZE_VALID_VALUES "-O0" "-O1" "-O2" "-O3" "-Os" "-Oz") endif() @@ -184,16 +140,6 @@ if (QCC) set(QT_CFLAGS_OPTIMIZE_FULL "-O3") endif() -if(ICC) - if(MSVC) - set(QT_CFLAGS_OPTIMIZE_FULL "-O3") - else() - # Should inherit gcc base - set(QT_CFLAGS_OPTIMIZE "-O2") - set(QT_CFLAGS_OPTIMIZE_SIZE "-Os") - endif() -endif() - if(WASM) set(QT_CFLAGS_OPTIMIZE "-O2") set(QT_CFLAGS_OPTIMIZE_FULL "-O3") |