Convert the rest of packages to new framework

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

11 files changed, 135 insertions, 955 deletions

diff --git a/config/libc/avr-libc.in b/config/libc/avr-libc.in
index 2b8d891d..6abbe01b 100644
--- a/config/libc/avr-libc.in
+++ b/config/libc/avr-libc.in
@@ -9,66 +9,4 @@
 ## help Atmel AVR 8-bit RISC microcontrollers. In addition, the library
 ## help provides the basic startup code needed by most applications.
 
-config LIBC_AVR_LIBC_CUSTOM
-    bool
-    prompt "Custom avr-libc"
-    depends on EXPERIMENTAL
-    help
-      The choosen avr-libc version shall be not downloaded. Instead use
-      a custom location to get the source.
-
-if LIBC_AVR_LIBC_CUSTOM
-
-config LIBC_AVR_LIBC_CUSTOM_LOCATION
-    string
-    prompt "Full path to custom avr-libc source"
-    help
-      Enter the path to the directory or tarball of your source for avr-libc.
-
-      If the path is a tarball, it should extract to: <name>-<version>/
-      where the name is this component, avr-libc, and the version is set
-      below in the custom version string.
-
-config LIBC_AVR_LIBC_CUSTOM_VERSION
-    string
-    prompt "Custom AVR-Libc version"
-    help
-      Enter the version number for your custom avr-libc.
-
-config LIBC_VERSION
-    string
-    default LIBC_AVR_LIBC_CUSTOM_VERSION
-
-endif # LIBC_AVR_LIBC_CUSTOM
-
-if ! LIBC_AVR_LIBC_CUSTOM
-
-choice
-    bool
-    prompt "avr-libc version"
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
-
-config LIBC_AVR_LIBC_V_2_0_0
-    bool
-    prompt "2.0.0"
-
-config LIBC_AVR_LIBC_V_1_8_1
-    bool
-    prompt "1.8.1"
-
-config LIBC_AVR_LIBC_V_1_8_0
-    bool
-    prompt "1.8.0"
-
-endchoice
-
-config LIBC_VERSION
-    string
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-    default "2.0.0" if LIBC_AVR_LIBC_V_2_0_0
-    default "1.8.1" if LIBC_AVR_LIBC_V_1_8_1
-    default "1.8.0" if LIBC_AVR_LIBC_V_1_8_0
-
-endif # ! LIBC_AVR_LIBC_CUSTOM
+source "config/versions/avr-libc.in"
diff --git a/config/libc/bionic.in b/config/libc/bionic.in
index 9e041300..ab51e6b9 100644
--- a/config/libc/bionic.in
+++ b/config/libc/bionic.in
@@ -11,98 +11,17 @@
 ## help This platform has no TLS (Thread Local Storage) support so that option must be
 ## help disabled in the Compiler options.
 
+source "config/versions/bionic.in"
+
 config THREADS
     default "posix"
 
-config LIBC_BIONIC_CUSTOM
-    bool
-    prompt "Custom bionic"
-    help
-      The chosen bionic-libc version shall be not downloaded. Instead use
-      a custom location to get the source.
-
-if LIBC_BIONIC_CUSTOM
-
-config LIBC_BIONIC_CUSTOM_LOCATION
-    string
-    prompt "Full path to custom bionic source"
-    help
-      Enter the path to the directory or tarball of your source for bionic.
-
-      If the path is a zip archive, it should extract to: <name>-<version>/
-      where the name is android-ndk, and the version is set
-      below in the custom version string.
-
-config LIBC_BIONIC_CUSTOM_VERSION
-    string
-    prompt "Custom BIONIC version"
-    help
-      Enter the version number for your custom bionic.
-
-config LIBC_VERSION
-    string
-    default LIBC_BIONIC_CUSTOM_VERSION
-
-endif # LIBC_BIONIC_CUSTOM
-
-if ! LIBC_BIONIC_CUSTOM
-
-choice
-    bool
-    prompt "bionic version"
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
-
-config LIBC_BIONIC_V_15beta1
-    bool
-    prompt "15beta1"
-
-config LIBC_BIONIC_V_14b
-    bool
-    prompt "14b"
-
-config LIBC_BIONIC_V_13b
-    bool
-    prompt "13b (OBSOLETE)"
-    depends on OBSOLETE
-
-config LIBC_BIONIC_V_12b
-    bool
-    prompt "12b (OBSOLETE)"
-    depends on OBSOLETE
-
-config LIBC_BIONIC_V_11c
-    bool
-    prompt "11c (OBSOLETE)"
-    depends on OBSOLETE
-
-config LIBC_BIONIC_V_10e
-    bool
-    prompt "10e (OBSOLETE)"
-    depends on OBSOLETE
-
-endchoice
-
-config LIBC_VERSION
-    string
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-    default "r15-beta1" if LIBC_BIONIC_V_15beta1
-    default "r14b" if LIBC_BIONIC_V_14b
-    default "r13b" if LIBC_BIONIC_V_13b
-    default "r12b" if LIBC_BIONIC_V_12b
-    default "r11c" if LIBC_BIONIC_V_11c
-    default "r10e" if LIBC_BIONIC_V_10e
-
-endif # ! LIBC_BIONIC_CUSTOM
-
+# FIXME does API level depend on the bionic version? generate that, too?
 choice 
     bool
     prompt "Android API level"
     help
       The minimum for 64 bit support is 21.
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
 
 config ANDROID_API_24
     bool
@@ -169,8 +88,6 @@ endchoice
 
 config ANDROID_API
     string
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
     default "24" if ANDROID_API_24
     default "23" if ANDROID_API_23
     default "22" if ANDROID_API_22
@@ -184,4 +101,3 @@ config ANDROID_API
     default "13" if ANDROID_API_13
     default "12" if ANDROID_API_12
     default "9" if ANDROID_API_9
