Kconfigize choice/menu items

Also, add a poor man's upgrade script.

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

87 files changed, 338 insertions, 310 deletions

diff --git a/bootstrap b/bootstrap
index 0347db9..280af88 100755
--- a/bootstrap
+++ b/bootstrap
@@ -579,7 +579,7 @@ enter_choice()
     # 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]
     info[choice]="${choice}"
-    info[has_part2]="${p2}"
+    info[kcfg_choice]=`kconfigize "${choice}"`
 
     # Not local, we need these arrays be set in enter_dependency/enter_help
     deplines=( )
diff --git a/kconfig/kconfig.mk b/kconfig/kconfig.mk
index c82e502..ec0cd8a 100644
--- a/kconfig/kconfig.mk
+++ b/kconfig/kconfig.mk
@@ -26,6 +26,7 @@ nconfig:
 
 oldconfig: .config
 	@$(CT_ECHO) "  CONF  $@"
+	$(SILENT)$(sed) -i -r -f $(CT_LIB_DIR)/scripts/upgrade.sed $<
 	$(SILENT)$(CONF) --silent$@ $(KCONFIG_TOP)
 
 savedefconfig: .config
diff --git a/maintainer/kconfig-choice.template b/maintainer/kconfig-choice.template
index cfb5285..12ea12c 100644
--- a/maintainer/kconfig-choice.template
+++ b/maintainer/kconfig-choice.template
@@ -6,7 +6,7 @@ choice GEN_CHOICE_@@prefix@@
     bool "@@label@@"
 
 #!foreach choice
-config @@prefix@@_@@choice@@
+config @@prefix@@_@@kcfg_choice@@
     bool "@@choice@@"
 #!foreach dependency
     @@depline@@
@@ -22,11 +22,11 @@ endchoice
 config @@prefix@@
     string
 #!foreach choice
-    default "@@choice@@" if @@prefix@@_@@choice@@
+    default "@@choice@@" if @@prefix@@_@@kcfg_choice@@
 #!end-foreach
 
 #!foreach choice
-if @@prefix@@_@@choice@@
+if @@prefix@@_@@kcfg_choice@@
 source "config/@@dir@@/@@choice@@.in"
 endif
 #!end-foreach
diff --git a/maintainer/kconfig-menu.template b/maintainer/kconfig-menu.template
index e079a6b..12b9f2b 100644
--- a/maintainer/kconfig-menu.template
+++ b/maintainer/kconfig-menu.template
@@ -3,7 +3,7 @@
 #
 
 #!foreach choice
-menuconfig @@prefix@@_@@choice@@
+menuconfig @@prefix@@_@@kcfg_choice@@
     bool "@@choice@@"
 #!foreach dependency
     @@depline@@
@@ -13,7 +13,7 @@ menuconfig @@prefix@@_@@choice@@
       @@helpline@@
 #!end-foreach
 
-if @@prefix@@_@@choice@@
+if @@prefix@@_@@kcfg_choice@@
 source "config/@@dir@@/@@choice@@.in"
 endif
 
diff --git a/samples/aarch64-rpi3-linux-gnu/crosstool.config b/samples/aarch64-rpi3-linux-gnu/crosstool.config
index 01605ac..6aed7bb 100644
--- a/samples/aarch64-rpi3-linux-gnu/crosstool.config
+++ b/samples/aarch64-rpi3-linux-gnu/crosstool.config
@@ -1,11 +1,11 @@
-CT_ARCH_arm=y
+CT_ARCH_ARM=y
 CT_ARCH_64=y
 CT_ARCH_CPU="cortex-a53"
 CT_TARGET_VENDOR="rpi3"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
 CT_BINUTILS_LINKER_LD_GOLD=y
 CT_BINUTILS_GOLD_THREADS=y
 CT_BINUTILS_LD_WRAPPER=y
 CT_BINUTILS_PLUGINS=y
 CT_CC_LANG_CXX=y
-CT_DEBUG_gdb=y
+CT_DEBUG_GDB=y
diff --git a/samples/aarch64-unknown-linux-android/crosstool.config b/samples/aarch64-unknown-linux-android/crosstool.config
index aa49e31..76e3647 100644
--- a/samples/aarch64-unknown-linux-android/crosstool.config
+++ b/samples/aarch64-unknown-linux-android/crosstool.config
@@ -1,11 +1,11 @@
 CT_EXPERIMENTAL=y
-CT_ARCH_arm=y
+CT_ARCH_ARM=y
 CT_ARCH_64=y
 CT_ARCH_ARCH="armv8-a"
 CT_STATIC_TOOLCHAIN=y
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
 CT_BIONIC_V_14b=y
 CT_ANDROID_API_21=y
 CT_CC_LANG_CXX=y
-CT_DEBUG_gdb=y
+CT_DEBUG_GDB=y
 CT_GETTEXT=y
diff --git a/samples/aarch64-unknown-linux-gnu/crosstool.config b/samples/aarch64-unknown-linux-gnu/crosstool.config
index e3a393a..898e4e4 100644
--- a/samples/aarch64-unknown-linux-gnu/crosstool.config
+++ b/samples/aarch64-unknown-linux-gnu/crosstool.config
@@ -1,10 +1,10 @@
-CT_ARCH_arm=y
+CT_ARCH_ARM=y
 CT_ARCH_64=y
 CT_TARGET_VENDOR=""
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
 CT_BINUTILS_LINKER_LD_GOLD=y
 CT_BINUTILS_GOLD_THREADS=y
 CT_BINUTILS_LD_WRAPPER=y
 CT_BINUTILS_PLUGINS=y
 CT_CC_LANG_CXX=y
-CT_DEBUG_gdb=y
+CT_DEBUG_GDB=y
diff --git a/samples/aarch64-unknown-linux-uclibc/crosstool.config b/samples/aarch64-unknown-linux-uclibc/crosstool.config
index ebc0524..fdda449 100644
--- a/samples/aarch64-unknown-linux-uclibc/crosstool.config
+++ b/samples/aarch64-unknown-linux-uclibc/crosstool.config
@@ -1,14 +1,14 @@
-CT_ARCH_arm=y
+CT_ARCH_ARM=y
 CT_ARCH_64=y
 CT_TARGET_VENDOR=""
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
 CT_BINUTILS_LINKER_LD_GOLD=y
 CT_BINUTILS_GOLD_THREADS=y
 CT_BINUTILS_LD_WRAPPER=y
 CT_BINUTILS_PLUGINS=y
-CT_LIBC_uClibc=y
+CT_LIBC_UCLIBC=y
 CT_CC_LANG_CXX=y
-CT_DEBUG_gdb=y
+CT_DEBUG_GDB=y
 CT_GDB_NATIVE=y
-CT_DEBUG_strace=y
+CT_DEBUG_STRACE=y
 CT_GETTEXT=y
diff --git a/samples/alphaev56-unknown-linux-gnu/crosstool.config b/samples/alphaev56-unknown-linux-gnu/crosstool.config
index 67a5807..6009163 100644
--- a/samples/alphaev56-unknown-linux-gnu/crosstool.config
+++ b/samples/alphaev56-unknown-linux-gnu/crosstool.config
@@ -1,5 +1,5 @@
 CT_ARCH_CPU="ev56"
 CT_ARCH_ALPHA_EV56=y
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
 CT_BINUTILS_PLUGINS=y
 CT_CC_LANG_CXX=y
diff --git a/samples/alphaev67-unknown-linux-gnu/crosstool.config b/samples/alphaev67-unknown-linux-gnu/crosstool.config
index 41cc753..c50c973 100644
--- a/samples/alphaev67-unknown-linux-gnu/crosstool.config
+++ b/samples/alphaev67-unknown-linux-gnu/crosstool.config
@@ -1,6 +1,6 @@
 CT_ARCH_CPU="ev67"
 CT_ARCH_ALPHA_EV67=y
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
 CT_BINUTILS_PLUGINS=y
 # CT_CC_GCC_ENABLE_TARGET_OPTSPACE is not set
 CT_CC_LANG_CXX=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 c570a1e..1aa9993 100644
--- a/samples/arm-bare_newlib_cortex_m3_nommu-eabi/crosstool.config
+++ b/samples/arm-bare_newlib_cortex_m3_nommu-eabi/crosstool.config
@@ -1,4 +1,4 @@
-CT_ARCH_arm=y
+CT_ARCH_ARM=y
 # CT_ARCH_USE_MMU is not set
 CT_ARCH_CPU="cortex-m3"
 CT_ARCH_FLOAT_SW=y
diff --git a/samples/arm-cortex_a15-linux-gnueabihf/crosstool.config b/samples/arm-cortex_a15-linux-gnueabihf/crosstool.config
index 3f948f8..74a6ef5 100644
--- a/samples/arm-cortex_a15-linux-gnueabihf/crosstool.config
+++ b/samples/arm-cortex_a15-linux-gnueabihf/crosstool.config
@@ -1,17 +1,17 @@
-CT_ARCH_arm=y
+CT_ARCH_ARM=y
 CT_ARCH_CPU="cortex-a15"
 CT_ARCH_FPU="neon-vfpv4"
 CT_ARCH_FLOAT_HW=y
 CT_TARGET_VENDOR="cortex_a15"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=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_GLIBC=y
 CT_CC_LANG_CXX=y
-CT_DEBUG_duma=y
-CT_DEBUG_gdb=y
+CT_DEBUG_DUMA=y
+CT_DEBUG_GDB=y
 # CT_GDB_CROSS_PYTHON is not set
 CT_GDB_NATIVE=y
