ghc.git
8 years agoVectoriser gets all DPH library identifiers from Data.Array.Parallel.Prim
Manuel M T Chakravarty [Mon, 24 Oct 2011 03:48:34 +0000 (14:48 +1100)] 
Vectoriser gets all DPH library identifiers from Data.Array.Parallel.Prim

* No more use of hardcoded original names
* Initialisation of the desugarer monad loads 'Data.Array.Parallel.Prim' if -fdph-* given
* Initialisation of the vectoriser gets all built-in names from there

8 years agoTabs -> spaces
Manuel M T Chakravarty [Wed, 19 Oct 2011 05:09:37 +0000 (16:09 +1100)] 
Tabs -> spaces

8 years agoTabs -> spaces
Manuel M T Chakravarty [Sun, 16 Oct 2011 10:19:55 +0000 (21:19 +1100)] 
Tabs -> spaces

8 years agoTabs -> spaces
Manuel M T Chakravarty [Sat, 15 Oct 2011 06:22:53 +0000 (17:22 +1100)] 
Tabs -> spaces

8 years agoTabs -> spaces
Manuel M T Chakravarty [Sat, 15 Oct 2011 06:03:06 +0000 (17:03 +1100)] 
Tabs -> spaces

8 years agoMerge branch 'master' of http://darcs.haskell.org/ghc
Simon Peyton Jones [Mon, 24 Oct 2011 18:51:16 +0000 (19:51 +0100)] 
Merge branch 'master' of darcs.haskell.org/ghc

8 years agoMake the matching in PrelRules "look through" unfoldings
Simon Peyton Jones [Mon, 24 Oct 2011 17:05:42 +0000 (18:05 +0100)] 
Make the matching in PrelRules "look through" unfoldings

This is important for Integer literals; fixes Trac #5576

8 years agoComments and layout only
Simon Peyton Jones [Mon, 24 Oct 2011 17:04:53 +0000 (18:04 +0100)] 
Comments and layout only

8 years agoMerge branch 'master' of http://darcs.haskell.org/ghc
Simon Peyton Jones [Mon, 24 Oct 2011 14:44:02 +0000 (15:44 +0100)] 
Merge branch 'master' of darcs.haskell.org/ghc

8 years agoLayout only
Simon Peyton Jones [Mon, 24 Oct 2011 14:43:49 +0000 (15:43 +0100)] 
Layout only

8 years agoAssociated type defaults work only for type *synonym* defaults
Simon Peyton Jones [Mon, 24 Oct 2011 14:40:07 +0000 (15:40 +0100)] 
Associated type defaults work only for type *synonym* defaults

8 years agoComments only
Simon Peyton Jones [Mon, 24 Oct 2011 14:39:44 +0000 (15:39 +0100)] 
Comments only