-
diff --git a/config/libc/glibc.in b/config/libc/glibc.in
index 9e4ff565..c0c633dd 100644
--- a/config/libc/glibc.in
+++ b/config/libc/glibc.in
@@ -5,218 +5,50 @@
 ## select LIBC_SUPPORT_THREADS_NATIVE
 ## select CC_CORE_PASSES_NEEDED
 ## select GETTEXT_NEEDED
+## select BINUTILS_FORCE_LD_BFD_DEFAULT
 ##
 ## help The de-facto standard for Linux distributions.
 ## help Feature-rich, but large...  Most useful for desktop-like systems.
 
-config THREADS
-    default "nptl"
-
-config LIBC_GLIBC_CUSTOM
-    bool
-    prompt "Custom glibc"
-    depends on EXPERIMENTAL
-    select LIBC_CUSTOM
-    select LIBC_GLIBC_2_20_or_later
-    help
-      The choosen glibc version shall be not downloaded. Instead use
-      a custom location to get the source.
-
-if LIBC_GLIBC_CUSTOM
-
-config LIBC_GLIBC_CUSTOM_LOCATION
-    string
-    prompt "Full path to custom glibc source"
-    help
-      Enter the path to the directory or tarball of your source for glibc.
-
-      If the path is a tarball, it should extract to: <name>-<version>/
-      where the name is this component, glibc, and the version is set
-      below in the custom version string.
-
-config LIBC_GLIBC_CUSTOM_VERSION
-    string
-    prompt "Custom GLIBC version"
-    help
-      Enter the version number for your custom glibc.
-
-config LIBC_VERSION
-    string
-    default LIBC_GLIBC_CUSTOM_VERSION
-
-endif # LIBC_GLIBC_CUSTOM
-
-if ! LIBC_GLIBC_CUSTOM
-
-config CC_GLIBC_SHOW_LINARO
-    bool
-    prompt "Show Linaro versions"
-    help
-      Linaro is maintaining some advanced/more stable/experimental versions
-      of glibc, especially for the ARM architecture.
-      
-      Those versions have not been blessed by the glibc comunity (nor have they
-      been cursed either!), but they look to be pretty much stable, and even
-      more stable than the upstream versions. YMMV...
-      
-      If you do not know what this Linaro stuff is, then simply say 'n' here,
-      and rest in peace. OTOH, if you know what you are doing, you will be
-      able to use and enjoy :-) the Linaro versions by saying 'y' here.
-      
-      Linaro: http://www.linaro.org/
-
 # GLIBC and kernel are special when it comes to obsoletion. Users
 # of crosstool-ng depend on the ability to build new toolchains matching
 # the kernel/libc versions of a particular target system, and LTS releases
 # are still using quite ancient versions. Please do not retire versions
-# (including versions in between) until the EOL dates indicated below.
-choice
-    bool
-    prompt "glibc version"
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
-
-config LIBC_GLIBC_V_2_25
-    bool
-    prompt "2.25"
-    select LIBC_GLIBC_2_23_or_later
-
-config LIBC_GLIBC_V_2_24
-    bool
-    prompt "2.24"
-    select LIBC_GLIBC_2_23_or_later
-
-# EOL 04/2021 [Ubuntu16.04]
-config LIBC_GLIBC_V_2_23
-    bool
-    prompt "2.23"
-    select LIBC_GLIBC_2_23_or_later
-
-config LIBC_GLIBC_V_2_22
-    bool
-    prompt "2.22 (OBSOLETE)"
-    select LIBC_GLIBC_2_20_or_later
-    depends on OBSOLETE
-
-config LIBC_GLIBC_V_2_21
-    bool
-    prompt "2.21 (OBSOLETE)"
-    select LIBC_GLIBC_2_20_or_later
-    depends on OBSOLETE
-
-config LIBC_GLIBC_LINARO_V_2_20
-    bool
-    prompt "Linaro 2.20-2014.11 (OBSOLETE)"
-    select LIBC_GLIBC_2_20_or_later
-    depends on CC_GLIBC_SHOW_LINARO
-    depends on OBSOLETE
+# (including versions in between) until the EOL dates indicated in version.desc.
+source "config/versions/glibc.in"
 
-config LIBC_GLIBC_V_2_20
-    bool
-    prompt "2.20 (OBSOLETE)"
-    select LIBC_GLIBC_2_20_or_later
-    depends on OBSOLETE
-
-# EOL 04/2019 [Ubuntu14.04]
-config LIBC_GLIBC_V_2_19
-    bool
-    prompt "2.19 (OBSOLETE)"
-    depends on OBSOLETE
-    select LIBC_GLIBC_2_17_or_later
-
-config LIBC_GLIBC_V_2_18
-    bool
-    prompt "2.18 (OBSOLETE)"
-    depends on OBSOLETE
-    select LIBC_GLIBC_2_17_or_later
-
-# EOL 06/2024 [CentOS7.x]
-config LIBC_GLIBC_V_2_17
-    bool
-    prompt "2.17 (OBSOLETE)"
-    depends on OBSOLETE
-    select LIBC_GLIBC_2_17_or_later
-
-config LIBC_GLIBC_V_2_16_0
-    bool
-    prompt "2.16.0 (OBSOLETE)"
-    depends on OBSOLETE
-
-# EOL 04/2017 [Ubuntu12.04]
-config LIBC_GLIBC_V_2_15
-    bool
-    prompt "2.15 (OBSOLETE)"
-    depends on OBSOLETE
-
-config LIBC_GLIBC_V_2_14_1
-    bool
-    prompt "2.14.1 (OBSOLETE)"
-    depends on OBSOLETE
-
-config LIBC_GLIBC_V_2_14
-    bool
-    prompt "2.14 (OBSOLETE)"
-    depends on OBSOLETE
-
-config LIBC_GLIBC_V_2_13
-    bool
-    prompt "2.13 (OBSOLETE)"
-    depends on OBSOLETE
-
-# This version did not have glibc-ports addon released
-config LIBC_GLIBC_V_2_12_2
-    bool
-    prompt "2.12.2 (OBSOLETE)"
-    depends on OBSOLETE
-    depends on !LIBC_GLIBC_NEEDS_PORTS
-
-# EOL 11/2020 [CentOS6.x]
-config LIBC_GLIBC_V_2_12_1
-    bool
-    prompt "2.12.1 (OBSOLETE)"
-    depends on OBSOLETE
-
-endchoice
-
-endif # ! LIBC_GLIBC_CUSTOM
-
-# Checked by SPARC build: SPARCv8 is dropped in 2.23.
-config LIBC_GLIBC_2_23_or_later
-    select LIBC_GLIBC_2_20_or_later
-    bool
-
-# 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
+config THREADS
+    default "nptl"
 
