[ghc] silence warnings about unsupported llvm version (> 3.1) on ARM

Jens Petersen petersen at fedoraproject.org
Wed Jul 24 09:08:24 UTC 2013


commit 0d40f8dbbf2279a5283f75b52cf17746244ccd88
Author: Jens Petersen <petersen at redhat.com>
Date:   Wed Jul 24 18:08:02 2013 +0900

    silence warnings about unsupported llvm version (> 3.1) on ARM
    
    +You are using a new version of LLVM that hasn't been tested yet!
    +We will try though...
    
    (ghc-7.6 only officially supports 2.8 <= llvm <= 3.1)

 ghc-7.6.3-LlvmCodeGen-no-3.3-warning.patch |   11 +++++++++++
 ghc.spec                                   |   11 ++++++++++-
 2 files changed, 21 insertions(+), 1 deletions(-)
---
diff --git a/ghc-7.6.3-LlvmCodeGen-no-3.3-warning.patch b/ghc-7.6.3-LlvmCodeGen-no-3.3-warning.patch
new file mode 100644
index 0000000..d48abd4
--- /dev/null
+++ b/ghc-7.6.3-LlvmCodeGen-no-3.3-warning.patch
@@ -0,0 +1,11 @@
+--- ghc-7.6.3/compiler/llvmGen/LlvmCodeGen/Base.hs~	2013-04-19 06:22:46.000000000 +0900
++++ ghc-7.6.3/compiler/llvmGen/LlvmCodeGen/Base.hs	2013-07-24 17:05:06.491900335 +0900
+@@ -151,7 +151,7 @@
+ minSupportLlvmVersion = 28
+ 
+ maxSupportLlvmVersion :: LlvmVersion
+-maxSupportLlvmVersion = 31
++maxSupportLlvmVersion = 33
+ 
+ -- ----------------------------------------------------------------------------
+ -- * Environment Handling
diff --git a/ghc.spec b/ghc.spec
index ca0ac89..986d02b 100644
--- a/ghc.spec
+++ b/ghc.spec
@@ -29,7 +29,7 @@ Version: 7.6.3
 # - release can only be reset if *all* library versions get bumped simultaneously
 #   (sometimes after a major release)
 # - minor release numbers for a branch should be incremented monotonically
-Release: 16%{?dist}
+Release: 17%{?dist}
 Summary: Glasgow Haskell Compiler
 
 License: %BSDHaskellReport
@@ -52,6 +52,8 @@ Patch10: ghc-wrapper-libffi-include.patch
 Patch12: ghc-7.4.2-Cabal-disable-ghci-libs.patch
 # fix compilation with llvm-3.3
 Patch13: ghc-llvmCodeGen-empty-array.patch
+# stop warnings about unsupported version of llvm
+Patch14: ghc-7.6.3-LlvmCodeGen-no-3.3-warning.patch
 
 # fedora ghc has been bootstrapped on
 # %{ix86} x86_64 ppc alpha sparcv9 ppc64 armv7hl armv5tel s390 s390x
@@ -227,6 +229,10 @@ ln -s $(pkg-config --variable=includedir libffi)/*.h rts/dist/build
 
 %patch13 -p1 -b .orig
 
+%ifarch armv7hl armv5tel
+%patch14 -p1 -b .orig
+%endif
+
 
 %build
 # http://hackage.haskell.org/trac/ghc/wiki/Platforms
@@ -439,6 +445,9 @@ fi
 
 
 %changelog
+* Wed Jul 24 2013 Jens Petersen <petersen at redhat.com> - 7.6.3-17
+- silence warnings about unsupported llvm version (> 3.1) on ARM
+
 * Thu Jul 11 2013 Jens Petersen <petersen at redhat.com> - 7.6.3-16
 - revert the executable stack patch since it didn't fully fix the problem
   and yet changed the ghc library hash


More information about the scm-commits mailing list