5 files changed, 27 insertions, 67 deletions
diff --git a/config/libc.in b/config/libc.in
index 27228d1..a373990 100644
--- a/config/libc.in
+++ b/config/libc.in
@@ -2,10 +2,7 @@
 
 config LIBC
     string
-    default "none"   if BARE_METAL
-    default "glibc"  if LIBC_GLIBC
-    default "eglibc" if LIBC_EGLIBC
-    default "uClibc" if LIBC_UCLIBC
+    default "none" if BARE_METAL
 
 if ! BARE_METAL
 
@@ -25,37 +22,7 @@ config LIBC_VERSION
       So if you want to be able to re-build your toolchain later, you will
       have to save your C library tarball by yourself.
 
-choice
-    bool
-    prompt "C-library to use:"
-    default LIBC_GLIBC
-
-config LIBC_GLIBC
-    bool
-    prompt "glibc"
-    select LIBC_SUPPORT_NPTL
-    select LIBC_SUPPORT_LINUXTHREADS
-
-config LIBC_EGLIBC
-    bool
-    prompt "eglibc (EXPERIMENTAL)"
-    select LIBC_SUPPORT_NPTL
-    select LIBC_SUPPORT_LINUXTHREADS
-    depends on EXPERIMENTAL
-    help
-      EGLIBC (Embedded GLIBC) is a variant of the standard GNU GLIBC
-      that is designed to work well on embedded systems.  EGLIBC strives
-      to be source and binary compatible with GLIBC.  Its goals include
-      a reduced footprint, configurable components, and improved
-      cross-compilation support.  EGLIBC also includes some embedded ports
-      (such as e500/spe) that are normally separate add-ons of GLIBC.
-
-config LIBC_UCLIBC
-    bool
-    prompt "uClibc"
-    select LIBC_SUPPORT_LINUXTHREADS
-
-endchoice
+source config.gen/libc.in
 
 comment "Common C library options"
 
@@ -96,23 +63,11 @@ config THREADS_NONE
 
 endchoice
 
-if LIBC_GLIBC
-source config/libc/glibc.in
-endif
-
-if LIBC_EGLIBC
-source config/libc/eglibc.in
-endif
-
 # Hack: mconf does not allow to include a file multiple times,
 # so include glibc and eglibc common options from here, rather
 # than from each config files.
-if LIBC_GLIBC || LIBC_EGLIBC
-source config/libc/glibc-eglibc-common.in
-endif
-
-if LIBC_UCLIBC
-source config/libc/uClibc.in
+if LIBC_glibc || LIBC_eglibc
+source config/libc/glibc-eglibc.in-common
 endif
 
 endmenu
diff --git a/config/libc/eglibc.in b/config/libc/eglibc.in
index bf0e4ed..bcda338 100644
--- a/config/libc/eglibc.in
+++ b/config/libc/eglibc.in
@@ -1,6 +1,16 @@
+# EXPERIMENTAL
 # eglibc options
 
-comment "eglibc specific options"
+config LIBC_eglibc
+    select LIBC_SUPPORT_NPTL
+    select LIBC_SUPPORT_LINUXTHREADS
+    help
+      EGLIBC (Embedded GLIBC) is a variant of the standard GNU GLIBC
+      that is designed to work well on embedded systems.  EGLIBC strives
+      to be source and binary compatible with GLIBC.  Its goals include
+      a reduced footprint, configurable components, and improved
+      cross-compilation support.  EGLIBC also includes some embedded ports
+      (such as e500/spe) that are normally separate add-ons of GLIBC.
 
 choice
     bool
diff --git a/config/libc/glibc-eglibc-common.in b/config/libc/glibc-eglibc.in-common
index 61becfb..61becfb 100644
--- a/config/libc/glibc-eglibc-common.in
+++ b/config/libc/glibc-eglibc.in-common
diff --git a/config/libc/glibc.in b/config/libc/glibc.in
index 250a56b..12c3192 100644
--- a/config/libc/glibc.in
+++ b/config/libc/glibc.in
@@ -1,6 +1,11 @@
 # glibc options
 
-comment "glibc specific options"
+config LIBC_glibc
+    select LIBC_SUPPORT_NPTL
+    select LIBC_SUPPORT_LINUXTHREADS
+    help
+      The de-facto standard for Linux distributions.
+      Feature-rich, but large...  Most usefull for desktop-like systems.
 
 choice
     bool
@@ -60,18 +65,3 @@ config LIBC_VERSION
 # CT_INSERT_VERSION_STRING_ABOVE
 # Don't remove above line!
 
-# Please note: This is not used for now (no sh support).
-config LIBC_GLIBC_CONFIGPARMS
-    string
-#    prompt "Extra config params (READ HELP)"
-    default "" if ARCH != "sh3" && ARCH != "sh4"
-    default "no-z-defs=yes" if ARCH = "sh3" || ARCH = "sh4"
-    help
-      Some architectures need to set options in the file configparms.
-      This is the case for sh3/4, which really need to set configparms as of
-      gcc-3.4/glibc-2.3.2.
-
-      Unless you are building a toolchain for sh3/4, you should leave that empty.
-
-      Note: this is awkward, doesn't work well if you need more than one
-            line in configparms
diff --git a/config/libc/uClibc.in b/config/libc/uClibc.in
index a84fae2..c3784f9 100644
--- a/config/libc/uClibc.in
+++ b/config/libc/uClibc.in
@@ -1,6 +1,11 @@
 # uClibc options
 
-comment "uClibc specific options"
+config LIBC_uClibc
+    select LIBC_SUPPORT_LINUXTHREADS
+    help
+      The de-facto standard for embeded linux systems.
+      Highly configurable, thus as feature-rich as you need, without
+      compromising for size.
 
 choice
     bool