commit 80e0493eab5f94b1c00ebae9e2351901ae7c9c11
author Mike Klein <mtklein@google.com> Fri Aug 31 12:07:57 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Aug 31 16:39:18 2018 +0000
tree 675f3a5e797d23397db49e1993e9f5e1412fa5cb
parent a6687f8b4d5190c346ed60f4c536039547e8f0d8

Clang added pragma attribute in 5.0

Don't build the extra HSW slice with Clang < 5.0.

Change-Id: I8c5b053c299a2904304843c2abd44f5ebf6aff6b
Reviewed-on: https://skia-review.googlesource.com/150966
Auto-Submit: Mike Klein <mtklein@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>

skcms.cc

diff --git a/skcms.cc b/skcms.cc
index 551c932..b7aaee4 100644
--- a/skcms.cc
+++ b/skcms.cc
@@ -1878,8 +1878,10 @@
 }
 
 // Now, instantiate any other versions of run_program() we may want for runtime detection.
-#if !defined(SKCMS_PORTABLE) && (defined(__clang__) || defined(__GNUC__)) \
-        && defined(__x86_64__) && !defined(__AVX2__)
+#if !defined(SKCMS_PORTABLE) &&                           \
+        (( defined(__clang__) && __clang_major__ >= 5) || \
+         (!defined(__clang__) && defined(__GNUC__)))      \
+     && defined(__x86_64__) && !defined(__AVX2__)
 
     #if defined(__clang__)
         #pragma clang attribute push(__attribute__((target("avx2,f16c"))), apply_to=function)