From 6b6ede3d15f04fe825cfa9f697507457e3640344 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 14 Feb 2015 23:00:19 -0600
Subject: resolve merge

---
 extra/Configs/Config.in                      | 37 ++++++----------------------
 extra/Configs/defconfigs/arc/tb10x_defconfig |  2 +-
 2 files changed, 8 insertions(+), 31 deletions(-)

(limited to 'extra')

diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in
index c1a2d5ac9..1d382017b 100644
--- a/extra/Configs/Config.in
+++ b/extra/Configs/Config.in
@@ -3,7 +3,7 @@
 # see extra/config/Kconfig-language.txt
 #
 
-mainmenu "uClibc $VERSION C Library Configuration"
+mainmenu "uClibc-ng $VERSION C Library Configuration"
 
 config DESIRED_TARGET_ARCH
 	string
@@ -506,7 +506,6 @@ 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.
@@ -519,9 +518,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 "Enable support for linuxthreads"
+	# linuxthreads need nanosleep()
 	select UCLIBC_HAS_REALTIME
 	depends on !TARGET_arc && \
 		   !TARGET_i386 && \
@@ -533,29 +532,8 @@ config LINUXTHREADS_OLD
 		   !TARGET_x86_64 && \
 		   !TARGET_xtensa
 	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
-	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).
+	  See here for information about linuxthreads:
+	  http://en.wikipedia.org/wiki/LinuxThreads
 
 config UCLIBC_HAS_THREADS_NATIVE
 	bool "Native POSIX Threading (NPTL)"
@@ -608,7 +586,6 @@ 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
@@ -2356,7 +2333,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/defconfigs/arc/tb10x_defconfig b/extra/Configs/defconfigs/arc/tb10x_defconfig
index 60065f97d..218a17d56 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
-- 
cgit v1.2.3