On Thu, Jul 7, 2011 at 11:58 AM, Peter Mazinger <[email protected]> wrote: > Hi, > >> On Fri, Jun 24, 2011 at 10:39 AM, Mike Frysinger <[email protected]> >> wrote: >> > On Wed, Jun 8, 2011 at 17:17, Bernhard Reutner-Fischer wrote: >> >> master is now potentially open to >> >> - merge future into master >> >> - merge prelink into master >> >> - merge ldso-future into master >> >> (in this order). >> >> >> >> To do this, ideally one would bring future up to date, then merge it >> >> back into master etc. >> >> >> >> Peter, do you see fit to >> >> $ git checkout future >> >> $ git pull --rebase (provided future is a proper tracking branch) >> >> $ git push -v >> >> $ git checkout master >> >> $ git merge origin/future >> >> # edit >> >> $ git add some/thing >> >> $ git commit -s some/thing >> >> etc, etc? >> >> >> >> Current future would most likely conflict in e.g. longjmp impl i.e. >> >> would need to be resolved after such merge (and i didn't look, TBH). >> >> >> >> Any takers? Khem, do you have time to explain and resolve that with >> >> peter? Anybody else? >> > >> > as long as the crap is pruned out (things like wrong commits that are >> > later reverted) ... i'd also like to see partial/broken commits get >> > squashed together. >> >> I am stabbing at the future branch. So far I have managed to compile >> it on nptl with arm, ppc, x86 >> and x86_64 and it ends up with linking errors on mips which seems like >> its exceeding GOT size >> but dont know for sure. Error is usual suspect >> >> libc/stdlib/system.c:208: relocation truncated to fit: R_MIPS_CALL16 >> against `_pthread_cleanup_pop_restore' >> >> but it does not boot completely. There is some bug lurking somewhere >> need to hunt > > does it not boot in mips or all the others as well?
Same point of failure on all arches. It does boot partially but as I said there is some regression lurking somewhere. > >> that down. I have rebased fixed a few and squashed a few commits. The >> rebased master is pushed >> here >> git://github.com/kraj/uClibc.git > > Is this the master, that fails on mips? I could take a look. This is latest master + future branch rebased on top with out future branch patches everything works hunky dory on all arches > Have you put all the changes regarding [_]_pthread_cleanup_* into this master? > I have taken in all the patches that were on future branch if these patches are additional then I have not taken them >> There are some patches on top which I have not pushed yet. The patches >> there are all from the branch >> >> I will start cherry picking commits which are least disruptive. > > thanks working on it, Peter >> >> Thanks >> >> -Khem >> >> >> > -mike >> > _______________________________________________ >> > uClibc mailing list >> > [email protected] >> > http://lists.busybox.net/mailman/listinfo/uclibc >> > >> _______________________________________________ >> uClibc mailing list >> [email protected] >> http://lists.busybox.net/mailman/listinfo/uclibc > > -- > NEU: FreePhone - kostenlos mobil telefonieren! > Jetzt informieren: http://www.gmx.net/de/go/freephone > _______________________________________________ > uClibc mailing list > [email protected] > http://lists.busybox.net/mailman/listinfo/uclibc > _______________________________________________ uClibc mailing list [email protected] http://lists.busybox.net/mailman/listinfo/uclibc
