29 lines
923 B
Diff
29 lines
923 B
Diff
|
From 6d3d16d5d0490b222ff27261c209f121d60db3a4 Mon Sep 17 00:00:00 2001
|
||
|
|
From: "Richard W.M. Jones" <rjones@redhat.com>
|
||
|
|
Date: Wed, 9 Nov 2016 11:01:15 -0500
|
||
|
|
Subject: [PATCH 6/6] s390x: Fix address of caml_raise_exn in native dynlink
|
||
|
|
modules.
|
||
|
|
|
||
|
|
Upstream bug report:
|
||
|
|
https://caml.inria.fr/mantis/view.php?id=7405
|
||
|
|
---
|
||
|
|
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
|
||
|
|
--- a/asmcomp/s390x/emit.mlp
|
||
|
|
+++ b/asmcomp/s390x/emit.mlp
|
||
|
|
@@ -611,7 +611,7 @@ let emit_instr i =
|
||
|
|
| Lraise k ->
|
||
|
|
begin match k with
|
||
|
|
| Cmm.Raise_withtrace ->
|
||
|
|
- ` brasl %r14, {emit_symbol "caml_raise_exn"}\n`;
|
||
|
|
+ ` brasl %r14, {emit_symbol "caml_raise_exn"}@PLT\n`;
|
||
|
|
let lbl = record_frame Reg.Set.empty true i.dbg in
|
||
|
|
`{emit_label lbl}:\n`
|
||
|
|
| Cmm.Raise_notrace ->
|
||
|
|
--
|
||
|
|
2.9.3
|
||
|
|
|