Fix the build on amd64/Linux

compiler/codeGen/CgHpc.hs

@@ -21,9 +21,7 @@ import FastString
 import HscTypes
 import Panic
 import Char
-import StaticFlags
 import BasicTypes
-import PackageConfig
 
 import Data.Word
 

compiler/codeGen/StgCmmForeign.hs

@@ -37,6 +37,7 @@ import StaticFlags
 import Maybes
 import Outputable
 import ZipCfgCmmRep
+import BasicTypes
 
 import Control.Monad
 

compiler/codeGen/StgCmmHpc.hs

@@ -21,6 +21,7 @@ import FastString
 import HscTypes
 import Char
 import StaticFlags
+import BasicTypes
 
 mkTickBox :: Module -> Int -> CmmAGraph
 mkTickBox mod n 

compiler/nativeGen/PositionIndependentCode.hs

@@ -70,6 +70,7 @@ import Instrs
 import NCGMonad         ( NatM, getNewRegNat, getNewLabelNat )
 
 import StaticFlags	( opt_PIC, opt_Static )
+import BasicTypes
 
 import Pretty
 import qualified Outputable

compiler/nativeGen/PprMach.hs

@@ -30,6 +30,7 @@ import BlockId
 import Cmm
 import Regs		-- may differ per-platform
 import Instrs
+import Regs
 
 import CLabel		( CLabel, pprCLabel, externallyVisibleCLabel,
 			  labelDynamic, mkAsmTempLabel, entryLblToInfoLbl )

compiler/nativeGen/Regs.hs

@@ -61,7 +61,7 @@ module Regs (
 	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,