diff -r 35b0ddf2c462 -r 4c6b50e0021a config/libc.in
--- a/config/libc.in	Tue Aug 12 10:53:11 2008 +0000
+++ b/config/libc.in	Thu Aug 21 09:48:00 2008 +0000
@@ -13,6 +13,10 @@
     select LIBC_SUPPORT_NPTL
     select LIBC_SUPPORT_LINUXTHREADS
 
+if LIBC_GLIBC
+source config/libc/glibc.in
+endif
+
 config LIBC_EGLIBC
     bool
     prompt "eglibc (EXPERIMENTAL)"
@@ -20,11 +24,19 @@
     select LIBC_SUPPORT_LINUXTHREADS
     depends on EXPERIMENTAL
 
+if LIBC_EGLIBC
+source config/libc/eglibc.in
+endif
+
 config LIBC_UCLIBC
     bool
     prompt "uClibc"
     select LIBC_SUPPORT_LINUXTHREADS
 
+if LIBC_UCLIBC
+source config/libc/uClibc.in
+endif
+
 endchoice
 
 config LIBC_VERSION
@@ -44,17 +56,34 @@
     bool
     default n
 
-if LIBC_GLIBC
-source config/libc/glibc.in
-endif
+choice
+    bool
+    prompt "Threading implementation to use:"
+    default THREADS_NPTL           if LIBC_SUPPORT_NPTL
+    default THREADS_LINUXTHREADS   if LIBC_SUPPORT_LINUXTHREADS && ! LIBC_SUPPORT_NPTL
+    default THREADS_NONE           if ! LIBC_SUPPORT_LINUXTHREADS && ! LIBC_SUPPORT_NPTL
 
-if LIBC_EGLIBC
-source config/libc/eglibc.in
-endif
+config THREADS_NPTL
+    bool
+    prompt "nptl"
+    depends on LIBC_SUPPORT_NPTL
 
-if LIBC_UCLIBC
-source config/libc/uClibc.in
-endif
+config THREADS_LINUXTHREADS
+    bool
+    prompt "linuxthreads"
+    depends on LIBC_SUPPORT_LINUXTHREADS
+
+config THREADS_NONE
+    bool
+    prompt "none"
+
+endchoice
+
+config THREADS
+    string
+    default "nptl"          if THREADS_NPTL
+    default "linuxthreads"  if THREADS_LINUXTHREADS
+    default "none"          if THREADS_NONE
 
 config LIBC_VERSION
     help