From 85f28ac094883e20d31775cba258b7e2a333866c Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Mon, 1 Jul 2019 07:10:36 -0600 Subject: [PATCH 2/2] Fix ARM skia ICE --- chromium/third_party/skia/third_party/skcms/src/Transform_inl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chromium/third_party/skia/third_party/skcms/src/Transform_inl.h b/chromium/third_party/skia/third_party/skcms/src/Transform_inl.h index 9a69fcf1b90..ffb1aaac1f8 100644 --- a/chromium/third_party/skia/third_party/skcms/src/Transform_inl.h +++ b/chromium/third_party/skia/third_party/skcms/src/Transform_inl.h @@ -559,7 +559,7 @@ SI void sample_clut_16(const skcms_A2B* a2b, I32 ix, F* r, F* g, F* b) { // 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) +#if 1 && defined(__GNUC__) && !defined(__clang__) && (defined(__mips64) || defined(__arm__)) #define MAYBE_NOINLINE __attribute__((noinline)) #else #define MAYBE_NOINLINE -- 2.21.0