diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2011-01-24 12:16:50 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2011-01-24 12:16:50 +0000 |
| commit | 889c084e943779e76d19f2ef5e970ff655f511eb (patch) | |
| tree | 56bba8db5c08c72dc1a85ecb2987e6c16c0fd635 /compiler/ghc.cabal.in | |
| parent | f1a90f54590e5a7a32a9c3ef2950740922b1f425 (diff) | |
| download | haskell-889c084e943779e76d19f2ef5e970ff655f511eb.tar.gz | |
Merge in new code generator branch.
This changes the new code generator to make use of the Hoopl package
for dataflow analysis. Hoopl is a new boot package, and is maintained
in a separate upstream git repository (as usual, GHC has its own
lagging darcs mirror in http://darcs.haskell.org/packages/hoopl).
During this merge I squashed recent history into one patch. I tried
to rebase, but the history had some internal conflicts of its own
which made rebase extremely confusing, so I gave up. The history I
squashed was:
- Update new codegen to work with latest Hoopl
- Add some notes on new code gen to cmm-notes
- Enable Hoopl lag package.
- Add SPJ note to cmm-notes
- Improve GC calls on new code generator.
Work in this branch was done by:
- Milan Straka <fox@ucw.cz>
- John Dias <dias@cs.tufts.edu>
- David Terei <davidterei@gmail.com>
Edward Z. Yang <ezyang@mit.edu> merged in further changes from GHC HEAD
and fixed a few bugs.
Diffstat (limited to 'compiler/ghc.cabal.in')
| -rw-r--r-- | compiler/ghc.cabal.in | 31 |
1 files changed, 12 insertions, 19 deletions
diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in index cc4c562a9d..32d13f839b 100644 --- a/compiler/ghc.cabal.in +++ b/compiler/ghc.cabal.in @@ -92,6 +92,7 @@ Library CPP-Options: -DOMIT_NATIVE_CODEGEN Build-Depends: bin-package-db + Build-Depends: hoopl -- GHC 6.4.2 needs to be able to find WCsubst.c, which needs to be -- able to find WCsubst.h @@ -188,45 +189,37 @@ Library BlockId CLabel Cmm - CmmBrokenBlock CmmBuildInfoTables CmmCPS - CmmCPSGen - CmmCPSZ CmmCallConv - CmmCommonBlockElimZ + CmmCommonBlockElim CmmContFlowOpt CmmCvt + CmmDecl CmmExpr CmmInfo CmmLex CmmLint CmmLive - CmmLiveZ + CmmMachOp + CmmNode CmmOpt CmmParse CmmProcPoint - CmmProcPointZ CmmSpillReload CmmStackLayout - CmmTx + CmmType CmmUtils - CmmZipUtil - DFMonad - Dataflow - MkZipCfg - MkZipCfgCmm + MkGraph + OldCmm + OldCmmUtils + OldPprCmm OptimizationFuel PprBase PprC PprCmm - PprCmmZ - StackColor - StackPlacements - ZipCfg - ZipCfgCmmRep - ZipCfgExtras - ZipDataflow + PprCmmDecl + PprCmmExpr Bitmap CgBindery CgCallConv |