# CT_ARCH_m68k is not set
 # CT_ARCH_microblaze is not set
 # CT_ARCH_mips is not set
+# CT_ARCH_msp430 is not set
 # CT_ARCH_nios2 is not set
 # CT_ARCH_powerpc is not set
 # CT_ARCH_s390 is not set
 #
 CT_KERNEL_SUPPORTS_SHARED_LIBS=y
 CT_KERNEL="linux"
-CT_KERNEL_VERSION="custom"
+CT_KERNEL_VERSION="${KERNEL_VER}"
 # CT_KERNEL_bare_metal is not set
 CT_KERNEL_linux=y
 CT_KERNEL_LINUX_CUSTOM=y
 
                test $$NUM_CPUS -lt 1 && NUM_CPUS=1; \
                sed -i "s@^CT_PARALLEL_JOBS=.*@CT_PARALLEL_JOBS=$$NUM_CPUS@" .config; \
                \
-               cp -a $(PATCHES)/ct-ng/999-gcc-6.3-backport-fix-of-check-for-empty-string-in-ubsan.c.patch patches/gcc/$(GCC_VER_HD2); \
-               \
                export CST_UCLIBC_CONFIG="$(PATCHES)/ct-ng/ct-ng-uClibc-$(UCLIBC_VER).config"; \
                export CST_BASE_DIR=$(BASE_DIR); \
                export KERNEL_VER=$(CST_KERNEL_VERSION); \
 
 
 # crosstool-ng versions
 CT_NG_VER_HD1 = 1894239
-CT_NG_VER_HD2 = 1dbb06f2
+CT_NG_VER_HD2 = 872341e
 CT_NG_VER_ARM = 872341e
 
 ETHTOOL_VER = 4.17
 
 # Linaro GCC Versions
 GCC_VER_HD1 = linaro-4.9-2017.01
-GCC_VER_HD2 = linaro-6.3-2017.02
+GCC_VER_HD2 = linaro-6.3-2017.05
 
 # Dropbear is a relatively small SSH server and client
 DROPBEAR_VER=2018.76