Merge pull request ocaml#12914 from dustanddreams/clang_s390x

s390x: allow builds with llvm/clang
jberdine · Jan 18, 2024 · 42ece63 · 42ece63
2 parents 8fa4c5f + c3494a2
commit 42ece63
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/Changes b/Changes
@@ -45,6 +45,10 @@ _______________
   bytecode linker in `-custom` and `-output-*` modes.
   (David Allsopp, Antonin Décimo and Samuel Hym, review by Vincent Laviron)
 
+- #xxxxx: Slightly change the s390x assembly dialect in order to build with
+  Clang's integrated assembler.
+  (Miod Vallat, review by TBD)
+
 ### Build system:
 
 - #12909: Reorganise how MKEXE_VIA_CC is built to make it correct for MSVC by

diff --git a/asmcomp/s390x/emit.mlp b/asmcomp/s390x/emit.mlp
@@ -121,7 +121,7 @@ let emit_stack env r =
 
 let emit_load_symbol_addr reg s =
   if !pic_code then
-  `	lgrl	{emit_reg reg}, {emit_symbol s}@GOTENT\n`
+  `	lgrl	{emit_reg reg}, {emit_symbol s}@GOT\n`
   else
   `	larl	{emit_reg reg}, {emit_symbol s}\n`
 

diff --git a/runtime/s390x.S b/runtime/s390x.S
@@ -35,7 +35,7 @@
 
 #define LBL(x) .L##x
 #define G(r) r
-#define GREL(r) r@GOTENT
+#define GREL(r) r@GOT
 #define GCALL(r) r@PLT
 #define TEXT_SECTION(name)
 #define FUNCTION(name) \