From abe0c8ba392d2b46a8a547bfcf96f8e08c8c8511 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Tue, 29 May 2007 19:30:38 +0000
Subject: Threading model does not belong to the target sub-menu, but to the
 toolchain sub-menu.


diff --git a/config/target.in b/config/target.in
index 0b8a681..2f1b9c6 100644
--- a/config/target.in
+++ b/config/target.in
@@ -57,35 +57,6 @@ config ARCH_LE
 
 endchoice
 
-choice
-    bool
-    prompt "Threading implentation 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
-
 comment "Target optimisations"
 
 config ARCH_ARCH
diff --git a/config/toolchain.in b/config/toolchain.in
index 9c178c6..f46e1dc 100644
--- a/config/toolchain.in
+++ b/config/toolchain.in
@@ -22,6 +22,35 @@ 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 implentation 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_MULTILIB
     bool
 #    prompt "Enable 'multilib' support (EXPERIMENTAL)"
-- 
cgit v0.10.2-6-g49f6