Merge pull request ocaml#12918 from mndrix/nobtcfi

Disable control flow integrity on OpenBSD
jberdine · Jan 19, 2024 · b6ecc23 · b6ecc23
2 parents b851fea + 3a12d03
commit b6ecc23
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 0 deletions.
diff --git a/Changes b/Changes
@@ -2325,6 +2325,10 @@ OCaml 4.14 maintenance version
   (Xavier Leroy and Anil Madhavapeddy, review by Anil Madhavapeddy and
   Sébastien Hinderer)
 
+- #12903: Disable control flow integrity on OpenBSD >= 7.4 to avoid
+  illegal instruction errors on certain CPUs.
+  (Michael Hendricks, review by Miod Vallat)
+
 ### Bug fixes:
 
 - #12878: fix incorrect treatment of injectivity for private recursive types.

diff --git a/configure b/configure
diff --git a/configure.ac b/configure.ac
@@ -1211,6 +1211,14 @@ AS_CASE([$host],
     [oc_ldflags="$oc_ldflags -Wl,--no-execute-only"
      natdynlinkopts="$natdynlinkopts -Wl,--no-execute-only"])
 
+# Disable control flow integrity
+
+AS_CASE([$host],
+  [[*-*-openbsd7.[4-9]|*-*-openbsd[89].*]],
+    [oc_ldflags="$oc_ldflags -Wl,-z,nobtcfi"
+     natdynlinkopts="$natdynlinkopts -Wl,-z,nobtcfi"])
+
+
 # Configure native dynlink
 
 natdynlink=false