diff --git a/build-config/conf/crosstool/gcc-8.5.0/uClibc-ng-1.0.38/crosstool.x86_64.config b/build-config/conf/crosstool/gcc-8.5.0/uClibc-ng-1.0.38/crosstool.x86_64.config
new file mode 100644
index 000000000..f6189fb74
--- /dev/null
+++ b/build-config/conf/crosstool/gcc-8.5.0/uClibc-ng-1.0.38/crosstool.x86_64.config
@@ -0,0 +1,873 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# crosstool-NG 1.28.0 Configuration
+#
+CT_CONFIGURE_has_static_link=y
+CT_CONFIGURE_has_cxx11=y
+CT_CONFIGURE_has_wget=y
+CT_CONFIGURE_has_curl=y
+CT_CONFIGURE_has_make_3_81_or_newer=y
+CT_CONFIGURE_has_make_4_0_or_newer=y
+CT_CONFIGURE_has_libtool_2_4_or_newer=y
+CT_CONFIGURE_has_libtoolize_2_4_or_newer=y
+CT_CONFIGURE_has_autoconf_2_65_or_newer=y
+CT_CONFIGURE_has_autoreconf_2_65_or_newer=y
+CT_CONFIGURE_has_automake_1_15_or_newer=y
+CT_CONFIGURE_has_gnu_m4_1_4_12_or_newer=y
+CT_CONFIGURE_has_python_3_4_or_newer=y
+CT_CONFIGURE_has_bison_2_7_or_newer=y
+CT_CONFIGURE_has_bison_3_0_4_or_newer=y
+CT_CONFIGURE_has_python=y
+CT_CONFIGURE_has_git=y
+CT_CONFIGURE_has_md5sum=y
+CT_CONFIGURE_has_sha1sum=y
+CT_CONFIGURE_has_sha256sum=y
+CT_CONFIGURE_has_sha512sum=y
+CT_CONFIGURE_has_install_with_strip_program=y
+CT_VERSION="1.28.0"
+CT_VCHECK=""
+CT_CONFIG_VERSION_ENV="4"
+CT_CONFIG_VERSION_CURRENT="4"
+CT_CONFIG_VERSION="4"
+CT_MODULES=y
+
+#
+# Paths and misc options
+#
+
+#
+# crosstool-NG behavior
+#
+# CT_OBSOLETE is not set
+# CT_EXPERIMENTAL is not set
+# CT_DEBUG_CT is not set
+
+#
+# Paths
+#
+CT_LOCAL_TARBALLS_DIR="${DOWNLOADDIR}"
+CT_SAVE_TARBALLS=y
+# CT_TARBALLS_BUILDROOT_LAYOUT is not set
+CT_WORK_DIR="${CT_TOP_DIR}/build"
+CT_BUILD_TOP_DIR="${CT_WORK_DIR:-${CT_TOP_DIR}/.build}/${CT_HOST:+HOST-${CT_HOST}/}${CT_TARGET}"
+CT_BUILD_DIR="${CT_BUILD_TOP_DIR}/build"
+CT_PREFIX_DIR="${XTOOLS_INSTALL_DIR}/${CT_TARGET}"
+CT_RM_RF_PREFIX_DIR=y
+CT_REMOVE_DOCS=y
+CT_INSTALL_LICENSES=y
+CT_PREFIX_DIR_RO=y
+CT_STRIP_HOST_TOOLCHAIN_EXECUTABLES=y
+CT_STRIP_TARGET_TOOLCHAIN_EXECUTABLES=y
+
+#
+# Downloading
+#
+# CT_DOWNLOAD_AGENT_WGET is not set
+# CT_DOWNLOAD_AGENT_CURL is not set
+CT_DOWNLOAD_AGENT_NONE=y
+CT_FORBID_DOWNLOAD=y
+
+#
+# Extracting
+#
+# CT_FORCE_EXTRACT is not set
+CT_OVERRIDE_CONFIG_GUESS_SUB=y
+# CT_ONLY_EXTRACT is not set
+# CT_PATCH_BUNDLED is not set
+CT_PATCH_BUNDLED_LOCAL=y
+CT_PATCH_ORDER="bundled,local"
+CT_PATCH_USE_LOCAL=y
+CT_LOCAL_PATCH_DIR="${CROSSTOOL_NG_LOCAL_PATCHDIR}"
+
+#
+# Build behavior
+#
+CT_PARALLEL_JOBS=0
+CT_LOAD=""
+CT_USE_PIPES=y
+CT_EXTRA_CFLAGS_FOR_BUILD=""
+CT_EXTRA_CXXFLAGS_FOR_BUILD=""
+CT_EXTRA_LDFLAGS_FOR_BUILD=""
+CT_EXTRA_CFLAGS_FOR_HOST=""
+CT_EXTRA_LDFLAGS_FOR_HOST=""
+# CT_CONFIG_SHELL_SH is not set
+# CT_CONFIG_SHELL_ASH is not set
+CT_CONFIG_SHELL_BASH=y
+# CT_CONFIG_SHELL_CUSTOM is not set
+CT_CONFIG_SHELL="${bash}"
+
+#
+# Logging
+#
+# CT_LOG_ERROR is not set
+# CT_LOG_WARN is not set
+CT_LOG_INFO=y
+# CT_LOG_EXTRA is not set
+# CT_LOG_ALL is not set
+# CT_LOG_DEBUG is not set
+CT_LOG_LEVEL_MAX="INFO"
+# CT_LOG_SEE_TOOLS_WARN is not set
+# CT_LOG_PROGRESS_BAR is not set
+CT_LOG_TO_FILE=y
+CT_LOG_FILE_COMPRESS=y
+# end of Paths and misc options
+
+#
+# Target options
+#
+# CT_ARCH_ALPHA is not set
+# CT_ARCH_ARC is not set
+# CT_ARCH_ARM is not set
+# CT_ARCH_AVR is not set
+# CT_ARCH_BPF is not set
+# CT_ARCH_M68K is not set
+# CT_ARCH_MIPS is not set
+# CT_ARCH_NIOS2 is not set
+# CT_ARCH_POWERPC is not set
+# CT_ARCH_PRU is not set
+# CT_ARCH_RISCV is not set
+# CT_ARCH_RX is not set
+# CT_ARCH_S390 is not set
+# CT_ARCH_SH is not set
+# CT_ARCH_SPARC is not set
+CT_ARCH_X86=y
+# CT_ARCH_XTENSA is not set
+CT_ARCH="x86"
+CT_ARCH_CHOICE_KSYM="X86"
+CT_ARCH_CPU=""
+CT_ARCH_TUNE=""
+CT_ARCH_X86_SHOW=y
+
+#
+# Options for x86
+#
+CT_ARCH_X86_PKG_KSYM=""
+CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR BPF C6X LM32 LOONGARCH M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 OPENRISC PARISC POWERPC PRU RISCV RX S390 SH SPARC TRICORE X86 XTENSA"
+CT_ARCH_SUFFIX=""
+# CT_OMIT_TARGET_VENDOR is not set
+
+#
+# Generic target options
+#
+# CT_MULTILIB is not set
+CT_DEMULTILIB=y
+CT_ARCH_USE_MMU=y
+CT_ARCH_SUPPORTS_LIBSANITIZER=y
+CT_ARCH_SUPPORTS_32=y
+CT_ARCH_SUPPORTS_64=y
+CT_ARCH_DEFAULT_32=y
+CT_ARCH_BITNESS=64
+# CT_ARCH_32 is not set
+CT_ARCH_64=y
+CT_ARCH_SUPPORTS_WITH_32_64=y
+
+#
+# Target optimisations
+#
+CT_ARCH_SUPPORTS_WITH_ARCH=y
+CT_ARCH_SUPPORTS_WITH_CPU=y
+CT_ARCH_SUPPORTS_WITH_TUNE=y
+CT_ARCH_ARCH=""
+CT_TARGET_CFLAGS=""
+CT_TARGET_LDFLAGS=""
+# end of Target options
+
+#
+# Toolchain options
+#
+
+#
+# General toolchain options
+#
+CT_FORCE_SYSROOT=y
+CT_USE_SYSROOT=y
+CT_SYSROOT_NAME="sysroot"
+CT_SYSROOT_DIR_PREFIX=""
+CT_WANTS_STATIC_LINK=y
+CT_WANTS_STATIC_LINK_CXX=y
+# CT_STATIC_TOOLCHAIN is not set
+CT_SHOW_CT_VERSION=y
+CT_TOOLCHAIN_PKGVERSION="ONIE-${LSB_RELEASE_TAG}"
+CT_TOOLCHAIN_BUGURL=""
+
+#
+# Tuple completion and aliasing
+#
+CT_TARGET_VENDOR="onie"
+CT_TARGET_ALIAS_SED_EXPR=""
+CT_TARGET_ALIAS="x86_64"
+
+#
+# Toolchain type
+#
+CT_CROSS=y
+# CT_CANADIAN is not set
+CT_TOOLCHAIN_TYPE="cross"
+
+#
+# Build system
+#
+CT_BUILD=""
+CT_BUILD_PREFIX=""
+CT_BUILD_SUFFIX=""
+
+#
+# Misc options
+#
+# CT_TOOLCHAIN_ENABLE_NLS is not set
+# CT_TOOLCHAIN_CMAKE_TOOLCHAIN_FILE is not set
+# end of Toolchain options
+
+#
+# Operating System
+#
+CT_KERNEL_SUPPORTS_SHARED_LIBS=y
+# CT_KERNEL_BARE_METAL is not set
+CT_KERNEL_LINUX=y
+CT_KERNEL="linux"
+CT_KERNEL_CHOICE_KSYM="LINUX"
+CT_KERNEL_LINUX_SHOW=y
+
+#
+# Options for linux
+#
+#  ONIE xtools.make will apply the value of LINUX_VERSION
+#  to set:
+#   CT_LINUX_VERSION a.b.c
+#   CT_LINUX_V_a_b=y
+#  Note this will require adding entries for newer kernels.
+CT_KERNEL_LINUX_PKG_KSYM="LINUX"
+CT_LINUX_DIR_NAME="linux"
+CT_LINUX_PKG_NAME="linux"
+CT_LINUX_SRC_RELEASE=y
+# CT_LINUX_SRC_DEVEL is not set
+CT_LINUX_PATCH_ORDER="global"
+# CT_LINUX_V_6_16 is not set
+# CT_LINUX_V_6_15 is not set
+# CT_LINUX_V_6_14 is not set
+# CT_LINUX_V_6_13 is not set
+# CT_LINUX_V_6_12 is not set
+# CT_LINUX_V_6_11 is not set
+# CT_LINUX_V_6_10 is not set
+# CT_LINUX_V_6_9 is not set
+# CT_LINUX_V_6_8 is not set
+# CT_LINUX_V_6_7 is not set
+# CT_LINUX_V_6_6 is not set
+# CT_LINUX_V_6_5 is not set
+# CT_LINUX_V_6_4 is not set
+# CT_LINUX_V_6_3 is not set
+# CT_LINUX_V_6_2 is not set
+# CT_LINUX_V_6_1 is not set
+# CT_LINUX_V_6_0 is not set
+# CT_LINUX_V_5_19 is not set
+# CT_LINUX_V_5_18 is not set
+# CT_LINUX_V_5_17 is not set
+# CT_LINUX_V_5_16 is not set
+# CT_LINUX_V_5_15 is not set
+# CT_LINUX_V_5_14 is not set
+# CT_LINUX_V_5_13 is not set
+# CT_LINUX_V_5_12 is not set
+# CT_LINUX_V_5_11 is not set
+# CT_LINUX_V_5_10 is not set
+# CT_LINUX_V_5_9 is not set
+# CT_LINUX_V_5_8 is not set
+# CT_LINUX_V_5_7 is not set
+# CT_LINUX_V_5_4 is not set
+# CT_LINUX_V_4_20 is not set
+# CT_LINUX_V_4_19 is not set
+# CT_LINUX_V_4_18 is not set
+# CT_LINUX_V_4_15 is not set
+# CT_LINUX_V_4_14 is not set
+# CT_LINUX_V_4_9 is not set
+# CT_LINUX_V_4_4 is not set
+# CT_LINUX_V_4_1 is not set
+# CT_LINUX_V_3_16 is not set
+# CT_LINUX_V_3_13 is not set
+# CT_LINUX_V_3_12 is not set
+# CT_LINUX_V_3_10 is not set
+# CT_LINUX_V_3_4 is not set
+# CT_LINUX_V_3_2 is not set
+# CT_LINUX_V_2_6_32 is not set
+# CT_LINUX_NO_VERSIONS is not set
+CT_LINUX_VERSION="ONIE set by xtools.make"
+CT_LINUX_MIRRORS="$(CT_Mirrors kernel.org linux ${CT_LINUX_VERSION})"
+CT_LINUX_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
+CT_LINUX_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
+CT_LINUX_ARCHIVE_FORMATS=".tar.xz .tar.gz"
+CT_LINUX_SIGNATURE_FORMAT="unpacked/.sign"
+CT_LINUX_5_19_or_older=y
+CT_LINUX_older_than_5_19=y
+CT_LINUX_5_12_or_older=y
+CT_LINUX_older_than_5_12=y
+CT_LINUX_5_5_or_older=y
+CT_LINUX_older_than_5_5=y
+CT_LINUX_later_than_5_3=y
+CT_LINUX_5_3_or_later=y
+CT_LINUX_later_than_4_8=y
+CT_LINUX_4_8_or_later=y
+CT_LINUX_later_than_3_7=y
+CT_LINUX_3_7_or_later=y
+CT_LINUX_later_than_3_2=y
+CT_LINUX_3_2_or_later=y
+CT_KERNEL_has_rsync=y
+CT_KERNEL_DEP_RSYNC=y
+CT_KERNEL_LINUX_VERBOSITY_0=y
+# CT_KERNEL_LINUX_VERBOSITY_1 is not set
+# CT_KERNEL_LINUX_VERBOSITY_2 is not set
+CT_KERNEL_LINUX_VERBOSE_LEVEL=0
+CT_ALL_KERNEL_CHOICES="BARE_METAL LINUX WINDOWS"
+
+#
+# Common kernel options
+#
+CT_SHARED_LIBS=y
+# end of Operating System
+
+#
+# Binary utilities
+#
+CT_ARCH_BINFMT_ELF=y
+CT_BINUTILS_BINUTILS=y
+CT_BINUTILS="binutils"
+CT_BINUTILS_CHOICE_KSYM="BINUTILS"
+CT_BINUTILS_BINUTILS_SHOW=y
+
+#
+# Options for binutils
+#
+CT_BINUTILS_BINUTILS_PKG_KSYM="BINUTILS"
+CT_BINUTILS_DIR_NAME="binutils"
+CT_BINUTILS_USE_GNU=y
+# CT_BINUTILS_USE_ORACLE is not set
+CT_BINUTILS_USE="BINUTILS"
+CT_BINUTILS_PKG_NAME="binutils"
+CT_BINUTILS_SRC_RELEASE=y
+# CT_BINUTILS_SRC_DEVEL is not set
+CT_BINUTILS_PATCH_ORDER="global"
+# CT_BINUTILS_V_2_45 is not set
+# CT_BINUTILS_V_2_44 is not set
+# CT_BINUTILS_V_2_43 is not set
+# CT_BINUTILS_V_2_42 is not set
+# CT_BINUTILS_V_2_41 is not set
+# CT_BINUTILS_V_2_40 is not set
+# CT_BINUTILS_V_2_39 is not set
+# CT_BINUTILS_V_2_38 is not set
+# CT_BINUTILS_V_2_37 is not set
+# CT_BINUTILS_V_2_36 is not set
+# CT_BINUTILS_V_2_35 is not set
+# CT_BINUTILS_V_2_34 is not set
+# CT_BINUTILS_V_2_33 is not set
+CT_BINUTILS_V_2_32=y
+# CT_BINUTILS_V_2_31 is not set
+# CT_BINUTILS_V_2_30 is not set
+# CT_BINUTILS_V_2_29 is not set
+# CT_BINUTILS_V_2_28 is not set
+# CT_BINUTILS_V_2_27 is not set
+# CT_BINUTILS_V_2_26 is not set
+CT_BINUTILS_VERSION="2.32"
+CT_BINUTILS_MIRRORS="$(CT_Mirrors GNU binutils) $(CT_Mirrors sourceware binutils/releases)"
+CT_BINUTILS_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
+CT_BINUTILS_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
+CT_BINUTILS_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz"
+CT_BINUTILS_SIGNATURE_FORMAT="packed/.sig"
+CT_BINUTILS_2_45_or_older=y
+CT_BINUTILS_older_than_2_45=y
+CT_BINUTILS_2_44_or_older=y
+CT_BINUTILS_older_than_2_44=y
+CT_BINUTILS_2_41_or_older=y
+CT_BINUTILS_older_than_2_41=y
+CT_BINUTILS_2_39_or_older=y
+CT_BINUTILS_older_than_2_39=y
+CT_BINUTILS_later_than_2_30=y
+CT_BINUTILS_2_30_or_later=y
+CT_BINUTILS_later_than_2_27=y
+CT_BINUTILS_2_27_or_later=y
+CT_BINUTILS_later_than_2_26=y
+CT_BINUTILS_2_26_or_later=y
+
+#
+# GNU binutils
+#
+CT_BINUTILS_GOLD_SUPPORTS_ARCH=y
+CT_BINUTILS_HAS_GOLD=y
+CT_BINUTILS_GOLD_SUPPORT=y
+CT_BINUTILS_LINKER_LD=y
+# CT_BINUTILS_LINKER_GOLD is not set
+# CT_BINUTILS_LINKER_LD_GOLD is not set
+# CT_BINUTILS_LINKER_GOLD_LD is not set
+CT_BINUTILS_LINKERS_LIST="ld"
+CT_BINUTILS_LINKER_DEFAULT="bfd"
+# CT_BINUTILS_PLUGINS is not set
+CT_BINUTILS_RELRO=m
+CT_BINUTILS_DETERMINISTIC_ARCHIVES=y
+CT_BINUTILS_EXTRA_CONFIG_ARRAY=""
+CT_BINUTILS_FOR_TARGET=y
+# CT_BINUTILS_GPROFNG is not set
+CT_BINUTILS_FOR_TARGET_IBERTY=y
+CT_BINUTILS_FOR_TARGET_BFD=y
+CT_BINUTILS_FOR_TARGET_OPCODES=y
+CT_ALL_BINUTILS_CHOICES="BINUTILS"
+# end of Binary utilities
+
+#
+# C-library
+#
+# CT_LIBC_GLIBC is not set
+# CT_LIBC_MUSL is not set
+CT_LIBC_UCLIBC_NG=y
+CT_LIBC="uClibc-ng"
+CT_LIBC_CHOICE_KSYM="UCLIBC_NG"
+CT_THREADS="nptl"
+CT_LIBC_UCLIBC_NG_SHOW=y
+
+#
+# Options for uClibc-ng
+#
+CT_LIBC_UCLIBC_NG_PKG_KSYM="UCLIBC_NG"
+CT_UCLIBC_NG_DIR_NAME="uClibc-ng"
+CT_UCLIBC_NG_PKG_NAME="uClibc-ng"
+CT_UCLIBC_NG_SRC_RELEASE=y
+# CT_UCLIBC_NG_SRC_DEVEL is not set
+CT_UCLIBC_NG_PATCH_ORDER="global"
+# CT_UCLIBC_NG_V_1_0_54 is not set
+# CT_UCLIBC_NG_V_1_0_52 is not set
+# CT_UCLIBC_NG_V_1_0_50 is not set
+# CT_UCLIBC_NG_V_1_0_49 is not set
+# CT_UCLIBC_NG_V_1_0_48 is not set
+# CT_UCLIBC_NG_V_1_0_43 is not set
+# CT_UCLIBC_NG_V_1_0_42 is not set
+# CT_UCLIBC_NG_V_1_0_39 is not set
+CT_UCLIBC_NG_V_1_0_38=y
+# CT_UCLIBC_NG_V_1_0_36 is not set
+# CT_UCLIBC_NG_V_1_0_33 is not set
+# CT_UCLIBC_NG_V_1_0_32 is not set
+# CT_UCLIBC_NG_V_1_0_31 is not set
+# CT_UCLIBC_NG_V_1_0_30 is not set
+# CT_UCLIBC_NG_V_1_0_29 is not set
+# CT_UCLIBC_NG_V_1_0_28 is not set
+# CT_UCLIBC_NG_V_1_0_27 is not set
+# CT_UCLIBC_NG_V_1_0_26 is not set
+# CT_UCLIBC_NG_V_1_0_25 is not set
+CT_UCLIBC_NG_VERSION="1.0.38"
+CT_UCLIBC_NG_MIRRORS="http://downloads.uclibc-ng.org/releases/${CT_UCLIBC_NG_VERSION}"
+CT_UCLIBC_NG_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
+CT_UCLIBC_NG_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
+CT_UCLIBC_NG_ARCHIVE_FORMATS=".tar.xz .tar.lz .tar.bz2 .tar.gz"
+CT_UCLIBC_NG_SIGNATURE_FORMAT="packed/.asc"
+CT_LIBC_UCLIBC_VERBOSITY_0=y
+# CT_LIBC_UCLIBC_VERBOSITY_1 is not set
+# CT_LIBC_UCLIBC_VERBOSITY_2 is not set
+CT_LIBC_UCLIBC_VERBOSITY=""
+CT_LIBC_UCLIBC_DEBUG_LEVEL_0=y
+# CT_LIBC_UCLIBC_DEBUG_LEVEL_1 is not set
+# CT_LIBC_UCLIBC_DEBUG_LEVEL_2 is not set
+# CT_LIBC_UCLIBC_DEBUG_LEVEL_3 is not set
+CT_LIBC_UCLIBC_DEBUG_LEVEL=0
+CT_LIBC_UCLIBC_CONFIG_FILE="${UCLIBC_CONFIG}"
+CT_LIBC_UCLIBC_LOCALES=y
+# CT_LIBC_UCLIBC_LIBICONV is not set
+CT_LIBC_UCLIBC_IPV6=y
+CT_LIBC_UCLIBC_WCHAR=y
+CT_LIBC_UCLIBC_FENV=y
+CT_LIBC_UCLIBC_HAS_SSP=y
+# CT_LIBC_UCLIBC_BUILD_SSP is not set
+CT_ALL_LIBC_CHOICES="AVR_LIBC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE PICOLIBC UCLIBC_NG"
+CT_LIBC_SUPPORT_THREADS_ANY=y
+CT_LIBC_SUPPORT_THREADS_NATIVE=y
+CT_LIBC_SUPPORT_THREADS_LT=y
+CT_LIBC_SUPPORT_THREADS_NONE=y
+
+#
+# Common C library options
+#
+CT_THREADS_NATIVE=y
+# CT_THREADS_LT is not set
+# CT_THREADS_NONE is not set
+# CT_CREATE_LDSO_CONF is not set
+CT_LIBC_XLDD=y
+# end of C-library
+
+#
+# C compiler
+#
+CT_CC_CORE_NEEDED=y
+CT_CC_SUPPORT_CXX=y
+CT_CC_SUPPORT_FORTRAN=y
+CT_CC_SUPPORT_ADA=y
+CT_CC_SUPPORT_OBJC=y
+CT_CC_SUPPORT_OBJCXX=y
+CT_CC_SUPPORT_GOLANG=y
+CT_CC_GCC=y
+CT_CC="gcc"
+CT_CC_CHOICE_KSYM="GCC"
+CT_CC_GCC_SHOW=y
+
+#
+# Options for gcc
+#
+CT_CC_GCC_PKG_KSYM="GCC"
+CT_GCC_DIR_NAME="gcc"
+CT_GCC_USE_GNU=y
+# CT_GCC_USE_ORACLE is not set
+CT_GCC_USE="GCC"
+CT_GCC_PKG_NAME="gcc"
+CT_GCC_SRC_RELEASE=y
+# CT_GCC_SRC_DEVEL is not set
+CT_GCC_PATCH_ORDER="global"
+# CT_GCC_V_15 is not set
+# CT_GCC_V_14 is not set
+# CT_GCC_V_13 is not set
+# CT_GCC_V_12 is not set
+# CT_GCC_V_11 is not set
+# CT_GCC_V_10 is not set
+# CT_GCC_V_9 is not set
+CT_GCC_V_8=y
+# CT_GCC_V_7 is not set
+# CT_GCC_V_6 is not set
+# CT_GCC_V_5 is not set
+# CT_GCC_V_4_9 is not set
+CT_GCC_VERSION="8.5.0"
+CT_GCC_MIRRORS="$(CT_Mirrors GNU gcc/gcc-${CT_GCC_VERSION}) $(CT_Mirrors sourceware gcc/releases/gcc-${CT_GCC_VERSION})"
+CT_GCC_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
+CT_GCC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
+CT_GCC_ARCHIVE_FORMATS=".tar.xz .tar.gz"
+CT_GCC_SIGNATURE_FORMAT=""
+CT_GCC_15_or_older=y
+CT_GCC_older_than_15=y
+CT_GCC_14_or_older=y
+CT_GCC_older_than_14=y
+CT_GCC_13_or_older=y
+CT_GCC_older_than_13=y
+CT_GCC_12_or_older=y
+CT_GCC_older_than_12=y
+CT_GCC_11_or_older=y
+CT_GCC_older_than_11=y
+CT_GCC_10_or_older=y
+CT_GCC_older_than_10=y
+CT_GCC_9_or_older=y
+CT_GCC_older_than_9=y
+CT_GCC_later_than_8=y
+CT_GCC_8_or_later=y
+CT_GCC_later_than_7=y
+CT_GCC_7_or_later=y
+CT_GCC_later_than_6=y
+CT_GCC_6_or_later=y
+CT_GCC_later_than_5=y
+CT_GCC_5_or_later=y
+CT_GCC_later_than_4_9=y
+CT_GCC_4_9_or_later=y
+CT_CC_GCC_HAS_LIBMPX=y
+CT_CC_GCC_ENABLE_CXX_FLAGS=""
+CT_CC_GCC_CORE_EXTRA_CONFIG_ARRAY=""
+CT_CC_GCC_EXTRA_CONFIG_ARRAY=""
+CT_CC_GCC_STATIC_LIBSTDCXX=y
+# CT_CC_GCC_SYSTEM_ZLIB is not set
+CT_CC_GCC_CONFIG_TLS=m
+
+#
+# Optimisation features
+#
+CT_CC_GCC_USE_GRAPHITE=y
+CT_CC_GCC_USE_LTO=y
+
+#
+# Settings for libraries running on target
+#
+# CT_CC_GCC_ENABLE_DEFAULT_PIE is not set
+CT_CC_GCC_ENABLE_TARGET_OPTSPACE=y
+CT_CC_GCC_LIBSTDCXX=m
+# CT_CC_GCC_LIBSTDCXX_HOSTED_DISABLE is not set
+CT_CC_GCC_LIBSTDCXX_TARGET_CXXFLAGS=""
+# CT_CC_GCC_LIBMUDFLAP is not set
+# CT_CC_GCC_LIBGOMP is not set
+# CT_CC_GCC_LIBSSP is not set
+# CT_CC_GCC_LIBQUADMATH is not set
+# CT_CC_GCC_LIBMPX is not set
+CT_CC_GCC_LIBSTDCXX_VERBOSE=m
+
+#
+# Misc. obscure options.
+#
+CT_CC_CXA_ATEXIT=y
+# CT_CC_GCC_DISABLE_PCH is not set
+CT_CC_GCC_SJLJ_EXCEPTIONS=m
+CT_CC_GCC_LDBL_128=m
+# CT_CC_GCC_BUILD_ID is not set
+CT_CC_GCC_LNK_HASH_STYLE_DEFAULT=y
+# CT_CC_GCC_LNK_HASH_STYLE_SYSV is not set
+# CT_CC_GCC_LNK_HASH_STYLE_GNU is not set
+# CT_CC_GCC_LNK_HASH_STYLE_BOTH is not set
+CT_CC_GCC_LNK_HASH_STYLE=""
+CT_CC_GCC_DEC_FLOATS_AUTO=y
+# CT_CC_GCC_DEC_FLOATS_BID is not set
+# CT_CC_GCC_DEC_FLOATS_DPD is not set
+# CT_CC_GCC_DEC_FLOATS_NO is not set
+CT_CC_GCC_DEC_FLOATS=""
+CT_ALL_CC_CHOICES="GCC"
+
+#
+# Additional supported languages:
+#
+CT_CC_LANG_CXX=y
+# CT_CC_LANG_FORTRAN is not set
+# end of C compiler
+
+#
+# Linkers
+#
+
+#
+# BFD enabled in binutils
+#
+# CT_LINKER_MOLD is not set
+CT_ALL_LINKER_CHOICES="MOLD"
+# end of Linkers
+
+#
+# Debug facilities
+#
+# CT_DEBUG_DUMA is not set
+# CT_DEBUG_GDB is not set
+# CT_DEBUG_LTRACE is not set
+CT_DEBUG_STRACE=y
+CT_DEBUG_STRACE_PKG_KSYM="STRACE"
+CT_STRACE_DIR_NAME="strace"
+CT_STRACE_PKG_NAME="strace"
+CT_STRACE_SRC_RELEASE=y
+# CT_STRACE_SRC_DEVEL is not set
+CT_STRACE_PATCH_ORDER="global"
+CT_STRACE_V_6_16=y
+CT_STRACE_VERSION="6.16"
+CT_STRACE_MIRRORS="https://strace.io/files/${CT_STRACE_VERSION} https://github.com/strace/strace/releases/download/v${CT_STRACE_VERSION}"
+CT_STRACE_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
+CT_STRACE_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
+CT_STRACE_ARCHIVE_FORMATS=".tar.xz"
+CT_STRACE_SIGNATURE_FORMAT=""
+CT_ALL_DEBUG_CHOICES="DUMA GDB LTRACE STRACE"
+# end of Debug facilities
+
+#
+# Companion libraries
+#
+# CT_COMPLIBS_CHECK is not set
+# CT_COMP_LIBS_CLOOG is not set
+# CT_COMP_LIBS_EXPAT is not set
+# CT_COMP_LIBS_GETTEXT is not set
+CT_COMP_LIBS_GMP=y
+CT_COMP_LIBS_GMP_PKG_KSYM="GMP"
+CT_GMP_DIR_NAME="gmp"
+CT_GMP_PKG_NAME="gmp"
+CT_GMP_SRC_RELEASE=y
+# CT_GMP_SRC_DEVEL is not set
+CT_GMP_PATCH_ORDER="global"
+CT_GMP_V_6_3=y
+# CT_GMP_V_6_2 is not set
+# CT_GMP_V_6_1 is not set
+CT_GMP_VERSION="6.3.0"
+CT_GMP_MIRRORS="https://gmplib.org/download/gmp https://gmplib.org/download/gmp/archive $(CT_Mirrors GNU gmp)"
+CT_GMP_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
+CT_GMP_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
+CT_GMP_ARCHIVE_FORMATS=".tar.xz .tar.lz .tar.bz2"
+CT_GMP_SIGNATURE_FORMAT="packed/.sig"
+CT_GMP_EXTRA_CFLAGS="-std=gnu17"
+CT_COMP_LIBS_ISL=y
+CT_COMP_LIBS_ISL_PKG_KSYM="ISL"
+CT_ISL_DIR_NAME="isl"
+CT_ISL_PKG_NAME="isl"
+CT_ISL_SRC_RELEASE=y
+# CT_ISL_SRC_DEVEL is not set
+CT_ISL_PATCH_ORDER="global"
+CT_ISL_V_0_27=y
+# CT_ISL_V_0_26 is not set
+# CT_ISL_V_0_25 is not set
+# CT_ISL_V_0_24 is not set
+# CT_ISL_V_0_23 is not set
+# CT_ISL_V_0_22 is not set
+# CT_ISL_V_0_21 is not set
+# CT_ISL_V_0_20 is not set
+# CT_ISL_V_0_19 is not set
+# CT_ISL_V_0_18 is not set
+# CT_ISL_V_0_17 is not set
+# CT_ISL_V_0_16 is not set
+# CT_ISL_V_0_15 is not set
+CT_ISL_VERSION="0.27"
+CT_ISL_MIRRORS="https://libisl.sourceforge.io"
+CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
+CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
+CT_ISL_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz"
+CT_ISL_SIGNATURE_FORMAT=""
+CT_ISL_later_than_0_18=y
+CT_ISL_0_18_or_later=y
+CT_ISL_later_than_0_15=y
+CT_ISL_0_15_or_later=y
+# CT_COMP_LIBS_LIBELF is not set
+# CT_COMP_LIBS_LIBICONV is not set
+CT_COMP_LIBS_MPC=y
+CT_COMP_LIBS_MPC_PKG_KSYM="MPC"
+CT_MPC_DIR_NAME="mpc"
+CT_MPC_PKG_NAME="mpc"
+CT_MPC_SRC_RELEASE=y
+# CT_MPC_SRC_DEVEL is not set
+CT_MPC_PATCH_ORDER="global"
+CT_MPC_V_1_3=y
+CT_MPC_VERSION="1.3.1"
+CT_MPC_MIRRORS="https://www.multiprecision.org/downloads $(CT_Mirrors GNU mpc)"
+CT_MPC_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
+CT_MPC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
+CT_MPC_ARCHIVE_FORMATS=".tar.gz"
+CT_MPC_SIGNATURE_FORMAT="packed/.sig"
+CT_COMP_LIBS_MPFR=y
+CT_COMP_LIBS_MPFR_PKG_KSYM="MPFR"
+CT_MPFR_DIR_NAME="mpfr"
+CT_MPFR_PKG_NAME="mpfr"
+CT_MPFR_SRC_RELEASE=y
+# CT_MPFR_SRC_DEVEL is not set
+CT_MPFR_PATCH_ORDER="global"
+CT_MPFR_V_4_2=y
+CT_MPFR_VERSION="4.2.2"
+CT_MPFR_MIRRORS="https://www.mpfr.org/mpfr-${CT_MPFR_VERSION} $(CT_Mirrors GNU mpfr)"
+CT_MPFR_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
+CT_MPFR_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
+CT_MPFR_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz .zip"
+CT_MPFR_SIGNATURE_FORMAT="packed/.asc"
+# CT_COMP_LIBS_NCURSES is not set
+CT_COMP_LIBS_ZLIB=y
+CT_COMP_LIBS_ZLIB_PKG_KSYM="ZLIB"
+CT_ZLIB_DIR_NAME="zlib"
+CT_ZLIB_PKG_NAME="zlib"
+CT_ZLIB_SRC_RELEASE=y
+# CT_ZLIB_SRC_DEVEL is not set
+CT_ZLIB_PATCH_ORDER="global"
+CT_ZLIB_V_1_3_1=y
+# CT_ZLIB_V_1_2_13 is not set
+CT_ZLIB_VERSION="1.3.1"
+CT_ZLIB_MIRRORS="https://github.com/madler/zlib/releases/download/v${CT_ZLIB_VERSION} https://www.zlib.net/"
+CT_ZLIB_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
+CT_ZLIB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
+CT_ZLIB_ARCHIVE_FORMATS=".tar.xz .tar.gz"
+CT_ZLIB_SIGNATURE_FORMAT="packed/.asc"
+CT_COMP_LIBS_ZSTD=y
+CT_COMP_LIBS_ZSTD_PKG_KSYM="ZSTD"
+CT_ZSTD_DIR_NAME="zstd"
+CT_ZSTD_PKG_NAME="zstd"
+CT_ZSTD_SRC_RELEASE=y
+# CT_ZSTD_SRC_DEVEL is not set
+CT_ZSTD_PATCH_ORDER="global"
+CT_ZSTD_V_1_5_7=y
+# CT_ZSTD_V_1_5_6 is not set
+# CT_ZSTD_V_1_5_5 is not set
+# CT_ZSTD_V_1_5_2 is not set
+CT_ZSTD_VERSION="1.5.7"
+CT_ZSTD_MIRRORS="https://github.com/facebook/zstd/releases/download/v${CT_ZSTD_VERSION} https://downloads.sourceforge.net/project/zstandard.mirror/v${CT_ZSTD_VERSION}"
+CT_ZSTD_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
+CT_ZSTD_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
+CT_ZSTD_ARCHIVE_FORMATS=".tar.gz"
+CT_ZSTD_SIGNATURE_FORMAT="packed/.sig"
+CT_ALL_COMP_LIBS_CHOICES="CLOOG EXPAT GETTEXT GMP GNUPRUMCU ISL LIBELF LIBICONV MPC MPFR NCURSES NEWLIB_NANO PICOLIBC ZLIB ZSTD"
+# CT_LIBICONV_NEEDED is not set
+# CT_GETTEXT_NEEDED is not set
+CT_GMP_NEEDED=y
+CT_MPFR_NEEDED=y
+CT_ISL_NEEDED=y
+CT_MPC_NEEDED=y
+CT_ZLIB_NEEDED=y
+CT_ZSTD_NEEDED=y
+CT_GMP=y
+CT_MPFR=y
+CT_ISL=y
+CT_MPC=y
+CT_ZLIB=y
+CT_ZSTD=y
+# end of Companion libraries
+
+#
+# Companion tools
+#
+# CT_COMP_TOOLS_FOR_HOST is not set
+CT_COMP_TOOLS_AUTOCONF=y
+CT_COMP_TOOLS_AUTOCONF_PKG_KSYM="AUTOCONF"
+CT_AUTOCONF_DIR_NAME="autoconf"
+CT_AUTOCONF_PKG_NAME="autoconf"
+CT_AUTOCONF_SRC_RELEASE=y
+# CT_AUTOCONF_SRC_DEVEL is not set
+CT_AUTOCONF_PATCH_ORDER="global"
+CT_AUTOCONF_V_2_72=y
+# CT_AUTOCONF_V_2_71 is not set
+# CT_AUTOCONF_V_2_69 is not set
+# CT_AUTOCONF_V_2_65 is not set
+CT_AUTOCONF_VERSION="2.72"
+CT_AUTOCONF_MIRRORS="$(CT_Mirrors GNU autoconf)"
+CT_AUTOCONF_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
+CT_AUTOCONF_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
+CT_AUTOCONF_ARCHIVE_FORMATS=".tar.xz .tar.gz"
+CT_AUTOCONF_SIGNATURE_FORMAT="packed/.sig"
+CT_COMP_TOOLS_AUTOMAKE=y
+CT_COMP_TOOLS_AUTOMAKE_PKG_KSYM="AUTOMAKE"
+CT_AUTOMAKE_DIR_NAME="automake"
+CT_AUTOMAKE_PKG_NAME="automake"
+CT_AUTOMAKE_SRC_RELEASE=y
+# CT_AUTOMAKE_SRC_DEVEL is not set
+CT_AUTOMAKE_PATCH_ORDER="global"
+CT_AUTOMAKE_V_1_17=y
+# CT_AUTOMAKE_V_1_16 is not set
+# CT_AUTOMAKE_V_1_15 is not set
+CT_AUTOMAKE_VERSION="1.17"
+CT_AUTOMAKE_MIRRORS="$(CT_Mirrors GNU automake)"
+CT_AUTOMAKE_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
+CT_AUTOMAKE_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
+CT_AUTOMAKE_ARCHIVE_FORMATS=".tar.xz .tar.gz"
+CT_AUTOMAKE_SIGNATURE_FORMAT="packed/.sig"
+# CT_COMP_TOOLS_BISON is not set
+# CT_COMP_TOOLS_DTC is not set
+CT_COMP_TOOLS_LIBTOOL=y
+CT_COMP_TOOLS_LIBTOOL_PKG_KSYM="LIBTOOL"
+CT_LIBTOOL_DIR_NAME="libtool"
+CT_LIBTOOL_PKG_NAME="libtool"
+CT_LIBTOOL_SRC_RELEASE=y
+# CT_LIBTOOL_SRC_DEVEL is not set
+CT_LIBTOOL_PATCH_ORDER="global"
+CT_LIBTOOL_V_2_5=y
+# CT_LIBTOOL_V_2_4 is not set
+CT_LIBTOOL_VERSION="2.5.4"
+CT_LIBTOOL_MIRRORS="$(CT_Mirrors GNU libtool)"
+CT_LIBTOOL_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
+CT_LIBTOOL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
+CT_LIBTOOL_ARCHIVE_FORMATS=".tar.xz .tar.gz"
+CT_LIBTOOL_SIGNATURE_FORMAT="packed/.sig"
+CT_COMP_TOOLS_M4=y
+CT_COMP_TOOLS_M4_PKG_KSYM="M4"
+CT_M4_DIR_NAME="m4"
+CT_M4_PKG_NAME="m4"
+CT_M4_SRC_RELEASE=y
+# CT_M4_SRC_DEVEL is not set
+CT_M4_PATCH_ORDER="global"
+CT_M4_V_1_4=y
+CT_M4_VERSION="1.4.20"
+CT_M4_MIRRORS="$(CT_Mirrors GNU m4)"
+CT_M4_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
+CT_M4_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
+CT_M4_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz"
+CT_M4_SIGNATURE_FORMAT="packed/.sig"
+CT_COMP_TOOLS_MAKE=y
+CT_COMP_TOOLS_MAKE_PKG_KSYM="MAKE"
+CT_MAKE_DIR_NAME="make"
+CT_MAKE_PKG_NAME="make"
+CT_MAKE_SRC_RELEASE=y
+# CT_MAKE_SRC_DEVEL is not set
+CT_MAKE_PATCH_ORDER="global"
+CT_MAKE_V_4_4=y
+# CT_MAKE_V_4_3 is not set
+CT_MAKE_VERSION="4.4.1"
+CT_MAKE_MIRRORS="$(CT_Mirrors GNU make)"
+CT_MAKE_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
+CT_MAKE_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
+CT_MAKE_ARCHIVE_FORMATS=".tar.lz .tar.gz"
+CT_MAKE_SIGNATURE_FORMAT="packed/.sig"
+CT_MAKE_later_than_4_4=y
+CT_MAKE_4_4_or_later=y
+CT_MAKE_later_than_4_3=y
+CT_MAKE_4_3_or_later=y
+# CT_MAKE_GMAKE_SYMLINK is not set
+# CT_MAKE_GNUMAKE_SYMLINK is not set
+CT_ALL_COMP_TOOLS_CHOICES="AUTOCONF AUTOMAKE BISON DTC LIBTOOL M4 MAKE"
+# end of Companion tools
diff --git a/build-config/make/crosstool-ng.make b/build-config/make/crosstool-ng.make
index 1ceb90604..27e60e678 100644
--- a/build-config/make/crosstool-ng.make
+++ b/build-config/make/crosstool-ng.make
@@ -24,14 +24,14 @@ XTOOLS_LIBC_VERSION 		?= 1.0.38
 
 # http://crosstool-ng.github.io/
 CROSSTOOL_NG_DESC		= crosstool-NG
