Merge pull request #10835 from hannesm/fix-32bit-relocations

relocation issues with clang on 32bit FreeBSD
ocaml · Feb 17, 2022 · 389121d · 389121d
2 parents cec8e01 + c22c830
commit 389121d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/Changes b/Changes
@@ -502,6 +502,11 @@ OCaml 4.14.0
 
 ### Build system:
 
+- #10835 Disable DT_TEXTREL warnings on x86 32 bit architecture by passing
+  -Wl,-z,notext in mksharedlib and mkmaindll. Fixes relocation issues, reported
+  in #9800, making local patches in Debian, Alpine, and FreeBSD superfluous.
+  (Hannes Mehnert with Kate Deplaix and Stéphane Glondu, review by Xavier Leroy)
+
 - #10717: Simplify the installation of man pages
   (Sébastien Hinderer, review by David Allsopp)
 

diff --git a/configure b/configure
diff --git a/configure.ac b/configure.ac
@@ -966,6 +966,10 @@ AS_IF([test x"$enable_shared" != "xno"],
        AS_CASE([$cc_basename,$host],
            [*gcc*,powerpc-*-linux*],
            [mksharedlib="$CC -shared -mbss-plt \$(LDFLAGS)"],
+           [[*,i[3456]86-*]],
+           # Disable DT_TEXTREL warnings on Linux and BSD i386
+           # See https://github.com/ocaml/ocaml/issues/9800
+           [mksharedlib="$CC -shared \$(LDFLAGS) -Wl,-z,notext"],
            [mksharedlib="$CC -shared \$(LDFLAGS)"])
       oc_ldflags="$oc_ldflags -Wl,-E"
       rpath="-Wl,-rpath,"