ghc-hetmet.git
11 years agoBetter output for -ddump-deriv when using generics.
Jose Pedro Magalhaes [Wed, 25 May 2011 09:57:44 +0000 (11:57 +0200)]
Better output for -ddump-deriv when using generics.

11 years agoRemove comment.
Jose Pedro Magalhaes [Mon, 23 May 2011 13:54:55 +0000 (15:54 +0200)]
Remove comment.

11 years agoFix a bug with standalone deriving of Generic instances.
Jose Pedro Magalhaes [Mon, 23 May 2011 09:54:38 +0000 (11:54 +0200)]
Fix a bug with standalone deriving of Generic instances.

11 years agoMerge branch 'master' of http://darcs.haskell.org/ghc into ghc-generics
Jose Pedro Magalhaes [Fri, 20 May 2011 18:15:23 +0000 (20:15 +0200)]
Merge branch 'master' of darcs.haskell.org/ghc into ghc-generics

Fixed conflicts:
compiler/typecheck/TcSMonad.lhs

11 years agoMerge branch 'ghc-generics' of http://darcs.haskell.org/ghc into ghc-generics
Jose Pedro Magalhaes [Fri, 20 May 2011 17:17:13 +0000 (19:17 +0200)]
Merge branch 'ghc-generics' of darcs.haskell.org/ghc into ghc-generics

11 years agoSimon's fixes to the generated type instances in Generics
Simon Peyton Jones [Fri, 20 May 2011 16:51:05 +0000 (17:51 +0100)]
Simon's fixes to the generated type instances in Generics

11 years agoMake array copy primops inline
Johan Tibell [Fri, 15 Apr 2011 11:40:05 +0000 (13:40 +0200)]
Make array copy primops inline

11 years agoAdd array copy/clone primops
Daniel Peebles [Tue, 12 Apr 2011 11:35:59 +0000 (13:35 +0200)]
Add array copy/clone primops

11 years agoMerge branch 'master' of http://darcs.haskell.org/ghc
Dimitrios Vytiniotis [Thu, 19 May 2011 08:56:56 +0000 (09:56 +0100)]
Merge branch 'master' of darcs.haskell.org/ghc

11 years agoadd 'sync-all log'
Simon Marlow [Wed, 18 May 2011 15:38:32 +0000 (16:38 +0100)]
add 'sync-all log'

11 years agoMerge remote branch 'origin/master'
Dimitrios Vytiniotis [Wed, 18 May 2011 13:12:46 +0000 (14:12 +0100)]
Merge remote branch 'origin/master'

Fixed conflicts in:
compiler/typecheck/TcCanonical.lhs
compiler/typecheck/TcErrors.lhs
compiler/typecheck/TcInteract.lhs

11 years agoAdd capability sets to the event system. Contains code from Duncan Coutts.
Spencer Janssen [Thu, 14 Apr 2011 06:11:05 +0000 (01:11 -0500)]
Add capability sets to the event system. Contains code from Duncan Coutts.

11 years agoFixes the way we check if flattening happened during
Dimitrios Vytiniotis [Wed, 18 May 2011 09:13:55 +0000 (10:13 +0100)]
Fixes the way we check if flattening happened during
canonicalization. We now check whether the returned
coercion is an identity coercion. We used to check
whether we return any constraints from flattening but
that's wrong in the presence of the flattening cache.

11 years agoFIX #4825: Update User Guide info on DLLs.
Duncan Coutts [Tue, 17 May 2011 16:32:35 +0000 (17:32 +0100)]
FIX #4825: Update User Guide info on DLLs.

Original patch by Orphi <MathematicalOrchid@hotmail.com>
Plus a few miscellaneous updates from me.

11 years agoIntroducing:
Dimitrios Vytiniotis [Tue, 17 May 2011 16:24:50 +0000 (17:24 +0100)]
Introducing:
   1) Postponing the application of instances when there
      is a possibility of a given matching. With the addition
      of prioritizing equalities this fixes #5002 and #4981.

   2) Implemented caching of flattening in constraint
      simplification. This improves efficiency (fixes #5030)

   3) Simplified pushing of unsolved wanteds
      (now pushing only equalities) inside implications.

11 years agoMerge branch 'master' of http://darcs.haskell.org/ghc into ghc-generics
Jose Pedro Magalhaes [Tue, 17 May 2011 06:51:09 +0000 (08:51 +0200)]
Merge branch 'master' of darcs.haskell.org/ghc into ghc-generics

