diff --git a/config/libc.in b/config/libc.in
index 69ce3b13..e9a6ad93 100644
--- a/config/libc.in
+++ b/config/libc.in
@@ -13,6 +13,10 @@ config LIBC_GLIBC
     select LIBC_SUPPORT_NPTL
     select LIBC_SUPPORT_LINUXTHREADS
 
+if LIBC_GLIBC
+source config/libc/glibc.in
+endif
+
 config LIBC_EGLIBC
     bool
     prompt "eglibc (EXPERIMENTAL)"
@@ -20,11 +24,19 @@ config LIBC_EGLIBC
     select LIBC_SUPPORT_LINUXTHREADS
     depends on EXPERIMENTAL
 
+if LIBC_EGLIBC
+source config/libc/eglibc.in
+endif
+
 config LIBC_UCLIBC
     bool
     prompt "uClibc"
     select LIBC_SUPPORT_LINUXTHREADS
 
+if LIBC_UCLIBC
+source config/libc/uClibc.in
+endif
+
 endchoice
 
 config LIBC_VERSION
@@ -44,17 +56,34 @@ config LIBC_SUPPORT_LINUXTHREADS
     bool
     default n
 
-if LIBC_GLIBC
-source config/libc/glibc.in
-endif
+choice
+    bool
+    prompt "Threading implementation to use:"
+    default THREADS_NPTL           if LIBC_SUPPORT_NPTL
+    default THREADS_LINUXTHREADS   if LIBC_SUPPORT_LINUXTHREADS && ! LIBC_SUPPORT_NPTL
+    default THREADS_NONE           if ! LIBC_SUPPORT_LINUXTHREADS && ! LIBC_SUPPORT_NPTL
 
-if LIBC_EGLIBC
-source config/libc/eglibc.in
-endif
+config THREADS_NPTL
+    bool
+    prompt "nptl"
+    depends on LIBC_SUPPORT_NPTL
 
-if LIBC_UCLIBC
-source config/libc/uClibc.in
-endif
+config THREADS_LINUXTHREADS
+    bool
+    prompt "linuxthreads"
+    depends on LIBC_SUPPORT_LINUXTHREADS
+
+config THREADS_NONE
+    bool
+    prompt "none"
+
+endchoice
+
+config THREADS
+    string
+    default "nptl"          if THREADS_NPTL
+    default "linuxthreads"  if THREADS_LINUXTHREADS
+    default "none"          if THREADS_NONE
 
 config LIBC_VERSION
     help
diff --git a/config/toolchain.in b/config/toolchain.in
index dbfa2f12..e52d9b9d 100644
--- a/config/toolchain.in
+++ b/config/toolchain.in
@@ -22,35 +22,6 @@ config SHARED_LIBS
       You might not want shared librries if you're building for a target that
       don't support it (maybe some nommu targets, for example, or bare metal).
 
-choice
-    bool
-    prompt "Threading implementation to use:"
-    default THREADS_NPTL           if LIBC_SUPPORT_NPTL
-    default THREADS_LINUXTHREADS   if LIBC_SUPPORT_LINUXTHREADS && ! LIBC_SUPPORT_NPTL
-    default THREADS_NONE           if ! LIBC_SUPPORT_LINUXTHREADS && ! LIBC_SUPPORT_NPTL
-
-config THREADS_NPTL
-    bool
-    prompt "nptl"
-    depends on LIBC_SUPPORT_NPTL
-
-config THREADS_LINUXTHREADS
-    bool
-    prompt "linuxthreads"
-    depends on LIBC_SUPPORT_LINUXTHREADS
-
-config THREADS_NONE
-    bool
-    prompt "none"
-
-endchoice
-
-config THREADS
-    string
-    default "nptl"          if THREADS_NPTL
-    default "linuxthreads"  if THREADS_LINUXTHREADS
-    default "none"          if THREADS_NONE
-
 config TARGET_VENDOR
     string
     prompt "Vendor string"