Use GHC.Exts rather than GHC.Prim

diff --git a/compiler/cmm/OptimizationFuel.hs b/compiler/cmm/OptimizationFuel.hs
index c15bd4d..49f8b05 100644 (file)
--- a/compiler/cmm/OptimizationFuel.hs
+++ b/compiler/cmm/OptimizationFuel.hs
@@ -11,7 +11,7 @@ module OptimizationFuel
     )
 where
 
-import GHC.Prim
+import GHC.Exts (State#)
 import Panic
 
 import Data.IORef

diff --git a/compiler/ghci/ByteCodeInstr.lhs b/compiler/ghci/ByteCodeInstr.lhs
index 50dbec1..d5e5e8e 100644 (file)
--- a/compiler/ghci/ByteCodeInstr.lhs
+++ b/compiler/ghci/ByteCodeInstr.lhs
@@ -37,7 +37,7 @@ import SMRep
 import GHC.Ptr
 
 import Module (Module)
-import GHC.Prim
+import GHC.Exts
 
 
 -- ----------------------------------------------------------------------------

diff --git a/compiler/ghci/ByteCodeItbls.lhs b/compiler/ghci/ByteCodeItbls.lhs
index 3d1e151..a05cfc1 100644 (file)
--- a/compiler/ghci/ByteCodeItbls.lhs
+++ b/compiler/ghci/ByteCodeItbls.lhs
@@ -38,7 +38,6 @@ import Data.Bits      ( Bits(..), shiftR )
 
 import GHC.Exts                ( Int(I#), addr2Int# )
 import GHC.Ptr         ( Ptr(..) )
-import GHC.Prim
 
 import Debug.Trace
 import Text.Printf

diff --git a/compiler/main/BreakArray.hs b/compiler/main/BreakArray.hs
index 364a917..8d86582 100644 (file)
--- a/compiler/main/BreakArray.hs
+++ b/compiler/main/BreakArray.hs
@@ -26,7 +26,6 @@ module BreakArray
 
 import GHC.Exts
 import GHC.IOBase
-import GHC.Prim
 import GHC.Word
 import Constants