diff --git a/classes-recipe/cuda-gcc.bbclass b/classes-recipe/cuda-gcc.bbclass
index f9439d5e..c613819c 100644
--- a/classes-recipe/cuda-gcc.bbclass
+++ b/classes-recipe/cuda-gcc.bbclass
@@ -1,6 +1,6 @@
 # CUDA requires gcc/g++ 10, so add that compiler and its runtime as
 # dependencies, and set CC_FOR_CUDA and CXX_FOR_CUDA to point to that compiler.
-DEPENDS:append:cuda = " virtual/${TARGET_PREFIX}cuda-gcc gcc-for-nvcc-runtime cuda-compatibility-workarounds"
+DEPENDS:append:cuda = " virtual/cross-cuda-gcc gcc-for-nvcc-runtime cuda-compatibility-workarounds"
 CUDA_HOST_TOOLCHAIN_SUFFIX ??= ""
 CUDA_HOST_TOOLCHAIN_SUFFIX:cuda = "-10.3.0"
 CC_FOR_CUDA ?= "${CCACHE}${HOST_PREFIX}gcc${CUDA_HOST_TOOLCHAIN_SUFFIX} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}"
diff --git a/conf/machine/include/tegra-common.inc b/conf/machine/include/tegra-common.inc
index cf9445f6..9707a909 100644
--- a/conf/machine/include/tegra-common.inc
+++ b/conf/machine/include/tegra-common.inc
@@ -141,3 +141,9 @@ PARTITION_LAYOUT_EXTERNAL ?= "${@d.getVar('PARTITION_LAYOUT_EXTERNAL_REDUNDANT')
 
 ROOTFSPART_SIZE_REDUNDANT ?= "${@int(d.getVar('ROOTFSPART_SIZE_DEFAULT')) // 2}"
 ROOTFSPART_SIZE ?= "${@d.getVar('ROOTFSPART_SIZE_REDUNDANT') if bb.utils.to_boolean(d.getVar('USE_REDUNDANT_FLASH_LAYOUT')) else d.getVar('ROOTFSPART_SIZE_DEFAULT')}"
+
+BB_RECIPE_VIRTUAL_PROVIDERS:append = " virtual/cross-cuda-gcc virtual/cross-cuda-g++"
+PREFERRED_PROVIDER_virtual/cross-cuda-gcc = "${MLPREFIX}gcc-for-nvcc-cross-${TARGET_ARCH}"
+PREFERRED_PROVIDER_virtual/cross-cuda-gcc:class-nativesdk = "${MLPREFIX}gcc-for-nvcc-crosssdk-${SDK_SYS}"
+PREFERRED_PROVIDER_virtual/cross-cuda-g++ = "${MLPREFIX}gcc-for-nvcc-cross-${TARGET_ARCH}"
+PREFERRED_PROVIDER_virtual/cross-cuda-g++:class-nativesdk = "${MLPREFIX}gcc-for-nvcc-crosssdk-${SDK_SYS}"
diff --git a/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.8-l4t-r36.4.0.bb b/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.8-l4t-r36.4.0.bb
index 7df2166c..aeb980bc 100644
--- a/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.8-l4t-r36.4.0.bb
+++ b/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2.8-l4t-r36.4.0.bb
@@ -11,7 +11,7 @@ require recipes-bsp/tegra-sources/tegra-sources-36.4.0.inc
 SRC_URI += "file://0001-workaround-to-fix-ld.bfd-warning-binutils-version-2..patch"
 
 INHIBIT_DEFAULT_DEPS = "1"
-DEPENDS:append = " virtual/${TARGET_PREFIX}gcc"
+DEPENDS:append = " virtual/cross-cc"
 
 S = "${WORKDIR}/arm-trusted-firmware"
 B = "${WORKDIR}/build"
diff --git a/recipes-bsp/uefi/edk2-firmware.inc b/recipes-bsp/uefi/edk2-firmware.inc
index 42d44a00..d65cc7fb 100644
--- a/recipes-bsp/uefi/edk2-firmware.inc
+++ b/recipes-bsp/uefi/edk2-firmware.inc
@@ -45,7 +45,7 @@ EDK2_EXTRA_BUILD   = ""
 EDK2_BUILD_MODE ?= "${@bb.utils.contains('EDK2_BUILD_RELEASE', '1', 'RELEASE', 'DEBUG', d)}"
 
 # Baremetal, no need for a C library
