Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/96acba6fe828bd9bc26459bba947125ddd80da76 >--------------------------------------------------------------- commit 96acba6fe828bd9bc26459bba947125ddd80da76 Merge: faa8ff4... c79f733... Author: Simon Peyton Jones <simo...@microsoft.com> Date: Fri Dec 14 17:39:34 2012 +0000 Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc Conflicts: compiler/typecheck/TcTyClsDecls.lhs compiler/cmm/CmmMachOp.hs | 2 + compiler/cmm/PprC.hs | 4 + compiler/codeGen/StgCmmPrim.hs | 6 + compiler/ghci/ByteCodeGen.lhs | 10 +- compiler/iface/LoadIface.lhs | 24 ++-- compiler/iface/MkIface.lhs | 5 +- compiler/llvmGen/LlvmCodeGen/CodeGen.hs | 12 ++ compiler/main/CodeOutput.lhs | 14 ++- compiler/main/DriverPipeline.hs | 18 ++- compiler/main/DynFlags.hs | 110 +++++++++++++------ compiler/main/GHC.hs | 27 +++++ compiler/main/HscMain.hs | 9 ++- compiler/main/HscTypes.lhs | 4 + compiler/nativeGen/AsmCodeGen.lhs | 175 ++++++++++++++++-------------- compiler/nativeGen/CPrim.hs | 12 ++- compiler/nativeGen/PPC/CodeGen.hs | 2 + compiler/nativeGen/SPARC/CodeGen.hs | 2 + compiler/nativeGen/X86/CodeGen.hs | 13 ++ compiler/prelude/primops.txt.pp | 3 + compiler/typecheck/TcGenGenerics.lhs | 14 +-- compiler/typecheck/TcRnMonad.lhs | 9 ++ compiler/typecheck/TcRnTypes.lhs | 2 + compiler/utils/Binary.hs | 12 +- compiler/utils/BufWrite.hs | 30 +++-- compiler/utils/FastString.lhs | 174 +++++++++++++---------------- docs/users_guide/bugs.xml | 22 ++-- docs/users_guide/ffi-chap.xml | 28 +++-- docs/users_guide/flags.xml | 8 ++ docs/users_guide/glasgow_exts.xml | 3 + docs/users_guide/using.xml | 47 ++++++++ includes/Stg.h | 7 +- includes/rts/Threads.h | 3 + includes/stg/TailCalls.h | 185 ------------------------------- rts/Capability.h | 3 +- rts/Linker.c | 1 + rts/STM.c | 24 ++++- sync-all | 27 +++-- 37 files changed, 557 insertions(+), 494 deletions(-) _______________________________________________ Cvs-ghc mailing list Cvs-ghc@haskell.org http://www.haskell.org/mailman/listinfo/cvs-ghc
