diff -r eeea35fbf182 -r 57694569322b config/libc.in
--- a/config/libc.in	Sat Feb 24 11:00:05 2007 +0000
+++ b/config/libc.in	Mon May 14 19:59:41 2007 +0000
@@ -10,10 +10,13 @@
 config LIBC_GLIBC
     bool
     prompt "glibc"
+    select LIBC_SUPPORT_NPTL
+    select LIBC_SUPPORT_LINUXTHREADS
 
 config LIBC_UCLIBC
     bool
     prompt "uClibc"
+    select LIBC_SUPPORT_LINUXTHREADS
 
 endchoice
 
@@ -25,6 +28,39 @@
     default "glibc" if LIBC_GLIBC
     default "uClibc" if LIBC_UCLIBC
 
+config LIBC_SUPPORT_NPTL
+    bool
+    default n
+
+config LIBC_SUPPORT_LINUXTHREADS
+    bool
+    default n
+
+choice
+    bool
+    prompt "Threading implentation to use:"
+    default LIBC_THREADS_NPTL           if LIBC_SUPPORT_NPTL
+    default LIBC_THREADS_LINUXTHREADS   if LIBC_SUPPORT_LINUXTHREADS && ! LIBC_SUPPORT_NPTL
+    default LIBC_THREADS_NONE           if ! LIBC_SUPPORT_LINUXTHREADS && ! LIBC_SUPPORT_NPTL
+    depends on EXPERIMENTAL
+
+config LIBC_THREADS_NPTL
+    bool
+    prompt "nptl (EXPERIMENTAL)"
+    depends on LIBC_SUPPORT_NPTL
+    depends on EXPERIMENTAL
+
+config LIBC_THREADS_LINUXTHREADS
+    bool
+    prompt "linuxthreads"
+    depends on LIBC_SUPPORT_LINUXTHREADS
+
+config LIBC_THREADS_NONE
+    bool
+    prompt "none"
+
+endchoice
+
 if LIBC_GLIBC
 source config/libc_glibc.in
 endif