Move the whole threading ;odel choice out of glibc and into the generic C library options: even uClibc may have NPTL at one point in the (hopefully near) future.
author"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Mon May 14 19:59:41 2007 +0000 (2007-05-14)
changeset 9557694569322b
parent 94 f32c4f663805
child 96 aa1a9fbd6eb8
Move the whole threading ;odel choice out of glibc and into the generic C library options: even uClibc may have NPTL at one point in the (hopefully near) future.
Mark the progress bar as being CPU-intensive.
Little style fix to the core C compiler build step.
config/global.in
config/libc.in
config/libc_glibc.in
scripts/build/cc_core_gcc.sh
     1.1 --- a/config/global.in	Mon May 14 19:28:14 2007 +0000
     1.2 +++ b/config/global.in	Mon May 14 19:59:41 2007 +0000
     1.3 @@ -258,6 +258,9 @@
     1.4        to show work is not stalled.
     1.5        
     1.6        Available when not in DEBUG log level.
     1.7 +      
     1.8 +      WARNING! Very CPU intensive! If you have spare CPU, then you can use it,
     1.9 +      otherwise, refrain from using it.
    1.10  
    1.11  config LOG_USE_COLORS
    1.12      bool
     2.1 --- a/config/libc.in	Mon May 14 19:28:14 2007 +0000
     2.2 +++ b/config/libc.in	Mon May 14 19:59:41 2007 +0000
     2.3 @@ -10,10 +10,13 @@
     2.4  config LIBC_GLIBC
     2.5      bool
     2.6      prompt "glibc"
     2.7 +    select LIBC_SUPPORT_NPTL
     2.8 +    select LIBC_SUPPORT_LINUXTHREADS
     2.9  
    2.10  config LIBC_UCLIBC
    2.11      bool
    2.12      prompt "uClibc"
    2.13 +    select LIBC_SUPPORT_LINUXTHREADS
    2.14  
    2.15  endchoice
    2.16  
    2.17 @@ -25,6 +28,39 @@
    2.18      default "glibc" if LIBC_GLIBC
    2.19      default "uClibc" if LIBC_UCLIBC
    2.20  
    2.21 +config LIBC_SUPPORT_NPTL
    2.22 +    bool
    2.23 +    default n
    2.24 +
    2.25 +config LIBC_SUPPORT_LINUXTHREADS
    2.26 +    bool
    2.27 +    default n
    2.28 +
    2.29 +choice
    2.30 +    bool
    2.31 +    prompt "Threading implentation to use:"
    2.32 +    default LIBC_THREADS_NPTL           if LIBC_SUPPORT_NPTL
    2.33 +    default LIBC_THREADS_LINUXTHREADS   if LIBC_SUPPORT_LINUXTHREADS && ! LIBC_SUPPORT_NPTL
    2.34 +    default LIBC_THREADS_NONE           if ! LIBC_SUPPORT_LINUXTHREADS && ! LIBC_SUPPORT_NPTL
    2.35 +    depends on EXPERIMENTAL
    2.36 +
    2.37 +config LIBC_THREADS_NPTL
    2.38 +    bool
    2.39 +    prompt "nptl (EXPERIMENTAL)"
    2.40 +    depends on LIBC_SUPPORT_NPTL
    2.41 +    depends on EXPERIMENTAL
    2.42 +
    2.43 +config LIBC_THREADS_LINUXTHREADS
    2.44 +    bool
    2.45 +    prompt "linuxthreads"
    2.46 +    depends on LIBC_SUPPORT_LINUXTHREADS
    2.47 +
    2.48 +config LIBC_THREADS_NONE
    2.49 +    bool
    2.50 +    prompt "none"
    2.51 +
    2.52 +endchoice
    2.53 +
    2.54  if LIBC_GLIBC
    2.55  source config/libc_glibc.in
    2.56  endif
     3.1 --- a/config/libc_glibc.in	Mon May 14 19:28:14 2007 +0000
     3.2 +++ b/config/libc_glibc.in	Mon May 14 19:59:41 2007 +0000
     3.3 @@ -136,25 +136,6 @@
     3.4  # CT_INSERT_VERSION_STRING_ABOVE
     3.5  # Don't remove above line!
     3.6  
     3.7 -choice
     3.8 -    bool
     3.9 -    prompt "Threading implentation to use:"
    3.10 -    default LIBC_GLIBC_THREADS_LINUXTHREADS
    3.11 -
    3.12 -config LIBC_GLIBC_THREADS_NPTL
    3.13 -    bool
    3.14 -    prompt "nptl (not implemented)"
    3.15 -
    3.16 -config LIBC_GLIBC_THREADS_LINUXTHREADS
    3.17 -    bool
    3.18 -    prompt "linuxthreads"
    3.19 -
    3.20 -config LIBC_GLIBC_THREADS_NONE
    3.21 -    bool
    3.22 -    prompt "none"
    3.23 -
    3.24 -endchoice
    3.25 -
    3.26  config LIBC_GLIBC_EXTRA_CONFIG
    3.27      string
    3.28      prompt "glibc extra config"
     4.1 --- a/scripts/build/cc_core_gcc.sh	Mon May 14 19:28:14 2007 +0000
     4.2 +++ b/scripts/build/cc_core_gcc.sh	Mon May 14 19:59:41 2007 +0000
     4.3 @@ -28,7 +28,7 @@
     4.4  
     4.5      CT_DoStep INFO "Installing core C compiler"
     4.6  
     4.7 -    CT_DoLog EXTRA "Copy headers to install area of bootstrap gcc, so it can build libgcc2"
     4.8 +    CT_DoLog EXTRA "Copying headers to install area of bootstrap gcc, so it can build libgcc2"
     4.9      mkdir -p "${CT_CC_CORE_PREFIX_DIR}/${CT_TARGET}/include"
    4.10      cp -r "${CT_HEADERS_DIR}"/* "${CT_CC_CORE_PREFIX_DIR}/${CT_TARGET}/include" 2>&1 |CT_DoLog DEBUG
    4.11