From f1bdbe995b8a06e2888020e74c8abdfaaa8d41da Mon Sep 17 00:00:00 2001
From: Bryan Hundven <bryanhundven@gmail.com>
Date: Mon, 8 Sep 2014 09:57:04 -0700
Subject: libc/glibc: Add glibc-2.20

Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>
Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com>

diff --git a/config/libc/glibc.in b/config/libc/glibc.in
index 2e34793..5c5f7dd 100644
--- a/config/libc/glibc.in
+++ b/config/libc/glibc.in
@@ -17,6 +17,10 @@ choice
 # Don't remove next line
 # CT_INSERT_VERSION_BELOW
 
+config LIBC_GLIBC_V_2_20
+    bool
+    prompt "2.20"
+
 config LIBC_GLIBC_V_2_19
     bool
     prompt "2.19"
@@ -96,6 +100,7 @@ config LIBC_VERSION
     string
 # Don't remove next line
 # CT_INSERT_VERSION_STRING_BELOW
+    default "2.20" if LIBC_GLIBC_V_2_20
     default "2.19" if LIBC_GLIBC_V_2_19
     default "2.18" if LIBC_GLIBC_V_2_18
     default "2.17" if LIBC_GLIBC_V_2_17
-- 
cgit v0.10.2-6-g49f6


From d7b4f0dbe3d6a17cc736fb4879c241890f4d73b7 Mon Sep 17 00:00:00 2001
From: David Holsgrove <david.holsgrove@xilinx.com>
Date: Tue, 9 Dec 2014 13:58:12 +1000
Subject: glibc: nptl is default from 2.20, so dont add to addons_list

No longer recommended practice to use --enable-add-ons=nptl, so
for 2.20 and later (along with custom glibc), don't add the
CT_THREADS to the addons_list

https://sourceware.org/glibc/wiki/Release/2.20#Packaging_Changes

Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com>

diff --git a/config/libc/glibc.in b/config/libc/glibc.in
index 5c5f7dd..d349dfb 100644
--- a/config/libc/glibc.in
+++ b/config/libc/glibc.in
@@ -20,6 +20,7 @@ choice
 config LIBC_GLIBC_V_2_20
     bool
     prompt "2.20"
+    select LIBC_GLIBC_2_20_or_later
 
 config LIBC_GLIBC_V_2_19
     bool
@@ -96,6 +97,9 @@ config LIBC_GLIBC_V_2_8
 
 endchoice
 
+config LIBC_GLIBC_2_20_or_later
+    bool
+
 config LIBC_VERSION
     string
 # Don't remove next line
diff --git a/scripts/build/libc/glibc-eglibc.sh-common b/scripts/build/libc/glibc-eglibc.sh-common
index 4d961fd..af3b1f1 100644
--- a/scripts/build/libc/glibc-eglibc.sh-common
+++ b/scripts/build/libc/glibc-eglibc.sh-common
@@ -487,10 +487,12 @@ do_libc_add_ons_list() {
     local addons_list="$( echo "${CT_LIBC_ADDONS_LIST}"         \
                           |sed -r -e "s/[[:space:],]/${sep}/g;" \
                         )"
-    case "${CT_THREADS}" in
-        none)   ;;
-        *)      addons_list="${addons_list}${sep}${CT_THREADS}";;
-    esac
+    if [ "${CT_LIBC_GLIBC_2_20_or_later}" != "y" ]; then
+        case "${CT_THREADS}" in
+            none)   ;;
+            *)      addons_list="${addons_list}${sep}${CT_THREADS}";;
+        esac
+    fi
     [ "${CT_LIBC_GLIBC_USE_PORTS}" = "y" ] && addons_list="${addons_list}${sep}ports"
     # Remove duplicate, leading and trailing separators
     echo "${addons_list}" |sed -r -e "s/${sep}+/${sep}/g; s/^${sep}//; s/${sep}\$//;"
-- 
cgit v0.10.2-6-g49f6