cvs commit: fptools/ghc/compiler/cmm CLabel.hs CmmParse.y fptools/ghc/compiler/codeGen CgBindery.lhs CgCase.lhs CgCon.lhs CgExpr.lhs CgHeapery.lhs CgMonad.lhs CgTailCall.lhs CgUtils.hs ClosureInfo.lhs CodeGen.lhs fptools/ghc/compiler/compMan ...

[Simon Marlow]

simonmar    2005/07/08 04:27:59 PDT

  Modified files:        (Branch: ghc-6-4-branch)
    ghc/compiler/cmm     CLabel.hs CmmParse.y 
    ghc/compiler/codeGen CgBindery.lhs CgCase.lhs CgCon.lhs 
                         CgExpr.lhs CgHeapery.lhs CgMonad.lhs 
                         CgTailCall.lhs CgUtils.hs ClosureInfo.lhs 
                         CodeGen.lhs 
    ghc/compiler/compMan CompManager.lhs 
    ghc/compiler/deSugar Desugar.lhs 
    ghc/compiler/iface   MkIface.lhs 
    ghc/compiler/main    Finder.lhs HscMain.lhs HscTypes.lhs 
                         Packages.lhs TidyPgm.lhs 
    ghc/compiler/profiling SCCfinal.lhs 
    ghc/compiler/simplStg SimplStg.lhs 
    ghc/compiler/stgSyn  StgSyn.lhs 
    ghc/compiler/typecheck Inst.lhs TcRnDriver.lhs TcRnMonad.lhs 
                           TcRnTypes.lhs 
  Log:
  Merge the package changes from the HEAD, in preparation for 6.4.1.
  
  The following patches were merged:
  
    1.156     +2 -2      fptools/ghc/compiler/typecheck/Inst.lhs
    1.127     +25 -20    fptools/ghc/compiler/typecheck/TcRnDriver.lhs
    1.57      +15 -2     fptools/ghc/compiler/typecheck/TcRnMonad.lhs
    1.61      +5 -1      fptools/ghc/compiler/typecheck/TcRnTypes.lhs
    1.49      +8 -7      fptools/ghc/compiler/stgSyn/StgSyn.lhs
    1.47      +4 -2      fptools/ghc/compiler/simplStg/SimplStg.lhs
    1.40      +4 -4      fptools/ghc/compiler/profiling/SCCfinal.lhs
    1.85      +37 -55    fptools/ghc/compiler/main/Finder.lhs
    1.42      +47 -24    fptools/ghc/compiler/main/GHC.hs
    1.223     +9 -6      fptools/ghc/compiler/main/HscMain.lhs
    1.141     +19 -13    fptools/ghc/compiler/main/HscTypes.lhs
    1.38      +142 -71   fptools/ghc/compiler/main/Packages.lhs
    1.26      +2 -0      fptools/ghc/compiler/main/TidyPgm.lhs
    1.34      +11 -9     fptools/ghc/compiler/iface/MkIface.lhs
    1.88      +3 -1      fptools/ghc/compiler/deSugar/Desugar.lhs
    1.57      +2 -2      fptools/ghc/compiler/codeGen/CgBindery.lhs
    1.75      +3 -3      fptools/ghc/compiler/codeGen/CgCase.lhs
    1.51      +13 -13    fptools/ghc/compiler/codeGen/CgCon.lhs
    1.62      +11 -11    fptools/ghc/compiler/codeGen/CgExpr.lhs
    1.47      +5 -7      fptools/ghc/compiler/codeGen/CgHeapery.lhs
    1.45      +14 -8     fptools/ghc/compiler/codeGen/CgMonad.lhs
    1.43      +3 -3      fptools/ghc/compiler/codeGen/CgTailCall.lhs
    1.17      +5 -4      fptools/ghc/compiler/codeGen/CgUtils.hs
    1.70      +23 -24    fptools/ghc/compiler/codeGen/ClosureInfo.lhs
    1.73      +25 -22    fptools/ghc/compiler/codeGen/CodeGen.lhs
    1.18      +20 -20    fptools/ghc/compiler/cmm/CLabel.hs
    1.8       +4 -4      fptools/ghc/compiler/cmm/CmmParse.y
    1.39      +10 -4     fptools/ghc/compiler/main/Packages.lhs
  
  Revision  Changes    Path
  1.14.2.1  +20 -19    fptools/ghc/compiler/cmm/CLabel.hs
  1.5.6.1   +4 -4      fptools/ghc/compiler/cmm/CmmParse.y
  1.55.6.1  +2 -2      fptools/ghc/compiler/codeGen/CgBindery.lhs
  1.72.6.1  +3 -3      fptools/ghc/compiler/codeGen/CgCase.lhs
  1.49.6.2  +13 -13    fptools/ghc/compiler/codeGen/CgCon.lhs
  1.61.6.1  +11 -11    fptools/ghc/compiler/codeGen/CgExpr.lhs
  1.42.6.1  +5 -7      fptools/ghc/compiler/codeGen/CgHeapery.lhs
  1.43.6.1  +13 -7     fptools/ghc/compiler/codeGen/CgMonad.lhs
  1.41.6.1  +3 -3      fptools/ghc/compiler/codeGen/CgTailCall.lhs
  1.12.2.4  +4 -3      fptools/ghc/compiler/codeGen/CgUtils.hs
  1.66.6.1  +23 -23    fptools/ghc/compiler/codeGen/ClosureInfo.lhs
  1.63.6.1  +23 -20    fptools/ghc/compiler/codeGen/CodeGen.lhs
  1.159.2.8 +1 -0      fptools/ghc/compiler/compMan/Attic/CompManager.lhs
  1.84.2.2  +3 -1      fptools/ghc/compiler/deSugar/Desugar.lhs
  1.26.2.3  +11 -9     fptools/ghc/compiler/iface/MkIface.lhs
  1.76.2.3  +81 -64    fptools/ghc/compiler/main/Finder.lhs
  1.203.2.3 +7 -5      fptools/ghc/compiler/main/HscMain.lhs
  1.123.2.3 +2 -2      fptools/ghc/compiler/main/HscTypes.lhs
  1.26.2.7  +151 -72   fptools/ghc/compiler/main/Packages.lhs
  1.20.2.1  +1 -2      fptools/ghc/compiler/main/TidyPgm.lhs
  1.38.6.1  +4 -3      fptools/ghc/compiler/profiling/SCCfinal.lhs
  1.44.6.1  +4 -2      fptools/ghc/compiler/simplStg/SimplStg.lhs
  1.46.6.1  +8 -7      fptools/ghc/compiler/stgSyn/StgSyn.lhs
  1.146.2.4 +3 -2      fptools/ghc/compiler/typecheck/Inst.lhs
  1.95.2.11 +26 -20    fptools/ghc/compiler/typecheck/TcRnDriver.lhs
  1.44.2.2  +15 -2     fptools/ghc/compiler/typecheck/TcRnMonad.lhs
  1.51.2.4  +5 -1      fptools/ghc/compiler/typecheck/TcRnTypes.lhs