From e1e46622ac0fce73d802fa4a8a2e83cc25cd9e7a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 14 Feb 2015 23:04:02 -0600 Subject: Revert "resolve merge" This reverts commit 6b6ede3d15f04fe825cfa9f697507457e3640344. --- extra/Configs/Config.in | 37 ++++++++++++++++++++++------ extra/Configs/defconfigs/arc/tb10x_defconfig | 2 +- 2 files changed, 31 insertions(+), 8 deletions(-) (limited to 'extra') diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in index 1d382017b..c1a2d5ac9 100644 --- a/extra/Configs/Config.in +++ b/extra/Configs/Config.in @@ -3,7 +3,7 @@ # see extra/config/Kconfig-language.txt # -mainmenu "uClibc-ng $VERSION C Library Configuration" +mainmenu "uClibc $VERSION C Library Configuration" config DESIRED_TARGET_ARCH string @@ -506,6 +506,7 @@ config LDSO_GNU_HASH_SUPPORT choice prompt "Thread support" + #default UCLIBC_HAS_THREADS_NATIVE if (TARGET_alpha || TARGET_arm || TARGET_i386 || TARGET_mips || TARGET_powerpc || TARGET_sh || TARGET_sh64) default HAS_NO_THREADS help If you want to compile uClibc with pthread support, then answer Y. @@ -518,9 +519,9 @@ config HAS_NO_THREADS help Disable thread support. -config UCLIBC_HAS_LINUXTHREADS - bool "Enable support for linuxthreads" - # linuxthreads need nanosleep() +config LINUXTHREADS_OLD + bool "older (stable) version of linuxthreads" + # linuxthreads and linuxthreads.old need nanosleep() select UCLIBC_HAS_REALTIME depends on !TARGET_arc && \ !TARGET_i386 && \ @@ -532,8 +533,29 @@ config UCLIBC_HAS_LINUXTHREADS !TARGET_x86_64 && \ !TARGET_xtensa help - See here for information about linuxthreads: - http://en.wikipedia.org/wiki/LinuxThreads + 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 + 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). config UCLIBC_HAS_THREADS_NATIVE bool "Native POSIX Threading (NPTL)" @@ -586,6 +608,7 @@ config PTHREADS_DEBUG_SUPPORT If you are doing development and want to debug applications using uClibc's pthread library, answer Y. Otherwise, answer N. + config UCLIBC_HAS_SYSLOG bool "Syslog support" default y @@ -2333,7 +2356,7 @@ config DODEBUG config DODEBUG_PT bool "Build pthread with debugging output" - depends on UCLIBC_HAS_THREADS && UCLIBC_HAS_LINUXTHREADS + depends on UCLIBC_HAS_THREADS && LINUXTHREADS_OLD help Enable debug output in libpthread. This is only useful when doing development in libpthread itself. diff --git a/extra/Configs/defconfigs/arc/tb10x_defconfig b/extra/Configs/defconfigs/arc/tb10x_defconfig index 218a17d56..60065f97d 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 -UCLIBC_HAS_LINUXTHREADS=y +LINUXTHREADS_OLD=y PTHREADS_DEBUG_SUPPORT=y MALLOC_GLIBC_COMPAT=y UCLIBC_SUSV3_LEGACY=y -- cgit v1.2.3