-CT_DEBUG_strace=y
+CT_DEBUG_STRACE=y
diff --git a/samples/arm-cortex_a8-linux-gnueabi/crosstool.config b/samples/arm-cortex_a8-linux-gnueabi/crosstool.config
index 7b7a74b..bea72b8 100644
--- a/samples/arm-cortex_a8-linux-gnueabi/crosstool.config
+++ b/samples/arm-cortex_a8-linux-gnueabi/crosstool.config
@@ -1,17 +1,17 @@
-CT_ARCH_arm=y
+CT_ARCH_ARM=y
 CT_ARCH_CPU="cortex-a8"
 CT_ARCH_FLOAT_SW=y
 CT_TARGET_VENDOR="cortex_a8"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=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_GLIBC=y
 CT_CC_LANG_CXX=y
-CT_DEBUG_duma=y
-CT_DEBUG_gdb=y
+CT_DEBUG_DUMA=y
+CT_DEBUG_GDB=y
 # CT_GDB_CROSS_PYTHON is not set
 CT_GDB_NATIVE=y
-CT_DEBUG_ltrace=y
-CT_DEBUG_strace=y
+CT_DEBUG_LTRACE=y
+CT_DEBUG_STRACE=y
diff --git a/samples/arm-cortexa5-linux-uclibcgnueabihf/crosstool.config b/samples/arm-cortexa5-linux-uclibcgnueabihf/crosstool.config
index 980d03f..1543eb6 100644
--- a/samples/arm-cortexa5-linux-uclibcgnueabihf/crosstool.config
+++ b/samples/arm-cortexa5-linux-uclibcgnueabihf/crosstool.config
@@ -1,20 +1,20 @@
 CT_EXPERIMENTAL=y
-CT_ARCH_arm=y
+CT_ARCH_ARM=y
 CT_ARCH_CPU="cortex-a5"
 CT_ARCH_FPU="vfpv4-d16"
 CT_ARCH_FLOAT_HW=y
 CT_TARGET_VENDOR="cortexa5"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
 CT_BINUTILS_LINKER_LD_GOLD=y
 CT_BINUTILS_GOLD_THREADS=y
 CT_BINUTILS_LD_WRAPPER=y
 CT_BINUTILS_PLUGINS=y
-CT_LIBC_uClibc=y
+CT_LIBC_UCLIBC=y
 CT_LIBC_UCLIBC_WCHAR=y
 CT_CC_LANG_CXX=y
-CT_DEBUG_duma=y
-CT_DEBUG_gdb=y
+CT_DEBUG_DUMA=y
+CT_DEBUG_GDB=y
 CT_GDB_CROSS_STATIC=y
 CT_GDB_NATIVE=y
-CT_DEBUG_ltrace=y
-CT_DEBUG_strace=y
+CT_DEBUG_LTRACE=y
+CT_DEBUG_STRACE=y
diff --git a/samples/arm-cortexa9_neon-linux-gnueabihf/crosstool.config b/samples/arm-cortexa9_neon-linux-gnueabihf/crosstool.config
index f34570c..83f781f 100644
--- a/samples/arm-cortexa9_neon-linux-gnueabihf/crosstool.config
+++ b/samples/arm-cortexa9_neon-linux-gnueabihf/crosstool.config
@@ -1,22 +1,22 @@
 CT_EXPERIMENTAL=y
-CT_ARCH_arm=y
+CT_ARCH_ARM=y
 CT_ARCH_CPU="cortex-a9"
 CT_ARCH_FPU="neon"
 CT_ARCH_FLOAT_HW=y
 CT_TARGET_VENDOR="cortexa9_neon"
 CT_TOOLCHAIN_ENABLE_NLS=y
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=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_GLIBC=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
+CT_DEBUG_GDB=y
 # CT_GDB_CROSS_PYTHON is not set
 CT_GDB_NATIVE=y
 CT_GDB_NATIVE_STATIC=y
diff --git a/samples/arm-multilib-linux-uclibcgnueabi/crosstool.config b/samples/arm-multilib-linux-uclibcgnueabi/crosstool.config
index 00ac47b..6dc39fa 100644
--- a/samples/arm-multilib-linux-uclibcgnueabi/crosstool.config
+++ b/samples/arm-multilib-linux-uclibcgnueabi/crosstool.config
@@ -1,15 +1,15 @@
-CT_ARCH_arm=y
+CT_ARCH_ARM=y
 CT_MULTILIB=y
 CT_ARCH_FLOAT_SW=y
 CT_TARGET_VENDOR="multilib"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
 # CT_SHARED_LIBS is not set
 CT_BINUTILS_LINKER_LD_GOLD=y
 CT_BINUTILS_GOLD_THREADS=y
 CT_BINUTILS_LD_WRAPPER=y
 CT_BINUTILS_PLUGINS=y
-CT_LIBC_uClibc=y
+CT_LIBC_UCLIBC=y
 CT_THREADS_NONE=y
 CT_CC_GCC_MULTILIB_LIST="aprofile"
-CT_DEBUG_ltrace=y
-CT_DEBUG_strace=y
+CT_DEBUG_LTRACE=y
+CT_DEBUG_STRACE=y
diff --git a/samples/arm-nano-eabi/crosstool.config b/samples/arm-nano-eabi/crosstool.config
index a00b6a2..82e5714 100644
--- a/samples/arm-nano-eabi/crosstool.config
+++ b/samples/arm-nano-eabi/crosstool.config
@@ -1,4 +1,4 @@
-CT_ARCH_arm=y
+CT_ARCH_ARM=y
 CT_MULTILIB=y
 CT_ARCH_FLOAT_SW=y
 CT_TARGET_VENDOR="nano"
diff --git a/samples/arm-unknown-eabi/crosstool.config b/samples/arm-unknown-eabi/crosstool.config
index a22ac4a..f52abec 100644
--- a/samples/arm-unknown-eabi/crosstool.config
+++ b/samples/arm-unknown-eabi/crosstool.config
@@ -1,4 +1,4 @@
-CT_ARCH_arm=y
+CT_ARCH_ARM=y
 CT_ARCH_FLOAT_SW=y
 CT_LIBC_NEWLIB_IO_C99FMT=y
 CT_LIBC_NEWLIB_IO_LL=y
diff --git a/samples/arm-unknown-linux-gnueabi/crosstool.config b/samples/arm-unknown-linux-gnueabi/crosstool.config
index 20157cf..666d2fc 100644
--- a/samples/arm-unknown-linux-gnueabi/crosstool.config
+++ b/samples/arm-unknown-linux-gnueabi/crosstool.config
@@ -1,17 +1,17 @@
 # CT_REMOVE_DOCS is not set
-CT_ARCH_arm=y
+CT_ARCH_ARM=y
 CT_ARCH_FLOAT_SW=y
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=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_GLIBC=y
 # CT_CC_GCC_SJLJ_EXCEPTIONS is not set
 CT_CC_LANG_CXX=y
-CT_DEBUG_duma=y
-CT_DEBUG_gdb=y
+CT_DEBUG_DUMA=y
+CT_DEBUG_GDB=y
 # CT_GDB_CROSS_PYTHON is not set
 CT_GDB_NATIVE=y
-CT_DEBUG_ltrace=y
-CT_DEBUG_strace=y
+CT_DEBUG_LTRACE=y
+CT_DEBUG_STRACE=y
diff --git a/samples/arm-unknown-linux-musleabi/crosstool.config b/samples/arm-unknown-linux-musleabi/crosstool.config
index e2335a7..c384611 100644
--- a/samples/arm-unknown-linux-musleabi/crosstool.config
+++ b/samples/arm-unknown-linux-musleabi/crosstool.config
@@ -1,14 +1,14 @@
 CT_EXPERIMENTAL=y
-CT_ARCH_arm=y
-CT_KERNEL_linux=y
+CT_ARCH_ARM=y
+CT_KERNEL_LINUX=y
 CT_BINUTILS_LINKER_LD_GOLD=y
 CT_BINUTILS_GOLD_THREADS=y
 CT_BINUTILS_LD_WRAPPER=y
 CT_BINUTILS_PLUGINS=y
 CT_BINUTILS_FOR_TARGET=y
-CT_LIBC_musl=y
+CT_LIBC_MUSL=y
 CT_CC_LANG_CXX=y
-CT_DEBUG_duma=y
-CT_DEBUG_gdb=y
+CT_DEBUG_DUMA=y
+CT_DEBUG_GDB=y
 CT_GDB_NATIVE=y
-CT_DEBUG_strace=y
+CT_DEBUG_STRACE=y
diff --git a/samples/arm-unknown-linux-uclibcgnueabi/crosstool.config b/samples/arm-unknown-linux-uclibcgnueabi/crosstool.config
index c2b4823..2993b99 100644
--- a/samples/arm-unknown-linux-uclibcgnueabi/crosstool.config
+++ b/samples/arm-unknown-linux-uclibcgnueabi/crosstool.config
@@ -1,16 +1,16 @@
-CT_ARCH_arm=y
+CT_ARCH_ARM=y
 CT_ARCH_CPU="arm926ej-s"
 CT_ARCH_FLOAT_SW=y
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
 CT_BINUTILS_LINKER_LD_GOLD=y
 CT_BINUTILS_GOLD_THREADS=y
 CT_BINUTILS_LD_WRAPPER=y
 CT_BINUTILS_PLUGINS=y
-CT_LIBC_uClibc=y
+CT_LIBC_UCLIBC=y
 CT_CC_LANG_CXX=y
-CT_DEBUG_duma=y
-CT_DEBUG_gdb=y
+CT_DEBUG_DUMA=y
+CT_DEBUG_GDB=y
 CT_GDB_CROSS_STATIC=y
 CT_GDB_NATIVE=y
