diff -r 207ad430c254 -r d11009b668dd scripts/build/libc/uClibc.sh
--- a/scripts/build/libc/uClibc.sh	Wed Apr 07 09:18:20 2010 +0200
+++ b/scripts/build/libc/uClibc.sh	Wed Jun 09 00:41:25 2010 +0200
@@ -327,6 +327,36 @@
 			ENDSED
     fi
 
+    # Push the threading model
+    # Note: we take into account all of the .28, .29, .30 and .31
+    #       versions, here.
+    case "${CT_THREADS}:${CT_LIBC_UCLIBC_LNXTHRD}" in
+        none:*)
+            cat <<-ENDSED
+				s/^# HAS_NO_THREADS is not set/HAS_NO_THREADS=y/
+				s/^UCLIBC_HAS_THREADS=y/# UCLIBC_HAS_THREADS is not set/
+				s/^LINUXTHREADS_OLD=y/# LINUXTHREADS_OLD is not set/
+				s/^LINUXTHREADS_NEW=y/# LINUXTHREADS_NEW is not set/
+				ENDSED
+            ;;
+        *:old)
+            cat <<-ENDSED
+				s/^HAS_NO_THREADS=y/# HAS_NO_THREADS is not set/
+				s/^# UCLIBC_HAS_THREADS is not set/UCLIBC_HAS_THREADS=y/
+				s/^# LINUXTHREADS_OLD is not set/# LINUXTHREADS_OLD=y/
+				s/^LINUXTHREADS_NEW=y/# LINUXTHREADS_NEW is not set/
+				ENDSED
+            ;;
+        *:new)
+            cat <<-ENDSED
+				s/^# HAS_NO_THREADS is not set/HAS_NO_THREADS=y/
+				s/^# UCLIBC_HAS_THREADS is not set/UCLIBC_HAS_THREADS=y/
+				s/^LINUXTHREADS_OLD=y/# LINUXTHREADS_OLD is not set/
+				s/^# LINUXTHREADS_NEW is not set/# LINUXTHREADS_NEW=y/
+				ENDSED
+            ;;
+    esac
+
     # Always build the libpthread_db
     cat <<-ENDSED
 		s/^# PTHREADS_DEBUG_SUPPORT is not set.*/PTHREADS_DEBUG_SUPPORT=y/