summaryrefslogtreecommitdiff
path: root/samples
diff options
context:
space:
mode:
authorBryan Hundven <bryanhundven@gmail.com>2015-11-14 19:30:03 (GMT)
committerBryan Hundven <bryanhundven@gmail.com>2015-11-14 19:30:03 (GMT)
commitb54d55c843defdf61c048d86d04adbc8b9edf0f0 (patch)
tree6b8f88efd8acac7d03fcb0c61c1d7074ff2182dd /samples
parente78251b75158689ace2194e8c87aa7b7bb5ec951 (diff)
Samples: Update samples
This commit updates samples to latest config/ changes. This closes #114 Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>
Diffstat (limited to 'samples')
-rw-r--r--samples/alphaev56-unknown-linux-gnu/crosstool.config3
-rw-r--r--samples/alphaev67-unknown-linux-gnu/crosstool.config5
-rw-r--r--samples/arm-bare_newlib_cortex_m3_nommu-eabi/crosstool.config3
-rw-r--r--samples/arm-cortex_a8-linux-gnueabi/crosstool.config3
-rw-r--r--samples/arm-cortexa5-linux-uclibcgnueabihf/crosstool.config3
-rw-r--r--samples/arm-cortexa9_neon-linux-gnueabihf/crosstool.config6
-rw-r--r--samples/arm-unknown-linux-gnueabi/crosstool.config3
-rw-r--r--samples/arm-unknown-linux-uclibcgnueabi/crosstool.config2
-rw-r--r--samples/arm-unknown-linux-uclibcgnueabihf/crosstool.config3
-rw-r--r--samples/armeb-unknown-linux-gnueabi/crosstool.config3
-rw-r--r--samples/armeb-unknown-linux-uclibcgnueabi/crosstool.config4
-rw-r--r--samples/armv6-rpi-linux-gnueabi/crosstool.config6
-rw-r--r--samples/armv7-rpi2-linux-gnueabihf/crosstool.config20
-rw-r--r--samples/i586-mingw32msvc,i686-none-linux-gnu/crosstool.config1
-rw-r--r--samples/i686-nptl-linux-gnu/crosstool.config1
-rw-r--r--samples/i686-w64-mingw32/crosstool.config2
-rw-r--r--samples/mips-ar2315-linux-gnu/crosstool.config3
-rw-r--r--samples/mips-malta-linux-gnu/crosstool.config3
-rw-r--r--samples/mips-unknown-linux-uclibc/crosstool.config2
-rw-r--r--samples/mips64el-n32-linux-uclibc/crosstool.config2
-rw-r--r--samples/mips64el-n64-linux-uclibc/crosstool.config2
-rw-r--r--samples/mipsel-unknown-linux-gnu/crosstool.config3
-rw-r--r--samples/powerpc-405-linux-gnu/crosstool.config3
-rw-r--r--samples/powerpc-860-linux-gnu/crosstool.config3
-rw-r--r--samples/powerpc-e300c3-linux-gnu/crosstool.config4
-rw-r--r--samples/powerpc-unknown-linux-gnu/crosstool.config1
-rw-r--r--samples/powerpc-unknown-linux-uclibc/crosstool.config2
-rw-r--r--samples/powerpc-unknown_nofpu-linux-gnu/crosstool.config1
-rw-r--r--samples/powerpc64-unknown-linux-gnu/crosstool.config1
-rw-r--r--samples/s390-ibm-linux-gnu/crosstool.config1
-rw-r--r--samples/s390x-ibm-linux-gnu/crosstool.config1
-rw-r--r--samples/sparc-unknown-linux-gnu/crosstool.config2
-rw-r--r--samples/x86_64-unknown-linux-gnu/crosstool.config3
-rw-r--r--samples/x86_64-unknown-linux-uclibc/crosstool.config2
-rw-r--r--samples/x86_64-w64-mingw32,x86_64-pc-linux-gnu/crosstool.config2
-rw-r--r--samples/x86_64-w64-mingw32/crosstool.config2
36 files changed, 24 insertions, 87 deletions
diff --git a/samples/alphaev56-unknown-linux-gnu/crosstool.config b/samples/alphaev56-unknown-linux-gnu/crosstool.config
index 26658e5..2e90761 100644
--- a/samples/alphaev56-unknown-linux-gnu/crosstool.config
+++ b/samples/alphaev56-unknown-linux-gnu/crosstool.config
@@ -2,10 +2,7 @@ CT_LOCAL_TARBALLS_DIR="${HOME}/src"
CT_SAVE_TARBALLS=y
CT_LOG_EXTRA=y
CT_ARCH_CPU="ev56"
-CT_ARCH_TUNE="ev56"
CT_ARCH_ALPHA_EV56=y
CT_KERNEL_linux=y
CT_BINUTILS_PLUGINS=y
-CT_LIBC_glibc=y
-CT_LIBC_GLIBC_USE_PORTS=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 db2661d..53b038a 100644
--- a/samples/alphaev67-unknown-linux-gnu/crosstool.config
+++ b/samples/alphaev67-unknown-linux-gnu/crosstool.config
@@ -2,11 +2,8 @@ CT_LOCAL_TARBALLS_DIR="${HOME}/src"
CT_SAVE_TARBALLS=y
CT_LOG_EXTRA=y
CT_ARCH_CPU="ev56"
-CT_ARCH_TUNE="ev56"
CT_ARCH_ALPHA_EV67=y
CT_KERNEL_linux=y
CT_BINUTILS_PLUGINS=y
-CT_LIBC_glibc=y
-CT_LIBC_GLIBC_USE_PORTS=y
-CT_CC_LANG_CXX=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 54409ed..144f5eb 100644
--- a/samples/arm-bare_newlib_cortex_m3_nommu-eabi/crosstool.config
+++ b/samples/arm-bare_newlib_cortex_m3_nommu-eabi/crosstool.config
@@ -2,7 +2,6 @@ CT_LOCAL_TARBALLS_DIR="${HOME}/src"
CT_SAVE_TARBALLS=y
CT_LOG_EXTRA=y
CT_ARCH_CPU="cortex-m3"
-CT_ARCH_TUNE="cortex-m3"
CT_ARCH_FLOAT_SW=y
CT_ARCH_arm=y
# CT_ARCH_USE_MMU is not set
@@ -14,5 +13,5 @@ CT_LIBC_NEWLIB_IO_LL=y
CT_LIBC_NEWLIB_IO_FLOAT=y
CT_LIBC_NEWLIB_IO_LDBL=y
CT_LIBC_NEWLIB_DISABLE_SUPPLIED_SYSCALLS=y
-CT_CC_LANG_CXX=y
CT_CC_GCC_BUILD_ID=y
+CT_CC_LANG_CXX=y
diff --git a/samples/arm-cortex_a8-linux-gnueabi/crosstool.config b/samples/arm-cortex_a8-linux-gnueabi/crosstool.config
index 3680597..ff787d0 100644
--- a/samples/arm-cortex_a8-linux-gnueabi/crosstool.config
+++ b/samples/arm-cortex_a8-linux-gnueabi/crosstool.config
@@ -1,9 +1,7 @@
CT_LOCAL_TARBALLS_DIR="${HOME}/src"
CT_SAVE_TARBALLS=y
CT_LOG_EXTRA=y
-CT_ARCH_ARCH="armv7-a"
CT_ARCH_CPU="cortex-a8"
-CT_ARCH_TUNE="cortex-a8"
CT_ARCH_FLOAT_SW=y
CT_ARCH_arm=y
CT_TARGET_VENDOR="cortex_a8"
@@ -12,7 +10,6 @@ CT_BINUTILS_LINKER_LD_GOLD=y
CT_BINUTILS_GOLD_THREADS=y
CT_BINUTILS_LD_WRAPPER=y
CT_BINUTILS_PLUGINS=y
-CT_LIBC_glibc=y
CT_CC_LANG_CXX=y
CT_DEBUG_dmalloc=y
CT_DEBUG_duma=y
diff --git a/samples/arm-cortexa5-linux-uclibcgnueabihf/crosstool.config b/samples/arm-cortexa5-linux-uclibcgnueabihf/crosstool.config
index ee18e5e..5c7039e 100644
--- a/samples/arm-cortexa5-linux-uclibcgnueabihf/crosstool.config
+++ b/samples/arm-cortexa5-linux-uclibcgnueabihf/crosstool.config
@@ -2,13 +2,10 @@ CT_EXPERIMENTAL=y
CT_LOCAL_TARBALLS_DIR="${HOME}/src"
CT_SAVE_TARBALLS=y
CT_LOG_EXTRA=y
-CT_ARCH_ARCH="armv7-a"
CT_ARCH_CPU="cortex-a5"
-CT_ARCH_TUNE="cortex-a5"
CT_ARCH_FPU="vfpv4-d16"
CT_ARCH_FLOAT_HW=y
CT_ARCH_arm=y
-CT_ARCH_ARM_TUPLE_USE_EABIHF=y
CT_TARGET_VENDOR="cortexa5"
CT_KERNEL_linux=y
CT_BINUTILS_LINKER_LD_GOLD=y
diff --git a/samples/arm-cortexa9_neon-linux-gnueabihf/crosstool.config b/samples/arm-cortexa9_neon-linux-gnueabihf/crosstool.config
index c13140a..958880a 100644
--- a/samples/arm-cortexa9_neon-linux-gnueabihf/crosstool.config
+++ b/samples/arm-cortexa9_neon-linux-gnueabihf/crosstool.config
@@ -2,13 +2,10 @@ CT_EXPERIMENTAL=y
CT_LOCAL_TARBALLS_DIR="${HOME}/src"
CT_SAVE_TARBALLS=y
CT_LOG_EXTRA=y
-CT_ARCH_ARCH="armv7-a"
CT_ARCH_CPU="cortex-a9"
-CT_ARCH_TUNE="cortex-a9"
CT_ARCH_FPU="neon"
CT_ARCH_FLOAT_HW=y
CT_ARCH_arm=y
-CT_ARCH_ARM_TUPLE_USE_EABIHF=y
CT_TARGET_VENDOR="cortexa9_neon"
CT_TOOLCHAIN_ENABLE_NLS=y
CT_KERNEL_linux=y
@@ -17,13 +14,12 @@ 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_ADDONS_LIST="libidn"
CT_LIBC_LOCALES=y
CT_LIBC_GLIBC_KERNEL_VERSION_NONE=y
CT_CC_GCC_SHOW_LINARO=y
-CT_CC_LANG_CXX=y
# CT_CC_GCC_ENABLE_TARGET_OPTSPACE is not set
+CT_CC_LANG_CXX=y
CT_DEBUG_gdb=y
# CT_GDB_CROSS_PYTHON is not set
CT_GDB_NATIVE=y
diff --git a/samples/arm-unknown-linux-gnueabi/crosstool.config b/samples/arm-unknown-linux-gnueabi/crosstool.config
index 9105b6f..5be3309 100644
--- a/samples/arm-unknown-linux-gnueabi/crosstool.config
+++ b/samples/arm-unknown-linux-gnueabi/crosstool.config
@@ -9,9 +9,8 @@ CT_BINUTILS_LINKER_LD_GOLD=y
CT_BINUTILS_GOLD_THREADS=y
CT_BINUTILS_LD_WRAPPER=y
CT_BINUTILS_PLUGINS=y
-CT_LIBC_glibc=y
-CT_CC_LANG_CXX=y
# CT_CC_GCC_SJLJ_EXCEPTIONS is not set
+CT_CC_LANG_CXX=y
CT_DEBUG_dmalloc=y
CT_DEBUG_duma=y
CT_DEBUG_gdb=y
diff --git a/samples/arm-unknown-linux-uclibcgnueabi/crosstool.config b/samples/arm-unknown-linux-uclibcgnueabi/crosstool.config
index 4372df6..9f6a4ba 100644
--- a/samples/arm-unknown-linux-uclibcgnueabi/crosstool.config
+++ b/samples/arm-unknown-linux-uclibcgnueabi/crosstool.config
@@ -1,9 +1,7 @@
CT_LOCAL_TARBALLS_DIR="${HOME}/src"
CT_SAVE_TARBALLS=y
CT_LOG_EXTRA=y
-CT_ARCH_ARCH="armv5te"
CT_ARCH_CPU="arm926ej-s"
-CT_ARCH_TUNE="arm926ej-s"
CT_ARCH_FLOAT_SW=y
CT_ARCH_arm=y
CT_KERNEL_linux=y
diff --git a/samples/arm-unknown-linux-uclibcgnueabihf/crosstool.config b/samples/arm-unknown-linux-uclibcgnueabihf/crosstool.config
index 834c1a0..0ca5498 100644
--- a/samples/arm-unknown-linux-uclibcgnueabihf/crosstool.config
+++ b/samples/arm-unknown-linux-uclibcgnueabihf/crosstool.config
@@ -2,12 +2,9 @@ CT_EXPERIMENTAL=y
CT_LOCAL_TARBALLS_DIR="${HOME}/src"
CT_SAVE_TARBALLS=y
CT_LOG_EXTRA=y
-CT_ARCH_ARCH="armv5te"
CT_ARCH_CPU="arm926ej-s"
-CT_ARCH_TUNE="arm926ej-s"
CT_ARCH_FLOAT_HW=y
CT_ARCH_arm=y
-CT_ARCH_ARM_TUPLE_USE_EABIHF=y
CT_KERNEL_linux=y
CT_BINUTILS_LINKER_LD_GOLD=y
CT_BINUTILS_GOLD_THREADS=y
diff --git a/samples/armeb-unknown-linux-gnueabi/crosstool.config b/samples/armeb-unknown-linux-gnueabi/crosstool.config
index a16a867..5af2ece 100644
--- a/samples/armeb-unknown-linux-gnueabi/crosstool.config
+++ b/samples/armeb-unknown-linux-gnueabi/crosstool.config
@@ -10,9 +10,8 @@ CT_BINUTILS_LINKER_LD_GOLD=y
CT_BINUTILS_GOLD_THREADS=y
CT_BINUTILS_LD_WRAPPER=y
CT_BINUTILS_PLUGINS=y
-CT_LIBC_glibc=y
-CT_CC_LANG_CXX=y
# CT_CC_GCC_SJLJ_EXCEPTIONS is not set
+CT_CC_LANG_CXX=y
CT_DEBUG_dmalloc=y
CT_DEBUG_duma=y
CT_DEBUG_gdb=y
diff --git a/samples/armeb-unknown-linux-uclibcgnueabi/crosstool.config b/samples/armeb-unknown-linux-uclibcgnueabi/crosstool.config
index d8d6f54..22ed53c 100644
--- a/samples/armeb-unknown-linux-uclibcgnueabi/crosstool.config
+++ b/samples/armeb-unknown-linux-uclibcgnueabi/crosstool.config
@@ -1,9 +1,7 @@
CT_LOCAL_TARBALLS_DIR="${HOME}/src"
CT_SAVE_TARBALLS=y
CT_LOG_EXTRA=y
-CT_ARCH_ARCH="armv5te"
CT_ARCH_CPU="xscale"
-CT_ARCH_TUNE="xscale"
CT_ARCH_BE=y
CT_ARCH_FLOAT_SW=y
CT_ARCH_arm=y
@@ -13,8 +11,8 @@ CT_BINUTILS_GOLD_THREADS=y
CT_BINUTILS_LD_WRAPPER=y
CT_BINUTILS_PLUGINS=y
CT_LIBC_uClibc=y
-CT_CC_LANG_CXX=y
# CT_CC_GCC_SJLJ_EXCEPTIONS is not set
+CT_CC_LANG_CXX=y
CT_DEBUG_dmalloc=y
CT_DEBUG_duma=y
CT_DEBUG_gdb=y
diff --git a/samples/armv6-rpi-linux-gnueabi/crosstool.config b/samples/armv6-rpi-linux-gnueabi/crosstool.config
index d92b1c1..bf5a2d0 100644
--- a/samples/armv6-rpi-linux-gnueabi/crosstool.config
+++ b/samples/armv6-rpi-linux-gnueabi/crosstool.config
@@ -1,9 +1,7 @@
CT_LOCAL_TARBALLS_DIR="${HOME}/src"
CT_SAVE_TARBALLS=y
CT_LOG_EXTRA=y
-CT_ARCH_ARCH="armv6zk"
CT_ARCH_CPU="arm1176jzf-s"
-CT_ARCH_TUNE="arm1176jzf-s"
CT_ARCH_FPU="vfp"
CT_ARCH_arm=y
CT_ARCH_SUFFIX="v6"
@@ -14,15 +12,13 @@ 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_CC_LANG_CXX=y
-# CT_CC_STATIC_LIBSTDCXX is not set
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_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 c1f6723..3c2e478 100644
--- a/samples/armv7-rpi2-linux-gnueabihf/crosstool.config
+++ b/samples/armv7-rpi2-linux-gnueabihf/crosstool.config
@@ -1,29 +1,15 @@
-CT_ARCH="arm"
+CT_LOCAL_TARBALLS_DIR="${HOME}/src"
CT_ARCH_CPU="cortex-a7"
CT_ARCH_FPU="neon-vfpv4"
-CT_ARCH_LE=y
-CT_ARCH_32=y
-CT_ARCH_BITNESS=32
CT_ARCH_FLOAT_HW=y
CT_ARCH_arm=y
CT_ARCH_SUFFIX="v7"
-CT_ARCH_ENDIAN="little"
-CT_ARCH_FLOAT="hard"
-CT_ARCH_ARM_MODE="arm"
-CT_ARCH_ARM_MODE_ARM=y
-CT_ARCH_ARM_TUPLE_USE_EABIHF=y
-CT_KERNEL="linux"
-CT_KERNEL_linux=y
CT_TARGET_VENDOR="rpi2"
-CT_BINUTILS="binutils"
-CT_BINUTILS_binutils=y
+CT_KERNEL_linux=y
CT_BINUTILS_LINKER_LD_GOLD=y
-CT_BINUTILS_LINKERS_LIST="ld,gold"
-CT_BINUTILS_PLUGINS=y
CT_BINUTILS_GOLD_THREADS=y
CT_BINUTILS_LD_WRAPPER=y
-CT_LIBC="glibc"
-CT_LIBC_glibc=y
+CT_BINUTILS_PLUGINS=y
CT_CC_LANG_CXX=y
CT_DEBUG_gdb=y
CT_GDB_CROSS_EXTRA_CONFIG_ARRAY="--with-expat"
diff --git a/samples/i586-mingw32msvc,i686-none-linux-gnu/crosstool.config b/samples/i586-mingw32msvc,i686-none-linux-gnu/crosstool.config
index 8bea0f2..1a67301 100644
--- a/samples/i586-mingw32msvc,i686-none-linux-gnu/crosstool.config
+++ b/samples/i586-mingw32msvc,i686-none-linux-gnu/crosstool.config
@@ -8,6 +8,5 @@ CT_TARGET_VENDOR="none"
CT_CANADIAN=y
CT_HOST="i586-mingw32msvc"
CT_KERNEL_linux=y
-CT_LIBC_glibc=y
# CT_LIBC_XLDD is not set
CT_CC_LANG_CXX=y
diff --git a/samples/i686-nptl-linux-gnu/crosstool.config b/samples/i686-nptl-linux-gnu/crosstool.config
index 78ab500..951053c 100644
--- a/samples/i686-nptl-linux-gnu/crosstool.config
+++ b/samples/i686-nptl-linux-gnu/crosstool.config
@@ -9,7 +9,6 @@ CT_BINUTILS_LINKER_LD_GOLD=y
CT_BINUTILS_GOLD_THREADS=y
CT_BINUTILS_LD_WRAPPER=y
CT_BINUTILS_PLUGINS=y
-CT_LIBC_glibc=y
CT_CC_LANG_CXX=y
CT_DEBUG_dmalloc=y
CT_DEBUG_duma=y
diff --git a/samples/i686-w64-mingw32/crosstool.config b/samples/i686-w64-mingw32/crosstool.config
index a142f01..b709a05 100644
--- a/samples/i686-w64-mingw32/crosstool.config
+++ b/samples/i686-w64-mingw32/crosstool.config
@@ -3,8 +3,8 @@ CT_SAVE_TARBALLS=y
CT_LOG_EXTRA=y
CT_ARCH_ARCH="i686"
CT_ARCH_x86=y
-CT_KERNEL_windows=y
CT_TARGET_VENDOR="w64"
+CT_KERNEL_windows=y
CT_BINUTILS_PLUGINS=y
CT_MINGW_DIRECTX=y
CT_MINGW_DDK=y
diff --git a/samples/mips-ar2315-linux-gnu/crosstool.config b/samples/mips-ar2315-linux-gnu/crosstool.config
index 9e4e9d7..75af884 100644
--- a/samples/mips-ar2315-linux-gnu/crosstool.config
+++ b/samples/mips-ar2315-linux-gnu/crosstool.config
@@ -8,8 +8,7 @@ CT_ARCH_mips=y
CT_TARGET_VENDOR="ar2315"
CT_KERNEL_linux=y
CT_BINUTILS_PLUGINS=y
-CT_LIBC_glibc=y
-CT_CC_LANG_CXX=y
CT_CC_GCC_mips_plt=y
+CT_CC_LANG_CXX=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 0d7d23d..7b33e25 100644
--- a/samples/mips-malta-linux-gnu/crosstool.config
+++ b/samples/mips-malta-linux-gnu/crosstool.config
@@ -5,8 +5,7 @@ CT_ARCH_mips=y
CT_TARGET_VENDOR="malta"
CT_KERNEL_linux=y
CT_BINUTILS_PLUGINS=y
-CT_LIBC_glibc=y
-CT_CC_LANG_CXX=y
CT_CC_GCC_mips_plt=y
+CT_CC_LANG_CXX=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 73ddfa0..38cd258 100644
--- a/samples/mips-unknown-linux-uclibc/crosstool.config
+++ b/samples/mips-unknown-linux-uclibc/crosstool.config
@@ -8,8 +8,8 @@ CT_KERNEL_linux=y
CT_BINUTILS_PLUGINS=y
CT_LIBC_uClibc=y
CT_LIBC_UCLIBC_WCHAR=y
-CT_CC_LANG_CXX=y
CT_CC_GCC_mips_plt=y
+CT_CC_LANG_CXX=y
CT_DEBUG_dmalloc=y
CT_DEBUG_duma=y
CT_DEBUG_gdb=y
diff --git a/samples/mips64el-n32-linux-uclibc/crosstool.config b/samples/mips64el-n32-linux-uclibc/crosstool.config
index 82b0ea5..1aa44c9 100644
--- a/samples/mips64el-n32-linux-uclibc/crosstool.config
+++ b/samples/mips64el-n32-linux-uclibc/crosstool.config
@@ -11,5 +11,5 @@ CT_KERNEL_linux=y
CT_BINUTILS_PLUGINS=y
CT_LIBC_uClibc=y
CT_LIBC_UCLIBC_WCHAR=y
-CT_CC_LANG_CXX=y
CT_CC_GCC_mips_plt=y
+CT_CC_LANG_CXX=y
diff --git a/samples/mips64el-n64-linux-uclibc/crosstool.config b/samples/mips64el-n64-linux-uclibc/crosstool.config
index 05e4278..2bc625b 100644
--- a/samples/mips64el-n64-linux-uclibc/crosstool.config
+++ b/samples/mips64el-n64-linux-uclibc/crosstool.config
@@ -12,5 +12,5 @@ CT_KERNEL_linux=y
CT_BINUTILS_PLUGINS=y
CT_LIBC_uClibc=y
CT_LIBC_UCLIBC_WCHAR=y
-CT_CC_LANG_CXX=y
CT_CC_GCC_mips_plt=y
+CT_CC_LANG_CXX=y
diff --git a/samples/mipsel-unknown-linux-gnu/crosstool.config b/samples/mipsel-unknown-linux-gnu/crosstool.config
index fc485bc..edaefed 100644
--- a/samples/mipsel-unknown-linux-gnu/crosstool.config
+++ b/samples/mipsel-unknown-linux-gnu/crosstool.config
@@ -7,9 +7,8 @@ CT_ARCH_FLOAT_SW=y
CT_ARCH_mips=y
CT_KERNEL_linux=y
CT_BINUTILS_PLUGINS=y
-CT_LIBC_glibc=y
-CT_CC_LANG_CXX=y
CT_CC_GCC_mips_plt=y
+CT_CC_LANG_CXX=y
CT_DEBUG_dmalloc=y
CT_DEBUG_duma=y
CT_DEBUG_gdb=y
diff --git a/samples/powerpc-405-linux-gnu/crosstool.config b/samples/powerpc-405-linux-gnu/crosstool.config
index 8d0cbb5..80f7104 100644
--- a/samples/powerpc-405-linux-gnu/crosstool.config
+++ b/samples/powerpc-405-linux-gnu/crosstool.config
@@ -2,14 +2,11 @@ CT_LOCAL_TARBALLS_DIR="${HOME}/src"
CT_SAVE_TARBALLS=y
CT_LOG_EXTRA=y
CT_ARCH_CPU="405"
-CT_ARCH_TUNE="405"
CT_ARCH_FLOAT_SW=y
CT_ARCH_powerpc=y
CT_TARGET_VENDOR="405"
CT_KERNEL_linux=y
CT_BINUTILS_PLUGINS=y
-CT_LIBC_glibc=y
-CT_LIBC_GLIBC_USE_PORTS=y
CT_CC_LANG_CXX=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 417add9..9475f5a 100644
--- a/samples/powerpc-860-linux-gnu/crosstool.config
+++ b/samples/powerpc-860-linux-gnu/crosstool.config
@@ -7,9 +7,8 @@ CT_ARCH_powerpc=y
CT_TARGET_VENDOR="860"
CT_KERNEL_linux=y
CT_BINUTILS_PLUGINS=y
-CT_LIBC_glibc=y
CT_LIBC_GLIBC_EXTRA_CONFIG_ARRAY="--without-fp"
+CT_CC_GCC_EXTRA_CONFIG_ARRAY="--with-cpu=860 --enable-cxx-flags=-mcpu=860 --with-float=soft --enable-cxx-flags=-msoft-float"
CT_CC_LANG_CXX=y
-CT_CC_EXTRA_CONFIG_ARRAY="--with-cpu=860 --enable-cxx-flags=-mcpu=860 --with-float=soft --enable-cxx-flags=-msoft-float"
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 41f7ff2..739a29f 100644
--- a/samples/powerpc-e300c3-linux-gnu/crosstool.config
+++ b/samples/powerpc-e300c3-linux-gnu/crosstool.config
@@ -2,11 +2,9 @@ CT_LOCAL_TARBALLS_DIR="${HOME}/src"
CT_SAVE_TARBALLS=y
CT_LOG_EXTRA=y
CT_ARCH_CPU="e300c3"
-CT_ARCH_TUNE="e300c3"
CT_ARCH_powerpc=y
CT_TARGET_VENDOR="e300c3"
CT_KERNEL_linux=y
CT_BINUTILS_PLUGINS=y
-CT_LIBC_glibc=y
-CT_CC_LANG_CXX=y
# CT_CC_GCC_ENABLE_TARGET_OPTSPACE is not set
+CT_CC_LANG_CXX=y
diff --git a/samples/powerpc-unknown-linux-gnu/crosstool.config b/samples/powerpc-unknown-linux-gnu/crosstool.config
index 4bdca18..a794eef 100644
--- a/samples/powerpc-unknown-linux-gnu/crosstool.config
+++ b/samples/powerpc-unknown-linux-gnu/crosstool.config
@@ -4,7 +4,6 @@ CT_LOG_EXTRA=y
CT_ARCH_powerpc=y
CT_KERNEL_linux=y
CT_BINUTILS_PLUGINS=y
-CT_LIBC_glibc=y
CT_CC_LANG_CXX=y
CT_DEBUG_duma=y
CT_DEBUG_gdb=y
diff --git a/samples/powerpc-unknown-linux-uclibc/crosstool.config b/samples/powerpc-unknown-linux-uclibc/crosstool.config
index 941f38a..fd2ea66 100644
--- a/samples/powerpc-unknown-linux-uclibc/crosstool.config
+++ b/samples/powerpc-unknown-linux-uclibc/crosstool.config
@@ -5,9 +5,9 @@ CT_ARCH_FLOAT_SW=y
CT_ARCH_powerpc=y
CT_KERNEL_linux=y
CT_BINUTILS_FOR_TARGET=y
+CT_LIBC_uClibc=y
CT_CC_LANG_FORTRAN=y
CT_CC_LANG_CXX=y
-CT_LIBC_uClibc=y
CT_DEBUG_dmalloc=y
CT_DEBUG_duma=y
CT_DEBUG_gdb=y
diff --git a/samples/powerpc-unknown_nofpu-linux-gnu/crosstool.config b/samples/powerpc-unknown_nofpu-linux-gnu/crosstool.config
index be9da97..17e62e1 100644
--- a/samples/powerpc-unknown_nofpu-linux-gnu/crosstool.config
+++ b/samples/powerpc-unknown_nofpu-linux-gnu/crosstool.config
@@ -6,7 +6,6 @@ CT_ARCH_powerpc=y
CT_TARGET_VENDOR="unknown_nofpu"
CT_KERNEL_linux=y
CT_BINUTILS_PLUGINS=y
-CT_LIBC_glibc=y
CT_CC_LANG_CXX=y
CT_DEBUG_duma=y
CT_DEBUG_gdb=y
diff --git a/samples/powerpc64-unknown-linux-gnu/crosstool.config b/samples/powerpc64-unknown-linux-gnu/crosstool.config
index 44b86a5..13b9052 100644
--- a/samples/powerpc64-unknown-linux-gnu/crosstool.config
+++ b/samples/powerpc64-unknown-linux-gnu/crosstool.config
@@ -5,7 +5,6 @@ CT_ARCH_64=y
CT_ARCH_powerpc=y
CT_KERNEL_linux=y
CT_BINUTILS_PLUGINS=y
-CT_LIBC_glibc=y
CT_CC_LANG_CXX=y
CT_DEBUG_gdb=y
# CT_GDB_CROSS_PYTHON is not set
diff --git a/samples/s390-ibm-linux-gnu/crosstool.config b/samples/s390-ibm-linux-gnu/crosstool.config
index d9aa759..b81ab98 100644
--- a/samples/s390-ibm-linux-gnu/crosstool.config
+++ b/samples/s390-ibm-linux-gnu/crosstool.config
@@ -5,5 +5,4 @@ CT_LOG_EXTRA=y
CT_ARCH_s390=y
CT_KERNEL_linux=y
CT_BINUTILS_PLUGINS=y
-CT_LIBC_glibc=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 0f40c56..c4b9ded 100644
--- a/samples/s390x-ibm-linux-gnu/crosstool.config
+++ b/samples/s390x-ibm-linux-gnu/crosstool.config
@@ -6,5 +6,4 @@ CT_ARCH_64=y
CT_ARCH_s390=y
CT_KERNEL_linux=y
CT_BINUTILS_PLUGINS=y
-CT_LIBC_glibc=y
CT_CC_LANG_CXX=y
diff --git a/samples/sparc-unknown-linux-gnu/crosstool.config b/samples/sparc-unknown-linux-gnu/crosstool.config
index f5f7c10..afb9f04 100644
--- a/samples/sparc-unknown-linux-gnu/crosstool.config
+++ b/samples/sparc-unknown-linux-gnu/crosstool.config
@@ -3,5 +3,3 @@ CT_SAVE_TARBALLS=y
CT_LOG_EXTRA=y
CT_ARCH_sparc=y
CT_KERNEL_linux=y
-CT_LIBC_glibc=y
-CT_LIBC_GLIBC_USE_PORTS=y
diff --git a/samples/x86_64-unknown-linux-gnu/crosstool.config b/samples/x86_64-unknown-linux-gnu/crosstool.config
index b733f87..0e45471 100644
--- a/samples/x86_64-unknown-linux-gnu/crosstool.config
+++ b/samples/x86_64-unknown-linux-gnu/crosstool.config
@@ -8,8 +8,7 @@ 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_KERNEL_VERSION_NONE=y
-CT_CC_LANG_CXX=y
CT_CC_GCC_LNK_HASH_STYLE_BOTH=y
+CT_CC_LANG_CXX=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 ef1ed9d..f20362d 100644
--- a/samples/x86_64-unknown-linux-uclibc/crosstool.config
+++ b/samples/x86_64-unknown-linux-uclibc/crosstool.config
@@ -11,8 +11,8 @@ CT_BINUTILS_LD_WRAPPER=y
CT_BINUTILS_PLUGINS=y
CT_LIBC_uClibc=y
CT_LIBC_UCLIBC_WCHAR=y
+CT_CC_GCC_EXTRA_CONFIG_ARRAY="--disable-libsanitizer"
CT_CC_LANG_CXX=y
-CT_CC_EXTRA_CONFIG_ARRAY="--disable-libsanitizer"
CT_DEBUG_dmalloc=y
CT_DEBUG_duma=y
CT_DEBUG_gdb=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 373ec83..10ed299 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
@@ -3,7 +3,7 @@ CT_DEBUG_CT=y
CT_DEBUG_CT_SAVE_STEPS=y
CT_LOCAL_TARBALLS_DIR="${HOME}/src"
CT_SAVE_TARBALLS=y
-# CT_STRIP_ALL_TOOLCHAIN_EXECUTABLES is not set
+# CT_STRIP_HOST_TOOLCHAIN_EXECUTABLES is not set
CT_LOG_EXTRA=y
CT_ARCH_64=y
CT_ARCH_x86=y
diff --git a/samples/x86_64-w64-mingw32/crosstool.config b/samples/x86_64-w64-mingw32/crosstool.config
index f39b5e1..21c9695 100644
--- a/samples/x86_64-w64-mingw32/crosstool.config
+++ b/samples/x86_64-w64-mingw32/crosstool.config
@@ -3,8 +3,8 @@ CT_SAVE_TARBALLS=y
CT_LOG_EXTRA=y
CT_ARCH_64=y
CT_ARCH_x86=y
-CT_KERNEL_windows=y
CT_TARGET_VENDOR="w64"
+CT_KERNEL_windows=y
CT_BINUTILS_PLUGINS=y
CT_MINGW_DIRECTX=y
CT_MINGW_DDK=y