-config LIBC_VERSION
-    string
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-    default "2.25" if LIBC_GLIBC_V_2_25
-    default "2.24" if LIBC_GLIBC_V_2_24
-    default "2.23" if LIBC_GLIBC_V_2_23
-    default "2.22" if LIBC_GLIBC_V_2_22
-    default "2.21" if LIBC_GLIBC_V_2_21
-    default "linaro-2.20-2014.11" if LIBC_GLIBC_LINARO_V_2_20
-    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
+# SPARCv8 support retired in 2.23
+config GLIBC_NO_SPARC_V8
+    def_bool y
+    depends on GLIBC_2_23_or_later
+
+# With 2.20, NPTL is in default glibc
+config GLIBC_HAS_NPTL_ADDON
+    def_bool y
+    depends on !GLIBC_2_20_or_later
+
+# With 2.20, all architectures are in main tree
+config GLIBC_HAS_PORTS_ADDON
+    def_bool y
+    depends on !GLIBC_2_20_or_later
+
+# With 2.17 and later, 'ports' addon is shipped in glibc tarball
+config GLIBC_PORTS_EXTERNAL
+    def_bool y
+    depends on !GLIBC_2_17_or_later
+
+# Some architectures require the ports addon. List them one by one here:
+# This list must be carefully in sync with the architectures names
+# we can find in config/arch/*
+config GLIBC_NEEDS_PORTS
+    def_bool y
+    depends on ARCH_alpha || ARCH_arm || ARCH_m68k || ARCH_mips || ARCH_powerpc
+
+# Ports are no longer an add-on starting with 2.20
+config GLIBC_USE_PORTS
+    def_bool y
+    depends on GLIBC_NEEDS_PORTS && GLIBC_HAS_PORTS_ADDON
 
-endif # ! LIBC_GLIBC_CUSTOM
diff --git a/config/libc/glibc.in.2 b/config/libc/glibc.in.2
index 93b7b59b..f1c224cf 100644
--- a/config/libc/glibc.in.2
+++ b/config/libc/glibc.in.2
@@ -1,31 +1,7 @@
 # This file contains the common configuration options
 # that apply to both glibc.
 
-# Some architectures require the ports addon. List them one by one here:
-# This list must be carefully in sync with the architectures names
-# we can find in config/arch/*
-
-# Ports were integrated into the main tarball in 2.17
-config LIBC_GLIBC_PORTS_EXTERNAL
-    def_bool y
-    depends on !LIBC_GLIBC_2_17_or_later
-
-config LIBC_GLIBC_NEEDS_PORTS
-    def_bool y
-    depends on ARCH_alpha || ARCH_arm || ARCH_m68k || ARCH_mips || ARCH_powerpc
-
-# Ports are no longer an add-on starting with 2.20
-config LIBC_GLIBC_USE_PORTS
-    def_bool y
-    depends on LIBC_GLIBC_NEEDS_PORTS && !LIBC_GLIBC_2_20_or_later
-
-# Force using the BFD linker during the toolchain build
-config LIBC_glibc_family
-    bool
-    default y
-    select BINUTILS_FORCE_LD_BFD_DEFAULT
-
-config LIBC_GLIBC_EXTRA_CONFIG_ARRAY
+config GLIBC_EXTRA_CONFIG_ARRAY
     string
     prompt "extra config"
     default ""
@@ -36,7 +12,7 @@ config LIBC_GLIBC_EXTRA_CONFIG_ARRAY
       if they are properly quoted (or escaped, but prefer quotes). Eg.:
           --with-foo="1st arg with 4 spaces" --with-bar=2nd-arg-without-space
 
-config LIBC_GLIBC_CONFIGPARMS
+config GLIBC_CONFIGPARMS
     string
     prompt "Extra config params (READ HELP)"
     default "" if ! ARCH_sh
@@ -51,14 +27,14 @@ config LIBC_GLIBC_CONFIGPARMS
       Note: If you need to pass more than one value, separate them with
             '\n'. Eg.:  var1=val1\nvar2=val2
 
-config LIBC_GLIBC_EXTRA_CFLAGS
+config GLIBC_EXTRA_CFLAGS
     string
     prompt "extra target CFLAGS"
     default ""
     help
       Extra target CFLAGS to use when building.
 
-config LIBC_ENABLE_FORTIFIED_BUILD
+config GLIBC_ENABLE_FORTIFIED_BUILD
     bool
     prompt "Enable fortified build (EXPERIMENTAL)"
     depends on EXPERIMENTAL
@@ -78,13 +54,13 @@ config LIBC_ENABLE_FORTIFIED_BUILD
       here. Otherwise, be still and say 'n' (the default). ;-)
 
 
-config LIBC_DISABLE_VERSIONING
+config GLIBC_DISABLE_VERSIONING
     bool
     prompt "Disable symbols versioning"
     help
       Do not include versioning information in the library objects.
 
