From: Mehdi Dogguy <mehdi@debian.org>
Date: Sun, 6 Nov 2016 09:40:06 +0000 (+0100)
Subject: Default to PIC on arm, to fix failing armhf tests (Closes: #837359).
X-Git-Tag: archive/raspbian/4.08.1-4+rpi1~3^2~33^2~12
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=cce1a5478ce79c3275329a7f8e15c8a4dd256f20;p=ocaml.git

Default to PIC on arm, to fix failing armhf tests (Closes: #837359).
---

diff --git a/debian/changelog b/debian/changelog
index cb36a3e3..a6a36600 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ocaml (4.02.3-8) UNRELEASED; urgency=medium
+
+  * Default to PIC on arm, to fix failing armhf tests (Closes: #837359).
+
+ -- Mehdi Dogguy <mehdi@debian.org>  Sun, 06 Nov 2016 10:36:15 +0100
+
 ocaml (4.02.3-7) unstable; urgency=medium
 
   * d/rules: split install-stamp target into -arch and -indep, to allow
diff --git a/debian/patches/0012-arm-default-PIC.patch b/debian/patches/0012-arm-default-PIC.patch
new file mode 100644
index 00000000..23277cff
--- /dev/null
+++ b/debian/patches/0012-arm-default-PIC.patch
@@ -0,0 +1,24 @@
+Description: Default to PIC on arm
+ Otherwise the armhf build fails now that PIE is enabled by default.
+Author: Mehdi Dogguy <mehdi@debian.org>
+Date: Sun, 6 Nov 2016 10:36:00 +0100
+Bug-Debian: https://bugs.debian.org/837359
+Forwarded: TODO
+
+---
+ asmcomp/arm/arch.ml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/asmcomp/arm/arch.ml b/asmcomp/arm/arch.ml
+index d93c1e0..3541106 100644
+--- a/asmcomp/arm/arch.ml
++++ b/asmcomp/arm/arch.ml
+@@ -56,7 +56,7 @@ let (arch, fpu, thumb) =
+     end in
+   (ref def_arch, ref def_fpu, ref def_thumb)
+ 
+-let pic_code = ref false
++let pic_code = ref true
+ 
+ let farch spec =
+   arch := (match spec with
diff --git a/debian/patches/series b/debian/patches/series
index e375d30d..552c4d78 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@
 0010-Enable-ocamldoc-to-build-reproducible-manpages.patch
 0010-Add-a-.file-directive-to-generated-.s-files.patch
 0011-Compatibility-with-x32-architecture.patch
+0012-arm-default-PIC.patch