Permalink
Browse files

PR#7405: s390x: Fix address of caml_raise_exn in native dynlink modules.

This commit started as Fedora patch e732c39340e86939530a087744caa8d8f1247878.
  • Loading branch information...
1 parent 762adce commit 7020a0b682524b4a63bdeb395db12b72389d01da @rwmjones rwmjones committed with gasche Nov 9, 2016
Showing with 6 additions and 1 deletion.
  1. +5 −0 Changes
  2. +1 −1 asmcomp/s390x/emit.mlp
View
@@ -6,6 +6,11 @@ Next version (4.04.1):
- PR#7403, GPR#894: fix a bug in Set.map as introduced in 4.04.0
(Gabriel Scherer, report by Thomas Leonard)
+### Bug fixes
+
+- PR#7405, GPR#903: s390x: Fix address of caml_raise_exn in native dynlink modules
+ (Richard Jones, review by Xavier Leroy)
+
OCaml 4.04.0 (4 Nov 2016):
--------------------------
@@ -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`;
+ ` {emit_call "caml_raise_exn"}\n`;
let lbl = record_frame Reg.Set.empty true i.dbg in
`{emit_label lbl}:\n`
| Cmm.Raise_notrace ->

0 comments on commit 7020a0b

Please sign in to comment.