-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Austin Foxley wrote: > For my own sanity, I'm killing (renaming) the non master based nptl > branch. The difference of effort in keeping the two synced to master is > quite significant. > > For the master based nptl_merge, all I have to do is a > 'git merge origin/master' and fixup any conflicts. Done. > For the old nptl branch, I have to cherry pick every commit by hand.
I'll help as mush as I can... as for your case, the problem is time. > I have so little time to work on uClibc, that I would rather spend it > actually fixing problems, than just doing very manual syncing work... > > Carmelo, I'm going to apply your sh4 string functions to nptl_merge as > they are the only outstanding difference between the two. > Austin, they will apply (I did on my own copy) without problem. They won't build on master anyway due to missing ENTRY() macro in sh/sysdeps that are defined into the nptl part only, that's clearly not the best. So I'll move them into a libc/sysdeps specific part and commit into master too. So, please go ahead. Carmelo > -Austin > _______________________________________________ > uClibc mailing list > uClibc@uclibc.org > http://lists.busybox.net/mailman/listinfo/uclibc > -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org iEYEARECAAYFAksKK5wACgkQoRq/3BrK1s+VXQCg6xYdPNt/6l3O91zZ3gSPGWjm dQcAoIb5T3iVqOCOXUJq6hdFsJWlovap =OWS8 -----END PGP SIGNATURE----- _______________________________________________ uClibc mailing list uClibc@uclibc.org http://lists.busybox.net/mailman/listinfo/uclibc