Fix the build on amd64/Linux

diff --git a/compiler/codeGen/CgHpc.hs b/compiler/codeGen/CgHpc.hs
index faee9c2..ce31717 100644 (file)
--- a/compiler/codeGen/CgHpc.hs
+++ b/compiler/codeGen/CgHpc.hs
@@ -21,9 +21,7 @@ import FastString
 import HscTypes
 import Panic
 import Char
 import HscTypes
 import Panic
 import Char

-import StaticFlags

 import BasicTypes
 import BasicTypes

-import PackageConfig

 
 import Data.Word
 
 
 import Data.Word
 

diff --git a/compiler/codeGen/StgCmmForeign.hs b/compiler/codeGen/StgCmmForeign.hs
index 711b79e..b8a7255 100644 (file)
--- a/compiler/codeGen/StgCmmForeign.hs
+++ b/compiler/codeGen/StgCmmForeign.hs
@@ -37,6 +37,7 @@ import StaticFlags
 import Maybes
 import Outputable
 import ZipCfgCmmRep
 import Maybes
 import Outputable
 import ZipCfgCmmRep

+import BasicTypes

 
 import Control.Monad
 
 
 import Control.Monad
 

diff --git a/compiler/codeGen/StgCmmHpc.hs b/compiler/codeGen/StgCmmHpc.hs
index afc238a..ab95a66 100644 (file)
--- a/compiler/codeGen/StgCmmHpc.hs
+++ b/compiler/codeGen/StgCmmHpc.hs
@@ -21,6 +21,7 @@ import FastString
 import HscTypes
 import Char
 import StaticFlags
 import HscTypes
 import Char
 import StaticFlags

+import BasicTypes

 
 mkTickBox :: Module -> Int -> CmmAGraph
 mkTickBox mod n 
 
 mkTickBox :: Module -> Int -> CmmAGraph
 mkTickBox mod n 

diff --git a/compiler/nativeGen/PositionIndependentCode.hs b/compiler/nativeGen/PositionIndependentCode.hs
index d74a627..a1e11d8 100644 (file)
--- a/compiler/nativeGen/PositionIndependentCode.hs
+++ b/compiler/nativeGen/PositionIndependentCode.hs
@@ -70,6 +70,7 @@ import Instrs
 import NCGMonad         ( NatM, getNewRegNat, getNewLabelNat )
 
 import StaticFlags     ( opt_PIC, opt_Static )
 import NCGMonad         ( NatM, getNewRegNat, getNewLabelNat )
 
 import StaticFlags     ( opt_PIC, opt_Static )

+import BasicTypes

 
 import Pretty
 import qualified Outputable
 
 import Pretty
 import qualified Outputable

diff --git a/compiler/nativeGen/PprMach.hs b/compiler/nativeGen/PprMach.hs
index 1e6f458..55e3930 100644 (file)
--- a/compiler/nativeGen/PprMach.hs
+++ b/compiler/nativeGen/PprMach.hs
@@ -30,6 +30,7 @@ import BlockId
 import Cmm
 import Regs            -- may differ per-platform
 import Instrs
 import Cmm
 import Regs            -- may differ per-platform
 import Instrs

+import Regs

 
 import CLabel          ( CLabel, pprCLabel, externallyVisibleCLabel,
                          labelDynamic, mkAsmTempLabel, entryLblToInfoLbl )
 
 import CLabel          ( CLabel, pprCLabel, externallyVisibleCLabel,
                          labelDynamic, mkAsmTempLabel, entryLblToInfoLbl )

diff --git a/compiler/nativeGen/Regs.hs b/compiler/nativeGen/Regs.hs
index 51eb0f0..c93ecdd 100644 (file)
--- a/compiler/nativeGen/Regs.hs
+++ b/compiler/nativeGen/Regs.hs
@@ -61,7 +61,7 @@ module Regs (
        freg,
        sp, r3, r4, r27, r28, f1, f20, f21,
 
        freg,
        sp, r3, r4, r27, r28, f1, f20, f21,
 

-#elif i386_TARGET_ARCH || i386_64_TARGET_ARCH
+#elif i386_TARGET_ARCH || x86_64_TARGET_ARCH

        EABase(..), EAIndex(..), addrModeRegs,
        
        eax, ebx, ecx, edx, esi, edi, ebp, esp,
        EABase(..), EAIndex(..), addrModeRegs,
        
        eax, ebx, ecx, edx, esi, edi, ebp, esp,