From 466c1ec09d1648f6bf22e5173c7dbfaa34d48164 Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Fri, 12 Jul 2019 18:28:34 +0900 Subject: [PATCH] Work around GCC ICE on mips*, i386 and s390x Closes: #931757 Gbp-Pq: Topic porting Gbp-Pq: Name Work-around-GCC-ICE-on-mips-i386-and-s390x.patch --- gfx/skia/skia/third_party/skcms/src/Transform_inl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gfx/skia/skia/third_party/skcms/src/Transform_inl.h b/gfx/skia/skia/third_party/skcms/src/Transform_inl.h index 7407c2adc87..735852075ee 100644 --- a/gfx/skia/skia/third_party/skcms/src/Transform_inl.h +++ b/gfx/skia/skia/third_party/skcms/src/Transform_inl.h @@ -560,7 +560,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(). // s390x and i*86 also hit this with GCC 7.4 and -O2 -#if 1 && defined(__GNUC__) && !defined(__clang__) && (defined(__mips64) || defined(__s390x__) || defined(__i586__) || defined(__i486__) || defined(__i386__)) +#if 1 && defined(__GNUC__) && !defined(__clang__) && (defined(__mips__) || defined(__s390x__) || defined(__i586__) || defined(__i486__) || defined(__i386__)) #define MAYBE_NOINLINE __attribute__((noinline)) #else #define MAYBE_NOINLINE -- 2.30.2