On 10/16/11 11:29 PM, Ben Gamari wrote:
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.
I still get:
rts/Linker.c: In function ‘do_Elf_Rel_relocations’:
rts/Linker.c:4339:16:
warning: implicit declaration of function ‘makeArmSymbolExtra’
rts/Linker.c:4339:16:
warning: nested extern declaration of ‘makeArmSymbolExtra’
rts/Linker.c:4339:74:
error: invalid type argument of ‘->’ (have ‘int’)
rts/Linker.c:4406:74:
error: invalid type argument of ‘->’ (have ‘int’)
make[1]: *** [rts/dist/build/Linker.o] Error 1
make: *** [all] Error 2
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
OK, here, I'm simply using:
git reset HEAD rts/Linker.c
git stash
git pull
and then resolve conflict which means removing `HEAD' code and leaving
the ^&^*$&)*@7397289472974 code in.
Using the correct remote name, of course. This way you avoid having to
merge conflicts as it's just a fast-forward.
Indeed, I'll need to set this up.
Karel
_______________________________________________
Cvs-ghc mailing list
[email protected]
http://www.haskell.org/mailman/listinfo/cvs-ghc
