--- a/mozilla-s390-context.patch	Mon Oct 17 21:08:02 2022 +0200
+++ b/mozilla-s390-context.patch	Tue Nov 15 15:11:07 2022 +0100
@@ -3,21 +3,21 @@
 # Date 1558452408 -7200
 #      Tue May 21 17:26:48 2019 +0200
 # Node ID 602e92722e765a3c238d3b96b26c0c8063b5eeb4
-# Parent  136e1f2c44a3099b3e49a576fa62c8ad77aa431e
+# Parent  263ccc06617bef4b8ef891eec54995190d5d5df3
 [mq]: mozilla-s390-context.patch
 
 diff --git a/js/src/wasm/WasmSignalHandlers.cpp b/js/src/wasm/WasmSignalHandlers.cpp
 --- a/js/src/wasm/WasmSignalHandlers.cpp
 +++ b/js/src/wasm/WasmSignalHandlers.cpp
-@@ -157,16 +157,20 @@ using mozilla::DebugOnly;
- #      define R32_sig(p) ((p)->uc_mcontext.gp_regs[32])
- #    endif
- #    if defined(__linux__) && defined(__loongarch__)
- #      define EPC_sig(p) ((p)->uc_mcontext.pc)
- #      define RRA_sig(p) ((p)->uc_mcontext.gregs[1])
+@@ -163,16 +163,20 @@ using mozilla::DebugOnly;
  #      define RSP_sig(p) ((p)->uc_mcontext.gregs[3])
  #      define RFP_sig(p) ((p)->uc_mcontext.gregs[22])
  #    endif
+ #    if defined(__sun__) && defined(__sparc__)
+ #      define PC_sig(p) ((p)->uc_mcontext.gregs[REG_PC])
+ #      define FP_sig(p) ((p)->uc_mcontext.gregs[REG_FPRS])
+ #      define SP_sig(p) ((p)->uc_mcontext.gregs[REG_SP])
+ #    endif
 +#  if defined(__linux__) && defined(__s390x__)
 +#    define GR_sig(p,x) ((p)->uc_mcontext.gregs[x])
 +#    define PSWa_sig(p) ((p)->uc_mcontext.psw.addr)
@@ -30,7 +30,7 @@
  #    define RSP_sig(p) ((p)->uc_mcontext.__gregs[_REG_RSP])
  #    define RBP_sig(p) ((p)->uc_mcontext.__gregs[_REG_RBP])
  #    define R11_sig(p) ((p)->uc_mcontext.__gregs[_REG_R11])
-@@ -399,16 +403,20 @@ struct macos_aarch64_context {
+@@ -405,16 +409,20 @@ struct macos_aarch64_context {
  #    define PC_sig(p) R32_sig(p)
  #    define SP_sig(p) R01_sig(p)
  #    define FP_sig(p) R01_sig(p)