-CT_DEBUG_ltrace=y
-CT_DEBUG_strace=y
+CT_DEBUG_LTRACE=y
+CT_DEBUG_STRACE=y
diff --git a/samples/arm-unknown-linux-uclibcgnueabihf/crosstool.config b/samples/arm-unknown-linux-uclibcgnueabihf/crosstool.config
index d327974..3fd2d2d 100644
--- a/samples/arm-unknown-linux-uclibcgnueabihf/crosstool.config
+++ b/samples/arm-unknown-linux-uclibcgnueabihf/crosstool.config
@@ -1,18 +1,18 @@
 CT_EXPERIMENTAL=y
-CT_ARCH_arm=y
+CT_ARCH_ARM=y
 CT_ARCH_CPU="arm926ej-s"
 CT_ARCH_FLOAT_HW=y
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
 CT_BINUTILS_LINKER_LD_GOLD=y
 CT_BINUTILS_GOLD_THREADS=y
 CT_BINUTILS_LD_WRAPPER=y
 CT_BINUTILS_PLUGINS=y
-CT_LIBC_uClibc=y
+CT_LIBC_UCLIBC=y
 CT_CC_LANG_CXX=y
-CT_DEBUG_duma=y
-CT_DEBUG_gdb=y
+CT_DEBUG_DUMA=y
+CT_DEBUG_GDB=y
 CT_GDB_CROSS_STATIC=y
 CT_GDB_NATIVE=y
 CT_GDB_NATIVE_STATIC=y
-CT_DEBUG_ltrace=y
-CT_DEBUG_strace=y
+CT_DEBUG_LTRACE=y
+CT_DEBUG_STRACE=y
diff --git a/samples/armeb-unknown-eabi/crosstool.config b/samples/armeb-unknown-eabi/crosstool.config
index ce975a8..c6779f8 100644
--- a/samples/armeb-unknown-eabi/crosstool.config
+++ b/samples/armeb-unknown-eabi/crosstool.config
@@ -1,11 +1,11 @@
-CT_ARCH_arm=y
+CT_ARCH_ARM=y
 CT_ARCH_BE=y
 CT_ARCH_FLOAT_SW=y
 CT_BINUTILS_LINKER_LD_GOLD=y
 CT_BINUTILS_GOLD_THREADS=y
 CT_BINUTILS_LD_WRAPPER=y
 CT_BINUTILS_PLUGINS=y
-CT_LIBC_none=y
+CT_LIBC_NONE=y
 # CT_CC_GCC_USE_GRAPHITE is not set
 # CT_CC_GCC_USE_LTO is not set
-CT_DEBUG_gdb=y
+CT_DEBUG_GDB=y
diff --git a/samples/armeb-unknown-linux-gnueabi/crosstool.config b/samples/armeb-unknown-linux-gnueabi/crosstool.config
index 983c33d..d9640c0 100644
--- a/samples/armeb-unknown-linux-gnueabi/crosstool.config
+++ b/samples/armeb-unknown-linux-gnueabi/crosstool.config
@@ -1,18 +1,18 @@
-CT_ARCH_arm=y
+CT_ARCH_ARM=y
 CT_ARCH_BE=y
 CT_ARCH_ARCH="armv5te"
 CT_ARCH_FLOAT_SW=y
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=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_GLIBC=y
 # CT_CC_GCC_SJLJ_EXCEPTIONS is not set
 CT_CC_LANG_CXX=y
-CT_DEBUG_duma=y
-CT_DEBUG_gdb=y
+CT_DEBUG_DUMA=y
+CT_DEBUG_GDB=y
 # CT_GDB_CROSS_PYTHON is not set
 CT_GDB_NATIVE=y
-CT_DEBUG_ltrace=y
-CT_DEBUG_strace=y
+CT_DEBUG_LTRACE=y
+CT_DEBUG_STRACE=y
diff --git a/samples/armeb-unknown-linux-uclibcgnueabi/crosstool.config b/samples/armeb-unknown-linux-uclibcgnueabi/crosstool.config
index 8f4d688..0bb1414 100644
--- a/samples/armeb-unknown-linux-uclibcgnueabi/crosstool.config
+++ b/samples/armeb-unknown-linux-uclibcgnueabi/crosstool.config
@@ -1,17 +1,17 @@
-CT_ARCH_arm=y
+CT_ARCH_ARM=y
 CT_ARCH_BE=y
 CT_ARCH_CPU="xscale"
 CT_ARCH_FLOAT_SW=y
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
 CT_BINUTILS_LINKER_LD_GOLD=y
 CT_BINUTILS_GOLD_THREADS=y
 CT_BINUTILS_LD_WRAPPER=y
 CT_BINUTILS_PLUGINS=y
-CT_LIBC_uClibc=y
+CT_LIBC_UCLIBC=y
 # CT_CC_GCC_SJLJ_EXCEPTIONS is not set
 CT_CC_LANG_CXX=y
-CT_DEBUG_duma=y
-CT_DEBUG_gdb=y
+CT_DEBUG_DUMA=y
+CT_DEBUG_GDB=y
 # CT_GDB_CROSS_PYTHON is not set
 CT_GDB_NATIVE=y
-CT_DEBUG_strace=y
+CT_DEBUG_STRACE=y
diff --git a/samples/armv6-nommu-linux-uclibcgnueabi/crosstool.config b/samples/armv6-nommu-linux-uclibcgnueabi/crosstool.config
index 8e7e00c..61ef658 100644
--- a/samples/armv6-nommu-linux-uclibcgnueabi/crosstool.config
+++ b/samples/armv6-nommu-linux-uclibcgnueabi/crosstool.config
@@ -1,8 +1,8 @@
-CT_ARCH_arm=y
+CT_ARCH_ARM=y
 CT_ARCH_SUFFIX="v6"
 # CT_ARCH_USE_MMU is not set
 CT_TARGET_VENDOR="nommu"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
 # CT_SHARED_LIBS is not set
 # CT_KERNEL_LINUX_INSTALL_CHECK is not set
 CT_BINUTILS_PLUGINS=y
diff --git a/samples/armv6-rpi-linux-gnueabi/crosstool.config b/samples/armv6-rpi-linux-gnueabi/crosstool.config
index c67c8d8..6c59a62 100644
--- a/samples/armv6-rpi-linux-gnueabi/crosstool.config
+++ b/samples/armv6-rpi-linux-gnueabi/crosstool.config
@@ -1,15 +1,15 @@
-CT_ARCH_arm=y
+CT_ARCH_ARM=y
 CT_ARCH_SUFFIX="v6"
 CT_ARCH_CPU="arm1176jzf-s"
 CT_ARCH_FPU="vfp"
 CT_TARGET_VENDOR="rpi"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=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_GLIBC=y
 CT_GLIBC_LOCALES=y
 CT_GLIBC_KERNEL_VERSION_CHOSEN=y
 CT_GLIBC_MIN_KERNEL_VERSION="3.2.27"
@@ -17,5 +17,5 @@ CT_CC_GCC_DISABLE_PCH=y
 CT_CC_GCC_BUILD_ID=y
 CT_CC_GCC_LNK_HASH_STYLE_BOTH=y
 CT_CC_LANG_CXX=y
-CT_DEBUG_gdb=y
+CT_DEBUG_GDB=y
 # CT_GDB_CROSS_PYTHON is not set
diff --git a/samples/armv7-rpi2-linux-gnueabihf/crosstool.config b/samples/armv7-rpi2-linux-gnueabihf/crosstool.config
index 30b678d..f4b1e96 100644
--- a/samples/armv7-rpi2-linux-gnueabihf/crosstool.config
+++ b/samples/armv7-rpi2-linux-gnueabihf/crosstool.config
@@ -1,14 +1,14 @@
-CT_ARCH_arm=y
+CT_ARCH_ARM=y
 CT_ARCH_SUFFIX="v7"
 CT_ARCH_CPU="cortex-a7"
 CT_ARCH_FPU="neon-vfpv4"
 CT_ARCH_FLOAT_HW=y
 CT_TARGET_VENDOR="rpi2"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=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_GLIBC=y
 CT_CC_LANG_CXX=y
-CT_DEBUG_gdb=y
+CT_DEBUG_GDB=y
diff --git a/samples/armv8-rpi3-linux-gnueabihf/crosstool.config b/samples/armv8-rpi3-linux-gnueabihf/crosstool.config
index 6d1d0f8..d54b861 100644
--- a/samples/armv8-rpi3-linux-gnueabihf/crosstool.config
+++ b/samples/armv8-rpi3-linux-gnueabihf/crosstool.config
@@ -1,14 +1,14 @@
-CT_ARCH_arm=y
+CT_ARCH_ARM=y
 CT_ARCH_SUFFIX="v8"
 CT_ARCH_CPU="cortex-a53"
 CT_ARCH_FPU="neon-vfpv4"
 CT_ARCH_FLOAT_HW=y
 CT_TARGET_VENDOR="rpi3"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=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_GLIBC=y
 CT_CC_LANG_CXX=y
-CT_DEBUG_gdb=y
+CT_DEBUG_GDB=y
diff --git a/samples/avr/crosstool.config b/samples/avr/crosstool.config
index 3a3016f..6283c78 100644
--- a/samples/avr/crosstool.config
+++ b/samples/avr/crosstool.config
@@ -1,3 +1,3 @@
-CT_ARCH_avr=y
+CT_ARCH_AVR=y
 CT_CC_LANG_CXX=y