11 years agoAmend comment per Marlow's comments.
Edward Z. Yang [Mon, 16 May 2011 11:55:20 +0000 (12:55 +0100)]
Amend comment per Marlow's comments.

Signed-off-by: Edward Z. Yang <ezyang@mit.edu>

11 years agoFix build when DEBUG is on
Max Bolingbroke [Sun, 15 May 2011 22:08:54 +0000 (23:08 +0100)]
Fix build when DEBUG is on

11 years agoUse FractionalLit more extensively to improve other pretty printers
Max Bolingbroke [Sun, 15 May 2011 18:36:41 +0000 (19:36 +0100)]
Use FractionalLit more extensively to improve other pretty printers

11 years agoRecord the original text along with parsed Rationals: fixes #2245
Max Bolingbroke [Sun, 15 May 2011 17:50:54 +0000 (18:50 +0100)]
Record the original text along with parsed Rationals: fixes #2245

11 years agoWork around lack of saving volatile registers from unsafe foreign calls.
Edward Z. Yang [Sun, 15 May 2011 12:58:42 +0000 (13:58 +0100)]
Work around lack of saving volatile registers from unsafe foreign calls.

Signed-off-by: Edward Z. Yang <ezyang@mit.edu>

11 years agoMake -ddump-to-file truncate existing files.
Edward Z. Yang [Sun, 15 May 2011 10:57:51 +0000 (11:57 +0100)]
Make -ddump-to-file truncate existing files.

Signed-off-by: Edward Z. Yang <ezyang@mit.edu>

11 years agoMore aggressive clobber detection with Hp and RegSlot.
Edward Z. Yang [Sat, 14 May 2011 14:04:36 +0000 (15:04 +0100)]
More aggressive clobber detection with Hp and RegSlot.

Signed-off-by: Edward Z. Yang <ezyang@mit.edu>

11 years agoSplit -ddump-cmmz into many smaller flags.
Edward Z. Yang [Sat, 14 May 2011 11:48:30 +0000 (12:48 +0100)]
Split -ddump-cmmz into many smaller flags.

Signed-off-by: Edward Z. Yang <ezyang@mit.edu>

11 years agoMore aggressive CmmRegOff inlining, and fix failure to inline to assignments.
Edward Z. Yang [Sat, 14 May 2011 11:49:08 +0000 (12:49 +0100)]
More aggressive CmmRegOff inlining, and fix failure to inline to assignments.

Signed-off-by: Edward Z. Yang <ezyang@mit.edu>

11 years agoGeneralized assignment rewriting pass.
Edward Z. Yang [Wed, 13 Apr 2011 10:16:36 +0000 (11:16 +0100)]
Generalized assignment rewriting pass.

This assignment rewriting pass subsumes the previous reload
sinking pass, and also performs basic inlining.

Signed-off-by: Edward Z. Yang <ezyang@mit.edu>

11 years agoFix build: Add missing import and remove unneeded #ifdef.
Ben Lippmeier [Sun, 15 May 2011 10:26:22 +0000 (20:26 +1000)]
Fix build: Add missing import and remove unneeded #ifdef.
From Erik de Castro Lopo.

11 years agoAccept '-l foo' as library syntax: fixes #4869
Max Bolingbroke [Sun, 15 May 2011 08:41:57 +0000 (09:41 +0100)]
Accept '-l foo' as library syntax: fixes #4869

11 years agoUnicode fixes, taking into account PEP383 support
Max Bolingbroke [Sat, 14 May 2011 21:34:41 +0000 (22:34 +0100)]
Unicode fixes, taking into account PEP383 support