-config LIBC_OLDEST_ABI
+config GLIBC_OLDEST_ABI
     string
     prompt "Oldest supported ABI"
     default ""
@@ -96,7 +72,7 @@ config LIBC_OLDEST_ABI
 
       If this option is not set, (e)glibc will choose for you.
 
-config LIBC_GLIBC_FORCE_UNWIND
+config GLIBC_FORCE_UNWIND
     bool
     prompt "Force unwind support (READ HELP!)"
     default y
@@ -112,7 +88,7 @@ config LIBC_GLIBC_FORCE_UNWIND
       of glibc on some architectures
       (seen on s390, s390x and x86_64).
 
-config LIBC_ADDONS_LIST
+config GLIBC_ADDONS_LIST
     string
     prompt "Extra addons"
     default ""
@@ -128,7 +104,7 @@ config LIBC_ADDONS_LIST
 
       Eg.: libidn
 
-config LIBC_LOCALES
+config GLIBC_LOCALES
     bool
     prompt "Build and install locales"
     help
@@ -149,12 +125,12 @@ endif # LIBC_glibc && LIBC_LOCALES
 
 if KERNEL_linux
 
-choice LIBC_GLIBC_SUPPORTED_KERNEL
+choice GLIBC_SUPPORTED_KERNEL
     bool
     prompt "Minimum supported kernel version"
-    default LIBC_GLIBC_KERNEL_VERSION_AS_HEADERS
+    default GLIBC_KERNEL_VERSION_AS_HEADERS
 
-config LIBC_GLIBC_KERNEL_VERSION_NONE
+config GLIBC_KERNEL_VERSION_NONE
     bool
     prompt "Let ./configure decide"
     help
@@ -172,7 +148,7 @@ config LIBC_GLIBC_KERNEL_VERSION_NONE
         powerpc*                Requires Linux 2.4.19
         arm*-*-linux-*gnueabi   Requires Linux 2.6.16
 
-config LIBC_GLIBC_KERNEL_VERSION_AS_HEADERS
+config GLIBC_KERNEL_VERSION_AS_HEADERS
     bool
     prompt "Same as kernel headers (default)"
     help
@@ -195,7 +171,7 @@ config LIBC_GLIBC_KERNEL_VERSION_AS_HEADERS
       chosen kernel headers version (CT_KERNEL_VERSION), you can choose
       "y" here.
 
-config LIBC_GLIBC_KERNEL_VERSION_CHOSEN
+config GLIBC_KERNEL_VERSION_CHOSEN
     bool
     prompt "Specific kernel version"
     help
@@ -213,9 +189,9 @@ config LIBC_GLIBC_KERNEL_VERSION_CHOSEN
 
       Most people can leave this at the default value of "2.6.9".
 
-if LIBC_GLIBC_KERNEL_VERSION_CHOSEN
+if GLIBC_KERNEL_VERSION_CHOSEN
 
-config LIBC_GLIBC_MIN_KERNEL_VERSION
+config GLIBC_MIN_KERNEL_VERSION
     string
     prompt "Minimum kernel version to support"
     default "2.6.9"
@@ -232,14 +208,14 @@ config LIBC_GLIBC_MIN_KERNEL_VERSION
       Note that no sanity check is performed by crosstool-NG to ensure
       that the value you enter here is appropriate for your target.
 
-endif # LIBC_GLIBC_KERNEL_VERSION_CHOSEN
+endif # GLIBC_KERNEL_VERSION_CHOSEN
 
 endchoice
 
-config LIBC_GLIBC_MIN_KERNEL
+config GLIBC_MIN_KERNEL
     string
-    default ""                            if LIBC_GLIBC_KERNEL_VERSION_NONE
-    default KERNEL_VERSION                if LIBC_GLIBC_KERNEL_VERSION_AS_HEADERS
-    default LIBC_GLIBC_MIN_KERNEL_VERSION if LIBC_GLIBC_KERNEL_VERSION_CHOSEN
+    default ""                            if GLIBC_KERNEL_VERSION_NONE
+    default KERNEL_VERSION                if GLIBC_KERNEL_VERSION_AS_HEADERS
+    default GLIBC_MIN_KERNEL_VERSION      if GLIBC_KERNEL_VERSION_CHOSEN
 
 endif # KERNEL_linux
