[commit: ghc] master: Merge branch 'master' of http://darcs.haskell.org/ghc (66ec09b)
Simon Peyton Jones <[email protected]>
| Newsgroups | gmane.comp.lang.haskell.cvs.ghc |
|---|---|
| Message-ID | <[email protected]> |
Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master http://hackage.haskell.org/trac/ghc/changeset/66ec09b7398291670914723b745fd5749eeeb15a >--------------------------------------------------------------- commit 66ec09b7398291670914723b745fd5749eeeb15a Merge: b6acaf0... edb5303... Author: Simon Peyton Jones <[email protected]> Date: Fri Oct 26 11:06:29 2012 +0100 Merge branch 'master' of http://darcs.haskell.org/ghc aclocal.m4 | 2 +- compiler/cmm/CmmSink.hs | 50 ++++++++++++-------- compiler/main/DynFlags.hs | 12 ++++- compiler/main/GHC.hs | 2 +- docs/users_guide/glasgow_exts.xml | 2 +- ghc.mk | 32 ++++++++++++- ghc/Main.hs | 2 +- includes/stg/MiscClosures.h | 2 + mk/build.mk.sample | 3 +- mk/validate-settings.mk | 2 +- rts/Capability.c | 2 +- rts/Profiling.c | 2 +- rts/Schedule.c | 29 ----------- rules/build-dependencies.mk | 9 ---- rules/build-package-data.mk | 10 ++++ rules/haddock.mk | 6 +- rules/{trace.mk => library-path.mk} | 16 +++--- rules/shell-wrapper.mk | 45 ++++++++++++------ utils/ghc-cabal/Main.hs | 25 +++++++-- utils/ghc-cabal/ghc.mk | 2 +- utils/ghc-pkg/Main.hs | 42 +++++++++------- utils/ghc-pwd/ghc.mk | 2 +- utils/mkUserGuidePart/ghc.mk | 8 +-- .../mkUserGuidePart.cabal} | 8 ++-- validate | 23 +--------- 25 files changed, 182 insertions(+), 156 deletions(-)