-CT_DEBUG_gdb=y
+CT_DEBUG_GDB=y
diff --git a/samples/i586-geode-linux-uclibc/crosstool.config b/samples/i586-geode-linux-uclibc/crosstool.config
index 5dc1cc4..0431e80 100644
--- a/samples/i586-geode-linux-uclibc/crosstool.config
+++ b/samples/i586-geode-linux-uclibc/crosstool.config
@@ -1,16 +1,16 @@
-CT_ARCH_x86=y
+CT_ARCH_X86=y
 CT_ARCH_ARCH="pentium-mmx"
 CT_TARGET_VENDOR="geode"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
 CT_BINUTILS_LINKER_LD_GOLD=y
 CT_BINUTILS_GOLD_THREADS=y
 CT_BINUTILS_LD_WRAPPER=y
 CT_BINUTILS_PLUGINS=y
-CT_LIBC_uClibc=y
+CT_LIBC_UCLIBC=y
 CT_LIBC_UCLIBC_WCHAR=y
 CT_CC_LANG_CXX=y
-CT_DEBUG_duma=y
-CT_DEBUG_gdb=y
+CT_DEBUG_DUMA=y
+CT_DEBUG_GDB=y
 # CT_GDB_CROSS_PYTHON is not set
 CT_GDB_NATIVE=y
-CT_DEBUG_strace=y
+CT_DEBUG_STRACE=y
diff --git a/samples/i686-centos6-linux-gnu/crosstool.config b/samples/i686-centos6-linux-gnu/crosstool.config
index 255b877..35f2945 100644
--- a/samples/i686-centos6-linux-gnu/crosstool.config
+++ b/samples/i686-centos6-linux-gnu/crosstool.config
@@ -1,10 +1,10 @@
 CT_OBSOLETE=y
-CT_ARCH_x86=y
+CT_ARCH_X86=y
 CT_ARCH_ARCH="i686"
 CT_TARGET_VENDOR="centos6"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
 CT_LINUX_V_2_6_32=y
-CT_LIBC_glibc=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 6d524d6..bfad9b6 100644
--- a/samples/i686-centos7-linux-gnu/crosstool.config
+++ b/samples/i686-centos7-linux-gnu/crosstool.config
@@ -1,10 +1,10 @@
 CT_OBSOLETE=y
-CT_ARCH_x86=y
+CT_ARCH_X86=y
 CT_ARCH_ARCH="i686"
 CT_TARGET_VENDOR="centos7"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
 CT_LINUX_V_3_10=y
-CT_LIBC_glibc=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 1f14d67..9dd93e6 100644
--- a/samples/i686-nptl-linux-gnu/crosstool.config
+++ b/samples/i686-nptl-linux-gnu/crosstool.config
@@ -1,16 +1,16 @@
-CT_ARCH_x86=y
+CT_ARCH_X86=y
 CT_ARCH_ARCH="i686"
 CT_TARGET_VENDOR="nptl"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=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_GLIBC=y
 CT_CC_LANG_CXX=y
-CT_DEBUG_duma=y
-CT_DEBUG_gdb=y
+CT_DEBUG_DUMA=y
+CT_DEBUG_GDB=y
 # CT_GDB_CROSS_PYTHON is not set
 CT_GDB_NATIVE=y
-CT_DEBUG_ltrace=y
-CT_DEBUG_strace=y
+CT_DEBUG_LTRACE=y
+CT_DEBUG_STRACE=y
diff --git a/samples/i686-ubuntu12.04-linux-gnu/crosstool.config b/samples/i686-ubuntu12.04-linux-gnu/crosstool.config
index 320b091..7d3af5a 100644
--- a/samples/i686-ubuntu12.04-linux-gnu/crosstool.config
+++ b/samples/i686-ubuntu12.04-linux-gnu/crosstool.config
@@ -1,10 +1,10 @@
 CT_OBSOLETE=y
-CT_ARCH_x86=y
+CT_ARCH_X86=y
 CT_ARCH_ARCH="i686"
 CT_TARGET_VENDOR="ubuntu12.04"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
 CT_LINUX_V_3_2=y
-CT_LIBC_glibc=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 016f85d..51faa33 100644
--- a/samples/i686-ubuntu14.04-linux-gnu/crosstool.config
+++ b/samples/i686-ubuntu14.04-linux-gnu/crosstool.config
@@ -1,10 +1,10 @@
 CT_OBSOLETE=y
-CT_ARCH_x86=y
+CT_ARCH_X86=y
 CT_ARCH_ARCH="i686"
 CT_TARGET_VENDOR="ubuntu14.04"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
 CT_LINUX_V_3_13=y
-CT_LIBC_glibc=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 e9b0d9c..defdf53 100644
--- a/samples/i686-ubuntu16.04-linux-gnu/crosstool.config
+++ b/samples/i686-ubuntu16.04-linux-gnu/crosstool.config
@@ -1,10 +1,10 @@
 CT_OBSOLETE=y
-CT_ARCH_x86=y
+CT_ARCH_X86=y
 CT_ARCH_ARCH="i686"
 CT_TARGET_VENDOR="ubuntu16.04"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
 CT_LINUX_V_4_4=y
-CT_LIBC_glibc=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/i686-w64-mingw32,nios2-spico-elf/crosstool.config b/samples/i686-w64-mingw32,nios2-spico-elf/crosstool.config
index f3cd8e5..c3df4ad 100644
--- a/samples/i686-w64-mingw32,nios2-spico-elf/crosstool.config
+++ b/samples/i686-w64-mingw32,nios2-spico-elf/crosstool.config
@@ -1,10 +1,10 @@
 CT_EXPERIMENTAL=y
 # CT_REMOVE_DOCS is not set
-CT_ARCH_nios2=y
+CT_ARCH_NIOS2=y
 CT_STATIC_TOOLCHAIN=y
 CT_TOOLCHAIN_BUGURL="https://bitbucket.org/netzimme/eax-gcc/issues?status=new&status=open"
 CT_TARGET_VENDOR="spico"
 CT_CANADIAN=y
 CT_HOST="i686-w64-mingw32"
 CT_CC_LANG_CXX=y
-CT_DEBUG_gdb=y
+CT_DEBUG_GDB=y
diff --git a/samples/i686-w64-mingw32/crosstool.config b/samples/i686-w64-mingw32/crosstool.config
index 4d2c99c..5ed39c0 100644
--- a/samples/i686-w64-mingw32/crosstool.config
+++ b/samples/i686-w64-mingw32/crosstool.config
@@ -1,8 +1,8 @@
 CT_EXPERIMENTAL=y
-CT_ARCH_x86=y
+CT_ARCH_X86=y
 CT_ARCH_ARCH="i686"
 CT_TARGET_VENDOR="w64"
-CT_KERNEL_windows=y
+CT_KERNEL_WINDOWS=y
 CT_BINUTILS_PLUGINS=y
 CT_MINGW_DIRECTX=y
 CT_MINGW_DDK=y
diff --git a/samples/m68k-unknown-elf/crosstool.config b/samples/m68k-unknown-elf/crosstool.config
index 9b93583..227d45b 100644
--- a/samples/m68k-unknown-elf/crosstool.config
+++ b/samples/m68k-unknown-elf/crosstool.config
@@ -1,9 +1,9 @@
-CT_ARCH_m68k=y
+CT_ARCH_M68K=y
 CT_ARCH_CPU="cpu32"
 CT_ARCH_BINFMT_FLAT=y
-CT_LIBC_none=y
+CT_LIBC_NONE=y
 # CT_CC_GCC_USE_GRAPHITE is not set
 # CT_CC_GCC_USE_LTO is not set
-CT_COMP_TOOLS_autoconf=y
-CT_COMP_TOOLS_automake=y
-CT_COMP_TOOLS_libtool=y
+CT_COMP_TOOLS_AUTOCONF=y
+CT_COMP_TOOLS_AUTOMAKE=y
+CT_COMP_TOOLS_LIBTOOL=y
diff --git a/samples/m68k-unknown-uclinux-uclibc/crosstool.config b/samples/m68k-unknown-uclinux-uclibc/crosstool.config
index ab0fbe5..61c37f1 100644
--- a/samples/m68k-unknown-uclinux-uclibc/crosstool.config
+++ b/samples/m68k-unknown-uclinux-uclibc/crosstool.config
@@ -1,3 +1,3 @@
-CT_ARCH_m68k=y
-CT_KERNEL_linux=y
+CT_ARCH_M68K=y
+CT_KERNEL_LINUX=y
 CT_THREADS_LT=y
diff --git a/samples/mips-ar2315-linux-gnu/crosstool.config b/samples/mips-ar2315-linux-gnu/crosstool.config
index 55ae935..bd0a360 100644
--- a/samples/mips-ar2315-linux-gnu/crosstool.config
+++ b/samples/mips-ar2315-linux-gnu/crosstool.config
@@ -1,12 +1,12 @@
-CT_ARCH_mips=y
+CT_ARCH_MIPS=y
 CT_ARCH_ARCH="4kc"
 CT_ARCH_TUNE="4kc"
 CT_ARCH_FLOAT_SW=y
 CT_TARGET_VENDOR="ar2315"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
 CT_BINUTILS_PLUGINS=y
-CT_LIBC_glibc=y
+CT_LIBC_GLIBC=y
 CT_CC_GCC_mips_plt=y
 CT_CC_LANG_CXX=y
-CT_DEBUG_gdb=y
+CT_DEBUG_GDB=y
 # CT_GDB_CROSS_PYTHON is not set
diff --git a/samples/mips-malta-linux-gnu/crosstool.config b/samples/mips-malta-linux-gnu/crosstool.config
index 624d01d..92b3a1a 100644
--- a/samples/mips-malta-linux-gnu/crosstool.config
+++ b/samples/mips-malta-linux-gnu/crosstool.config
@@ -1,9 +1,9 @@
-CT_ARCH_mips=y
+CT_ARCH_MIPS=y
 CT_TARGET_VENDOR="malta"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
 CT_BINUTILS_PLUGINS=y
