diff --git a/configure/os/CONFIG_SITE.RHEL7-x86_64.Common b/configure/os/CONFIG_SITE.RHEL7-x86_64.Common
index b2de8ae7f..0eaf7f3ce 100644
--- a/configure/os/CONFIG_SITE.RHEL7-x86_64.Common
+++ b/configure/os/CONFIG_SITE.RHEL7-x86_64.Common
@@ -1,28 +1 @@
 include $(CONFIG)/os/CONFIG_SITE.linux-x86_64.Common
-
-# Improved error checking with clang
-CROSS_COMPILER_TARGET_ARCHS += RHEL7-x86_64-clang
-CROSS_COMPILER_RUNTEST_ARCHS += RHEL7-x86_64-clang
-
-# Build for old SL6 64 bit
-CROSS_COMPILER_TARGET_ARCHS += SL6-x86_64
-CROSS_COMPILER_RUNTEST_ARCHS += SL6-x86_64
-
-# Build for old SL6 32 bit
-CROSS_COMPILER_TARGET_ARCHS += SL6-x86
-CROSS_COMPILER_RUNTEST_ARCHS += SL6-x86
-
-# Cross compilers that don't work on SL6 hosts
-
-# Debian 10
-CROSS_COMPILER_TARGET_ARCHS += deb10-x86_64
-
-# Newer DeltaTau PowerPMAC
-CROSS_COMPILER_TARGET_ARCHS += gcc8-ppc4xxFP
-
-# NI Linux Real-Time 7.x
-# requires RPM gcc-c++-arm-linux-gnu
-CROSS_COMPILER_TARGET_ARCHS += nilrt7-armv7a
-
-# Windows cross builds using Wine
-CROSS_COMPILER_TARGET_ARCHS += win32-x86 windows-x64
diff --git a/configure/os/CONFIG_SITE.linux-x86_64.Common b/configure/os/CONFIG_SITE.linux-x86_64.Common
index 11b12e9cb..3bfe7f90d 100644
--- a/configure/os/CONFIG_SITE.linux-x86_64.Common
+++ b/configure/os/CONFIG_SITE.linux-x86_64.Common
@@ -11,8 +11,27 @@ include $(CONFIG)/os/CONFIG_SITE.linux-x86.Common
 
 GNU_HOST_ARCH_64=x86_64
 
+# Improved error checking with clang
+CROSS_COMPILER_TARGET_ARCHS += RHEL7-x86_64-clang
+CROSS_COMPILER_RUNTEST_ARCHS += RHEL7-x86_64-clang
+
+# Build for old SL6 64 bit
+CROSS_COMPILER_TARGET_ARCHS += SL6-x86_64
+CROSS_COMPILER_RUNTEST_ARCHS += SL6-x86_64
+
+# Build for old SL6 32 bit
+CROSS_COMPILER_TARGET_ARCHS += SL6-x86
+CROSS_COMPILER_RUNTEST_ARCHS += SL6-x86
+
+# NI Linux Real-Time 7.x
+# requires RPM gcc-c++-arm-linux-gnu
+CROSS_COMPILER_TARGET_ARCHS += nilrt7-armv7a
+
+# Windows cross builds using Wine
+CROSS_COMPILER_TARGET_ARCHS += win32-x86 windows-x64
 # IOxOS IFC1211
 CROSS_COMPILER_TARGET_ARCHS += fslqoriq20-e6500_64
 
 # Zynq
 CROSS_COMPILER_TARGET_ARCHS += yocto21-aarch64
+CROSS_COMPILER_TARGET_ARCHS += yocto40-aarch64