Fix the references to old config variables

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

22 files changed, 36 insertions, 43 deletions

diff --git a/samples/aarch64-unknown-linux-android/crosstool.config b/samples/aarch64-unknown-linux-android/crosstool.config
index 295b219..aa49e31 100644
--- a/samples/aarch64-unknown-linux-android/crosstool.config
+++ b/samples/aarch64-unknown-linux-android/crosstool.config
@@ -4,7 +4,7 @@ CT_ARCH_64=y
 CT_ARCH_ARCH="armv8-a"
 CT_STATIC_TOOLCHAIN=y
 CT_KERNEL_linux=y
-CT_LIBC_BIONIC_V_14b=y
+CT_BIONIC_V_14b=y
 CT_ANDROID_API_21=y
 CT_CC_LANG_CXX=y
 CT_DEBUG_gdb=y
diff --git a/samples/arm-cortex_a15-linux-gnueabihf/crosstool.config b/samples/arm-cortex_a15-linux-gnueabihf/crosstool.config
index 76174b6..3f948f8 100644
--- a/samples/arm-cortex_a15-linux-gnueabihf/crosstool.config
+++ b/samples/arm-cortex_a15-linux-gnueabihf/crosstool.config
@@ -9,7 +9,6 @@ CT_BINUTILS_GOLD_THREADS=y
 CT_BINUTILS_LD_WRAPPER=y
 CT_BINUTILS_PLUGINS=y
 CT_LIBC_glibc=y
-CT_CC_GCC_SHOW_LINARO=y
 CT_CC_LANG_CXX=y
 CT_DEBUG_duma=y
 CT_DEBUG_gdb=y
diff --git a/samples/arm-cortexa9_neon-linux-gnueabihf/crosstool.config b/samples/arm-cortexa9_neon-linux-gnueabihf/crosstool.config
index f5a57dd..f34570c 100644
--- a/samples/arm-cortexa9_neon-linux-gnueabihf/crosstool.config
+++ b/samples/arm-cortexa9_neon-linux-gnueabihf/crosstool.config
@@ -11,10 +11,9 @@ CT_BINUTILS_GOLD_THREADS=y
 CT_BINUTILS_LD_WRAPPER=y
 CT_BINUTILS_PLUGINS=y
 CT_LIBC_glibc=y
-CT_LIBC_ADDONS_LIST="libidn"
-CT_LIBC_LOCALES=y
-CT_LIBC_GLIBC_KERNEL_VERSION_NONE=y
-CT_CC_GCC_SHOW_LINARO=y
+CT_GLIBC_USE_LIBIDN_ADDON=y
+CT_GLIBC_LOCALES=y
+CT_GLIBC_KERNEL_VERSION_NONE=y
 # CT_CC_GCC_ENABLE_TARGET_OPTSPACE is not set
 CT_CC_LANG_CXX=y
 CT_DEBUG_gdb=y
diff --git a/samples/armv6-nommu-linux-uclibcgnueabi/crosstool.config b/samples/armv6-nommu-linux-uclibcgnueabi/crosstool.config
index 398a550..8e7e00c 100644
--- a/samples/armv6-nommu-linux-uclibcgnueabi/crosstool.config
+++ b/samples/armv6-nommu-linux-uclibcgnueabi/crosstool.config
@@ -7,7 +7,6 @@ CT_KERNEL_linux=y
 # CT_KERNEL_LINUX_INSTALL_CHECK is not set
 CT_BINUTILS_PLUGINS=y
 CT_THREADS_NONE=y
-CT_CC_GCC_SHOW_LINARO=y
 CT_CC_GCC_DISABLE_PCH=y
 CT_CC_GCC_BUILD_ID=y
 CT_CC_GCC_LNK_HASH_STYLE_BOTH=y
diff --git a/samples/armv6-rpi-linux-gnueabi/crosstool.config b/samples/armv6-rpi-linux-gnueabi/crosstool.config
index 22fbfaa..c67c8d8 100644
--- a/samples/armv6-rpi-linux-gnueabi/crosstool.config
+++ b/samples/armv6-rpi-linux-gnueabi/crosstool.config
@@ -4,16 +4,15 @@ CT_ARCH_CPU="arm1176jzf-s"
 CT_ARCH_FPU="vfp"
 CT_TARGET_VENDOR="rpi"
 CT_KERNEL_linux=y
-CT_KERNEL_V_3_12=y
+CT_LINUX_V_3_12=y
 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_LIBC_LOCALES=y
