Roll skia/third_party/skcms d7303797becf..4f682a1d0b94 (1 commits)
https://skia.googlesource.com/skcms.git/+log/d7303797becf..4f682a1d0b94
2019-06-25 mtklein@google.com Skip inlining clut() with GCC on more platforms.
The AutoRoll server is located here: https://autoroll.skia.org/r/skcms-skia-autoroll
Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md
If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.
CQ_INCLUDE_TRYBOTS=luci.chromium.try:linux-blink-rel
TBR=djsollen@google.com,mtklein@google.com
Change-Id: Icaa64c5cf48f031482ff91afca216984a8cb9983
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/223588
Reviewed-by: skia-autoroll <skia-autoroll@skia-public.iam.gserviceaccount.com>
Commit-Queue: skia-autoroll <skia-autoroll@skia-public.iam.gserviceaccount.com>
diff --git a/third_party/skcms/src/Transform_inl.h b/third_party/skcms/src/Transform_inl.h
index 799eda0..a8e8aa6 100644
--- a/third_party/skcms/src/Transform_inl.h
+++ b/third_party/skcms/src/Transform_inl.h
@@ -608,8 +608,9 @@
}
// GCC 7.2.0 hits an internal compiler error with -finline-functions (or -O3)
-// when targeting MIPS 64, I think attempting to inline clut() into exec_ops().
-#if 1 && defined(__GNUC__) && !defined(__clang__) && defined(__mips64)
+// when targeting MIPS 64, i386, or s390x, I think attempting to inline clut() into exec_ops().
+#if 1 && defined(__GNUC__) && !defined(__clang__) \
+ && (defined(__mips64) || defined(__i386) || defined(__s390x__))
#define MAYBE_NOINLINE __attribute__((noinline))
#else
#define MAYBE_NOINLINE
diff --git a/third_party/skcms/version.sha1 b/third_party/skcms/version.sha1
index 4b1279b..9fa67db 100755
--- a/third_party/skcms/version.sha1
+++ b/third_party/skcms/version.sha1
@@ -1 +1 @@
-d7303797becf75345b57800671aa1e559a718605
\ No newline at end of file
+4f682a1d0b94dc1f6adfee312d3d15b156ae5d61
\ No newline at end of file
