From 721da92158c37cd044ccccd3b37d1e8d0c183f39 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Mon, 14 May 2007 19:59:41 +0000
Subject: 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 --git a/config/global.in b/config/global.in
index 00c5b10..bfe3863 100644
--- a/config/global.in
+++ b/config/global.in
@@ -258,6 +258,9 @@ config LOG_PROGRESS_BAR
       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 --git a/config/libc.in b/config/libc.in
index ba6a1be..da86f1c 100644
--- a/config/libc.in
+++ b/config/libc.in
@@ -10,10 +10,13 @@ choice
 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 @@ config LIBC
     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 --git a/config/libc_glibc.in b/config/libc_glibc.in
index eef10b7..d1b4be3 100644
--- a/config/libc_glibc.in
+++ b/config/libc_glibc.in
@@ -136,25 +136,6 @@ config LIBC_VERSION
 # 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 --git a/scripts/build/cc_core_gcc.sh b/scripts/build/cc_core_gcc.sh
index b12b8ba..3547256 100644
--- a/scripts/build/cc_core_gcc.sh
+++ b/scripts/build/cc_core_gcc.sh
@@ -28,7 +28,7 @@ do_cc_core() {
 
     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
 
-- 
cgit v0.10.2-6-g49f6