summaryrefslogtreecommitdiff
path: root/config/libc/uClibc.in.2
diff options
context:
space:
mode:
authorAlexey Neyman <stilor@att.net>2016-10-12 18:58:28 (GMT)
committerGitHub <noreply@github.com>2016-10-12 18:58:28 (GMT)
commit91575d02c47e384e381a8a9c83e33814d26799b3 (patch)
tree280cebcd23a2ea54c9c478652ace7fead592ba44 /config/libc/uClibc.in.2
parent339b83c3939296e54f5366439a19861372bad9b9 (diff)
parentdf5a341e592fe162999ed9be6da3fb67eb885f12 (diff)
Merge branch 'master' into static-libgcc-more-fixes
Diffstat (limited to 'config/libc/uClibc.in.2')
-rw-r--r--config/libc/uClibc.in.24
1 files changed, 3 insertions, 1 deletions
diff --git a/config/libc/uClibc.in.2 b/config/libc/uClibc.in.2
index 3a5fe34..dc02420 100644
--- a/config/libc/uClibc.in.2
+++ b/config/libc/uClibc.in.2
@@ -1,6 +1,6 @@
# uClibc second-part option
-if THREADS_LT
+if THREADS_LT && !LIBC_UCLIBC_NG_1_0_15_or_later
choice
bool
@@ -30,10 +30,12 @@ endchoice
endif # THREADS_LT
+# uClibc-ng 1.0.15 did away with 2 implementations of linuxthreads
config LIBC_UCLIBC_LNXTHRD
string
default "" if THREADS_NONE
default "" if THREADS_NATIVE
+ default "" if LIBC_UCLIBC_NG_1_0_15_or_later
default "old" if LIBC_UCLIBC_LNXTHRD_OLD
default "new" if LIBC_UCLIBC_LNXTHRD_NEW