Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : pretty-build
http://hackage.haskell.org/trac/ghc/changeset/7befd215db8272ec6301abf1a05e6347da5d3ec8 >--------------------------------------------------------------- commit 7befd215db8272ec6301abf1a05e6347da5d3ec8 Merge: d209588... 7533607... Author: Iavor S. Diatchki <[email protected]> Date: Fri Apr 27 13:28:20 2012 -0700 Merge remote-tracking branch 'origin/master' into pretty-build aclocal.m4 | 2 +- compiler/coreSyn/CoreUnfold.lhs | 3 +- compiler/coreSyn/CoreUtils.lhs | 95 ++-- compiler/deSugar/DsMeta.hs | 2 +- compiler/iface/IfaceType.lhs | 2 +- compiler/main/DriverPipeline.hs | 16 +- compiler/main/DynFlags.hs | 7 +- compiler/nativeGen/AsmCodeGen.lhs | 2 +- compiler/nativeGen/RegAlloc/Graph/TrivColorable.hs | 56 ++-- compiler/nativeGen/RegAlloc/Linear/FreeRegs.hs | 14 +- compiler/nativeGen/RegAlloc/Linear/Main.hs | 14 +- compiler/nativeGen/TargetReg.hs | 70 ++-- compiler/prelude/primops.txt.pp | 6 + compiler/rename/RnEnv.lhs | 56 ++- compiler/rename/RnSource.lhs | 4 +- compiler/simplCore/CoreMonad.lhs | 7 +- compiler/simplCore/FloatIn.lhs | 16 +- compiler/simplCore/SimplCore.lhs | 4 +- compiler/simplCore/SimplMonad.lhs | 3 +- compiler/simplCore/SimplUtils.lhs | 2 + compiler/typecheck/TcEnv.lhs | 15 +- compiler/typecheck/TcErrors.lhs | 3 +- compiler/typecheck/TcForeign.lhs | 5 +- compiler/typecheck/TcGenGenerics.lhs | 22 +- compiler/typecheck/TcHsType.lhs | 2 - compiler/typecheck/TcInstDcls.lhs | 23 +- compiler/typecheck/TcInteract.lhs | 1 + compiler/typecheck/TcPat.lhs | 3 +- compiler/typecheck/TcRnDriver.lhs | 4 +- compiler/typecheck/TcSMonad.lhs | 3 +- compiler/typecheck/TcTyClsDecls.lhs | 60 ++- compiler/typecheck/TcType.lhs | 2 +- compiler/typecheck/TcUnify.lhs | 2 +- compiler/types/InstEnv.lhs | 8 +- compiler/types/Type.lhs | 2 +- compiler/types/TypeRep.lhs | 37 +- compiler/utils/Platform.hs | 12 +- config.guess | 482 ++++++++++---------- configure.ac | 14 + docs/users_guide/using.xml | 21 +- ghc/InteractiveUI.hs | 44 ++- ghc/hschooks.c | 5 +- includes/Rts.h | 37 +-- includes/mkDerivedConstants.c | 3 +- includes/rts/Hooks.h | 6 +- includes/rts/Messages.h | 15 +- includes/rts/Types.h | 6 +- includes/stg/MiscClosures.h | 1 + includes/stg/Types.h | 29 +- mk/validate-settings.mk | 12 +- rts/Capability.c | 4 +- rts/Disassembler.c | 18 +- rts/Linker.c | 33 +- rts/PrimOps.cmm | 16 +- rts/Printer.c | 24 +- rts/ProfHeap.c | 2 +- rts/RtsFlags.c | 2 +- rts/RtsStartup.c | 9 +- rts/Stats.c | 21 +- rts/Stats.h | 11 +- rts/Task.c | 4 +- rts/Ticky.c | 26 +- rts/Trace.c | 26 +- rts/eventlog/EventLog.c | 5 +- rts/eventlog/EventLog.h | 2 +- rts/hooks/MallocFail.c | 2 +- rts/hooks/OutOfHeap.c | 2 +- rts/hooks/StackOverflow.c | 2 +- rts/sm/Sanity.c | 18 +- rts/sm/Scav.c | 4 +- rts/win32/IOManager.c | 2 +- rts/win32/OSMem.c | 4 +- rules/build-package-data.mk | 2 +- rules/distdir-way-opts.mk | 8 +- utils/ghc-cabal/ghc.mk | 2 +- utils/ghc-pkg/ghc.mk | 1 + 76 files changed, 852 insertions(+), 658 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