-CROSSTOOL_NG_VERSION		= 1.24.0
+CROSSTOOL_NG_VERSION		?= 1.24.0
 CROSSTOOL_NG_TARBALL		= crosstool-ng-$(CROSSTOOL_NG_VERSION).tar.xz
-CROSSTOOL_NG_URLS		+= $(ONIE_MIRROR) http://crosstool-ng.org/download/crosstool-ng
+CROSSTOOL_NG_URLS		+= $(ONIE_MIRROR) https://github.com/crosstool-ng/crosstool-ng/releases/download/crosstool-ng-$(CROSSTOOL_NG_VERSION)/
 CROSSTOOL_NG_BUILD_DIR		= $(BUILDDIR)/crosstool-ng
 CROSSTOOL_NG_STAMP_DIR		= $(CROSSTOOL_NG_BUILD_DIR)/stamp
 CROSSTOOL_NG_DIR		= $(CROSSTOOL_NG_BUILD_DIR)/crosstool-ng-$(CROSSTOOL_NG_VERSION)
 
-CROSSTOOL_NG_SRCPATCHDIR	= $(PATCHDIR)/crosstool-NG
+CROSSTOOL_NG_SRCPATCHDIR	= $(PATCHDIR)/crosstool-NG/$(CROSSTOOL_NG_VERSION)
 CROSSTOOL_NG_LOCAL_PATCHDIR	= $(CROSSTOOL_NG_SRCPATCHDIR)/local
 CROSSTOOL_NG_DOWNLOAD_STAMP	= $(DOWNLOADDIR)/crosstool-ng-$(CROSSTOOL_NG_VERSION)-download
 CROSSTOOL_NG_SOURCE_STAMP	= $(CROSSTOOL_NG_STAMP_DIR)/crosstool-ng-source
