Hello community, here is the log from the commit of package ghc for openSUSE:Factory checked in at 2013-09-11 12:52:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc (Old) and /work/SRC/openSUSE:Factory/.ghc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2013-09-08 11:30:21.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2013-09-11 12:52:47.000000000 +0200 @@ -1,0 +2,16 @@ +Tue Sep 10 16:21:19 UTC 2013 - [email protected] + +- Patches for llvm 3.3. +* Add ghc-7.6.3-LlvmCodeGen-no-3.3-warning.patch: Silence warning + about llvm too new +* Add ghc-avoid-empty-llvm-used-definitions.patch: Fix llvm code + generator. Backported patch for ghc 7.7 (cf Haskell trac #7996) +- explicitly configure gcc location in bootstrap builds too +- allow ppc builds (ppc64 build gets stuck) + +------------------------------------------------------------------- +Fri Sep 6 17:19:26 UTC 2013 - [email protected] + +- include BuildFlavour definitions in build.mk + +------------------------------------------------------------------- New: ---- ghc-7.6.3-LlvmCodeGen-no-3.3-warning.patch ghc-avoid-empty-llvm-used-definitions.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc.spec ++++++ --- /var/tmp/diff_new_pack.5ftqpW/_old 2013-09-11 12:52:49.000000000 +0200 +++ /var/tmp/diff_new_pack.5ftqpW/_new 2013-09-11 12:52:49.000000000 +0200 @@ -23,7 +23,7 @@ Summary: The Glorious Glasgow Haskell Compiler License: BSD-3-Clause Group: Development/Languages/Other -ExclusiveArch: %{ix86} x86_64 +ExclusiveArch: %{ix86} x86_64 ppc BuildRequires: ghc-bytestring-devel BuildRequires: ghc-compiler >= 7.0 @@ -84,6 +84,10 @@ Patch1: ghc-suse-as-needed.patch # PATCH-FIX-UPSTREAM Cabal-fix-dynamic-exec-for-TH.patch [email protected] - Fedora patch 10 Patch2: Cabal-fix-dynamic-exec-for-TH.patch +# PATCH-FIX-UPSTREAM ghc-7.6.3-LlvmCodeGen-no-3.3-warning.patch [email protected] - Fedora patch 14: Silence warning about llvm 3.3 +Patch3: ghc-7.6.3-LlvmCodeGen-no-3.3-warning.patch +# PATCH-FIX-UPSTREAM ghc-avoid-empty-llvm-used-definitions.patch [email protected] - Backport of commit db9b63105a54, fixes Haskell trac #7996 +Patch4: ghc-avoid-empty-llvm-used-definitions.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -180,6 +184,8 @@ rm -r ghc-tarballs/libffi %patch1 -p1 -b .suse %patch2 -p1 -b .TH +%patch3 -p1 -b .llvm-version +%patch4 -p1 -b .llvm-empty %build # required for patch and patch1 @@ -195,7 +201,8 @@ BUILD_DOCBOOK_HTML = NO HSCOLOUR_SRCS = NO EOF -./configure --prefix=%{_builddir}/ghc-boot --with-system-libffi +./configure --prefix=%{_builddir}/ghc-boot --with-system-libffi \ + --with-gcc=%{_bindir}/gcc make %{?_smp_mflags} make install make clean @@ -216,6 +223,8 @@ HSCOLOUR_SRCS = NO %endif EOF +# BuildFlavours are defined in mk/build.mk.sample +cat mk/build.mk.sample >> mk/build.mk export CFLAGS="${CFLAGS:-%optflags}" ./configure --prefix=%{_prefix} --exec-prefix=%{_exec_prefix} \ ++++++ ghc-7.6.3-LlvmCodeGen-no-3.3-warning.patch ++++++ --- 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 ++++++ ghc-avoid-empty-llvm-used-definitions.patch ++++++ git-author: Geoffrey Mainland <gmainlan@…> (06/12/13 13:31:49) git-committer: Geoffrey Mainland <gmainlan@…> (06/12/13 13:31:49) Message: Avoid generating empty llvm.used definitions. LLVM 3.3rc3 complains when the llvm.used global is an empty array, so don't define llvm.used at all when it would be empty. -- Index: ghc-7.6.3/compiler/llvmGen/LlvmCodeGen.hs =================================================================== --- ghc-7.6.3.orig/compiler/llvmGen/LlvmCodeGen.hs +++ ghc-7.6.3/compiler/llvmGen/LlvmCodeGen.hs @@ -112,19 +112,19 @@ cmmProcLlvmGens :: DynFlags -> BufHandle -> [[LlvmVar]] -- ^ info tables that need to be marked as 'used' -> IO () -cmmProcLlvmGens _ _ _ _ [] _ [] - = return () - cmmProcLlvmGens dflags h _ _ [] _ ivars - = let ivars' = concat ivars - cast x = LMBitc (LMStaticPointer (pVarLift x)) i8Ptr - ty = (LMArray (length ivars') i8Ptr) - usedArray = LMStaticArray (map cast ivars') ty - lmUsed = (LMGlobalVar (fsLit "llvm.used") ty Appending - (Just $ fsLit "llvm.metadata") Nothing False, Just usedArray) - in Prt.bufLeftRender h $ {-# SCC "llvm_used_ppr" #-} - withPprStyleDoc dflags (mkCodeStyle CStyle) $ - pprLlvmData ([lmUsed], []) + | null ivars' = return () + | otherwise = Prt.bufLeftRender h $ + {-# SCC "llvm_used_ppr" #-} + withPprStyleDoc dflags (mkCodeStyle CStyle) $ + pprLlvmData ([lmUsed], []) + where + ivars' = concat ivars + cast x = LMBitc (LMStaticPointer (pVarLift x)) i8Ptr + ty = (LMArray (length ivars') i8Ptr) + usedArray = LMStaticArray (map cast ivars') ty + lmUsed = (LMGlobalVar (fsLit "llvm.used") ty Appending + (Just $ fsLit "llvm.metadata") Nothing False, Just usedArray) cmmProcLlvmGens dflags h us env ((CmmData _ _) : cmms) count ivars = cmmProcLlvmGens dflags h us env cmms count ivars -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
