From 88e8852ccd94a60979971454f8b49cb1d06cd907 Mon Sep 17 00:00:00 2001
From: Bryan Hundven <bryanhundven@gmail.com>
Date: Tue, 23 Feb 2016 11:02:40 -0800
Subject: glibc: Clean out old glibc versions

We now only support glibc >=2.18
This now enables us to clean up glibc support!

Also, add a comment about glibc 2.20 as the point which glibc no longer
supports not building with pthread.

Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>

diff --git a/config/libc/glibc.in b/config/libc/glibc.in
index c1a4192..fc7c85b 100644
--- a/config/libc/glibc.in
+++ b/config/libc/glibc.in
@@ -100,90 +100,19 @@ config LIBC_GLIBC_V_2_20
 config LIBC_GLIBC_V_2_19
     bool
     prompt "2.19"
-    select LIBC_GLIBC_2_17_or_later
 
 config LIBC_GLIBC_V_2_18
     bool
     prompt "2.18"
-    select LIBC_GLIBC_2_17_or_later
-
-config LIBC_GLIBC_V_2_17
-    bool
-    prompt "2.17"
-    select LIBC_GLIBC_2_17_or_later
-
-config LIBC_GLIBC_V_2_16_0
-    bool
-    prompt "2.16.0"
-    select LIBC_GLIBC_PORTS_EXTERNAL
-
-config LIBC_GLIBC_V_2_15
-    bool
-    prompt "2.15"
-    select LIBC_GLIBC_PORTS_EXTERNAL
-
-config LIBC_GLIBC_V_2_14_1
-    bool
-    prompt "2.14.1"
-    select LIBC_GLIBC_PORTS_EXTERNAL
-
-config LIBC_GLIBC_V_2_14
-    bool
-    prompt "2.14"
-    select LIBC_GLIBC_PORTS_EXTERNAL
-
-config LIBC_GLIBC_V_2_13
-    bool
-    prompt "2.13"
-    select LIBC_GLIBC_PORTS_EXTERNAL
-
-config LIBC_GLIBC_V_2_12_2
-    bool
-    prompt "2.12.2"
-    select LIBC_GLIBC_PORTS_EXTERNAL
-
-config LIBC_GLIBC_V_2_12_1
-    bool
-    prompt "2.12.1"
-    select LIBC_GLIBC_PORTS_EXTERNAL
-
-config LIBC_GLIBC_V_2_11_1
-    bool
-    prompt "2.11.1"
-    select LIBC_GLIBC_PORTS_EXTERNAL
-
-config LIBC_GLIBC_V_2_11
-    bool
-    prompt "2.11"
-    select LIBC_GLIBC_PORTS_EXTERNAL
-
-config LIBC_GLIBC_V_2_10_1
-    bool
-    prompt "2.10.1"
-    select LIBC_GLIBC_PORTS_EXTERNAL
-    select LIBC_GLIBC_USE_PORTS
-
-config LIBC_GLIBC_V_2_9
-    bool
-    prompt "2.9"
-    select LIBC_GLIBC_PORTS_EXTERNAL
-
-config LIBC_GLIBC_V_2_8
-    bool
-    prompt "2.8"
-    select LIBC_GLIBC_PORTS_EXTERNAL
 
 endchoice
 
 endif # ! LIBC_GLIBC_CUSTOM
 
+# DeMark 2.20 as no longer needs to set NPTL as an addon.
+# It is no longer possible to build glibc without pthread!
 config LIBC_GLIBC_2_20_or_later
     bool
-    select LIBC_GLIBC_2_17_or_later
-
-# DeMark no more ports
-config LIBC_GLIBC_2_17_or_later
-    bool
 
 if ! LIBC_GLIBC_CUSTOM
 
@@ -198,18 +127,5 @@ config LIBC_VERSION
     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
-    default "2.16.0" if LIBC_GLIBC_V_2_16_0
-    default "2.15" if LIBC_GLIBC_V_2_15
-    default "2.14.1" if LIBC_GLIBC_V_2_14_1
-    default "2.14" if LIBC_GLIBC_V_2_14
-    default "2.13" if LIBC_GLIBC_V_2_13
-    default "2.12.2" if LIBC_GLIBC_V_2_12_2
-    default "2.12.1" if LIBC_GLIBC_V_2_12_1
-    default "2.11.1" if LIBC_GLIBC_V_2_11_1
-    default "2.11" if LIBC_GLIBC_V_2_11
-    default "2.10.1" if LIBC_GLIBC_V_2_10_1
-    default "2.9" if LIBC_GLIBC_V_2_9
-    default "2.8" if LIBC_GLIBC_V_2_8
 
 endif # ! LIBC_GLIBC_CUSTOM
-- 
cgit v0.10.2-6-g49f6