2 files changed, 16 insertions, 56 deletions

diff --git a/classes/clang.bbclass b/classes/clang-legacy.bbclass
index 450500d..dbd600f 100644
--- a/classes/clang.bbclass
+++ b/classes/clang-legacy.bbclass
@@ -2,29 +2,17 @@
 CCACHE_COMPILERCHECK:toolchain-clang ?= "%compiler% -v"
 HOST_CC_ARCH:prepend:toolchain-clang:class-target = "-target ${HOST_SYS} "
 HOST_CC_ARCH:prepend:toolchain-clang:class-nativesdk = "-target ${HOST_SYS} "
-CC:toolchain-clang  = "${CCACHE}${HOST_PREFIX}clang ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}"
-CXX:toolchain-clang = "${CCACHE}${HOST_PREFIX}clang++ ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}"
-CPP:toolchain-clang = "${CCACHE}${HOST_PREFIX}clang ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS} -E"
-CCLD:toolchain-clang = "${CCACHE}${HOST_PREFIX}clang ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}"
-RANLIB:toolchain-clang = "${HOST_PREFIX}llvm-ranlib"
-AR:toolchain-clang = "${HOST_PREFIX}llvm-ar"
-NM:toolchain-clang = "${HOST_PREFIX}llvm-nm"
-OBJDUMP:toolchain-clang = "${HOST_PREFIX}llvm-objdump"
-OBJCOPY:toolchain-clang = "${HOST_PREFIX}llvm-objcopy"
-STRIP:toolchain-clang = "${HOST_PREFIX}llvm-strip"
-STRINGS:toolchain-clang = "${HOST_PREFIX}llvm-strings"
-READELF:toolchain-clang = "${HOST_PREFIX}llvm-readelf"
-LD:toolchain-clang = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', '${HOST_PREFIX}ld.lld${TOOLCHAIN_OPTIONS} ${HOST_LD_ARCH}', '${HOST_PREFIX}ld${TOOLCHAIN_OPTIONS} ${HOST_LD_ARCH}', d)}"
-
-LTO:toolchain-clang = "${@bb.utils.contains('DISTRO_FEATURES', 'thin-lto', '-flto=thin', '-flto -fuse-ld=lld', d)}"
+LD:toolchain-clang:class-target = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', '${HOST_PREFIX}ld.lld${TOOLCHAIN_OPTIONS} ${HOST_LD_ARCH}', '${HOST_PREFIX}ld${TOOLCHAIN_OPTIONS} ${HOST_LD_ARCH}', d)}"
+LD:toolchain-clang:class-nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', '${HOST_PREFIX}ld.lld${TOOLCHAIN_OPTIONS} ${HOST_LD_ARCH}', '${HOST_PREFIX}ld${TOOLCHAIN_OPTIONS} ${HOST_LD_ARCH}', d)}"
+
+LTO:toolchain-clang:class-target = "${@bb.utils.contains('DISTRO_FEATURES', 'thin-lto', '-flto=thin', '-flto -fuse-ld=lld', d)}"
+LTO:toolchain-clang:class-nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', 'thin-lto', '-flto=thin', '-flto -fuse-ld=lld', d)}"
 
 COMPILER_RT ??= ""
-COMPILER_RT:class-native = "-rtlib=libgcc ${UNWINDLIB}"
 COMPILER_RT:armeb = "-rtlib=libgcc ${UNWINDLIB}"
 COMPILER_RT:libc-klibc = "-rtlib=libgcc ${UNWINDLIB}"
 
 UNWINDLIB ??= ""
-UNWINDLIB:class-native = "--unwindlib=libgcc"
 UNWINDLIB:armeb = "--unwindlib=libgcc"
 UNWINDLIB_libc-klibc = "--unwindlib=libgcc"
 
@@ -34,10 +22,6 @@ LIBCPLUSPLUS:armv5 = "-stdlib=libstdc++"
 CXXFLAGS:append:toolchain-clang = " ${LIBCPLUSPLUS}"
 LDFLAGS:append:toolchain-clang = " ${COMPILER_RT} ${LIBCPLUSPLUS}"
 
-TUNE_CCARGS:remove:toolchain-clang = "-meb"
-TUNE_CCARGS:remove:toolchain-clang = "-mel"
-TUNE_CCARGS:append:toolchain-clang = "${@bb.utils.contains("TUNE_FEATURES", "bigendian", " -mbig-endian", " -mlittle-endian", d)}"
-
 # Clang does not yet support big.LITTLE performance tunes, so use the LITTLE for tunes
 TUNE_CCARGS:remove:toolchain-clang = "\
     -mcpu=cortex-a57.cortex-a53${TUNE_CCARGS_MARCH_OPTS} \
@@ -79,15 +63,14 @@ LDFLAGS:toolchain-clang:class-nativesdk = "${BUILDSDK_LDFLAGS} \
                                            -Wl,-rpath,${libdir}/.. "
 
 # Enable lld globally except for ppc32 where it causes random segfaults in Qemu usermode
