Merge remote-tracking branch 'origin/master' into newcg
authorSimon Marlow <marlowsd@gmail.com>
Mon, 13 Feb 2012 21:19:21 +0000 (21:19 +0000)
committerSimon Marlow <marlowsd@gmail.com>
Mon, 13 Feb 2012 21:19:21 +0000 (21:19 +0000)
commitec2184eded032ec3305cc40c61149c4f8408ce49
tree9cbe1184a655a4afa5bebe20c0187b4eca3df7dc
parent3a47819657f6b8542107d14cbd883d93f6fbf442
parent4a0973bb25f8d328f1a41d43d9f45c374178113c
Merge remote-tracking branch 'origin/master' into newcg

Conflicts:
compiler/cmm/CmmLint.hs
compiler/cmm/OldCmm.hs
compiler/codeGen/CgMonad.lhs
compiler/main/CodeOutput.lhs
17 files changed:
compiler/cmm/CmmCvt.hs
compiler/cmm/CmmLint.hs
compiler/cmm/CmmParse.y
compiler/cmm/OldCmm.hs
compiler/cmm/OldPprCmm.hs
compiler/codeGen/CgInfoTbls.hs
compiler/codeGen/CgMonad.lhs
compiler/codeGen/StgCmmForeign.hs
compiler/codeGen/StgCmmMonad.hs
compiler/codeGen/StgCmmPrim.hs
compiler/ghc.cabal.in
compiler/ghc.mk
compiler/main/CodeOutput.lhs
compiler/main/DynFlags.hs
compiler/main/HscMain.hs
compiler/nativeGen/AsmCodeGen.lhs
compiler/utils/Outputable.lhs