diff --git a/config/libc/mingw-w64.in b/config/libc/mingw-w64.in
new file mode 100644
index 00000000..769c976f
--- /dev/null
+++ b/config/libc/mingw-w64.in
@@ -0,0 +1,39 @@
+# mingw options
+
+## depends on WINDOWS
+##
+## select LIBC_SUPPORT_THREADS_NATIVE
+## select LIBC_SUPPORT_THREADS_POSIX
+## select CC_CORE_PASS_2_NEEDED
+##
+## help The de-facto standard for Mingw distributions.
+
+source "config/versions/mingw-w64.in"
+
+config THREADS
+    default "win32"  if THREADS_NATIVE
+    default "posix"  if THREADS_POSIX
+
+config MINGW_SECURE_API
+    bool "Expose secure API prototypes"
+    default y
+
+config MINGW_DIRECTX
+    bool "Include DirectX development files"
+
+config MINGW_DDK
+    bool "Include DDK development files"
+
+config MINGW_TOOLS
+    bool "Include the companion tools"
+    default y
+    help
+      Build the companion tools with mingw such as widl, gendef,
+      and genpeimg.
+
+config MINGW_TOOL_LIST_ARRAY
+    string "List of mingw-w64 tools to build"
+    default "gendef genidl genlib genpeimg widl"
+    depends on MINGW_TOOLS
+    help
+      List of mingw-w64 tools to build.
diff --git a/config/libc/mingw.in b/config/libc/mingw.in
deleted file mode 100644
index 0ca1823f..00000000
--- a/config/libc/mingw.in
+++ /dev/null
@@ -1,159 +0,0 @@
-# mingw options
-
-## depends on WINDOWS
-##
-## select LIBC_SUPPORT_THREADS_NATIVE
-## select LIBC_SUPPORT_THREADS_POSIX
-## select CC_CORE_PASS_2_NEEDED
-##
-## help The de-facto standard for Mingw distributions.
-
-config THREADS
-    default "win32"  if THREADS_NATIVE
-    default "posix"  if THREADS_POSIX
-
-choice
-    bool
-    prompt "Windows API version"
-
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
-
-config WINAPI_V_5_0_2
-    bool
-    prompt "5.0.2"
-
-config WINAPI_V_5_0_1
-    bool
-    prompt "5.0.1 (OBSOLETE)"
-    depends on OBSOLETE
-
-config WINAPI_V_5_0_0
-    bool
-    prompt "5.0.0 (OBSOLETE)"
-    depends on OBSOLETE
-
-config WINAPI_V_4_0_6
-    bool
-    prompt "4.0.6"
-
-config WINAPI_V_4_0_5
-    bool
-    prompt "4.0.5 (OBSOLETE)"
-    depends on OBSOLETE
-
-config WINAPI_V_4_0_4
-    bool
-    prompt "4.0.4 (OBSOLETE)"
-    depends on OBSOLETE
-
-config WINAPI_V_4_0_2
-    bool
-    prompt "4.0.2 (OBSOLETE)"
-    depends on OBSOLETE
-
-config WINAPI_V_4_0_1
-    bool
-    prompt "4.0.1 (OBSOLETE)"
-    depends on OBSOLETE
-
-config WINAPI_V_4_0_0
-    bool
-    prompt "4.0.0 (OBSOLETE)"
-    depends on OBSOLETE
-
-config WINAPI_V_3_3_0
-    bool
-    prompt "3.3.0 (OBSOLETE)"
-    depends on OBSOLETE
-
-config WINAPI_V_3_2_0
-    bool
-    prompt "3.2.0 (OBSOLETE)"
-    depends on OBSOLETE
-
-config WINAPI_V_3_1_0
-    bool
-    prompt "3.1.0 (OBSOLETE)"
-    depends on OBSOLETE
-
-config WINAPI_V_3_0_0
-    bool
-    prompt "3.0.0 (OBSOLETE)"
-    depends on OBSOLETE
-
-config WINAPI_V_2_0_9
-    bool
-    prompt "2.0.9 (OBSOLETE)"
-    depends on OBSOLETE
-
-config WINAPI_V_2_0_8
-    bool
-    prompt "2.0.8 (OBSOLETE)"
-    depends on OBSOLETE
-
-config WINAPI_V_2_0_7
-    bool
-    prompt "2.0.7 (OBSOLETE)"
-    depends on OBSOLETE
-
-config WINAPI_V_select
-    bool
-    prompt "Other version"
-
-config WINAPI_V_DEVEL
-    bool
-    prompt "devel"
-    depends on EXPERIMENTAL
-    depends on CONFIGURE_has_git
-
-endchoice
-
-config WINAPI_VERSION
-    string
-    prompt "Windows API version" if WINAPI_V_select
-    default "devel" if WINAPI_V_DEVEL
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-    default "5.0.2" if WINAPI_V_5_0_2
-    default "5.0.1" if WINAPI_V_5_0_1
-    default "5.0.0" if WINAPI_V_5_0_0
-    default "4.0.6" if WINAPI_V_4_0_6
-    default "4.0.5" if WINAPI_V_4_0_5
-    default "4.0.4" if WINAPI_V_4_0_4
-    default "4.0.2" if WINAPI_V_4_0_2
-    default "4.0.1" if WINAPI_V_4_0_1
-    default "4.0.0" if WINAPI_V_4_0_0
-    default "3.3.0" if WINAPI_V_3_3_0
-    default "3.2.0" if WINAPI_V_3_2_0
-    default "3.1.0" if WINAPI_V_3_1_0
-    default "3.0.0" if WINAPI_V_3_0_0
-    default "2.0.9" if WINAPI_V_2_0_9
-    default "2.0.8" if WINAPI_V_2_0_8
-    default "2.0.7" if WINAPI_V_2_0_7
-    help
-      Enter the version number of the Windows API files to use
-
-config MINGW_SECURE_API
-    bool "Expose secure API prototypes"
-    default y
-
-config MINGW_DIRECTX
-    bool "Include DirectX development files"
-
-config MINGW_DDK
-    bool "Include DDK development files"
-
-config MINGW_TOOLS
-    bool "Include the companion tools"
-    default y
-    help
-      Build the companion tools with mingw such as widl, gendef,
-      and genpeimg.
-
-config MINGW_TOOL_LIST_ARRAY
-    string "List of mingw-w64 tools to build"
-    default "gendef genidl genlib genpeimg widl"
-    depends on MINGW_TOOLS
-    help
-      List of mingw-w64 tools to build.
diff --git a/config/libc/musl.in b/config/libc/musl.in
index 5ea166f1..24f522a6 100644
--- a/config/libc/musl.in
+++ b/config/libc/musl.in
@@ -10,66 +10,8 @@
 ## help devices. musl is lightweight, fast, simple, free, and strives to be
 ## help correct in the sense of standards-conformance and safety.
 
+source "config/versions/musl.in"
+
+# FIXME why? it claims "native", why report "musl"?
 config THREADS
     default "musl"
