diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2013-01-23 12:33:42 -0800 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-01 00:48:16 +0100 |
commit | 4b6bd14063875167a018495373a978ca3f003229 (patch) | |
tree | 25fcba0f22312ff4936c7919b6c26370ee120b55 /src | |
parent | 29a78d48d0d3c162fad11b050cb50c951d4a484c (diff) |
Let ICC 13 build Qt again if the system compiler is GCC 4.7.
GCC 4.7 has new builtins in x86intrin.h that ICC 13 does not (yet)
understand, causing compilation errors.
/usr/lib/gcc/x86_64-redhat-linux/4.7.2/include/adxintrin.h(36): error: identifier "__builtin_ia32_addcarryx_u32" is undefined
Change-Id: I1845ccc3bf3ac15aef063bc3f998c5839fa51866
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/corelib/tools/qsimd_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/tools/qsimd_p.h b/src/corelib/tools/qsimd_p.h index 2d0e554de8..3f570c7a44 100644 --- a/src/corelib/tools/qsimd_p.h +++ b/src/corelib/tools/qsimd_p.h @@ -141,7 +141,8 @@ QT_BEGIN_HEADER #endif // other x86 intrinsics -#if defined(QT_COMPILER_SUPPORTS_AVX) && defined(Q_CC_GNU) +#if defined(QT_COMPILER_SUPPORTS_AVX) && defined(Q_CC_GNU) && \ + (!defined(Q_CC_INTEL) || (__GNUC__ * 100 + __GNUC_MINOR__ < 407)) #define QT_COMPILER_SUPPORTS_X86INTRIN #include <x86intrin.h> #endif |