From d6f24c5f4ee9408ac9a00e3de84f417450b41215 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] PR#7405: s390x: Fix address of caml_raise_exn in native
 dynlink modules.

This commit started as Fedora patch e732c39340e86939530a087744caa8d8f1247878.
---
 Changes                | 3 +++
 asmcomp/s390x/emit.mlp | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Changes b/Changes
index e3329a57512e..d715d94087fd 100644
--- a/Changes
+++ b/Changes
@@ -77,6 +77,9 @@ Next version (4.05.0):
 
 ### Bug fixes
 
+- PR#7405, GPR#903: s390x: Fix address of caml_raise_exn in native dynlink modules
+  (Richard Jones, review by Xavier Leroy)
+
 - GPR#795: remove 256-character limitation on Sys.executable_name
   (Xavier Leroy)
 
diff --git a/asmcomp/s390x/emit.mlp b/asmcomp/s390x/emit.mlp
index 5d233a3655df..f99380aee0a1 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`;
+          `	{emit_call "caml_raise_exn"}\n`;
           let lbl = record_frame Reg.Set.empty true i.dbg in
           `{emit_label lbl}:\n`
         | Cmm.Raise_notrace ->