-CT_LIBC_GLIBC_KERNEL_VERSION_CHOSEN=y
-CT_LIBC_GLIBC_MIN_KERNEL_VERSION="3.2.27"
-CT_CC_GCC_SHOW_LINARO=y
+CT_GLIBC_LOCALES=y
+CT_GLIBC_KERNEL_VERSION_CHOSEN=y
+CT_GLIBC_MIN_KERNEL_VERSION="3.2.27"
 CT_CC_GCC_DISABLE_PCH=y
 CT_CC_GCC_BUILD_ID=y
 CT_CC_GCC_LNK_HASH_STYLE_BOTH=y
diff --git a/samples/i686-centos6-linux-gnu/crosstool.config b/samples/i686-centos6-linux-gnu/crosstool.config
index 86ec1f6..255b877 100644
--- a/samples/i686-centos6-linux-gnu/crosstool.config
+++ b/samples/i686-centos6-linux-gnu/crosstool.config
@@ -3,8 +3,8 @@ CT_ARCH_x86=y
 CT_ARCH_ARCH="i686"
 CT_TARGET_VENDOR="centos6"
 CT_KERNEL_linux=y
-CT_KERNEL_V_2_6_32=y
+CT_LINUX_V_2_6_32=y
 CT_LIBC_glibc=y
 # CT_KERNEL_LINUX_INSTALL_CHECK is not set
-CT_LIBC_GLIBC_V_2_12_2=y
+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 b6403bb..6d524d6 100644
--- a/samples/i686-centos7-linux-gnu/crosstool.config
+++ b/samples/i686-centos7-linux-gnu/crosstool.config
@@ -3,8 +3,8 @@ CT_ARCH_x86=y
 CT_ARCH_ARCH="i686"
 CT_TARGET_VENDOR="centos7"
 CT_KERNEL_linux=y
-CT_KERNEL_V_3_10=y
+CT_LINUX_V_3_10=y
 CT_LIBC_glibc=y
 # CT_KERNEL_LINUX_INSTALL_CHECK is not set
-CT_LIBC_GLIBC_V_2_17=y
+CT_GLIBC_V_2_17=y
 CT_CC_LANG_CXX=y
diff --git a/samples/i686-ubuntu12.04-linux-gnu/crosstool.config b/samples/i686-ubuntu12.04-linux-gnu/crosstool.config
index 01c4312..320b091 100644
--- a/samples/i686-ubuntu12.04-linux-gnu/crosstool.config
+++ b/samples/i686-ubuntu12.04-linux-gnu/crosstool.config
@@ -3,8 +3,8 @@ CT_ARCH_x86=y
 CT_ARCH_ARCH="i686"
 CT_TARGET_VENDOR="ubuntu12.04"
 CT_KERNEL_linux=y
-CT_KERNEL_V_3_2=y
+CT_LINUX_V_3_2=y
 CT_LIBC_glibc=y
 # CT_KERNEL_LINUX_INSTALL_CHECK is not set
-CT_LIBC_GLIBC_V_2_15=y
+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 e3f459b..016f85d 100644
--- a/samples/i686-ubuntu14.04-linux-gnu/crosstool.config
+++ b/samples/i686-ubuntu14.04-linux-gnu/crosstool.config
@@ -3,8 +3,8 @@ CT_ARCH_x86=y
 CT_ARCH_ARCH="i686"
 CT_TARGET_VENDOR="ubuntu14.04"
 CT_KERNEL_linux=y
-CT_KERNEL_V_3_13=y
+CT_LINUX_V_3_13=y
 CT_LIBC_glibc=y
 # CT_KERNEL_LINUX_INSTALL_CHECK is not set
-CT_LIBC_GLIBC_V_2_19=y
+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 9eec3c1..e9b0d9c 100644
--- a/samples/i686-ubuntu16.04-linux-gnu/crosstool.config
+++ b/samples/i686-ubuntu16.04-linux-gnu/crosstool.config
@@ -3,8 +3,8 @@ CT_ARCH_x86=y
 CT_ARCH_ARCH="i686"
 CT_TARGET_VENDOR="ubuntu16.04"
 CT_KERNEL_linux=y
-CT_KERNEL_V_4_4=y
+CT_LINUX_V_4_4=y
 CT_LIBC_glibc=y
 # CT_KERNEL_LINUX_INSTALL_CHECK is not set
-CT_LIBC_GLIBC_V_2_23=y
+CT_GLIBC_V_2_23=y
 CT_CC_LANG_CXX=y
