1.1 --- a/config/libc.in	Wed Aug 20 12:08:03 2008 +0000
     1.2 +++ b/config/libc.in	Thu Aug 21 09:48:00 2008 +0000
     1.3 @@ -13,6 +13,10 @@
     1.4      select LIBC_SUPPORT_NPTL
     1.5      select LIBC_SUPPORT_LINUXTHREADS
     1.6  
     1.7 +if LIBC_GLIBC
     1.8 +source config/libc/glibc.in
     1.9 +endif
    1.10 +
    1.11  config LIBC_EGLIBC
    1.12      bool
    1.13      prompt "eglibc (EXPERIMENTAL)"
    1.14 @@ -20,11 +24,19 @@
    1.15      select LIBC_SUPPORT_LINUXTHREADS
    1.16      depends on EXPERIMENTAL
    1.17  
    1.18 +if LIBC_EGLIBC
    1.19 +source config/libc/eglibc.in
    1.20 +endif
    1.21 +
    1.22  config LIBC_UCLIBC
    1.23      bool
    1.24      prompt "uClibc"
    1.25      select LIBC_SUPPORT_LINUXTHREADS
    1.26  
    1.27 +if LIBC_UCLIBC
    1.28 +source config/libc/uClibc.in
    1.29 +endif
    1.30 +
    1.31  endchoice
    1.32  
    1.33  config LIBC_VERSION
    1.34 @@ -44,17 +56,34 @@
    1.35      bool
    1.36      default n
    1.37  
    1.38 -if LIBC_GLIBC
    1.39 -source config/libc/glibc.in
    1.40 -endif
    1.41 +choice
    1.42 +    bool
    1.43 +    prompt "Threading implementation to use:"
    1.44 +    default THREADS_NPTL           if LIBC_SUPPORT_NPTL
    1.45 +    default THREADS_LINUXTHREADS   if LIBC_SUPPORT_LINUXTHREADS && ! LIBC_SUPPORT_NPTL
    1.46 +    default THREADS_NONE           if ! LIBC_SUPPORT_LINUXTHREADS && ! LIBC_SUPPORT_NPTL
    1.47  
    1.48 -if LIBC_EGLIBC
    1.49 -source config/libc/eglibc.in
    1.50 -endif
    1.51 +config THREADS_NPTL
    1.52 +    bool
    1.53 +    prompt "nptl"
    1.54 +    depends on LIBC_SUPPORT_NPTL
    1.55  
    1.56 -if LIBC_UCLIBC
    1.57 -source config/libc/uClibc.in
    1.58 -endif
    1.59 +config THREADS_LINUXTHREADS
    1.60 +    bool
    1.61 +    prompt "linuxthreads"
    1.62 +    depends on LIBC_SUPPORT_LINUXTHREADS
    1.63 +
    1.64 +config THREADS_NONE
    1.65 +    bool
    1.66 +    prompt "none"
    1.67 +
    1.68 +endchoice
    1.69 +
    1.70 +config THREADS
    1.71 +    string
    1.72 +    default "nptl"          if THREADS_NPTL
    1.73 +    default "linuxthreads"  if THREADS_LINUXTHREADS
    1.74 +    default "none"          if THREADS_NONE
    1.75  
    1.76  config LIBC_VERSION
    1.77      help

     2.1 --- a/config/toolchain.in	Wed Aug 20 12:08:03 2008 +0000
     2.2 +++ b/config/toolchain.in	Thu Aug 21 09:48:00 2008 +0000
     2.3 @@ -22,35 +22,6 @@
     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 implementation 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_VENDOR
    2.37      string
    2.38      prompt "Vendor string"