Steve Hill wrote: > My NPTL thread code is from glibc 20050823, clearly older code. Joseph, > what glibc version did you reference for the ARM port?
Our ARM port took the libpthreads/nptl directory from uClibc-nptl, so it's based on the same original sources. We used SVK to stay up to date with the uClibc NPTL branch, and later the uClibc trunk, but it wasn't a goal to track the upstream NPTL sources. > I would like to have Carmelo's latest patch against uClibc-NPTL branch. If the > changes are not severe, then I would like to get SuperH into the current NPTL > branch first. If there are too many changes, then let's go ahead and create a > new branch and start merging. It seems to me that we need to plan up front how we're going to merge to the trunk. I haven't followed development since last fall, but the last I knew, the uClibc-nptl branch wasn't up to date with respect to any individual trunk version, which means merging it to the trunk requires going through the patch versus the closest trunk rev we can find line by line. That seems like a heck of a lot of work. The ARM port is up to date with respect to a documented uClibc trunk revision. A diff between that trunk rev and the ARM port gets you exactly and only the NPTL changes. Merging that entails bringing in trunk changes since that point, resolving conflicts, and addressing regressions. Steve, have you tried simply dumping the MIPS-specific stuff from libpthread/nptl into the ARM port branch and seeing how it works? It might not be that bad. It'd be worth a try, to save that line-by-line work. (I sure didn't enjoy it. :) ) _______________________________________________ uClibc mailing list [email protected] http://busybox.net/cgi-bin/mailman/listinfo/uclibc
