2 files changed, 52 insertions, 0 deletions
diff --git a/debian/patches/porting-ppc64el/Work-around-GCC-ICE-on-ppc64el.patch b/debian/patches/porting-ppc64el/Work-around-GCC-ICE-on-ppc64el.patch
new file mode 100644
index 0000000000..911ad79b63
--- /dev/null
+++ b/debian/patches/porting-ppc64el/Work-around-GCC-ICE-on-ppc64el.patch
@@ -0,0 +1,30 @@
+From: Mike Hommey <mh@glandium.org>
+Date: Tue, 11 Jul 2023 06:34:59 +0900
+Subject: Work around GCC ICE on ppc64el
+
+Cherry picked from firefox.
+---
+ gfx/skia/moz.build | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/gfx/skia/moz.build b/gfx/skia/moz.build
+index 1d92936..ac0e0b2 100644
+--- a/gfx/skia/moz.build
++++ b/gfx/skia/moz.build
+@@ -359,7 +359,15 @@ UNIFIED_SOURCES += [
+     'skia/src/sksl/SkSLConstantFolder.cpp',
+     'skia/src/sksl/SkSLContext.cpp',
+     'skia/src/sksl/SkSLErrorReporter.cpp',
+-    'skia/src/sksl/SkSLInliner.cpp',
++]
++
++# Work around https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110606
++if CONFIG['CC_TYPE'] == 'gcc' and CONFIG['CPU_ARCH'] == 'ppc64':
++    SOURCES += ['skia/src/sksl/SkSLInliner.cpp']
++else:
++    UNIFIED_SOURCES += ['skia/src/sksl/SkSLInliner.cpp']
++
++UNIFIED_SOURCES += [
+     'skia/src/sksl/SkSLIntrinsicList.cpp',
+     'skia/src/sksl/SkSLMangler.cpp',
+     'skia/src/sksl/SkSLModuleLoader.cpp',
diff --git a/debian/patches/porting-ppc64el/skia-Disable-musttail-on-ppc64el.patch b/debian/patches/porting-ppc64el/skia-Disable-musttail-on-ppc64el.patch
new file mode 100644
index 0000000000..9e06c27ff7
--- /dev/null
+++ b/debian/patches/porting-ppc64el/skia-Disable-musttail-on-ppc64el.patch
@@ -0,0 +1,22 @@
+From: Carsten Schoenert <c.schoenert@t-online.de>
+Date: Tue, 18 Jul 2023 16:20:51 +0200
+Subject: skia: Disable musttail on ppc64el
+
+Based on https://cgit.freebsd.org/ports/commit/?id=8efc1c41f45d0d7c7fe2b9c05128bd00db9c397d
+---
+ gfx/skia/skia/src/core/SkRasterPipeline.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gfx/skia/skia/src/core/SkRasterPipeline.h b/gfx/skia/skia/src/core/SkRasterPipeline.h
+index 766bb0c..88c6cb2 100644
+--- a/gfx/skia/skia/src/core/SkRasterPipeline.h
++++ b/gfx/skia/skia/src/core/SkRasterPipeline.h
+@@ -24,7 +24,7 @@ enum SkColorType : int;
+ struct SkImageInfo;
+ struct skcms_TransferFunction;
+ 
+-#if __has_cpp_attribute(clang::musttail) && !defined(__EMSCRIPTEN__) && !defined(SK_CPU_ARM32)
++#if __has_cpp_attribute(clang::musttail) && !defined(__EMSCRIPTEN__) && !defined(SK_CPU_ARM32) && !defined(__powerpc__)
+     #define SK_HAS_MUSTTAIL 1
+ #else
+     #define SK_HAS_MUSTTAIL 0