[commit: ghc] wip/kavon-nosplit-llvm: import fixes for Hoopl (23a6940)

[git at git.haskell.org]

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

On branch  : wip/kavon-nosplit-llvm
Link       : http://ghc.haskell.org/trac/ghc/changeset/23a694038d4871eb5b6fa5664e0536b9bc468883/ghc

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

commit 23a694038d4871eb5b6fa5664e0536b9bc468883
Author: Kavon Farvardin <kavon at farvard.in>
Date:   Tue Jun 27 16:29:08 2017 +0100

    import fixes for Hoopl


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

23a694038d4871eb5b6fa5664e0536b9bc468883
 compiler/ghc.mk                         | 3 +++
 compiler/llvmGen/LlvmCodeGen.hs         | 1 +
 compiler/llvmGen/LlvmCodeGen/CodeGen.hs | 1 +
 compiler/llvmGen/LlvmMangler.hs         | 5 +++--
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/compiler/ghc.mk b/compiler/ghc.mk
index 34671f4..a83fa54 100644
--- a/compiler/ghc.mk
+++ b/compiler/ghc.mk
@@ -493,6 +493,9 @@ compiler_stage2_dll0_MODULES = \
 	PlaceHolder \
 	HsExtension \
 	PmExpr \
+	Hoopl.Collections \
+	Hoopl.Label \
+	Hoopl.Unique \
 	HsPat \
 	HsSyn \
 	HsTypes \
diff --git a/compiler/llvmGen/LlvmCodeGen.hs b/compiler/llvmGen/LlvmCodeGen.hs
index be8c688..16f5611 100644
--- a/compiler/llvmGen/LlvmCodeGen.hs
+++ b/compiler/llvmGen/LlvmCodeGen.hs
@@ -21,6 +21,7 @@ import Cmm
 import CmmUtils
 import Hoopl.Block
 import Hoopl.Collections
+import Hoopl.Label
 import PprCmm
 
 import BufWrite
diff --git a/compiler/llvmGen/LlvmCodeGen/CodeGen.hs b/compiler/llvmGen/LlvmCodeGen/CodeGen.hs
index fb9aed8..6d1ab2b 100644
--- a/compiler/llvmGen/LlvmCodeGen/CodeGen.hs
+++ b/compiler/llvmGen/LlvmCodeGen/CodeGen.hs
@@ -21,6 +21,7 @@ import CmmSwitch
 import Hoopl.Block
 import Hoopl.Graph
 import Hoopl.Collections
+import Hoopl.Label
 
 import DynFlags
 import FastString
diff --git a/compiler/llvmGen/LlvmMangler.hs b/compiler/llvmGen/LlvmMangler.hs
index 0517dde..a21b135 100644
--- a/compiler/llvmGen/LlvmMangler.hs
+++ b/compiler/llvmGen/LlvmMangler.hs
@@ -19,8 +19,9 @@ import Outputable ( text )
 import Control.Exception
 import qualified Data.ByteString.Char8 as B
 import System.IO
-import Compiler.Hoopl
-import Compiler.Hoopl.Internals ( uniqueToLbl )
+import Hoopl.Label
+import Hoopl.Collections
+import Hoopl.Unique ( intToUnique )
 import Data.Maybe ( fromMaybe )
 
 -- note [mangler string func]