Merge the NPTL stuff.
That still leaves the linuxthreads stuff broken, but it was just before. I don't care anyway. Time to fix that later...
1 --- glibc-2.2.5/configure.old 2003-05-30 21:51:13.000000000 -0700
2 +++ glibc-2.2.5/configure 2003-05-30 21:51:23.000000000 -0700
4 ac_cv_prog_cc_works=yes
5 # If we can't run a trivial program, we are probably using a cross compiler.
6 if (./conftest; exit) 2>/dev/null; then
7 - ac_cv_prog_cc_cross=no
8 + ac_cv_prog_cc_cross=yes
10 ac_cv_prog_cc_cross=yes