diff --git a/build-config/make/images.make b/build-config/make/images.make
index 02cc36fbf..f6dff2846 100644
--- a/build-config/make/images.make
+++ b/build-config/make/images.make
@@ -201,6 +201,8 @@ ifeq ($(REQUIRE_CXX_LIBS),yes)
     SYSROOT_LIBS += libstdc++.so.6.0.20
   else ifeq ($(GCC_VERSION),8.3.0)
     SYSROOT_LIBS += libstdc++.so.6.0.25
+  else ifeq ($(GCC_VERSION),8.5.0)
+    SYSROOT_LIBS += libstdc++.so.6.0.25
   else
     $(error C++ support: Unsupported GCC version: $(GCC_VERSION))
   endif
diff --git a/build-config/make/xtools.make b/build-config/make/xtools.make
index a4fbad85a..ca2dd4973 100644
--- a/build-config/make/xtools.make
+++ b/build-config/make/xtools.make
@@ -43,6 +43,15 @@ PHONY += xtools xtools-prep xtools-download xtools-config \
 	 xtools-build xtools-clean xtools-distclean uclibc-menuconfig
 
 # List of common packages needed by crosstool-NG
+ifeq ($(CROSSTOOL_NG_VERSION),1.28.0)
+CT_NG_COMPONENTS =	\
+	autoconf-2.72.tar.xz		\
+	automake-1.17.tar.xz		\
+	libelf-0.8.13.tar.gz		\
+	libtool-2.5.4.tar.xz		\
+	m4-1.4.20.tar.xz		\
+	make-4.4.1.tar.gz
+else
 CT_NG_COMPONENTS =	\
 	autoconf-2.69.tar.xz		\
 	automake-1.15.1.tar.xz		\