-
-config LIBC_MUSL_CUSTOM
-    bool
-    prompt "Custom musl"
-    depends on EXPERIMENTAL
-    help
-      The choosen musl-libc version shall be not downloaded. Instead use
-      a custom location to get the source.
-
-if LIBC_MUSL_CUSTOM
-
-config LIBC_MUSL_CUSTOM_LOCATION
-    string
-    prompt "Full path to custom musl-libc source"
-    help
-      Enter the path to the directory or tarball of your source for musl.
-
-      If the path is a tarball, it should extract to: <name>-<version>/
-      where the name is this component, musl, and the version is set
-      below in the custom version string.
-
-config LIBC_MUSL_CUSTOM_VERSION
-    string
-    prompt "Custom MUSL version"
-    help
-      Enter the version number for your custom musl-libc.
-
-config LIBC_VERSION
-    string
-    default LIBC_MUSL_CUSTOM_VERSION
-
-endif # LIBC_MUSL_CUSTOM
-
-if ! LIBC_MUSL_CUSTOM
-
-choice
-    bool
-    prompt "musl version"
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
-
-config LIBC_MUSL_V_1_1_16
-    bool
-    prompt "1.1.16"
-    depends on EXPERIMENTAL
-
-config LIBC_MUSL_V_1_1_15
-    bool
-    prompt "1.1.15 (OBSOLETE)"
-    depends on EXPERIMENTAL && OBSOLETE
-
-endchoice
-
-config LIBC_VERSION
-    string
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-    default "1.1.16" if LIBC_MUSL_V_1_1_16
-    default "1.1.15" if LIBC_MUSL_V_1_1_15
-
-endif # ! LIBC_MUSL_CUSTOM
diff --git a/config/libc/newlib.in b/config/libc/newlib.in
index 68e8b62c..5354fef9 100644
--- a/config/libc/newlib.in
+++ b/config/libc/newlib.in
@@ -12,209 +12,12 @@
 ## help is only available in source form. It can be compiled for a wide
 ## help array of processors, and will usually work on any architecture with
 ## help the addition of a few low-level routines.
-#
-config LIBC_NEWLIB_CUSTOM
-    bool
-    prompt "Custom newlib"
-    depends on EXPERIMENTAL
-    select LIBC_NEWLIB_2_5_or_later
-    help
-      The choosen newlib version shall be not downloaded. Instead use
-      a custom location to get the source.
 
-if LIBC_NEWLIB_CUSTOM
-
-config LIBC_NEWLIB_CUSTOM_LOCATION
-    string
-    prompt "Full path to custom newlib source"
-    help
-      Enter the path to the directory or tarball of your source for newlib.
-
-      If the path is a tarball, it should extract to: <name>-<version>/
-      where the name is this component, newlib, and the version is set
-      below in the custom version string.
-
-config LIBC_NEWLIB_CUSTOM_VERSION
-    string
-    prompt "Custom NEWLIB version"
-    help
-      Enter the version number for your custom newlib.
-
-config LIBC_VERSION
-    string
-    default LIBC_NEWLIB_CUSTOM_VERSION
-
-endif # LIBC_NEWLIB_CUSTOM
-
-if ! LIBC_NEWLIB_CUSTOM
-
-config CC_NEWLIB_SHOW_LINARO
-    bool
-    prompt "Show Linaro versions"
-    help
-      Linaro is maintaining some advanced/more stable/experimental versions
-      of newlib, especially for the ARM architecture.
-
-      Those versions have not been blessed by the newlib comunity (nor have they
-      been cursed either!), but they look to be pretty much stable, and even
-      more stable than the upstream versions. YMMV...
-
-      If you do not know what this Linaro stuff is, then simply say 'n' here,
-      and rest in peace. OTOH, if you know what you are doing, you will be
-      able to use and enjoy :-) the Linaro versions by saying 'y' here.
-
-      Linaro: http://www.linaro.org/
-
-choice
-    bool
-    prompt "newlib version"
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
-config LIBC_NEWLIB_V_2_5_0
-    bool
-    prompt "2.5.0.20170519"
-    select LIBC_NEWLIB_2_5
-
-config LIBC_NEWLIB_V_2_4_0
-    bool
-    prompt "2.4.0.20161025"
-    select LIBC_NEWLIB_2_4
-
-config LIBC_NEWLIB_V_2_3_0
-    bool
-    prompt "2.3.0.20160226"
-    select LIBC_NEWLIB_2_3
-
-config LIBC_NEWLIB_LINARO_V_2_2_0
-    bool
-    prompt "Linaro 2.2.0-2015.01"
-    depends on CC_NEWLIB_SHOW_LINARO
-    select LIBC_NEWLIB_2_2
-
-config LIBC_NEWLIB_V_2_2_0
-    bool
-    prompt "2.2.0.20151023"
-    select LIBC_NEWLIB_2_2
-
-config LIBC_NEWLIB_LINARO_V_2_1_0
-    bool
-    prompt "Linaro 2.1.0-2014.09"
-    depends on CC_NEWLIB_SHOW_LINARO
-    select LIBC_NEWLIB_2_1
-
-config LIBC_NEWLIB_V_2_1_0
-    bool
-    prompt "2.1.0"
-    select LIBC_NEWLIB_2_1
-
-config LIBC_NEWLIB_V_2_0_0
-    bool
-    prompt "2.0.0"
-    select LIBC_NEWLIB_2_0
-
-config LIBC_NEWLIB_V_1_20_0
-    bool
-    prompt "1.20.0"
-
-config LIBC_NEWLIB_V_1_19_0
-    bool
-    prompt "1.19.0"
-
-config LIBC_NEWLIB_V_1_18_0
-    bool
-    prompt "1.18.0"
-
-config LIBC_NEWLIB_V_1_17_0
-    bool
-    prompt "1.17.0"
-
-endchoice
-
-endif # ! LIBC_NEWLIB_CUSTOM
-
-config LIBC_NEWLIB_2_5
-    bool
-    select LIBC_NEWLIB_2_5_or_later
-
-config LIBC_NEWLIB_2_4
-    bool
-    select LIBC_NEWLIB_2_4_or_later
-
-config LIBC_NEWLIB_2_3
-    bool
-    select LIBC_NEWLIB_2_3_or_later
-
-config LIBC_NEWLIB_2_2
-    bool
-    select LIBC_NEWLIB_2_2_or_later
-
-config LIBC_NEWLIB_2_1
-    bool
-    select LIBC_NEWLIB_2_1_or_later
-
-config LIBC_NEWLIB_2_0
-    bool
-    select LIBC_NEWLIB_2_0_or_later
-
-config LIBC_NEWLIB_2_5_or_later
-    bool
-    select LIBC_NEWLIB_2_4_or_later
-
-config LIBC_NEWLIB_2_4_or_later
-    bool
-    select LIBC_NEWLIB_2_3_or_later
-
-config LIBC_NEWLIB_2_3_or_later
-    bool
-    select LIBC_NEWLIB_2_2_or_later
-
-config LIBC_NEWLIB_2_2_or_later
-    bool
-    select LIBC_NEWLIB_2_1_or_later
-
-config LIBC_NEWLIB_2_1_or_later
-    bool
-    select LIBC_NEWLIB_2_0_or_later
+source "config/versions/newlib.in"
 
 # maybe older versions of newlib will support it too, but this
 # needs to be checked
