[commit: ghc] master: Fix build for GHC earlier than 7.0.1. (6b0d62c)

Edward Z. Yang ezyang at MIT.EDU
Wed Jun 15 02:23:58 CEST 2011


Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/6b0d62c952a5591456b9142018abc262d1857bf4

>---------------------------------------------------------------

commit 6b0d62c952a5591456b9142018abc262d1857bf4
Author: Edward Z. Yang <ezyang at mit.edu>
Date:   Wed Jun 15 00:40:36 2011 +0100

    Fix build for GHC earlier than 7.0.1.
    
    Signed-off-by: Edward Z. Yang <ezyang at mit.edu>

>---------------------------------------------------------------

 compiler/cmm/CmmRewriteAssignments.hs |    4 ++++
 compiler/cmm/CmmSpillReload.hs        |    4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/compiler/cmm/CmmRewriteAssignments.hs b/compiler/cmm/CmmRewriteAssignments.hs
index 6a59e34..d4d0e0c 100644
--- a/compiler/cmm/CmmRewriteAssignments.hs
+++ b/compiler/cmm/CmmRewriteAssignments.hs
@@ -3,6 +3,10 @@
 {-# LANGUAGE FlexibleContexts #-}
 
 {-# OPTIONS_GHC -fno-warn-warnings-deprecations #-}
+#if __GLASGOW_HASKELL__ < 701
+-- GHC 7.0.1 improved incomplete pattern warnings with GADTs
+{-# OPTIONS_GHC -fno-warn-incomplete-patterns #-}
+#endif
 
 -- This module implements generalized code motion for assignments to
 -- local registers, inlining and sinking when possible.  It also does
diff --git a/compiler/cmm/CmmSpillReload.hs b/compiler/cmm/CmmSpillReload.hs
index a4bedb0..1dbfbb0 100644
--- a/compiler/cmm/CmmSpillReload.hs
+++ b/compiler/cmm/CmmSpillReload.hs
@@ -3,9 +3,9 @@
 -- If this module lives on I'd like to get rid of this flag in due course
 
 {-# OPTIONS_GHC -fno-warn-warnings-deprecations #-}
-#if __GLASGOW_HASKELL__ >= 701
+#if __GLASGOW_HASKELL__ < 701
 -- GHC 7.0.1 improved incomplete pattern warnings with GADTs
-{-# OPTIONS_GHC -fwarn-incomplete-patterns #-}
+{-# OPTIONS_GHC -fno-warn-incomplete-patterns #-}
 #endif
 
 module CmmSpillReload





More information about the Cvs-ghc mailing list