diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-11-13 12:53:29 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-12-20 13:50:54 +0100 |
| commit | 5b448471ea7173afd44dcd98ed8e9a60cf42968f (patch) | |
| tree | 6c8f23b4e0eb068117678a0002fc2aaa0a89c4a1 | |
| parent | 35615c8e96c7a4866f8388be0e2e0d45bb130dcc (diff) | |
| download | qtwebengine-chromium-5b448471ea7173afd44dcd98ed8e9a60cf42968f.tar.gz | |
Fix building skcms with intel cc
Change-Id: I25a4e5185566a542e909971c8479cc053ac457a1
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| -rw-r--r-- | chromium/third_party/skia/third_party/skcms/skcms.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chromium/third_party/skia/third_party/skcms/skcms.cc b/chromium/third_party/skia/third_party/skcms/skcms.cc index 835478a6cc1..7884174a68c 100644 --- a/chromium/third_party/skia/third_party/skcms/skcms.cc +++ b/chromium/third_party/skia/third_party/skcms/skcms.cc @@ -1840,7 +1840,7 @@ typedef enum { // First, instantiate our default exec_ops() implementation using the default compiliation target. namespace baseline { -#if defined(SKCMS_PORTABLE) || !(defined(__clang__) || defined(__GNUC__)) +#if defined(SKCMS_PORTABLE) || defined(__INTEL_COMPILER) || !(defined(__clang__) || defined(__GNUC__)) #define N 1 using F = float; using U64 = uint64_t; @@ -1883,7 +1883,7 @@ namespace baseline { #if !defined(SKCMS_PORTABLE) && \ (( defined(__clang__) && __clang_major__ >= 5) || \ (!defined(__clang__) && defined(__GNUC__))) \ - && defined(__x86_64__) && !defined(__AVX2__) + && defined(__x86_64__) && !defined(__AVX2__) && !defined(__INTEL_COMPILER) #if defined(__clang__) #pragma clang attribute push(__attribute__((target("avx2,f16c"))), apply_to=function) |