-CT_LIBC_glibc=y
+CT_LIBC_GLIBC=y
 CT_CC_GCC_mips_plt=y
 CT_CC_LANG_CXX=y
-CT_DEBUG_gdb=y
+CT_DEBUG_GDB=y
 # CT_GDB_CROSS_PYTHON is not set
diff --git a/samples/mips-unknown-elf/crosstool.config b/samples/mips-unknown-elf/crosstool.config
index 658b3ef..133d27e 100644
--- a/samples/mips-unknown-elf/crosstool.config
+++ b/samples/mips-unknown-elf/crosstool.config
@@ -1,6 +1,6 @@
-CT_ARCH_mips=y
+CT_ARCH_MIPS=y
 CT_ARCH_FLOAT_SW=y
-CT_LIBC_none=y
+CT_LIBC_NONE=y
 CT_CC_GCC_mips_plt=y
-CT_DEBUG_gdb=y
+CT_DEBUG_GDB=y
 # CT_GDB_CROSS_PYTHON is not set
diff --git a/samples/mips-unknown-linux-uclibc/crosstool.config b/samples/mips-unknown-linux-uclibc/crosstool.config
index c693e8b..b56e9c1 100644
--- a/samples/mips-unknown-linux-uclibc/crosstool.config
+++ b/samples/mips-unknown-linux-uclibc/crosstool.config
@@ -1,12 +1,12 @@
-CT_ARCH_mips=y
+CT_ARCH_MIPS=y
 CT_ARCH_ARCH="mips1"
 CT_ARCH_FLOAT_SW=y
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
 CT_BINUTILS_PLUGINS=y
-CT_LIBC_uClibc=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
-CT_DEBUG_gdb=y
+CT_DEBUG_DUMA=y
+CT_DEBUG_GDB=y
 # CT_GDB_CROSS_PYTHON is not set
diff --git a/samples/mips64el-multilib-linux-uclibc/crosstool.config b/samples/mips64el-multilib-linux-uclibc/crosstool.config
index f4d8e66..faeab87 100644
--- a/samples/mips64el-multilib-linux-uclibc/crosstool.config
+++ b/samples/mips64el-multilib-linux-uclibc/crosstool.config
@@ -1,12 +1,12 @@
-CT_ARCH_mips=y
+CT_ARCH_MIPS=y
 CT_MULTILIB=y
 CT_ARCH_LE=y
 CT_ARCH_64=y
 CT_ARCH_FLOAT_SW=y
 CT_TARGET_VENDOR="multilib"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
 CT_BINUTILS_PLUGINS=y
-CT_LIBC_uClibc=y
+CT_LIBC_UCLIBC=y
 CT_LIBC_UCLIBC_WCHAR=y
 CT_CC_GCC_mips_plt=y
 CT_CC_LANG_CXX=y
diff --git a/samples/mipsel-multilib-linux-gnu/crosstool.config b/samples/mipsel-multilib-linux-gnu/crosstool.config
index 6f767a3..02a26b7 100644
--- a/samples/mipsel-multilib-linux-gnu/crosstool.config
+++ b/samples/mipsel-multilib-linux-gnu/crosstool.config
@@ -1,17 +1,17 @@
-CT_ARCH_mips=y
+CT_ARCH_MIPS=y
 CT_MULTILIB=y
 CT_ARCH_LE=y
 CT_ARCH_FLOAT_SW=y
 CT_TARGET_VENDOR="multilib"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
 CT_BINUTILS_PLUGINS=y
-CT_LIBC_glibc=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
 CT_CC_LANG_CXX=y
-CT_DEBUG_duma=y
-CT_DEBUG_gdb=y
+CT_DEBUG_DUMA=y
+CT_DEBUG_GDB=y
 # CT_GDB_CROSS_PYTHON is not set
 CT_GDB_NATIVE=y
-CT_DEBUG_strace=y
+CT_DEBUG_STRACE=y
diff --git a/samples/mipsel-sde-elf/crosstool.config b/samples/mipsel-sde-elf/crosstool.config
index f5cac25..8e89c90 100644
--- a/samples/mipsel-sde-elf/crosstool.config
+++ b/samples/mipsel-sde-elf/crosstool.config
@@ -1,8 +1,8 @@
-CT_ARCH_mips=y
+CT_ARCH_MIPS=y
 CT_ARCH_LE=y
 CT_ARCH_FLOAT_SW=y
 CT_TARGET_VENDOR="sde"
-CT_LIBC_none=y
+CT_LIBC_NONE=y
 # CT_CC_GCC_ENABLE_TARGET_OPTSPACE is not set
-CT_DEBUG_gdb=y
+CT_DEBUG_GDB=y
 # CT_GDB_CROSS_PYTHON is not set
diff --git a/samples/mipsel-unknown-linux-gnu/crosstool.config b/samples/mipsel-unknown-linux-gnu/crosstool.config
index 11320bf..af4aa6d 100644
--- a/samples/mipsel-unknown-linux-gnu/crosstool.config
+++ b/samples/mipsel-unknown-linux-gnu/crosstool.config
@@ -1,14 +1,14 @@
-CT_ARCH_mips=y
+CT_ARCH_MIPS=y
 CT_ARCH_LE=y
 CT_ARCH_ARCH="mips1"
 CT_ARCH_FLOAT_SW=y
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
 CT_BINUTILS_PLUGINS=y
-CT_LIBC_glibc=y
+CT_LIBC_GLIBC=y
 CT_CC_GCC_mips_plt=y
 CT_CC_LANG_CXX=y
-CT_DEBUG_duma=y
-CT_DEBUG_gdb=y
+CT_DEBUG_DUMA=y
+CT_DEBUG_GDB=y
 # CT_GDB_CROSS_PYTHON is not set
 CT_GDB_NATIVE=y
-CT_DEBUG_strace=y
+CT_DEBUG_STRACE=y
diff --git a/samples/msp430-unknown-elf/crosstool.config b/samples/msp430-unknown-elf/crosstool.config
index 5e979e1..52c53ba 100644
--- a/samples/msp430-unknown-elf/crosstool.config
+++ b/samples/msp430-unknown-elf/crosstool.config
@@ -1,4 +1,4 @@
 CT_EXPERIMENTAL=y
-CT_ARCH_msp430=y
-CT_CC_GCC_V_4_9_4=y
-CT_DEBUG_gdb=y
+CT_ARCH_MSP430=y
+CT_GCC_V_4_9_4=y
+CT_DEBUG_GDB=y
diff --git a/samples/powerpc-405-linux-gnu/crosstool.config b/samples/powerpc-405-linux-gnu/crosstool.config
index eeddbac..0e22d92 100644
--- a/samples/powerpc-405-linux-gnu/crosstool.config
+++ b/samples/powerpc-405-linux-gnu/crosstool.config
@@ -1,9 +1,9 @@
-CT_ARCH_powerpc=y
+CT_ARCH_POWERPC=y
 CT_ARCH_CPU="405"
 CT_ARCH_FLOAT_SW=y
 CT_TARGET_VENDOR="405"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
 CT_BINUTILS_PLUGINS=y
 CT_CC_LANG_CXX=y
-CT_DEBUG_gdb=y
+CT_DEBUG_GDB=y
 # CT_GDB_CROSS_PYTHON is not set
diff --git a/samples/powerpc-860-linux-gnu/crosstool.config b/samples/powerpc-860-linux-gnu/crosstool.config
index b6d3a46..6f1db15 100644
--- a/samples/powerpc-860-linux-gnu/crosstool.config
+++ b/samples/powerpc-860-linux-gnu/crosstool.config
@@ -1,10 +1,10 @@
-CT_ARCH_powerpc=y
+CT_ARCH_POWERPC=y
 CT_ARCH_CPU="860"
 CT_ARCH_FLOAT_SW=y
 CT_TARGET_VENDOR="860"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
 CT_BINUTILS_PLUGINS=y
 CT_GLIBC_EXTRA_CONFIG_ARRAY="--without-fp"
 CT_CC_LANG_CXX=y
-CT_DEBUG_gdb=y
+CT_DEBUG_GDB=y
 # CT_GDB_CROSS_PYTHON is not set
diff --git a/samples/powerpc-e300c3-linux-gnu/crosstool.config b/samples/powerpc-e300c3-linux-gnu/crosstool.config
index 8cdef71..53ad00c 100644
--- a/samples/powerpc-e300c3-linux-gnu/crosstool.config
+++ b/samples/powerpc-e300c3-linux-gnu/crosstool.config
@@ -1,7 +1,7 @@
-CT_ARCH_powerpc=y
+CT_ARCH_POWERPC=y
 CT_ARCH_CPU="e300c3"
 CT_TARGET_VENDOR="e300c3"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
 CT_BINUTILS_PLUGINS=y
 # CT_CC_GCC_ENABLE_TARGET_OPTSPACE is not set
 CT_CC_LANG_CXX=y
diff --git a/samples/powerpc-e500v2-linux-gnuspe/crosstool.config b/samples/powerpc-e500v2-linux-gnuspe/crosstool.config
index b86bf27..7f8f5d7 100644
--- a/samples/powerpc-e500v2-linux-gnuspe/crosstool.config
+++ b/samples/powerpc-e500v2-linux-gnuspe/crosstool.config
@@ -1,15 +1,15 @@
-CT_ARCH_powerpc=y
+CT_ARCH_POWERPC=y
 CT_ARCH_CPU="8548"
 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_KERNEL_LINUX=y
 CT_BINUTILS_EXTRA_CONFIG_ARRAY="--enable-spe=yes --enable-e500x2 --with-e500x2"
 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
 CT_CC_GCC_LDBL_128=y
 CT_CC_LANG_CXX=y
