summaryrefslogtreecommitdiff
path: root/config/libc/uClibc.in.2
diff options
context:
space:
mode:
authorBryan Hundven <bryanhundven@gmail.com>2016-10-24 17:07:16 (GMT)
committerGitHub <noreply@github.com>2016-10-24 17:07:16 (GMT)
commitdc280e477d6af7702e2481c17af20a7db83814d9 (patch)
treed02d3b765573080c43977520d56c77b6250457da /config/libc/uClibc.in.2
parentc7cb030fd58f7ec468de9693d78b73037091d7e0 (diff)
parentdf5a341e592fe162999ed9be6da3fb67eb885f12 (diff)
Merge branch 'master' into janitorial
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