diff --git a/samples/powerpc-860-linux-gnu/crosstool.config b/samples/powerpc-860-linux-gnu/crosstool.config
index eae5f91..b6d3a46 100644
--- a/samples/powerpc-860-linux-gnu/crosstool.config
+++ b/samples/powerpc-860-linux-gnu/crosstool.config
@@ -4,7 +4,7 @@ CT_ARCH_FLOAT_SW=y
 CT_TARGET_VENDOR="860"
 CT_KERNEL_linux=y
 CT_BINUTILS_PLUGINS=y
-CT_LIBC_GLIBC_EXTRA_CONFIG_ARRAY="--without-fp"
+CT_GLIBC_EXTRA_CONFIG_ARRAY="--without-fp"
 CT_CC_LANG_CXX=y
 CT_DEBUG_gdb=y
 # CT_GDB_CROSS_PYTHON is not set
diff --git a/samples/powerpc-e500v2-linux-gnuspe/crosstool.config b/samples/powerpc-e500v2-linux-gnuspe/crosstool.config
index d05e2b4..b86bf27 100644
--- a/samples/powerpc-e500v2-linux-gnuspe/crosstool.config
+++ b/samples/powerpc-e500v2-linux-gnuspe/crosstool.config
@@ -6,7 +6,6 @@ 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"
-CT_CC_GCC_SHOW_LINARO=y
 CT_CC_GCC_CORE_EXTRA_CONFIG_ARRAY="--enable-e500_double"
 CT_CC_GCC_EXTRA_CONFIG_ARRAY="--enable-e500_double"
 # CT_CC_GCC_ENABLE_TARGET_OPTSPACE is not set
diff --git a/samples/sh4-multilib-linux-uclibc/crosstool.config b/samples/sh4-multilib-linux-uclibc/crosstool.config
index 2c61643..c3c6eda 100644
--- a/samples/sh4-multilib-linux-uclibc/crosstool.config
+++ b/samples/sh4-multilib-linux-uclibc/crosstool.config
@@ -4,7 +4,6 @@ CT_TARGET_VENDOR="multilib"
 CT_KERNEL_linux=y
 CT_BINUTILS_PLUGINS=y
 CT_LIBC_uClibc=y
-CT_CC_GCC_V_4_9_4=y
 CT_CC_GCC_MULTILIB_LIST="m4a,m3"
 CT_CC_LANG_CXX=y
 CT_DEBUG_gdb=y
diff --git a/samples/sparc-leon-linux-uclibc/crosstool.config b/samples/sparc-leon-linux-uclibc/crosstool.config
index 02c346d..016cf69 100644
--- a/samples/sparc-leon-linux-uclibc/crosstool.config
+++ b/samples/sparc-leon-linux-uclibc/crosstool.config
@@ -4,12 +4,12 @@ CT_ARCH_TUNE="leon"
 CT_ARCH_FLOAT_SW=y
 CT_TARGET_VENDOR="leon"
 CT_KERNEL_linux=y
-CT_KERNEL_V_3_10=y
+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_CC_GCC_V_6_3_0=y
+CT_GCC_V_6_3_0=y
 CT_CC_GCC_EXTRA_CONFIG_ARRAY="--disable-libitm"
 CT_CC_LANG_CXX=y
 CT_DEBUG_gdb=y
diff --git a/samples/x86_64-centos6-linux-gnu/crosstool.config b/samples/x86_64-centos6-linux-gnu/crosstool.config
index ad84a6c..a2375a4 100644
--- a/samples/x86_64-centos6-linux-gnu/crosstool.config
+++ b/samples/x86_64-centos6-linux-gnu/crosstool.config
@@ -3,8 +3,8 @@ CT_ARCH_x86=y
 CT_ARCH_64=y
 CT_TARGET_VENDOR="centos6"
 CT_KERNEL_linux=y
-CT_KERNEL_V_2_6_32=y
+CT_LINUX_V_2_6_32=y
 CT_LIBC_glibc=y
 # CT_KERNEL_LINUX_INSTALL_CHECK is not set
-CT_LIBC_GLIBC_V_2_12_2=y
+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 8ca023c..db00ebb 100644
--- a/samples/x86_64-centos7-linux-gnu/crosstool.config
+++ b/samples/x86_64-centos7-linux-gnu/crosstool.config
@@ -3,8 +3,8 @@ CT_ARCH_x86=y
 CT_ARCH_64=y
 CT_TARGET_VENDOR="centos7"
 CT_KERNEL_linux=y
-CT_KERNEL_V_3_10=y
+CT_LINUX_V_3_10=y
 CT_LIBC_glibc=y
 # CT_KERNEL_LINUX_INSTALL_CHECK is not set
