diff --git a/bootstrap b/bootstrap
index 8a5b605f..6b76a9bf 100755
--- a/bootstrap
+++ b/bootstrap
@@ -219,6 +219,20 @@ run_template()
 kconfigize()
 {
     local v="${1}"
+    local p pb pa vx
+    shift
+
+    # If optional patterns are provided, find the first match
+    # and contract to the matching portion.
+    for p in "$@"; do
+        pb=${p%|*}
+        pa=${p#*|}
+        eval "vx=\${v#${pb}${pa}}"
+        if [ "${v%${pa}${vx}}" != "${v}" ]; then
+            v=${v%${pa}${vx}}
+            break
+        fi
+    done
 
     v=${v//[^0-9A-Za-z_]/_}
     echo "${v^^}"
@@ -429,6 +443,7 @@ find_forks()
         pkg_nforks[${1}]=$[pkg_nforks[${1}]+1]
         pkg_forks[${1}]+=" ${1} "
         pkg_milestones[${1}]=`sort_versions ${info[milestones]}`
+        pkg_relevantpattern[${1}]=${info[relevantpattern]}
         pkg_masters+=( "${1}" )
     fi
     # Keep sorting so that preferred fork is first
@@ -511,7 +526,7 @@ enter_version()
 
     eval `read_version_desc ${info[fork]} ${version}`
     info[ver]=${version}
-    info[kcfg]=`kconfigize ${version}`
+    info[kcfg]=`kconfigize ${version} ${info[relevantpattern]}`
     info[ver_postfix]=${ver_postfix[,${info[obsolete]},${info[experimental]},]}
 }
 
@@ -529,7 +544,7 @@ enter_milestone()
 
 gen_packages()
 {
-    local -A pkg_forks pkg_milestones pkg_nforks
+    local -A pkg_forks pkg_milestones pkg_nforks pkg_relevantpattern
     local -a pkg_masters pkg_all pkg_preferred
 
     pkg_all=( `cd packages && \
@@ -558,6 +573,7 @@ gen_packages()
             [masterpfx]=`kconfigize ${p}` \
             [nforks]=${pkg_nforks[${p}]} \
             [all_milestones]=${pkg_milestones[${p}]} \
+            [relevantpattern]=${pkg_relevantpattern[${p}]} \
             )
         set_iter fork ${pkg_forks[${p}]}
         set_iter milestone ${pkg_milestones[${p}]}
@@ -588,8 +604,8 @@ enter_choice()
     local choice="${1}"
     local l
 
-    # TBD generate sourcing of versions/$component.in automatically - and add a comment that versions must
-    # TBD generated first? [what to do with glibc/glibc-ports]
+    # TBD generate sourcing of versions/$component.in automatically - and add a comment
+    # TBD that versions must be generated first? [what to do with glibc/glibc-ports]
     info[choice]="${choice}"
     info[kcfg_choice]=`kconfigize "${choice}"`
 
diff --git a/packages/linux/package.desc b/packages/linux/package.desc
index 6e3a0f44..3dae8f3b 100644
--- a/packages/linux/package.desc
+++ b/packages/linux/package.desc
@@ -1,2 +1,3 @@
 repository='git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git'
 mirrors='$(CT_Mirrors kernel.org linux ${CT_LINUX_VERSION})'
+relevantpattern='2.*.*|. *.*|.'
diff --git a/packages/newlib/package.desc b/packages/newlib/package.desc
index 56fe432c..523bd47f 100644
--- a/packages/newlib/package.desc
+++ b/packages/newlib/package.desc
@@ -2,3 +2,4 @@ origin='RedHat'
 repository='git git://sourceware.org/git/newlib-cygwin.git'
 mirrors='ftp://sourceware.org/pub/newlib'
 milestones='2.0 2.1 2.2'
+relevantpattern='*.*.*|.'
diff --git a/samples/aarch64-rpi3-linux-gnu/crosstool.config b/samples/aarch64-rpi3-linux-gnu/crosstool.config
index 6aed7bb3..f8ef63da 100644
--- a/samples/aarch64-rpi3-linux-gnu/crosstool.config
+++ b/samples/aarch64-rpi3-linux-gnu/crosstool.config
@@ -1,6 +1,6 @@
 CT_ARCH_ARM=y
-CT_ARCH_64=y
 CT_ARCH_CPU="cortex-a53"
+CT_ARCH_64=y
 CT_TARGET_VENDOR="rpi3"
 CT_KERNEL_LINUX=y
 CT_BINUTILS_LINKER_LD_GOLD=y
diff --git a/samples/aarch64-unknown-linux-android/crosstool.config b/samples/aarch64-unknown-linux-android/crosstool.config
index 76e36479..0e8a6f86 100644
--- a/samples/aarch64-unknown-linux-android/crosstool.config
+++ b/samples/aarch64-unknown-linux-android/crosstool.config
@@ -4,7 +4,6 @@ CT_ARCH_64=y
 CT_ARCH_ARCH="armv8-a"
 CT_STATIC_TOOLCHAIN=y
 CT_KERNEL_LINUX=y
-CT_BIONIC_V_14b=y
 CT_ANDROID_API_21=y
 CT_CC_LANG_CXX=y
 CT_DEBUG_GDB=y
diff --git a/samples/alphaev56-unknown-linux-gnu/crosstool.config b/samples/alphaev56-unknown-linux-gnu/crosstool.config
index 60091639..321e957e 100644
--- a/samples/alphaev56-unknown-linux-gnu/crosstool.config
+++ b/samples/alphaev56-unknown-linux-gnu/crosstool.config
@@ -1,4 +1,3 @@
-CT_ARCH_CPU="ev56"
 CT_ARCH_ALPHA_EV56=y
 CT_KERNEL_LINUX=y
 CT_BINUTILS_PLUGINS=y
diff --git a/samples/alphaev67-unknown-linux-gnu/crosstool.config b/samples/alphaev67-unknown-linux-gnu/crosstool.config
index c50c9737..485bd2d5 100644
--- a/samples/alphaev67-unknown-linux-gnu/crosstool.config
+++ b/samples/alphaev67-unknown-linux-gnu/crosstool.config
@@ -1,4 +1,3 @@
-CT_ARCH_CPU="ev67"
 CT_ARCH_ALPHA_EV67=y
 CT_KERNEL_LINUX=y
 CT_BINUTILS_PLUGINS=y
diff --git a/samples/arm-bare_newlib_cortex_m3_nommu-eabi/crosstool.config b/samples/arm-bare_newlib_cortex_m3_nommu-eabi/crosstool.config
index 1aa99933..09cae2b2 100644
--- a/samples/arm-bare_newlib_cortex_m3_nommu-eabi/crosstool.config
+++ b/samples/arm-bare_newlib_cortex_m3_nommu-eabi/crosstool.config
@@ -1,8 +1,8 @@
 CT_ARCH_ARM=y
-# CT_ARCH_USE_MMU is not set
 CT_ARCH_CPU="cortex-m3"
-CT_ARCH_FLOAT_SW=y
 CT_ARCH_ARM_MODE_THUMB=y
+# CT_ARCH_USE_MMU is not set
+CT_ARCH_FLOAT_SW=y
 CT_TARGET_VENDOR="bare_newlib_cortex_m3_nommu"
 CT_ARCH_BINFMT_FLAT=y
 CT_LIBC_NEWLIB_IO_C99FMT=y
diff --git a/samples/arm-cortex_a15-linux-gnueabihf/crosstool.config b/samples/arm-cortex_a15-linux-gnueabihf/crosstool.config
index 74a6ef5c..491046d9 100644
--- a/samples/arm-cortex_a15-linux-gnueabihf/crosstool.config
+++ b/samples/arm-cortex_a15-linux-gnueabihf/crosstool.config
@@ -8,7 +8,6 @@ CT_BINUTILS_LINKER_LD_GOLD=y
 CT_BINUTILS_GOLD_THREADS=y
 CT_BINUTILS_LD_WRAPPER=y
 CT_BINUTILS_PLUGINS=y
-CT_LIBC_GLIBC=y
 CT_CC_LANG_CXX=y
 CT_DEBUG_DUMA=y
 CT_DEBUG_GDB=y
diff --git a/samples/arm-cortex_a8-linux-gnueabi/crosstool.config b/samples/arm-cortex_a8-linux-gnueabi/crosstool.config
index bea72b80..3e4c024b 100644
--- a/samples/arm-cortex_a8-linux-gnueabi/crosstool.config
+++ b/samples/arm-cortex_a8-linux-gnueabi/crosstool.config
@@ -7,7 +7,6 @@ CT_BINUTILS_LINKER_LD_GOLD=y
 CT_BINUTILS_GOLD_THREADS=y
 CT_BINUTILS_LD_WRAPPER=y
 CT_BINUTILS_PLUGINS=y
-CT_LIBC_GLIBC=y
 CT_CC_LANG_CXX=y
 CT_DEBUG_DUMA=y
 CT_DEBUG_GDB=y
diff --git a/samples/arm-cortexa5-linux-uclibcgnueabihf/crosstool.config b/samples/arm-cortexa5-linux-uclibcgnueabihf/crosstool.config
index 1543eb69..49e842ca 100644
--- a/samples/arm-cortexa5-linux-uclibcgnueabihf/crosstool.config
+++ b/samples/arm-cortexa5-linux-uclibcgnueabihf/crosstool.config
@@ -10,7 +10,6 @@ CT_BINUTILS_GOLD_THREADS=y
 CT_BINUTILS_LD_WRAPPER=y
 CT_BINUTILS_PLUGINS=y
 CT_LIBC_UCLIBC=y
-CT_LIBC_UCLIBC_WCHAR=y
 CT_CC_LANG_CXX=y
 CT_DEBUG_DUMA=y
 CT_DEBUG_GDB=y
diff --git a/samples/arm-unknown-linux-gnueabi/crosstool.config b/samples/arm-unknown-linux-gnueabi/crosstool.config
index 666d2fc7..128d3799 100644
--- a/samples/arm-unknown-linux-gnueabi/crosstool.config
+++ b/samples/arm-unknown-linux-gnueabi/crosstool.config
@@ -6,7 +6,6 @@ CT_BINUTILS_LINKER_LD_GOLD=y
 CT_BINUTILS_GOLD_THREADS=y
 CT_BINUTILS_LD_WRAPPER=y
 CT_BINUTILS_PLUGINS=y
-CT_LIBC_GLIBC=y
 # CT_CC_GCC_SJLJ_EXCEPTIONS is not set
 CT_CC_LANG_CXX=y
 CT_DEBUG_DUMA=y
diff --git a/samples/armeb-unknown-linux-gnueabi/crosstool.config b/samples/armeb-unknown-linux-gnueabi/crosstool.config
index d9640c06..22d7d9f3 100644
--- a/samples/armeb-unknown-linux-gnueabi/crosstool.config
+++ b/samples/armeb-unknown-linux-gnueabi/crosstool.config
@@ -7,7 +7,6 @@ CT_BINUTILS_LINKER_LD_GOLD=y
 CT_BINUTILS_GOLD_THREADS=y
 CT_BINUTILS_LD_WRAPPER=y
 CT_BINUTILS_PLUGINS=y
-CT_LIBC_GLIBC=y
 # CT_CC_GCC_SJLJ_EXCEPTIONS is not set
 CT_CC_LANG_CXX=y
 CT_DEBUG_DUMA=y
diff --git a/samples/armeb-unknown-linux-uclibcgnueabi/crosstool.config b/samples/armeb-unknown-linux-uclibcgnueabi/crosstool.config
index 0bb14149..c2b21f88 100644
--- a/samples/armeb-unknown-linux-uclibcgnueabi/crosstool.config
+++ b/samples/armeb-unknown-linux-uclibcgnueabi/crosstool.config
@@ -1,6 +1,6 @@
 CT_ARCH_ARM=y
-CT_ARCH_BE=y
 CT_ARCH_CPU="xscale"
+CT_ARCH_BE=y
 CT_ARCH_FLOAT_SW=y
 CT_KERNEL_LINUX=y
 CT_BINUTILS_LINKER_LD_GOLD=y
diff --git a/samples/armv6-nommu-linux-uclibcgnueabi/crosstool.config b/samples/armv6-nommu-linux-uclibcgnueabi/crosstool.config
index 61ef6582..4b0c04b6 100644
--- a/samples/armv6-nommu-linux-uclibcgnueabi/crosstool.config
+++ b/samples/armv6-nommu-linux-uclibcgnueabi/crosstool.config
@@ -3,8 +3,8 @@ CT_ARCH_SUFFIX="v6"
 # CT_ARCH_USE_MMU is not set
 CT_TARGET_VENDOR="nommu"
 CT_KERNEL_LINUX=y
-# CT_SHARED_LIBS is not set
 # CT_KERNEL_LINUX_INSTALL_CHECK is not set
+# CT_SHARED_LIBS is not set
 CT_BINUTILS_PLUGINS=y
 CT_THREADS_NONE=y
 CT_CC_GCC_DISABLE_PCH=y
diff --git a/samples/armv6-rpi-linux-gnueabi/crosstool.config b/samples/armv6-rpi-linux-gnueabi/crosstool.config
index 6c59a621..94f1b2a1 100644
--- a/samples/armv6-rpi-linux-gnueabi/crosstool.config
+++ b/samples/armv6-rpi-linux-gnueabi/crosstool.config
@@ -1,6 +1,6 @@
 CT_ARCH_ARM=y
-CT_ARCH_SUFFIX="v6"
 CT_ARCH_CPU="arm1176jzf-s"
+CT_ARCH_SUFFIX="v6"
 CT_ARCH_FPU="vfp"
 CT_TARGET_VENDOR="rpi"
 CT_KERNEL_LINUX=y
@@ -9,7 +9,6 @@ CT_BINUTILS_LINKER_LD_GOLD=y
 CT_BINUTILS_GOLD_THREADS=y
 CT_BINUTILS_LD_WRAPPER=y
 CT_BINUTILS_PLUGINS=y
-CT_LIBC_GLIBC=y
 CT_GLIBC_LOCALES=y
 CT_GLIBC_KERNEL_VERSION_CHOSEN=y
 CT_GLIBC_MIN_KERNEL_VERSION="3.2.27"
diff --git a/samples/armv7-rpi2-linux-gnueabihf/crosstool.config b/samples/armv7-rpi2-linux-gnueabihf/crosstool.config
index f4b1e963..102c5032 100644
--- a/samples/armv7-rpi2-linux-gnueabihf/crosstool.config
+++ b/samples/armv7-rpi2-linux-gnueabihf/crosstool.config
@@ -1,6 +1,6 @@
 CT_ARCH_ARM=y
-CT_ARCH_SUFFIX="v7"
 CT_ARCH_CPU="cortex-a7"
+CT_ARCH_SUFFIX="v7"
 CT_ARCH_FPU="neon-vfpv4"
 CT_ARCH_FLOAT_HW=y
 CT_TARGET_VENDOR="rpi2"
@@ -9,6 +9,5 @@ CT_BINUTILS_LINKER_LD_GOLD=y
 CT_BINUTILS_GOLD_THREADS=y
 CT_BINUTILS_LD_WRAPPER=y
 CT_BINUTILS_PLUGINS=y
-CT_LIBC_GLIBC=y
 CT_CC_LANG_CXX=y
 CT_DEBUG_GDB=y
diff --git a/samples/armv8-rpi3-linux-gnueabihf/crosstool.config b/samples/armv8-rpi3-linux-gnueabihf/crosstool.config
index d54b861d..fe9b5af1 100644
--- a/samples/armv8-rpi3-linux-gnueabihf/crosstool.config
+++ b/samples/armv8-rpi3-linux-gnueabihf/crosstool.config
@@ -1,6 +1,6 @@
 CT_ARCH_ARM=y
-CT_ARCH_SUFFIX="v8"
 CT_ARCH_CPU="cortex-a53"
+CT_ARCH_SUFFIX="v8"
 CT_ARCH_FPU="neon-vfpv4"
 CT_ARCH_FLOAT_HW=y
 CT_TARGET_VENDOR="rpi3"
@@ -9,6 +9,5 @@ CT_BINUTILS_LINKER_LD_GOLD=y
 CT_BINUTILS_GOLD_THREADS=y
 CT_BINUTILS_LD_WRAPPER=y
 CT_BINUTILS_PLUGINS=y
-CT_LIBC_GLIBC=y
 CT_CC_LANG_CXX=y
 CT_DEBUG_GDB=y
diff --git a/samples/i586-geode-linux-uclibc/crosstool.config b/samples/i586-geode-linux-uclibc/crosstool.config
index 0431e807..08f90f5d 100644
--- a/samples/i586-geode-linux-uclibc/crosstool.config
+++ b/samples/i586-geode-linux-uclibc/crosstool.config
@@ -7,7 +7,6 @@ CT_BINUTILS_GOLD_THREADS=y
 CT_BINUTILS_LD_WRAPPER=y
 CT_BINUTILS_PLUGINS=y
 CT_LIBC_UCLIBC=y
-CT_LIBC_UCLIBC_WCHAR=y
 CT_CC_LANG_CXX=y
 CT_DEBUG_DUMA=y
 CT_DEBUG_GDB=y
diff --git a/samples/i686-centos6-linux-gnu/crosstool.config b/samples/i686-centos6-linux-gnu/crosstool.config
index 35f2945d..c2858930 100644
--- a/samples/i686-centos6-linux-gnu/crosstool.config
+++ b/samples/i686-centos6-linux-gnu/crosstool.config
@@ -4,7 +4,6 @@ CT_ARCH_ARCH="i686"
 CT_TARGET_VENDOR="centos6"
 CT_KERNEL_LINUX=y
 CT_LINUX_V_2_6_32=y
-CT_LIBC_GLIBC=y
 # CT_KERNEL_LINUX_INSTALL_CHECK is not set
 CT_GLIBC_V_2_12_2=y
 CT_CC_LANG_CXX=y
diff --git a/samples/i686-centos7-linux-gnu/crosstool.config b/samples/i686-centos7-linux-gnu/crosstool.config
index bfad9b62..498afcce 100644
--- a/samples/i686-centos7-linux-gnu/crosstool.config
+++ b/samples/i686-centos7-linux-gnu/crosstool.config
@@ -4,7 +4,6 @@ CT_ARCH_ARCH="i686"
 CT_TARGET_VENDOR="centos7"
 CT_KERNEL_LINUX=y
 CT_LINUX_V_3_10=y
-CT_LIBC_GLIBC=y
 # CT_KERNEL_LINUX_INSTALL_CHECK is not set
 CT_GLIBC_V_2_17=y
 CT_CC_LANG_CXX=y
diff --git a/samples/i686-nptl-linux-gnu/crosstool.config b/samples/i686-nptl-linux-gnu/crosstool.config
index 9dd93e6d..48df3304 100644
--- a/samples/i686-nptl-linux-gnu/crosstool.config
+++ b/samples/i686-nptl-linux-gnu/crosstool.config
@@ -6,7 +6,6 @@ CT_BINUTILS_LINKER_LD_GOLD=y
 CT_BINUTILS_GOLD_THREADS=y
 CT_BINUTILS_LD_WRAPPER=y
 CT_BINUTILS_PLUGINS=y
-CT_LIBC_GLIBC=y
 CT_CC_LANG_CXX=y
 CT_DEBUG_DUMA=y
 CT_DEBUG_GDB=y
diff --git a/samples/i686-ubuntu12.04-linux-gnu/crosstool.config b/samples/i686-ubuntu12.04-linux-gnu/crosstool.config
index 7d3af5a8..958825d0 100644
--- a/samples/i686-ubuntu12.04-linux-gnu/crosstool.config
+++ b/samples/i686-ubuntu12.04-linux-gnu/crosstool.config
@@ -4,7 +4,6 @@ CT_ARCH_ARCH="i686"
 CT_TARGET_VENDOR="ubuntu12.04"
 CT_KERNEL_LINUX=y
 CT_LINUX_V_3_2=y
-CT_LIBC_GLIBC=y
 # CT_KERNEL_LINUX_INSTALL_CHECK is not set
 CT_GLIBC_V_2_15=y
 CT_CC_LANG_CXX=y
diff --git a/samples/i686-ubuntu14.04-linux-gnu/crosstool.config b/samples/i686-ubuntu14.04-linux-gnu/crosstool.config
index 51faa33e..339c4c69 100644
--- a/samples/i686-ubuntu14.04-linux-gnu/crosstool.config
+++ b/samples/i686-ubuntu14.04-linux-gnu/crosstool.config
@@ -4,7 +4,6 @@ CT_ARCH_ARCH="i686"
 CT_TARGET_VENDOR="ubuntu14.04"
 CT_KERNEL_LINUX=y
 CT_LINUX_V_3_13=y
-CT_LIBC_GLIBC=y
 # CT_KERNEL_LINUX_INSTALL_CHECK is not set
 CT_GLIBC_V_2_19=y
 CT_CC_LANG_CXX=y
diff --git a/samples/i686-ubuntu16.04-linux-gnu/crosstool.config b/samples/i686-ubuntu16.04-linux-gnu/crosstool.config
index defdf532..e7f381eb 100644
--- a/samples/i686-ubuntu16.04-linux-gnu/crosstool.config
+++ b/samples/i686-ubuntu16.04-linux-gnu/crosstool.config
@@ -4,7 +4,6 @@ CT_ARCH_ARCH="i686"
 CT_TARGET_VENDOR="ubuntu16.04"
 CT_KERNEL_LINUX=y
 CT_LINUX_V_4_4=y
-CT_LIBC_GLIBC=y
 # CT_KERNEL_LINUX_INSTALL_CHECK is not set
 CT_GLIBC_V_2_23=y
 CT_CC_LANG_CXX=y
diff --git a/samples/mips-ar2315-linux-gnu/crosstool.config b/samples/mips-ar2315-linux-gnu/crosstool.config
index bd0a3603..f9e79d7e 100644
--- a/samples/mips-ar2315-linux-gnu/crosstool.config
+++ b/samples/mips-ar2315-linux-gnu/crosstool.config
@@ -1,11 +1,10 @@
 CT_ARCH_MIPS=y
-CT_ARCH_ARCH="4kc"
 CT_ARCH_TUNE="4kc"
+CT_ARCH_ARCH="4kc"
 CT_ARCH_FLOAT_SW=y
 CT_TARGET_VENDOR="ar2315"
 CT_KERNEL_LINUX=y
 CT_BINUTILS_PLUGINS=y
-CT_LIBC_GLIBC=y
 CT_CC_GCC_mips_plt=y
 CT_CC_LANG_CXX=y
 CT_DEBUG_GDB=y
diff --git a/samples/mips-malta-linux-gnu/crosstool.config b/samples/mips-malta-linux-gnu/crosstool.config
index 92b3a1af..a0639080 100644
--- a/samples/mips-malta-linux-gnu/crosstool.config
+++ b/samples/mips-malta-linux-gnu/crosstool.config
@@ -2,7 +2,6 @@ CT_ARCH_MIPS=y
 CT_TARGET_VENDOR="malta"
 CT_KERNEL_LINUX=y
 CT_BINUTILS_PLUGINS=y
-CT_LIBC_GLIBC=y
 CT_CC_GCC_mips_plt=y
 CT_CC_LANG_CXX=y
 CT_DEBUG_GDB=y
diff --git a/samples/mips-unknown-linux-uclibc/crosstool.config b/samples/mips-unknown-linux-uclibc/crosstool.config
index b56e9c13..a4cd5ce0 100644
--- a/samples/mips-unknown-linux-uclibc/crosstool.config
+++ b/samples/mips-unknown-linux-uclibc/crosstool.config
@@ -4,7 +4,6 @@ CT_ARCH_FLOAT_SW=y
 CT_KERNEL_LINUX=y
 CT_BINUTILS_PLUGINS=y
 CT_LIBC_UCLIBC=y
-CT_LIBC_UCLIBC_WCHAR=y
 CT_CC_GCC_mips_plt=y
 CT_CC_LANG_CXX=y
 CT_DEBUG_DUMA=y
diff --git a/samples/mipsel-multilib-linux-gnu/crosstool.config b/samples/mipsel-multilib-linux-gnu/crosstool.config
index 02a26b7f..9257801c 100644
--- a/samples/mipsel-multilib-linux-gnu/crosstool.config
+++ b/samples/mipsel-multilib-linux-gnu/crosstool.config
@@ -5,7 +5,6 @@ CT_ARCH_FLOAT_SW=y
 CT_TARGET_VENDOR="multilib"
 CT_KERNEL_LINUX=y
 CT_BINUTILS_PLUGINS=y
-CT_LIBC_GLIBC=y
 CT_CC_GCC_CORE_EXTRA_CONFIG_ARRAY="--enable-targets=all"
 CT_CC_GCC_EXTRA_CONFIG_ARRAY="--enable-targets=all"
 CT_CC_GCC_mips_plt=y
diff --git a/samples/mipsel-unknown-linux-gnu/crosstool.config b/samples/mipsel-unknown-linux-gnu/crosstool.config
index af4aa6da..5458b7e7 100644
--- a/samples/mipsel-unknown-linux-gnu/crosstool.config
+++ b/samples/mipsel-unknown-linux-gnu/crosstool.config
@@ -4,7 +4,6 @@ CT_ARCH_ARCH="mips1"
 CT_ARCH_FLOAT_SW=y
 CT_KERNEL_LINUX=y
 CT_BINUTILS_PLUGINS=y
-CT_LIBC_GLIBC=y
 CT_CC_GCC_mips_plt=y
 CT_CC_LANG_CXX=y
 CT_DEBUG_DUMA=y
diff --git a/samples/powerpc-e500v2-linux-gnuspe/crosstool.config b/samples/powerpc-e500v2-linux-gnuspe/crosstool.config
index 7f8f5d79..aab2632e 100644
--- a/samples/powerpc-e500v2-linux-gnuspe/crosstool.config
+++ b/samples/powerpc-e500v2-linux-gnuspe/crosstool.config
@@ -1,8 +1,8 @@
 CT_ARCH_POWERPC=y
 CT_ARCH_CPU="8548"
+CT_ARCH_powerpc_ABI_SPE=y
 CT_ARCH_FLOAT_SW=y
 CT_TARGET_CFLAGS="-mfloat-gprs=double -Wa,-me500x2"
-CT_ARCH_powerpc_ABI_SPE=y
 CT_TARGET_VENDOR="e500v2"
 CT_KERNEL_LINUX=y
 CT_BINUTILS_EXTRA_CONFIG_ARRAY="--enable-spe=yes --enable-e500x2 --with-e500x2"
diff --git a/samples/powerpc-unknown-linux-uclibc/crosstool.config b/samples/powerpc-unknown-linux-uclibc/crosstool.config
index 1236c7fc..e0f6dcbb 100644
--- a/samples/powerpc-unknown-linux-uclibc/crosstool.config
+++ b/samples/powerpc-unknown-linux-uclibc/crosstool.config
@@ -3,7 +3,6 @@ CT_ARCH_FLOAT_SW=y
 CT_KERNEL_LINUX=y
 CT_BINUTILS_FOR_TARGET=y
 CT_LIBC_UCLIBC=y
-CT_LIBC_UCLIBC_WCHAR=y
 CT_CC_LANG_CXX=y
 CT_CC_LANG_FORTRAN=y
 CT_DEBUG_DUMA=y
diff --git a/samples/sparc-leon-linux-uclibc/crosstool.config b/samples/sparc-leon-linux-uclibc/crosstool.config
index 2b8e005e..26d3cbd0 100644
--- a/samples/sparc-leon-linux-uclibc/crosstool.config
+++ b/samples/sparc-leon-linux-uclibc/crosstool.config
@@ -8,7 +8,6 @@ CT_LINUX_V_3_10=y
 CT_LIBC_UCLIBC=y
 CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/samples/${CT_TARGET}/uClibc.config"
 CT_LIBC_UCLIBC_IPV6=y
-CT_LIBC_UCLIBC_WCHAR=y
 CT_GCC_V_6_3_0=y
 CT_CC_GCC_EXTRA_CONFIG_ARRAY="--disable-libitm"
 CT_CC_LANG_CXX=y
diff --git a/samples/x86_64-centos6-linux-gnu/crosstool.config b/samples/x86_64-centos6-linux-gnu/crosstool.config
index ff2a2f2b..6f0c10ff 100644
--- a/samples/x86_64-centos6-linux-gnu/crosstool.config
+++ b/samples/x86_64-centos6-linux-gnu/crosstool.config
@@ -4,7 +4,6 @@ CT_ARCH_64=y
 CT_TARGET_VENDOR="centos6"
 CT_KERNEL_LINUX=y
 CT_LINUX_V_2_6_32=y
-CT_LIBC_GLIBC=y
 # CT_KERNEL_LINUX_INSTALL_CHECK is not set
 CT_GLIBC_V_2_12_2=y
 CT_CC_LANG_CXX=y
diff --git a/samples/x86_64-centos7-linux-gnu/crosstool.config b/samples/x86_64-centos7-linux-gnu/crosstool.config
index 21a02bba..9d16c9e1 100644
--- a/samples/x86_64-centos7-linux-gnu/crosstool.config
+++ b/samples/x86_64-centos7-linux-gnu/crosstool.config
@@ -4,7 +4,6 @@ CT_ARCH_64=y
 CT_TARGET_VENDOR="centos7"
 CT_KERNEL_LINUX=y
 CT_LINUX_V_3_10=y
-CT_LIBC_GLIBC=y
 # CT_KERNEL_LINUX_INSTALL_CHECK is not set
 CT_GLIBC_V_2_17=y
 CT_CC_LANG_CXX=y
diff --git a/samples/x86_64-multilib-linux-gnu/crosstool.config b/samples/x86_64-multilib-linux-gnu/crosstool.config
index 8c48504f..5fc177c4 100644
--- a/samples/x86_64-multilib-linux-gnu/crosstool.config
+++ b/samples/x86_64-multilib-linux-gnu/crosstool.config
@@ -7,7 +7,6 @@ CT_BINUTILS_LINKER_LD_GOLD=y
 CT_BINUTILS_GOLD_THREADS=y
 CT_BINUTILS_LD_WRAPPER=y
 CT_BINUTILS_PLUGINS=y
-CT_LIBC_GLIBC=y
 CT_GLIBC_KERNEL_VERSION_NONE=y
 CT_CC_GCC_MULTILIB_LIST="m64,m32,mx32"
 CT_CC_GCC_LNK_HASH_STYLE_BOTH=y
diff --git a/samples/x86_64-multilib-linux-uclibc,powerpc-unknown-elf/crosstool.config b/samples/x86_64-multilib-linux-uclibc,powerpc-unknown-elf/crosstool.config
index 2902e5c2..d5be28f5 100644
--- a/samples/x86_64-multilib-linux-uclibc,powerpc-unknown-elf/crosstool.config
+++ b/samples/x86_64-multilib-linux-uclibc,powerpc-unknown-elf/crosstool.config
@@ -5,7 +5,6 @@ CT_HOST="x86_64-multilib-linux-uclibc"
 CT_BINUTILS_PLUGINS=y
 CT_CC_LANG_CXX=y
 CT_DEBUG_GDB=y
-# CT_GDB_CROSS_PYTHON is not set
 CT_COMP_TOOLS_FOR_HOST=y
 CT_COMP_TOOLS_M4=y
 CT_COMP_TOOLS_MAKE=y
diff --git a/samples/x86_64-multilib-linux-uclibc/crosstool.config b/samples/x86_64-multilib-linux-uclibc/crosstool.config
index 1be0259b..4e08f7cd 100644
--- a/samples/x86_64-multilib-linux-uclibc/crosstool.config
+++ b/samples/x86_64-multilib-linux-uclibc/crosstool.config
@@ -9,7 +9,6 @@ CT_BINUTILS_GOLD_THREADS=y
 CT_BINUTILS_LD_WRAPPER=y
 CT_BINUTILS_PLUGINS=y
 CT_LIBC_UCLIBC=y
-CT_LIBC_UCLIBC_WCHAR=y
 CT_CC_LANG_CXX=y
 CT_DEBUG_DUMA=y
 CT_DEBUG_GDB=y
diff --git a/samples/x86_64-ubuntu12.04-linux-gnu/crosstool.config b/samples/x86_64-ubuntu12.04-linux-gnu/crosstool.config
index f6ca1d4d..f71ad6da 100644
--- a/samples/x86_64-ubuntu12.04-linux-gnu/crosstool.config
+++ b/samples/x86_64-ubuntu12.04-linux-gnu/crosstool.config
@@ -4,7 +4,6 @@ CT_ARCH_64=y
 CT_TARGET_VENDOR="ubuntu12.04"
 CT_KERNEL_LINUX=y
 CT_LINUX_V_3_2=y
-CT_LIBC_GLIBC=y
 # CT_KERNEL_LINUX_INSTALL_CHECK is not set
 CT_GLIBC_V_2_15=y
 CT_CC_LANG_CXX=y
diff --git a/samples/x86_64-ubuntu14.04-linux-gnu/crosstool.config b/samples/x86_64-ubuntu14.04-linux-gnu/crosstool.config
index aef684e6..e7bfcd3d 100644
--- a/samples/x86_64-ubuntu14.04-linux-gnu/crosstool.config
+++ b/samples/x86_64-ubuntu14.04-linux-gnu/crosstool.config
@@ -4,7 +4,6 @@ CT_ARCH_64=y
 CT_TARGET_VENDOR="ubuntu14.04"
 CT_KERNEL_LINUX=y
 CT_LINUX_V_3_13=y
-CT_LIBC_GLIBC=y
 # CT_KERNEL_LINUX_INSTALL_CHECK is not set
 CT_GLIBC_V_2_19=y
 CT_CC_LANG_CXX=y
diff --git a/samples/x86_64-ubuntu16.04-linux-gnu/crosstool.config b/samples/x86_64-ubuntu16.04-linux-gnu/crosstool.config
index 957a96c4..2a7fc1d2 100644
--- a/samples/x86_64-ubuntu16.04-linux-gnu/crosstool.config
+++ b/samples/x86_64-ubuntu16.04-linux-gnu/crosstool.config
@@ -4,7 +4,6 @@ CT_ARCH_64=y
 CT_TARGET_VENDOR="ubuntu16.04"
 CT_KERNEL_LINUX=y
 CT_LINUX_V_4_4=y
-CT_LIBC_GLIBC=y
 # CT_KERNEL_LINUX_INSTALL_CHECK is not set
 CT_GLIBC_V_2_23=y
 CT_CC_LANG_CXX=y
diff --git a/samples/x86_64-unknown-linux-gnu/crosstool.config b/samples/x86_64-unknown-linux-gnu/crosstool.config
index c7a5d0d1..c3518a17 100644
--- a/samples/x86_64-unknown-linux-gnu/crosstool.config
+++ b/samples/x86_64-unknown-linux-gnu/crosstool.config
@@ -5,7 +5,6 @@ CT_BINUTILS_LINKER_LD_GOLD=y
 CT_BINUTILS_GOLD_THREADS=y
 CT_BINUTILS_LD_WRAPPER=y
 CT_BINUTILS_PLUGINS=y
-CT_LIBC_GLIBC=y
 CT_GLIBC_KERNEL_VERSION_NONE=y
 CT_CC_GCC_LNK_HASH_STYLE_BOTH=y
 CT_CC_LANG_CXX=y
diff --git a/samples/x86_64-unknown-linux-uclibc/crosstool.config b/samples/x86_64-unknown-linux-uclibc/crosstool.config
index a60163c5..6b2eb170 100644
--- a/samples/x86_64-unknown-linux-uclibc/crosstool.config
+++ b/samples/x86_64-unknown-linux-uclibc/crosstool.config
@@ -7,7 +7,6 @@ CT_BINUTILS_GOLD_THREADS=y
 CT_BINUTILS_LD_WRAPPER=y
 CT_BINUTILS_PLUGINS=y
 CT_LIBC_UCLIBC=y
-CT_LIBC_UCLIBC_WCHAR=y
 CT_CC_LANG_CXX=y
 CT_DEBUG_DUMA=y
 CT_DEBUG_GDB=y
diff --git a/samples/x86_64-w64-mingw32,arm-cortexa9_neon-linux-gnueabihf/crosstool.config b/samples/x86_64-w64-mingw32,arm-cortexa9_neon-linux-gnueabihf/crosstool.config
index c249088f..2fc67d97 100644
--- a/samples/x86_64-w64-mingw32,arm-cortexa9_neon-linux-gnueabihf/crosstool.config
+++ b/samples/x86_64-w64-mingw32,arm-cortexa9_neon-linux-gnueabihf/crosstool.config
@@ -18,6 +18,5 @@ CT_GLIBC_KERNEL_VERSION_NONE=y
 # CT_CC_GCC_ENABLE_TARGET_OPTSPACE is not set
 CT_CC_LANG_CXX=y
 CT_DEBUG_GDB=y
-# CT_GDB_CROSS_PYTHON is not set
 CT_GDB_NATIVE=y
 CT_GDB_NATIVE_STATIC=y
diff --git a/samples/xtensa-fsf-linux-uclibc/crosstool.config b/samples/xtensa-fsf-linux-uclibc/crosstool.config
index 66c1dedf..92f03889 100644
--- a/samples/xtensa-fsf-linux-uclibc/crosstool.config
+++ b/samples/xtensa-fsf-linux-uclibc/crosstool.config
@@ -4,6 +4,5 @@ CT_TARGET_CFLAGS="-mlongcalls -mtext-section-literals"
 CT_TARGET_VENDOR="fsf"
 CT_KERNEL_LINUX=y
 CT_LIBC_UCLIBC=y
-CT_LIBC_UCLIBC_WCHAR=y
 CT_CC_LANG_CXX=y
 CT_DEBUG_GDB=y