8 years agodelete shadowed entries from tcg_rdr_env (#5564)
Simon Marlow [Wed, 19 Oct 2011 10:46:20 +0000 (11:46 +0100)] 
delete shadowed entries from tcg_rdr_env (#5564)

This just tidies up the out-of-scope error messages in GHCi by not
suggesting some names twice.

8 years agoGive a correct SrcSpan to 'it' (#5564)
Simon Marlow [Wed, 19 Oct 2011 10:40:43 +0000 (11:40 +0100)] 
Give a correct SrcSpan to 'it' (#5564)

8 years agoIncrement the line number correctly in GHCi
Simon Marlow [Wed, 19 Oct 2011 10:39:44 +0000 (11:39 +0100)] 
Increment the line number correctly in GHCi

We were doing this when stdin was not a terminal, so all the tests
worked, but not when stdin was a terminal.  In fact the line number
was stuck at "2".

8 years agofix race condition in yieldCapability() (#5552)
Simon Marlow [Mon, 24 Oct 2011 12:29:32 +0000 (13:29 +0100)] 
fix race condition in yieldCapability() (#5552)

See comment for details.  I've tried quite hard, but haven't been able
to make a small test case that reproduces the bug.

8 years agoComments only on superclass cycle check
Simon Peyton Jones [Mon, 24 Oct 2011 11:46:26 +0000 (12:46 +0100)] 
Comments only on superclass cycle check

8 years agoAdd note about superclass cycle check
Max Bolingbroke [Mon, 24 Oct 2011 08:31:14 +0000 (09:31 +0100)] 
Add note about superclass cycle check

8 years agoMerge branch 'master' of http://darcs.haskell.org/ghc
Simon Peyton Jones [Mon, 24 Oct 2011 07:34:19 +0000 (08:34 +0100)] 
Merge branch 'master' of darcs.haskell.org/ghc

8 years agoEliminate all uses of IF_ARCH_i386, and remove the definition
Ian Lynagh [Sun, 23 Oct 2011 22:07:17 +0000 (23:07 +0100)] 
Eliminate all uses of IF_ARCH_i386, and remove the definition

8 years agoRemove unused CPP definitions of COMMA
Ian Lynagh [Sun, 23 Oct 2011 21:50:26 +0000 (22:50 +0100)] 
Remove unused CPP definitions of COMMA

8 years agoRemove unused IF_OS_* CPP definitions
Ian Lynagh [Sun, 23 Oct 2011 21:49:26 +0000 (22:49 +0100)] 
Remove unused IF_OS_* CPP definitions

8 years agoEliminate a couple of IF_ARCH_i386's
Ian Lynagh [Sun, 23 Oct 2011 21:47:15 +0000 (22:47 +0100)] 
Eliminate a couple of IF_ARCH_i386's

8 years agoMore CPP removal
Ian Lynagh [Sun, 23 Oct 2011 21:45:06 +0000 (22:45 +0100)] 
More CPP removal

8 years agoCorrect a comment
Ian Lynagh [Sun, 23 Oct 2011 21:35:07 +0000 (22:35 +0100)] 
Correct a comment

8 years agoFinish removing CPP from nativeGen/PPC/Ppr.hs
Ian Lynagh [Sun, 23 Oct 2011 19:41:01 +0000 (20:41 +0100)] 
Finish removing CPP from nativeGen/PPC/Ppr.hs

8 years agoRemove half the CPP from nativeGen/PPC/Ppr.hs
Ian Lynagh [Sun, 23 Oct 2011 19:27:19 +0000 (20:27 +0100)] 
Remove half the CPP from nativeGen/PPC/Ppr.hs

8 years agoSome DEBUG CPP removal
Ian Lynagh [Sun, 23 Oct 2011 17:49:24 +0000 (18:49 +0100)] 
Some DEBUG CPP removal

8 years agoRemove a redundant #ifdef DEBUG
Ian Lynagh [Sun, 23 Oct 2011 17:09:20 +0000 (18:09 +0100)] 
Remove a redundant #ifdef DEBUG

Assertions already get optimised away if DEBUG is off

8 years agoFollow cabal->Cabal rename, and fix haddock index generation
Ian Lynagh [Sun, 23 Oct 2011 15:13:56 +0000 (16:13 +0100)] 
Follow cabal->Cabal rename, and fix haddock index generation

We now make use of the ghc-packages file when making the haddock index.

8 years agoBrief documentation about relaxed superclass cycle check
Max Bolingbroke [Sat, 22 Oct 2011 13:03:07 +0000 (14:03 +0100)] 
Brief documentation about relaxed superclass cycle check

8 years agoCorrect the manual to use ConstraintKinds rather than ConstraintKinds
Max Bolingbroke [Sat, 22 Oct 2011 13:02:51 +0000 (14:02 +0100)] 
Correct the manual to use ConstraintKinds rather than ConstraintKinds

8 years agoImplement relaxed superclass cycle check
Max Bolingbroke [Fri, 21 Oct 2011 15:44:23 +0000 (16:44 +0100)] 
Implement relaxed superclass cycle check

This new check permits code such as the following:

  class B cls a where
    meth :: cls a => a -> a

  class B C a => C a where

This code can never cause the constraint solver to diverge, adding
infinite numbers of superclasses, because C is not mentioned as a
superclass of B.

8 years agoFix kind-checking for unboxed tuples (fixes Trac #5573)
Simon Peyton Jones [Sat, 22 Oct 2011 11:03:11 +0000 (12:03 +0100)] 
Fix kind-checking for unboxed tuples (fixes Trac #5573)

In particular we don't allow *nested* unboxed tuples, but the
typechecker wasn't actually enforcing that, which confused the
later stages of the compiler.

I also updated the documentation on unboxed tuples.

8 years agoMerge branch 'master' of http://darcs.haskell.org/ghc
Simon Peyton Jones [Fri, 21 Oct 2011 22:09:29 +0000 (23:09 +0100)] 
Merge branch 'master' of darcs.haskell.org/ghc

8 years agoMake sure the arg and result of ($) have kind *
Simon Peyton Jones [Fri, 21 Oct 2011 22:07:10 +0000 (23:07 +0100)] 
Make sure the arg and result of ($) have kind *

Fixes Trac #5570

8 years agoRecover proper sharing for Integer literals
Simon Peyton Jones [Fri, 21 Oct 2011 16:53:30 +0000 (17:53 +0100)] 
Recover proper sharing for Integer literals

Trac #5549 showed a loss of performance for GHC 7.4.
What was happening was that an integer literal was being
allocated each time around a loop, rather than being
floated to top level and shared.

Two fixes
 * Make the float-out pass float literals that are non-trivial
 * Make the inliner *not* treat Integer literals as size-zero

8 years agoEcho the Haddock command line, to make deugging any crash in Haddock easier
Simon Peyton Jones [Fri, 21 Oct 2011 15:42:04 +0000 (16:42 +0100)] 
Echo the Haddock command line, to make deugging any crash in Haddock easier

8 years agoA little more refactoring, triggered by the fix to Trac #5545
Simon Peyton Jones [Fri, 21 Oct 2011 15:41:13 +0000 (16:41 +0100)] 
A little more refactoring, triggered by the fix to Trac #5545

8 years agoPrint simplifier statistics in simplifyExpr as well
Simon Peyton Jones [Fri, 21 Oct 2011 15:38:56 +0000 (16:38 +0100)] 
Print simplifier statistics in simplifyExpr as well

8 years agoRefactor the way in which type (and other) signatures are renamed
Simon Peyton Jones [Fri, 21 Oct 2011 15:37:43 +0000 (16:37 +0100)] 
Refactor the way in which type (and other) signatures are renamed

This was a trickier change than I had anticipated, but I think
it's considerably tidier now.

Fixes Trac #5533.

8 years agoBe even more careful about eta expansion when bottom is involved
Simon Peyton Jones [Fri, 21 Oct 2011 15:34:21 +0000 (16:34 +0100)] 
Be even more careful about eta expansion when bottom is involved

See Note [Dealing with bottom], reproduced below.  Fixes Trac #5557.

3.  Note [Dealing with bottom]
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Consider
f = \x -> error "foo"
Here, arity 1 is fine.  But if it is
f = \x -> case x of
True  -> error "foo"
False -> \y -> x+y
then we want to get arity 2.  Technically, this isn't quite right, because
(f True) `seq` 1
should diverge, but it'll converge if we eta-expand f.  Nevertheless, we
do so; it improves some programs significantly, and increasing convergence
isn't a bad thing.  Hence the ABot/ATop in ArityType.

However, this really isn't always the Right Thing, and we have several
tickets reporting unexpected bahaviour resulting from this
transformation.  So we try to limit it as much as possible:

 * Do NOT move a lambda outside a known-bottom case expression
      case undefined of { (a,b) -> \y -> e }
   This showed up in Trac #5557

 * Do NOT move a lambda outside a case if all the branches of
   the case are known to return bottom.
      case x of { (a,b) -> \y -> error "urk" }
   This case is less important, but the idea is that if the fn is
   going to diverge eventually anyway then getting the best arity
   isn't an issue, so we might as well play safe

Of course both these are readily defeated by disguising the bottoms.

8 years agoFinish fixing #5529: Require that constructors are imported from all types
Ian Lynagh [Thu, 20 Oct 2011 23:47:15 +0000 (00:47 +0100)] 
Finish fixing #5529: Require that constructors are imported from all types

We used to have a hack for Foreign.C.Types and System.Posix.Types,
but I've removed that now. We also mark any constructors that we look
through as "used", so that we don't get warnings about unused imports.

8 years agoFollow change in FFI import decls
Ian Lynagh [Thu, 20 Oct 2011 23:43:23 +0000 (00:43 +0100)] 
Follow change in FFI import decls

Now need to import constructors for Foreign.C.Types types

8 years agoSome CPP removal
Ian Lynagh [Thu, 20 Oct 2011 01:01:10 +0000 (02:01 +0100)] 
Some CPP removal

8 years agoRemove some legacy code
Ian Lynagh [Thu, 20 Oct 2011 00:07:22 +0000 (01:07 +0100)] 
Remove some legacy code

__GLASGOW_HASKELL__ >= 612 is now always true

8 years agoRemove unused elf_OBJ_FORMAT #define
Ian Lynagh [Wed, 19 Oct 2011 23:46:53 +0000 (00:46 +0100)] 
Remove unused elf_OBJ_FORMAT #define

8 years agoFIX BUILD on OS X 10.5: Check whether ld understands -no_compact_unwind
Thorkil Naur [Tue, 18 Oct 2011 22:20:53 +0000 (00:20 +0200)] 
FIX BUILD on OS X 10.5: Check whether ld understands -no_compact_unwind

8 years agoA little more CPP removal
Ian Lynagh [Wed, 19 Oct 2011 20:49:26 +0000 (21:49 +0100)] 
A little more CPP removal

8 years agoConvert the HAVE_GNU_NONEXEC_STACK conditional into Haskell
Ian Lynagh [Wed, 19 Oct 2011 16:33:25 +0000 (17:33 +0100)] 
Convert the HAVE_GNU_NONEXEC_STACK conditional into Haskell

8 years agoRemove all Haskell conditionals on HAVE_SUBSECTIONS_VIA_SYMBOLS
Ian Lynagh [Wed, 19 Oct 2011 15:57:38 +0000 (16:57 +0100)] 
Remove all Haskell conditionals on HAVE_SUBSECTIONS_VIA_SYMBOLS

We now use the value from the targetPlatform instead.

8 years agoAdd "have subsections via symbols" to the Platform type
Ian Lynagh [Wed, 19 Oct 2011 15:36:40 +0000 (16:36 +0100)] 
Add "have subsections via symbols" to the Platform type

8 years agoMerge branch 'master' of http://darcs.haskell.org/ghc
Ian Lynagh [Wed, 19 Oct 2011 13:17:47 +0000 (14:17 +0100)] 
Merge branch 'master' of darcs.haskell.org/ghc

Conflicts:
compiler/utils/Platform.hs

8 years agoPut the target platform in the settings file
Ian Lynagh [Wed, 19 Oct 2011 12:32:11 +0000 (13:32 +0100)] 
Put the target platform in the settings file

8 years agoadd info about pulling changes (#5562)
Simon Marlow [Wed, 19 Oct 2011 09:37:08 +0000 (10:37 +0100)] 
add info about pulling changes (#5562)

8 years agoRevert "Move freeStablePtr() into the exported API (Lennart wants it)"
Simon Marlow [Tue, 18 Oct 2011 15:42:48 +0000 (16:42 +0100)] 
Revert "Move freeStablePtr() into the exported API (Lennart wants it)"

On second thoughts, hs_free_stable_ptr() is the official way to free a
StablePtr.

This reverts commit ae583f2949570755c8a03f68a71416c0fd7f257c.

8 years agoRevert "Remove OSUnknown"
Ian Lynagh [Wed, 19 Oct 2011 00:58:54 +0000 (01:58 +0100)] 
Revert "Remove OSUnknown"

This reverts commit f75f26cc4eed3c3cfc256ebfb9e77b8e82a766fc.

On second thoughts, this does make sense, for unregisterised via-C
OSes at least.

8 years agoRevert "Remove ArchUnknown"
Ian Lynagh [Wed, 19 Oct 2011 00:58:17 +0000 (01:58 +0100)] 
Revert "Remove ArchUnknown"

This reverts commit 2dea11a442e1d14d86fa661804de06a721943bf0.

On second thoughts, this does make sense, for unregisterised via-C
arches at least.

8 years agoFix warning.
David Terei [Tue, 18 Oct 2011 22:59:35 +0000 (15:59 -0700)] 
Fix warning.

8 years agoMerge branch 'master' of http://darcs.haskell.org/ghc
David Terei [Tue, 18 Oct 2011 22:43:59 +0000 (15:43 -0700)] 
Merge branch 'master' of darcs.haskell.org/ghc

8 years agoFix file permissions
David Terei [Tue, 18 Oct 2011 22:43:56 +0000 (15:43 -0700)] 
Fix file permissions

8 years agoRemove ArchUnknown
Ian Lynagh [Tue, 18 Oct 2011 18:01:27 +0000 (19:01 +0100)] 
Remove ArchUnknown

It doesn't make sense. If platformArch is ArchUnknown then we don't know
the answer to any questions about the arch. So now if we don't recognise
the arch we just fail, and the new arch will need to be added to the
datatype.

8 years agoRemove OSUnknown
Ian Lynagh [Tue, 18 Oct 2011 17:41:29 +0000 (18:41 +0100)] 
Remove OSUnknown

It doesn't make sense. If platformOS is OSUnknown then we don't know the
answer to any questions about the OS. So now if we don't recognise the
OS we just fail, and the new OS will need to be added to the datatype.

8 years agoMerge branch 'master' of http://darcs.haskell.org/ghc
Ian Lynagh [Tue, 18 Oct 2011 16:18:32 +0000 (17:18 +0100)] 
Merge branch 'master' of darcs.haskell.org/ghc

8 years agoMove freeStablePtr() into the exported API (Lennart wants it)
Simon Marlow [Tue, 18 Oct 2011 15:22:49 +0000 (16:22 +0100)] 
Move freeStablePtr() into the exported API (Lennart wants it)

8 years agofix the object suffix when using TH with profiling (#5554)
Simon Marlow [Tue, 18 Oct 2011 12:23:29 +0000 (13:23 +0100)] 
fix the object suffix when using TH with profiling (#5554)

8 years agofix value of this_mod passed to tcRnImports (#5545)
Simon Marlow [Tue, 18 Oct 2011 10:31:53 +0000 (11:31 +0100)] 
fix value of this_mod passed to tcRnImports (#5545)

8 years agoMerge branch 'master' of http://darcs.haskell.org/ghc
Ian Lynagh [Tue, 18 Oct 2011 11:26:57 +0000 (12:26 +0100)] 
Merge branch 'master' of darcs.haskell.org/ghc

8 years agoGet Windows building dynlibs again
Ian Lynagh [Tue, 18 Oct 2011 11:07:29 +0000 (12:07 +0100)] 
Get Windows building dynlibs again

8 years agoAdd -fpackage-trust flag to Safe Haskell.
David Terei [Tue, 18 Oct 2011 03:38:37 +0000 (20:38 -0700)] 
Add -fpackage-trust flag to Safe Haskell.

8 years agoremove some old files
David Terei [Mon, 17 Oct 2011 21:50:09 +0000 (14:50 -0700)] 
remove some old files

8 years agoFix safe haskell warnings to include src locations
David Terei [Mon, 17 Oct 2011 20:49:48 +0000 (13:49 -0700)] 
Fix safe haskell warnings to include src locations

8 years agoFormatting wibbles.
David Terei [Fri, 7 Oct 2011 01:34:52 +0000 (18:34 -0700)] 
Formatting wibbles.

8 years agoRemove cruft code from old Safe Haskell implementation method
David Terei [Fri, 7 Oct 2011 01:33:01 +0000 (18:33 -0700)] 
Remove cruft code from old Safe Haskell implementation method

8 years agofix warning
Simon Marlow [Mon, 17 Oct 2011 12:25:18 +0000 (13:25 +0100)] 
fix warning

8 years agomake CAFs atomic, to fix #5558
Simon Marlow [Mon, 17 Oct 2011 12:16:02 +0000 (13:16 +0100)] 
make CAFs atomic, to fix #5558

See Note [atomic CAFs] in rts/sm/Storage.c

8 years agoWhitespace only in simplCore/SimplCore.lhs.
Michal Terepeta [Sun, 9 Oct 2011 11:11:54 +0000 (13:11 +0200)] 
Whitespace only in simplCore/SimplCore.lhs.

8 years agobuild registerised on ARM platform by default
Karel Gardas [Wed, 12 Oct 2011 16:28:29 +0000 (18:28 +0200)] 
build registerised on ARM platform by default

8 years agoPass Platform to pprExpr1
Ben Gamari [Wed, 12 Oct 2011 13:24:13 +0000 (09:24 -0400)] 
Pass Platform to pprExpr1

Fixes build error:

compiler/cmm/PprC.hs:961:33:
    Couldn't match expected type `Platform'
           against inferred type `CmmExpr'
    In the first argument of `pprExpr1', namely `expr'
    In the second argument of `(<+>)', namely `pprExpr1 expr'
    In the first argument of `parens', namely
        `(cast <+> pprExpr1 expr)'

8 years agoOn non-Windows, go back to using the libffi dynlib for the dyn way
Ian Lynagh [Sun, 16 Oct 2011 20:37:16 +0000 (21:37 +0100)] 
On non-Windows, go back to using the libffi dynlib for the dyn way

8 years agoRemove CPP from llvmGen/LlvmCodeGen/CodeGen.hs
Ian Lynagh [Sat, 15 Oct 2011 09:41:47 +0000 (10:41 +0100)] 
Remove CPP from llvmGen/LlvmCodeGen/CodeGen.hs

8 years agoRemove a little more CPP
Ian Lynagh [Fri, 14 Oct 2011 23:50:25 +0000 (00:50 +0100)] 
Remove a little more CPP

8 years agoRemove some CPP from nativeGen/SPARC/Ppr.hs
Ian Lynagh [Fri, 14 Oct 2011 23:27:33 +0000 (00:27 +0100)] 
Remove some CPP from nativeGen/SPARC/Ppr.hs

8 years agode-CPP codeGen/CgCon.lhs
Ian Lynagh [Fri, 14 Oct 2011 22:24:48 +0000 (23:24 +0100)] 
de-CPP codeGen/CgCon.lhs

8 years agoWhitespace only in codeGen/CgCon.lhs
Ian Lynagh [Fri, 14 Oct 2011 22:07:32 +0000 (23:07 +0100)] 
Whitespace only in codeGen/CgCon.lhs

8 years agoTweak a comment
Ian Lynagh [Fri, 14 Oct 2011 22:04:14 +0000 (23:04 +0100)] 
Tweak a comment

8 years agoMerge branch 'master' of dippy:c:/msys/1.0/home/ian/ghc/.
Ian Lynagh [Fri, 14 Oct 2011 20:29:09 +0000 (21:29 +0100)] 
Merge branch 'master' of dippy:c:/msys/1.0/home/ian/ghc/.

8 years agoTemporary hack to get Windows to validate again
Ian Lynagh [Fri, 14 Oct 2011 20:27:57 +0000 (21:27 +0100)] 
Temporary hack to get Windows to validate again

For now, turn off dynlibs when validating

8 years agoRemove CPP from codeGen/StgCmmCon.hs
Ian Lynagh [Fri, 14 Oct 2011 19:47:22 +0000 (20:47 +0100)] 
Remove CPP from codeGen/StgCmmCon.hs

8 years agoWhitespace only in codeGen/StgCmmCon.hs
Ian Lynagh [Fri, 14 Oct 2011 19:38:38 +0000 (20:38 +0100)] 
Whitespace only in codeGen/StgCmmCon.hs

8 years agoRemove some CPP
Ian Lynagh [Fri, 14 Oct 2011 19:36:30 +0000 (20:36 +0100)] 
Remove some CPP

8 years agoRemove some CPP
Ian Lynagh [Fri, 14 Oct 2011 19:25:49 +0000 (20:25 +0100)] 
Remove some CPP

8 years agoFix some warnings
Ian Lynagh [Fri, 14 Oct 2011 19:16:32 +0000 (20:16 +0100)] 
Fix some warnings

8 years agoMerge branch 'master' of dippy:c:/msys/1.0/home/ian/ghc/.
Ian Lynagh [Fri, 14 Oct 2011 15:25:31 +0000 (16:25 +0100)] 
Merge branch 'master' of dippy:c:/msys/1.0/home/ian/ghc/.

8 years agoFix libffi build on Windows
Ian Lynagh [Fri, 14 Oct 2011 15:11:10 +0000 (16:11 +0100)] 
Fix libffi build on Windows

8 years agoDon't hide the binary package
Ian Lynagh [Fri, 14 Oct 2011 14:17:06 +0000 (15:17 +0100)] 
Don't hide the binary package

Cabal will use it regardless, and if people are going to use binary then
it's a lot better if they use the one that we ship, rather than
installing a second version.

8 years agoFix ffi build on amd64/Linux, and simplify a little more
Ian Lynagh [Fri, 14 Oct 2011 12:45:35 +0000 (13:45 +0100)] 
Fix ffi build on amd64/Linux, and simplify a little more

8 years agoMerge branch 'master' of mac:ghc/git/val32/.
Ian Lynagh [Fri, 14 Oct 2011 02:11:51 +0000 (03:11 +0100)] 
Merge branch 'master' of mac:ghc/git/val32/.

8 years agoSimplify the libffi build
Ian Lynagh [Fri, 14 Oct 2011 01:43:50 +0000 (02:43 +0100)] 
Simplify the libffi build

We now put the libffi objects into the RTS library, rather than trying
to mangle libffi into being a ghc package itself. It would be nicer to
 make it a separate library (but not a ghc package), but for now
 hopefully this will get the build going through on Windows again.

8 years agoInclude -optc options in mkExtraCObj (#5528)
Simon Marlow [Mon, 10 Oct 2011 14:56:50 +0000 (15:56 +0100)] 
Include -optc options in mkExtraCObj (#5528)