-CT_DEBUG_gdb=y
+CT_DEBUG_GDB=y
 # CT_GDB_CROSS_PYTHON is not set
diff --git a/samples/powerpc-unknown-linux-gnu/crosstool.config b/samples/powerpc-unknown-linux-gnu/crosstool.config
index 8fbfb0b..29bedbf 100644
--- a/samples/powerpc-unknown-linux-gnu/crosstool.config
+++ b/samples/powerpc-unknown-linux-gnu/crosstool.config
@@ -1,9 +1,9 @@
-CT_ARCH_powerpc=y
-CT_KERNEL_linux=y
+CT_ARCH_POWERPC=y
+CT_KERNEL_LINUX=y
 CT_BINUTILS_PLUGINS=y
 CT_CC_LANG_CXX=y
-CT_DEBUG_duma=y
-CT_DEBUG_gdb=y
+CT_DEBUG_DUMA=y
+CT_DEBUG_GDB=y
 # CT_GDB_CROSS_PYTHON is not set
 CT_GDB_NATIVE=y
-CT_DEBUG_strace=y
+CT_DEBUG_STRACE=y
diff --git a/samples/powerpc-unknown-linux-uclibc,m68k-unknown-uclinux-uclibc/crosstool.config b/samples/powerpc-unknown-linux-uclibc,m68k-unknown-uclinux-uclibc/crosstool.config
index 5225b61..749e26d 100644
--- a/samples/powerpc-unknown-linux-uclibc,m68k-unknown-uclinux-uclibc/crosstool.config
+++ b/samples/powerpc-unknown-linux-uclibc,m68k-unknown-uclinux-uclibc/crosstool.config
@@ -1,7 +1,7 @@
-CT_ARCH_m68k=y
+CT_ARCH_M68K=y
 CT_CANADIAN=y
 CT_HOST="powerpc-unknown-linux-uclibc"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
 CT_THREADS_LT=y
 # CT_LIBICONV is not set
 # CT_GETTEXT is not set
diff --git a/samples/powerpc-unknown-linux-uclibc/crosstool.config b/samples/powerpc-unknown-linux-uclibc/crosstool.config
index 5dddeeb..1236c7f 100644
--- a/samples/powerpc-unknown-linux-uclibc/crosstool.config
+++ b/samples/powerpc-unknown-linux-uclibc/crosstool.config
@@ -1,12 +1,12 @@
-CT_ARCH_powerpc=y
+CT_ARCH_POWERPC=y
 CT_ARCH_FLOAT_SW=y
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
 CT_BINUTILS_FOR_TARGET=y
-CT_LIBC_uClibc=y
+CT_LIBC_UCLIBC=y
 CT_LIBC_UCLIBC_WCHAR=y
 CT_CC_LANG_CXX=y
 CT_CC_LANG_FORTRAN=y
-CT_DEBUG_duma=y
-CT_DEBUG_gdb=y
+CT_DEBUG_DUMA=y
+CT_DEBUG_GDB=y
 CT_GDB_NATIVE=y
-CT_DEBUG_strace=y
+CT_DEBUG_STRACE=y
diff --git a/samples/powerpc-unknown_nofpu-linux-gnu/crosstool.config b/samples/powerpc-unknown_nofpu-linux-gnu/crosstool.config
index 4b0dc05..b42fa3b 100644
--- a/samples/powerpc-unknown_nofpu-linux-gnu/crosstool.config
+++ b/samples/powerpc-unknown_nofpu-linux-gnu/crosstool.config
@@ -1,9 +1,9 @@
-CT_ARCH_powerpc=y
+CT_ARCH_POWERPC=y
 CT_ARCH_FLOAT_SW=y
 CT_TARGET_VENDOR="unknown_nofpu"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
 CT_BINUTILS_PLUGINS=y
 CT_CC_LANG_CXX=y
-CT_DEBUG_duma=y
-CT_DEBUG_gdb=y
-CT_DEBUG_strace=y
+CT_DEBUG_DUMA=y
+CT_DEBUG_GDB=y
+CT_DEBUG_STRACE=y
diff --git a/samples/powerpc64-multilib-linux-gnu/crosstool.config b/samples/powerpc64-multilib-linux-gnu/crosstool.config
index d59aa5a..d89a262 100644
--- a/samples/powerpc64-multilib-linux-gnu/crosstool.config
+++ b/samples/powerpc64-multilib-linux-gnu/crosstool.config
@@ -1,10 +1,10 @@
-CT_ARCH_powerpc=y
+CT_ARCH_POWERPC=y
 CT_MULTILIB=y
 CT_ARCH_64=y
 CT_TARGET_VENDOR="multilib"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
 CT_BINUTILS_PLUGINS=y
 CT_CC_LANG_CXX=y
-CT_DEBUG_gdb=y
+CT_DEBUG_GDB=y
 # CT_GDB_CROSS_PYTHON is not set
 CT_GDB_NATIVE=y
diff --git a/samples/powerpc64-unknown-linux-gnu/crosstool.config b/samples/powerpc64-unknown-linux-gnu/crosstool.config
index 15cb99b..bbe8d5b 100644
--- a/samples/powerpc64-unknown-linux-gnu/crosstool.config
+++ b/samples/powerpc64-unknown-linux-gnu/crosstool.config
@@ -1,8 +1,8 @@
-CT_ARCH_powerpc=y
+CT_ARCH_POWERPC=y
 CT_ARCH_64=y
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
 CT_BINUTILS_PLUGINS=y
 CT_CC_LANG_CXX=y
-CT_DEBUG_gdb=y
+CT_DEBUG_GDB=y
 # CT_GDB_CROSS_PYTHON is not set
 CT_GDB_NATIVE=y
diff --git a/samples/powerpc64le-unknown-linux-gnu/crosstool.config b/samples/powerpc64le-unknown-linux-gnu/crosstool.config
index 9f8245e..21b9e8c 100644
--- a/samples/powerpc64le-unknown-linux-gnu/crosstool.config
+++ b/samples/powerpc64le-unknown-linux-gnu/crosstool.config
@@ -1,9 +1,9 @@
-CT_ARCH_powerpc=y
+CT_ARCH_POWERPC=y
 CT_ARCH_LE=y
 CT_ARCH_64=y
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
 CT_BINUTILS_PLUGINS=y
 CT_CC_LANG_CXX=y
-CT_DEBUG_gdb=y
+CT_DEBUG_GDB=y
 # CT_GDB_CROSS_PYTHON is not set
 CT_GDB_NATIVE=y
diff --git a/samples/s390-ibm-linux-gnu/crosstool.config b/samples/s390-ibm-linux-gnu/crosstool.config
index 2312934..8648aa5 100644
--- a/samples/s390-ibm-linux-gnu/crosstool.config
+++ b/samples/s390-ibm-linux-gnu/crosstool.config
@@ -1,5 +1,5 @@
 CT_EXPERIMENTAL=y
-CT_ARCH_s390=y
-CT_KERNEL_linux=y
+CT_ARCH_S390=y
+CT_KERNEL_LINUX=y
 CT_BINUTILS_PLUGINS=y
 CT_CC_LANG_CXX=y
diff --git a/samples/s390x-ibm-linux-gnu/crosstool.config b/samples/s390x-ibm-linux-gnu/crosstool.config
index 97afa2e..32f06c0 100644
--- a/samples/s390x-ibm-linux-gnu/crosstool.config
+++ b/samples/s390x-ibm-linux-gnu/crosstool.config
@@ -1,5 +1,5 @@
-CT_ARCH_s390=y
+CT_ARCH_S390=y
 CT_ARCH_64=y
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
 CT_BINUTILS_PLUGINS=y
 CT_CC_LANG_CXX=y
diff --git a/samples/sh4-multilib-linux-gnu/crosstool.config b/samples/sh4-multilib-linux-gnu/crosstool.config
index 2055126..7965da6 100644
--- a/samples/sh4-multilib-linux-gnu/crosstool.config
+++ b/samples/sh4-multilib-linux-gnu/crosstool.config
@@ -1,9 +1,9 @@
-CT_ARCH_sh=y
+CT_ARCH_SH=y
 CT_ARCH_SH_SH4=y
 CT_TARGET_VENDOR="multilib"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
 CT_BINUTILS_PLUGINS=y
 CT_CC_GCC_MULTILIB_LIST="m4a"
 CT_CC_LANG_CXX=y
-CT_DEBUG_gdb=y
+CT_DEBUG_GDB=y
 # CT_GDB_CROSS_PYTHON is not set
diff --git a/samples/sh4-multilib-linux-uclibc/crosstool.config b/samples/sh4-multilib-linux-uclibc/crosstool.config
index c3c6eda..2fc3406 100644
--- a/samples/sh4-multilib-linux-uclibc/crosstool.config
+++ b/samples/sh4-multilib-linux-uclibc/crosstool.config
@@ -1,10 +1,10 @@
-CT_ARCH_sh=y
+CT_ARCH_SH=y
 CT_ARCH_SH_SH4=y
 CT_TARGET_VENDOR="multilib"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
 CT_BINUTILS_PLUGINS=y
-CT_LIBC_uClibc=y
+CT_LIBC_UCLIBC=y
 CT_CC_GCC_MULTILIB_LIST="m4a,m3"
 CT_CC_LANG_CXX=y
-CT_DEBUG_gdb=y
+CT_DEBUG_GDB=y
 # CT_GDB_CROSS_PYTHON is not set