@@ -55,8 +64,21 @@ CT_NG_COMPONENTS =	\
 	m4-1.4.18.tar.xz		\
 	make-4.2.1.tar.bz2		\
 	ncurses-6.0.tar.gz
+endif
 
-ifeq ($(GCC_VERSION),8.3.0)
+ifeq ($(GCC_VERSION),8.5.0)
+CT_NG_COMPONENTS +=	\
+	binutils-2.32.tar.bz2		\
+	expat-2.2.6.tar.bz2		\
+	gcc-8.5.0.tar.xz		\
+	gmp-6.3.0.tar.xz		\
+	isl-0.27.tar.xz			\
+	mpc-1.3.1.tar.gz		\
+	mpfr-4.2.2.tar.xz		\
+	strace-6.16.tar.xz      	\
+	zlib-1.3.1.tar.xz		\
+	zstd-1.5.7.tar.gz
+else ifeq ($(GCC_VERSION),8.3.0)
 CT_NG_COMPONENTS +=	\
 	binutils-2.32.tar.bz2 \
 	expat-2.2.6.tar.bz2	    \
@@ -174,6 +196,9 @@ xtools-distclean:
 #  The new .config will need to be merged (or upgraded) 
 #  with the existing one to actually be applied, though.
 uclibc-menuconfig:
