From: Mike Hommey <mh@glandium.org>
Date: Fri, 12 Jul 2019 09:28:34 +0000 (+0900)
Subject: Work around GCC ICE on mips*, i386 and s390x
X-Git-Tag: archive/raspbian/78.6.0esr-1+rpi1^2~19
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=cc6341d2f469c4bbd08b0a9cf095bb2b58609804;p=firefox-esr.git

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
---

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 c4b312286a2..cfaae3ea361 100644
--- a/gfx/skia/skia/third_party/skcms/src/Transform_inl.h
+++ b/gfx/skia/skia/third_party/skcms/src/Transform_inl.h
@@ -685,7 +685,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, i386, or s390x,  I think attempting to inline clut() into exec_ops().
 #if 1 && defined(__GNUC__) && !defined(__clang__) \
-      && (defined(__mips64) || defined(__i386) || defined(__s390x__))
+      && (defined(__mips__) || defined(__i386) || defined(__s390x__))
     #define MAYBE_NOINLINE __attribute__((noinline))
 #else
     #define MAYBE_NOINLINE