diff --git a/samples/sh4-unknown-linux-gnu/crosstool.config b/samples/sh4-unknown-linux-gnu/crosstool.config
index 0972f31..36d806f 100644
--- a/samples/sh4-unknown-linux-gnu/crosstool.config
+++ b/samples/sh4-unknown-linux-gnu/crosstool.config
@@ -1,7 +1,7 @@
-CT_ARCH_sh=y
+CT_ARCH_SH=y
 CT_ARCH_SH_SH4=y
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
 CT_BINUTILS_PLUGINS=y
 CT_CC_LANG_CXX=y
-CT_DEBUG_gdb=y
+CT_DEBUG_GDB=y
 # CT_GDB_CROSS_PYTHON is not set
diff --git a/samples/sparc-leon-linux-uclibc/crosstool.config b/samples/sparc-leon-linux-uclibc/crosstool.config
index 016cf69..2b8e005 100644
--- a/samples/sparc-leon-linux-uclibc/crosstool.config
+++ b/samples/sparc-leon-linux-uclibc/crosstool.config
@@ -1,15 +1,15 @@
-CT_ARCH_sparc=y
+CT_ARCH_SPARC=y
 CT_ARCH_CPU="leon"
 CT_ARCH_TUNE="leon"
 CT_ARCH_FLOAT_SW=y
 CT_TARGET_VENDOR="leon"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
 CT_LINUX_V_3_10=y
-CT_LIBC_uClibc=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
-CT_DEBUG_gdb=y
+CT_DEBUG_GDB=y
diff --git a/samples/sparc-unknown-linux-gnu/crosstool.config b/samples/sparc-unknown-linux-gnu/crosstool.config
index 9590037..2b225c7 100644
--- a/samples/sparc-unknown-linux-gnu/crosstool.config
+++ b/samples/sparc-unknown-linux-gnu/crosstool.config
@@ -1,2 +1,2 @@
-CT_ARCH_sparc=y
-CT_KERNEL_linux=y
+CT_ARCH_SPARC=y
+CT_KERNEL_LINUX=y
diff --git a/samples/sparc64-multilib-linux-gnu/crosstool.config b/samples/sparc64-multilib-linux-gnu/crosstool.config
index 3cd2a30..7ee711f 100644
--- a/samples/sparc64-multilib-linux-gnu/crosstool.config
+++ b/samples/sparc64-multilib-linux-gnu/crosstool.config
@@ -1,5 +1,5 @@
-CT_ARCH_sparc=y
+CT_ARCH_SPARC=y
 CT_MULTILIB=y
 CT_ARCH_64=y
 CT_TARGET_VENDOR="multilib"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
diff --git a/samples/x86_64-centos6-linux-gnu/crosstool.config b/samples/x86_64-centos6-linux-gnu/crosstool.config
index a2375a4..ff2a2f2 100644
--- a/samples/x86_64-centos6-linux-gnu/crosstool.config
+++ b/samples/x86_64-centos6-linux-gnu/crosstool.config
@@ -1,10 +1,10 @@
 CT_OBSOLETE=y
-CT_ARCH_x86=y
+CT_ARCH_X86=y
 CT_ARCH_64=y
 CT_TARGET_VENDOR="centos6"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
 CT_LINUX_V_2_6_32=y
-CT_LIBC_glibc=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 db00ebb..21a02bb 100644
--- a/samples/x86_64-centos7-linux-gnu/crosstool.config
+++ b/samples/x86_64-centos7-linux-gnu/crosstool.config
@@ -1,10 +1,10 @@
 CT_OBSOLETE=y
-CT_ARCH_x86=y
+CT_ARCH_X86=y
 CT_ARCH_64=y
 CT_TARGET_VENDOR="centos7"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
 CT_LINUX_V_3_10=y
-CT_LIBC_glibc=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 dabac91..8c48504 100644
--- a/samples/x86_64-multilib-linux-gnu/crosstool.config
+++ b/samples/x86_64-multilib-linux-gnu/crosstool.config
@@ -1,15 +1,15 @@
-CT_ARCH_x86=y
+CT_ARCH_X86=y
 CT_MULTILIB=y
 CT_ARCH_64=y
 CT_TARGET_VENDOR="multilib"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=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_GLIBC=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
-CT_DEBUG_gdb=y
+CT_DEBUG_GDB=y
diff --git a/samples/x86_64-multilib-linux-musl/crosstool.config b/samples/x86_64-multilib-linux-musl/crosstool.config
index 7725879..a24f96f 100644
--- a/samples/x86_64-multilib-linux-musl/crosstool.config
+++ b/samples/x86_64-multilib-linux-musl/crosstool.config
@@ -1,15 +1,15 @@
 CT_EXPERIMENTAL=y
-CT_ARCH_x86=y
+CT_ARCH_X86=y
 CT_MULTILIB=y
 CT_ARCH_64=y
 CT_TARGET_VENDOR="multilib"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
 # CT_KERNEL_LINUX_INSTALL_CHECK is not set
 CT_BINUTILS_LINKER_LD_GOLD=y
 CT_BINUTILS_GOLD_THREADS=y
 CT_BINUTILS_LD_WRAPPER=y
 CT_BINUTILS_PLUGINS=y
-CT_LIBC_musl=y
+CT_LIBC_MUSL=y
 CT_CC_LANG_CXX=y
-CT_DEBUG_duma=y
-CT_DEBUG_gdb=y
+CT_DEBUG_DUMA=y
+CT_DEBUG_GDB=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 a243ac4..2902e5c 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
@@ -1,11 +1,11 @@
-CT_ARCH_powerpc=y
+CT_ARCH_POWERPC=y
 CT_TARGET_VENDOR=""
 CT_CANADIAN=y
 CT_HOST="x86_64-multilib-linux-uclibc"
 CT_BINUTILS_PLUGINS=y
 CT_CC_LANG_CXX=y
-CT_DEBUG_gdb=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
+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 c2fa7fa..1be0259 100644
--- a/samples/x86_64-multilib-linux-uclibc/crosstool.config
+++ b/samples/x86_64-multilib-linux-uclibc/crosstool.config
@@ -1,16 +1,16 @@
-CT_ARCH_x86=y
+CT_ARCH_X86=y
 CT_MULTILIB=y
 CT_ARCH_64=y
 CT_TARGET_VENDOR="multilib"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
 # CT_KERNEL_LINUX_INSTALL_CHECK is not set
 CT_BINUTILS_LINKER_LD_GOLD=y
 CT_BINUTILS_GOLD_THREADS=y
 CT_BINUTILS_LD_WRAPPER=y
 CT_BINUTILS_PLUGINS=y
-CT_LIBC_uClibc=y
+CT_LIBC_UCLIBC=y
 CT_LIBC_UCLIBC_WCHAR=y
 CT_CC_LANG_CXX=y
-CT_DEBUG_duma=y
-CT_DEBUG_gdb=y
+CT_DEBUG_DUMA=y
+CT_DEBUG_GDB=y
 CT_GDB_NATIVE=y
diff --git a/samples/x86_64-ubuntu12.04-linux-gnu/crosstool.config b/samples/x86_64-ubuntu12.04-linux-gnu/crosstool.config
index 0a177e9..f6ca1d4 100644
--- a/samples/x86_64-ubuntu12.04-linux-gnu/crosstool.config
+++ b/samples/x86_64-ubuntu12.04-linux-gnu/crosstool.config
@@ -1,10 +1,10 @@
 CT_OBSOLETE=y
-CT_ARCH_x86=y
+CT_ARCH_X86=y
 CT_ARCH_64=y
 CT_TARGET_VENDOR="ubuntu12.04"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
 CT_LINUX_V_3_2=y
-CT_LIBC_glibc=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 234d950..aef684e 100644
--- a/samples/x86_64-ubuntu14.04-linux-gnu/crosstool.config
+++ b/samples/x86_64-ubuntu14.04-linux-gnu/crosstool.config
@@ -1,10 +1,10 @@
 CT_OBSOLETE=y
-CT_ARCH_x86=y
+CT_ARCH_X86=y
 CT_ARCH_64=y
 CT_TARGET_VENDOR="ubuntu14.04"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
 CT_LINUX_V_3_13=y
-CT_LIBC_glibc=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 220f818..957a96c 100644
--- a/samples/x86_64-ubuntu16.04-linux-gnu/crosstool.config
+++ b/samples/x86_64-ubuntu16.04-linux-gnu/crosstool.config
@@ -1,10 +1,10 @@
 CT_OBSOLETE=y
-CT_ARCH_x86=y
+CT_ARCH_X86=y
 CT_ARCH_64=y
 CT_TARGET_VENDOR="ubuntu16.04"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
 CT_LINUX_V_4_4=y
-CT_LIBC_glibc=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 a499b61..c7a5d0d 100644
--- a/samples/x86_64-unknown-linux-gnu/crosstool.config
+++ b/samples/x86_64-unknown-linux-gnu/crosstool.config
@@ -1,12 +1,12 @@
-CT_ARCH_x86=y
+CT_ARCH_X86=y
 CT_ARCH_64=y
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=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_GLIBC=y
 CT_GLIBC_KERNEL_VERSION_NONE=y
 CT_CC_GCC_LNK_HASH_STYLE_BOTH=y
 CT_CC_LANG_CXX=y
-CT_DEBUG_gdb=y
+CT_DEBUG_GDB=y
diff --git a/samples/x86_64-unknown-linux-uclibc/crosstool.config b/samples/x86_64-unknown-linux-uclibc/crosstool.config
index 1cf57fb..a60163c 100644
--- a/samples/x86_64-unknown-linux-uclibc/crosstool.config
+++ b/samples/x86_64-unknown-linux-uclibc/crosstool.config
@@ -1,14 +1,14 @@
-CT_ARCH_x86=y
+CT_ARCH_X86=y
 CT_ARCH_64=y
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
 # CT_KERNEL_LINUX_INSTALL_CHECK is not set
 CT_BINUTILS_LINKER_LD_GOLD=y
 CT_BINUTILS_GOLD_THREADS=y
 CT_BINUTILS_LD_WRAPPER=y
 CT_BINUTILS_PLUGINS=y
