commit 57e818ae88b7e1e82e77ee05c5c277b41efd0587
author Brian Osman <brianosman@google.com> Tue Mar 16 13:07:32 2021 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Mar 16 18:40:16 2021 +0000
tree 5b49f0182d9debe00e78348ab83f2301bdd92e08
parent 4e5402c5697310dc507b53e0c6af16214a941cbb

Suppress psabi warning on Clang, too

... but not clang-cl, which doesn't know about this warning.

Change-Id: Ia230171a549ed2c3809027e9be5d60faffa02883
Reviewed-on: https://skia-review.googlesource.com/c/skcms/+/385376
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Weston Tracey <westont@google.com>

src/Transform_inl.h

diff --git a/src/Transform_inl.h b/src/Transform_inl.h
index 4ec175c..2d76010 100644
--- a/src/Transform_inl.h
+++ b/src/Transform_inl.h
@@ -63,11 +63,15 @@
     #pragma clang diagnostic ignored "-Wvector-conversion"
 #endif
 
-// GCC warns us about returning U64 on x86 because it's larger than a register.
+// GCC & Clang warn us about returning U64 on x86 because it's larger than a register.
 // You'd see warnings like, "using AVX even though AVX is not enabled".
 // We stifle these warnings... our helpers that return U64 are always inlined.
-#if defined(__SSE__) && defined(__GNUC__) && !defined(__clang__)
-    #pragma GCC diagnostic ignored "-Wpsabi"
+#if defined(__SSE__)
+    #if defined(__clang__) && !defined(_MSC_VER)
+        #pragma clang diagnostic ignored "-Wpsabi"
+    #elif defined(__GNUC__)
+        #pragma GCC diagnostic ignored "-Wpsabi"
+    #endif
 #endif
 
 #if defined(__clang__)