From: Mike Hommey <mh@glandium.org>
Date: Fri, 6 Dec 2019 23:32:14 +0000 (+0900)
Subject: Work around another GCC ICE on arm
X-Git-Tag: archive/raspbian/102.5.0esr-1+rpi1^2~19
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9798b9be5b80396d5ff014800254e2b055c8e116;p=firefox-esr.git

Work around another GCC ICE on arm


Gbp-Pq: Topic porting
Gbp-Pq: Name Work-around-another-GCC-ICE-on-arm.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 cfaae3ea361..604e10957f6 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(__mips__) || defined(__i386) || defined(__s390x__))
+      && (defined(__arm__) || defined(__aarch64__) || defined(__mips__) || defined(__i386) || defined(__s390x__))
     #define MAYBE_NOINLINE __attribute__((noinline))
 #else
     #define MAYBE_NOINLINE