ExternalVendorCode/crosstool-ng
1
0
Fork 0
mirror of https://github.com/crosstool-ng/crosstool-ng.git synced 2024-12-20 05:17:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

libc: rename the threads options

Browse Source 
Use a more coherent naming for the options. This will help commonalise
the native case (e.g. NPTL on Linux, win32 on Windows), and add alternate
implementations (e.g. musl.)

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Bryan Hundven <bryanhundven@gmail.com>
This commit is contained in:
Yann E. MORIN 2014-07-27 23:47:24 +02:00
parent 85622fdd49
commit b1f536966b
7 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
config/libc.in
View File

@ -24,15 +24,15 @@ source "config.gen/libc.in"
config LIBC_SUPPORT_THREADS_ANY config LIBC_SUPPORT_THREADS_ANY
bool bool
config LIBC_SUPPORT_NPTL config LIBC_SUPPORT_THREADS_NATIVE
bool bool
select LIBC_SUPPORT_THREADS_ANY select LIBC_SUPPORT_THREADS_ANY
config LIBC_SUPPORT_LINUXTHREADS config LIBC_SUPPORT_THREADS_LT
bool bool
select LIBC_SUPPORT_THREADS_ANY select LIBC_SUPPORT_THREADS_ANY
config LIBC_SUPPORT_WIN32THREADS config LIBC_SUPPORT_THREADS_WIN32
bool bool
select LIBC_SUPPORT_THREADS_ANY select LIBC_SUPPORT_THREADS_ANY
@ -41,9 +41,9 @@ config LIBC_SUPPORT_THREADS_NONE
config THREADS config THREADS
string string
default "nptl" if THREADS_NPTL default "nptl" if THREADS_NATIVE
default "linuxthreads" if THREADS_LINUXTHREADS default "linuxthreads" if THREADS_LT
default "win32" if THREADS_WIN32THREADS default "win32" if THREADS_WIN32
default "none" if THREADS_NONE || LIBC_none default "none" if THREADS_NONE || LIBC_none
# No C library, no threads! # No C library, no threads!
@ -54,25 +54,30 @@ comment "Common C library options"
choice choice
bool bool
prompt "Threading implementation to use:" prompt "Threading implementation to use:"
default THREADS_NPTL if LIBC_SUPPORT_NPTL default THREADS_NATIVE if LIBC_SUPPORT_THREADS_NATIVE
default THREADS_LINUXTHREADS if LIBC_SUPPORT_LINUXTHREADS && ! LIBC_SUPPORT_NPTL default THREADS_THREADS_LT if LIBC_SUPPORT_THREADS_LT && ! LIBC_SUPPORT_THREADS_NATIVE
default THREADS_WIN32 if LIBC_SUPPORT_WIN32THREADS default THREADS_WIN32 if LIBC_SUPPORT_THREADS_WIN32
default THREADS_NONE if ! LIBC_SUPPORT_THREADS_ANY default THREADS_NONE if ! LIBC_SUPPORT_THREADS_ANY
config THREADS_NPTL config THREADS_NATIVE
bool bool
prompt "nptl" prompt "native"
depends on LIBC_SUPPORT_NPTL depends on LIBC_SUPPORT_THREADS_NATIVE
help
This selects the native threads implementation for the selected
system and C library.
config THREADS_LINUXTHREADS For example, on Linux with glibc, this is NPTL.
config THREADS_LT
bool bool
prompt "linuxthreads" prompt "linuxthreads"
depends on LIBC_SUPPORT_LINUXTHREADS depends on LIBC_SUPPORT_THREADS_LT
config THREADS_WIN32THREADS config THREADS_WIN32
bool bool
prompt "win32" prompt "win32"
depends on LIBC_SUPPORT_WIN32THREADS depends on LIBC_SUPPORT_THREADS_WIN32
config THREADS_NONE config THREADS_NONE
bool bool

2
config/libc/eglibc.in
View File

@ -2,7 +2,7 @@
## depends on ! WINDOWS && ! BARE_METAL && ARCH_USE_MMU ## depends on ! WINDOWS && ! BARE_METAL && ARCH_USE_MMU
## ##
## select LIBC_SUPPORT_NPTL ## select LIBC_SUPPORT_THREADS_NATIVE
## select CC_CORE_PASSES_NEEDED ## select CC_CORE_PASSES_NEEDED
## ##
## help EGLIBC (Embedded GLIBC) is a variant of the standard GNU GLIBC ## help EGLIBC (Embedded GLIBC) is a variant of the standard GNU GLIBC

