7 files changed, 61 insertions, 65 deletions
diff --git a/config/libc/eglibc.in b/config/libc/eglibc.in
index 43ab84cc..5c77074a 100644
--- a/config/libc/eglibc.in
+++ b/config/libc/eglibc.in
@@ -1,16 +1,16 @@
 # eglibc options
-# depends on ! MINGW32 && ! BARE_METAL && ARCH_USE_MMU
 
-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.
+## depends on ! MINGW32 && ! BARE_METAL && ARCH_USE_MMU
+##
+## select LIBC_SUPPORT_NPTL
+## select LIBC_SUPPORT_LINUXTHREADS
+##
+## help EGLIBC (Embedded GLIBC) is a variant of the standard GNU GLIBC
+## help that is designed to work well on embedded systems.  EGLIBC strives
+## help to be source and binary compatible with GLIBC.  Its goals include
+## help a reduced footprint, configurable components, and improved
+## help cross-compilation support.  EGLIBC also includes some embedded ports
+## help (such as e500/spe) that are normally separate add-ons of GLIBC.
 
 choice
     bool
diff --git a/config/libc/glibc-eglibc.in-common b/config/libc/glibc-eglibc.in-common
index 89b85eb6..7b75fcb7 100644
--- a/config/libc/glibc-eglibc.in-common
+++ b/config/libc/glibc-eglibc.in-common
@@ -3,23 +3,20 @@
 
 if LIBC_glibc || LIBC_eglibc
 
-# Force using the BFD linker during the toolchain build
-config LIBC_glibc_familly
-    bool
-    default y
-    select BINUTILS_FORCE_LD_BFD
-
 # Some architectures require the ports addon. List them one by one here:
 # This list must be carefully in sync with the architectures names
 # we can find in config/arch/*
-
-config ARCH_arm
-    select LIBC_GLIBC_USE_PORTS
-
-config ARCH_mips
+config LIBC_GLIBC_MAY_FORCE_PORTS
+    bool
+    default y if ARCH_arm
+    default y if ARCH_mips
     select LIBC_GLIBC_USE_PORTS
 
-# End of arch-specific ports auto-select
+# Force using the BFD linker during the toolchain build
+config LIBC_glibc_familly
+    bool
+    default y
+    select BINUTILS_FORCE_LD_BFD
 
 comment "glibc/eglibc common options"
 
diff --git a/config/libc/glibc.in b/config/libc/glibc.in
index 4c4f472b..d3b59481 100644
--- a/config/libc/glibc.in
+++ b/config/libc/glibc.in
@@ -1,11 +1,11 @@
 # glibc options
-# depends on ! MINGW32 && ! BARE_METAL && ARCH_USE_MMU
 
-config LIBC_glibc
-    select LIBC_SUPPORT_NPTL
-    help
-      The de-facto standard for Linux distributions.
-      Feature-rich, but large...  Most usefull for desktop-like systems.
+## depends on ! MINGW32 && ! BARE_METAL && ARCH_USE_MMU
+##
+## select LIBC_SUPPORT_NPTL
+##
+## help The de-facto standard for Linux distributions.
+## help Feature-rich, but large...  Most usefull for desktop-like systems.
 
 choice
     bool
diff --git a/config/libc/mingw.in b/config/libc/mingw.in
index 2c7bb0f9..c2b10e43 100644
--- a/config/libc/mingw.in
+++ b/config/libc/mingw.in
@@ -1,11 +1,10 @@
 # mingw options
-# depends on MINGW32
 
-config LIBC_mingw
-    bool
-    select LIBC_SUPPORT_WIN32THREADS
-    help
-      The de-facto standard for Mingw distributions.
+## depends on MINGW32
+##
+## select LIBC_SUPPORT_WIN32THREADS
+##
+## help The de-facto standard for Mingw distributions.
 
 choice
     bool
diff --git a/config/libc/newlib.in b/config/libc/newlib.in
index 3eba924b..9eeee522 100644
--- a/config/libc/newlib.in
+++ b/config/libc/newlib.in
@@ -1,15 +1,15 @@
 # newlib options
-# depends on BARE_METAL
 
-config LIBC_newlib
-    select LIBC_SUPPORT_THREADS_NONE
-    help
-      Newlib is a C library intended for use on embedded systems. It is a
-      conglomeration of several library parts, all under free software
-      licenses that make them easily usable on embedded products. Newlib
-      is only available in source form. It can be compiled for a wide
-      array of processors, and will usually work on any architecture with
-      the addition of a few low-level routines.
+## depends on BARE_METAL
+##
+## select LIBC_SUPPORT_THREADS_NONE
+##
+## help Newlib is a C library intended for use on embedded systems. It is a
+## help conglomeration of several library parts, all under free software
+## help licenses that make them easily usable on embedded products. Newlib
+## help is only available in source form. It can be compiled for a wide
+## help array of processors, and will usually work on any architecture with
+## help the addition of a few low-level routines.
 
 choice
     bool
diff --git a/config/libc/none.in b/config/libc/none.in
index 95070075..78a06125 100644
--- a/config/libc/none.in
+++ b/config/libc/none.in
@@ -1,14 +1,13 @@
 # Dummy config file to not use a C library *at all*
-# depends on BARE_METAL
 
-config LIBC_none
-    help
-      Do not use a C library.
-      
-      This is usefull if your project is self-contained, does not rely on
-      an external C library, and provides all the necessary bits.
-      
-      Most probably usefull to bootloaders, as they generally don't depend
-      on the C library.
-      
-      If unsure: do *not* choose that, and use another option in the choice.
+## depends on BARE_METAL
+##
+## help Do not use a C library.
+## help
+## help This is usefull if your project is self-contained, does not rely on
+## help an external C library, and provides all the necessary bits.
+## help
+## help Most probably usefull to bootloaders, as they generally don't depend
+## help on the C library.
+## help
+## help If unsure: do *not* choose that, and use another option in the choice.
diff --git a/config/libc/uClibc.in b/config/libc/uClibc.in
index 1740e658..50ecf89f 100644
--- a/config/libc/uClibc.in
+++ b/config/libc/uClibc.in
@@ -1,13 +1,14 @@
 # uClibc options
-# depends on ! MINGW32 && ! BARE_METAL
 
-config LIBC_uClibc
-    select LIBC_SUPPORT_LINUXTHREADS
-    select LIBC_SUPPORT_THREADS_NONE
-    help
-      The de-facto standard for embeded linux systems.
-      Highly configurable, thus as feature-rich as you need, without
-      compromising for size.
+## depends on ! MINGW32 && ! BARE_METAL
+##
+## select LIBC_SUPPORT_LINUXTHREADS
+## select LIBC_SUPPORT_THREADS_NONE
+##
+## help The de-facto standard for embeded linux systems.
+## help
+## help Highly configurable, thus as feature-rich as you
+## help need, without compromising for size.
 
 choice
     bool