summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* The local-gc branch is in a working state at this fingerprint:local-gcSimon Marlow2011-06-060-0/+0
* fix an interaction between the new pinned_object_block policy andSimon Marlow2011-06-062-5/+22
* fix the new capset events: they were being emitted even without +RTS -Ds.Simon Marlow2011-06-061-5/+13
* fix merge bugsSimon Marlow2011-06-065-31/+33
* mergeSimon Marlow2011-06-05325-13006/+15246
|\
| * add commentSimon Marlow2011-06-041-0/+4
| * comment typoSimon Marlow2011-06-041-1/+1
| * Tidy up the ic_exports field of the InteractiveContext. PreviouslySimon Marlow2011-06-046-114/+139
| * Make builds that use stage1 use "dist-install" consistently. ThisSimon Marlow2011-05-286-25/+25
| * Emit various bits of OS process info into the eventlogDuncan Coutts2011-05-2610-2/+330
| * Add capability sets to the tracing/events systemDuncan Coutts2011-05-266-2/+183
| * Make the tracing of the startup event more regularDuncan Coutts2011-05-265-12/+36
| * Rearrange shutdownCapability code slightlyDuncan Coutts2011-05-263-37/+45
| * Merge branch 'ghc-generics'Jose Pedro Magalhaes2011-05-262-7/+22
| |\
| | * Better output for -ddump-deriv when using generics.Jose Pedro Magalhaes2011-05-252-7/+22
| * | Merge branch 'master' of http://darcs.haskell.org/ghcSimon Peyton Jones2011-05-2652-1469/+1386
| |\ \
| | * \ Merge remote branch 'origin/master' into ghc-genericsSimon Peyton Jones2011-05-2642-756/+883
| | |\ \
| | * | | Do not be so eager about loading family-instance modulesSimon Peyton Jones2011-05-261-19/+22
| | * | | Rejig the way in which generic default method signatures are checkedSimon Peyton Jones2011-05-266-78/+77
| | | |/ | | |/|
| | * | Remove comment.Jose Pedro Magalhaes2011-05-231-5/+1
| | * | Fix a bug with standalone deriving of Generic instances.Jose Pedro Magalhaes2011-05-231-4/+17
| | * | Merge branch 'master' of http://darcs.haskell.org/ghc into ghc-genericsJose Pedro Magalhaes2011-05-2028-260/+1260
| | |\ \
| | * \ \ Merge branch 'ghc-generics' of http://darcs.haskell.org/ghc into ghc-genericsJose Pedro Magalhaes2011-05-208-88/+88
| | |\ \ \
| | | * | | Simon's fixes to the generated type instances in GenericsSimon Peyton Jones2011-05-208-88/+88
| | * | | | Merge branch 'master' of http://darcs.haskell.org/ghc into ghc-genericsJose Pedro Magalhaes2011-05-1732-440/+1090
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Fix some small things broken with the last merge.Jose Pedro Magalhaes2011-05-122-3/+5
| | * | | | Merge branch 'master' of http://darcs.haskell.org/ghc into ghc-genericsJose Pedro Magalhaes2011-05-12136-4474/+5159
| | |\ \ \ \
| | * | | | | Remove some old code.Jose Pedro Magalhaes2011-05-121-80/+23
| | * | | | | Merge branch 'master' of http://darcs.haskell.org/ghc into ghc-genericsJose Pedro Magalhaes2011-05-107-15/+63
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' of http://darcs.haskell.org/ghc into ghc-genericsJose Pedro Magalhaes2011-05-0924-728/+675
| | |\ \ \ \ \ \
| | * | | | | | | Make the errors for DeriveGeneric consistent with other deriving errors.Jose Pedro Magalhaes2011-05-091-5/+5
| | * | | | | | | "Representable0" -> "Generic" in the user's guide.Jose Pedro Magalhaes2011-05-092-32/+31
| | * | | | | | | Improve the error message when we cannot derive Generic.Jose Pedro Magalhaes2011-05-092-13/+34
| | * | | | | | | Deprecate -XGenerics.Jose Pedro Magalhaes2011-05-092-8/+5
| | * | | | | | | Rename `Representable0` to `Generic`.Jose Pedro Magalhaes2011-05-094-106/+71
| | * | | | | | | Merge branch 'ghc-generics' of http://darcs.haskell.org/ghc into ghc-genericsJose Pedro Magalhaes2011-05-051-13/+13
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch 'ghc-generics' of http://darcs.haskell.org/ghc into ghc-genericsSimon Peyton Jones2011-05-0559-1550/+2352
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | Invert sense of "why" error messages, so that "or" means "or"Simon Peyton Jones2011-05-041-13/+13
| | * | | | | | | | | Do not enable -XGenerics when building the optimized libs.Jose Pedro Magalhaes2011-05-053-9/+3
| | * | | | | | | | | Remove comment mentioning the old generic classes.Jose Pedro Magalhaes2011-05-051-2/+1
| | * | | | | | | | | Update the User Guide with generics stuff.Jose Pedro Magalhaes2011-05-052-212/+202
| | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Fix a previous incorrect merge.Jose Pedro Magalhaes2011-05-051-3/+2
| | * | | | | | | | Merge branch 'master' of http://darcs.haskell.org/ghc into ghc-genericsJose Pedro Magalhaes2011-05-0518-360/+368
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'master' of http://darcs.haskell.org/ghc into ghc-genericsJose Pedro Magalhaes2011-05-0435-1069/+1967
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Remove HsNumTy and TypePati.Jose Pedro Magalhaes2011-05-0419-125/+22
| | | |_|/ / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge branch 'master' of http://darcs.haskell.org/ghc into ghc-genericsJose Pedro Magalhaes2011-05-044-30/+41
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Add a new flag XDefaultSignatures to enable just the signatures on the defaul...Jose Pedro Magalhaes2011-05-046-47/+41
| | * | | | | | | | | | Update location of the CString stuff (from GHC.Base to GHC.CString).Jose Pedro Magalhaes2011-05-031-5/+6
| | * | | | | | | | | | Use NoSelector when a constructor does not have fields.Jose Pedro Magalhaes2011-05-031-19/+26
| | * | | | | | | | | | Merge branch 'master' of http://darcs.haskell.org/ghc into ghc-genericsJose Pedro Magalhaes2011-05-0249-2553/+750
| | |\ \ \ \ \ \ \ \ \ \