From: Stephane Glondu <steph@glondu.net>
Date: Wed, 24 Jul 2019 11:18:15 +0000 (+0200)
Subject: Disable native compiler on x32
X-Git-Tag: archive/raspbian/4.08.1-4+rpi1~2^2~17^2~23
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4015d036137bf7e5bce5395ec9a54f411b186d8b;p=ocaml.git

Disable native compiler on x32
---

diff --git a/debian/native-archs b/debian/native-archs
index a29f0093..6b492b06 100644
--- a/debian/native-archs
+++ b/debian/native-archs
@@ -1 +1 @@
-amd64 arm64 armhf hurd-i386 i386 kfreebsd-i386 kfreebsd-amd64 lpia powerpc ppc64 ppc64el sparc s390x x32
+amd64 arm64 armhf hurd-i386 i386 kfreebsd-i386 kfreebsd-amd64 lpia powerpc ppc64 ppc64el sparc s390x
diff --git a/debian/rules b/debian/rules
index 7c69f5b8..479fcac5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -60,8 +60,9 @@ CONFIGURE_OPTS := \
   --with-x \
   -mandir $(DEB_TEST_BUILD_PREFIX)/usr/share/man \
 
-# Upstream recommends dropping support, see https://github.com/ocaml/ocaml/issues/7642
-ifneq (,$(filter $(DEB_HOST_ARCH),armel))
+# Upstream recommends dropping support on armel, see https://github.com/ocaml/ocaml/issues/7642
+# Binaries generated by ocamlopt segfault on x32
+ifneq (,$(filter $(DEB_HOST_ARCH),armel x32))
 CONFIGURE_OPTS += --disable-native-compiler
 endif