[ghc/f21] use llvm34 instead of llvm-3.5 for arm (#1161049)

[Jens Petersen]

commit 90d9ed7db6228783c9605da83e3f583c5af984ab
Author: Jens Petersen <petersen at redhat.com>
Date:   Mon Dec 22 18:24:56 2014 +0900

    use llvm34 instead of llvm-3.5 for arm (#1161049)

 ghc                        |    3 +++
 ghc-NCG-no-execstack.patch |   32 --------------------------------
 ghc-pkg                    |    3 +++
 ghc.spec                   |   20 ++++++++++++++++----
 4 files changed, 22 insertions(+), 36 deletions(-)
---
diff --git a/ghc b/ghc
new file mode 100755
index 0000000..aa61e6a
--- /dev/null
+++ b/ghc
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+/usr/bin/ghc -pgmlc llc-3.4 -pgmlo opt-3.4 $*
diff --git a/ghc-pkg b/ghc-pkg
new file mode 100755
index 0000000..14e0395
--- /dev/null
+++ b/ghc-pkg
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+/usr/bin/ghc-pkg $*
diff --git a/ghc.spec b/ghc.spec
index f17e641..241e3fc 100644
--- a/ghc.spec
+++ b/ghc.spec
@@ -22,7 +22,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: 26.1%{?dist}
+Release: 26.2%{?dist}
 Summary: Glasgow Haskell Compiler
 
 License: %BSDHaskellReport
@@ -33,6 +33,8 @@ Source2: http://www.haskell.org/ghc/dist/%{version}/ghc-%{version}-testsuite.tar
 %endif
 Source3: ghc-doc-index.cron
 Source4: ghc-doc-index
+Source5: ghc
+Source6: ghc-pkg
 # absolute haddock path (was for html/libraries -> libraries)
 Patch1:  ghc-gen_contents_index-haddock-path.patch
 # fedora does not allow copy libraries
@@ -124,7 +126,7 @@ BuildRequires: libxslt, docbook-style-xsl
 BuildRequires: python
 %endif
 %ifarch armv7hl armv5tel
-BuildRequires: llvm >= 3.0
+BuildRequires: llvm34
 %endif
 %ifarch ppc64le aarch64
 # for patch19 and patch21
@@ -172,7 +174,7 @@ Requires(postun): chkconfig
 # added in f14
 Obsoletes: ghc-doc < 6.12.3-4
 %ifarch armv7hl armv5tel
-Requires: llvm >= 3.0
+Requires: llvm34
 %endif
 
 %description compiler
@@ -359,12 +361,19 @@ autoreconf
 %endif
 export CFLAGS="${CFLAGS:-%optflags}"
 export LDFLAGS="${LDFLAGS:-%__global_ldflags}"
+%ifarch armv7hl armv5tel
+export GHC=%SOURCE5
+%endif
 ./configure --prefix=%{_prefix} --exec-prefix=%{_exec_prefix} \
   --bindir=%{_bindir} --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} \
   --datadir=%{_datadir} --includedir=%{_includedir} --libdir=%{_libdir} \
   --libexecdir=%{_libexecdir} --localstatedir=%{_localstatedir} \
   --sharedstatedir=%{_sharedstatedir} --mandir=%{_mandir} \
-  --with-gcc=%{_bindir}/gcc
+  --with-gcc=%{_bindir}/gcc \
+%ifarch armv7hl armv5tel
+  --with-llc=%{_bindir}/llc-3.4 --with-opt=%{_bindir}/opt-3.4 \
+%endif
+%{nil}
 
 # utf8 is needed when building with verbose output
 LANG=en_US.utf8 make %{?_smp_mflags}
@@ -556,6 +565,9 @@ fi
 
 
 %changelog
+* Mon Dec 22 2014 Jens Petersen <petersen at redhat.com> - 7.6.3-26.2
+- use llvm34 instead of llvm-3.5 for arm (#1161049)
+
 * Tue Nov 18 2014 Jens Petersen <petersen at redhat.com> - 7.6.3-26.1
 - use rpm internal dependency generator with ghc.attr on F21+
 - fix bash-ism in ghc-doc-index (#1146733)