[commit: ghc] master: Delete hack that was once needed to fix the build (a7ec061)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/a7ec061ed3c4373b0b47d6779d2fd259ad712b5e/ghc

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

commit a7ec061ed3c4373b0b47d6779d2fd259ad712b5e
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Thu Sep 25 23:10:33 2014 -0500

    Delete hack that was once needed to fix the build
    
    Summary:
    Introduced in 6c7b41cc2b24f533697a62bf1843507ae043fc97.
    
    I checked the rest of that commit, and this is all that was left to revert.
    
    Test Plan: x
    
    Reviewers: ezyang, austin
    
    Reviewed By: ezyang, austin
    
    Subscribers: simonmar, ezyang, carter, thomie
    
    Differential Revision: https://phabricator.haskell.org/D241


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

a7ec061ed3c4373b0b47d6779d2fd259ad712b5e
 compiler/nativeGen/RegAlloc/Graph/Spill.hs | 1 +
 compiler/nativeGen/RegAlloc/Liveness.hs    | 1 +
 compiler/utils/State.hs                    | 8 +++++---
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/compiler/nativeGen/RegAlloc/Graph/Spill.hs b/compiler/nativeGen/RegAlloc/Graph/Spill.hs
index 543db11..802046c 100644
--- a/compiler/nativeGen/RegAlloc/Graph/Spill.hs
+++ b/compiler/nativeGen/RegAlloc/Graph/Spill.hs
@@ -13,6 +13,7 @@ import Reg
 import Cmm hiding (RegSet)
 import BlockId
 
+import MonadUtils
 import State
 import Unique
 import UniqFM
diff --git a/compiler/nativeGen/RegAlloc/Liveness.hs b/compiler/nativeGen/RegAlloc/Liveness.hs
index d7fd8bd..167197d 100644
--- a/compiler/nativeGen/RegAlloc/Liveness.hs
+++ b/compiler/nativeGen/RegAlloc/Liveness.hs
@@ -44,6 +44,7 @@ import PprCmm()
 
 import Digraph
 import DynFlags
+import MonadUtils
 import Outputable
 import Platform
 import UniqSet
diff --git a/compiler/utils/State.hs b/compiler/utils/State.hs
index 216034f..7346841 100644
--- a/compiler/utils/State.hs
+++ b/compiler/utils/State.hs
@@ -1,8 +1,10 @@
-{-# LANGUAGE UnboxedTuples #-}
+{-# LANGUAGE UnboxedTuples, CPP #-}
 
-module State (module State, mapAccumLM {- XXX hack -}) where
+module State where
 
-import MonadUtils
+#if __GLASGOW_HASKELL__ < 709
+import Control.Applicative
+#endif
 
 newtype State s a = State { runState' :: s -> (# a, s #) }