# HG changeset patch
# User "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
# Date 1179172781 0
# Node ID 57694569322b8e2a933e36535d8066f0a0b28dfb
# Parent  f32c4f663805a2dc21721c8bf42fafe0243571c2
Move the whole threading ;odel choice out of glibc and into the generic C library options: even uClibc may have NPTL at one point in the (hopefully near) future.
Mark the progress bar as being CPU-intensive.
Little style fix to the core C compiler build step.

diff -r f32c4f663805 -r 57694569322b config/global.in
--- a/config/global.in	Mon May 14 19:28:14 2007 +0000
+++ b/config/global.in	Mon May 14 19:59:41 2007 +0000
@@ -258,6 +258,9 @@
       to show work is not stalled.
       
       Available when not in DEBUG log level.
+      
+      WARNING! Very CPU intensive! If you have spare CPU, then you can use it,
+      otherwise, refrain from using it.
 
 config LOG_USE_COLORS
     bool
diff -r f32c4f663805 -r 57694569322b config/libc.in
--- a/config/libc.in	Mon May 14 19:28:14 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
diff -r f32c4f663805 -r 57694569322b config/libc_glibc.in
--- a/config/libc_glibc.in	Mon May 14 19:28:14 2007 +0000
+++ b/config/libc_glibc.in	Mon May 14 19:59:41 2007 +0000
@@ -136,25 +136,6 @@
 # CT_INSERT_VERSION_STRING_ABOVE
 # Don't remove above line!
 
-choice
-    bool
-    prompt "Threading implentation to use:"
-    default LIBC_GLIBC_THREADS_LINUXTHREADS
-
-config LIBC_GLIBC_THREADS_NPTL
-    bool
-    prompt "nptl (not implemented)"
-
-config LIBC_GLIBC_THREADS_LINUXTHREADS
-    bool
-    prompt "linuxthreads"
-
-config LIBC_GLIBC_THREADS_NONE
-    bool
-    prompt "none"
-
-endchoice
-
 config LIBC_GLIBC_EXTRA_CONFIG
     string
     prompt "glibc extra config"
diff -r f32c4f663805 -r 57694569322b scripts/build/cc_core_gcc.sh
--- a/scripts/build/cc_core_gcc.sh	Mon May 14 19:28:14 2007 +0000
+++ b/scripts/build/cc_core_gcc.sh	Mon May 14 19:59:41 2007 +0000
@@ -28,7 +28,7 @@
 
     CT_DoStep INFO "Installing core C compiler"
 
-    CT_DoLog EXTRA "Copy headers to install area of bootstrap gcc, so it can build libgcc2"
+    CT_DoLog EXTRA "Copying headers to install area of bootstrap gcc, so it can build libgcc2"
     mkdir -p "${CT_CC_CORE_PREFIX_DIR}/${CT_TARGET}/include"
     cp -r "${CT_HEADERS_DIR}"/* "${CT_CC_CORE_PREFIX_DIR}/${CT_TARGET}/include" 2>&1 |CT_DoLog DEBUG