From 4b6bd14063875167a018495373a978ca3f003229 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 23 Jan 2013 12:33:42 -0800 Subject: 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 --- src/corelib/tools/qsimd_p.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/corelib') 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 #endif -- cgit v1.2.3