Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : new-typeable
http://hackage.haskell.org/trac/ghc/changeset/ba7affb61e0d0ec9393efa7faa0865239150929b >--------------------------------------------------------------- commit ba7affb61e0d0ec9393efa7faa0865239150929b Merge: 959fb56... 5d0d1d9... Author: Jose Pedro Magalhaes <j...@cs.ox.ac.uk> Date: Wed Dec 12 10:53:02 2012 +0000 Merge branch 'master', remote-tracking branch 'origin' into new-typeable aclocal.m4 | 2 +- compiler/basicTypes/DataCon.lhs | 8 +- compiler/basicTypes/DataCon.lhs-boot | 2 + compiler/cmm/PprC.hs | 3 + compiler/ghc.cabal.in | 10 +-- compiler/ghc.mk | 20 +++- compiler/ghci/keepCAFsForGHCi.c | 5 +- compiler/iface/IfaceType.lhs | 71 +++++------- compiler/iface/LoadIface.lhs | 210 ++++++++++++++++++++-------------- compiler/iface/MkIface.lhs | 7 +- compiler/main/CodeOutput.lhs | 17 ++- compiler/main/DriverPipeline.hs | 141 ++++++++++++----------- compiler/main/DynFlags.hs | 139 ++++++++++++++++------- compiler/main/DynamicLoading.hs | 7 +- compiler/main/GHC.hs | 27 +++++ compiler/main/HscMain.hs | 9 ++- compiler/main/HscTypes.lhs | 4 + compiler/main/TidyPgm.lhs | 207 ++++++++++++++++++---------------- compiler/nativeGen/AsmCodeGen.lhs | 162 ++++++++++++++------------ compiler/rename/RnNames.lhs | 40 +++++-- compiler/typecheck/TcGenGenerics.lhs | 14 +-- compiler/typecheck/TcRnMonad.lhs | 9 ++ compiler/typecheck/TcRnTypes.lhs | 5 + compiler/typecheck/TcTyClsDecls.lhs | 50 ++++++++ compiler/typecheck/TcType.lhs | 4 +- compiler/types/TyCon.lhs | 43 +++++++- compiler/types/Type.lhs | 10 +-- configure.ac | 118 ++++++++++---------- 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 | 50 ++++++++- docs/users_guide/using.xml | 47 ++++++++ rts/Linker.c | 1 + rts/STM.c | 24 ++++- sync-all | 33 +++--- 36 files changed, 988 insertions(+), 569 deletions(-) _______________________________________________ Cvs-ghc mailing list Cvs-ghc@haskell.org http://www.haskell.org/mailman/listinfo/cvs-ghc
