diff options
| author | Ian Lynagh <igloo@earth.li> | 2009-02-06 14:34:20 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2009-02-06 14:34:20 +0000 |
| commit | 232e72122fa7f08690e3be2bb9f8a7f8024e37d5 (patch) | |
| tree | ace24a7e4c415d5ee5a466eb1d822e179d4d5be1 | |
| parent | 497302c44ad08c6c27d0e15d94a787f332c0cfec (diff) | |
| download | haskell-232e72122fa7f08690e3be2bb9f8a7f8024e37d5.tar.gz | |
Fix the build on amd64/Linux
| -rw-r--r-- | compiler/codeGen/CgHpc.hs | 2 | ||||
| -rw-r--r-- | compiler/codeGen/StgCmmForeign.hs | 1 | ||||
| -rw-r--r-- | compiler/codeGen/StgCmmHpc.hs | 1 | ||||
| -rw-r--r-- | compiler/nativeGen/PositionIndependentCode.hs | 1 | ||||
| -rw-r--r-- | compiler/nativeGen/PprMach.hs | 1 | ||||
| -rw-r--r-- | compiler/nativeGen/Regs.hs | 2 |
6 files changed, 5 insertions, 3 deletions
diff --git a/compiler/codeGen/CgHpc.hs b/compiler/codeGen/CgHpc.hs index faee9c2d3f..ce31717885 100644 --- a/compiler/codeGen/CgHpc.hs +++ b/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 diff --git a/compiler/codeGen/StgCmmForeign.hs b/compiler/codeGen/StgCmmForeign.hs index 711b79e13f..b8a725520f 100644 --- a/compiler/codeGen/StgCmmForeign.hs +++ b/compiler/codeGen/StgCmmForeign.hs @@ -37,6 +37,7 @@ import StaticFlags import Maybes import Outputable import ZipCfgCmmRep +import BasicTypes import Control.Monad diff --git a/compiler/codeGen/StgCmmHpc.hs b/compiler/codeGen/StgCmmHpc.hs index afc238a252..ab95a66cd0 100644 --- a/compiler/codeGen/StgCmmHpc.hs +++ b/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 diff --git a/compiler/nativeGen/PositionIndependentCode.hs b/compiler/nativeGen/PositionIndependentCode.hs index d74a627d0a..a1e11d8a34 100644 --- 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 BasicTypes import Pretty import qualified Outputable diff --git a/compiler/nativeGen/PprMach.hs b/compiler/nativeGen/PprMach.hs index 1e6f45847d..55e3930786 100644 --- 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 Regs import CLabel ( CLabel, pprCLabel, externallyVisibleCLabel, labelDynamic, mkAsmTempLabel, entryLblToInfoLbl ) diff --git a/compiler/nativeGen/Regs.hs b/compiler/nativeGen/Regs.hs index 51eb0f093b..c93ecdda0e 100644 --- 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, -#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, |