1 files changed, 22 insertions, 27 deletions
diff --git a/community/ocaml/fix-mcontext-fields.patch b/community/ocaml/fix-mcontext-fields.patch
index e47f348b23..436057df76 100644
--- a/community/ocaml/fix-mcontext-fields.patch
+++ b/community/ocaml/fix-mcontext-fields.patch
@@ -1,27 +1,7 @@
-diff -Nru a/asmrun/signals_osdep.h b/asmrun/signals_osdep.h
---- a/asmrun/signals_osdep.h   2016-11-04 16:08:24.000000000 +0000
-+++ b/asmrun/signals_osdep.h   2017-05-13 03:16:28.749615533 +0000
-@@ -314,11 +314,11 @@
-      sigact.sa_flags = 0
- 
-   typedef unsigned long context_reg;
--  #define CONTEXT_PC (context->sregs->regs.psw.addr)
--  #define CONTEXT_EXCEPTION_POINTER (context->sregs->regs.gprs[13])
--  #define CONTEXT_YOUNG_LIMIT (context->sregs->regs.gprs[10])
--  #define CONTEXT_YOUNG_PTR (context->sregs->regs.gprs[11])
--  #define CONTEXT_SP (context->sregs->regs.gprs[15])
-+  #define CONTEXT_PC (context->sregs->psw.addr)
-+  #define CONTEXT_EXCEPTION_POINTER (context->sregs->gregs[13])
-+  #define CONTEXT_YOUNG_LIMIT (context->sregs->gregs[10])
-+  #define CONTEXT_YOUNG_PTR (context->sregs->gregs[11])
-+  #define CONTEXT_SP (context->sregs->gregs[15])
- 
- /****************** PowerPC, BSD */
- 
-diff -Nru a/asmrun/signals_osdep.h b/asmrun/signals_osdep.h
---- a/asmrun/signals_osdep.h    2017-05-13 03:19:52.863954544 +0000
-+++ b/asmrun/signals_osdep.h    2017-05-13 04:10:48.417194351 +0000
-@@ -297,11 +297,20 @@
+diff -Nru a/runtime/signals_osdep.h b/runtime/signals_osdep.h
+--- a/runtime/signals_osdep.h   2019-06-14 08:21:51.000000000 -0300
++++ b/runtime/signals_osdep.h   2019-07-16 14:21:56.751434439 -0300
+@@ -297,11 +297,19 @@
       sigact.sa_flags = 0
  
    typedef unsigned long context_reg;
@@ -30,7 +10,6 @@ diff -Nru a/asmrun/signals_osdep.h b/asmrun/signals_osdep.h
 -  #define CONTEXT_YOUNG_LIMIT (context->regs->gpr[30])
 -  #define CONTEXT_YOUNG_PTR (context->regs->gpr[31])
 -  #define CONTEXT_SP (context->regs->gpr[1])
-+
 +  #ifdef __powerpc64__
 +    #define CONTEXT_PC (context->gp_regs[32])
 +    #define CONTEXT_EXCEPTION_POINTER (context->gp_regs[29])
@@ -45,5 +24,21 @@ diff -Nru a/asmrun/signals_osdep.h b/asmrun/signals_osdep.h
 +    #define CONTEXT_SP (context->regs->gpr[1])
 +  #endif
  
- /****************** s390x, ELF (Linux) */
- #elif defined(TARGET_s390x) && defined(SYS_elf)
+ /****************** PowerPC, NetBSD */
+ 
+@@ -354,11 +362,11 @@
+      sigact.sa_flags = 0
+ 
+   typedef unsigned long context_reg;
+-  #define CONTEXT_PC (context->sregs->regs.psw.addr)
+-  #define CONTEXT_EXCEPTION_POINTER (context->sregs->regs.gprs[13])
+-  #define CONTEXT_YOUNG_LIMIT (context->sregs->regs.gprs[10])
+-  #define CONTEXT_YOUNG_PTR (context->sregs->regs.gprs[11])
+-  #define CONTEXT_SP (context->sregs->regs.gprs[15])
++  #define CONTEXT_PC (context->sregs->psw.addr)
++  #define CONTEXT_EXCEPTION_POINTER (context->sregs->gregs[13])
++  #define CONTEXT_YOUNG_LIMIT (context->sregs->gregs[10])
++  #define CONTEXT_YOUNG_PTR (context->sregs->gregs[11])
++  #define CONTEXT_SP (context->sregs->gregs[15])
+ 
+ /******************** Default */