+# TODO: after crosstool-NG 1.24.0 uClibc is called uClibc-ng so the code below
+#       needs to adapt to use src/uClibc or src/uClibc-ng based on the ctng
+#       version
 # The rest of the path can be hardcodeed since only x86 uses uClibc
 	$(Q)  cd  $(XTOOLS_BUILD_DIR)/build/x86_64-onie-linux-uclibc/src/uClibc \
 			&& make menuconfig
diff --git a/machine/kvm_x86_64/machine.make b/machine/kvm_x86_64/machine.make
index 438d762eb..cfd97f649 100644
--- a/machine/kvm_x86_64/machine.make
+++ b/machine/kvm_x86_64/machine.make
@@ -112,8 +112,12 @@ ifeq ($(SECURE_BOOT_EXT),yes)
 	SECURE_BOOT_ENABLE = yes
 endif
 
+# Specify the version of crosstool-NG. 1.28.0 gives access to newer compiler
+# versions
+CROSSTOOL_NG_VERSION = 1.28.0
 
-
+# Specify the version of GCC
+GCC_VERSION = 8.5.0
 
 #-------------------------------------------------------------------------------
 #
diff --git a/patches/crosstool-NG/Ignore-a-bad-id-command-to-allow-docker.patch b/patches/crosstool-NG/1.24.0/Ignore-a-bad-id-command-to-allow-docker.patch
similarity index 100%
rename from patches/crosstool-NG/Ignore-a-bad-id-command-to-allow-docker.patch
rename to patches/crosstool-NG/1.24.0/Ignore-a-bad-id-command-to-allow-docker.patch
diff --git a/patches/crosstool-NG/allow-obsolete-isl-0-12-2-with-custom-gcc-version.patch b/patches/crosstool-NG/1.24.0/allow-obsolete-isl-0-12-2-with-custom-gcc-version.patch
similarity index 100%
rename from patches/crosstool-NG/allow-obsolete-isl-0-12-2-with-custom-gcc-version.patch
rename to patches/crosstool-NG/1.24.0/allow-obsolete-isl-0-12-2-with-custom-gcc-version.patch
diff --git a/patches/crosstool-NG/allow-patching-custom-kernel-tarballs.patch b/patches/crosstool-NG/1.24.0/allow-patching-custom-kernel-tarballs.patch
similarity index 100%
rename from patches/crosstool-NG/allow-patching-custom-kernel-tarballs.patch
rename to patches/crosstool-NG/1.24.0/allow-patching-custom-kernel-tarballs.patch
diff --git a/patches/crosstool-NG/local/README b/patches/crosstool-NG/1.24.0/local/README
similarity index 100%
rename from patches/crosstool-NG/local/README
rename to patches/crosstool-NG/1.24.0/local/README
diff --git a/patches/crosstool-NG/local/automake/1.15/perl.patch b/patches/crosstool-NG/1.24.0/local/automake/1.15/perl.patch
similarity index 100%
rename from patches/crosstool-NG/local/automake/1.15/perl.patch
rename to patches/crosstool-NG/1.24.0/local/automake/1.15/perl.patch
diff --git a/patches/crosstool-NG/local/gcc/4.9.2/132-build_gcc-5_with_gcc-6.patch b/patches/crosstool-NG/1.24.0/local/gcc/4.9.2/132-build_gcc-5_with_gcc-6.patch
similarity index 100%
rename from patches/crosstool-NG/local/gcc/4.9.2/132-build_gcc-5_with_gcc-6.patch
rename to patches/crosstool-NG/1.24.0/local/gcc/4.9.2/132-build_gcc-5_with_gcc-6.patch
diff --git a/patches/crosstool-NG/local/gdb/7.12.1/gdb-7.12.1.patch b/patches/crosstool-NG/1.24.0/local/gdb/7.12.1/gdb-7.12.1.patch
similarity index 100%
rename from patches/crosstool-NG/local/gdb/7.12.1/gdb-7.12.1.patch
rename to patches/crosstool-NG/1.24.0/local/gdb/7.12.1/gdb-7.12.1.patch
diff --git a/patches/crosstool-NG/local/linux/3.10.0-54.0.1.el7.x86_64/0001-kbuild-fix-make-headers_install-when-path-is-too-lon.patch b/patches/crosstool-NG/1.24.0/local/linux/3.10.0-54.0.1.el7.x86_64/0001-kbuild-fix-make-headers_install-when-path-is-too-lon.patch
similarity index 100%
rename from patches/crosstool-NG/local/linux/3.10.0-54.0.1.el7.x86_64/0001-kbuild-fix-make-headers_install-when-path-is-too-lon.patch
rename to patches/crosstool-NG/1.24.0/local/linux/3.10.0-54.0.1.el7.x86_64/0001-kbuild-fix-make-headers_install-when-path-is-too-lon.patch
diff --git a/patches/crosstool-NG/local/linux/fsl-sdk-v1.5/001-scripts-Makefile.headersinst-install-headers-from-sc.patch b/patches/crosstool-NG/1.24.0/local/linux/fsl-sdk-v1.5/001-scripts-Makefile.headersinst-install-headers-from-sc.patch
similarity index 100%
rename from patches/crosstool-NG/local/linux/fsl-sdk-v1.5/001-scripts-Makefile.headersinst-install-headers-from-sc.patch
rename to patches/crosstool-NG/1.24.0/local/linux/fsl-sdk-v1.5/001-scripts-Makefile.headersinst-install-headers-from-sc.patch
diff --git a/patches/crosstool-NG/local/make/4.2.1/glibc-2.27-glob.patch b/patches/crosstool-NG/1.24.0/local/make/4.2.1/glibc-2.27-glob.patch
similarity index 100%
rename from patches/crosstool-NG/local/make/4.2.1/glibc-2.27-glob.patch
rename to patches/crosstool-NG/1.24.0/local/make/4.2.1/glibc-2.27-glob.patch
diff --git a/patches/crosstool-NG/series b/patches/crosstool-NG/1.24.0/series
similarity index 100%
rename from patches/crosstool-NG/series
rename to patches/crosstool-NG/1.24.0/series
diff --git a/patches/crosstool-NG/ubsan-fix-check-empty-string.patch b/patches/crosstool-NG/1.24.0/ubsan-fix-check-empty-string.patch
similarity index 100%
rename from patches/crosstool-NG/ubsan-fix-check-empty-string.patch
rename to patches/crosstool-NG/1.24.0/ubsan-fix-check-empty-string.patch
diff --git a/upstream/autoconf-2.72.tar.xz.sha1 b/upstream/autoconf-2.72.tar.xz.sha1
new file mode 100644
index 000000000..35da89d56
--- /dev/null
+++ b/upstream/autoconf-2.72.tar.xz.sha1
@@ -0,0 +1 @@
+1d082d999ff4506ec8f92c6ecb9732546f5204fb  autoconf-2.72.tar.xz
diff --git a/upstream/automake-1.17.tar.xz.sha1 b/upstream/automake-1.17.tar.xz.sha1
new file mode 100644
index 000000000..cc5497eb6
--- /dev/null
+++ b/upstream/automake-1.17.tar.xz.sha1
@@ -0,0 +1 @@
+626e4e1fe203cddb1d50ca7e6a3a396baa8190b8  automake-1.17.tar.xz
diff --git a/upstream/crosstool-ng-1.28.0.tar.xz.sha1 b/upstream/crosstool-ng-1.28.0.tar.xz.sha1
new file mode 100644
index 000000000..fe8b0f62d
--- /dev/null
+++ b/upstream/crosstool-ng-1.28.0.tar.xz.sha1
@@ -0,0 +1 @@
+cdeeea026046bd4408e1e6248ae96b7383665110  crosstool-ng-1.28.0.tar.xz
diff --git a/upstream/gcc-8.5.0.tar.xz.sha1 b/upstream/gcc-8.5.0.tar.xz.sha1
new file mode 100644
index 000000000..186e19485
--- /dev/null
+++ b/upstream/gcc-8.5.0.tar.xz.sha1
@@ -0,0 +1 @@
+2e93f85672f57023d45c20fef9572b72f8a3e7f1  gcc-8.5.0.tar.xz
diff --git a/upstream/gmp-6.3.0.tar.xz.sha1 b/upstream/gmp-6.3.0.tar.xz.sha1
new file mode 100644
index 000000000..6a57acf35
--- /dev/null
+++ b/upstream/gmp-6.3.0.tar.xz.sha1
@@ -0,0 +1 @@
+b4043dd2964ab1a858109da85c44de224384f352  gmp-6.3.0.tar.xz
diff --git a/upstream/isl-0.27.tar.xz.sha1 b/upstream/isl-0.27.tar.xz.sha1
new file mode 100644
index 000000000..8c02e7a08
--- /dev/null
+++ b/upstream/isl-0.27.tar.xz.sha1
@@ -0,0 +1 @@
+8778bdabc1fbebe392564440c1ebbaaa45cdaf85  isl-0.27.tar.xz
diff --git a/upstream/libtool-2.5.4.tar.xz.sha1 b/upstream/libtool-2.5.4.tar.xz.sha1
new file mode 100644
index 000000000..9daeda26a
--- /dev/null
+++ b/upstream/libtool-2.5.4.tar.xz.sha1
@@ -0,0 +1 @@
+9781a113fe6af1b150571410b29d3eee2e792516  libtool-2.5.4.tar.xz
diff --git a/upstream/m4-1.4.20.tar.xz.sha1 b/upstream/m4-1.4.20.tar.xz.sha1
new file mode 100644
index 000000000..54dcef1e5
--- /dev/null
+++ b/upstream/m4-1.4.20.tar.xz.sha1
@@ -0,0 +1 @@
+025df51430845178f926b20a078f994eefaa50fd  m4-1.4.20.tar.xz
diff --git a/upstream/make-4.4.1.tar.gz.sha1 b/upstream/make-4.4.1.tar.gz.sha1
new file mode 100644
index 000000000..16b01f07e
--- /dev/null
+++ b/upstream/make-4.4.1.tar.gz.sha1
@@ -0,0 +1 @@
+5ca41d365c35a4ded07d616190baf38814c25f2a  make-4.4.1.tar.gz
diff --git a/upstream/mpc-1.3.1.tar.gz.sha1 b/upstream/mpc-1.3.1.tar.gz.sha1
new file mode 100644
index 000000000..a2856f849
--- /dev/null
+++ b/upstream/mpc-1.3.1.tar.gz.sha1
@@ -0,0 +1 @@
+bac1c1fa79f5602df1e29e4684e103ad55714e02  mpc-1.3.1.tar.gz
diff --git a/upstream/mpfr-4.2.2.tar.xz.sha1 b/upstream/mpfr-4.2.2.tar.xz.sha1
new file mode 100644
index 000000000..46cb6badc
--- /dev/null
+++ b/upstream/mpfr-4.2.2.tar.xz.sha1
@@ -0,0 +1 @@
+a63a264b273a652e27518443640e69567da498ce  mpfr-4.2.2.tar.xz
diff --git a/upstream/strace-6.16.tar.xz.sha1 b/upstream/strace-6.16.tar.xz.sha1
new file mode 100644
index 000000000..9364fc066
--- /dev/null
+++ b/upstream/strace-6.16.tar.xz.sha1
@@ -0,0 +1 @@
+4e89c156d9754056cfae9fdc87b4f9ee2b3510af  strace-6.16.tar.xz
diff --git a/upstream/zlib-1.3.1.tar.xz.sha1 b/upstream/zlib-1.3.1.tar.xz.sha1
new file mode 100644
index 000000000..22f6c697e
--- /dev/null
+++ b/upstream/zlib-1.3.1.tar.xz.sha1
@@ -0,0 +1 @@
+30b78dfdbe5d23d697738eb175ed34a3c4c2b561  zlib-1.3.1.tar.xz
diff --git a/upstream/zstd-1.5.7.tar.gz.sha1 b/upstream/zstd-1.5.7.tar.gz.sha1
new file mode 100644
index 000000000..1f2b918a1
--- /dev/null
+++ b/upstream/zstd-1.5.7.tar.gz.sha1
@@ -0,0 +1 @@
+6c7dd9c829561ac5475b72592a079a01ab7f3eab  zstd-1.5.7.tar.gz