Switch PIC default to on for all architectures

3 files changed, 27 insertions, 0 deletions

diff --git a/p/ghc/debian/changelog b/p/ghc/debian/changelog
index 92404edd1..b3cc352ea 100644
--- a/p/ghc/debian/changelog
+++ b/p/ghc/debian/changelog
@@ -1,3 +1,9 @@
+ghc (8.0.1-5) experimental; urgency=medium
+
+  * Switch PIC default to on for all architectures.
+
+ -- Clint Adams <clint@debian.org>  Sat, 22 Oct 2016 18:20:02 -0400
+
 ghc (8.0.1-4) experimental; urgency=medium
 
   [ Balint Reczey ]
diff --git a/p/ghc/debian/patches/opt-pic b/p/ghc/debian/patches/opt-pic
new file mode 100644
index 000000000..ffb8492d7
--- /dev/null
+++ b/p/ghc/debian/patches/opt-pic
@@ -0,0 +1,20 @@
+--- a/compiler/main/DynFlags.hs
++++ b/compiler/main/DynFlags.hs
+@@ -3629,16 +3629,7 @@ defaultFlags settings
+     where platform = sTargetPlatform settings
+ 
+ default_PIC :: Platform -> [GeneralFlag]
+-default_PIC platform =
+-  case (platformOS platform, platformArch platform) of
+-    (OSDarwin, ArchX86_64) -> [Opt_PIC]
+-    (OSOpenBSD, ArchX86_64) -> [Opt_PIC] -- Due to PIE support in
+-                                         -- OpenBSD since 5.3 release
+-                                         -- (1 May 2013) we need to
+-                                         -- always generate PIC. See
+-                                         -- #10597 for more
+-                                         -- information.
+-    _                      -> []
++default_PIC platform = [Opt_PIC]
+ 
+ -- General flags that are switched on/off when other general flags are switched
+ -- on
diff --git a/p/ghc/debian/patches/series b/p/ghc/debian/patches/series
index 5de9d7abf..b391048f7 100644
--- a/p/ghc/debian/patches/series
+++ b/p/ghc/debian/patches/series
@@ -6,3 +6,4 @@ buildpath-abi-stability.patch
 reproducible-tmp-names
 do-not-use-SHELL
 add-missing-MO_WriteBarrier
+opt-pic