-config LIBC_NEWLIB_2_0_or_later
-    bool
+config NEWLIB_CXA_ATEXIT
+    def_bool y
+    depends on NEWLIB_2_0_or_later
     select LIBC_PROVIDES_CXA_ATEXIT
-
-if ! LIBC_NEWLIB_CUSTOM
-config LIBC_VERSION
-    string
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-    default "2.5.0.20170519" if LIBC_NEWLIB_V_2_5_0
-    default "2.4.0.20161025" if LIBC_NEWLIB_V_2_4_0
-    default "2.3.0.20160226" if LIBC_NEWLIB_V_2_3_0
-    default "linaro-2.2.0-2015.01" if LIBC_NEWLIB_LINARO_V_2_2_0
-    default "2.2.0.20151023" if LIBC_NEWLIB_V_2_2_0
-    default "linaro-2.1.0-2014.09" if LIBC_NEWLIB_LINARO_V_2_1_0
-    default "2.1.0" if LIBC_NEWLIB_V_2_1_0
-    default "2.0.0" if LIBC_NEWLIB_V_2_0_0
-    default "1.20.0" if LIBC_NEWLIB_V_1_20_0
-    default "1.19.0" if LIBC_NEWLIB_V_1_19_0
-    default "1.18.0" if LIBC_NEWLIB_V_1_18_0
-    default "1.17.0" if LIBC_NEWLIB_V_1_17_0
-    help
-      Enter the tag you want to use.
-      Leave empty to use the 'head' of the repository.
-
-endif # ! LIBC_NEWLIB_CUSTOM
-
-config LIBC_NEWLIB_TARGET_CFLAGS
-    string
-    prompt "Target CFLAGS for newlib"
-    default ""
-    help
-      Used to add specific options when compiling the target libraries
-      (eg. -ffunction-sections -fdata-sections), which can't be defined
-      in global TARGET_CFLAGS, because they shall be not used for the
-      gcc target libraries.
-      Note:  Both TARGET_CFLAGS and LIBC_NEWLIB_TARGET_CFLAGS are used
-             to compile the libraries.
-
-      Leave blank if you don't know better.
diff --git a/config/libc/newlib.in.2 b/config/libc/newlib.in.2
index 96bd22bf..f73128c3 100644
--- a/config/libc/newlib.in.2
+++ b/config/libc/newlib.in.2
@@ -1,5 +1,19 @@
 # newlib second-part options
 
+config LIBC_NEWLIB_TARGET_CFLAGS
+    string
+    prompt "Target CFLAGS for newlib"
+    default ""
+    help
+      Used to add specific options when compiling the target libraries
+      (eg. -ffunction-sections -fdata-sections), which can't be defined
+      in global TARGET_CFLAGS, because they shall be not used for the
+      gcc target libraries.
+      Note:  Both TARGET_CFLAGS and LIBC_NEWLIB_TARGET_CFLAGS are used
+             to compile the libraries.
+
+      Leave blank if you don't know better.
+
 config LIBC_NEWLIB_IO_C99FMT
     bool
     prompt "Enable IOs on C99 formats"
diff --git a/config/libc/uClibc.in b/config/libc/uClibc.in
index a85cf215..8f91aa01 100644
--- a/config/libc/uClibc.in
+++ b/config/libc/uClibc.in
@@ -4,6 +4,7 @@
 ##
 ## select LIBC_SUPPORT_THREADS_LT
 ## select LIBC_SUPPORT_THREADS_NONE
+## select LIBC_SUPPORT_THREADS_NATIVE if UCLIBC_0_9_33_2_or_later
 ## select CC_CORE_PASSES_NEEDED
 ##
 ## help The de-facto standard for embeded linux systems.
@@ -11,6 +12,8 @@
 ## help Highly configurable, thus as feature-rich as you
 ## help need, without compromising for size.
 
+source "config/versions/uClibc-ng.in"
+
 config THREADS
     default "nptl"          if THREADS_NATIVE
     default "linuxthreads"  if THREADS_LT
@@ -20,141 +23,18 @@ comment "'softfp' ABI and uClibc is not entirely tested in crosstool-NG"
 comment "You may experience issues, although it should work just fine"
 endif # ARCH_FLOAT_SOFTFP
 