-DEPENDS:remove = "virtual/${TARGET_PREFIX}compilerlibs virtual/libc"
+DEPENDS:remove = "virtual/compilerlibs virtual/libc"
 DEPENDS += "util-linux-native iasl-native"
 
 inherit deploy
diff --git a/recipes-devtools/gcc-for-nvcc/gcc-for-nvcc-common.inc b/recipes-devtools/gcc-for-nvcc/gcc-for-nvcc-common.inc
index dc288e36..1b250726 100644
--- a/recipes-devtools/gcc-for-nvcc/gcc-for-nvcc-common.inc
+++ b/recipes-devtools/gcc-for-nvcc/gcc-for-nvcc-common.inc
@@ -11,7 +11,8 @@ CVE_PRODUCT = "gcc"
 inherit autotools gettext texinfo
 
 BPN = "gcc"
-COMPILERDEP = "virtual/${TARGET_PREFIX}cuda-gcc:do_gcc_stash_builddir"
+COMPILERDEP = "${MLPREFIX}gcc-for-nvcc-cross-${TARGET_ARCH}:do_gcc_stash_builddir"
+COMPILERDEP:class-nativesdk = "gcc-for-nvcc-crosssdk-${SDK_SYS}:do_gcc_stash_builddir"
 
 python extract_stashed_builddir () {
     src = d.expand("${COMPONENTS_DIR}/${BUILD_ARCH}/gcc-for-nvcc-stashed-builddir-${TARGET_SYS}")
diff --git a/recipes-devtools/gcc-for-nvcc/gcc-for-nvcc-cross-canadian.inc b/recipes-devtools/gcc-for-nvcc/gcc-for-nvcc-cross-canadian.inc
index a7f16e94..937e0575 100644
--- a/recipes-devtools/gcc-for-nvcc/gcc-for-nvcc-cross-canadian.inc
+++ b/recipes-devtools/gcc-for-nvcc/gcc-for-nvcc-cross-canadian.inc
@@ -3,7 +3,7 @@ inherit cross-canadian
 SUMMARY = "GNU cc and gcc C compilers (cross-canadian for ${TARGET_ARCH} target)"
 PN = "gcc-for-nvcc-cross-canadian-${TRANSLATED_TARGET_ARCH}"
 
-DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${HOST_PREFIX}gcc virtual/${HOST_PREFIX}binutils virtual/nativesdk-libc nativesdk-gettext flex-native virtual/libc"
+DEPENDS = "virtual/nativesdk-cross-cc virtual/cross-cc virtual/nativesdk-cross-binutils virtual/nativesdk-libc nativesdk-gettext flex-native virtual/libc"
 
 GCCMULTILIB = "--enable-multilib"
 
diff --git a/recipes-devtools/gcc-for-nvcc/gcc-for-nvcc-cross.inc b/recipes-devtools/gcc-for-nvcc/gcc-for-nvcc-cross.inc
index 43384c22..f1312d46 100644
--- a/recipes-devtools/gcc-for-nvcc/gcc-for-nvcc-cross.inc
+++ b/recipes-devtools/gcc-for-nvcc/gcc-for-nvcc-cross.inc
@@ -2,8 +2,8 @@ inherit cross
 
 INHIBIT_DEFAULT_DEPS = "1"
 EXTRADEPENDS = ""
-DEPENDS = "virtual/${TARGET_PREFIX}binutils ${EXTRADEPENDS} ${NATIVEDEPS}"
-PROVIDES = "virtual/${TARGET_PREFIX}cuda-gcc virtual/${TARGET_PREFIX}cuda-g++"
+DEPENDS = "virtual/cross-binutils ${EXTRADEPENDS} ${NATIVEDEPS}"
+PROVIDES = "virtual/cross-cuda-gcc virtual/cross-cuda-g++"
 python () {
     if d.getVar("TARGET_OS").startswith("linux"):
         d.setVar("EXTRADEPENDS", "linux-libc-headers")
diff --git a/recipes-devtools/gcc-for-nvcc/gcc-for-nvcc-crosssdk.inc b/recipes-devtools/gcc-for-nvcc/gcc-for-nvcc-crosssdk.inc
index 80a3c8ee..38575c00 100644
--- a/recipes-devtools/gcc-for-nvcc/gcc-for-nvcc-crosssdk.inc
+++ b/recipes-devtools/gcc-for-nvcc/gcc-for-nvcc-crosssdk.inc
@@ -8,5 +8,5 @@ SYSTEMLIBS1 = "${SDKPATHNATIVE}${libdir_nativesdk}/"
 
 GCCMULTILIB = "--disable-multilib"
 
-DEPENDS = "virtual/${TARGET_PREFIX}binutils gettext-native ${NATIVEDEPS}"
-PROVIDES = "virtual/${TARGET_PREFIX}cuda-gcc virtual/${TARGET_PREFIX}cuda-g++"
+DEPENDS = "virtual/nativesdk-cross-binutils gettext-native ${NATIVEDEPS}"
+PROVIDES = "virtual/nativesdk-cross-cuda-gcc virtual/nativesdk-cross-cuda-g++"
diff --git a/recipes-devtools/gcc-for-nvcc/gcc-for-nvcc-runtime.inc b/recipes-devtools/gcc-for-nvcc/gcc-for-nvcc-runtime.inc
index b0bc0bf8..ada9e4a4 100644
--- a/recipes-devtools/gcc-for-nvcc/gcc-for-nvcc-runtime.inc
+++ b/recipes-devtools/gcc-for-nvcc/gcc-for-nvcc-runtime.inc
@@ -147,7 +147,8 @@ do_install:append:class-target () {
 }
 
 INHIBIT_DEFAULT_DEPS = "1"
-DEPENDS = "virtual/${TARGET_PREFIX}cuda-gcc virtual/${TARGET_PREFIX}cuda-g++ libgcc-for-nvcc libgcc virtual/${MLPREFIX}libc"
+DEPENDS = "virtual/cross-cuda-gcc virtual/cross-cuda-g++ libgcc-for-nvcc libgcc virtual/${MLPREFIX}libc"
+DEPENDS:class-nativesdk = "virtual/nativesdk-cross-cuda-gcc virtual/nativesdk-cross-cuda-g++ ${MLPREFIX}libgcc-for-nvcc ${MLPREFIX}libgcc virtual/${MLPREFIX}/libc"
 STAGING_BINDIR_TOOLCHAIN:append = "-${BINV}"
 
 BBCLASSEXTEND = "nativesdk"
diff --git a/recipes-devtools/gcc-for-nvcc/gcc-for-nvcc-target.inc b/recipes-devtools/gcc-for-nvcc/gcc-for-nvcc-target.inc
index 208f95e9..a43b702c 100644
--- a/recipes-devtools/gcc-for-nvcc/gcc-for-nvcc-target.inc
+++ b/recipes-devtools/gcc-for-nvcc/gcc-for-nvcc-target.inc
@@ -1,7 +1,7 @@
 GCCMULTILIB = "--enable-multilib"
 require gcc-for-nvcc-configure-common.inc
 
-DEPENDS += "virtual/${TARGET_PREFIX}cuda-gcc"
+DEPENDS += "virtual/cross-cuda-gcc"
 
 EXTRA_OECONF_PATHS = "\
     --with-build-sysroot=${STAGING_DIR_TARGET} \
diff --git a/recipes-devtools/gcc-for-nvcc/libgcc-for-nvcc-initial.inc b/recipes-devtools/gcc-for-nvcc/libgcc-for-nvcc-initial.inc
index e8fe0098..0f286b47 100644
--- a/recipes-devtools/gcc-for-nvcc/libgcc-for-nvcc-initial.inc
+++ b/recipes-devtools/gcc-for-nvcc/libgcc-for-nvcc-initial.inc
@@ -29,7 +29,7 @@
 
 require libgcc-for-nvcc-common.inc
 
-DEPENDS = "virtual/${TARGET_PREFIX}gcc"
+DEPENDS = "virtual/cross-cc"
 
 LICENSE = "GPL-3.0-with-GCC-exception"
 
diff --git a/recipes-devtools/gcc-for-nvcc/libgcc-for-nvcc.inc b/recipes-devtools/gcc-for-nvcc/libgcc-for-nvcc.inc
index ffa5ed7f..db6ebb21 100644
--- a/recipes-devtools/gcc-for-nvcc/libgcc-for-nvcc.inc
+++ b/recipes-devtools/gcc-for-nvcc/libgcc-for-nvcc.inc
@@ -1,6 +1,6 @@
 require libgcc-for-nvcc-common.inc
 
-DEPENDS = "virtual/${TARGET_PREFIX}cuda-gcc virtual/${TARGET_PREFIX}cuda-g++ virtual/${MLPREFIX}libc"
+DEPENDS = "virtual/cross-cuda-gcc virtual/cross-cuda-g++ virtual/${MLPREFIX}libc"
 STAGING_BINDIR_TOOLCHAIN:append = "-${BINV}"
 
 do_install:append:class-target () {