11 years agoMake the GHCi linker handle partially stripped object files (#5004)
Duncan Coutts [Thu, 12 May 2011 15:25:41 +0000 (16:25 +0100)]
Make the GHCi linker handle partially stripped object files (#5004)

When you use 'strip --strip-unneeded' on a ELF format .o or .a file, if
the object file has no global/exported symbols then 'strip' ends up
removing the symbol table entirely. Previously the GHCi linker assumed
there would always be exactly one symbol table and exactly one string
table. In fact, in ELF object files there is no such limitation, instead
each section points to the other sections it needs, in particular
relocation sections have a link to the symbol table section they use and
symbol table sections have a link to the corresponding string table.
So instead of assuming there will always be a global symbol and string
table, all we have to do is validate and follow these links. Then, when
we encounter an empty object file that has no symbols then we handle it
correctly, because since it's empty we never process any relocations and
so never have to follow any links to non-existant symbol tables.

Also, in the case where an object is fully stripped, we can now detect
this more reliably and emit a more helpful error message, e.g:

libHSghc-7.1.20110509.a(DsMeta.o): relocation section #2 has no symbol table
This object file has probably been fully striped. Such files cannot be linked.

11 years agoFix some small things broken with the last merge.
Jose Pedro Magalhaes [Thu, 12 May 2011 13:48:45 +0000 (15:48 +0200)]
Fix some small things broken with the last merge.

11 years agoMerge branch 'master' of /Users/benl/devel/ghc/ghc-head
Ben Lippmeier [Thu, 12 May 2011 12:38:13 +0000 (22:38 +1000)]
Merge branch 'master' of /Users/benl/devel/ghc/ghc-head

11 years agoMerge branch 'master' of http://darcs.haskell.org/ghc into ghc-generics
Jose Pedro Magalhaes [Thu, 12 May 2011 11:26:03 +0000 (13:26 +0200)]
Merge branch 'master' of darcs.haskell.org/ghc into ghc-generics

Resolved conflicts:
compiler/typecheck/TcTyClsDecls.lhs

11 years agoRemove some old code.
Jose Pedro Magalhaes [Thu, 12 May 2011 11:11:07 +0000 (13:11 +0200)]
Remove some old code.

11 years agoRemove scar tissue
Ben Lippmeier [Wed, 11 May 2011 09:00:56 +0000 (19:00 +1000)]
Remove scar tissue

11 years agoWibbles on modules imported by vectoriser
Ben Lippmeier [Wed, 11 May 2011 09:00:40 +0000 (19:00 +1000)]
Wibbles on modules imported by vectoriser

11 years agoFix build
Ben Lippmeier [Wed, 11 May 2011 03:36:01 +0000 (13:36 +1000)]
Fix build

11 years agoFollow changes in DPH library: Repr module is gone.
Ben Lippmeier [Mon, 9 May 2011 03:24:58 +0000 (13:24 +1000)]
Follow changes in DPH library: Repr module is gone.

11 years agoUpdate vectoriser now that PData instances have moved.
Ben Lippmeier [Mon, 9 May 2011 01:26:48 +0000 (11:26 +1000)]
Update vectoriser now that PData instances have moved.

11 years agoUpdate vectoriser now that PRepr has moved
Ben Lippmeier [Thu, 5 May 2011 06:08:49 +0000 (16:08 +1000)]
Update vectoriser now that PRepr has moved

11 years agoUpdate vectoriser now that Scalar has moved
Ben Lippmeier [Thu, 5 May 2011 04:32:00 +0000 (14:32 +1000)]
Update vectoriser now that Scalar has moved

11 years agoUpdate vectoriser now that PData has moved.
Ben Lippmeier [Thu, 5 May 2011 03:59:00 +0000 (13:59 +1000)]
Update vectoriser now that PData has moved.

11 years agoMerge branch 'master' of http://darcs.haskell.org/ghc
Simon Peyton Jones [Thu, 12 May 2011 10:22:50 +0000 (11:22 +0100)]
Merge branch 'master' of darcs.haskell.org/ghc

11 years agoThe final batch of changes for the new coercion representation
Simon Peyton Jones [Thu, 12 May 2011 10:09:28 +0000 (11:09 +0100)]
The final batch of changes for the new coercion representation

* Fix bugs in the packing and unpacking of data
  constructors with equality predicates in their types

* Remove PredCo altogether; instead, coercions between predicated
  types (like  (Eq a, [a]~b) => blah) are treated as if they
  were precisely their underlying representation type
       Eq a -> ((~) [a] b) -> blah
  in this case

* Similarly, Type.coreView no longer treats equality
  predciates specially.

* Implement the cast-of-coercion optimisation in
  Simplify.simplCoercionF

Numerous other small bug-fixes and refactorings.

Annoyingly, OptCoercion had Windows line endings, and this
patch switches to Unix, so it looks as if every line has changed.

11 years agoUnix line endings for Pair.lhs
Simon Peyton Jones [Thu, 12 May 2011 10:04:08 +0000 (11:04 +0100)]
Unix line endings for Pair.lhs

11 years agoFix Trac #5192: missing case in hsValBindsImplicits
Simon Peyton Jones [Thu, 12 May 2011 10:01:34 +0000 (11:01 +0100)]
Fix Trac #5192: missing case in hsValBindsImplicits

This fixes the bug, adds some comments, and a tiny bit of refactoring

11 years agoMerge branch 'master' of http://darcs.haskell.org/ghc
Simon Peyton Jones [Thu, 12 May 2011 07:48:07 +0000 (08:48 +0100)]
Merge branch 'master' of darcs.haskell.org/ghc

11 years agoWhite space only
Simon Peyton Jones [Thu, 12 May 2011 07:46:20 +0000 (08:46 +0100)]
White space only

11 years agoDocument -ddump-to-file.
Edward Z. Yang [Wed, 11 May 2011 21:31:58 +0000 (22:31 +0100)]
Document -ddump-to-file.

Signed-off-by: Edward Z. Yang <ezyang@mit.edu>

11 years agoMerge remote branch 'origin/master'
Simon Peyton Jones [Wed, 11 May 2011 16:28:26 +0000 (17:28 +0100)]
Merge remote branch 'origin/master'

11 years agoscheduleDoGC: if we're doing heapCensus(), do it *before* releasing
Simon Marlow [Wed, 11 May 2011 10:00:10 +0000 (11:00 +0100)]
scheduleDoGC: if we're doing heapCensus(), do it *before* releasing
the other mutator threads (#5127)

11 years agofix the names of the floating-point operations in the Cmm parser
Simon Marlow [Wed, 4 May 2011 15:43:35 +0000 (16:43 +0100)]
fix the names of the floating-point operations in the Cmm parser

11 years agoFix bug in one-line stats printing
David M Peixotto [Tue, 10 May 2011 17:40:23 +0000 (12:40 -0500)]
Fix bug in one-line stats printing

The code that prints the "one-line" stats (i.e. the RTS -t flag) was
incorreclty printing zeros for some time values. These time values
were computed inside a conditional that was only true when printing
detailed stats (i.e. the RTS -s or -S flags).

This commit simply moves the computation out of the conditional so
they are available for the one-line stats output.

11 years agoMerge branch 'master' of http://darcs.haskell.org/ghc into ghc-generics
Jose Pedro Magalhaes [Tue, 10 May 2011 06:12:21 +0000 (08:12 +0200)]
Merge branch 'master' of darcs.haskell.org/ghc into ghc-generics

11 years agoMerge branch 'master' of http://darcs.haskell.org/ghc
Simon Peyton Jones [Mon, 9 May 2011 17:10:57 +0000 (18:10 +0100)]
Merge branch 'master' of darcs.haskell.org/ghc

11 years agoFix renaming of guards
Simon Peyton Jones [Mon, 9 May 2011 15:45:12 +0000 (16:45 +0100)]
Fix renaming of guards

This was making mc17 fail.

11 years agoFix the desugaring of guards in arrow syntax
Simon Peyton Jones [Mon, 9 May 2011 15:44:30 +0000 (16:44 +0100)]
Fix the desugaring of guards in arrow syntax

This was making T3822 fail, which it has apparently been doing
for some time (ie in GHC 7, 6.12, 6.10)!

11 years agofix pretty-printing of the cvttsd2si SSE2 instruction (fixes 5149 test
Simon Marlow [Mon, 9 May 2011 12:33:00 +0000 (13:33 +0100)]
fix pretty-printing of the cvttsd2si SSE2 instruction (fixes 5149 test
on x86_64).

11 years agoMerge branch 'master' of http://darcs.haskell.org/ghc into ghc-generics
Jose Pedro Magalhaes [Mon, 9 May 2011 12:04:37 +0000 (14:04 +0200)]
Merge branch 'master' of darcs.haskell.org/ghc into ghc-generics

11 years agoMake the errors for DeriveGeneric consistent with other deriving errors.
Jose Pedro Magalhaes [Mon, 9 May 2011 12:00:32 +0000 (14:00 +0200)]
Make the errors for DeriveGeneric consistent with other deriving errors.

11 years agoMerge branch 'master' of http://darcs.haskell.org/ghc
Simon Peyton Jones [Mon, 9 May 2011 11:01:38 +0000 (12:01 +0100)]
Merge branch 'master' of darcs.haskell.org/ghc

11 years agoMerge ghc-new-co into master branch
Simon Peyton Jones [Mon, 9 May 2011 10:53:47 +0000 (11:53 +0100)]
Merge ghc-new-co into master branch

11 years agoDon't discard usage info from coercion bindings!
Simon Peyton Jones [Mon, 9 May 2011 10:46:03 +0000 (11:46 +0100)]
Don't discard usage info from coercion bindings!

11 years agoheapCensus: we need to traverse the heap fragments stored in the
Simon Marlow [Mon, 9 May 2011 10:34:14 +0000 (11:34 +0100)]
heapCensus: we need to traverse the heap fragments stored in the
gen_workspace structures.  Fixes heapprof001(prof_hc_hb).

11 years ago"Representable0" -> "Generic" in the user's guide.
Jose Pedro Magalhaes [Mon, 9 May 2011 10:07:02 +0000 (12:07 +0200)]
"Representable0" -> "Generic" in the user's guide.

11 years agoImprove the error message when we cannot derive Generic.
Jose Pedro Magalhaes [Mon, 9 May 2011 09:52:47 +0000 (11:52 +0200)]
Improve the error message when we cannot derive Generic.

11 years agoAdd $$($1_$2_$3_ALL_HC_OPTS) when linking dynamic libraries. Not
Simon Marlow [Fri, 6 May 2011 11:00:53 +0000 (12:00 +0100)]
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.

11 years agoComments only
Simon Peyton Jones [Mon, 9 May 2011 09:03:28 +0000 (10:03 +0100)]
Comments only

11 years agoDeprecate -XGenerics.
Jose Pedro Magalhaes [Mon, 9 May 2011 09:02:42 +0000 (11:02 +0200)]
Deprecate -XGenerics.

11 years agoRename `Representable0` to `Generic`.
Jose Pedro Magalhaes [Mon, 9 May 2011 07:46:38 +0000 (09:46 +0200)]
Rename `Representable0` to `Generic`.

Remove a few other `0`s from names.

11 years agoMerge branch 'coloured-core' of https://github.com/nominolo/ghc into coloured-core
Ian Lynagh [Sun, 8 May 2011 15:13:33 +0000 (16:13 +0100)]
Merge branch 'coloured-core' of https://github.com/nominolo/ghc into coloured-core

11 years agoChange remaining uses of cTargetOS to platformOS
Ian Lynagh [Sun, 8 May 2011 12:41:12 +0000 (13:41 +0100)]
Change remaining uses of cTargetOS to platformOS

And remove cTargetOS/cTargetPlatform.

11 years agoRemove a use of cTargetOS, in favour of platformOS
Ian Lynagh [Sun, 8 May 2011 10:41:34 +0000 (11:41 +0100)]
Remove a use of cTargetOS, in favour of platformOS

11 years agoWhitespace only in ghci/ByteCodeGen.lhs
Ian Lynagh [Sat, 7 May 2011 23:50:04 +0000 (00:50 +0100)]
Whitespace only in ghci/ByteCodeGen.lhs

11 years agoRemove an explicit import list
Ian Lynagh [Sat, 7 May 2011 23:39:42 +0000 (00:39 +0100)]
Remove an explicit import list

11 years agoRemove commented out imports
Ian Lynagh [Sat, 7 May 2011 23:39:05 +0000 (00:39 +0100)]
Remove commented out imports

11 years agoChange more Config tests to Platform tests
Ian Lynagh [Sat, 7 May 2011 23:30:38 +0000 (00:30 +0100)]
Change more Config tests to Platform tests

11 years agoRemove unused pprUserReg functions
Ian Lynagh [Sat, 7 May 2011 23:25:19 +0000 (00:25 +0100)]
Remove unused pprUserReg functions

11 years agoChange some conditional tests from Config.cTargetArch to platformArch
Ian Lynagh [Sat, 7 May 2011 23:22:38 +0000 (00:22 +0100)]
Change some conditional tests from Config.cTargetArch to platformArch

11 years agoMove Platform from compiler/nativeGen to compiler/utils
Ian Lynagh [Sat, 7 May 2011 22:37:59 +0000 (23:37 +0100)]
Move Platform from compiler/nativeGen to compiler/utils

We want to use it across the whole compiler now

11 years agoImprove the warning about -fllvm and -fPIC/-dynamic conflicting
Ian Lynagh [Sat, 7 May 2011 22:35:39 +0000 (23:35 +0100)]
Improve the warning about -fllvm and -fPIC/-dynamic conflicting

We now do it while parsing the flags, rather than at the end.
It also now uses the Platform's arch/os variables, rather than Config's.

11 years agoRemove some dead code
Ian Lynagh [Sat, 7 May 2011 16:55:08 +0000 (17:55 +0100)]
Remove some dead code

Not needed now that we don't support registerised via-C compilation.

11 years agoMake retainer profiling use the label length (-L) flag)
Ian Lynagh [Fri, 6 May 2011 14:28:53 +0000 (15:28 +0100)]
Make retainer profiling use the label length (-L) flag)

11 years agoRemove commented out imports
Ian Lynagh [Sun, 1 May 2011 17:04:21 +0000 (18:04 +0100)]
Remove commented out imports

11 years agoFix build
Simon Peyton Jones [Fri, 6 May 2011 17:07:36 +0000 (18:07 +0100)]
Fix build

11 years agoMerge master into the ghc-new-co branch
Simon Peyton Jones [Fri, 6 May 2011 14:56:06 +0000 (15:56 +0100)]
Merge master into the ghc-new-co branch

11 years agoSubstantial improvements in RtClosureInspect
Simon Peyton Jones [Fri, 6 May 2011 14:43:49 +0000 (15:43 +0100)]
Substantial improvements in RtClosureInspect

The code for constructors in cvReconstrutType and cvObtainTerm
was grotesque.  It's now slightly better.  And it works with
the new coercion representation.

Apart from being simpler I have also made some small behavioural
improvements
  * Improved printing for string values
  * Preserve the print-name when instanting type variables
    (so now they are not always called "t")
  * Suppressed printing of predicate arguments to
    data constructors, unless -dppr-debug is on

11 years agoMissing coercion case in byte code generation
Simon Peyton Jones [Fri, 6 May 2011 14:35:07 +0000 (15:35 +0100)]
Missing coercion case in byte code generation

11 years agoRemove special case for EqPred in CoreView
Simon Peyton Jones [Fri, 6 May 2011 14:34:32 +0000 (15:34 +0100)]
Remove special case for EqPred in CoreView

11 years agoUse eqSpecPreds
Simon Peyton Jones [Fri, 6 May 2011 14:34:09 +0000 (15:34 +0100)]
Use eqSpecPreds

11 years agoImprove dead block calculation, per Simon Marlow's advice.
Edward Z. Yang [Thu, 5 May 2011 18:37:23 +0000 (19:37 +0100)]
Improve dead block calculation, per Simon Marlow's advice.

Signed-off-by: Edward Z. Yang <ezyang@mit.edu>

11 years agoMerge branch 'ghc-generics' of http://darcs.haskell.org/ghc into ghc-generics
Jose Pedro Magalhaes [Thu, 5 May 2011 11:31:09 +0000 (13:31 +0200)]
Merge branch 'ghc-generics' of darcs.haskell.org/ghc into ghc-generics

11 years agoDo not enable -XGenerics when building the optimized libs.
Jose Pedro Magalhaes [Thu, 5 May 2011 11:26:24 +0000 (13:26 +0200)]
Do not enable -XGenerics when building the optimized libs.

11 years agoRemove comment mentioning the old generic classes.
Jose Pedro Magalhaes [Thu, 5 May 2011 11:26:04 +0000 (13:26 +0200)]
Remove comment mentioning the old generic classes.

11 years agoUpdate the User Guide with generics stuff.
Jose Pedro Magalhaes [Thu, 5 May 2011 10:13:36 +0000 (12:13 +0200)]
Update the User Guide with generics stuff.

11 years agoMerge branch 'ghc-generics' of http://darcs.haskell.org/ghc into ghc-generics
Simon Peyton Jones [Thu, 5 May 2011 08:00:27 +0000 (09:00 +0100)]
Merge branch 'ghc-generics' of darcs.haskell.org/ghc into ghc-generics

11 years agoFix a previous incorrect merge.
Jose Pedro Magalhaes [Thu, 5 May 2011 07:44:43 +0000 (09:44 +0200)]
Fix a previous incorrect merge.

11 years agoMerge branch 'master' of http://darcs.haskell.org/ghc into ghc-generics
Jose Pedro Magalhaes [Thu, 5 May 2011 06:11:52 +0000 (08:11 +0200)]
Merge branch 'master' of darcs.haskell.org/ghc into ghc-generics

Fixed conflicts:
compiler/iface/IfaceSyn.lhs
compiler/typecheck/TcSMonad.lhs

11 years agoRemove unused hasktags configure check
David Terei [Thu, 5 May 2011 00:08:47 +0000 (17:08 -0700)]
Remove unused hasktags configure check

11 years agoRemove depreciated install-docs command
David Terei [Thu, 5 May 2011 00:07:53 +0000 (17:07 -0700)]
Remove depreciated install-docs command