rpms/ocaml
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Replace s390 fix with final patch.

Browse Source 
No need to rebuild anything.
This commit is contained in:
Richard W.M. Jones 2016-11-11 12:10:33 +00:00
parent 02890f76ff
commit 746dc88032
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
0006-s390x-Fix-address-of-caml_raise_exn-in-native-dynlin.patch → 0006-PR-7405-s390x-Fix-address-of-caml_raise_exn-in-nativ.patch
View File

@ -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" <rjones@redhat.com> From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Wed, 9 Nov 2016 11:01:15 -0500 Date: Wed, 9 Nov 2016 11:01:15 -0500
Subject: [PATCH 6/6] s390x: Fix address of caml_raise_exn in native dynlink Subject: [PATCH 6/6] PR#7405: s390x: Fix address of caml_raise_exn in native
modules. dynlink modules.
Upstream bug report: This commit started as Fedora patch e732c39340e86939530a087744caa8d8f1247878.
https://caml.inria.fr/mantis/view.php?id=7405
(cherry picked from commit d6f24c5f4ee9408ac9a00e3de84f417450b41215)
--- ---
asmcomp/s390x/emit.mlp | 2 +- asmcomp/s390x/emit.mlp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/asmcomp/s390x/emit.mlp b/asmcomp/s390x/emit.mlp 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 --- a/asmcomp/s390x/emit.mlp
+++ b/asmcomp/s390x/emit.mlp +++ b/asmcomp/s390x/emit.mlp
@@ -611,7 +611,7 @@ let emit_instr i = @@ -611,7 +611,7 @@ let emit_instr i =
@ -19,7 +20,7 @@ index 5d233a3..a099bdb 100644
begin match k with begin match k with
| Cmm.Raise_withtrace -> | Cmm.Raise_withtrace ->
- ` brasl %r14, {emit_symbol "caml_raise_exn"}\n`; - ` 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 let lbl = record_frame Reg.Set.empty true i.dbg in
`{emit_label lbl}:\n` `{emit_label lbl}:\n`
| Cmm.Raise_notrace -> | Cmm.Raise_notrace ->

2
ocaml.spec
View File

@ -63,7 +63,7 @@ Patch0004: 0004-Don-t-rewrite-Werror.patch
# Out of tree patch from # Out of tree patch from
# https://github.com/nojb/riscv-ocaml # https://github.com/nojb/riscv-ocaml
Patch0005: 0005-RISC-V-support-2016-11-08.patch 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: binutils-devel
BuildRequires: ncurses-devel BuildRequires: ncurses-devel