[Pkg-haskell-commits] darcs: ghc: Remove debian/patches/armhf_llvm_abi, applied upstream (Closes: #695739)

[Joachim Breitner]

Wed Dec 12 08:44:51 UTC 2012  Joachim Breitner <mail at joachim-breitner.de>
  * Remove debian/patches/armhf_llvm_abi, applied upstream (Closes: #695739)
  Ignore-this: 932ed695f7337f0eab27409c40d6bfb7

    M ./changelog -1 +3
    R ./patches/armhf_llvm_abi
    M ./patches/series -1

Wed Dec 12 08:44:51 UTC 2012  Joachim Breitner <mail at joachim-breitner.de>
  * Remove debian/patches/armhf_llvm_abi, applied upstream (Closes: #695739)
  Ignore-this: 932ed695f7337f0eab27409c40d6bfb7
diff -rN -u old-ghc//changelog new-ghc//changelog
--- old-ghc//changelog	2012-12-12 16:53:39.311135584 +0000
+++ new-ghc//changelog	2012-12-12 16:53:39.372633046 +0000
@@ -2,8 +2,10 @@
 
   * New upstream release (aka 7.6.1-rc).
     + Closes: #677096 (huge number of wakeups)
+  * Remove debian/patches/armhf_llvm_abi, applied upstream, thanks to Shawn
+    Landden for noticing (Closes: #695739)
 
- -- Joachim Breitner <nomeata at debian.org>  Mon, 10 Dec 2012 18:59:15 +0100
+ -- Joachim Breitner <nomeata at debian.org>  Mon, 10 Dec 2012 19:01:38 +0100
 
 ghc (7.6.1-3) experimental; urgency=low
 
diff -rN -u old-ghc//patches/armhf_llvm_abi new-ghc//patches/armhf_llvm_abi
--- old-ghc//patches/armhf_llvm_abi	2012-12-12 16:53:39.274752438 +0000
+++ new-ghc//patches/armhf_llvm_abi	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-Description: If we are on armhf, tell llvm to generate code for this ABI. Not
- forwarded upstream, because they will do a more 'proper' patch. See upstream
- bug #5914.
-Author: Iain Lane <laney at debian.org>
-
-Index: ghc-7.6.1/compiler/main/DriverPipeline.hs
-===================================================================
---- 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 #-}
-+{-# LANGUAGE NamedFieldPuns, CPP #-}
- -- -fno-cse is needed for GLOBAL_VAR's to behave properly
- 
- -----------------------------------------------------------------------------
-@@ -1393,6 +1393,9 @@
-                                       then ["-mattr=+v7,+vfp3"]
-                                       else if (elem VFPv3D16 ext)
-                                            then ["-mattr=+v7,+vfp3,+d16"]
-+#ifdef __ARM_PCS_VFP
-+                                                ++ ["-float-abi=hard"]
-+#endif
-                                            else []
-                    _                 -> []
-         -- On Ubuntu/Debian with ARM hard float ABI, LLVM's llc still
diff -rN -u old-ghc//patches/series new-ghc//patches/series
--- old-ghc//patches/series	2012-12-12 16:53:39.274752438 +0000
+++ new-ghc//patches/series	2012-12-12 16:53:39.330723807 +0000
@@ -1,6 +1,5 @@
 system-libffi
 haddock-hardcode-ghc-paths
 use-debian-gen_contents_index
-armhf_llvm_abi
 ARM-VFPv3D16
 no-missing-haddock-file-warning