[Pkg-haskell-commits] darcs: ghc: Refresh armhf_llvm_abi

[Joachim Breitner]

Mon Oct  8 11:12:31 UTC 2012  Joachim Breitner <mail at joachim-breitner.de>
  * Refresh armhf_llvm_abi
  Ignore-this: 823f6e5b1c7d2e1a4ed3260564aebc76

    M ./patches/armhf_llvm_abi -6 +6

Mon Oct  8 11:12:31 UTC 2012  Joachim Breitner <mail at joachim-breitner.de>
  * Refresh armhf_llvm_abi
  Ignore-this: 823f6e5b1c7d2e1a4ed3260564aebc76
diff -rN -u old-ghc//patches/armhf_llvm_abi new-ghc//patches/armhf_llvm_abi
--- old-ghc//patches/armhf_llvm_abi	2012-10-08 12:00:59.186222393 +0000
+++ new-ghc//patches/armhf_llvm_abi	2012-10-08 12:00:59.571719593 +0000
@@ -3,10 +3,10 @@
  bug #5914.
 Author: Iain Lane <laney at debian.org>
 
-Index: ghc-7.4.2/compiler/main/DriverPipeline.hs
+Index: ghc-7.6.1/compiler/main/DriverPipeline.hs
 ===================================================================
---- ghc-7.4.2.orig/compiler/main/DriverPipeline.hs	2012-06-07 03:10:25.000000000 +1000
-+++ ghc-7.4.2/compiler/main/DriverPipeline.hs	2012-06-11 15:25:32.000000000 +1000
+--- ghc-7.6.1.orig/compiler/main/DriverPipeline.hs	2012-10-08 13:11:54.371876293 +0200
++++ ghc-7.6.1/compiler/main/DriverPipeline.hs	2012-10-08 13:12:20.927875333 +0200
 @@ -1,5 +1,5 @@
  {-# OPTIONS -fno-cse #-}
 -{-# LANGUAGE NamedFieldPuns #-}
@@ -14,7 +14,7 @@
  -- -fno-cse is needed for GLOBAL_VAR's to behave properly
  
  -----------------------------------------------------------------------------
-@@ -1382,6 +1382,9 @@
+@@ -1393,6 +1393,9 @@
                                        then ["-mattr=+v7,+vfp3"]
                                        else if (elem VFPv3D16 ext)
                                             then ["-mattr=+v7,+vfp3,+d16"]
@@ -22,5 +22,5 @@
 +                                                ++ ["-float-abi=hard"]
 +#endif
                                             else []
-                    _               -> []
- 
+                    _                 -> []
+         -- On Ubuntu/Debian with ARM hard float ABI, LLVM's llc still