-CT_LIBC_uClibc=y
+CT_LIBC_UCLIBC=y
 CT_LIBC_UCLIBC_WCHAR=y
 CT_CC_LANG_CXX=y
-CT_DEBUG_duma=y
-CT_DEBUG_gdb=y
+CT_DEBUG_DUMA=y
+CT_DEBUG_GDB=y
 CT_GDB_NATIVE=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 3d8cc41..c249088 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
@@ -1,5 +1,5 @@
 CT_EXPERIMENTAL=y
-CT_ARCH_arm=y
+CT_ARCH_ARM=y
 CT_ARCH_CPU="cortex-a9"
 CT_ARCH_FPU="neon"
 CT_ARCH_FLOAT_HW=y
@@ -7,17 +7,17 @@ CT_TARGET_VENDOR="cortexa9_neon"
 CT_CANADIAN=y
 CT_HOST="x86_64-w64-mingw32"
 CT_TOOLCHAIN_ENABLE_NLS=y
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
 CT_BINUTILS_LINKER_LD_GOLD=y
 CT_BINUTILS_GOLD_THREADS=y
 CT_BINUTILS_LD_WRAPPER=y
-CT_LIBC_glibc=y
+CT_LIBC_GLIBC=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
+CT_DEBUG_GDB=y
 # CT_GDB_CROSS_PYTHON is not set
 CT_GDB_NATIVE=y
 CT_GDB_NATIVE_STATIC=y
diff --git a/samples/x86_64-w64-mingw32,x86_64-pc-linux-gnu/crosstool.config b/samples/x86_64-w64-mingw32,x86_64-pc-linux-gnu/crosstool.config
index efd43a0..f10a91a 100644
--- a/samples/x86_64-w64-mingw32,x86_64-pc-linux-gnu/crosstool.config
+++ b/samples/x86_64-w64-mingw32,x86_64-pc-linux-gnu/crosstool.config
@@ -1,18 +1,18 @@
 CT_EXPERIMENTAL=y
 # CT_STRIP_HOST_TOOLCHAIN_EXECUTABLES is not set
-CT_ARCH_x86=y
+CT_ARCH_X86=y
 CT_ARCH_64=y
 CT_TARGET_VENDOR="pc"
 CT_CANADIAN=y
 CT_HOST="x86_64-w64-mingw32"
-CT_KERNEL_linux=y
+CT_KERNEL_LINUX=y
 CT_BINUTILS_LINKER_LD_GOLD=y
 CT_BINUTILS_GOLD_THREADS=y
 CT_BINUTILS_LD_WRAPPER=y
 CT_BINUTILS_FOR_TARGET=y
-CT_LIBC_glibc=y
+CT_LIBC_GLIBC=y
 CT_CC_LANG_CXX=y
-CT_DEBUG_ltrace=y
-CT_DEBUG_strace=y
-CT_COMP_TOOLS_libtool=y
-CT_COMP_TOOLS_make=y
+CT_DEBUG_LTRACE=y
+CT_DEBUG_STRACE=y
+CT_COMP_TOOLS_LIBTOOL=y
+CT_COMP_TOOLS_MAKE=y
diff --git a/samples/x86_64-w64-mingw32/crosstool.config b/samples/x86_64-w64-mingw32/crosstool.config
index 253cb1c..eda9c67 100644
--- a/samples/x86_64-w64-mingw32/crosstool.config
+++ b/samples/x86_64-w64-mingw32/crosstool.config
@@ -1,9 +1,9 @@
 CT_EXPERIMENTAL=y
-CT_ARCH_x86=y
+CT_ARCH_X86=y
 CT_MULTILIB=y
 CT_ARCH_64=y
 CT_TARGET_VENDOR="w64"
-CT_KERNEL_windows=y
+CT_KERNEL_WINDOWS=y
 CT_BINUTILS_PLUGINS=y
 CT_MINGW_DIRECTX=y
 CT_MINGW_DDK=y
diff --git a/samples/xtensa-fsf-linux-uclibc/crosstool.config b/samples/xtensa-fsf-linux-uclibc/crosstool.config
index ab82294..66c1ded 100644
--- a/samples/xtensa-fsf-linux-uclibc/crosstool.config
+++ b/samples/xtensa-fsf-linux-uclibc/crosstool.config
@@ -1,9 +1,9 @@
-CT_ARCH_xtensa=y
+CT_ARCH_XTENSA=y
 CT_ARCH_BE=y
 CT_TARGET_CFLAGS="-mlongcalls -mtext-section-literals"
 CT_TARGET_VENDOR="fsf"
-CT_KERNEL_linux=y
-CT_LIBC_uClibc=y
+CT_KERNEL_LINUX=y
+CT_LIBC_UCLIBC=y
 CT_LIBC_UCLIBC_WCHAR=y
 CT_CC_LANG_CXX=y
-CT_DEBUG_gdb=y
+CT_DEBUG_GDB=y
diff --git a/scripts/build/internals.sh b/scripts/build/internals.sh
index 07029d0..e407de8 100644
--- a/scripts/build/internals.sh
+++ b/scripts/build/internals.sh
@@ -69,7 +69,7 @@ do_finish() {
             CT_DoExecLog ALL "${CT_TARGET}-strip" ${strip_args}         \
                              "${CT_TARGET}/debug-root/usr/bin/gdbserver${exe_suffix}"
         fi
-        if [ "${CT_CC_gcc}" = "y" ]; then
+        if [ "${CT_CC_GCC}" = "y" ]; then
             # TBD GCC 3.x/2.x is no longer supported by ctng
             # We can not use the version in CT_GCC_VERSION because
             # of the Linaro stuff. So, harvest the version string
diff --git a/scripts/build/libc/newlib.sh b/scripts/build/libc/newlib.sh
index ff0f45b..05f9830 100644
--- a/scripts/build/libc/newlib.sh
+++ b/scripts/build/libc/newlib.sh
@@ -18,7 +18,7 @@ do_libc_start_files() {
     CT_DoStep INFO "Installing C library headers & start files"
     CT_DoExecLog ALL cp -a "${CT_SRC_DIR}/newlib/newlib/libc/include/." \
     "${CT_HEADERS_DIR}"
-    if [ "${CT_ARCH_xtensa}" = "y" ]; then
+    if [ "${CT_ARCH_XTENSA}" = "y" ]; then
         CT_DoLog EXTRA "Installing Xtensa headers"
         CT_DoExecLog ALL cp -r "${CT_SRC_DIR}/newlib/newlib/libc/sys/xtensa/include/."   \
                                "${CT_HEADERS_DIR}"
diff --git a/scripts/upgrade.sed b/scripts/upgrade.sed
new file mode 100644
index 0000000..2a05192
--- /dev/null
+++ b/scripts/upgrade.sed
@@ -0,0 +1,27 @@
+# After 1.23.0, generated config options were standardized to upper case
+s/\<CT_ARCH_(alpha|arm|avr|m68k|microblaze|mips|msp430|nios2|powerpc|s390|sh|sparc|x86|xtensa)\>/CT_ARCH_\U\1/g
+s/\<CT_BINUTILS_binutils\>/CT_BINUTILS_BINUTILS/g
+s/\<CT_CC_gcc\>/CT_CC_GCC/g
+s/\<CT_COMP_TOOLS_(autoconf|automake|libtool|m4|make)\>/CT_COMP_TOOLS_\U\1/g
+s/\<CT_DEBUG_(duma|gdb|ltrace|strace)\>/CT_DEBUG_\U\1/g
+s/\<CT_KERNEL_(bare_metal|linux|windows)\>/CT_KERNEL_\U\1/g
+s/\<CT_LIBC_(avr_libc|bionic|glibc|mingw|musl|newlib|none|uClibc)\>/CT_LIBC_\U\1/g
+
+# Also after 1.23.0, package versions were brought to the same format
+s/\<CT_LIBC_BIONIC_V_([0-9a-z]+)\>/CT_ANDROID_NDK_V_R\U\1/g
+s/\<CT_ANDROID_NDK_V_R15BETA1\>/CT_ANDROID_NDK_V_R15B/g
+s/\<CT_LIBC_AVR_LIBC_V_/CT_AVR_LIBC_V_/g
+s/\<CT_CC_GCC_V_/CT_GCC_V_/g
+s/\<CT_LIBC_GLIBC_V_/CT_GLIBC_V_/g
+s/\<CT_KERNEL_V_/CT_LINUX_V_/g
+s/\<CT_WINAPI_V_/CT_MINGW_W64_V_V/g
+s/\<CT_LIBC_MUSL_V_/CT_MUSL_V_/g
+s/\<CT_LIBC_NEWLIB_V_/CT_NEWLIB_V_/g
+s/\<CT_LIBC_UCLIBC_NG_V_/CT_UCLIBC_NG_V_/g
+
+# TBD add some way to ignore fast-changing parts, such as patchlevel in Linux or patchdate in newlib?
+
+# Special cases that need manual intervention (require setting of supporting options)
+s/\<CT_LIBC_UCLIBC_V_.*/# [&] not handled by upgrade script, use menuconfig./w/dev/stderr
+s/\<CT_[A-Za-z0-9_]*_SHOW_LINARO.*/# [&] not handled by upgrade script, use menuconfig./w/dev/stderr
+s/\<CT_[A-Za-z0-9_]*_CUSTOM_LOCATION.*/# [&] not handled by upgrade script, use menuconfig./w/dev/stderr