-config LIBC_UCLIBC_CUSTOM
-    bool
-    prompt "Custom uClibc"
-    depends on EXPERIMENTAL
-    help
-      The choosen uclibc version shall be not downloaded. Instead use
-      a custom location to get the source.
-
-if LIBC_UCLIBC_CUSTOM
-
-choice
-    bool
-    prompt "uClibc Version Name"
-
-config LIBC_UCLIBC_CUSTOM_UCLIBC
-    bool "uClibc (OBSOLETE)"
-    depends on OBSOLETE
-    select LIBC_UCLIBC_0_9_33_2_or_later
-
-config LIBC_UCLIBC_CUSTOM_UCLIBC_NG
-    bool "uClibc-ng (1.0.15 or later)"
-    select LIBC_UCLIBC_NG_1_0_15_or_later
-
-config LIBC_UCLIBC_CUSTOM_UCLIBC_NG_OLD
-    bool "uClibc-ng (older than 1.0.15)"
-    select LIBC_UCLIBC_NG_1_0_0_or_later
-
-endchoice
-
-config LIBC_UCLIBC_CUSTOM_LOCATION
-    string
-    prompt "Full path to custom uClibc source"
-    help
-      Enter the path to the directory or tarball of your source for uClibc.
-
-      If the path is a tarball, it should extract to: <name>-<version>/
-      where the name is this component will be set by the uClibc Version Name
-      option from above, and the version is set below in the custom version
-      string.
-
-config LIBC_UCLIBC_CUSTOM_VERSION
-    string
-    prompt "Custom uClibc Version"
-    help
-      Enter the version number for your custom uClibc.
-      Version 1.0.18 is only enabled in EXPERIMENTAL builds due to issues
-      with static libraries.
-
-config LIBC_VERSION
-    string
-    default LIBC_UCLIBC_CUSTOM_VERSION
-
-endif # LIBC_UCLIBC_CUSTOM
-
-if ! LIBC_UCLIBC_CUSTOM
-
-choice
-    bool
-    prompt "uClibc version"
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
-
-config LIBC_UCLIBC_NG_V_1_0_25
-    bool
-    prompt "1.0.25"
-    select LIBC_UCLIBC_NG_1_0_15_or_later
-
-config LIBC_UCLIBC_NG_V_1_0_24
-    bool
-    prompt "1.0.24"
-    select LIBC_UCLIBC_NG_1_0_15_or_later
-
-config LIBC_UCLIBC_NG_V_1_0_23
-    bool
-    prompt "1.0.23"
-    select LIBC_UCLIBC_NG_1_0_15_or_later
-
-config LIBC_UCLIBC_NG_V_1_0_22
-    bool
-    prompt "1.0.22"
-    select LIBC_UCLIBC_NG_1_0_15_or_later
-
-config LIBC_UCLIBC_NG_V_1_0_21
-    bool
-    prompt "1.0.21 (OBSOLETE)"
-    depends on OBSOLETE
-    select LIBC_UCLIBC_NG_1_0_15_or_later
-
-config LIBC_UCLIBC_NG_V_1_0_20
-    bool
-    prompt "1.0.20 (OBSOLETE)"
-    depends on OBSOLETE
-    select LIBC_UCLIBC_NG_1_0_15_or_later
-
-config LIBC_UCLIBC_V_0_9_33_2
-    bool
-    prompt "0.9.33.2 (OBSOLETE)"
-    depends on OBSOLETE
-    select LIBC_UCLIBC_0_9_33_2_or_later
-
-endchoice
-
-config LIBC_VERSION
-    string
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-    default "1.0.25" if LIBC_UCLIBC_NG_V_1_0_25
-    default "1.0.24" if LIBC_UCLIBC_NG_V_1_0_24
-    default "1.0.23" if LIBC_UCLIBC_NG_V_1_0_23
-    default "1.0.22" if LIBC_UCLIBC_NG_V_1_0_22
-    default "1.0.21" if LIBC_UCLIBC_NG_V_1_0_21
-    default "1.0.20" if LIBC_UCLIBC_NG_V_1_0_20
-    default "0.9.33.2" if LIBC_UCLIBC_V_0_9_33_2
-
-endif # ! LIBC_UCLIBC_CUSTOM
-
-config LIBC_UCLIBC_NG_1_0_15_or_later
-    bool
-    select LIBC_UCLIBC_NG_1_0_0_or_later
-
-config LIBC_UCLIBC_NG_1_0_0_or_later
-    bool
-    select LIBC_UCLIBC_NG
-    select LIBC_UCLIBC_0_9_33_2_or_later
-
-config LIBC_UCLIBC_0_9_33_2_or_later
-    bool
-    select LIBC_SUPPORT_THREADS_NATIVE
-    select LIBC_UCLIBC_PARALLEL
-
 config LIBC_UCLIBC_PARALLEL
-    bool
+    def_bool y
+    depends on UCLIBC_0_9_33_2_or_later
 
 config LIBC_UCLIBC_NG
-    bool
+    def_bool y
+    depends on UCLIBC_1_0_0_or_later
+
+# uClibc-ng 1.0.15 did away with 2 implementations of linuxthreads
+config UCLIBC_MERGED_LINUXTHREADS
+    def_bool y
+    depends on UCLIBC_1_0_15_or_later
 
 choice
     bool
diff --git a/config/libc/uClibc.in.2 b/config/libc/uClibc.in.2
index 1b348554..7bf8f2aa 100644
--- a/config/libc/uClibc.in.2
+++ b/config/libc/uClibc.in.2
@@ -1,6 +1,6 @@
 # uClibc second-part option
 
-if THREADS_LT && !LIBC_UCLIBC_NG_1_0_15_or_later
+if THREADS_LT && !UCLIBC_MERGED_LINUXTHREADS
 
 choice
     bool
@@ -30,12 +30,11 @@ 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 ""      if UCLIBC_MERGED_LINUXTHREADS
     default "old"   if LIBC_UCLIBC_LNXTHRD_OLD
     default "new"   if LIBC_UCLIBC_LNXTHRD_NEW