summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
Diffstat (limited to 'extra')
-rw-r--r--extra/Configs/Config.in33
-rw-r--r--extra/Configs/Config.in.arch2
-rw-r--r--extra/Configs/defconfigs/arc/tb10x_defconfig2
-rw-r--r--extra/Configs/defconfigs/or1k/defconfig3
4 files changed, 8 insertions, 32 deletions
diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in
index 8eac9e008..17ae847ce 100644
--- a/extra/Configs/Config.in
+++ b/extra/Configs/Config.in
@@ -489,9 +489,9 @@ config HAS_NO_THREADS
help
Disable thread support.
-config LINUXTHREADS_OLD
- bool "older (stable) version of linuxthreads"
- # linuxthreads and linuxthreads.old need nanosleep()
+config UCLIBC_HAS_LINUXTHREADS
+ bool "Linuxthreads"
+ # linuxthreads need nanosleep()
select UCLIBC_HAS_REALTIME
depends on !TARGET_arc && \
!TARGET_arm && \
@@ -504,30 +504,7 @@ config LINUXTHREADS_OLD
!TARGET_xtensa || \
!ARCH_USE_MMU
help
- There are two versions of linuxthreads. The older (stable) version
- has been in uClibc for quite a long time but hasn't seen too many
- updates other than bugfixes.
-
-
-config LINUXTHREADS_NEW
- bool "slightly newer version of linuxthreads"
- depends on ARCH_HAS_DEPRECATED_SYSCALLS
- depends on !TARGET_arc && \
- !TARGET_arm && \
- !TARGET_i386 && \
- !TARGET_metag && \
- !TARGET_mips && \
- !TARGET_powerpc && \
- !TARGET_sh && \
- !TARGET_sparc && \
- !TARGET_x86_64 && \
- !TARGET_xtensa || \
- !ARCH_USE_MMU
- help
- The new version has not been tested much, and lacks ports for arches
- which glibc does not support (like bfin/frv/etc...), but is based on
- the latest code from glibc, so it may be the only choice for the
- newer ports (like alpha/amd64/64bit arches and hppa).
+ If you want to compile uClibc with Linuxthreads support, then answer Y.
config UCLIBC_HAS_THREADS_NATIVE
bool "Native POSIX Threading (NPTL)"
@@ -2336,7 +2313,7 @@ config DODEBUG
config DODEBUG_PT
bool "Build pthread with debugging output"
- depends on UCLIBC_HAS_THREADS && LINUXTHREADS_OLD
+ depends on UCLIBC_HAS_THREADS && UCLIBC_HAS_LINUXTHREADS
help
Enable debug output in libpthread. This is only useful when doing
development in libpthread itself.
diff --git a/extra/Configs/Config.in.arch b/extra/Configs/Config.in.arch
index 92f45d969..37dd8bd74 100644
--- a/extra/Configs/Config.in.arch
+++ b/extra/Configs/Config.in.arch
@@ -43,7 +43,7 @@ config ARCH_HAS_DEPRECATED_SYSCALLS
bool
help
New architectures do not support deprecated system calls. However,
- these system calls are needed to build linuxthreads (old and new) so
+ these system calls are needed to build linuxthreads so
this symbol controls whether there is support for these threading libraries
or not.
diff --git a/extra/Configs/defconfigs/arc/tb10x_defconfig b/extra/Configs/defconfigs/arc/tb10x_defconfig
index 405a4eac7..f70068814 100644
--- a/extra/Configs/defconfigs/arc/tb10x_defconfig
+++ b/extra/Configs/defconfigs/arc/tb10x_defconfig
@@ -6,7 +6,7 @@ KERNEL_HEADERS="%KERNEL_HEADERS%"
# LDSO_CACHE_SUPPORT is not set
LDSO_RUNPATH=y
# LDSO_SAFE_RUNPATH is not set
-LINUXTHREADS_OLD=y
+UCLIBC_HAS_LINUXTHREADS=y
PTHREADS_DEBUG_SUPPORT=y
MALLOC_GLIBC_COMPAT=y
UCLIBC_SUSV3_LEGACY=y
diff --git a/extra/Configs/defconfigs/or1k/defconfig b/extra/Configs/defconfigs/or1k/defconfig
index e0e08ce11..63d657109 100644
--- a/extra/Configs/defconfigs/or1k/defconfig
+++ b/extra/Configs/defconfigs/or1k/defconfig
@@ -74,8 +74,7 @@ LDSO_LD_LIBRARY_PATH=y
UCLIBC_CTOR_DTOR=y
# LDSO_GNU_HASH_SUPPORT is not set
# HAS_NO_THREADS is not set
-LINUXTHREADS_OLD=y
-# LINUXTHREADS_NEW is not set
+UCLIBC_HAS_LINUXTHREADS=y
# UCLIBC_HAS_THREADS_NATIVE is not set
UCLIBC_HAS_THREADS=y
# PTHREADS_DEBUG_SUPPORT is not set