15 files changed, 23 insertions, 145 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"
diff --git a/conf/layer.conf b/conf/layer.conf
index c5d0ecb..806fa56 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -28,14 +28,12 @@ BBFILES_DYNAMIC += " \
 PREFERRED_PROVIDER_libgcc-initial = "libgcc-initial"
 #PREFERRED_PROVIDER_virtual/${MLPREFIX}compilerlibs:forcevariable = "libcxx"
 PREFERRED_PROVIDER_libunwind = "${@bb.utils.contains_any("TC_CXX_RUNTIME", "llvm android", "libcxx", "libunwind", d)}"
-INHERIT += "clang"
+INHERIT += "clang-legacy"
 
 # Do not include clang in SDK unless user wants to
 CLANGSDK ??= "0"
 
 LLVMVERSION = "20.1.2"
 
-NON_MULTILIB_RECIPES:append = " llvm-project-source"
-
 require conf/nonclangable.conf
 require conf/nonscanable.conf
diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtpdf_%.bbappend b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtpdf_%.bbappend
index b4f7374..aaff78e 100644
--- a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtpdf_%.bbappend
+++ b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtpdf_%.bbappend
@@ -1,3 +1,4 @@
 # its needed to build gn-native which is embedded into
 # qtpdf directly
-inherit clang-native
+
+TOOLCHAIN_NATIVE = "clang"
diff --git a/dynamic-layers/qt6-layer/recipes-qt/qt6/python3-pyside6_%.bbappend b/dynamic-layers/qt6-layer/recipes-qt/qt6/python3-pyside6_%.bbappend
new file mode 100644
index 0000000..177bcbd
--- /dev/null
+++ b/dynamic-layers/qt6-layer/recipes-qt/qt6/python3-pyside6_%.bbappend
@@ -0,0 +1 @@
+EXCLUDE_FROM_WORLD = "1"
diff --git a/dynamic-layers/qt6-layer/recipes-qt/qt6/qtwebengine_%.bbappend b/dynamic-layers/qt6-layer/recipes-qt/qt6/qtwebengine_%.bbappend
new file mode 100644
index 0000000..8071b17
--- /dev/null
+++ b/dynamic-layers/qt6-layer/recipes-qt/qt6/qtwebengine_%.bbappend
@@ -0,0 +1 @@
+TOOLCHAIN_NATIVE ?= "clang"
diff --git a/dynamic-layers/qt6-layer/recpes-qt/qt6/qtbase_%.bbappend b/dynamic-layers/qt6-layer/recpes-qt/qt6/qtbase_%.bbappend
deleted file mode 100644
index 44ce43f..0000000
--- a/dynamic-layers/qt6-layer/recpes-qt/qt6/qtbase_%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-PACKAGECONFIG:append:toolchain-clang = " use-lld-linker"
diff --git a/dynamic-layers/qt6-layer/recpes-qt/qt6/qtwebengine_%.bbappend b/dynamic-layers/qt6-layer/recpes-qt/qt6/qtwebengine_%.bbappend
deleted file mode 100644
index 9576a3a..0000000
--- a/dynamic-layers/qt6-layer/recpes-qt/qt6/qtwebengine_%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-inherit clang-native
diff --git a/recipes-core/busybox/busybox/clang.cfg b/recipes-core/busybox/busybox/clang.cfg
deleted file mode 100644
index 450fa7e..0000000
--- a/recipes-core/busybox/busybox/clang.cfg
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_EXTRA_CFLAGS="-DBB_GLOBAL_CONST=''"
diff --git a/recipes-core/busybox/busybox_1.%.bbappend b/recipes-core/busybox/busybox_1.%.bbappend
deleted file mode 100644
index 6eadf24..0000000
--- a/recipes-core/busybox/busybox_1.%.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-
-SRC_URI:append:toolchain-clang = " file://clang.cfg"
diff --git a/recipes-devtools/castxml/castxml_0.6.11.bb b/recipes-devtools/castxml/castxml_0.6.11.bb
index 7eccc77..69663e0 100644
--- a/recipes-devtools/castxml/castxml_0.6.11.bb
+++ b/recipes-devtools/castxml/castxml_0.6.11.bb
@@ -6,8 +6,6 @@ SRC_URI = "git://github.com/CastXML/CastXML;protocol=https;branch=master"
 
 SRCREV = "f38c024b395187814f14f77974d8f5240bb2e71f"
 
