Build is broken

Sat May 14 10:37:09 CEST 2011

On 13/05/2011, at 8:56 PM, Edward Z. Yang wrote:

> Hey Ben,
> 
> It looks like you broke the build for other people in
> 5bfa6a6382a4e4b949d333b1996065e9bcfacb18.

Urgh, sorry. It looks like I tripped over an #ifdef mine. I tried to validate Erik's patch just now but I've messed up my git repo so It'll need to wait until tomorrow (Sunday, Sydney Time). In the meantime you can just add the "import Config" line back to AsmCodeGen.hs

wrt the git messup. I've now got two copies of my previous patches in the commit history. I can just start from a fresh repo, but I don't know what I could have done to cause this..

Ben.

commit 747aa1e51d39455adc66b2c8064eeb3fd8445a8f
Merge: 1303502 cfbf0eb
Author: Ben Lippmeier <benl at ouroborus.net>
Date:   Sat May 14 18:29:49 2011 +1000

    Merge branch 'master' of /Users/benl/devel/ghc/ghc-head

commit 1303502216f381e8e64c09591ed5c202ec4e970a
Author: Ben Lippmeier <benl at ouroborus.net>
Date:   Sat May 14 17:37:26 2011 +1000

    Fix build: Add missing import and remove an unneeded #ifdef.
    From Erik de Castro Lopo

commit 231bf49c0b6f575da60c39d72964c015edf5874d
Author: Ben Lippmeier <benl at ouroborus.net>
Date:   Wed May 11 19:00:56 2011 +1000

    Remove scar tissue

commit b3c76c6551d7980abd91d2d345b502a921b845f1
Author: Ben Lippmeier <benl at ouroborus.net>
Date:   Wed May 11 19:00:40 2011 +1000

    Wibbles on modules imported by vectoriser

commit e12204ff1f6f5abeda647bf8d4eab073a5937123
Author: Ben Lippmeier <benl at ouroborus.net>
Date:   Wed May 11 13:36:01 2011 +1000

    Fix build

commit 42cea9bb59c77c36b9a9e5b910f4779a06ae7a65
Author: Ben Lippmeier <benl at ouroborus.net>
Date:   Mon May 9 13:24:58 2011 +1000

    Follow changes in DPH library: Repr module is gone.

commit 62d442d50351e5256efa81ef987446b86dbebd38
Author: Ben Lippmeier <benl at ouroborus.net>
Date:   Mon May 9 11:26:48 2011 +1000

    Update vectoriser now that PData instances have moved.

commit f749f29d08e23f0dd74dc640fd13a82374689c30
Author: Ben Lippmeier <benl at ouroborus.net>
Date:   Thu May 5 16:08:49 2011 +1000

    Update vectoriser now that PRepr has moved

commit 04c0eb98fefeb99b6d59d169777989173648cb57
Author: Ben Lippmeier <benl at ouroborus.net>
Date:   Thu May 5 14:32:00 2011 +1000

    Update vectoriser now that Scalar has moved

commit eb22df061f70d1da1e7749398a0977ebc98cbcb6
Author: Ben Lippmeier <benl at ouroborus.net>
Date:   Thu May 5 13:59:00 2011 +1000

    Update vectoriser now that PData has moved.

commit cfbf0eb134efd1c5d9a589f6ae2139d7fad60581
Author: Duncan Coutts <duncan at well-typed.com>
Date:   Thu May 12 16:25:41 2011 +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.

commit 7b3a746294d3d034da0052644237e4d1ab1f08c8
Merge: 9ae7aca fd6587b
Author: Ben Lippmeier <benl at ouroborus.net>
Date:   Thu May 12 22:38:13 2011 +1000

    Merge branch 'master' of /Users/benl/devel/ghc/ghc-head

commit 9ae7aca7d1985640aff647de797db2abae49a9a2
Author: Ben Lippmeier <benl at ouroborus.net>
Date:   Wed May 11 19:00:56 2011 +1000

    Remove scar tissue

commit 999857fdfd8fa1b305a94bc54bb1860f5c8896d1
Author: Ben Lippmeier <benl at ouroborus.net>
Date:   Wed May 11 19:00:40 2011 +1000

    Wibbles on modules imported by vectoriser

commit 5bfa6a6382a4e4b949d333b1996065e9bcfacb18
Author: Ben Lippmeier <benl at ouroborus.net>
Date:   Wed May 11 13:36:01 2011 +1000

    Fix build

commit 35474439dcf6dc60e2f6e296de7da128c690d50e
Author: Ben Lippmeier <benl at ouroborus.net>
Date:   Mon May 9 13:24:58 2011 +1000

    Follow changes in DPH library: Repr module is gone.

commit 73350708d2769ef96ffa102630f675dd4ab40cd1
Author: Ben Lippmeier <benl at ouroborus.net>
Date:   Mon May 9 11:26:48 2011 +1000

    Update vectoriser now that PData instances have moved.

commit 31b9ba54b309b7ad8043a7dade7dddb71d184b8b
Author: Ben Lippmeier <benl at ouroborus.net>
Date:   Thu May 5 16:08:49 2011 +1000

    Update vectoriser now that PRepr has moved

commit b2153822467a86d4da0ccdbd4274741aaa90d81b
Author: Ben Lippmeier <benl at ouroborus.net>
Date:   Thu May 5 14:32:00 2011 +1000

    Update vectoriser now that Scalar has moved

commit a2230234bcf8c1a40c68c32f0d64d66fdc442073
Author: Ben Lippmeier <benl at ouroborus.net>
Date:   Thu May 5 13:59:00 2011 +1000

    Update vectoriser now that PData has moved.

commit fd6587b68ad5aa4b6202066b598aec234220bae0
Merge: 10ffbfd c8c2f6b
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Thu May 12 11:22:50 2011 +0100

    Merge branch 'master' of http://darcs.haskell.org/ghc

commit c8c2f6bb7d79a2a6aeaa3233363fdf0bbbfad205
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Thu May 12 11:09:28 2011 +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.