From 9db1aa536cd20f7904da42799427015306cb7766 Mon Sep 17 00:00:00 2001 From: q66 Date: Mon, 28 Oct 2019 22:51:40 +0100 Subject: [PATCH] ocaml: drop unnecessary musl/ppc patch [ci skip] --- srcpkgs/ocaml/patches/musl-ppc.patch | 11 +++++++++++ .../ocaml-4.08.0-ppc-sigcontext-musl.patch | 19 ------------------- 2 files changed, 11 insertions(+), 19 deletions(-) create mode 100644 srcpkgs/ocaml/patches/musl-ppc.patch delete mode 100644 srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-sigcontext-musl.patch diff --git a/srcpkgs/ocaml/patches/musl-ppc.patch b/srcpkgs/ocaml/patches/musl-ppc.patch new file mode 100644 index 00000000000..bc2c10fd43a --- /dev/null +++ b/srcpkgs/ocaml/patches/musl-ppc.patch @@ -0,0 +1,11 @@ +--- a/runtime/signals_osdep.h ++++ b/runtime/signals_osdep.h +@@ -309,6 +309,8 @@ + + #elif defined(TARGET_power) && defined(SYS_elf) + ++ #include ++ + #define DECLARE_SIGNAL_HANDLER(name) \ + static void name(int sig, struct sigcontext * context) + diff --git a/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-sigcontext-musl.patch b/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-sigcontext-musl.patch deleted file mode 100644 index a40bc5fd64d..00000000000 --- a/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-sigcontext-musl.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- ocaml-4.04.2/runtime/signals_osdep.h -+++ ocaml-4.04.2/runtime/signals_osdep.h -@@ -297,11 +297,11 @@ - sigact.sa_flags = 0 - - typedef unsigned long context_reg; -- #define CONTEXT_PC (context->regs->nip) -- #define CONTEXT_EXCEPTION_POINTER (context->regs->gpr[29]) -- #define CONTEXT_YOUNG_LIMIT (context->regs->gpr[30]) -- #define CONTEXT_YOUNG_PTR (context->regs->gpr[31]) -- #define CONTEXT_SP (context->regs->gpr[1]) -+ #define CONTEXT_PC (context->gp_regs[32]) -+ #define CONTEXT_EXCEPTION_POINTER (context->gp_regs[29]) -+ #define CONTEXT_YOUNG_LIMIT (context->gp_regs[30]) -+ #define CONTEXT_YOUNG_PTR (context->gp_regs[31]) -+ #define CONTEXT_SP (context->gp_regs[1]) - - /****************** PowerPC, NetBSD */ -