www/firefox-esr: unbreak on powerpc64 after r472833

In file included from objdir/js/src/Unified_cpp_js_src41.cpp:2:
js/src/wasm/WasmSignalHandlers.cpp: In function 'uint8_t** ContextToPC(ucontext_t*)':
js/src/wasm/WasmSignalHandlers.cpp:439:19: error: 'R32_sig' was not declared in this scope
 #define PC_sig(p) R32_sig(p)
                   ^~~~~~~
js/src/wasm/WasmSignalHandlers.cpp:450:39: note: in expansion of macro 'PC_sig'
   return reinterpret_cast<uint8_t**>(&PC_sig(context));
                                       ^~~~~~
js/src/wasm/WasmSignalHandlers.cpp:439:19: note: suggested alternative: 'R12_sig'
 #define PC_sig(p) R32_sig(p)
                   ^~~~~~~
js/src/wasm/WasmSignalHandlers.cpp:450:39: note: in expansion of macro 'PC_sig'
   return reinterpret_cast<uint8_t**>(&PC_sig(context));
                                       ^~~~~~

Reported by:	pkg-fallout

4 files changed, 160 insertions, 0 deletions

diff --git a/mail/thunderbird/files/patch-bug1532851 b/mail/thunderbird/files/patch-bug1532851
new file mode 100644
index 000000000000..a13b0ff125eb
--- /dev/null
+++ b/mail/thunderbird/files/patch-bug1532851
@@ -0,0 +1,40 @@
+diff --git js/src/wasm/WasmSignalHandlers.cpp js/src/wasm/WasmSignalHandlers.cpp
+index fc49f361d82a..636537f84786 100644
+--- js/src/wasm/WasmSignalHandlers.cpp
++++ js/src/wasm/WasmSignalHandlers.cpp
+@@ -102,6 +102,11 @@ using mozilla::DebugOnly;
+ #define EPC_sig(p) ((p)->sc_pc)
+ #define RFP_sig(p) ((p)->sc_regs[30])
+ #endif
++#if defined(__ppc64__) || defined(__PPC64__) || defined(__ppc64le__) || \
++    defined(__PPC64LE__)
++#define R01_sig(p) ((p)->sc_frame.fixreg[1])
++#define R32_sig(p) ((p)->sc_frame.srr0)
++#endif
+ #elif defined(__linux__) || defined(__sun)
+ #if defined(__linux__)
+ #define EIP_sig(p) ((p)->uc_mcontext.gregs[REG_EIP])
+@@ -169,6 +174,11 @@ using mozilla::DebugOnly;
+ #define EPC_sig(p) ((p)->uc_mcontext.__gregs[_REG_EPC])
+ #define RFP_sig(p) ((p)->uc_mcontext.__gregs[_REG_S8])
+ #endif
++#if defined(__ppc64__) || defined(__PPC64__) || defined(__ppc64le__) || \
++    defined(__PPC64LE__)
++#define R01_sig(p) ((p)->uc_mcontext.__gregs[_REG_R1])
++#define R32_sig(p) ((p)->uc_mcontext.__gregs[_REG_PC])
++#endif
+ #elif defined(__DragonFly__) || defined(__FreeBSD__) || \
+     defined(__FreeBSD_kernel__)
+ #define EIP_sig(p) ((p)->uc_mcontext.mc_eip)
+@@ -197,6 +207,11 @@ using mozilla::DebugOnly;
+ #if defined(__FreeBSD__) && defined(__mips__)
+ #define EPC_sig(p) ((p)->uc_mcontext.mc_pc)
+ #define RFP_sig(p) ((p)->uc_mcontext.mc_regs[30])
++#endif
++#if defined(__FreeBSD__) && (defined(__ppc64__) || defined(__PPC64__) || \
++                             defined(__ppc64le__) || defined(__PPC64LE__))
++#define R01_sig(p) ((p)->uc_mcontext.mc_gpr[1])
++#define R32_sig(p) ((p)->uc_mcontext.mc_srr0)
+ #endif
+ #elif defined(XP_DARWIN)
+ #define EIP_sig(p) ((p)->thread.uts.ts32.__eip)
diff --git a/www/cliqz/files/patch-bug1532851 b/www/cliqz/files/patch-bug1532851
new file mode 100644
index 000000000000..5327db441be6
--- /dev/null
+++ b/www/cliqz/files/patch-bug1532851
@@ -0,0 +1,40 @@
+diff --git js/src/wasm/WasmSignalHandlers.cpp js/src/wasm/WasmSignalHandlers.cpp
+index fc49f361d82a..636537f84786 100644
+--- mozilla-release/js/src/wasm/WasmSignalHandlers.cpp
++++ mozilla-release/js/src/wasm/WasmSignalHandlers.cpp
+@@ -94,6 +94,11 @@ using mozilla::DebugOnly;
+ #  define EPC_sig(p) ((p)->sc_pc)
+ #  define RFP_sig(p) ((p)->sc_regs[30])
+ # endif
++# if defined(__ppc64__) || defined(__PPC64__) || defined(__ppc64le__) || \
++    defined(__PPC64LE__)
++#  define R01_sig(p) ((p)->sc_frame.fixreg[1])
++#  define R32_sig(p) ((p)->sc_frame.srr0)
++# endif
+ #elif defined(__linux__) || defined(__sun)
+ # if defined(__linux__)
+ #  define EIP_sig(p) ((p)->uc_mcontext.gregs[REG_EIP])
+@@ -161,6 +166,11 @@ using mozilla::DebugOnly;
+ #  define EPC_sig(p) ((p)->uc_mcontext.__gregs[_REG_EPC])
+ #  define RFP_sig(p) ((p)->uc_mcontext.__gregs[_REG_S8])
+ # endif
++# if defined(__ppc64__) || defined(__PPC64__) || defined(__ppc64le__) || \
++    defined(__PPC64LE__)
++#  define R01_sig(p) ((p)->uc_mcontext.__gregs[_REG_R1])
++#  define R32_sig(p) ((p)->uc_mcontext.__gregs[_REG_PC])
++# endif
+ #elif defined(__DragonFly__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ # define EIP_sig(p) ((p)->uc_mcontext.mc_eip)
+ # define EBP_sig(p) ((p)->uc_mcontext.mc_ebp)
+@@ -188,6 +198,11 @@ using mozilla::DebugOnly;
+ # if defined(__FreeBSD__) && defined(__mips__)
+ #  define EPC_sig(p) ((p)->uc_mcontext.mc_pc)
+ #  define RFP_sig(p) ((p)->uc_mcontext.mc_regs[30])
++# endif
++# if defined(__FreeBSD__) && (defined(__ppc64__) || defined(__PPC64__) || \
++                              defined(__ppc64le__) || defined(__PPC64LE__))
++#  define R01_sig(p) ((p)->uc_mcontext.mc_gpr[1])
++#  define R32_sig(p) ((p)->uc_mcontext.mc_srr0)
+ # endif
+ #elif defined(XP_DARWIN)
+ # define EIP_sig(p) ((p)->thread.uts.ts32.__eip)
diff --git a/www/firefox-esr/files/patch-bug1532851 b/www/firefox-esr/files/patch-bug1532851
new file mode 100644
index 000000000000..a13b0ff125eb
--- /dev/null
+++ b/www/firefox-esr/files/patch-bug1532851
@@ -0,0 +1,40 @@
+diff --git js/src/wasm/WasmSignalHandlers.cpp js/src/wasm/WasmSignalHandlers.cpp
+index fc49f361d82a..636537f84786 100644
+--- js/src/wasm/WasmSignalHandlers.cpp
++++ js/src/wasm/WasmSignalHandlers.cpp
+@@ -102,6 +102,11 @@ using mozilla::DebugOnly;
+ #define EPC_sig(p) ((p)->sc_pc)
+ #define RFP_sig(p) ((p)->sc_regs[30])
+ #endif
++#if defined(__ppc64__) || defined(__PPC64__) || defined(__ppc64le__) || \
++    defined(__PPC64LE__)
++#define R01_sig(p) ((p)->sc_frame.fixreg[1])
++#define R32_sig(p) ((p)->sc_frame.srr0)
++#endif
+ #elif defined(__linux__) || defined(__sun)
+ #if defined(__linux__)
+ #define EIP_sig(p) ((p)->uc_mcontext.gregs[REG_EIP])
+@@ -169,6 +174,11 @@ using mozilla::DebugOnly;
+ #define EPC_sig(p) ((p)->uc_mcontext.__gregs[_REG_EPC])
+ #define RFP_sig(p) ((p)->uc_mcontext.__gregs[_REG_S8])
+ #endif
++#if defined(__ppc64__) || defined(__PPC64__) || defined(__ppc64le__) || \
++    defined(__PPC64LE__)
++#define R01_sig(p) ((p)->uc_mcontext.__gregs[_REG_R1])
++#define R32_sig(p) ((p)->uc_mcontext.__gregs[_REG_PC])
++#endif
+ #elif defined(__DragonFly__) || defined(__FreeBSD__) || \
+     defined(__FreeBSD_kernel__)
+ #define EIP_sig(p) ((p)->uc_mcontext.mc_eip)
+@@ -197,6 +207,11 @@ using mozilla::DebugOnly;
+ #if defined(__FreeBSD__) && defined(__mips__)
+ #define EPC_sig(p) ((p)->uc_mcontext.mc_pc)
+ #define RFP_sig(p) ((p)->uc_mcontext.mc_regs[30])
++#endif
++#if defined(__FreeBSD__) && (defined(__ppc64__) || defined(__PPC64__) || \
++                             defined(__ppc64le__) || defined(__PPC64LE__))
++#define R01_sig(p) ((p)->uc_mcontext.mc_gpr[1])
++#define R32_sig(p) ((p)->uc_mcontext.mc_srr0)
+ #endif
+ #elif defined(XP_DARWIN)
+ #define EIP_sig(p) ((p)->thread.uts.ts32.__eip)
diff --git a/www/firefox/files/patch-bug1532851 b/www/firefox/files/patch-bug1532851
new file mode 100644
index 000000000000..a13b0ff125eb
--- /dev/null
+++ b/www/firefox/files/patch-bug1532851
@@ -0,0 +1,40 @@
+diff --git js/src/wasm/WasmSignalHandlers.cpp js/src/wasm/WasmSignalHandlers.cpp
+index fc49f361d82a..636537f84786 100644
+--- js/src/wasm/WasmSignalHandlers.cpp
++++ js/src/wasm/WasmSignalHandlers.cpp
+@@ -102,6 +102,11 @@ using mozilla::DebugOnly;
+ #define EPC_sig(p) ((p)->sc_pc)
+ #define RFP_sig(p) ((p)->sc_regs[30])
+ #endif
++#if defined(__ppc64__) || defined(__PPC64__) || defined(__ppc64le__) || \
++    defined(__PPC64LE__)
++#define R01_sig(p) ((p)->sc_frame.fixreg[1])
++#define R32_sig(p) ((p)->sc_frame.srr0)
++#endif
+ #elif defined(__linux__) || defined(__sun)
+ #if defined(__linux__)
+ #define EIP_sig(p) ((p)->uc_mcontext.gregs[REG_EIP])
+@@ -169,6 +174,11 @@ using mozilla::DebugOnly;
+ #define EPC_sig(p) ((p)->uc_mcontext.__gregs[_REG_EPC])
+ #define RFP_sig(p) ((p)->uc_mcontext.__gregs[_REG_S8])
+ #endif
++#if defined(__ppc64__) || defined(__PPC64__) || defined(__ppc64le__) || \
++    defined(__PPC64LE__)
++#define R01_sig(p) ((p)->uc_mcontext.__gregs[_REG_R1])
++#define R32_sig(p) ((p)->uc_mcontext.__gregs[_REG_PC])
++#endif
+ #elif defined(__DragonFly__) || defined(__FreeBSD__) || \
+     defined(__FreeBSD_kernel__)
+ #define EIP_sig(p) ((p)->uc_mcontext.mc_eip)
+@@ -197,6 +207,11 @@ using mozilla::DebugOnly;
+ #if defined(__FreeBSD__) && defined(__mips__)
+ #define EPC_sig(p) ((p)->uc_mcontext.mc_pc)
+ #define RFP_sig(p) ((p)->uc_mcontext.mc_regs[30])
++#endif
++#if defined(__FreeBSD__) && (defined(__ppc64__) || defined(__PPC64__) || \
++                             defined(__ppc64le__) || defined(__PPC64LE__))
++#define R01_sig(p) ((p)->uc_mcontext.mc_gpr[1])
++#define R32_sig(p) ((p)->uc_mcontext.mc_srr0)
+ #endif
+ #elif defined(XP_DARWIN)
+ #define EIP_sig(p) ((p)->thread.uts.ts32.__eip)