1.1 --- a/config/libc.in	Sun Sep 14 18:09:36 2008 +0000
     1.2 +++ b/config/libc.in	Sun Jan 31 13:04:34 2010 +0100
     1.3 @@ -2,10 +2,7 @@
     1.4  
     1.5  config LIBC
     1.6      string
     1.7 -    default "none"   if BARE_METAL
     1.8 -    default "glibc"  if LIBC_GLIBC
     1.9 -    default "eglibc" if LIBC_EGLIBC
    1.10 -    default "uClibc" if LIBC_UCLIBC
    1.11 +    default "none" if BARE_METAL
    1.12  
    1.13  if ! BARE_METAL
    1.14  
    1.15 @@ -25,37 +22,7 @@
    1.16        So if you want to be able to re-build your toolchain later, you will
    1.17        have to save your C library tarball by yourself.
    1.18  
    1.19 -choice
    1.20 -    bool
    1.21 -    prompt "C-library to use:"
    1.22 -    default LIBC_GLIBC
    1.23 -
    1.24 -config LIBC_GLIBC
    1.25 -    bool
    1.26 -    prompt "glibc"
    1.27 -    select LIBC_SUPPORT_NPTL
    1.28 -    select LIBC_SUPPORT_LINUXTHREADS
    1.29 -
    1.30 -config LIBC_EGLIBC
    1.31 -    bool
    1.32 -    prompt "eglibc (EXPERIMENTAL)"
    1.33 -    select LIBC_SUPPORT_NPTL
    1.34 -    select LIBC_SUPPORT_LINUXTHREADS
    1.35 -    depends on EXPERIMENTAL
    1.36 -    help
    1.37 -      EGLIBC (Embedded GLIBC) is a variant of the standard GNU GLIBC
    1.38 -      that is designed to work well on embedded systems.  EGLIBC strives
    1.39 -      to be source and binary compatible with GLIBC.  Its goals include
    1.40 -      a reduced footprint, configurable components, and improved
    1.41 -      cross-compilation support.  EGLIBC also includes some embedded ports
    1.42 -      (such as e500/spe) that are normally separate add-ons of GLIBC.
    1.43 -
    1.44 -config LIBC_UCLIBC
    1.45 -    bool
    1.46 -    prompt "uClibc"
    1.47 -    select LIBC_SUPPORT_LINUXTHREADS
    1.48 -
    1.49 -endchoice
    1.50 +source config.gen/libc.in
    1.51  
    1.52  comment "Common C library options"
    1.53  
    1.54 @@ -96,23 +63,11 @@
    1.55  
    1.56  endchoice
    1.57  
    1.58 -if LIBC_GLIBC
    1.59 -source config/libc/glibc.in
    1.60 -endif
    1.61 -
    1.62 -if LIBC_EGLIBC
    1.63 -source config/libc/eglibc.in
    1.64 -endif
    1.65 -
    1.66  # Hack: mconf does not allow to include a file multiple times,
    1.67  # so include glibc and eglibc common options from here, rather
    1.68  # than from each config files.
    1.69 -if LIBC_GLIBC || LIBC_EGLIBC
    1.70 -source config/libc/glibc-eglibc-common.in
    1.71 -endif
    1.72 -
    1.73 -if LIBC_UCLIBC
    1.74 -source config/libc/uClibc.in
    1.75 +if LIBC_glibc || LIBC_eglibc
    1.76 +source config/libc/glibc-eglibc.in-common
    1.77  endif
    1.78  
    1.79  endmenu