-LDFLAGS:append:toolchain-clang = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' -fuse-ld=lld', '', d)}"
+LDFLAGS:append:toolchain-clang:class-target = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' -fuse-ld=lld', '', d)}"
+LDFLAGS:append:toolchain-clang:class-nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' -fuse-ld=lld', '', d)}"
 LDFLAGS:remove:toolchain-clang:powerpc = "-fuse-ld=lld"
 
 # Remove gcc specific -fcanon-prefix-map option, added in gcc-13+
 # clang does not support it yet
 DEBUG_PREFIX_MAP:remove:toolchain-clang = "-fcanon-prefix-map"
 
-# choose between 'gcc' 'clang' an empty '' can be used as well
-TOOLCHAIN ??= "gcc"
 # choose between 'gnu' 'llvm'
 TC_CXX_RUNTIME ??= "gnu"
 # Using gcc or llvm runtime is only available when using clang for compiler
@@ -95,15 +78,15 @@ TC_CXX_RUNTIME ??= "gnu"
 TC_CXX_RUNTIME:armeb = "gnu"
 TC_CXX_RUNTIME:armv5 = "gnu"
 
-TOOLCHAIN:class-native = "gcc"
-TOOLCHAIN:class-nativesdk = "gcc"
-TOOLCHAIN:class-cross-canadian = "gcc"
-TOOLCHAIN:class-crosssdk = "gcc"
-TOOLCHAIN:class-cross = "gcc"
+#TOOLCHAIN:class-native = "gcc"
+#TOOLCHAIN:class-nativesdk = "gcc"
+#TOOLCHAIN:class-cross-canadian = "gcc"
+#TOOLCHAIN:class-crosssdk = "gcc"
+#TOOLCHAIN:class-cross = "gcc"
 
-OVERRIDES =. "${@['', 'toolchain-${TOOLCHAIN}:']['${TOOLCHAIN}' != '']}"
+#OVERRIDES =. "${@['', 'toolchain-${TOOLCHAIN}:']['${TOOLCHAIN}' != '']}"
 OVERRIDES =. "${@['', 'runtime-${TC_CXX_RUNTIME}:']['${TC_CXX_RUNTIME}' != '']}"
-OVERRIDES[vardepsexclude] += "TOOLCHAIN TC_CXX_RUNTIME"
+OVERRIDES[vardepsexclude] += "TC_CXX_RUNTIME"
 
 YOCTO_ALTERNATE_EXE_PATH:toolchain-clang:class-target = "${STAGING_BINDIR}/llvm-config"
 YOCTO_ALTERNATE_LIBDIR:toolchain-clang:class-target = "/${BASELIB}"
@@ -139,8 +122,8 @@ def clang_base_deps(d):
     return ""
 
 BASE_DEFAULT_DEPS:append:class-target:toolchain-clang:class-target = " ${@clang_base_deps(d)}"
-BASE_DEFAULT_DEPS:append:class-native:toolchain-clang:runtime-llvm = " libcxx-native compiler-rt-native"
-BASE_DEFAULT_DEPS:append:class-nativesdk:toolchain-clang:runtime-llvm = " clang-native nativesdk-libcxx nativesdk-compiler-rt"
+BASE_DEFAULT_DEPS:append:class-native:runtime-llvm = " libcxx-native compiler-rt-native"
+BASE_DEFAULT_DEPS:append:class-nativesdk:runtime-llvm = " clang-native nativesdk-libcxx nativesdk-compiler-rt"
 
 # do_populate_sysroot needs STRIP
 POPULATESYSROOTDEPS:toolchain-clang:class-target = "${MLPREFIX}clang-cross-${TARGET_ARCH}:do_populate_sysroot"
diff --git a/classes/clang-native.bbclass b/classes/clang-native.bbclass
deleted file mode 100644
index 51fafcd..0000000
--- a/classes/clang-native.bbclass
+++ /dev/null
@@ -1,23 +0,0 @@
-# inherit this class if you would like to use clang to compile the native
-# version of your recipes instead of system compiler ( which is normally gcc )
-# on build machines
-# to use it add
-#
-# inherit clang-native
-#
-# to the concerned recipe via a bbappend or directly to recipe file
-#
-DEPENDS:append:runtime-llvm = " clang-native compiler-rt-native libcxx-native"
-# Use libcxx headers for native parts
-CXXFLAGS:append:runtime-llvm = " -stdlib=libc++"
-BUILD_CXXFLAGS:append:runtime-llvm = " -isysroot=${STAGING_DIR_NATIVE} -stdlib=libc++"
-# Use libgcc for native parts
-LDFLAGS:append:runtime-llvm = " -stdlib=libc++ -rtlib=libgcc -unwindlib=libgcc"
-BUILD_LDFLAGS:append:runtime-llvm = " -stdlib=libc++ -rtlib=libgcc -unwindlib=libgcc"
-BUILD_CC:runtime-llvm  = "${CCACHE}clang -isysroot=${STAGING_DIR_NATIVE}"
-BUILD_CXX:runtime-llvm = "${CCACHE}clang++ -isysroot=${STAGING_DIR_NATIVE}"
-BUILD_CPP:runtime-llvm = "${CCACHE}clang -isysroot=${STAGING_DIR_NATIVE} -E"
-BUILD_CCLD:runtime-llvm = "${CCACHE}clang"
-BUILD_RANLIB:runtime-llvm = "llvm-ranlib"
-BUILD_AR:runtime-llvm = "llvm-ar"
-BUILD_NM:runtime-llvm = "llvm-nm"