From 8121be5b217d1b354db856f8c4ca1b94ce7cffd4 Mon Sep 17 00:00:00 2001
From: Alexey Neyman <stilor@att.net>
Date: Mon, 19 Sep 2016 18:50:08 -0700
Subject: Fix m68k with uClibc-ng >= 1.0.15.

1.0.15 only kept a single LINUXTHREADS option, and renamed it, making it
no longer option-compatible with uClibc.

The option for "1.0.14 or later" version of uClibc-ng is not currently
used; rename it to "1.0.15 or later" and use it to handle newer
uClibc-ng's linuxthreads.

m68k happens to be the only sample using linuxthreads.

Signed-off-by: Alexey Neyman <stilor@att.net>

diff --git a/config/libc/uClibc.in b/config/libc/uClibc.in
index 3a76a42..14564ba 100644
--- a/config/libc/uClibc.in
+++ b/config/libc/uClibc.in
@@ -78,7 +78,7 @@ choice
 config LIBC_UCLIBC_NG_V_1_0_17
     bool
     prompt "1.0.17"
-    select LIBC_UCLIBC_NG_1_0_14_or_later
+    select LIBC_UCLIBC_NG_1_0_15_or_later
 
 config LIBC_UCLIBC_V_0_9_33_2
     bool
@@ -96,7 +96,7 @@ config LIBC_VERSION
 
 endif # ! LIBC_UCLIBC_CUSTOM
 
-config LIBC_UCLIBC_NG_1_0_14_or_later
+config LIBC_UCLIBC_NG_1_0_15_or_later
     bool
     select LIBC_UCLIBC_NG_1_0_0_or_later
 
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
 
diff --git a/scripts/build/libc/uClibc.sh b/scripts/build/libc/uClibc.sh
index 47e135b..be8d6bf 100644
--- a/scripts/build/libc/uClibc.sh
+++ b/scripts/build/libc/uClibc.sh
@@ -377,6 +377,11 @@ manage_uClibc_config() {
     case "${CT_THREADS}:${CT_LIBC_UCLIBC_LNXTHRD}" in
         none:)
             ;;
+        linuxthreads:)
+            # Newer version of uClibc-ng, no old/new dichotomy
+            CT_KconfigEnableOption "UCLIBC_HAS_THREADS" "${dst}"
+            CT_KconfigEnableOption "UCLIBC_HAS_LINUXTHREADS" "${dst}"
+            ;;
         linuxthreads:old)
             CT_KconfigEnableOption "UCLIBC_HAS_THREADS" "${dst}"
             CT_KconfigEnableOption "LINUXTHREADS_OLD" "${dst}"
-- 
cgit v0.10.2-6-g49f6