2
config/libc/glibc.in
View File

@ -2,7 +2,7 @@
## depends on ! WINDOWS && ! BARE_METAL && ARCH_USE_MMU ## depends on ! WINDOWS && ! BARE_METAL && ARCH_USE_MMU
## ##
## select LIBC_SUPPORT_NPTL ## select LIBC_SUPPORT_THREADS_NATIVE
## select CC_CORE_PASSES_NEEDED ## select CC_CORE_PASSES_NEEDED
## ##
## help The de-facto standard for Linux distributions. ## help The de-facto standard for Linux distributions.

2
config/libc/mingw.in
View File

@ -2,7 +2,7 @@
## depends on WINDOWS ## depends on WINDOWS
## ##
## select LIBC_SUPPORT_WIN32THREADS ## select LIBC_SUPPORT_THREADS_WIN32
## select CC_CORE_PASSES_NEEDED ## select CC_CORE_PASSES_NEEDED
## ##
## help The de-facto standard for Mingw distributions. ## help The de-facto standard for Mingw distributions.

6
config/libc/uClibc.in
View File

@ -2,7 +2,7 @@
## depends on ! WINDOWS && ! BARE_METAL ## depends on ! WINDOWS && ! BARE_METAL
## ##
## select LIBC_SUPPORT_LINUXTHREADS ## select LIBC_SUPPORT_THREADS_LT
## select LIBC_SUPPORT_THREADS_NONE ## select LIBC_SUPPORT_THREADS_NONE
## select CC_CORE_PASSES_NEEDED ## select CC_CORE_PASSES_NEEDED
## ##
@ -76,7 +76,7 @@ config LIBC_UCLIBC_CUSTOM
bool bool
prompt "Custom uClibc" prompt "Custom uClibc"
depends on EXPERIMENTAL depends on EXPERIMENTAL
select LIBC_SUPPORT_NPTL select LIBC_SUPPORT_THREADS_NATIVE
select LIBC_UCLIBC_0_9_30_or_later select LIBC_UCLIBC_0_9_30_or_later
endchoice endchoice
@ -111,7 +111,7 @@ config LIBC_VERSION
config LIBC_UCLIBC_0_9_32_or_later config LIBC_UCLIBC_0_9_32_or_later
bool bool
select LIBC_SUPPORT_NPTL select LIBC_SUPPORT_THREADS_NATIVE
select LIBC_UCLIBC_0_9_30_or_later select LIBC_UCLIBC_0_9_30_or_later
config LIBC_UCLIBC_0_9_30_or_later config LIBC_UCLIBC_0_9_30_or_later

6
config/libc/uClibc.in.2
View File

@ -1,6 +1,6 @@
# uClibc second-part option # uClibc second-part option
if THREADS_LINUXTHREADS if THREADS_LT
choice choice
bool bool
@ -28,12 +28,12 @@ config LIBC_UCLIBC_LNXTHRD_NEW
endchoice endchoice
endif # THREADS_LINUXTHREADS endif # THREADS_LT
config LIBC_UCLIBC_LNXTHRD config LIBC_UCLIBC_LNXTHRD
string string
default "" if THREADS_NONE default "" if THREADS_NONE
default "" if THREADS_NPTL default "" if THREADS_NATIVE
default "old" if LIBC_UCLIBC_LNXTHRD_OLD default "old" if LIBC_UCLIBC_LNXTHRD_OLD
default "new" if LIBC_UCLIBC_LNXTHRD_NEW default "new" if LIBC_UCLIBC_LNXTHRD_NEW

2
samples/m68k-unknown-uclinux-uclibc/crosstool.config
View File

@ -7,4 +7,4 @@ CT_KERNEL_linux=y
CT_KERNEL_V_3_5=y CT_KERNEL_V_3_5=y
CT_BINUTILS_V_2_21_1a=y CT_BINUTILS_V_2_21_1a=y
CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/samples/${CT_TARGET}/${CT_LIBC}-${CT_LIBC_VERSION}.config" CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/samples/${CT_TARGET}/${CT_LIBC}-${CT_LIBC_VERSION}.config"
CT_THREADS_LINUXTHREADS=y CT_THREADS_LT=y