[commit: ghc] ghc-generics's head updated: Fix some small things broken with the last merge. (d872133)

[José Pedro Magalhães]

Repository : ssh://darcs.haskell.org//srv/darcs/ghc

Branch 'ghc-generics' now includes:

     d637f9b... Add zeroWidthText to Pretty.
     4e6bac1... Start support for coloured SDoc output.
     daead6b... Make SDoc an abstract type.
     fdf8656... This BIG PATCH contains most of the work for the New Coercion Representation
     39bb1bd... Merge branch 'master' into ghc-new-co
     15bea1b... Comment changes to satisfy Haddock
     224ef30... Merge remote branch 'origin/master' into ghc-new-co
     b855273... A few more wibbles on ghc-new-co
     db4f42a... Merge in changes from HEAD
     5096055... Merge commit
     a10a21d... Be cleverer in dataConCannotMatch, fixes Trac #5168
     246183c... Improve dead block calculation, per Simon Marlow's advice.
     ee62a1b... Use eqSpecPreds
     abfa45f... Remove special case for EqPred in CoreView
     668ac80... Missing coercion case in byte code generation
     4f8d714... Substantial improvements in RtClosureInspect
     ca53c38... Merge master into the ghc-new-co branch
     fe58dd2... Fix build
     77c4f11... Remove commented out imports
     d5adcc5... Make retainer profiling use the label length (-L) flag)
     12fb168... Remove some dead code
     cc91e4a... Improve the warning about -fllvm and -fPIC/-dynamic conflicting
     7da235b... Move Platform from compiler/nativeGen to compiler/utils
     b29e277... Change some conditional tests from Config.cTargetArch to platformArch
     103494b... Remove unused pprUserReg functions
     be30b4d... Change more Config tests to Platform tests
     e233649... Remove commented out imports
     d8fd8d5... Remove an explicit import list
     78fe515... Whitespace only in ghci/ByteCodeGen.lhs
     00f44fd... Remove a use of cTargetOS, in favour of platformOS
     c5f7496... Change remaining uses of cTargetOS to platformOS
     d45197a... Merge branch 'coloured-core' of https://github.com/nominolo/ghc into coloured-core
     ce8ae48... Comments only
     37a6a52... Add $$($1_$2_$3_ALL_HC_OPTS) when linking dynamic libraries.  Not having this meant we weren't getting -no-user-package-conf, which caused a build failure for me due to locally-installed packages being used instead of ones in the tree.
     18197a0... heapCensus: we need to traverse the heap fragments stored in the gen_workspace structures.  Fixes heapprof001(prof_hc_hb).
     3d56d5a... Don't discard usage info from coercion bindings!
     cbebca1... Merge ghc-new-co into master branch
     4fbe278... Merge branch 'master' of http://darcs.haskell.org/ghc
     61d89bc... Merge branch 'master' of http://darcs.haskell.org/ghc into ghc-generics
     72d4ef3... fix pretty-printing of the cvttsd2si SSE2 instruction (fixes 5149 test on x86_64).
     13f959e... Fix the desugaring of guards in arrow syntax
     6a1aab7... Fix renaming of guards
     2d52051... Merge branch 'master' of http://darcs.haskell.org/ghc
     9e4c8ad... Merge branch 'master' of http://darcs.haskell.org/ghc into ghc-generics
     8ae1fd3... Fix bug in one-line stats printing
     a50363e... fix the names of the floating-point operations in the Cmm parser
     9fb9395... scheduleDoGC: if we're doing heapCensus(), do it *before* releasing the other mutator threads (#5127)
     cd54b70... Merge remote branch 'origin/master'
     e841f7a... Document -ddump-to-file.
     e4a7750... Merge branch 'master' of http://darcs.haskell.org/ghc
     025477e... Unix line endings for Pair.lhs
     c8c2f6b... The final batch of changes for the new coercion representation
     c25b934... Remove some old code.
     1b381af... Merge branch 'master' of http://darcs.haskell.org/ghc into ghc-generics
     d872133... Fix some small things broken with the last merge.