1.1 --- a/config/target.in	Mon May 28 21:33:35 2007 +0000
     1.2 +++ b/config/target.in	Tue May 29 19:30:38 2007 +0000
     1.3 @@ -57,35 +57,6 @@
     1.4  
     1.5  endchoice
     1.6  
     1.7 -choice
     1.8 -    bool
     1.9 -    prompt "Threading implentation to use:"
    1.10 -    default THREADS_NPTL           if LIBC_SUPPORT_NPTL
    1.11 -    default THREADS_LINUXTHREADS   if LIBC_SUPPORT_LINUXTHREADS && ! LIBC_SUPPORT_NPTL
    1.12 -    default THREADS_NONE           if ! LIBC_SUPPORT_LINUXTHREADS && ! LIBC_SUPPORT_NPTL
    1.13 -
    1.14 -config THREADS_NPTL
    1.15 -    bool
    1.16 -    prompt "nptl"
    1.17 -    depends on LIBC_SUPPORT_NPTL
    1.18 -
    1.19 -config THREADS_LINUXTHREADS
    1.20 -    bool
    1.21 -    prompt "linuxthreads"
    1.22 -    depends on LIBC_SUPPORT_LINUXTHREADS
    1.23 -
    1.24 -config THREADS_NONE
    1.25 -    bool
    1.26 -    prompt "none"
    1.27 -
    1.28 -endchoice
    1.29 -
    1.30 -config THREADS
    1.31 -    string
    1.32 -    default "nptl"          if THREADS_NPTL
    1.33 -    default "linuxthreads"  if THREADS_LINUXTHREADS
    1.34 -    default "none"          if THREADS_NONE
    1.35 -
    1.36  comment "Target optimisations"
    1.37  
    1.38  config ARCH_ARCH

     2.1 --- a/config/toolchain.in	Mon May 28 21:33:35 2007 +0000
     2.2 +++ b/config/toolchain.in	Tue May 29 19:30:38 2007 +0000
     2.3 @@ -22,6 +22,35 @@
     2.4        You might not want shared librries if you're building for a target that
     2.5        don't support it (maybe some nommu targets, for example, or bare metal).
     2.6  
     2.7 +choice
     2.8 +    bool
     2.9 +    prompt "Threading implentation to use:"
    2.10 +    default THREADS_NPTL           if LIBC_SUPPORT_NPTL
    2.11 +    default THREADS_LINUXTHREADS   if LIBC_SUPPORT_LINUXTHREADS && ! LIBC_SUPPORT_NPTL
    2.12 +    default THREADS_NONE           if ! LIBC_SUPPORT_LINUXTHREADS && ! LIBC_SUPPORT_NPTL
    2.13 +
    2.14 +config THREADS_NPTL
    2.15 +    bool
    2.16 +    prompt "nptl"
    2.17 +    depends on LIBC_SUPPORT_NPTL
    2.18 +
    2.19 +config THREADS_LINUXTHREADS
    2.20 +    bool
    2.21 +    prompt "linuxthreads"
    2.22 +    depends on LIBC_SUPPORT_LINUXTHREADS
    2.23 +
    2.24 +config THREADS_NONE
    2.25 +    bool
    2.26 +    prompt "none"
    2.27 +
    2.28 +endchoice
    2.29 +
    2.30 +config THREADS
    2.31 +    string
    2.32 +    default "nptl"          if THREADS_NPTL
    2.33 +    default "linuxthreads"  if THREADS_LINUXTHREADS
    2.34 +    default "none"          if THREADS_NONE
    2.35 +
    2.36  config TARGET_MULTILIB
    2.37      bool
    2.38  #    prompt "Enable 'multilib' support (EXPERIMENTAL)"