diff --git a/0006-s390x-Fix-address-of-caml_raise_exn-in-native-dynlin.patch b/0006-PR-7405-s390x-Fix-address-of-caml_raise_exn-in-nativ.patch similarity index 61% rename from 0006-s390x-Fix-address-of-caml_raise_exn-in-native-dynlin.patch rename to 0006-PR-7405-s390x-Fix-address-of-caml_raise_exn-in-nativ.patch index cb5c7c3..f89e77a 100644 --- a/0006-s390x-Fix-address-of-caml_raise_exn-in-native-dynlin.patch +++ b/0006-PR-7405-s390x-Fix-address-of-caml_raise_exn-in-nativ.patch @@ -1,17 +1,18 @@ -From 6d3d16d5d0490b222ff27261c209f121d60db3a4 Mon Sep 17 00:00:00 2001 +From d82ea2b77261e030be5a75d0277ce5b62b52b751 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 9 Nov 2016 11:01:15 -0500 -Subject: [PATCH 6/6] s390x: Fix address of caml_raise_exn in native dynlink - modules. +Subject: [PATCH 6/6] PR#7405: s390x: Fix address of caml_raise_exn in native + dynlink modules. -Upstream bug report: -https://caml.inria.fr/mantis/view.php?id=7405 +This commit started as Fedora patch e732c39340e86939530a087744caa8d8f1247878. + +(cherry picked from commit d6f24c5f4ee9408ac9a00e3de84f417450b41215) --- asmcomp/s390x/emit.mlp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/asmcomp/s390x/emit.mlp b/asmcomp/s390x/emit.mlp -index 5d233a3..a099bdb 100644 +index 5d233a3..f99380a 100644 --- a/asmcomp/s390x/emit.mlp +++ b/asmcomp/s390x/emit.mlp @@ -611,7 +611,7 @@ let emit_instr i = @@ -19,7 +20,7 @@ index 5d233a3..a099bdb 100644 begin match k with | Cmm.Raise_withtrace -> - ` brasl %r14, {emit_symbol "caml_raise_exn"}\n`; -+ ` brasl %r14, {emit_symbol "caml_raise_exn"}@PLT\n`; ++ ` {emit_call "caml_raise_exn"}\n`; let lbl = record_frame Reg.Set.empty true i.dbg in `{emit_label lbl}:\n` | Cmm.Raise_notrace -> diff --git a/ocaml.spec b/ocaml.spec index c04c496..2d2b511 100644 --- a/ocaml.spec +++ b/ocaml.spec @@ -63,7 +63,7 @@ Patch0004: 0004-Don-t-rewrite-Werror.patch # Out of tree patch from # https://github.com/nojb/riscv-ocaml Patch0005: 0005-RISC-V-support-2016-11-08.patch -Patch0006: 0006-s390x-Fix-address-of-caml_raise_exn-in-native-dynlin.patch +Patch0006: 0006-PR-7405-s390x-Fix-address-of-caml_raise_exn-in-nativ.patch BuildRequires: binutils-devel BuildRequires: ncurses-devel