-CT_LIBC_GLIBC_V_2_17=y
+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 d3e5b63..dabac91 100644
--- a/samples/x86_64-multilib-linux-gnu/crosstool.config
+++ b/samples/x86_64-multilib-linux-gnu/crosstool.config
@@ -8,7 +8,7 @@ CT_BINUTILS_GOLD_THREADS=y
 CT_BINUTILS_LD_WRAPPER=y
 CT_BINUTILS_PLUGINS=y
 CT_LIBC_glibc=y
-CT_LIBC_GLIBC_KERNEL_VERSION_NONE=y
+CT_GLIBC_KERNEL_VERSION_NONE=y
 CT_CC_GCC_MULTILIB_LIST="m64,m32,mx32"
 CT_CC_GCC_LNK_HASH_STYLE_BOTH=y
 CT_CC_LANG_CXX=y
diff --git a/samples/x86_64-ubuntu12.04-linux-gnu/crosstool.config b/samples/x86_64-ubuntu12.04-linux-gnu/crosstool.config
index 3e2bc3f..0a177e9 100644
--- a/samples/x86_64-ubuntu12.04-linux-gnu/crosstool.config
+++ b/samples/x86_64-ubuntu12.04-linux-gnu/crosstool.config
@@ -3,8 +3,8 @@ CT_ARCH_x86=y
 CT_ARCH_64=y
 CT_TARGET_VENDOR="ubuntu12.04"
 CT_KERNEL_linux=y
-CT_KERNEL_V_3_2=y
+CT_LINUX_V_3_2=y
 CT_LIBC_glibc=y
 # CT_KERNEL_LINUX_INSTALL_CHECK is not set
-CT_LIBC_GLIBC_V_2_15=y
+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 4aa16c7..234d950 100644
--- a/samples/x86_64-ubuntu14.04-linux-gnu/crosstool.config
+++ b/samples/x86_64-ubuntu14.04-linux-gnu/crosstool.config
@@ -3,8 +3,8 @@ CT_ARCH_x86=y
 CT_ARCH_64=y
 CT_TARGET_VENDOR="ubuntu14.04"
 CT_KERNEL_linux=y
-CT_KERNEL_V_3_13=y
+CT_LINUX_V_3_13=y
 CT_LIBC_glibc=y
 # CT_KERNEL_LINUX_INSTALL_CHECK is not set
-CT_LIBC_GLIBC_V_2_19=y
+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 37be385..220f818 100644
--- a/samples/x86_64-ubuntu16.04-linux-gnu/crosstool.config
+++ b/samples/x86_64-ubuntu16.04-linux-gnu/crosstool.config
@@ -3,8 +3,8 @@ CT_ARCH_x86=y
 CT_ARCH_64=y
 CT_TARGET_VENDOR="ubuntu16.04"
 CT_KERNEL_linux=y
-CT_KERNEL_V_4_4=y
+CT_LINUX_V_4_4=y
 CT_LIBC_glibc=y
 # CT_KERNEL_LINUX_INSTALL_CHECK is not set
-CT_LIBC_GLIBC_V_2_23=y
+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 3f7c338..a499b61 100644
--- a/samples/x86_64-unknown-linux-gnu/crosstool.config
+++ b/samples/x86_64-unknown-linux-gnu/crosstool.config
@@ -6,7 +6,7 @@ CT_BINUTILS_GOLD_THREADS=y
 CT_BINUTILS_LD_WRAPPER=y
 CT_BINUTILS_PLUGINS=y
 CT_LIBC_glibc=y
-CT_LIBC_GLIBC_KERNEL_VERSION_NONE=y
+CT_GLIBC_KERNEL_VERSION_NONE=y
 CT_CC_GCC_LNK_HASH_STYLE_BOTH=y
 CT_CC_LANG_CXX=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 34d1ea1..3d8cc41 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
@@ -12,10 +12,9 @@ CT_BINUTILS_LINKER_LD_GOLD=y
 CT_BINUTILS_GOLD_THREADS=y
 CT_BINUTILS_LD_WRAPPER=y
 CT_LIBC_glibc=y
-CT_LIBC_ADDONS_LIST="libidn"
-CT_LIBC_LOCALES=y
-CT_LIBC_GLIBC_KERNEL_VERSION_NONE=y
-CT_CC_GCC_SHOW_LINARO=y
+CT_GLIBC_USE_LIBIDN_ADDON=y
+CT_GLIBC_LOCALES=y
+CT_GLIBC_KERNEL_VERSION_NONE=y
 # CT_CC_GCC_ENABLE_TARGET_OPTSPACE is not set
 CT_CC_LANG_CXX=y
 CT_DEBUG_gdb=y