1.1 --- a/config/libc.in	Sun Sep 14 16:21:07 2008 +0000
     1.2 +++ b/config/libc.in	Sun Sep 14 18:09:36 2008 +0000
     1.3 @@ -11,6 +11,20 @@
     1.4  
     1.5  menu "C-library"
     1.6  
     1.7 +config LIBC_VERSION
     1.8 +    string
     1.9 +    help
    1.10 +      Enter the date of the snapshot you want to use in the form: YYYYMMDD
    1.11 +      where YYYY is the 4-digit year, MM the 2-digit month and DD the 2-digit
    1.12 +      day in the month.
    1.13 +      
    1.14 +      Please note:
    1.15 +      - glibc has snapshots done every monday, and only the last ten are kept.
    1.16 +      - uClibc has daily snapshots, and only the last 30-or-so are kept.
    1.17 +      
    1.18 +      So if you want to be able to re-build your toolchain later, you will
    1.19 +      have to save your C library tarball by yourself.
    1.20 +
    1.21  choice
    1.22      bool
    1.23      prompt "C-library to use:"
    1.24 @@ -22,10 +36,6 @@
    1.25      select LIBC_SUPPORT_NPTL
    1.26      select LIBC_SUPPORT_LINUXTHREADS
    1.27  
    1.28 -if LIBC_GLIBC
    1.29 -source config/libc/glibc.in
    1.30 -endif
    1.31 -
    1.32  config LIBC_EGLIBC
    1.33      bool
    1.34      prompt "eglibc (EXPERIMENTAL)"
    1.35 @@ -40,23 +50,14 @@
    1.36        cross-compilation support.  EGLIBC also includes some embedded ports
    1.37        (such as e500/spe) that are normally separate add-ons of GLIBC.
    1.38  
    1.39 -if LIBC_EGLIBC
    1.40 -source config/libc/eglibc.in
    1.41 -endif
    1.42 -
    1.43  config LIBC_UCLIBC
    1.44      bool
    1.45      prompt "uClibc"
    1.46      select LIBC_SUPPORT_LINUXTHREADS
    1.47  
    1.48 -if LIBC_UCLIBC
    1.49 -source config/libc/uClibc.in
    1.50 -endif
    1.51 -
    1.52  endchoice
    1.53  
    1.54 -config LIBC_VERSION
    1.55 -    string
    1.56 +comment "Common C library options"
    1.57  
    1.58  config LIBC_SUPPORT_NPTL
    1.59      bool
    1.60 @@ -66,6 +67,12 @@
    1.61      bool
    1.62      default n
    1.63  
    1.64 +config THREADS
    1.65 +    string
    1.66 +    default "nptl"          if THREADS_NPTL
    1.67 +    default "linuxthreads"  if THREADS_LINUXTHREADS
    1.68 +    default "none"          if THREADS_NONE
    1.69 +
    1.70  choice
    1.71      bool
    1.72      prompt "Threading implementation to use:"
    1.73 @@ -89,24 +96,24 @@
    1.74  
    1.75  endchoice
    1.76  
    1.77 -config THREADS
    1.78 -    string
    1.79 -    default "nptl"          if THREADS_NPTL
    1.80 -    default "linuxthreads"  if THREADS_LINUXTHREADS
    1.81 -    default "none"          if THREADS_NONE
    1.82 +if LIBC_GLIBC
    1.83 +source config/libc/glibc.in
    1.84 +endif
    1.85  
    1.86 -config LIBC_VERSION
    1.87 -    help
    1.88 -      Enter the date of the snapshot you want to use in the form: YYYYMMDD
    1.89 -      where YYYY is the 4-digit year, MM the 2-digit month and DD the 2-digit
    1.90 -      day in the month.
    1.91 -      
    1.92 -      Please note:
    1.93 -      - glibc has snapshots done every monday, and only the last ten are kept.
    1.94 -      - uClibc has daily snapshots, and only the last 30-or-so are kept.
    1.95 -      
    1.96 -      So if you want to be able to re-build your toolchain later, you will
    1.97 -      have to save your C library tarball by yourself.
    1.98 +if LIBC_EGLIBC
    1.99 +source config/libc/eglibc.in
   1.100 +endif
   1.101 +
   1.102 +# Hack: mconf does not allow to include a file multiple times,
   1.103 +# so include glibc and eglibc common options from here, rather
   1.104 +# than from each config files.
   1.105 +if LIBC_GLIBC || LIBC_EGLIBC
   1.106 +source config/libc/glibc-eglibc-common.in
   1.107 +endif
   1.108 +
   1.109 +if LIBC_UCLIBC
   1.110 +source config/libc/uClibc.in
   1.111 +endif
   1.112  
   1.113  endmenu
   1.114