-S = "${WORKDIR}/git"
-
 DEPENDS = "clang"
 inherit cmake pkgconfig python3native
 
diff --git a/recipes-devtools/clang/common.inc b/recipes-devtools/clang/common.inc
deleted file mode 100644
index e49bd68..0000000
--- a/recipes-devtools/clang/common.inc
+++ /dev/null
@@ -1,72 +0,0 @@
-FILESEXTRAPATHS =. "${FILE_DIRNAME}/clang:"
-
-LIC_FILES_CHKSUM = "file://llvm/LICENSE.TXT;md5=${LLVMMD5SUM} \
-                    file://clang/LICENSE.TXT;md5=${CLANGMD5SUM} \
-"
-LICENSE = "Apache-2.0-with-LLVM-exception"
-
-# Snapshot
-#RELEASE ?= "a69568efe6c4972e71af295c6577b3412dd57c22"
-#BASEURI ?= "https://api.github.com/repos/llvm/llvm-project/tarball/${RELEASE};downloadfilename=llvm-${PV}-${RELEASE}.tar.gz"
-#SOURCEDIR ?= "llvm-llvm-project-${@'${RELEASE}'[0:7]}"
-#SRC_URI[sha256sum] = "aed4f66cd72867b36cc55a0588436933c3d58d3e61ca782b6bf57605d3fdcb09"
-
-# GA Release
-RELEASE ?= "${PV}"
-BASEURI ?= "${LLVM_HTTP}/llvm-project/releases/download/llvmorg-${PV}/llvm-project-${PV}.src.tar.xz"
-SOURCEDIR ?= "llvm-project-${PV}.src"
-SRC_URI[sha256sum] = "f0a4a240aabc9b056142d14d5478bb6d962aeac549cbd75b809f5499240a8b38"
-
-SRC_URI = "\
-    ${BASEURI} \
-    file://0001-libcxxabi-Find-libunwind-headers-when-LIBCXXABI_LIBU.patch \
-    file://0002-compiler-rt-support-a-new-embedded-linux-target.patch \
-    file://0003-compiler-rt-Simplify-cross-compilation.-Don-t-use-na.patch \
-    file://0004-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch \
-    file://0005-llvm-allow-env-override-of-exe-and-libdir-path.patch \
-    file://0006-clang-driver-Check-sysroot-for-ldso-path.patch \
-    file://0007-clang-Driver-tools.cpp-Add-lssp_nonshared-on-musl.patch \
-    file://0008-clang-Prepend-trailing-to-sysroot.patch \
-    file://0009-clang-Look-inside-the-target-sysroot-for-compiler-ru.patch \
-    file://0010-clang-Define-releative-gcc-installation-dir.patch \
-    file://0011-clang-Add-lpthread-and-ldl-along-with-lunwind-for-st.patch \
-    file://0012-Pass-PYTHON_EXECUTABLE-when-cross-compiling-for-nati.patch \
-    file://0013-Check-for-atomic-double-intrinsics.patch \
-    file://0014-cmake-Fix-configure-for-packages-using-find_package.patch \
-    file://0015-clang-Fix-resource-dir-location-for-cross-toolchains.patch \
-    file://0016-clang-driver-Add-dyld-prefix-when-checking-sysroot-f.patch \
-    file://0017-clang-Use-python3-in-python-scripts.patch \
-    file://0018-For-x86_64-set-Yocto-based-GCC-install-search-path.patch \
-    file://0019-llvm-Insert-anchor-for-adding-OE-distro-vendor-names.patch \
-    file://0020-compiler-rt-Do-not-use-backtrace-APIs-on-non-glibc-l.patch \
-    file://0021-clang-Fix-x86-triple-for-non-debian-multiarch-linux-.patch \
-    file://0022-libunwind-Added-unw_backtrace-method.patch \
-    file://0023-clang-Do-not-use-install-relative-libc-headers.patch \
-    file://0024-Fix-lib-paths-for-OpenEmbedded-Host.patch \
-    file://0025-Correct-library-search-path-for-OpenEmbedded-Host.patch \
-    file://0026-lldb-Link-with-libatomic-on-x86.patch \
-    file://0027-compiler-rt-Enable-__int128-for-ppc32.patch \
-    file://0028-llvm-Do-not-use-cmake-infra-to-detect-libzstd.patch \
-    file://0029-compiler-rt-Fix-stat-struct-s-size-for-O32-ABI.patch \
-    file://0030-compiler-rt-Undef-_TIME_BITS-along-with-_FILE_OFFSET.patch \
-    file://0031-ToolChains-Gnu.cpp-ARMLibDirs-search-also-in-lib32.patch \
-    file://0032-clang-llvm-Add-OE-specific-ABI-triple-for-N32-ABI.patch \
-    file://0033-llvm-Add-libunwind.pc.in-and-llvm-config-scripts.patch \
-    file://0034-scan-build-py-respect-LLVM_LIBDIR_SUFFIX-like-other-.patch \
-    file://0035-compiler-rt-Do-not-pass-target-to-clang-compiler.patch \
-    file://0036-Fix-build-on-ppc64-musl.patch \
-    file://0037-clangd-Add-a-build-option-to-disable-building-dexp.patch \
-    file://0001-llvm-config-remove-LLVM_LDFLAGS-from-ldflags-output.patch \
-"
-# Fallback to no-PIE if not set
-GCCPIE ??= ""
-
-S = "${TMPDIR}/work-shared/llvm-project-source-${PV}-${PR}/${SOURCEDIR}"
-B ?= "${WORKDIR}/llvm-project-source-${PV}/build.${HOST_SYS}.${TARGET_SYS}"
-
-# We need to ensure that for the shared work directory, the do_patch signatures match
-# The real WORKDIR location isn't a dependency for the shared workdir.
-src_patches[vardepsexclude] = "WORKDIR"
-should_apply[vardepsexclude] += "PN"
-
-BPN = "clang"
diff --git a/recipes-devtools/include-what-you-use/include-what-you-use_0.23.bb b/recipes-devtools/include-what-you-use/include-what-you-use_0.23.bb
index 9ba16b6..7c4392f 100644
--- a/recipes-devtools/include-what-you-use/include-what-you-use_0.23.bb
+++ b/recipes-devtools/include-what-you-use/include-what-you-use_0.23.bb
@@ -15,8 +15,6 @@ SRCREV = "fa1094c0b3848f82244778bc6153cc84f8a890f6"
 
 PV .= "+git"
 
-S = "${WORKDIR}/git"
-
 inherit cmake python3native
 
 EXTRA_OECMAKE = "-DIWYU_RESOURCE_RELATIVE_TO=iwyu"
diff --git a/recipes-devtools/rust/rust-llvm_%.bbappend b/recipes-devtools/rust/rust-llvm_%.bbappend
index 09963d1..cc5c255 100644
--- a/recipes-devtools/rust/rust-llvm_%.bbappend
+++ b/recipes-devtools/rust/rust-llvm_%.bbappend
@@ -1,3 +1,3 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-inherit clang-native
+TOOLCHAIN_NATIVE ?= "clang"
diff --git a/recipes-devtools/rust/rust_%.bbappend b/recipes-devtools/rust/rust_%.bbappend
index 4d7022f..cc5c255 100644
--- a/recipes-devtools/rust/rust_%.bbappend
+++ b/recipes-devtools/rust/rust_%.bbappend
@@ -1,4 +1,3 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-inherit clang-native
-
+TOOLCHAIN_NATIVE ?= "clang"