Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/bfbf3858110b1e16b2efd89f691e426b03e52343 >--------------------------------------------------------------- commit bfbf3858110b1e16b2efd89f691e426b03e52343 Merge: a347cd7... e49dae3... Author: Simon Peyton Jones <[email protected]> Date: Thu Jun 30 14:49:14 2011 +0100 Merge branch 'master' of http://darcs.haskell.org/ghc .gitignore | 5 +- aclocal.m4 | 3 + compiler/basicTypes/VarEnv.lhs | 17 +++- compiler/cmm/CmmDecl.hs | 7 - compiler/cmm/CmmMachOp.hs | 26 +--- compiler/cmm/CmmNode.hs | 11 +- compiler/cmm/CmmType.hs | 14 +-- compiler/codeGen/CgCase.lhs | 19 +++ compiler/codeGen/CgExpr.lhs | 7 + compiler/codeGen/CgPrimOp.hs | 20 +++ compiler/coreSyn/CoreSubst.lhs | 3 +- compiler/deSugar/Coverage.lhs | 25 +--- compiler/deSugar/Desugar.lhs | 3 +- compiler/iface/BinIface.hs | 8 +- compiler/iface/LoadIface.lhs | 4 + compiler/iface/MkIface.lhs | 66 +++++----- compiler/llvmGen/LlvmCodeGen/Base.hs | 4 +- compiler/main/CmdLineParser.hs | 6 +- compiler/main/DriverPipeline.hs | 19 +++- compiler/main/DynFlags.hs | 39 ++++-- compiler/main/GHC.hs | 2 +- compiler/main/GhcMake.hs | 6 +- compiler/main/HscMain.lhs | 59 +++++++-- compiler/main/HscTypes.lhs | 77 ++++++++---- compiler/main/StaticFlags.hs | 11 ++- compiler/main/SysTools.lhs | 4 +- compiler/nativeGen/AsmCodeGen.lhs | 2 + compiler/nativeGen/RegAlloc/Graph/TrivColorable.hs | 4 + compiler/nativeGen/RegAlloc/Linear/FreeRegs.hs | 1 + compiler/nativeGen/RegAlloc/Linear/Main.hs | 1 + compiler/nativeGen/TargetReg.hs | 5 + compiler/nativeGen/X86/CodeGen.hs | 15 +-- compiler/nativeGen/X86/RegInfo.hs | 1 + compiler/prelude/PrelNames.lhs | 7 + compiler/prelude/PrelRules.lhs | 30 ++++- compiler/prelude/primops.txt.pp | 15 ++ compiler/rename/RnNames.lhs | 137 +++++++++++++++----- compiler/typecheck/TcErrors.lhs | 2 +- compiler/typecheck/TcRnDriver.lhs | 13 ++- compiler/typecheck/TcRnTypes.lhs | 80 +++++++----- compiler/types/InstEnv.lhs | 4 +- compiler/utils/Outputable.lhs | 25 ++++ compiler/utils/Platform.hs | 4 + compiler/utils/UniqFM.lhs | 10 ++- docs/users_guide/flags.xml | 6 + docs/users_guide/ghci.xml | 4 + ghc/InteractiveUI.hs | 5 +- rts/Adjustor.c | 56 +------- rts/AdjustorAsm.S | 7 +- rts/StgCRun.c | 54 ++++---- rts/Trace.h | 6 +- rts/ghc.mk | 6 +- utils/fingerprint/fingerprint.py | 2 +- 53 files changed, 633 insertions(+), 334 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
