[PATCH 1/4] libc: rename the threads options
Bryan Hundven
bryanhundven@gmail.com
Fri Aug 1 02:02:00 GMT 2014
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
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>
Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>
---
config/libc.in | 37 ++++++++++++----------
config/libc/eglibc.in | 2 +-
config/libc/glibc.in | 2 +-
config/libc/mingw.in | 2 +-
config/libc/uClibc.in | 6 ++--
config/libc/uClibc.in.2 | 6 ++--
.../m68k-unknown-uclinux-uclibc/crosstool.config | 2 +-
7 files changed, 31 insertions(+), 26 deletions(-)
diff --git a/config/libc.in b/config/libc.in
index 03f5db2..240a01e 100644
--- a/config/libc.in
+++ b/config/libc.in
@@ -24,15 +24,15 @@ source "config.gen/libc.in"
config LIBC_SUPPORT_THREADS_ANY
bool
-config LIBC_SUPPORT_NPTL
+config LIBC_SUPPORT_THREADS_NATIVE
bool
select LIBC_SUPPORT_THREADS_ANY
-config LIBC_SUPPORT_LINUXTHREADS
+config LIBC_SUPPORT_THREADS_LT
bool
select LIBC_SUPPORT_THREADS_ANY
-config LIBC_SUPPORT_WIN32THREADS
+config LIBC_SUPPORT_THREADS_WIN32
bool
select LIBC_SUPPORT_THREADS_ANY
@@ -41,9 +41,9 @@ config LIBC_SUPPORT_THREADS_NONE
config THREADS
string
- default "nptl" if THREADS_NPTL
- default "linuxthreads" if THREADS_LINUXTHREADS
- default "win32" if THREADS_WIN32THREADS
+ default "nptl" if THREADS_NATIVE
+ default "linuxthreads" if THREADS_LT
+ default "win32" if THREADS_WIN32
default "none" if THREADS_NONE || LIBC_none
# No C library, no threads!
@@ -54,25 +54,30 @@ comment "Common C library options"
choice
bool
prompt "Threading implementation to use:"
- default THREADS_NPTL if LIBC_SUPPORT_NPTL
- default THREADS_LINUXTHREADS if LIBC_SUPPORT_LINUXTHREADS && ! LIBC_SUPPORT_NPTL
- default THREADS_WIN32 if LIBC_SUPPORT_WIN32THREADS
+ default THREADS_NATIVE if LIBC_SUPPORT_THREADS_NATIVE
+ default THREADS_THREADS_LT if LIBC_SUPPORT_THREADS_LT && ! LIBC_SUPPORT_THREADS_NATIVE
+ default THREADS_WIN32 if LIBC_SUPPORT_THREADS_WIN32
default THREADS_NONE if ! LIBC_SUPPORT_THREADS_ANY
-config THREADS_NPTL
+config THREADS_NATIVE
bool
- prompt "nptl"
- depends on LIBC_SUPPORT_NPTL
+ prompt "native"
+ depends on LIBC_SUPPORT_THREADS_NATIVE
+ help
+ This selects the native threads implementation for the selected
+ system and C library.
+
+ For example, on Linux with glibc, this is NPTL.
-config THREADS_LINUXTHREADS
+config THREADS_LT
bool
prompt "linuxthreads"
- depends on LIBC_SUPPORT_LINUXTHREADS
+ depends on LIBC_SUPPORT_THREADS_LT
-config THREADS_WIN32THREADS
+config THREADS_WIN32
bool
prompt "win32"
- depends on LIBC_SUPPORT_WIN32THREADS
+ depends on LIBC_SUPPORT_THREADS_WIN32
config THREADS_NONE
bool
diff --git a/config/libc/eglibc.in b/config/libc/eglibc.in
index 4f2b3ba..b677df0 100644
--- a/config/libc/eglibc.in
+++ b/config/libc/eglibc.in
@@ -2,7 +2,7 @@
## depends on ! WINDOWS && ! BARE_METAL && ARCH_USE_MMU
##
-## select LIBC_SUPPORT_NPTL
+## select LIBC_SUPPORT_THREADS_NATIVE
## select CC_CORE_PASSES_NEEDED
##
## help EGLIBC (Embedded GLIBC) is a variant of the standard GNU GLIBC
diff --git a/config/libc/glibc.in b/config/libc/glibc.in
index 15e3aff..5870995 100644
--- a/config/libc/glibc.in
+++ b/config/libc/glibc.in
@@ -2,7 +2,7 @@
## depends on ! WINDOWS && ! BARE_METAL && ARCH_USE_MMU
##
-## select LIBC_SUPPORT_NPTL
+## select LIBC_SUPPORT_THREADS_NATIVE
## select CC_CORE_PASSES_NEEDED
##
## help The de-facto standard for Linux distributions.
diff --git a/config/libc/mingw.in b/config/libc/mingw.in
index 7e27ae0..8c32b91 100644
--- a/config/libc/mingw.in
+++ b/config/libc/mingw.in
@@ -2,7 +2,7 @@
## depends on WINDOWS
##
-## select LIBC_SUPPORT_WIN32THREADS
+## select LIBC_SUPPORT_THREADS_WIN32
## select CC_CORE_PASSES_NEEDED
##
## help The de-facto standard for Mingw distributions.
diff --git a/config/libc/uClibc.in b/config/libc/uClibc.in
index 6be63d6..f641a6f 100644
--- a/config/libc/uClibc.in
+++ b/config/libc/uClibc.in
@@ -2,7 +2,7 @@
## depends on ! WINDOWS && ! BARE_METAL
##
-## select LIBC_SUPPORT_LINUXTHREADS
+## select LIBC_SUPPORT_THREADS_LT
## select LIBC_SUPPORT_THREADS_NONE
## select CC_CORE_PASSES_NEEDED
##
@@ -76,7 +76,7 @@ config LIBC_UCLIBC_CUSTOM
bool
prompt "Custom uClibc"
depends on EXPERIMENTAL
- select LIBC_SUPPORT_NPTL
+ select LIBC_SUPPORT_THREADS_NATIVE
select LIBC_UCLIBC_0_9_30_or_later
endchoice
@@ -111,7 +111,7 @@ config LIBC_VERSION
config LIBC_UCLIBC_0_9_32_or_later
bool
- select LIBC_SUPPORT_NPTL
+ select LIBC_SUPPORT_THREADS_NATIVE
select LIBC_UCLIBC_0_9_30_or_later
config LIBC_UCLIBC_0_9_30_or_later
diff --git a/config/libc/uClibc.in.2 b/config/libc/uClibc.in.2
index c1a84f9..8a21a4f 100644
--- a/config/libc/uClibc.in.2
+++ b/config/libc/uClibc.in.2
@@ -1,6 +1,6 @@
# uClibc second-part option
-if THREADS_LINUXTHREADS
+if THREADS_LT
choice
bool
@@ -28,12 +28,12 @@ config LIBC_UCLIBC_LNXTHRD_NEW
endchoice
-endif # THREADS_LINUXTHREADS
+endif # THREADS_LT
config LIBC_UCLIBC_LNXTHRD
string
default "" if THREADS_NONE
- default "" if THREADS_NPTL
+ default "" if THREADS_NATIVE
default "old" if LIBC_UCLIBC_LNXTHRD_OLD
default "new" if LIBC_UCLIBC_LNXTHRD_NEW
diff --git a/samples/m68k-unknown-uclinux-uclibc/crosstool.config b/samples/m68k-unknown-uclinux-uclibc/crosstool.config
index 6dd27ca..c83e3b7 100644
--- a/samples/m68k-unknown-uclinux-uclibc/crosstool.config
+++ b/samples/m68k-unknown-uclinux-uclibc/crosstool.config
@@ -7,4 +7,4 @@ CT_KERNEL_linux=y
CT_KERNEL_V_3_5=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_THREADS_LINUXTHREADS=y
+CT_THREADS_LT=y
--
2.0.1
--
For unsubscribe information see http://sourceware.org/lists.html#faq
More information about the crossgcc
mailing list