On Sun, 16 Oct 2011 22:43:52 +0200, Karel Gardas <[email protected]> wrote: > Now I got: > Fixed all of these. The problem was a misplaced #endif.
> >> also how do you do the changes push into Git? I always get conflicts > >> while doing pull from your repo... > >> > > Yes, I'm very sorry about that. I've been rebasing pretty liberally in > > order to keep the patch set clean. I'll try to avoid doing this in the > > future. > > rebase freely, I just hope I don't screw your code myself. > No worries. The easiest way to update your code base in the event of a rebase I think is the following, $ git reset --hard 79939a546be3697101900bfe49dd43880f7a6355 $ git remote update bgamari $ git merge bgamari/arm-ghci Using the correct remote name, of course. This way you avoid having to merge conflicts as it's just a fast-forward. > > Ahh, yes. That explains it. So when you said a Thumb build failed, what > > exactly were you referring to? > > I mean full thumb build, this means enforcing LLVM to output thumb ISA > by appropriate command-line options. IIRC I've tried twice, once in > build.mk and second attempt was harder push, I edited LLVM codegen and > added specific option there to enforce Thumb ISA generation all the > time. Anyway, I still got ghc-stage2 segfaulting. I don't remember > exactly what was the option combination but IMHO it was: -march=thumb > -mattr=+v7,+vfp3,+thumb2 > I see. Interesting. Cheers, - Ben _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
