90 files changed, 523 insertions, 4869 deletions
diff --git a/README.md b/README.md
index 599237c..73688ff 100644
--- a/README.md
+++ b/README.md
@@ -103,7 +103,7 @@ in `local.conf`.
 You can select libstdc++ per package too by writing bbappends for them containing
 ```shell
-LIBCPLUSPLUS:toolchain-clang:pn-<recipe> = "-stdlibc=libc++"
+LIBCPLUSPLUS:toolchain-clang:pn-<recipe> = "-stdlib=libc++"
 ```
 Defaults are chosen to be GNU for maximum compatibility with existing GNU systems. It's always
 good to use single runtime on a system, mixing runtimes can cause complications during
@@ -235,6 +235,29 @@ URI: ghttps://github.com/openembedded/bitbake.git
 branch: master
 revision: HEAD
 ```
+# Using Devtool and Upstream Development
+All LLVM based recipes use single llvm source directory, As a LLVM
+developer, you might want to work on your own repository to build
+related recipes, devtool can we useful in establishing such a workflow
+there is a script provided `scripts/devtool-clang.sh` which can assist
+in setting up all the recipes to use custom LLVM repository, in order
+to setup repository make sure that it has all the needed patches applied
+or else it will fail to build. Such a tree is already prepared and kept
+in sync at
+https://github.com/kraj/llvm-project
+There are branches under `oe` namespace which carry the needed OE patches
+```
+cd $TOPDIR/workspace/sources
+git clone https://github.com/kraj/llvm-project -b oe/main llvm-project
+```
+Once project is setup and meta-clang is added, run `devtool-clang.sh`
+script which will do the needed for setting up external sources for the
+yocto recipes, now yocto will use custom LLVM tree for its needs.
 # Contributing
diff --git a/SECURITY b/SECURITY
new file mode 100644
index 0000000..952b125
--- /dev/null
+++ b/SECURITY
@@ -0,0 +1,20 @@
+How to Report a Potential Vulnerability?
+========================================
+If you would like to report a public issue (for example, one with a released
+CVE number), please report it via Github issues:
+  https://github.com/kraj/meta-clang/issues/new/choose
+If you are dealing with a not-yet released or urgent issue, please send a
+message to one of the maintainers listed in the README.  Include as many
+details as possible:
+  - the layer or software module affected
+  - the recipe and its version
+  - any example code, if available
+Branches maintained with security fixes
+---------------------------------------
+See https://wiki.yoctoproject.org/wiki/Releases for the list of current
+releases.  We only accept patches for the LTS releases and the master branch.
diff --git a/classes/clang.bbclass b/classes/clang-legacy.bbclass
index d5fa67a..dbd600f 100644
--- a/classes/clang.bbclass
+++ b/classes/clang-legacy.bbclass
@@ -1,28 +1,18 @@
 # Add the necessary override
 CCACHE_COMPILERCHECK:toolchain-clang ?= "%compiler% -v"
-HOST_CC_ARCH:prepend:toolchain-clang = "-target ${HOST_SYS} "
+HOST_CC_ARCH:prepend:toolchain-clang:class-target = "-target ${HOST_SYS} "
-CC:toolchain-clang  = "${CCACHE}${HOST_PREFIX}clang ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}"
+HOST_CC_ARCH:prepend:toolchain-clang:class-nativesdk = "-target ${HOST_SYS} "
-CXX:toolchain-clang = "${CCACHE}${HOST_PREFIX}clang++ ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}"
+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)}"
-CPP:toolchain-clang = "${CCACHE}${HOST_PREFIX}clang ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS} -E"
+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)}"
-CCLD:toolchain-clang = "${CCACHE}${HOST_PREFIX}clang ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}"
-RANLIB:toolchain-clang = "${HOST_PREFIX}llvm-ranlib"
+LTO:toolchain-clang:class-target = "${@bb.utils.contains('DISTRO_FEATURES', 'thin-lto', '-flto=thin', '-flto -fuse-ld=lld', d)}"
-AR:toolchain-clang = "${HOST_PREFIX}llvm-ar"
+LTO:toolchain-clang:class-nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', 'thin-lto', '-flto=thin', '-flto -fuse-ld=lld', d)}"
-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"
-LTO:toolchain-clang = "${@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"
@@ -32,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} \
@@ -56,7 +42,7 @@ TUNE_CCARGS:append:toolchain-clang = "${@bb.utils.contains_any("TUNE_FEATURES",
 TUNE_CCARGS_MARCH_OPTS:append:toolchain-clang = "${@bb.utils.contains_any("DEFAULTTUNE", "cortexa72 cortexa53", "+nocrypto", "", d)}"
 # Clang does not support octeontx2 processor
-TUNE_CCARGS:remove:toolchain-clang = "-mcpu=octeontx2"
+TUNE_CCARGS:remove:toolchain-clang = "-mcpu=octeontx2${TUNE_CCARGS_MARCH_OPTS}"
 # Reconcile some ppc anamolies
 TUNE_CCARGS:remove:toolchain-clang:powerpc = "-mhard-float -mno-spe"
@@ -76,15 +62,15 @@ LDFLAGS:toolchain-clang:class-nativesdk = "${BUILDSDK_LDFLAGS} \
                                           -Wl,-rpath-link,${STAGING_LIBDIR}/.. \
                                           -Wl,-rpath,${libdir}/.. "
-# Enable lld globally"
+# 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
@@ -92,15 +78,15 @@ TC_CXX_RUNTIME ??= "gnu"
 TC_CXX_RUNTIME:armeb = "gnu"
 TC_CXX_RUNTIME:armv5 = "gnu"
-TOOLCHAIN:class-native = "gcc"
+#TOOLCHAIN:class-native = "gcc"
-TOOLCHAIN:class-nativesdk = "gcc"
+#TOOLCHAIN:class-nativesdk = "gcc"
-TOOLCHAIN:class-cross-canadian = "gcc"
+#TOOLCHAIN:class-cross-canadian = "gcc"
-TOOLCHAIN:class-crosssdk = "gcc"
+#TOOLCHAIN:class-crosssdk = "gcc"
-TOOLCHAIN:class-cross = "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}"
@@ -131,13 +117,13 @@ def clang_base_deps(d):
            elif (d.getVar('LIBCPLUSPLUS').find('-stdlib=libc++') != -1):
                ret += " libcxx "
            else:
-                ret += " virtual/${TARGET_PREFIX}compilerlibs "
+                ret += " virtual/${MLPREFIX}compilerlibs "
            return ret
    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-native: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-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"
@@ -149,17 +135,6 @@ EOF
    sed -i 's/ -mmusl / /g' ${WORKDIR}/toolchain.cmake
 }
-RECIPESYSROOTFUNCS = ""
-RECIPESYSROOTFUNCS:toolchain-clang = "recipe_sysroot_check_ld_is_lld"
-recipe_sysroot_check_ld_is_lld () {
-    if ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', 'true', 'false', d)} &&  \
-        [ -e ${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}ld.lld ]; then
-        ln -srf ${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}ld.lld ${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}ld
-    fi
-}
-do_prepare_recipe_sysroot[postfuncs] += "${RECIPESYSROOTFUNCS}"
-#
 # dump recipes which still use gcc
 #python __anonymous() {
 #    toolchain = d.getVar("TOOLCHAIN")
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/classes/cmake-native.bbclass b/classes/cmake-native.bbclass
deleted file mode 100644
index 116cdd1..0000000
--- a/classes/cmake-native.bbclass
+++ /dev/null
@@ -1,56 +0,0 @@
-# Native C/C++ compiler (without cpu arch/tune arguments)
-OECMAKE_NATIVE_C_COMPILER ?= "`echo ${BUILD_CC} | sed 's/^\([^ ]*\).*/\1/'`"
-OECMAKE_NATIVE_CXX_COMPILER ?= "`echo ${BUILD_CXX} | sed 's/^\([^ ]*\).*/\1/'`"
-OECMAKE_NATIVE_AR ?= "${BUILD_AR}"
-OECMAKE_NATIVE_RANLIB ?= "${BUILD_RANLIB}"
-OECMAKE_NATIVE_NM ?= "${BUILD_NM}"
-# Native compiler flags
-OECMAKE_NATIVE_C_FLAGS ?= "${BUILD_CC_ARCH} ${BUILD_CFLAGS}"
-OECMAKE_NATIVE_CXX_FLAGS ?= "${BUILD_CC_ARCH} ${BUILD_CXXFLAGS}"
-OECMAKE_NATIVE_C_FLAGS_RELEASE ?= "-DNDEBUG"
-OECMAKE_NATIVE_CXX_FLAGS_RELEASE ?= "-DNDEBUG"
-OECMAKE_NATIVE_C_LINK_FLAGS ?= "${BUILD_CC_ARCH} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS}"
-OECMAKE_NATIVE_CXX_LINK_FLAGS ?= "${BUILD_CC_ARCH} ${BUILD_CXXFLAGS} ${BUILD_LDFLAGS}"
-BUILD_CXXFLAGS += "${BUILD_CC_ARCH}"
-BUILD_CFLAGS += "${BUILD_CC_ARCH}"
-do_generate_native_toolchain_file() {
-        cat > ${WORKDIR}/toolchain-native.cmake <<EOF
-set( CMAKE_SYSTEM_NAME `echo ${BUILD_OS} | sed -e 's/^./\u&/' -e 's/^\(Linux\).*/\1/'` )
-set( CMAKE_SYSTEM_PROCESSOR ${BUILD_ARCH} )
-set( CMAKE_C_COMPILER ${OECMAKE_NATIVE_C_COMPILER} )
-set( CMAKE_CXX_COMPILER ${OECMAKE_NATIVE_CXX_COMPILER} )
-set( CMAKE_ASM_COMPILER ${OECMAKE_NATIVE_C_COMPILER} )
-set( CMAKE_AR ${OECMAKE_NATIVE_AR} CACHE FILEPATH "Archiver" )
-set( CMAKE_RANLIB ${OECMAKE_NATIVE_RANLIB} CACHE FILEPATH "Archive Indexer" )
-set( CMAKE_NM ${OECMAKE_NATIVE_NM} CACHE FILEPATH "Symbol Lister" )
-set( CMAKE_C_FLAGS "${OECMAKE_NATIVE_C_FLAGS}" CACHE STRING "CFLAGS" )
-set( CMAKE_CXX_FLAGS "${OECMAKE_NATIVE_CXX_FLAGS}" CACHE STRING "CXXFLAGS" )
-set( CMAKE_ASM_FLAGS "${OECMAKE_NATIVE_C_FLAGS}" CACHE STRING "ASM FLAGS" )
-set( CMAKE_C_FLAGS_RELEASE "${OECMAKE_NATIVE_C_FLAGS_RELEASE}" CACHE STRING "Additional CFLAGS for release" )
-set( CMAKE_CXX_FLAGS_RELEASE "${OECMAKE_NATIVE_CXX_FLAGS_RELEASE}" CACHE STRING "Additional CXXFLAGS for release" )
-set( CMAKE_ASM_FLAGS_RELEASE "${OECMAKE_NATIVE_C_FLAGS_RELEASE}" CACHE STRING "Additional ASM FLAGS for release" )
-set( CMAKE_C_LINK_FLAGS "${OECMAKE_NATIVE_C_LINK_FLAGS}" CACHE STRING "LDFLAGS" )
-set( CMAKE_CXX_LINK_FLAGS "${OECMAKE_NATIVE_CXX_LINK_FLAGS}" CACHE STRING "LDFLAGS" )
-set( CMAKE_FIND_ROOT_PATH ${STAGING_DIR_NATIVE} )
-set( CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY )
-set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH )
-set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY )
-set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY )
-# Use native cmake modules
-list(APPEND CMAKE_MODULE_PATH "${STAGING_DATADIR_NATIVE}/cmake/Modules/")
-# add for non /usr/lib libdir, e.g. /usr/lib64
-set( CMAKE_LIBRARY_PATH ${STAGING_BASE_LIBDIR_NATIVE} ${STAGING_LIBDIR_NATIVE})
-# add include dir to implicit includes in case it differs from /usr/include
-list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES ${STAGING_INCDIR_NATIVE})
-list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES ${STAGING_INCDIR_NATIVE})
-EOF
-}
-addtask generate_native_toolchain_file after do_patch before do_configure
diff --git a/conf/layer.conf b/conf/layer.conf
index ee3446c..806fa56 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -7,7 +7,7 @@ BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend"
 BBFILE_COLLECTIONS += "clang-layer"
 BBFILE_PATTERN_clang-layer := "^${LAYERDIR}/"
 BBFILE_PRIORITY_clang-layer = "7"
-LAYERSERIES_COMPAT_clang-layer = "nanbield scarthgap"
+LAYERSERIES_COMPAT_clang-layer = "whinlatter"
 LAYERDEPENDS_clang-layer = "core"
 BBFILES_DYNAMIC += " \
@@ -26,14 +26,14 @@ BBFILES_DYNAMIC += " \
 "
 PREFERRED_PROVIDER_libgcc-initial = "libgcc-initial"
-#PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}compilerlibs_forcevariable = "libcxx"
+#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 = "18.1.4"
+LLVMVERSION = "20.1.2"
 require conf/nonclangable.conf
 require conf/nonscanable.conf
diff --git a/conf/nonclangable.conf b/conf/nonclangable.conf
index 27165f4..c18eada 100644
--- a/conf/nonclangable.conf
+++ b/conf/nonclangable.conf
@@ -1,3 +1,6 @@
+TUNE_CCARGS:remove:toolchain-clang = "${@bb.utils.contains('TUNE_FEATURES', 'aarch64', '-mbranch-protection=standard', '', d)}"
 # https://github.com/llvm/llvm-project/issues/78337
 TOOLCHAIN:pn-kernel-selftest = "gcc"
@@ -62,6 +65,10 @@ TOOLCHAIN:pn-libssp-nonshared = "gcc"
 TOOLCHAIN:pn-m4:powerpc = "gcc"
 # clang does not have 64bit atomics on ppc
 TOOLCHAIN:pn-mesa:powerpc = "gcc"
+# recipe-sysroot//usr/lib/libGLESv2.so.2: unsupported relocation type 12
+TOOLCHAIN:pn-mesa:riscv32 = "gcc"
+# usr/lib/libgallium-25.0.2.so: unexpected reloc type 0x0c
+TOOLCHAIN:pn-mesa:riscv64 = "gcc"
 # clang fails with db.c:(.text+0x188): unsupported bss-plt -fPIC ifunc mmio_write64_be
 TOOLCHAIN:pn-rdma-core:powerpc = "gcc"
 # usermode qemu crashes when running binaries from clang + rust compiler on ppc32
@@ -150,8 +157,6 @@ TOOLCHAIN:pn-php:mips = "gcc"
 # Workaround oe-core patching problem temporarily
 TOOLCHAIN:pn-rsync = "gcc"
-# U-boot does compile with clang but clang-15 crashes compiling it :(
-TOOLCHAIN:pn-u-boot = "gcc"
 TOOLCHAIN:pn-u-boot-at91 = "gcc"
 TOOLCHAIN:pn-u-boot-fslc-mfgtool = "gcc"
 TOOLCHAIN:pn-u-boot-fslc-mxsboot = "gcc"
@@ -198,6 +203,25 @@ TOOLCHAIN:pn-gcc-for-nvcc-runtime:tegra = "gcc"
 #|       | ^
 TOOLCHAIN:pn-optee-os:imx-nxp-bsp = "gcc"
+# Fails with clang-19+
+# Poco/PriorityDelegate.h:203:10: error: no member named '_pTarget' in 'PriorityDelegate<type-parameter-0-0, void, true>'
+TOOLCHAIN:pn-poco = "gcc"
+TOOLCHAIN:pn-netdata = "gcc"
+# Needs OMP and with clang openmp is not ported to rv32 yet
+TOOLCHAIN:pn-python3-drgn:riscv32 = "gcc"
+# Clang-20 issue - https://github.com/llvm/llvm-project/issues/132322
+TOOLCHAIN:pn-webkitgtk:arm = "gcc"
+TOOLCHAIN:pn-webkitgtk3:arm = "gcc"
+# Disable clang on rv64 for now. see - https://bugs.webkit.org/show_bug.cgi?id=290243
+TOOLCHAIN:pn-webkitgtk:riscv64 = "gcc"
+TOOLCHAIN:pn-webkitgtk3:riscv64 = "gcc"
+# Clang can not compile vulkan-samples because fmt version is old
+# see - https://github.com/KhronosGroup/Vulkan-Samples/pull/1315 
+TOOLCHAIN:pn-vulkan-samples = "gcc"
 CFLAGS:append:pn-liboil:toolchain-clang:x86-64 = " -fheinous-gnu-extensions "
 # TOPDIR/build/tmp/work/core2-32-yoe-linux/gnu-efi/3.0.17-r0/gnu-efi-3.0.17//lib/ctors.S:11:41: error: expected the entry size
@@ -231,6 +255,14 @@ CFLAGS:append:pn-userland:toolchain-clang = " -no-integrated-as"
 # ^
 CFLAGS:append:pn-libjpeg-turbo:toolchain-clang:mipsarch = " -no-integrated-as"
+# <inline asm>:1:41: error: expected '%<type>' or "<type>"
+#     1 | .pushsection ".debug_gdb_scripts", "MS",@progbits,1
+#       |                                         ^
+# <inline asm>:318:12: error: .popsection without corresponding .pushsection
+#   318 | .popsection
+#       |            ^
+CXXFLAGS:append:pn-boost:toolchain-clang:arm = " -no-integrated-as"
 #| /tmp/x86-sse2-cdb148.s:207:9: error: ambiguous operand size for instruction 'sub'
 #|     sub SIZE, 64
 #|         ^~~~
@@ -283,7 +315,8 @@ CFLAGS:append:pn-qtbase:toolchain-clang:arm = " -no-integrated-as"
 #../git/common/connection.c:154:55: error: comparison of integers of different signs: 'unsigned long' and 'int' [-Werror,-Wsign-compare]
 #        for (cmsg = CMSG_FIRSTHDR(msg); cmsg != NULL; cmsg = CMSG_NXTHDR(msg, cmsg)) {
 #                                                             ^~~~~~~~~~~~~~~~~~~~~~
-CFLAGS:append:pn-seatd:toolchain-clang = " -Wno-sign-compare"
+CFLAGS:append:pn-seatd:toolchain-clang = " -Wno-error=sign-compare"
+CXXFLAGS:append:pn-ot-br-posix:toolchain-clang = " -Wno-error=sign-compare"
 # -fno-tree-vrp is gcc specific
 CXXFLAGS:remove:pn-mozjs:toolchain-clang = "-fno-tree-vrp"
@@ -315,34 +348,38 @@ TUNE_CCARGS:remove:pn-tesseract:toolchain-clang = "-Qunused-arguments"
 TUNE_CCARGS:remove:pn-pulseaudio:toolchain-clang = "-Qunused-arguments"
 TUNE_CCARGS:remove:pn-btrfs-tools:toolchain-clang = "-Qunused-arguments"
 TUNE_CCARGS:append:pn-btrfs-tools:toolchain-clang = " -Werror=unused-command-line-argument"
+TUNE_CCARGS:remove:pn-gimp:toolchain-clang = "-Qunused-arguments"
 # Disable altivec on ppc32
 #/usr/include/eigen3/Eigen/src/Core/arch/AltiVec/PacketMath.h:1345:32: error: use of undeclared identifier 'vec_sqrt'; did you mean 'vec_rsqrt'?
 #  BF16_TO_F32_UNARY_OP_WRAPPER(vec_sqrt, a);
 #                               ^~~~~~~~
 #                               vec_rsqrt
-TUNE_CCARGS:pn-ceres-solver:append:toolchain-clang:powerpc = " -mno-altivec"
+TUNE_CCARGS:append:pn-ceres-solver:toolchain-clang:powerpc = " -mno-altivec"
-TUNE_CCARGS:pn-opencv:append:toolchain-clang:powerpc = " -mno-altivec"
+TUNE_CCARGS:append:pn-opencv:toolchain-clang:powerpc = " -mno-altivec"
-CXXFLAGS:pn-libeigen:append:toolchain-clang:powerpc = " -DEIGEN_ALTIVEC_DISABLE_MMA"
+CXXFLAGS:append:pn-libeigen:toolchain-clang:powerpc = " -DEIGEN_ALTIVEC_DISABLE_MMA"
 # external/amber/src/src/amber.cc:53:41: error: unsafe pointer arithmetic [-Werror,-Wunsafe-buffer-usage]
 # vk-wrappers-1-0.inc:74:34: error: cast from 'PFN_vkVoidFunction' (aka 'void (*)()') to 'PFN_vkCmdEndRenderPass'
 # (aka 'void (*)(VkCommandBuffer_T *)') converts to incompatible function type [-Werror,-Wcast-function-type-strict]
-CXXFLAGS:pn-opengl-es-cts:append:toolchain-clang = " -Wno-error=unsafe-buffer-usage -Wno-error=cast-function-type-strict"
+CXXFLAGS:append:pn-opengl-es-cts:toolchain-clang = " -Wno-error=unsafe-buffer-usage -Wno-error=cast-function-type-strict"
-CXXFLAGS:pn-vulkan-cts:append:toolchain-clang = " -Wno-error=unsafe-buffer-usage -Wno-error=cast-function-type-strict"
+CXXFLAGS:append:pn-vulkan-cts:toolchain-clang = " -Wno-error=unsafe-buffer-usage -Wno-error=cast-function-type-strict"
-# see https://github.com/jtv/libpqxx/issues/738
-CXXFLAGS:pn-vulkan-samples:append:toolchain-clang = " -Wno-error=deprecated-declarations"
 # Workaround for https://gitlab.gnome.org/GNOME/gtk/-/issues/6033
-CFLAGS:pn-gtk4:append:toolchain-clang = " -Wno-error=int-conversion"
+CFLAGS:append:pn-gtk4:toolchain-clang = " -Wno-error=int-conversion"
 # usr/include/glib-2.0/glib/glib-autocleanups.h:49:1: error: cast from 'void (*)(void)' to 'GDestroyNotify'
 # (aka 'void (*)(void *)') converts to incompatible function type [-Werror,-Wcast-function-type-strict]
-CFLAGS:pn-pidgin-sipe:append:toolchain-clang = " -Wno-error=cast-function-type-strict"
+CFLAGS:append:pn-pidgin-sipe:toolchain-clang = " -Wno-error=cast-function-type-strict"
 # 32bit builds of nodejs needs this warning to be disabled with clang16 until
 # v8 engine in nodejs moved beyong this commit
 # https://github.com/v8/v8/commit/d15d49b09dc7aef9edcc4cf6a0cb2b77a0db203f
-CXXFLAGS:pn-nodejs:append:toolchain-clang = " -Wno-error=enum-constexpr-conversion"
+CXXFLAGS:append:pn-nodejs:toolchain-clang = " -Wno-error=enum-constexpr-conversion"
+# deps/TinyDeflate/gunzip.hh:1144:35: error: a template argument list is expected after a name prefixed by the template keyword [-Wmissing-template-arg-list-after-template-kw]
+CXXFLAGS:append:pn-doxygen:toolchain-clang = " -Wno-error=missing-template-arg-list-after-template-kw"
+# Finds this extra warning with clang20+
+CXXFLAGS:append:pn-fmt:toolchain-clang = " -Wno-error=invalid-specialization"
 #| /usr/src/debug/ruby/2.5.1-r0/build/../ruby-2.5.1/process.c:7073: undefined reference to `__mulodi4'
 #| clang-7: error: linker command failed with exit code 1 (use -v to see invocation)
@@ -361,12 +398,15 @@ COMPILER_RT:remove:pn-webkitgtk:powerpc = "-rtlib=compiler-rt"
 COMPILER_RT:remove:pn-m4:armeb = "-rtlib=compiler-rt"
 COMPILER_RT:remove:pn-ruby:armeb = "-rtlib=compiler-rt"
 COMPILER_RT:remove:pn-webkitgtk:armeb = "-rtlib=compiler-rt"
 # build/lib/libQt5Widgets.so: undefined reference to `__lshrti3'
 # __lshrti3 is missing in libgcc
 COMPILER_RT:pn-qtbase:toolchain-clang:riscv32 = "-rtlib=compiler-rt ${UNWINDLIB}"
 LDFLAGS:append:pn-qtwebengine:toolchain-clang:runtime-gnu:x86 = " -latomic"
+# | i686-yoe-linux-ld.lld: error: undefined symbol: __atomic_store
+LDFLAGS:append:pn-lttng-tools:toolchain-clang:x86 = " -latomic"
 LDFLAGS:append:pn-qemu:toolchain-clang:x86 = " -latomic"
 # warning: <elfFile> has a LOAD segment with RWX permissions
 LDFLAGS:append:pn-ruby:toolchain-clang:powerpc = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', '', ' -Wl,--no-warn-rwx-segment', d)}"
@@ -389,6 +429,17 @@ COMPILER_RT:pn-mpich:toolchain-clang:x86-64 = "-rtlib=libgcc --unwindlib=libgcc"
 COMPILER_RT:pn-aufs-util:libc-glibc:toolchain-clang:x86-64 = "-rtlib=libgcc --unwindlib=libgcc"
 COMPILER_RT:pn-libhugetlbfs:libc-glibc:toolchain-clang:x86-64 = "-rtlib=libgcc --unwindlib=libgcc"
 COMPILER_RT:pn-tsocks:libc-glibc:toolchain-clang:x86-64 = "-rtlib=libgcc --unwindlib=libgcc"
+# | tmp-lmp/work/corei7-64-lmp-linux/ostree/2021.6-r0/recipe-sysroot-native/usr/bin/x86_64-lmp-linux/x86_64-lmp-linux-ld: tmp-lmp/work/corei7-64-lmp-linux/ostree/2021.6-r0/recipe-sysroot//usr/lib/libc.a(printf_fp.o): in function `__printf_fp_l':
+# | /usr/src/debug/glibc/2.35-r0/git/stdio-common/printf_fp.c:388: undefined reference to `__unordtf2'
+# | tmp-lmp/work/corei7-64-lmp-linux/ostree/2021.6-r0/recipe-sysroot-native/usr/bin/x86_64-lmp-linux/x86_64-lmp-linux-ld: /usr/src/debug/glibc/2.35-r0/git/stdio-common/printf_fp.c:388: undefined reference to `__unordtf2'
+# | tmp-lmp/work/corei7-64-lmp-linux/ostree/2021.6-r0/recipe-sysroot-native/usr/bin/x86_64-lmp-linux/x86_64-lmp-linux-ld: /usr/src/debug/glibc/2.35-r0/git/stdio-common/printf_fp.c:388: undefined reference to `__letf2'
+# | tmp-lmp/work/corei7-64-lmp-linux/ostree/2021.6-r0/recipe-sysroot-native/usr/bin/x86_64-lmp-linux/x86_64-lmp-linux-ld: tmp-lmp/work/corei7-64-lmp-linux/ostree/2021.6-r0/recipe-sysroot//usr/lib/libc.a(printf_fphex.o): in function `__printf_fphex':
+# | /usr/src/debug/glibc/2.35-r0/git/stdio-common/../stdio-common/printf_fphex.c:206: undefined reference to `__unordtf2'
+# | tmp-lmp/work/corei7-64-lmp-linux/ostree/2021.6-r0/recipe-sysroot-native/usr/bin/x86_64-lmp-linux/x86_64-lmp-linux-ld: /usr/src/debug/glibc/2.35-r0/git/stdio-common/../stdio-common/printf_fphex.c:206: undefined reference to `__unordtf2'
+# | tmp-lmp/work/corei7-64-lmp-linux/ostree/2021.6-r0/recipe-sysroot-native/usr/bin/x86_64-lmp-linux/x86_64-lmp-linux-ld: /usr/src/debug/glibc/2.35-r0/git/stdio-common/../stdio-common/printf_fphex.c:206: undefined reference to `__letf2'
+# | x86_64-lmp-linux-clang -target x86_64-lmp-linux  -m64 -march=nehalem -mtune=generic -mfpmath=sse -msse4.2 -mlittle-endian --dyld-prefix=/usr -Qunused-arguments -fstack-protector-strong  -O2 -D_F
+COMPILER_RT:pn-ostree:libc-glibc:toolchain-clang:x86 = "-rtlib=libgcc --unwindlib=libgcc"
+COMPILER_RT:pn-ostree:libc-glibc:toolchain-clang:x86-64 = "-rtlib=libgcc --unwindlib=libgcc"
 #(unwind.o): in function `__pthread_unwind':
 #/usr/src/debug/glibc/2.29-r0/git/nptl/unwind.c:121: undefined reference to `_Unwind_ForcedUnwind'
@@ -399,6 +450,22 @@ COMPILER_RT:pn-libhugetlbfs:libc-glibc:toolchain-clang:arm = "--unwindlib=libgcc
 # https://github.com/llvm/llvm-project/issues/63743
 LIBCPLUSPLUS:pn-apt:toolchain-clang = "-stdlib=libstdc++"
+# All following need to use libstdc++ with clang-19
+# see https://libcxx.llvm.org/ReleaseNotes/19.html#deprecations-and-removals
+LIBCPLUSPLUS:pn-pbzip2:toolchain-clang = "-stdlib=libstdc++"
+LIBCPLUSPLUS:pn-nlohmann-json:toolchain-clang = "-stdlib=libstdc++"
+LIBCPLUSPLUS:pn-paho-mqtt-cpp:toolchain-clang = "-stdlib=libstdc++"
+LIBCPLUSPLUS:pn-poco:toolchain-clang = "-stdlib=libstdc++"
+LIBCPLUSPLUS:pn-netdata:toolchain-clang = "-stdlib=libstdc++"
+LIBCPLUSPLUS:pn-cpp-netlib:toolchain-clang = "-stdlib=libstdc++"
+LIBCPLUSPLUS:pn-cpprest:toolchain-clang = "-stdlib=libstdc++"
+# See https://lists.openembedded.org/g/openembedded-devel/topic/meta_oe_patch_2_3/108964413
+LIBCPLUSPLUS:pn-tomlplusplus:toolchain-clang = "-stdlib=libstdc++"
+LIBCPLUSPLUS:pn-doxygen:toolchain-clang = "-stdlib=libstdc++"
+# https://www.mail-archive.com/freebsd-pkg-fallout@freebsd.org/msg2394451.html
+LIBCPLUSPLUS:pn-snort3:toolchain-clang = "-stdlib=libstdc++"
+LIBCPLUSPLUS:pn-libdaq:toolchain-clang = "-stdlib=libstdc++"
 # Uses gcc for native tools, e.g. nsinstall and passes clang options which fails so
 # let same compiler ( gcc or clang) be native/cross compiler
 # | gcc: error: unrecognized command line option ‘-Qunused-arguments’
@@ -475,12 +542,9 @@ OBJDUMP:pn-libbsd:mips:toolchain-clang = "${HOST_PREFIX}objdump"
 STRIP:pn-python3-matplotlib:toolchain-clang:riscv64 = "${HOST_PREFIX}llvm-strip"
 STRIP:pn-python3-matplotlib:toolchain-clang:riscv32 = "${HOST_PREFIX}llvm-strip"
-#riscv64-yoe-linux-strip: TOPDIR/build/tmp/work/riscv64-yoe-linux/nmap/7.80-r0/image/usr/bin/stUPhYkC: not enough room for program headers, try linking with -N
-LDFLAGS:append:pn-nmap:riscv64:toolchain-clang = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' -Wl,-N', '', d)}"
 # Need OBJDUMP during do_package_qa which is set to llvm-objdump with meta-clang
 # it might work with GNU objdump since it falls back to one from build host
-DEPENDS:pn-linux-firmware:append:toolchain-clang = " clang-native"
+DEPENDS:append:pn-linux-firmware:toolchain-clang = " clang-native"
 # Needs for solving fopenmp issues
 DEPENDS:append:pn-pixman:mips:toolchain-clang = " openmp"
@@ -495,6 +559,15 @@ CFLAGS:append:pn-pixman:arm:toolchain-clang = " -no-integrated-as"
 #  vsetvli zero, zero, e16, m1
 CFLAGS:append:pn-dav1d:riscv64:toolchain-clang = " -no-integrated-as"
+# ../numpy-2.2.3/numpy/_core/src/highway/hwy/ops/rvv-inl.h:644:17: error: use of undeclared identifier '__riscv_vsetvl_e8mf8'
+# This only happens with clang with rv64gc
+TOOLCHAIN_OPTIONS:append:pn-python3-numpy:riscv64:toolchain-clang = " -march=rv64gcv"
+TOOLCHAIN_OPTIONS:append:pn-python3-numpy:riscv32:toolchain-clang = " -march=rv32gcv"
+# git/lib/simdutf-amalgamation-5.5.0/src/simdutf/simdutf.cpp:4941:57: error: RISC-V type 'vuint16m1_t' (aka '__rvv_uint16m1_t') requires the 'zve32x' extension
+#      return __riscv_vmacc_vx_u16m1(__riscv_vsrl_vx_u16m1(v, 8, vl), 0x100, v, vl);
+TOOLCHAIN_OPTIONS:append:pn-fluentbit:riscv64:toolchain-clang = " -march=rv64gcv"
 # test_connectx segfaults with this option set to -fstack-protector-strong
 SECURITY_STACK_PROTECTOR:pn-lksctp-tools:toolchain-clang = ""
@@ -510,7 +583,6 @@ LDFLAGS:append:pn-libgcrypt:toolchain-clang = "${@bb.utils.contains('DISTRO_FEAT
 LDFLAGS:append:pn-libxml2:toolchain-clang = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' -Wl,--undefined-version', '', d)}"
 LDFLAGS:append:pn-binutils:toolchain-clang = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' -Wl,--undefined-version', '', d)}"
 LDFLAGS:append:pn-libnss-mdns:toolchain-clang = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' -Wl,--undefined-version', '', d)}"
-LDFLAGS:append:pn-bluez5:toolchain-clang = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' -Wl,--undefined-version', '', d)}"
 LDFLAGS:append:pn-pulseaudio:toolchain-clang = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' -Wl,--undefined-version', '', d)}"
 LDFLAGS:append:pn-mesa:toolchain-clang = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' -Wl,--undefined-version', '', d)}"
 LDFLAGS:append:pn-mesa-gl:toolchain-clang = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' -Wl,--undefined-version', '', d)}"
@@ -613,8 +685,18 @@ LDFLAGS:append:pn-libcgroup:toolchain-clang = "${@bb.utils.contains('DISTRO_FEAT
 LDFLAGS:append:pn-kernel-selftest:toolchain-clang = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' -Wl,--undefined-version', '', d)}"
 LDFLAGS:append:pn-openldap:toolchain-clang = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' -Wl,--undefined-version', '', d)}"
 LDFLAGS:append:pn-liburing:toolchain-clang = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' -Wl,--undefined-version', '', d)}"
+LDFLAGS:append:pn-frame:toolchain-clang = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' -Wl,--undefined-version', '', d)}"
 # | x86_64-yoe-linux-musl-ld.lld: error: version script assignment of 'global' to symbol 'pam_sm_chauthtok' failed: symbol not defined
 LDFLAGS:append:pn-wtmpdb:toolchain-clang = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' -Wl,--undefined-version', '', d)}"
+# arm-yoe-linux-gnueabi-ld.lld: error: version script assignment of 'global' to symbol 'pam_sm_chauthtok' failed: symbol not defined
+LDFLAGS:append:pn-util-linux:toolchain-clang = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' -Wl,--undefined-version', '', d)}"
+LDFLAGS:append:pn-util-linux-libuuid:toolchain-clang = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' -Wl,--undefined-version', '', d)}"
+# riscv64-yoe-linux-musl-ld.lld: error: version script assignment of 'global' to symbol 'pam_sm_chauthtok' failed: symbol not defined
+LDFLAGS:append:pn-libpam:toolchain-clang = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' -Wl,--undefined-version', '', d)}"
+# i686-yoe-linux-ld.lld: error: version script assignment of 'SLIRP_4.0' to symbol 'slirp_add_exec' failed: symbol not defined
+LDFLAGS:append:pn-libslirp:toolchain-clang = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' -Wl,--undefined-version', '', d)}"
+# x86_64-yoe-linux-ld.lld: error: version script assignment of 'NSSMDNS_0' to symbol '_nss_mdns_gethostbyaddr_r' failed: symbol not defined
+LDFLAGS:append:pn-avahi-libnss-mdns:toolchain-clang = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' -Wl,--undefined-version', '', d)}"
 TUNE_CCARGS:remove:pn-kernel-selftest:toolchain-clang = "-mfpmath=sse"
 # Avoid's go linker crash as reported in https://github.com/golang/go/issues/61872
@@ -634,5 +716,30 @@ LDFLAGS:remove:pn-aufs-util:toolchain-clang = "${@bb.utils.contains('DISTRO_FEAT
 # | arm-yoe-linux-gnueabi-ld.lld: error: version script assignment of 'global' to symbol 'pam_sm_chauthtok' failed: symbol not defined
 LDFLAGS:append:pn-lastlog2:toolchain-clang = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' -fuse-ld=bfd', '', d)}"
 LDFLAGS:remove:pn-lastlog2:toolchain-clang = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', '-fuse-ld=lld', '', d)}"
+LDFLAGS:remove:pn-python3-bcrypt:toolchain-clang = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld ptest', '-fuse-ld=lld', '', d)}"
+LDFLAGS:remove:pn-bluez5:toolchain-clang = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', '-fuse-ld=lld', '', d)}"
+LDFLAGS:append:pn-bluez5:toolchain-clang = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' -fuse-ld=bfd', '', d)}"
+# lld ends up with unsupported relocation type 12 with clang-20 on mesa 25
 LD:pn-gnu-efi:toolchain-clang = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', '${HOST_PREFIX}ld.bfd${TOOLCHAIN_OPTIONS} ${HOST_LD_ARCH}', '${HOST_PREFIX}ld${TOOLCHAIN_OPTIONS} ${HOST_LD_ARCH}', d)}"
+LD:pn-libhugetlbfs:toolchain-clang = "${HOST_PREFIX}ld.bfd${TOOLCHAIN_OPTIONS} ${HOST_LD_ARCH}"
+LD:pn-libunix-statgrab:toolchain-clang = "${CC}"
+TOOLCHAIN:pn-perf = "gcc"
+# See https://github.com/llvm/llvm-project/issues/108262
+SELECTED_OPTIMIZATION:remove:pn-libjxl:arm:toolchain-clang = "-O2"
+SELECTED_OPTIMIZATION:append:pn-libjxl:arm:toolchain-clang = " -Og"
+# qemu usermode crashes when using clang as system compiler but works with gcc
+# see https://patchwork.yoctoproject.org/project/oe-core/patch/20240923234336.3978188-1-raj.khem@gmail.com/
+GI_DATA_ENABLED:pn-vte:toolchain-clang:armv7ve = "False"
+# in following 4 recipes g-i fails to parse glibc 2.41 headers with clang on x86 arches
+GI_DATA_ENABLED:pn-libmodulemd:toolchain-clang:x86 = "False"
+GI_DATA_ENABLED:pn-libblockdev:toolchain-clang:x86 = "False"
+GI_DATA_ENABLED:pn-webkitgtk3:toolchain-clang:x86 = "False"
+GI_DATA_ENABLED:pn-webkitgtk:toolchain-clang:x86 = "False"
+GI_DATA_ENABLED:pn-libmodulemd:toolchain-clang:x86-64 = "False"
+GI_DATA_ENABLED:pn-libblockdev:toolchain-clang:x86-64 = "False"
+GI_DATA_ENABLED:pn-webkitgtk3:toolchain-clang:x86-64 = "False"
+GI_DATA_ENABLED:pn-webkitgtk:toolchain-clang:x86-64 = "False"
diff --git a/dynamic-layers/meta-python/recipes-devtools/bcc/bcc/0001-tests-cc-Use-c-14-standard.patch b/dynamic-layers/meta-python/recipes-devtools/bcc/bcc/0001-tests-cc-Use-c-14-standard.patch
deleted file mode 100644
index dcd9dc1..0000000
--- a/dynamic-layers/meta-python/recipes-devtools/bcc/bcc/0001-tests-cc-Use-c-14-standard.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 9f45e12ad4689ca2c41844b77c6d789d21509a13 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 6 Mar 2023 13:26:11 -0800
-Subject: [PATCH] tests/cc: Use c++14 standard
-default c++ standard was bumped to c++17 when using clang16+ compiler
-via 907b89cc9, however, tests which use check tool is not yet ported
-to work with c++17 standard, therefore use c++14 on tests
-Upstream-Status: Submitted [https://github.com/iovisor/bcc/pull/4506]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Cc: Hengqi Chen <chenhengqi@outlook.com>
---
- tests/cc/CMakeLists.txt | 4 ++++
- 1 file changed, 4 insertions(+)
--- a/tests/cc/CMakeLists.txt
-+++ b/tests/cc/CMakeLists.txt
-@@ -27,6 +27,10 @@ if(${LLVM_PACKAGE_VERSION} VERSION_EQUAL
- set(CMAKE_CXX_STANDARD 14)
- endif()
- 
-+if(${LLVM_PACKAGE_VERSION} VERSION_EQUAL 16 OR ${LLVM_PACKAGE_VERSION} VERSION_GREATER 16)
-+set(CMAKE_CXX_STANDARD 14)
-+endif()
-+
- if(ENABLE_USDT)
- set(TEST_LIBBCC_SOURCES
-        test_libbcc.cc
diff --git a/dynamic-layers/meta-python/recipes-devtools/bcc/bcc/bpf_stack_id.patch b/dynamic-layers/meta-python/recipes-devtools/bcc/bcc/bpf_stack_id.patch
new file mode 100644
index 0000000..18221be
--- /dev/null
+++ b/dynamic-layers/meta-python/recipes-devtools/bcc/bcc/bpf_stack_id.patch
@@ -0,0 +1,13 @@
+Upstream-Status: Submitted [https://github.com/iovisor/bcc/pull/5292]
+Signed-off-by: Harish Sadineni <Harish.Sadineni@windriver.com>
+--- a/tests/cc/test_bpf_table.cc
+++ b/tests/cc/test_bpf_table.cc
+@@ -260,6 +260,7 @@
+   /* libc locations on different distributions are added below*/
+   bpf.add_module("/lib/x86_64-linux-gnu/libc.so.6"); //Location of libc in ubuntu
+   bpf.add_module("/lib64/libc.so.6"); //Location of libc fedora machine
+  bpf.add_module("/lib/libc.so.6");//location of libc in image
+   int stack_id = id[0];
+   REQUIRE(stack_id >= 0);
diff --git a/dynamic-layers/meta-python/recipes-devtools/bcc/bcc/fix_for_memleak.patch b/dynamic-layers/meta-python/recipes-devtools/bcc/bcc/fix_for_memleak.patch
new file mode 100644
index 0000000..a3a1ec9
--- /dev/null
+++ b/dynamic-layers/meta-python/recipes-devtools/bcc/bcc/fix_for_memleak.patch
@@ -0,0 +1,16 @@
+Upstream-Status: Submitted [https://github.com/iovisor/bcc/pull/5355]
+Signed-off-by: Harish Sadineni <Harish.Sadineni@windriver.com>
+diff --git a/tests/python/test_tools_memleak.py b/tests/python/test_tools_memleak.py
+--- a/tests/python/test_tools_memleak.py       
+++ b/tests/python/test_tools_memleak.py   
+@@ -26,7 +26,7 @@
+     # Build the memory leaking application.
+     c_src = 'test_tools_memleak_leaker_app.c'
+     tmp_dir = tempfile.mkdtemp(prefix='bcc-test-memleak-')
+-    c_src_full = os.path.dirname(sys.argv[0]) + os.path.sep + c_src
+    c_src_full = os.path.abspath(os.path.dirname(sys.argv[0])) + os.path.sep + c_src
+     exec_dst = tmp_dir + os.path.sep + 'leaker_app'
+     if subprocess.call(['gcc', '-g', '-O0', '-o', exec_dst, c_src_full]) != 0:
diff --git a/dynamic-layers/meta-python/recipes-devtools/bcc/bcc/run-ptest b/dynamic-layers/meta-python/recipes-devtools/bcc/bcc/run-ptest
index a27f697..4740ae9 100644
--- a/dynamic-layers/meta-python/recipes-devtools/bcc/bcc/run-ptest
+++ b/dynamic-layers/meta-python/recipes-devtools/bcc/bcc/run-ptest
@@ -17,6 +17,29 @@ print_test_result() {
    fi
 }
+ARCH=$(uname -m)
+case "$ARCH" in
+  x86_64)
+    KDIR="x86"
+    ;;
+  riscv64)
+    KDIR="riscv"
+    ;;
+  aarch64)
+    KDIR="arm64"
+    ;;
+  powerpc64le | ppc64le)
+    KDIR="powerpc"
+    ;;
+  *)
+    echo "Architecture not present, Add the architecture in run-ptest: $ARCH"
+    exit 1
+    ;;
+esac
+export BCC_KERNEL_SOURCE="/usr/src/kernel/arch/$KDIR"
 # Run CC tests, set IFS as test names have spaces
 IFS=$(printf '\n\t')
 for test_name in $(./cc/test_libbcc_no_libbpf --list-test-names-only); do
diff --git a/dynamic-layers/meta-python/recipes-devtools/bcc/bcc/support_finish_task_switch_isra_0.patch b/dynamic-layers/meta-python/recipes-devtools/bcc/bcc/support_finish_task_switch_isra_0.patch
new file mode 100644
index 0000000..92a3f7b
--- /dev/null
+++ b/dynamic-layers/meta-python/recipes-devtools/bcc/bcc/support_finish_task_switch_isra_0.patch
@@ -0,0 +1,49 @@
+Upstream-Status: Backport [https://github.com/iovisor/bcc/pull/5302/commits/b24519e1ba7b87c9676ae3a7f70772215cd5819d]
+Signed-off-by: Harish Sadineni <Harish.Sadineni@windriver.com>
+diff --git a/tests/python/test_histogram.py b/tests/python/test_histogram.py
+--- a/tests/python/test_histogram.py
+++ b/tests/python/test_histogram.py
+@@ -64,7 +64,7 @@
+ #include <linux/version.h>
+ typedef struct { char name[TASK_COMM_LEN]; u64 slot; } Key;
+ BPF_HISTOGRAM(hist1, Key, 1024);
+-int kprobe__finish_task_switch(struct pt_regs *ctx, struct task_struct *prev) {
+int count_prev_task_start_time(struct pt_regs *ctx, struct task_struct *prev) {
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(5,5,0)
+     Key k = {.slot = bpf_log2l(prev->real_start_time)};
+ #else
+@@ -77,6 +77,10 @@
+     return 0;
+ }
+ """)
+        b.attach_kprobe(
+            event_re=r'^finish_task_switch$|^finish_task_switch\.isra\.\d$',
+            fn_name=b"count_prev_task_start_time"
+        )
+         for i in range(0, 100): time.sleep(0.01)
+         b[b"hist1"].print_log2_hist()
+         b.cleanup()
+diff --git a/tests/python/test_clang.py b/tests/python/test_clang.py
+--- a/tests/python/test_clang.py
+++ b/tests/python/test_clang.py
+@@ -399,7 +399,7 @@
+   u32 curr_pid;
+ };
+ BPF_HASH(stats, struct key_t, u64, 1024);
+-int kprobe__finish_task_switch(struct pt_regs *ctx, struct task_struct *prev) {
+int count_sched(struct pt_regs *ctx, struct task_struct *prev) {
+   struct key_t key = {};
+   u64 zero = 0, *val;
+   key.curr_pid = bpf_get_current_pid_tgid();
+@@ -412,6 +412,10 @@
+   return 0;
+ }
+ """)
+        b.attach_kprobe(
+            event_re=r'^finish_task_switch$|^finish_task_switch\.isra\.\d$',
+            fn_name=b"count_sched"
+        )
+ 
+     def test_probe_simple_assign(self):
+         b = BPF(text=b"""
diff --git a/dynamic-layers/meta-python/recipes-devtools/bcc/bcc_0.29.1.bb b/dynamic-layers/meta-python/recipes-devtools/bcc/bcc_0.33.0.bb
index ec3811e..768b08e 100644
--- a/dynamic-layers/meta-python/recipes-devtools/bcc/bcc_0.29.1.bb
+++ b/dynamic-layers/meta-python/recipes-devtools/bcc/bcc_0.33.0.bb
@@ -16,20 +16,22 @@ DEPENDS += "bison-native \
            "
 RDEPENDS:${PN} += "bash python3 python3-core python3-setuptools xz"
-RDEPENDS:${PN}-ptest = "cmake python3 python3-netaddr python3-pyroute2"
+RDEPENDS:${PN}-ptest = "kernel-devsrc packagegroup-core-buildessential cmake bash python3 python3-netaddr python3-pyroute2"
 SRC_URI = "gitsm://github.com/iovisor/bcc;branch=master;protocol=https \
           file://0001-CMakeLists.txt-override-the-PY_CMD_ESCAPED.patch \
           file://0001-Vendor-just-enough-extra-headers-to-allow-libbpf-to-.patch \
-           file://0001-tests-cc-Use-c-14-standard.patch \
           file://0001-CMakeLists.txt-don-t-modify-.gitconfig-on-build-host.patch \
           file://run-ptest \
           file://ptest_wrapper.sh \
+           file://bpf_stack_id.patch \
+           file://support_finish_task_switch_isra_0.patch \
+           file://fix_for_memleak.patch \
           "
-SRCREV = "eb8ede2d70b17350757f2570ef76ea4c2e1dbff8"
+SRCREV = "92e32ff8a06616779f3a3191b75da6881d59fd17"
-S = "${WORKDIR}/git"
+PV .= "+git"
 PACKAGECONFIG ??= "examples"
 PACKAGECONFIG:remove:libc-musl = "examples"
@@ -38,6 +40,7 @@ PACKAGECONFIG[manpages] = "-DENABLE_MAN=ON,-DENABLE_MAN=OFF,"
 PACKAGECONFIG[examples] = "-DENABLE_EXAMPLES=ON,-DENABLE_EXAMPLES=OFF,"
 EXTRA_OECMAKE = " \
+    -DREVISION='${PV}' \
    -DCMAKE_USE_LIBBPF_PACKAGE=ON \
    -DENABLE_LLVM_SHARED=ON \
    -DENABLE_CLANG_JIT=ON \
@@ -46,6 +49,10 @@ EXTRA_OECMAKE = " \
    -DPYTHON_FLAGS=--install-lib=${PYTHON_SITEPACKAGES_DIR} \
 "
+# Avoid stripping debuginfo.so to fix some tests.
+INHIBIT_PACKAGE_STRIP = "1"
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
 do_install:append() {
        sed -e 's@#!/usr/bin/env python@#!/usr/bin/env python3@g' \
            -i $(find ${D}${datadir}/${PN} -type f)
@@ -56,13 +63,34 @@ do_install:append() {
 do_install_ptest() {
    install -d ${D}${PTEST_PATH}/tests/cc
+    # ptest searches for shared libs and archive files in the build folder.
+    # Hence, these files are copied to the image to fix these tests.
+    install -d ${D}${B}/tests/cc
+    install ${B}/tests/cc/archive.zip ${B}/tests/cc/libdebuginfo_test_lib.so ${B}/tests/cc/with_gnu_debuglink.so ${B}/tests/cc/with_gnu_debugdata.so ${B}/tests/cc/debuginfo.so ${D}${B}/tests/cc
+    install -d ${D}/opt
    install ${B}/tests/cc/test_libbcc_no_libbpf ${B}/tests/cc/libusdt_test_lib.so ${D}${PTEST_PATH}/tests/cc
    cp -rf ${S}/tests/python ${D}${PTEST_PATH}/tests/python
-    install ${WORKDIR}/ptest_wrapper.sh ${D}${PTEST_PATH}/tests
+    install ${UNPACKDIR}/ptest_wrapper.sh ${D}${PTEST_PATH}/tests
    install ${S}/examples/networking/simulation.py ${D}${PTEST_PATH}/tests/python
+    find ${B}/../sources/bcc-0.33.0+git/tools/ -type f -name "*.py" -exec \
+    sed -i \
+    -e 's@^#! */usr/bin/env python$@#!/usr/bin/env python3@' \
+    -e 's@^#! */usr/bin/python.*@#!/usr/bin/env python3@' {} +
+    cp -rf ${B}/../sources/bcc-0.33.0+git/tools/ ${D}${PTEST_PATH}/../../tools/
 }
 FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR}"
+FILES:${PN} += "${B}/tests/cc"
+FILES:${PN}-ptest += "${libdir}/tools/"
+FILES:${PN}-ptest += "/opt/"
 FILES:${PN}-doc += "${datadir}/${PN}/man"
 COMPATIBLE_HOST = "(x86_64.*|aarch64.*|powerpc64.*|riscv64.*)-linux"
+# WARNING: bcc-0.30.0+git-r0 do_package_qa: QA Issue: File /usr/lib/bcc/ptest/tests/cc/test_libbcc_no_libbpf in package bcc-ptest contains reference to TMPDIR [buildpaths]
+# this one is difficult to resolve, because the tests use CMAKE_CURRENT_BINARY_DIR directly in .cc e.g.:
+# https://github.com/iovisor/bcc/commit/7271bfc946a19413761be2e3c60c48bf72c5eea1#diff-233a0bfa490f3d7466c49935b64c86dd93956bbc0461f5af703b344cf6601461
+# we would probably need to use separate variable for "runtime" path for test assets from the standard CMAKE_CURRENT_BINARY_DIR variable or use relative
+# path from the test binary
+WARN_QA:append = "${@bb.utils.contains('PTEST_ENABLED', '1', ' buildpaths', '', d)}"
+ERROR_QA:remove = "${@bb.utils.contains('PTEST_ENABLED', '1', 'buildpaths', '', d)}"
diff --git a/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace/0001-Fix-build-failures-due-to-missing-location.hh.patch b/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace/0001-Fix-build-failures-due-to-missing-location.hh.patch
new file mode 100644
index 0000000..1c2ae33
--- /dev/null
+++ b/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace/0001-Fix-build-failures-due-to-missing-location.hh.patch
@@ -0,0 +1,54 @@
+From 24421ba92c69f1abaadaff01270621917616a2b8 Mon Sep 17 00:00:00 2001
+From: Changqing Li <changqing.li@windriver.com>
+Date: Thu, 17 Apr 2025 10:38:50 +0800
+Subject: [PATCH] Fix build failures due to missing location.hh
+ast/location.h does `#include "location.hh"` and location.hh is
+generated by the parser so any CMake target whose source includes
+ast/location.h needs to have a dependency on the `parser` target,
+otherwise the compilation may fail due to incorrect ordering of build
+targets. This also applies to targets which include ast/location.h
+transitively via other headers.
+To avoid such errors, do 2 things:
+- drop includes of ast/location.h where unused
+- for CMake targets including ast/location.h, add an explicit dependency
+  on the `parser` target
+Signed-off-by: Viktor Malik <viktor.malik@gmail.com>
+Upstream-Status: Backport [https://github.com/bpftrace/bpftrace/commit/743cb9c88c25fb9737d714f4d4ac853f05bb6481]
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ src/CMakeLists.txt     | 1 +
+ src/ast/CMakeLists.txt | 1 +
+ 2 files changed, 2 insertions(+)
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index e04ee429..13a51040 100644
+--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
+@@ -21,6 +21,7 @@ add_library(compiler_core STATIC
+   struct.cpp
+   types.cpp
+ )
+add_dependencies(compiler_core parser)
+ 
+ add_library(runtime STATIC
+   attached_probe.cpp
+diff --git a/src/ast/CMakeLists.txt b/src/ast/CMakeLists.txt
+index 92231f85..7230cf71 100644
+--- a/src/ast/CMakeLists.txt
+++ b/src/ast/CMakeLists.txt
+@@ -22,6 +22,7 @@ add_library(ast STATIC
+   passes/return_path_analyser.cpp
+ )
+ 
+add_dependencies(ast parser)
+ target_compile_definitions(ast PRIVATE ${BPFTRACE_FLAGS})
+ target_link_libraries(ast PUBLIC ast_defs arch compiler_core parser)
+ 
+-- 
+2.34.1
diff --git a/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace/0002-CMakeLists.txt-allow-to-set-BISON_FLAGS-like-l.patch b/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace/0002-CMakeLists.txt-allow-to-set-BISON_FLAGS-like-l.patch
new file mode 100644
index 0000000..4f0ebbf
--- /dev/null
+++ b/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace/0002-CMakeLists.txt-allow-to-set-BISON_FLAGS-like-l.patch
@@ -0,0 +1,38 @@
+From ce5d908bb1256ede680fbfd521f087060a567dca Mon Sep 17 00:00:00 2001
+From: Martin Jansa <martin.jansa@gmail.com>
+Date: Tue, 3 Sep 2024 14:17:51 +0200
+Subject: [PATCH] CMakeLists.txt: allow to set BISON_FLAGS like -l
+Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
+Upstream-Status: Pending
+---
+ CMakeLists.txt | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -100,16 +100,20 @@ include_directories(SYSTEM ${LIBCEREAL_I
+ 
+ find_package(BISON REQUIRED)
+ find_package(FLEX REQUIRED)
+
+# avoid buildpaths in generated #line statements and allow to pass --file-prefix-map=OLD=NEW
+set(BISON_FLAGS "${BISON_FLAGS} -l")
+set(FLEX_FLAGS "${FLEX_FLAGS} -L")
+ # `parser_class_name` is deprecated and generates warnings in bison >= 3.3.
+ # But `api.parser.class` is not supported in bison < 3.3. So we must inject
+ # the %define based on the bison version here.
+ if(${BISON_VERSION} VERSION_GREATER_EQUAL 3.3)
+-  set(BISON_FLAGS "-Dapi.parser.class={Parser}")
+  set(BISON_FLAGS "${BISON_FLAGS} -Dapi.parser.class={Parser}")
+ else()
+-  set(BISON_FLAGS "-Dparser_class_name={Parser}")
+  set(BISON_FLAGS "${BISON_FLAGS} -Dparser_class_name={Parser}")
+ endif()
+ bison_target(bison_parser src/parser.yy ${CMAKE_BINARY_DIR}/parser.tab.cc COMPILE_FLAGS ${BISON_FLAGS} VERBOSE)
+-flex_target(flex_lexer src/lexer.l ${CMAKE_BINARY_DIR}/lex.yy.cc)
+flex_target(flex_lexer src/lexer.l ${CMAKE_BINARY_DIR}/lex.yy.cc COMPILE_FLAGS ${FLEX_FLAGS})
+ add_flex_bison_dependency(flex_lexer bison_parser)
+ add_library(parser STATIC ${BISON_bison_parser_OUTPUTS} ${FLEX_flex_lexer_OUTPUTS})
+ target_compile_options(parser PRIVATE "-w")
diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace/run-ptest b/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace/run-ptest
index 63d65e2..63d65e2 100644
--- a/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace/run-ptest
+++ b/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace/run-ptest
diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace_0.20.1.bb b/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace_0.23.0.bb
index 355f427..bd3b772 100644
--- a/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace_0.20.1.bb
+++ b/dynamic-layers/meta-python/recipes-devtools/bpftrace/bpftrace_0.23.0.bb
@@ -18,23 +18,22 @@ RDEPENDS:${PN} += "bash python3 xz"
 PV .= "+git"
-SRC_URI = "git://github.com/iovisor/bpftrace;branch=master;protocol=https \
+SRC_URI = "git://github.com/iovisor/bpftrace;branch=release/0.23.x;protocol=https \
-           file://0001-replace-python-with-python3-in-the-test.patch \
-           file://0002-ast-Repace-getInt8PtrTy-with-getPtrTy.patch \
-           file://0003-ast-Adjust-to-enum-changes-in-llvm-18.patch \
-           file://0004-cmake-Bump-max-LLVM-version-to-18.patch \
-           file://0001-use-64bit-alignment-for-map-counter-atomic-add.patch \
           file://run-ptest \
+           file://0002-CMakeLists.txt-allow-to-set-BISON_FLAGS-like-l.patch \
+           file://0001-Fix-build-failures-due-to-missing-location.hh.patch \
 "
-SRCREV = "fe6362b4e2c1b9d0833c7d3f308c1d4006b54723"
+SRCREV = "01e806d24c61f996f1809e1e991646311499db4f"
-S = "${WORKDIR}/git"
+inherit bash-completion cmake ptest pkgconfig
-inherit cmake ptest
+PACKAGECONFIG ?= " \
+        ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \
-PACKAGECONFIG ?= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}"
+        ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "systemd", "", d)} \
+        "
 PACKAGECONFIG[tests] = "-DBUILD_TESTING=ON,-DBUILD_TESTING=OFF,gtest xxd-native"
+PACKAGECONFIG[systemd] = "-DENABLE_SYSTEMD=ON,-DENABLE_SYSTEMD=OFF,systemd"
 do_install_ptest() {
    if [ -e ${B}/tests/bpftrace_test ]; then
@@ -44,17 +43,12 @@ do_install_ptest() {
    fi
 }
-def llvm_major_version(d):
-    pvsplit = d.getVar('LLVMVERSION').split('.')
-    return pvsplit[0]
-LLVM_MAJOR_VERSION = "${@llvm_major_version(d)}"
 EXTRA_OECMAKE = " \
    -DCMAKE_ENABLE_EXPORTS=1 \
    -DCMAKE_BUILD_TYPE=Release \
    -DUSE_SYSTEM_BPF_BCC=ON \
    -DENABLE_MAN=OFF \
+    -DBISON_FLAGS='--file-prefix-map=${WORKDIR}=' \
 "
 COMPATIBLE_HOST = "(x86_64.*|aarch64.*|powerpc64.*|riscv64.*)-linux"
@@ -63,3 +57,6 @@ COMPATIBLE_HOST:libc-musl = "null"
 INHIBIT_PACKAGE_STRIP_FILES += "\
    ${PKGD}${PTEST_PATH}/tests/testprogs/uprobe_test \
 "
+WARN_QA:append = "${@bb.utils.contains('PTEST_ENABLED', '1', ' buildpaths', '', d)}"
+ERROR_QA:remove = "${@bb.utils.contains('PTEST_ENABLED', '1', 'buildpaths', '', d)}"
diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace/0001-replace-python-with-python3-in-the-test.patch b/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace/0001-replace-python-with-python3-in-the-test.patch
deleted file mode 100644
index 4438716..0000000
--- a/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace/0001-replace-python-with-python3-in-the-test.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 62319459e7ef14a37293bc10830b52edf89daabe Mon Sep 17 00:00:00 2001
-From: Wentao Zhang <wentao.zhang@windriver.com>
-Date: Tue, 15 Aug 2023 11:18:36 +0800
-Subject: [PATCH 1/4] replace python with python3 in the test
-"runtime:call" in ptest gets the following FAILED:
-python: No such file or directory
-replace python with python3 in the test scripts.
-$export BPFTRACE_RUNTIME_TEST_EXECUTABLE=/usr/bin
-$cd /usr/lib/bpftrace/ptest/tests
-$python3 runtime/engine/main.py --filter="call.*"
-***
-[ RUN      ] call.strftime_microsecond_extension_rollover
-[  FAILED  ] call.strftime_microsecond_extension_rollover
-        Command: /usr/bin/bpftrace -e 'BEGIN { printf("%s - %s\n", strftime
-    ("1%f", 1000000123000), strftime("1%f", 0)); exit(); }' | tail -n
-    +2 | xargs -I{} python -c "print({})"
-        Unclean exit code: 127
-        Output: __BPFTRACE_NOTIFY_PROBES_ATTACHED\nxargs: python: No such
-    file or directory\n
-***
-Upstream-Status: Submitted [https://github.com/bpftrace/bpftrace/pull/3009]
-Signed-off-by: Wentao Zhang <wentao.zhang@windriver.com>
---
- tests/runtime/call | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/tests/runtime/call b/tests/runtime/call
-index 7f7cce6d..174bce95 100644
--- a/tests/runtime/call
-+++ b/tests/runtime/call
-@@ -371,13 +371,13 @@ TIMEOUT 5
- #
- # Note we add a `1` before the timestamp b/c leading zeros (eg `0123`) is invalid integer in python.
- NAME strftime_microsecond_extension
-RUN {{BPFTRACE}} -e 'BEGIN { printf("%s - %s\n", strftime("1%f", 1000123000), strftime("1%f", 0)); exit(); }' | tail -n +2 | xargs -I{} python -c "print({})"
-+RUN {{BPFTRACE}} -e 'BEGIN { printf("%s - %s\n", strftime("1%f", 1000123000), strftime("1%f", 0)); exit(); }' | tail -n +2 | xargs -I{} python3 -c "print({})"
- EXPECT 123
- TIMEOUT 1
- 
- # Similar to above test but test that rolling over past 1s works as expected
- NAME strftime_microsecond_extension_rollover
-RUN {{BPFTRACE}} -e 'BEGIN { printf("%s - %s\n", strftime("1%f", 1000000123000), strftime("1%f", 0)); exit(); }' | tail -n +2 | xargs -I{} python -c "print({})"
-+RUN {{BPFTRACE}} -e 'BEGIN { printf("%s - %s\n", strftime("1%f", 1000000123000), strftime("1%f", 0)); exit(); }' | tail -n +2 | xargs -I{} python3 -c "print({})"
- EXPECT 123
- TIMEOUT 1
- 
-- 
-2.43.2
diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace/0001-use-64bit-alignment-for-map-counter-atomic-add.patch b/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace/0001-use-64bit-alignment-for-map-counter-atomic-add.patch
deleted file mode 100644
index 49938a1..0000000
--- a/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace/0001-use-64bit-alignment-for-map-counter-atomic-add.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 76538f80d3c56430c3105b6a3a7614313b01ddc5 Mon Sep 17 00:00:00 2001
-From: Frank van der Linden <fvdl@google.com>
-Date: Mon, 11 Mar 2024 15:35:32 +0000
-Subject: [PATCH] use 64bit alignment for map counter atomic add
-For an atomic inc of a map counter (ringbuf loss counter), generate
-IR with 64bit alignment. This is more correct, and will avoid problems
-with upcoming LLVM versions, as they will emit a function call for
-a potentially unaligned atomicrmw. This will lead to an error like this:
-error: <unknown>:0:0: in function BEGIN i64 (ptr): t15: i64 = GlobalAddress<ptr @__atomic_compare_exchange> 0 too many arguments
-Upstream-Status: Backport [https://github.com/bpftrace/bpftrace/pull/3045/commits/3878a437ca946ab69cc92bcd2cb3c2369625b3dc]
- 
-Signed-off-by: Wentao Zhang <wentao.zhang@windriver.com>
---
- CHANGELOG.md             | 2 ++
- src/ast/irbuilderbpf.cpp | 2 +-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-diff --git a/CHANGELOG.md b/CHANGELOG.md
-index 4fa3b673..81b6e0e2 100644
--- a/CHANGELOG.md
-+++ b/CHANGELOG.md
-@@ -19,6 +19,8 @@ and this project adheres to
- #### Fixed
- - Fix field resolution on structs with anon union as first field
-   - [#2964](https://github.com/bpftrace/bpftrace/pull/2964)
-+- Fix alignment of atomic map counter update
-+  - [#3045](https://github.com/bpftrace/bpftrace/pull/3045)
- #### Docs
- #### Tools
- 
-diff --git a/src/ast/irbuilderbpf.cpp b/src/ast/irbuilderbpf.cpp
-index 2ff3c0ce..98c4b0d5 100644
--- a/src/ast/irbuilderbpf.cpp
-+++ b/src/ast/irbuilderbpf.cpp
-@@ -1474,7 +1474,7 @@ void IRBuilderBPF::CreateAtomicIncCounter(const std::string &map_name,
-   CREATE_ATOMIC_RMW(AtomicRMWInst::BinOp::Add,
-                     val,
-                     getInt64(1),
-                    1,
-+                    8,
-                     AtomicOrdering::SequentiallyConsistent);
-   CreateBr(lookup_merge_block);
- 
-- 
-2.35.5
diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace/0002-ast-Repace-getInt8PtrTy-with-getPtrTy.patch b/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace/0002-ast-Repace-getInt8PtrTy-with-getPtrTy.patch
deleted file mode 100644
index 9167963..0000000
--- a/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace/0002-ast-Repace-getInt8PtrTy-with-getPtrTy.patch
+++ /dev/null
@@ -1,338 +0,0 @@
-From 441f38a0fa9711a08ca8d904b542559593bffb16 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 16 Feb 2024 10:32:27 -0800
-Subject: [PATCH 2/4] ast: Repace getInt8PtrTy with getPtrTy
-getPtrTy is added in LLVM-15 and is to be used instead of getInt8PtrTy
-which is gone in LLVM-18 onwards
-https://github.com/llvm/llvm-project/commit/7e0802aeb5b90
-Upstream-Status: Submitted [https://github.com/bpftrace/bpftrace/pull/3009]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- src/ast/irbuilderbpf.cpp        | 58 ++++++++++++++++-----------------
- src/ast/passes/codegen_llvm.cpp | 22 ++++++-------
- 2 files changed, 40 insertions(+), 40 deletions(-)
-diff --git a/src/ast/irbuilderbpf.cpp b/src/ast/irbuilderbpf.cpp
-index 670a9e98..2ff3c0ce 100644
--- a/src/ast/irbuilderbpf.cpp
-+++ b/src/ast/irbuilderbpf.cpp
-@@ -301,7 +301,7 @@ CallInst *IRBuilderBPF::createMapLookup(const std::string &map_name,
-                                         Value *key,
-                                         const std::string &name)
- {
-  return createMapLookup(map_name, key, getInt8PtrTy(), name);
-+  return createMapLookup(map_name, key, getPtrTy(), name);
- }
- 
- CallInst *IRBuilderBPF::createMapLookup(const std::string &map_name,
-@@ -329,7 +329,7 @@ CallInst *IRBuilderBPF::CreateGetJoinMap(BasicBlock *failure_callback,
- {
-   return createGetScratchMap(to_string(MapManager::Type::Join),
-                              "join",
-                             getInt8PtrTy(),
-+                             getPtrTy(),
-                              loc,
-                              failure_callback);
- }
-@@ -358,8 +358,8 @@ CallInst *IRBuilderBPF::createGetScratchMap(const std::string &map_name,
-   BasicBlock *lookup_merge_block = BasicBlock::Create(
-       module_.getContext(), "lookup_" + name + "_merge", parent);
-   Value *condition = CreateICmpNE(
-      CreateIntCast(call, getInt8PtrTy(), true),
-      ConstantExpr::getCast(Instruction::IntToPtr, getInt64(0), getInt8PtrTy()),
-+      CreateIntCast(call, getPtrTy(), true),
-+      ConstantExpr::getCast(Instruction::IntToPtr, getInt64(0), getPtrTy()),
-       "lookup_" + name + "_cond");
-   CreateCondBr(condition, lookup_merge_block, lookup_failure_block);
- 
-@@ -379,7 +379,7 @@ Value *IRBuilderBPF::CreateMapLookupElem(Value *ctx,
-                                          Value *key,
-                                          const location &loc)
- {
-  assert(ctx && ctx->getType() == getInt8PtrTy());
-+  assert(ctx && ctx->getType() == getPtrTy());
-   return CreateMapLookupElem(ctx, map.ident, key, map.type, loc);
- }
- 
-@@ -389,7 +389,7 @@ Value *IRBuilderBPF::CreateMapLookupElem(Value *ctx,
-                                          SizedType &type,
-                                          const location &loc)
- {
-  assert(ctx && ctx->getType() == getInt8PtrTy());
-+  assert(ctx && ctx->getType() == getPtrTy());
-   CallInst *call = createMapLookup(map_name, key);
- 
-   // Check if result == 0
-@@ -406,8 +406,8 @@ Value *IRBuilderBPF::CreateMapLookupElem(Value *ctx,
- 
-   AllocaInst *value = CreateAllocaBPF(type, "lookup_elem_val");
-   Value *condition = CreateICmpNE(
-      CreateIntCast(call, getInt8PtrTy(), true),
-      ConstantExpr::getCast(Instruction::IntToPtr, getInt64(0), getInt8PtrTy()),
-+      CreateIntCast(call, getPtrTy(), true),
-+      ConstantExpr::getCast(Instruction::IntToPtr, getInt64(0), getPtrTy()),
-       "map_lookup_cond");
-   CreateCondBr(condition, lookup_success_block, lookup_failure_block);
- 
-@@ -449,7 +449,7 @@ void IRBuilderBPF::CreateMapUpdateElem(Value *ctx,
- {
-   Value *map_ptr = GetMapVar(map.ident);
- 
-  assert(ctx && ctx->getType() == getInt8PtrTy());
-+  assert(ctx && ctx->getType() == getPtrTy());
-   assert(key->getType()->isPointerTy());
-   assert(val->getType()->isPointerTy());
- 
-@@ -478,7 +478,7 @@ void IRBuilderBPF::CreateMapDeleteElem(Value *ctx,
-                                        Value *key,
-                                        const location &loc)
- {
-  assert(ctx && ctx->getType() == getInt8PtrTy());
-+  assert(ctx && ctx->getType() == getPtrTy());
-   assert(key->getType()->isPointerTy());
-   Value *map_ptr = GetMapVar(map.ident);
- 
-@@ -541,7 +541,7 @@ void IRBuilderBPF::CreateProbeRead(Value *ctx,
-                                    AddrSpace as,
-                                    const location &loc)
- {
-  assert(ctx && ctx->getType() == getInt8PtrTy());
-+  assert(ctx && ctx->getType() == getPtrTy());
-   assert(size && size->getType()->getIntegerBitWidth() <= 32);
-   size = CreateIntCast(size, getInt32Ty(), false);
- 
-@@ -581,7 +581,7 @@ CallInst *IRBuilderBPF::CreateProbeReadStr(Value *ctx,
-                                            AddrSpace as,
-                                            const location &loc)
- {
-  assert(ctx && ctx->getType() == getInt8PtrTy());
-+  assert(ctx && ctx->getType() == getPtrTy());
-   assert(size && size->getType()->isIntegerTy());
-   if ([[maybe_unused]] auto *dst_alloca = dyn_cast<AllocaInst>(dst)) {
-     assert(dst_alloca->getAllocatedType()->isArrayTy() &&
-@@ -615,7 +615,7 @@ Value *IRBuilderBPF::CreateUSDTReadArgument(Value *ctx,
-                                             AddrSpace as,
-                                             const location &loc)
- {
-  assert(ctx && ctx->getType() == getInt8PtrTy());
-+  assert(ctx && ctx->getType() == getPtrTy());
-   // Argument size must be 1, 2, 4, or 8. See
-   // https://sourceware.org/systemtap/wiki/UserSpaceProbeImplementation
-   int abs_size = std::abs(argument->size);
-@@ -711,7 +711,7 @@ Value *IRBuilderBPF::CreateUSDTReadArgument(Value *ctx,
-                                             AddrSpace as,
-                                             const location &loc)
- {
-  assert(ctx && ctx->getType() == getInt8PtrTy());
-+  assert(ctx && ctx->getType() == getPtrTy());
-   struct bcc_usdt_argument argument;
- 
-   void *usdt;
-@@ -1337,7 +1337,7 @@ CallInst *IRBuilderBPF::CreateGetStackId(Value *ctx,
-                                          StackType stack_type,
-                                          const location &loc)
- {
-  assert(ctx && ctx->getType() == getInt8PtrTy());
-+  assert(ctx && ctx->getType() == getPtrTy());
- 
-   Value *map_ptr = GetMapVar(stack_type.name());
- 
-@@ -1350,7 +1350,7 @@ CallInst *IRBuilderBPF::CreateGetStackId(Value *ctx,
-   // Return: >= 0 stackid on success or negative error
-   FunctionType *getstackid_func_type = FunctionType::get(
-       getInt64Ty(),
-      { getInt8PtrTy(), map_ptr->getType(), getInt64Ty() },
-+      { getPtrTy(), map_ptr->getType(), getInt64Ty() },
-       false);
-   CallInst *call = CreateHelperCall(libbpf::BPF_FUNC_get_stackid,
-                                     getstackid_func_type,
-@@ -1399,7 +1399,7 @@ void IRBuilderBPF::CreateOutput(Value *ctx,
-                                 size_t size,
-                                 const location *loc)
- {
-  assert(ctx && ctx->getType() == getInt8PtrTy());
-+  assert(ctx && ctx->getType() == getPtrTy());
-   assert(data && data->getType()->isPointerTy());
- 
-   if (bpftrace_.feature_->has_map_ringbuf()) {
-@@ -1464,8 +1464,8 @@ void IRBuilderBPF::CreateAtomicIncCounter(const std::string &map_name,
-                                                       parent);
- 
-   Value *condition = CreateICmpNE(
-      CreateIntCast(call, getInt8PtrTy(), true),
-      ConstantExpr::getCast(Instruction::IntToPtr, getInt64(0), getInt8PtrTy()),
-+      CreateIntCast(call, getPtrTy(), true),
-+      ConstantExpr::getCast(Instruction::IntToPtr, getInt64(0), getPtrTy()),
-       "map_lookup_cond");
-   CreateCondBr(condition, lookup_success_block, lookup_failure_block);
- 
-@@ -1521,8 +1521,8 @@ void IRBuilderBPF::CreateMapElemAdd(Value *ctx,
- 
-   AllocaInst *value = CreateAllocaBPF(type, "lookup_elem_val");
-   Value *condition = CreateICmpNE(
-      CreateIntCast(call, getInt8PtrTy(), true),
-      ConstantExpr::getCast(Instruction::IntToPtr, getInt64(0), getInt8PtrTy()),
-+      CreateIntCast(call, getPtrTy(), true),
-+      ConstantExpr::getCast(Instruction::IntToPtr, getInt64(0), getPtrTy()),
-       "map_lookup_cond");
-   CreateCondBr(condition, lookup_success_block, lookup_failure_block);
- 
-@@ -1557,7 +1557,7 @@ void IRBuilderBPF::CreatePerfEventOutput(Value *ctx,
-   // long bpf_perf_event_output(struct pt_regs *ctx, struct bpf_map *map,
-   //                            u64 flags, void *data, u64 size)
-   FunctionType *perfoutput_func_type = FunctionType::get(getInt64Ty(),
-                                                         { getInt8PtrTy(),
-+                                                         { getPtrTy(),
-                                                            map_ptr->getType(),
-                                                            getInt64Ty(),
-                                                            data->getType(),
-@@ -1600,7 +1600,7 @@ void IRBuilderBPF::CreateTracePrintk(Value *fmt_ptr,
- 
-   // long bpf_trace_printk(const char *fmt, u32 fmt_size, ...)
-   FunctionType *traceprintk_func_type = FunctionType::get(
-      getInt64Ty(), { getInt8PtrTy(), getInt32Ty() }, true);
-+      getInt64Ty(), { getPtrTy(), getInt32Ty() }, true);
- 
-   CreateHelperCall(libbpf::BPF_FUNC_trace_printk,
-                    traceprintk_func_type,
-@@ -1630,7 +1630,7 @@ void IRBuilderBPF::CreateOverrideReturn(Value *ctx, Value *rc)
-   // long bpf_override_return(struct pt_regs *regs, u64 rc)
-   // Return: 0
-   FunctionType *override_func_type = FunctionType::get(
-      getInt64Ty(), { getInt8PtrTy(), getInt64Ty() }, false);
-+      getInt64Ty(), { getPtrTy(), getInt64Ty() }, false);
-   PointerType *override_func_ptr_type = PointerType::get(override_func_type, 0);
-   Constant *override_func = ConstantExpr::getCast(
-       Instruction::IntToPtr,
-@@ -1807,7 +1807,7 @@ void IRBuilderBPF::CreateHelperError(Value *ctx,
-                                      libbpf::bpf_func_id func_id,
-                                      const location &loc)
- {
-  assert(ctx && ctx->getType() == getInt8PtrTy());
-+  assert(ctx && ctx->getType() == getPtrTy());
-   assert(return_value && return_value->getType() == getInt32Ty());
- 
-   if (bpftrace_.helper_check_level_ == 0 ||
-@@ -1847,7 +1847,7 @@ void IRBuilderBPF::CreateHelperErrorCond(Value *ctx,
-                                          const location &loc,
-                                          bool compare_zero)
- {
-  assert(ctx && ctx->getType() == getInt8PtrTy());
-+  assert(ctx && ctx->getType() == getPtrTy());
-   if (bpftrace_.helper_check_level_ == 0 ||
-       (bpftrace_.helper_check_level_ == 1 && return_zero_if_err(func_id)))
-     return;
-@@ -1883,7 +1883,7 @@ void IRBuilderBPF::CreatePath(Value *ctx,
-   // int bpf_d_path(struct path *path, char *buf, u32 sz)
-   // Return: 0 or error
-   FunctionType *d_path_func_type = FunctionType::get(
-      getInt64Ty(), { getInt8PtrTy(), buf->getType(), getInt32Ty() }, false);
-+      getInt64Ty(), { getPtrTy(), buf->getType(), getInt32Ty() }, false);
-   CallInst *call = CreateHelperCall(
-       libbpf::bpf_func_id::BPF_FUNC_d_path,
-       d_path_func_type,
-@@ -1905,9 +1905,9 @@ void IRBuilderBPF::CreateSeqPrintf(Value *ctx,
-   // Return: 0 or error
-   FunctionType *seq_printf_func_type = FunctionType::get(getInt64Ty(),
-                                                          { getInt64Ty(),
-                                                           getInt8PtrTy(),
-+                                                           getPtrTy(),
-                                                            getInt32Ty(),
-                                                           getInt8PtrTy(),
-+                                                           getPtrTy(),
-                                                            getInt32Ty() },
-                                                          false);
-   PointerType *seq_printf_func_ptr_type = PointerType::get(seq_printf_func_type,
-diff --git a/src/ast/passes/codegen_llvm.cpp b/src/ast/passes/codegen_llvm.cpp
-index 073d48ae..258b0b0b 100644
--- a/src/ast/passes/codegen_llvm.cpp
-+++ b/src/ast/passes/codegen_llvm.cpp
-@@ -380,10 +380,10 @@ void CodegenLLVM::visit(Call &call)
- 
-     AllocaInst *value = b_.CreateAllocaBPF(type, "lookup_elem_val");
-     Value *condition = b_.CreateICmpNE(
-        b_.CreateIntCast(lookup, b_.getInt8PtrTy(), true),
-+        b_.CreateIntCast(lookup, b_.getPtrTy(), true),
-         ConstantExpr::getCast(Instruction::IntToPtr,
-                               b_.getInt64(0),
-                              b_.getInt8PtrTy()),
-+                              b_.getPtrTy()),
-         "map_lookup_cond");
-     b_.CreateCondBr(condition, lookup_success_block, lookup_failure_block);
- 
-@@ -437,10 +437,10 @@ void CodegenLLVM::visit(Call &call)
- 
-     AllocaInst *value = b_.CreateAllocaBPF(type, "lookup_elem_val");
-     Value *condition = b_.CreateICmpNE(
-        b_.CreateIntCast(lookup, b_.getInt8PtrTy(), true),
-+        b_.CreateIntCast(lookup, b_.getPtrTy(), true),
-         ConstantExpr::getCast(Instruction::IntToPtr,
-                               b_.getInt64(0),
-                              b_.getInt8PtrTy()),
-+                              b_.getPtrTy()),
-         "map_lookup_cond");
-     b_.CreateCondBr(condition, lookup_success_block, lookup_failure_block);
- 
-@@ -687,7 +687,7 @@ void CodegenLLVM::visit(Call &call)
-                                     ? Instruction::BitCast
-                                     : Instruction::IntToPtr,
-                                 expr_,
-                                b_.getInt8PtrTy()),
-+                                b_.getPtrTy()),
-                   call.loc);
-     expr_ = buf;
-     expr_deleter_ = [this, buf]() { b_.CreateLifetimeEnd(buf); };
-@@ -919,9 +919,9 @@ void CodegenLLVM::visit(Call &call)
- 
-       // and finally the seq_printf call
-       b_.CreateSeqPrintf(ctx_,
-                         b_.CreateIntToPtr(fmt, b_.getInt8PtrTy()),
-+                         b_.CreateIntToPtr(fmt, b_.getPtrTy()),
-                          b_.getInt32(size),
-                         b_.CreatePointerCast(data, b_.getInt8PtrTy()),
-+                         b_.CreatePointerCast(data, b_.getPtrTy()),
-                          b_.getInt32(data_size),
-                          call.loc);
- 
-@@ -950,7 +950,7 @@ void CodegenLLVM::visit(Call &call)
-       values.push_back(expr_);
-     }
- 
-    b_.CreateTracePrintk(b_.CreateIntToPtr(fmt, b_.getInt8PtrTy()),
-+    b_.CreateTracePrintk(b_.CreateIntToPtr(fmt, b_.getPtrTy()),
-                          b_.getInt32(size),
-                          values,
-                          call.loc);
-@@ -1878,7 +1878,7 @@ void CodegenLLVM::visit(FieldAccess &acc)
-         // `is_data_loc` should only be set if field access is on `args` which
-         // has to be a ctx access
-         assert(type.IsCtxAccess());
-        assert(ctx_->getType() == b_.getInt8PtrTy());
-+        assert(ctx_->getType() == b_.getPtrTy());
-         // Parser needs to have rewritten field to be a u64
-         assert(field.type.IsIntTy());
-         assert(field.type.GetIntBitWidth() == 64);
-@@ -2416,7 +2416,7 @@ void CodegenLLVM::createRet(Value *value)
- void CodegenLLVM::visit(Probe &probe)
- {
-   FunctionType *func_type = FunctionType::get(b_.getInt64Ty(),
-                                              { b_.getInt8PtrTy() }, // struct
-+                                              { b_.getPtrTy() }, // struct
-                                                                      // pt_regs
-                                                                      // *ctx
-                                               false);
-@@ -3773,7 +3773,7 @@ Function *CodegenLLVM::createMapLenCallback()
-   auto saved_ip = b_.saveIP();
- 
-   std::array<llvm::Type *, 4> args = {
-    b_.getInt8PtrTy(), b_.getInt8PtrTy(), b_.getInt8PtrTy(), b_.getInt8PtrTy()
-+    b_.getPtrTy(), b_.getPtrTy(), b_.getPtrTy(), b_.getPtrTy()
-   };
- 
-   FunctionType *callback_type = FunctionType::get(b_.getInt64Ty(), args, false);
-- 
-2.43.2
diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace/0003-ast-Adjust-to-enum-changes-in-llvm-18.patch b/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace/0003-ast-Adjust-to-enum-changes-in-llvm-18.patch
deleted file mode 100644
index 35f442f..0000000
--- a/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace/0003-ast-Adjust-to-enum-changes-in-llvm-18.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 71618b5eae717c491e11b770dff14ba79306f0c8 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 16 Feb 2024 10:40:21 -0800
-Subject: [PATCH 3/4] ast: Adjust to enum changes in llvm 18
-llvm 18 has change CodeGenOpt::Level/CodeGenFileType into enum classes via
-https://github.com/llvm/llvm-project/commit/0a1aa6cda2758b0926a95f87d39ffefb1cb90200
-Upstream-Status: Submitted [https://github.com/bpftrace/bpftrace/pull/3009]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- src/ast/passes/codegen_llvm.cpp | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-diff --git a/src/ast/passes/codegen_llvm.cpp b/src/ast/passes/codegen_llvm.cpp
-index 258b0b0b..ceab4bc4 100644
--- a/src/ast/passes/codegen_llvm.cpp
-+++ b/src/ast/passes/codegen_llvm.cpp
-@@ -73,7 +73,7 @@ CodegenLLVM::CodegenLLVM(Node *root, BPFtrace &bpftrace)
-                                   Optional<Reloc::Model>()
- #endif
-                                       ));
-  target_machine_->setOptLevel(llvm::CodeGenOpt::Aggressive);
-+  target_machine_->setOptLevel(llvm::CodeGenOptLevel::Aggressive);
- 
-   module_->setTargetTriple(LLVMTargetTriple);
-   module_->setDataLayout(target_machine_->createDataLayout());
-@@ -3530,7 +3530,9 @@ void CodegenLLVM::emit(raw_pwrite_stream &stream)
- {
-   legacy::PassManager PM;
- 
-#if LLVM_VERSION_MAJOR >= 10
-+#if LLVM_VERSION_MAJOR >= 18
-+  auto type = CodeGenFileType::ObjectFile;
-+#elif LLVM_VERSION_MAJOR >= 10
-   auto type = llvm::CGFT_ObjectFile;
- #else
-   auto type = llvm::TargetMachine::CGFT_ObjectFile;
-- 
-2.43.2
diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace/0004-cmake-Bump-max-LLVM-version-to-18.patch b/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace/0004-cmake-Bump-max-LLVM-version-to-18.patch
deleted file mode 100644
index 8a5dbf2..0000000
--- a/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace/0004-cmake-Bump-max-LLVM-version-to-18.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 16186113346c268a0bb45424ba1c41768b7e94cf Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 16 Feb 2024 10:14:41 -0800
-Subject: [PATCH 4/4] cmake: Bump max LLVM version to 18+
-Upstream-Status: Submitted [https://github.com/bpftrace/bpftrace/pull/3009]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7983ee17..7d0433de 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -139,7 +139,7 @@ else()
- endif()
- 
- set(MIN_LLVM_MAJOR 6)
-set(MAX_LLVM_MAJOR 17)
-+set(MAX_LLVM_MAJOR 18)
- 
- if((${LLVM_VERSION_MAJOR} VERSION_LESS ${MIN_LLVM_MAJOR}) OR (${LLVM_VERSION_MAJOR} VERSION_GREATER ${MAX_LLVM_MAJOR}))
-   message(SEND_ERROR "Unsupported LLVM version found via ${LLVM_INCLUDE_DIRS}: ${LLVM_VERSION_MAJOR}")
-- 
-2.43.2
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/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/recipes-connectivity/openssl/openssl_%.bbappend b/recipes-connectivity/openssl/openssl_%.bbappend
index 6679165..c0a5991 100644
--- a/recipes-connectivity/openssl/openssl_%.bbappend
+++ b/recipes-connectivity/openssl/openssl_%.bbappend
@@ -1,11 +1,3 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-LDLIBS:append:toolchain-clang:riscv64 = " -latomic"
+LDFLAGS:append:toolchain-clang:riscv32 = " -Wl,--no-relax"
-LDLIBS:append:toolchain-clang:riscv32 = " -latomic"
-do_configure:prepend:toolchain-clang:riscv64 () {
-    export LDLIBS="${LDLIBS}"
-}
-do_configure:prepend:toolchain-clang:riscv32 () {
-    export LDLIBS="${LDLIBS}"
-}
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.36%.bbappend b/recipes-core/busybox/busybox_1.36%.bbappend
deleted file mode 100644
index 6eadf24..0000000
--- a/recipes-core/busybox/busybox_1.36%.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-SRC_URI:append:toolchain-clang = " file://clang.cfg"
diff --git a/recipes-core/musl/musl_%.bbappend b/recipes-core/musl/musl_%.bbappend
index 5140968..0315be3 100644
--- a/recipes-core/musl/musl_%.bbappend
+++ b/recipes-core/musl/musl_%.bbappend
@@ -1,5 +1,5 @@
 DEPENDS:append:toolchain-clang = " clang-cross-${TARGET_ARCH}"
-DEPENDS:remove:toolchain-clang = "virtual/${TARGET_PREFIX}gcc"
+DEPENDS:remove:toolchain-clang = "virtual/cross-cc"
 TOOLCHAIN:x86-x32 = "gcc"
 # crashes seen in malloc@plt
diff --git a/recipes-devtools/bindgen-cli/bindgen-cli-crates.inc b/recipes-devtools/bindgen-cli/bindgen-cli-crates.inc
deleted file mode 100644
index 5bf5faf..0000000
--- a/recipes-devtools/bindgen-cli/bindgen-cli-crates.inc
+++ /dev/null
@@ -1,198 +0,0 @@
-# Autogenerated with 'bitbake -c update_crates bindgen-cli'
-# from Cargo.lock
-SRC_URI += " \
-    crate://crates.io/aho-corasick/0.5.3 \
-    crate://crates.io/aho-corasick/0.7.20 \
-    crate://crates.io/ansi_term/0.12.1 \
-    crate://crates.io/atty/0.2.14 \
-    crate://crates.io/bitflags/1.3.2 \
-    crate://crates.io/block/0.1.6 \
-    crate://crates.io/cc/1.0.78 \
-    crate://crates.io/cexpr/0.6.0 \
-    crate://crates.io/cfg-if/1.0.0 \
-    crate://crates.io/clang-sys/1.4.0 \
-    crate://crates.io/clap/2.34.0 \
-    crate://crates.io/clap/4.1.4 \
-    crate://crates.io/clap_derive/4.1.0 \
-    crate://crates.io/clap_lex/0.3.1 \
-    crate://crates.io/diff/0.1.13 \
-    crate://crates.io/either/1.8.1 \
-    crate://crates.io/env_logger/0.3.5 \
-    crate://crates.io/env_logger/0.9.3 \
-    crate://crates.io/errno/0.2.8 \
-    crate://crates.io/errno-dragonfly/0.1.2 \
-    crate://crates.io/fastrand/1.8.0 \
-    crate://crates.io/fuchsia-cprng/0.1.1 \
-    crate://crates.io/glob/0.3.1 \
-    crate://crates.io/heck/0.4.0 \
-    crate://crates.io/hermit-abi/0.1.19 \
-    crate://crates.io/hermit-abi/0.2.6 \
-    crate://crates.io/humantime/2.1.0 \
-    crate://crates.io/instant/0.1.12 \
-    crate://crates.io/io-lifetimes/1.0.4 \
-    crate://crates.io/is-terminal/0.4.2 \
-    crate://crates.io/kernel32-sys/0.2.2 \
-    crate://crates.io/lazy_static/1.4.0 \
-    crate://crates.io/lazycell/1.3.0 \
-    crate://crates.io/libc/0.2.139 \
-    crate://crates.io/libloading/0.6.7 \
-    crate://crates.io/libloading/0.7.4 \
-    crate://crates.io/linux-raw-sys/0.1.4 \
-    crate://crates.io/log/0.3.9 \
-    crate://crates.io/log/0.4.17 \
-    crate://crates.io/malloc_buf/0.0.6 \
-    crate://crates.io/memchr/0.1.11 \
-    crate://crates.io/memchr/2.5.0 \
-    crate://crates.io/minimal-lexical/0.2.1 \
-    crate://crates.io/nom/7.1.3 \
-    crate://crates.io/objc/0.2.7 \
-    crate://crates.io/once_cell/1.17.0 \
-    crate://crates.io/os_str_bytes/6.4.1 \
-    crate://crates.io/peeking_take_while/0.1.2 \
-    crate://crates.io/proc-macro-error/1.0.4 \
-    crate://crates.io/proc-macro-error-attr/1.0.4 \
-    crate://crates.io/proc-macro2/1.0.50 \
-    crate://crates.io/quickcheck/0.4.1 \
-    crate://crates.io/quote/1.0.23 \
-    crate://crates.io/rand/0.3.23 \
-    crate://crates.io/rand/0.4.6 \
-    crate://crates.io/rand_core/0.3.1 \
-    crate://crates.io/rand_core/0.4.2 \
-    crate://crates.io/rdrand/0.4.0 \
-    crate://crates.io/redox_syscall/0.2.16 \
-    crate://crates.io/regex/0.1.80 \
-    crate://crates.io/regex/1.7.1 \
-    crate://crates.io/regex-syntax/0.3.9 \
-    crate://crates.io/regex-syntax/0.6.28 \
-    crate://crates.io/remove_dir_all/0.5.3 \
-    crate://crates.io/rustc-hash/1.1.0 \
-    crate://crates.io/rustix/0.36.7 \
-    crate://crates.io/shlex/1.1.0 \
-    crate://crates.io/strsim/0.8.0 \
-    crate://crates.io/strsim/0.10.0 \
-    crate://crates.io/syn/1.0.107 \
-    crate://crates.io/tempdir/0.3.7 \
-    crate://crates.io/tempfile/3.3.0 \
-    crate://crates.io/termcolor/1.2.0 \
-    crate://crates.io/textwrap/0.11.0 \
-    crate://crates.io/thread-id/2.0.0 \
-    crate://crates.io/thread_local/0.2.7 \
-    crate://crates.io/unicode-ident/1.0.6 \
-    crate://crates.io/unicode-width/0.1.10 \
-    crate://crates.io/utf8-ranges/0.1.3 \
-    crate://crates.io/vec_map/0.8.2 \
-    crate://crates.io/version_check/0.9.4 \
-    crate://crates.io/which/4.4.0 \
-    crate://crates.io/winapi/0.2.8 \
-    crate://crates.io/winapi/0.3.9 \
-    crate://crates.io/winapi-build/0.1.1 \
-    crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \
-    crate://crates.io/winapi-util/0.1.5 \
-    crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \
-    crate://crates.io/windows-sys/0.42.0 \
-    crate://crates.io/windows_aarch64_gnullvm/0.42.1 \
-    crate://crates.io/windows_aarch64_msvc/0.42.1 \
-    crate://crates.io/windows_i686_gnu/0.42.1 \
-    crate://crates.io/windows_i686_msvc/0.42.1 \
-    crate://crates.io/windows_x86_64_gnu/0.42.1 \
-    crate://crates.io/windows_x86_64_gnullvm/0.42.1 \
-    crate://crates.io/windows_x86_64_msvc/0.42.1 \
-"
-SRC_URI[aho-corasick-0.5.3.sha256sum] = "ca972c2ea5f742bfce5687b9aef75506a764f61d37f8f649047846a9686ddb66"
-SRC_URI[aho-corasick-0.7.20.sha256sum] = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
-SRC_URI[ansi_term-0.12.1.sha256sum] = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
-SRC_URI[atty-0.2.14.sha256sum] = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-SRC_URI[bitflags-1.3.2.sha256sum] = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-SRC_URI[block-0.1.6.sha256sum] = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
-SRC_URI[cc-1.0.78.sha256sum] = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d"
-SRC_URI[cexpr-0.6.0.sha256sum] = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
-SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-SRC_URI[clang-sys-1.4.0.sha256sum] = "fa2e27ae6ab525c3d369ded447057bca5438d86dc3a68f6faafb8269ba82ebf3"
-SRC_URI[clap-2.34.0.sha256sum] = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
-SRC_URI[clap-4.1.4.sha256sum] = "f13b9c79b5d1dd500d20ef541215a6423c75829ef43117e1b4d17fd8af0b5d76"
-SRC_URI[clap_derive-4.1.0.sha256sum] = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8"
-SRC_URI[clap_lex-0.3.1.sha256sum] = "783fe232adfca04f90f56201b26d79682d4cd2625e0bc7290b95123afe558ade"
-SRC_URI[diff-0.1.13.sha256sum] = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
-SRC_URI[either-1.8.1.sha256sum] = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
-SRC_URI[env_logger-0.3.5.sha256sum] = "15abd780e45b3ea4f76b4e9a26ff4843258dd8a3eed2775a0e7368c2e7936c2f"
-SRC_URI[env_logger-0.9.3.sha256sum] = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7"
-SRC_URI[errno-0.2.8.sha256sum] = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
-SRC_URI[errno-dragonfly-0.1.2.sha256sum] = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
-SRC_URI[fastrand-1.8.0.sha256sum] = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499"
-SRC_URI[fuchsia-cprng-0.1.1.sha256sum] = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
-SRC_URI[glob-0.3.1.sha256sum] = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
-SRC_URI[heck-0.4.0.sha256sum] = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9"
-SRC_URI[hermit-abi-0.1.19.sha256sum] = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
-SRC_URI[hermit-abi-0.2.6.sha256sum] = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
-SRC_URI[humantime-2.1.0.sha256sum] = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
-SRC_URI[instant-0.1.12.sha256sum] = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
-SRC_URI[io-lifetimes-1.0.4.sha256sum] = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e"
-SRC_URI[is-terminal-0.4.2.sha256sum] = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189"
-SRC_URI[kernel32-sys-0.2.2.sha256sum] = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
-SRC_URI[lazy_static-1.4.0.sha256sum] = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-SRC_URI[lazycell-1.3.0.sha256sum] = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
-SRC_URI[libc-0.2.139.sha256sum] = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
-SRC_URI[libloading-0.6.7.sha256sum] = "351a32417a12d5f7e82c368a66781e307834dae04c6ce0cd4456d52989229883"
-SRC_URI[libloading-0.7.4.sha256sum] = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
-SRC_URI[linux-raw-sys-0.1.4.sha256sum] = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
-SRC_URI[log-0.3.9.sha256sum] = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
-SRC_URI[log-0.4.17.sha256sum] = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
-SRC_URI[malloc_buf-0.0.6.sha256sum] = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb"
-SRC_URI[memchr-0.1.11.sha256sum] = "d8b629fb514376c675b98c1421e80b151d3817ac42d7c667717d282761418d20"
-SRC_URI[memchr-2.5.0.sha256sum] = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
-SRC_URI[minimal-lexical-0.2.1.sha256sum] = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
-SRC_URI[nom-7.1.3.sha256sum] = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
-SRC_URI[objc-0.2.7.sha256sum] = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
-SRC_URI[once_cell-1.17.0.sha256sum] = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66"
-SRC_URI[os_str_bytes-6.4.1.sha256sum] = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee"
-SRC_URI[peeking_take_while-0.1.2.sha256sum] = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
-SRC_URI[proc-macro-error-1.0.4.sha256sum] = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
-SRC_URI[proc-macro-error-attr-1.0.4.sha256sum] = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
-SRC_URI[proc-macro2-1.0.50.sha256sum] = "6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2"
-SRC_URI[quickcheck-0.4.1.sha256sum] = "02c2411d418cea2364325b18a205664f9ef8252e06b2e911db97c0b0d98b1406"
-SRC_URI[quote-1.0.23.sha256sum] = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b"
-SRC_URI[rand-0.3.23.sha256sum] = "64ac302d8f83c0c1974bf758f6b041c6c8ada916fbb44a609158ca8b064cc76c"
-SRC_URI[rand-0.4.6.sha256sum] = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293"
-SRC_URI[rand_core-0.3.1.sha256sum] = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
-SRC_URI[rand_core-0.4.2.sha256sum] = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
-SRC_URI[rdrand-0.4.0.sha256sum] = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
-SRC_URI[redox_syscall-0.2.16.sha256sum] = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
-SRC_URI[regex-0.1.80.sha256sum] = "4fd4ace6a8cf7860714a2c2280d6c1f7e6a413486c13298bbc86fd3da019402f"
-SRC_URI[regex-1.7.1.sha256sum] = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733"
-SRC_URI[regex-syntax-0.3.9.sha256sum] = "f9ec002c35e86791825ed294b50008eea9ddfc8def4420124fbc6b08db834957"
-SRC_URI[regex-syntax-0.6.28.sha256sum] = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
-SRC_URI[remove_dir_all-0.5.3.sha256sum] = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
-SRC_URI[rustc-hash-1.1.0.sha256sum] = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
-SRC_URI[rustix-0.36.7.sha256sum] = "d4fdebc4b395b7fbb9ab11e462e20ed9051e7b16e42d24042c776eca0ac81b03"
-SRC_URI[shlex-1.1.0.sha256sum] = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3"
-SRC_URI[strsim-0.8.0.sha256sum] = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
-SRC_URI[strsim-0.10.0.sha256sum] = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
-SRC_URI[syn-1.0.107.sha256sum] = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5"
-SRC_URI[tempdir-0.3.7.sha256sum] = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8"
-SRC_URI[tempfile-3.3.0.sha256sum] = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
-SRC_URI[termcolor-1.2.0.sha256sum] = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
-SRC_URI[textwrap-0.11.0.sha256sum] = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
-SRC_URI[thread-id-2.0.0.sha256sum] = "a9539db560102d1cef46b8b78ce737ff0bb64e7e18d35b2a5688f7d097d0ff03"
-SRC_URI[thread_local-0.2.7.sha256sum] = "8576dbbfcaef9641452d5cf0df9b0e7eeab7694956dd33bb61515fb8f18cfdd5"
-SRC_URI[unicode-ident-1.0.6.sha256sum] = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc"
-SRC_URI[unicode-width-0.1.10.sha256sum] = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
-SRC_URI[utf8-ranges-0.1.3.sha256sum] = "a1ca13c08c41c9c3e04224ed9ff80461d97e121589ff27c753a16cb10830ae0f"
-SRC_URI[vec_map-0.8.2.sha256sum] = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
-SRC_URI[version_check-0.9.4.sha256sum] = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
-SRC_URI[which-4.4.0.sha256sum] = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269"
-SRC_URI[winapi-0.2.8.sha256sum] = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
-SRC_URI[winapi-0.3.9.sha256sum] = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-SRC_URI[winapi-build-0.1.1.sha256sum] = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
-SRC_URI[winapi-i686-pc-windows-gnu-0.4.0.sha256sum] = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-SRC_URI[winapi-util-0.1.5.sha256sum] = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
-SRC_URI[winapi-x86_64-pc-windows-gnu-0.4.0.sha256sum] = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-SRC_URI[windows-sys-0.42.0.sha256sum] = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
-SRC_URI[windows_aarch64_gnullvm-0.42.1.sha256sum] = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608"
-SRC_URI[windows_aarch64_msvc-0.42.1.sha256sum] = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7"
-SRC_URI[windows_i686_gnu-0.42.1.sha256sum] = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640"
-SRC_URI[windows_i686_msvc-0.42.1.sha256sum] = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605"
-SRC_URI[windows_x86_64_gnu-0.42.1.sha256sum] = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45"
-SRC_URI[windows_x86_64_gnullvm-0.42.1.sha256sum] = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463"
-SRC_URI[windows_x86_64_msvc-0.42.1.sha256sum] = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd"
diff --git a/recipes-devtools/bindgen-cli/bindgen-cli_0.64.0.bb b/recipes-devtools/bindgen-cli/bindgen-cli_0.64.0.bb
deleted file mode 100644
index 7c0b739..0000000
--- a/recipes-devtools/bindgen-cli/bindgen-cli_0.64.0.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-SUMMARY = "Automatically generates Rust FFI bindings to C and C++ libraries."
-HOMEPAGE = "https://rust-lang.github.io/rust-bindgen/"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=0b9a98cb3dcdefcceb145324693fda9b"
-inherit rust cargo cargo-update-recipe-crates
-SRCREV = "ae6817256ac557981906e93a1f866349db85053e"
-SRC_URI = "git://github.com/rust-lang/rust-bindgen;protocol=https;branch=main"
-S = "${WORKDIR}/git"
-require ${BPN}-crates.inc
-do_install:append:class-native() {
-        create_wrapper ${D}/${bindir}/bindgen LIBCLANG_PATH="${STAGING_LIBDIR_NATIVE}"
-}
-RDEPENDS:${PN} = "libclang"
-BBCLASSEXTEND = "native"
diff --git a/recipes-devtools/castxml/castxml_0.6.4.20240205.bb b/recipes-devtools/castxml/castxml_0.6.11.bb
index 3ff360c..69663e0 100644
--- a/recipes-devtools/castxml/castxml_0.6.4.20240205.bb
+++ b/recipes-devtools/castxml/castxml_0.6.11.bb
@@ -4,11 +4,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 SRC_URI = "git://github.com/CastXML/CastXML;protocol=https;branch=master"
-SRCREV = "1a460924d456d9983082d615e0df5f797fdeb635"
+SRCREV = "f38c024b395187814f14f77974d8f5240bb2e71f"
-S = "${WORKDIR}/git"
 DEPENDS = "clang"
-inherit cmake cmake-native pkgconfig python3native
+inherit cmake pkgconfig python3native
 BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-devtools/clang/clang-cross-canadian_git.bb b/recipes-devtools/clang/clang-cross-canadian_git.bb
deleted file mode 100644
index 33c33c4..0000000
--- a/recipes-devtools/clang/clang-cross-canadian_git.bb
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright (C) 2014 Khem Raj <raj.khem@gmail.com>
-# Released under the MIT license (see COPYING.MIT for the terms)
-DESCRIPTION = "Clang/LLVM based C/C++ compiler (cross-canadian for ${TARGET_ARCH} target)"
-HOMEPAGE = "http://clang.llvm.org/"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0-with-LLVM-exception;md5=0bcd48c3bdfef0c9d9fd17726e4b7dab"
-SECTION = "devel"
-PN = "clang-cross-canadian-${TRANSLATED_TARGET_ARCH}"
-require clang.inc
-require common-source.inc
-inherit cross-canadian
-DEPENDS += "nativesdk-clang binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} virtual/${HOST_PREFIX}binutils virtual/nativesdk-libc"
-# We have to point gcc at a sysroot but we don't need to rebuild if this changes
-# e.g. we switch between different machines with different tunes.
-EXTRA_OECONF_PATHS[vardepsexclude] = "TUNE_PKGARCH"
-TARGET_ARCH[vardepsexclude] = "TUNE_ARCH"
-do_install() {
-        install -d ${D}${bindir}
-        for tool in clang clang++ clang-tidy lld ld.lld llvm-profdata \
-            llvm-nm llvm-ar llvm-as llvm-ranlib llvm-strip llvm-objcopy llvm-objdump llvm-readelf \
-            llvm-addr2line llvm-dwp llvm-size llvm-strings llvm-cov
-        do
-                ln -sf ../$tool ${D}${bindir}/${TARGET_PREFIX}$tool
-        done
-}
-SSTATE_SCAN_FILES += "*-clang *-clang++ *-llvm-profdata *-llvm-ar \
-                      *-llvm-ranlib *-llvm-nm *-lld *-ld.lld *-llvm-as *-llvm-strip \
-                      *-llvm-objcopy *-llvm-objdump *-llvm-readelf *-llvm-addr2line \
-                      *-llvm-dwp *-llvm-size *-llvm-strings *-llvm-cov"
-do_install:append() {
-        cross_canadian_bindirlinks
-}
diff --git a/recipes-devtools/clang/clang-cross_git.bb b/recipes-devtools/clang/clang-cross_git.bb
deleted file mode 100644
index 8aee5cd..0000000
--- a/recipes-devtools/clang/clang-cross_git.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright (C) 2014 Khem Raj <raj.khem@gmail.com>
-# Released under the MIT license (see COPYING.MIT for the terms)
-DESCRIPTION = "Cross compiler wrappers for LLVM based C/C++ compiler"
-HOMEPAGE = "http://clang.llvm.org/"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0-with-LLVM-exception;md5=0bcd48c3bdfef0c9d9fd17726e4b7dab"
-SECTION = "devel"
-PN = "clang-cross-${TARGET_ARCH}"
-require clang.inc
-require common-source.inc
-inherit cross
-DEPENDS += "clang-native virtual/${TARGET_PREFIX}binutils"
-do_install() {
-        install -d ${D}${bindir}
-        for tool in clang clang++ clang-tidy lld ld.lld llvm-profdata \
-            llvm-nm llvm-ar llvm-as llvm-ranlib llvm-strip llvm-objcopy llvm-objdump llvm-readelf \
-            llvm-addr2line llvm-dwp llvm-size llvm-strings llvm-cov
-        do
-                ln -sf ../$tool ${D}${bindir}/${TARGET_PREFIX}$tool
-        done
-}
-SSTATE_SCAN_FILES += "*-clang *-clang++ *-llvm-profdata *-lld *-ld.lld \
-                      *-llvm-nm *-llvm-ar *-llvm-as *-llvm-ranlib *-llvm-strip \
-                      *-llvm-objcopy *-llvm-objdump *-llvm-readelf *-llvm-addr2line \
-                      *-llvm-dwp *-llvm-size *-llvm-strings *-llvm-cov"
-SYSROOT_PREPROCESS_FUNCS += "clangcross_sysroot_preprocess"
-clangcross_sysroot_preprocess () {
-        sysroot_stage_dir ${D}${bindir} ${SYSROOT_DESTDIR}${bindir}
-}
-PACKAGES = ""
diff --git a/recipes-devtools/clang/clang-crosssdk_git.bb b/recipes-devtools/clang/clang-crosssdk_git.bb
deleted file mode 100644
index fb8bee5..0000000
--- a/recipes-devtools/clang/clang-crosssdk_git.bb
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright (C) 2014 Khem Raj <raj.khem@gmail.com>
-# Released under the MIT license (see COPYING.MIT for the terms)
-DESCRIPTION = "SDK Cross compiler wrappers for LLVM based C/C++ compiler"
-HOMEPAGE = "http://clang.llvm.org/"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0-with-LLVM-exception;md5=0bcd48c3bdfef0c9d9fd17726e4b7dab"
-SECTION = "devel"
-PN = "clang-crosssdk-${TARGET_ARCH}"
-require clang.inc
-require common-source.inc
-inherit crosssdk
-DEPENDS += "clang-native nativesdk-clang-glue virtual/${TARGET_PREFIX}binutils virtual/nativesdk-libc"
-do_install() {
-        install -d ${D}${bindir}
-        for tool in clang clang++ clang-tidy lld ld.lld llvm-profdata \
-            llvm-nm llvm-ar llvm-as llvm-ranlib llvm-strip llvm-objcopy llvm-objdump llvm-readelf \
-            llvm-addr2line llvm-dwp llvm-size llvm-strings llvm-cov
-        do
-                ln -sf ../$tool ${D}${bindir}/${TARGET_PREFIX}$tool
-        done
-}
-SSTATE_SCAN_FILES += "*-clang *-clang++ *-llvm-profdata *-lld *-ld.lld \
-                      *-llvm-nm *-llvm-ar *-llvm-as *-llvm-ranlib *-llvm-strip \
-                      *-llvm-objcopy *-llvm-objdump *-llvm-readelf *-llvm-addr2line \
-                      *-llvm-dwp *-llvm-size *-llvm-strings *-llvm-cov"
-sysroot_stage_all () {
-        sysroot_stage_dir ${D}${bindir} ${SYSROOT_DESTDIR}${bindir}
-}
-PACKAGES = ""
diff --git a/recipes-devtools/clang/clang.inc b/recipes-devtools/clang/clang.inc
deleted file mode 100644
index 8bfc4d1..0000000
--- a/recipes-devtools/clang/clang.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-LLVM_RELEASE = ""
-LLVM_DIR = "llvm${LLVM_RELEASE}"
-LLVM_GIT ?= "git://github.com/llvm"
-LLVM_GIT_PROTOCOL ?= "https"
-MAJOR_VER = "18"
-MINOR_VER = "1"
-PATCH_VER = "4"
-# could be 'rcX' or 'git' or empty ( for release )
-VER_SUFFIX = ""
-SRCREV ?= "e6c3289804a67ea0bb6a86fadbe454dd93b8d855"
-PV = "${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}${VER_SUFFIX}"
-BRANCH = "release/18.x"
-LLVMMD5SUM = "8a15a0759ef07f2682d2ba4b893c9afe"
-CLANGMD5SUM = "ff42885ed2ab98f1ecb8c1fc41205343"
-LLDMD5SUM = "ae7dc7c027b1fa89b5b013d391d3ee2b"
-LLDBMD5SUM = "2e0d44968471fcde980034dbb826bea9"
-LLVM_LIBDIR_SUFFIX="${@d.getVar('baselib').replace('lib', '')}"
-# set the default pigz thread
-export PIGZ = "-p ${@oe.utils.cpu_count(at_least=2)}"
-require common.inc
diff --git a/recipes-devtools/clang/clang/0001-libcxxabi-Find-libunwind-headers-when-LIBCXXABI_LIBU.patch b/recipes-devtools/clang/clang/0001-libcxxabi-Find-libunwind-headers-when-LIBCXXABI_LIBU.patch
deleted file mode 100644
index d4afeed..0000000
--- a/recipes-devtools/clang/clang/0001-libcxxabi-Find-libunwind-headers-when-LIBCXXABI_LIBU.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From ec5bd3bfc9f682c90ceba06f2d76aa5234a9c846 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 27 Aug 2017 10:37:49 -0700
-Subject: [PATCH] libcxxabi: Find libunwind headers when
- LIBCXXABI_LIBUNWIND_INCLUDES is set
-Currently, when LIBCXXABI_LIBUNWIND_INCLUDES is set via CMake arguments
-then it ends up not searching the specified dir and unwind.h is not found
-especially for ARM targets
-This patch makes the searching synthesized directories and then set
-LIBCXXABI_LIBUNWIND_INCLUDES if its there in environment
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- libcxxabi/CMakeLists.txt | 16 +++++++++++-----
- 1 file changed, 11 insertions(+), 5 deletions(-)
-diff --git a/libcxxabi/CMakeLists.txt b/libcxxabi/CMakeLists.txt
-index da998d2221dc..936b78e4d6dd 100644
--- a/libcxxabi/CMakeLists.txt
-+++ b/libcxxabi/CMakeLists.txt
-@@ -422,7 +422,7 @@ set(LIBCXXABI_LIBUNWIND_PATH "${LIBCXXABI_LIBUNWIND_PATH}" CACHE PATH
-     "Specify path to libunwind source." FORCE)
- 
- if (LIBCXXABI_USE_LLVM_UNWINDER OR LLVM_NATIVE_ARCH MATCHES ARM)
-  find_path(LIBCXXABI_LIBUNWIND_INCLUDES_INTERNAL libunwind.h
-+  find_path(LIBCXXABI_LIBUNWIND_INCLUDES libunwind.h
-     PATHS ${LIBCXXABI_LIBUNWIND_INCLUDES}
-           ${LIBCXXABI_LIBUNWIND_PATH}/include
-           ${CMAKE_BINARY_DIR}/${LIBCXXABI_LIBUNWIND_INCLUDES}
-@@ -433,15 +433,21 @@ if (LIBCXXABI_USE_LLVM_UNWINDER OR LLVM_NATIVE_ARCH MATCHES ARM)
-     NO_CMAKE_FIND_ROOT_PATH
-   )
- 
-  if (LIBCXXABI_LIBUNWIND_INCLUDES_INTERNAL STREQUAL "LIBCXXABI_LIBUNWIND_INCLUDES_INTERNAL-NOTFOUND")
-    set(LIBCXXABI_LIBUNWIND_INCLUDES_INTERNAL "")
-+  if (LIBCXXABI_LIBUNWIND_INCLUDES STREQUAL "LIBCXXABI_LIBUNWIND_INCLUDES-NOTFOUND")
-+    set(LIBCXXABI_LIBUNWIND_INCLUDES "")
-   endif()
- endif()
- 
-if (NOT "${LIBCXXABI_LIBUNWIND_INCLUDES_INTERNAL}" STREQUAL "")
-  include_directories("${LIBCXXABI_LIBUNWIND_INCLUDES_INTERNAL}")
-+if (NOT "${LIBCXXABI_LIBUNWIND_INCLUDES}" STREQUAL "")
-+  include_directories("${LIBCXXABI_LIBUNWIND_INCLUDES}")
- endif()
- 
-+set(LIBCXXABI_LIBUNWIND_INCLUDES "${LIBCXXABI_LIBUNWIND_INCLUDES}" CACHE PATH
-+    "Specify path to libunwind includes." FORCE)
-+set(LIBCXXABI_LIBUNWIND_PATH "${LIBCXXABI_LIBUNWIND_PATH}" CACHE PATH
-+    "Specify path to libunwind source." FORCE)
-+
-+
- # Add source code. This also contains all of the logic for deciding linker flags
- # soname, etc...
- add_subdirectory(include)
diff --git a/recipes-devtools/clang/clang/0002-compiler-rt-support-a-new-embedded-linux-target.patch b/recipes-devtools/clang/clang/0002-compiler-rt-support-a-new-embedded-linux-target.patch
deleted file mode 100644
index 6c5c0de..0000000
--- a/recipes-devtools/clang/clang/0002-compiler-rt-support-a-new-embedded-linux-target.patch
+++ /dev/null
@@ -1,309 +0,0 @@
-From ac1643e6e68697e6ee374535dd98413c92224076 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 19 Apr 2015 15:16:23 -0700
-Subject: [PATCH] compiler-rt: support a new embedded linux target
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- .../make/platform/clang_linux_embedded.mk     | 286 ++++++++++++++++++
- .../clang_linux_embedded_test_input.c         |   0
- 2 files changed, 286 insertions(+)
- create mode 100644 compiler-rt/make/platform/clang_linux_embedded.mk
- create mode 100644 compiler-rt/make/platform/clang_linux_embedded_test_input.c
-diff --git a/compiler-rt/make/platform/clang_linux_embedded.mk b/compiler-rt/make/platform/clang_linux_embedded.mk
-new file mode 100644
-index 000000000000..d0a890075a1c
--- /dev/null
-+++ b/compiler-rt/make/platform/clang_linux_embedded.mk
-@@ -0,0 +1,286 @@
-+# These are the functions which clang needs when it is targeting a previous
-+# version of the OS. The issue is that the backend may use functions which were
-+# not present in the libgcc that shipped on the platform. In such cases, we link
-+# with a version of the library which contains private_extern definitions of all
-+# the extra functions which might be referenced.
-+
-+Description := Static runtime libraries for embedded clang/Linux
-+
-+# A function that ensures we don't try to build for architectures that we
-+# don't have working toolchains for.
-+CheckArches = \
-+  $(shell \
-+    result=""; \
-+    for arch in $(1); do \
-+      if $(CC) -arch $$arch -c \
-+         -integrated-as \
-+         $(ProjSrcRoot)/make/platform/clang_linux_embedded_test_input.c \
-+         -o /dev/null > /dev/null 2> /dev/null; then \
-+        result="$$result$$arch "; \
-+      else \
-+       printf 1>&2 \
-+         "warning: clang_linux_embedded.mk: dropping arch '$$arch' from lib '$(2)'\n"; \
-+      fi; \
-+    done; \
-+    echo $$result)
-+
-+XCRun = \
-+  $(shell \
-+    result=`xcrun -find $(1) 2> /dev/null`; \
-+    if [ "$$?" != "0" ]; then result=$(1); fi; \
-+    echo $$result)
-+
-+###
-+
-+CC       := $(call XCRun,clang)
-+AR       := $(call XCRun,ar)
-+RANLIB   := $(call XCRun,ranlib)
-+STRIP    := $(call XCRun,strip)
-+LIPO     := $(call XCRun,lipo)
-+DSYMUTIL := $(call XCRun,dsymutil)
-+Configs :=
-+UniversalArchs :=
-+
-+# Soft-float version of the runtime. No floating-point instructions will be used
-+# and the ABI (out of necessity) passes floating values in normal registers:
-+# non-VFP variant of the AAPCS.
-+UniversalArchs.soft_static := $(call CheckArches,arm armv7m armv7em armv7,soft_static)
-+Configs += $(if $(UniversalArchs.soft_static),soft_static)
-+
-+# Hard-float version of the runtime. On ARM VFP instructions and registers are
-+# allowed, and floating point values get passed in them. VFP variant of the
-+# AAPCS.
-+UniversalArchs.hard_static := $(call CheckArches,armv7em armv7 i386 x86_64,hard_static)
-+Configs += $(if $(UniversalArchs.hard_static),hard_static)
-+
-+UniversalArchs.soft_pic := $(call CheckArches,armv6m armv7m armv7em armv7,soft_pic)
-+Configs += $(if $(UniversalArchs.soft_pic),soft_pic)
-+
-+UniversalArchs.hard_pic := $(call CheckArches,armv7em armv7 i386 x86_64,hard_pic)
-+Configs += $(if $(UniversalArchs.hard_pic),hard_pic)
-+
-+CFLAGS := -Wall -Werror -Oz -fomit-frame-pointer -ffreestanding
-+
-+PIC_CFLAGS := -fPIC
-+STATIC_CFLAGS := -static
-+
-+CFLAGS_SOFT := -mfloat-abi=soft
-+CFLAGS_HARD := -mfloat-abi=hard
-+
-+CFLAGS_I386  := -march=pentium
-+
-+CFLAGS.soft_static := $(CFLAGS) $(STATIC_CFLAGS) $(CFLAGS_SOFT)
-+CFLAGS.hard_static := $(CFLAGS) $(STATIC_CFLAGS) $(CFLAGS_HARD)
-+CFLAGS.soft_pic    := $(CFLAGS) $(PIC_CFLAGS) $(CFLAGS_SOFT)
-+CFLAGS.hard_pic    := $(CFLAGS) $(PIC_CFLAGS) $(CFLAGS_HARD)
-+
-+CFLAGS.soft_static.armv7 := $(CFLAGS.soft_static) $(CFLAGS_ARMV7)
-+CFLAGS.hard_static.armv7 := $(CFLAGS.hard_static) $(CFLAGS_ARMV7)
-+CFLAGS.soft_pic.armv7    := $(CFLAGS.soft_pic) $(CFLAGS_ARMV7)
-+CFLAGS.hard_pic.armv7    := $(CFLAGS.hard_pic) $(CFLAGS_ARMV7)
-+
-+# x86 platforms ignore -mfloat-abi options and complain about doing so. Despite
-+# this they're hard-float.
-+CFLAGS.hard_static.i386   := $(CFLAGS) $(STATIC_CFLAGS) $(CFLAGS_I386)
-+CFLAGS.hard_pic.i386      := $(CFLAGS) $(PIC_CFLAGS) $(CFLAGS_I386)
-+CFLAGS.hard_static.x86_64 := $(CFLAGS) $(STATIC_CFLAGS)
-+CFLAGS.hard_pic.x86_64    := $(CFLAGS) $(PIC_CFLAGS)
-+
-+# Functions not wanted:
-+#   + eprintf is obsolete anyway
-+#   + *vfp: designed for Thumb1 CPUs with VFPv2
-+
-+COMMON_FUNCTIONS := \
-+       absvdi2 \
-+       absvsi2 \
-+       addvdi3 \
-+       addvsi3 \
-+       ashldi3 \
-+       ashrdi3 \
-+       bswapdi2 \
-+       bswapsi2 \
-+       clzdi2 \
-+       clzsi2 \
-+       cmpdi2 \
-+       ctzdi2 \
-+       ctzsi2 \
-+       divdc3 \
-+       divdi3 \
-+       divsc3 \
-+       divmodsi4 \
-+       udivmodsi4 \
-+       do_global_dtors \
-+       ffsdi2 \
-+       fixdfdi \
-+       fixsfdi \
-+       fixunsdfdi \
-+       fixunsdfsi \
-+       fixunssfdi \
-+       fixunssfsi \
-+       floatdidf \
-+       floatdisf \
-+       floatundidf \
-+       floatundisf \
-+       gcc_bcmp \
-+       lshrdi3 \
-+       moddi3 \
-+       muldc3 \
-+       muldi3 \
-+       mulsc3 \
-+       mulvdi3 \
-+       mulvsi3 \
-+       negdi2 \
-+       negvdi2 \
-+       negvsi2 \
-+       paritydi2 \
-+       paritysi2 \
-+       popcountdi2 \
-+       popcountsi2 \
-+       powidf2 \
-+       powisf2 \
-+       subvdi3 \
-+       subvsi3 \
-+       ucmpdi2 \
-+       udiv_w_sdiv \
-+       udivdi3 \
-+       udivmoddi4 \
-+       umoddi3 \
-+       adddf3 \
-+       addsf3 \
-+       cmpdf2 \
-+       cmpsf2 \
-+       div0 \
-+       divdf3 \
-+       divsf3 \
-+       divsi3 \
-+       extendsfdf2 \
-+       ffssi2 \
-+       fixdfsi \
-+       fixsfsi \
-+       floatsidf \
-+       floatsisf \
-+       floatunsidf \
-+       floatunsisf \
-+       comparedf2 \
-+       comparesf2 \
-+       modsi3 \
-+       muldf3 \
-+       mulsf3 \
-+       negdf2 \
-+       negsf2 \
-+       subdf3 \
-+       subsf3 \
-+       truncdfsf2 \
-+       udivsi3 \
-+       umodsi3 \
-+       unorddf2 \
-+       unordsf2
-+
-+ARM_FUNCTIONS := \
-+       aeabi_cdcmpeq \
-+       aeabi_cdrcmple \
-+       aeabi_cfcmpeq \
-+       aeabi_cfrcmple \
-+       aeabi_dcmpeq \
-+       aeabi_dcmpge \
-+       aeabi_dcmpgt \
-+       aeabi_dcmple \
-+       aeabi_dcmplt \
-+       aeabi_drsub \
-+       aeabi_fcmpeq \
-+       aeabi_fcmpge \
-+       aeabi_fcmpgt \
-+       aeabi_fcmple \
-+       aeabi_fcmplt \
-+       aeabi_frsub \
-+       aeabi_idivmod \
-+       aeabi_uidivmod \
-+
-+# ARM Assembly implementation which requires Thumb2 (i.e. won't work on v6M).
-+THUMB2_FUNCTIONS := \
-+       switch16 \
-+       switch32 \
-+       switch8 \
-+       switchu8 \
-+       sync_fetch_and_add_4 \
-+       sync_fetch_and_sub_4 \
-+       sync_fetch_and_and_4 \
-+       sync_fetch_and_or_4 \
-+       sync_fetch_and_xor_4 \
-+       sync_fetch_and_nand_4 \
-+       sync_fetch_and_max_4 \
-+       sync_fetch_and_umax_4 \
-+       sync_fetch_and_min_4 \
-+       sync_fetch_and_umin_4 \
-+       sync_fetch_and_add_8 \
-+       sync_fetch_and_sub_8 \
-+       sync_fetch_and_and_8 \
-+       sync_fetch_and_or_8 \
-+       sync_fetch_and_xor_8 \
-+       sync_fetch_and_nand_8 \
-+       sync_fetch_and_max_8 \
-+       sync_fetch_and_umax_8 \
-+       sync_fetch_and_min_8 \
-+       sync_fetch_and_umin_8
-+
-+I386_FUNCTIONS :=  \
-+       i686.get_pc_thunk.eax \
-+       i686.get_pc_thunk.ebp \
-+       i686.get_pc_thunk.ebx \
-+       i686.get_pc_thunk.ecx \
-+       i686.get_pc_thunk.edi \
-+       i686.get_pc_thunk.edx \
-+       i686.get_pc_thunk.esi
-+
-+# FIXME: Currently, compiler-rt is missing implementations for a number of the
-+# functions. Filter them out for now.
-+MISSING_FUNCTIONS := \
-+       cmpdf2 cmpsf2 div0 \
-+       ffssi2 \
-+       udiv_w_sdiv unorddf2 unordsf2 bswapdi2 \
-+       bswapsi2 \
-+       gcc_bcmp \
-+       do_global_dtors \
-+       i686.get_pc_thunk.eax i686.get_pc_thunk.ebp i686.get_pc_thunk.ebx \
-+       i686.get_pc_thunk.ecx i686.get_pc_thunk.edi i686.get_pc_thunk.edx \
-+       i686.get_pc_thunk.esi \
-+       aeabi_cdcmpeq aeabi_cdrcmple aeabi_cfcmpeq aeabi_cfrcmple aeabi_dcmpeq \
-+       aeabi_dcmpge aeabi_dcmpgt aeabi_dcmple aeabi_dcmplt aeabi_drsub \
-+       aeabi_fcmpeq \ aeabi_fcmpge aeabi_fcmpgt aeabi_fcmple aeabi_fcmplt \
-+       aeabi_frsub aeabi_idivmod aeabi_uidivmod
-+
-+FUNCTIONS_ARMV6M  := $(COMMON_FUNCTIONS) $(ARM_FUNCTIONS)
-+FUNCTIONS_ARM_ALL := $(COMMON_FUNCTIONS) $(ARM_FUNCTIONS) $(THUMB2_FUNCTIONS)
-+FUNCTIONS_I386    := $(COMMON_FUNCTIONS) $(I386_FUNCTIONS)
-+FUNCTIONS_X86_64  := $(COMMON_FUNCTIONS)
-+
-+FUNCTIONS_ARMV6M := \
-+       $(filter-out $(MISSING_FUNCTIONS),$(FUNCTIONS_ARMV6M))
-+FUNCTIONS_ARM_ALL := \
-+       $(filter-out $(MISSING_FUNCTIONS),$(FUNCTIONS_ARM_ALL))
-+FUNCTIONS_I386 := \
-+       $(filter-out $(MISSING_FUNCTIONS),$(FUNCTIONS_I386))
-+FUNCTIONS_X86_64 := \
-+       $(filter-out $(MISSING_FUNCTIONS),$(FUNCTIONS_X86_64))
-+
-+FUNCTIONS.soft_static.armv6m := $(FUNCTIONS_ARMV6M)
-+FUNCTIONS.soft_pic.armv6m    := $(FUNCTIONS_ARMV6M)
-+
-+FUNCTIONS.soft_static.armv7m := $(FUNCTIONS_ARM_ALL)
-+FUNCTIONS.soft_pic.armv7m    := $(FUNCTIONS_ARM_ALL)
-+
-+FUNCTIONS.soft_static.armv7em := $(FUNCTIONS_ARM_ALL)
-+FUNCTIONS.hard_static.armv7em := $(FUNCTIONS_ARM_ALL)
-+FUNCTIONS.soft_pic.armv7em    := $(FUNCTIONS_ARM_ALL)
-+FUNCTIONS.hard_pic.armv7em    := $(FUNCTIONS_ARM_ALL)
-+
-+FUNCTIONS.soft_static.armv7 := $(FUNCTIONS_ARM_ALL)
-+FUNCTIONS.hard_static.armv7 := $(FUNCTIONS_ARM_ALL)
-+FUNCTIONS.soft_pic.armv7    := $(FUNCTIONS_ARM_ALL)
-+FUNCTIONS.hard_pic.armv7    := $(FUNCTIONS_ARM_ALL)
-+
-+FUNCTIONS.hard_static.i386 := $(FUNCTIONS_I386)
-+FUNCTIONS.hard_pic.i386    := $(FUNCTIONS_I386)
-+
-+FUNCTIONS.hard_static.x86_64 := $(FUNCTIONS_X86_64)
-+FUNCTIONS.hard_pic.x86_64    := $(FUNCTIONS_X86_64)
-diff --git a/compiler-rt/make/platform/clang_linux_embedded_test_input.c b/compiler-rt/make/platform/clang_linux_embedded_test_input.c
-new file mode 100644
-index 000000000000..e69de29bb2d1
diff --git a/recipes-devtools/clang/clang/0003-compiler-rt-Simplify-cross-compilation.-Don-t-use-na.patch b/recipes-devtools/clang/clang/0003-compiler-rt-Simplify-cross-compilation.-Don-t-use-na.patch
deleted file mode 100644
index c5c809b..0000000
--- a/recipes-devtools/clang/clang/0003-compiler-rt-Simplify-cross-compilation.-Don-t-use-na.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 3d969ae73698da3518f3230f9e40cb7bd6f2e6c3 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 19 May 2016 23:11:45 -0700
-Subject: [PATCH] compiler-rt: Simplify cross-compilation. Don't use
- native-compiled llvm-config.
-    Note: AddLLVM.cmake does not expose the LLVM source directory.
-    So if you want to run the test suite, you need to either:
-    1) set LLVM_MAIN_SRC_DIR explicitly (to find lit.py)
-    2) change AddLLVM.cmake to point to an installed 'lit'.
-    3) add_subdirectory(compiler-rt/test) from clang instead of compiler-rt.
-https://us.codeaurora.org/patches/quic/llvm/50683/compiler-rt-cross-compilation.patch
-Upstream-Status: Pending
-Signed-off-by: Greg Fitzgerald <gregf@codeaurora.org>
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- compiler-rt/CMakeLists.txt | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt
-index bbb4e8d7c333..583e5630b03c 100644
--- a/compiler-rt/CMakeLists.txt
-+++ b/compiler-rt/CMakeLists.txt
-@@ -82,7 +82,16 @@ if (COMPILER_RT_STANDALONE_BUILD)
-   set(CMAKE_CXX_EXTENSIONS NO)
- 
-   if (NOT LLVM_RUNTIMES_BUILD)
-    load_llvm_config()
-+    find_package(LLVM REQUIRED)
-+    list(APPEND CMAKE_MODULE_PATH "${LLVM_CMAKE_DIR}")
-+
-+    # Variables that AddLLVM.cmake depends on (included by AddCompilerRT)
-+    set(LLVM_TOOLS_BINARY_DIR "${LLVM_INSTALL_PREFIX}/bin")
-+    set(LLVM_LIBRARY_DIR "${LLVM_INSTALL_PREFIX}/lib")
-+
-+    set(LLVM_LIBRARY_OUTPUT_INTDIR
-+      ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX})
-+
-   endif()
-   if (TARGET intrinsics_gen)
-     # Loading the llvm config causes this target to be imported so place it
diff --git a/recipes-devtools/clang/clang/0004-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch b/recipes-devtools/clang/clang/0004-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch
deleted file mode 100644
index 505a5ba..0000000
--- a/recipes-devtools/clang/clang/0004-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From df831369b91c38565d73b56d452186eff0a63dd4 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 21 May 2016 00:33:20 +0000
-Subject: [PATCH] llvm: TargetLibraryInfo: Undefine libc functions if they are
- macros
-musl defines some functions as macros and not inline functions
-if this is the case then make sure to undefine them
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- .../llvm/Analysis/TargetLibraryInfo.def       | 22 ++++++++++++++++++-
- 1 file changed, 21 insertions(+), 1 deletion(-)
-diff --git a/llvm/include/llvm/Analysis/TargetLibraryInfo.def b/llvm/include/llvm/Analysis/TargetLibraryInfo.def
-index 6bd922eed89e..9e15466f963a 100644
--- a/llvm/include/llvm/Analysis/TargetLibraryInfo.def
-+++ b/llvm/include/llvm/Analysis/TargetLibraryInfo.def
-@@ -1348,6 +1348,9 @@ TLI_DEFINE_STRING_INTERNAL("fopen")
- TLI_DEFINE_SIG_INTERNAL(Ptr, Ptr, Ptr)
- 
- /// FILE *fopen64(const char *filename, const char *opentype)
-+#ifdef fopen64
-+#undef fopen64
-+#endif
- TLI_DEFINE_ENUM_INTERNAL(fopen64)
- TLI_DEFINE_STRING_INTERNAL("fopen64")
- TLI_DEFINE_SIG_INTERNAL(Ptr, Ptr, Ptr)
-@@ -1426,7 +1429,9 @@ TLI_DEFINE_SIG_INTERNAL(Int, Ptr, Long, Int)
- TLI_DEFINE_ENUM_INTERNAL(fseeko)
- TLI_DEFINE_STRING_INTERNAL("fseeko")
- TLI_DEFINE_SIG_INTERNAL(Int, Ptr, IntX, Int)
-
-+#ifdef fseeko64
-+#undef fseeko64
-+#endif
- /// int fseeko64(FILE *stream, off64_t offset, int whence)
- TLI_DEFINE_ENUM_INTERNAL(fseeko64)
- TLI_DEFINE_STRING_INTERNAL("fseeko64")
-@@ -1443,6 +1448,9 @@ TLI_DEFINE_STRING_INTERNAL("fstat")
- TLI_DEFINE_SIG_INTERNAL(Int, Int, Ptr)
- 
- /// int fstat64(int filedes, struct stat64 *buf)
-+#ifdef fstat64
-+#undef fstat64
-+#endif
- TLI_DEFINE_ENUM_INTERNAL(fstat64)
- TLI_DEFINE_STRING_INTERNAL("fstat64")
- TLI_DEFINE_SIG_INTERNAL(Int, Int, Ptr)
-@@ -1468,6 +1476,9 @@ TLI_DEFINE_STRING_INTERNAL("ftello")
- TLI_DEFINE_SIG_INTERNAL(IntPlus, Ptr)
- 
- /// off64_t ftello64(FILE *stream)
-+#ifdef ftello64
-+#undef ftello64
-+#endif
- TLI_DEFINE_ENUM_INTERNAL(ftello64)
- TLI_DEFINE_STRING_INTERNAL("ftello64")
- TLI_DEFINE_SIG_INTERNAL(Int64, Ptr)
-@@ -1678,6 +1689,9 @@ TLI_DEFINE_STRING_INTERNAL("lstat")
- TLI_DEFINE_SIG_INTERNAL(Int, Ptr, Ptr)
- 
- /// int lstat64(const char *path, struct stat64 *buf);
-+#ifdef lstat64
-+#undef lstat64
-+#endif
- TLI_DEFINE_ENUM_INTERNAL(lstat64)
- TLI_DEFINE_STRING_INTERNAL("lstat64")
- TLI_DEFINE_SIG_INTERNAL(Int, Ptr, Ptr)
-@@ -2090,6 +2104,9 @@ TLI_DEFINE_STRING_INTERNAL("stat")
- TLI_DEFINE_SIG_INTERNAL(Int, Ptr, Ptr)
- 
- /// int stat64(const char *path, struct stat64 *buf);
-+#ifdef stat64
-+#undef stat64
-+#endif
- TLI_DEFINE_ENUM_INTERNAL(stat64)
- TLI_DEFINE_STRING_INTERNAL("stat64")
- TLI_DEFINE_SIG_INTERNAL(Int, Ptr, Ptr)
-@@ -2315,6 +2332,9 @@ TLI_DEFINE_STRING_INTERNAL("tmpfile")
- TLI_DEFINE_SIG_INTERNAL(Ptr)
- 
- /// FILE *tmpfile64(void)
-+#ifdef tmpfile64
-+#undef tmpfile64
-+#endif
- TLI_DEFINE_ENUM_INTERNAL(tmpfile64)
- TLI_DEFINE_STRING_INTERNAL("tmpfile64")
- TLI_DEFINE_SIG_INTERNAL(Ptr)
diff --git a/recipes-devtools/clang/clang/0005-llvm-allow-env-override-of-exe-and-libdir-path.patch b/recipes-devtools/clang/clang/0005-llvm-allow-env-override-of-exe-and-libdir-path.patch
deleted file mode 100644
index 249027a..0000000
--- a/recipes-devtools/clang/clang/0005-llvm-allow-env-override-of-exe-and-libdir-path.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From a160c086ee25bb5db31bc497e910c3615681e948 Mon Sep 17 00:00:00 2001
-From: Martin Kelly <mkelly@xevo.com>
-Date: Fri, 19 May 2017 00:22:57 -0700
-Subject: [PATCH] llvm: allow env override of exe and libdir path
-When using a native llvm-config from inside a sysroot, we need llvm-config to
-return the libraries, include directories, etc. from inside the sysroot rather
-than from the native sysroot. Thus provide an env override for calling
-llvm-config from a target sysroot.
-Add YOCTO_ALTERNATE_LIBDIR and YOCTO_ALTERNATE_EXE_PATH env variables
-Upstream-Status: Inappropriate [OE-specific]
-Signed-off-by: Martin Kelly <mkelly@xevo.com>
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- llvm/tools/llvm-config/llvm-config.cpp | 25 +++++++++++++++++++------
- 1 file changed, 19 insertions(+), 6 deletions(-)
-diff --git a/llvm/tools/llvm-config/llvm-config.cpp b/llvm/tools/llvm-config/llvm-config.cpp
-index d5b76b1bb6c1..a739f0d8dbea 100644
--- a/llvm/tools/llvm-config/llvm-config.cpp
-+++ b/llvm/tools/llvm-config/llvm-config.cpp
-@@ -246,6 +246,13 @@ Typical components:\n\
- 
- /// Compute the path to the main executable.
- std::string GetExecutablePath(const char *Argv0) {
-+  // Hack for Yocto: we need to override the root path when we are using
-+  // llvm-config from within a target sysroot.
-+  const char *Sysroot = std::getenv("YOCTO_ALTERNATE_EXE_PATH");
-+  if (Sysroot != nullptr) {
-+    return Sysroot;
-+  }
-+
-   // This just needs to be some symbol in the binary; C++ doesn't
-   // allow taking the address of ::main however.
-   void *P = (void *)(intptr_t)GetExecutablePath;
-@@ -325,7 +332,7 @@ int main(int argc, char **argv) {
-   // Compute various directory locations based on the derived location
-   // information.
-   std::string ActivePrefix, ActiveBinDir, ActiveIncludeDir, ActiveLibDir,
-              ActiveCMakeDir;
-+              ActiveCMakeDir, BaseLibDir;
-   std::string ActiveIncludeOption;
-   if (IsInDevelopmentTree) {
-     ActiveIncludeDir = std::string(LLVM_SRC_ROOT) + "/include";
-@@ -366,12 +373,18 @@ int main(int argc, char **argv) {
-       sys::fs::make_absolute(ActivePrefix, Path);
-       ActiveBinDir = std::string(Path);
-     }
-    ActiveLibDir = ActivePrefix + "/lib" + LLVM_LIBDIR_SUFFIX;
-    {
-      SmallString<256> Path(LLVM_INSTALL_PACKAGE_DIR);
-      sys::fs::make_absolute(ActivePrefix, Path);
-      ActiveCMakeDir = std::string(Path);
-+    // Hack for Yocto: we need to override the lib path when we are using
-+    // llvm-config from within a target sysroot since LLVM_LIBDIR_SUFFIX
-+    // maybe different for host llvm vs target e.g. ppc64 Libdir=lib64 but
-+    // x86_64 Libdir = lib
-+    const char *YoctoLibDir = std::getenv("YOCTO_ALTERNATE_LIBDIR");
-+    if (YoctoLibDir != nullptr) {
-+      BaseLibDir = std::string(YoctoLibDir);
-+    } else {
-+      BaseLibDir = std::string("/lib") + LLVM_LIBDIR_SUFFIX;
-     }
-+    ActiveLibDir = ActivePrefix + BaseLibDir;
-+    ActiveCMakeDir = ActiveLibDir + "/cmake/llvm";
-     ActiveIncludeOption = "-I" + ActiveIncludeDir;
-   }
- 
diff --git a/recipes-devtools/clang/clang/0006-clang-driver-Check-sysroot-for-ldso-path.patch b/recipes-devtools/clang/clang/0006-clang-driver-Check-sysroot-for-ldso-path.patch
deleted file mode 100644
index 1175ec7..0000000
--- a/recipes-devtools/clang/clang/0006-clang-driver-Check-sysroot-for-ldso-path.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From af511db3b78d27f21af09877c1c188b1c0c2ce0a Mon Sep 17 00:00:00 2001
-From: Dan McGregor <dan.mcgregor@usask.ca>
-Date: Wed, 26 Apr 2017 20:29:41 -0600
-Subject: [PATCH] clang: driver: Check sysroot for ldso path
-OE does not necessarily follow the default path for the dynamic linker,
-therefore adjust it for OE. Check for the default path, and if it isn't
-there, check /lib.
-Upstream-Status: Pending
-Signed-off-by: Dan McGregor <dan.mcgregor@usask.ca>
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- clang/lib/Driver/ToolChains/Linux.cpp | 22 +++++++++++++++++++++-
- 1 file changed, 21 insertions(+), 1 deletion(-)
-diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp
-index 4300a2bdff17..fe1bea2bde9d 100644
--- a/clang/lib/Driver/ToolChains/Linux.cpp
-+++ b/clang/lib/Driver/ToolChains/Linux.cpp
-@@ -499,7 +499,11 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
-         Triple.getEnvironment() == llvm::Triple::GNUEABIHF ||
-         tools::arm::getARMFloatABI(*this, Args) == tools::arm::FloatABI::Hard;
- 
-    LibDir = "lib";
-+    LibDir = "lib32";
-+    if (!getVFS().exists(getDriver().SysRoot + "/" + LibDir + "/" + Loader) &&
-+         getVFS().exists(getDriver().SysRoot + "/lib/" + Loader)) {
-+        LibDir = "lib";
-+    }
-     Loader = HF ? "ld-linux-armhf.so.3" : "ld-linux.so.3";
-     break;
-   }
-@@ -554,11 +558,19 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
-     LibDir = "lib64";
-     Loader =
-         (tools::ppc::hasPPCAbiArg(Args, "elfv2")) ? "ld64.so.2" : "ld64.so.1";
-+    if (!getVFS().exists(getDriver().SysRoot + "/" + LibDir + "/" + Loader) &&
-+         getVFS().exists(getDriver().SysRoot + "/lib/" + Loader)) {
-+        LibDir = "lib";
-+    }
-     break;
-   case llvm::Triple::ppc64le:
-     LibDir = "lib64";
-     Loader =
-         (tools::ppc::hasPPCAbiArg(Args, "elfv1")) ? "ld64.so.1" : "ld64.so.2";
-+    if (!getVFS().exists(getDriver().SysRoot + "/" + LibDir + "/" + Loader) &&
-+         getVFS().exists(getDriver().SysRoot + "/lib/" + Loader)) {
-+        LibDir = "lib";
-+    }
-     break;
-   case llvm::Triple::riscv32: {
-     StringRef ABIName = tools::riscv::getRISCVABI(Args, Triple);
-@@ -580,6 +592,10 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
-   case llvm::Triple::sparcv9:
-     LibDir = "lib64";
-     Loader = "ld-linux.so.2";
-+    if (!getVFS().exists(getDriver().SysRoot + "/" + LibDir + "/" + Loader) &&
-+         getVFS().exists(getDriver().SysRoot + "/lib/" + Loader)) {
-+        LibDir = "lib";
-+    }
-     break;
-   case llvm::Triple::systemz:
-     LibDir = "lib";
-@@ -594,6 +610,10 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
- 
-     LibDir = X32 ? "libx32" : "lib64";
-     Loader = X32 ? "ld-linux-x32.so.2" : "ld-linux-x86-64.so.2";
-+    if (!getVFS().exists(getDriver().SysRoot + "/" + LibDir + "/" + Loader) &&
-+         getVFS().exists(getDriver().SysRoot + "/lib/" + Loader)) {
-+        LibDir = "lib";
-+    }
-     break;
-   }
-   case llvm::Triple::ve:
diff --git a/recipes-devtools/clang/clang/0007-clang-Driver-tools.cpp-Add-lssp_nonshared-on-musl.patch b/recipes-devtools/clang/clang/0007-clang-Driver-tools.cpp-Add-lssp_nonshared-on-musl.patch
deleted file mode 100644
index 9d174a7..0000000
--- a/recipes-devtools/clang/clang/0007-clang-Driver-tools.cpp-Add-lssp_nonshared-on-musl.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From a842a494f82f68c92a562aa40e6861f792d5b703 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 19 May 2016 21:11:06 -0700
-Subject: [PATCH] clang: Driver/tools.cpp: Add -lssp_nonshared on musl
-musl driver will need to add ssp_nonshared for stack_check_local
-on the linker cmdline when using stack protector commands on
-compiler cmdline
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- clang/lib/Driver/ToolChains/Gnu.cpp | 6 ++++++
- 1 file changed, 6 insertions(+)
-diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp
-index e5e1b1d77269..7b43cde6b884 100644
--- a/clang/lib/Driver/ToolChains/Gnu.cpp
-+++ b/clang/lib/Driver/ToolChains/Gnu.cpp
-@@ -628,6 +628,12 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
-       if (IsIAMCU)
-         CmdArgs.push_back("-lgloss");
- 
-+      if (ToolChain.getTriple().isMusl() &&
-+          (Args.hasArg(options::OPT_fstack_protector) ||
-+          Args.hasArg(options::OPT_fstack_protector_strong) ||
-+          Args.hasArg(options::OPT_fstack_protector_all))) {
-+        CmdArgs.push_back("-lssp_nonshared");
-+      }
-       if (IsStatic || IsStaticPIE)
-         CmdArgs.push_back("--end-group");
-       else
diff --git a/recipes-devtools/clang/clang/0008-clang-Prepend-trailing-to-sysroot.patch b/recipes-devtools/clang/clang/0008-clang-Prepend-trailing-to-sysroot.patch
deleted file mode 100644
index c43219f..0000000
--- a/recipes-devtools/clang/clang/0008-clang-Prepend-trailing-to-sysroot.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 53b47e96f7c69bea46d16489dd6887561245c23f Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 16 Mar 2017 09:02:13 -0700
-Subject: [PATCH] clang: Prepend trailing '/' to sysroot
-This is needed to handle a case where clang
-isntall and target sysroot are perilously same
-e.g.
-sysroot = /mnt/clang/recipe-sysroot
-clang install = /mnt/clang/recipe-sysroot-native
-in this case it will mistakenly assume that
-clang is installed under the same sysroot dir
-and it will try to add relative ../lib paths
-to linker steps which would then be wrong
-since they will become relative to clang
-installation and not sysroot
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- clang/lib/Driver/ToolChains/Linux.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp
-index fe1bea2bde9d..9cfc135ed2c0 100644
--- a/clang/lib/Driver/ToolChains/Linux.cpp
-+++ b/clang/lib/Driver/ToolChains/Linux.cpp
-@@ -219,7 +219,7 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
-   Multilibs = GCCInstallation.getMultilibs();
-   SelectedMultilibs.assign({GCCInstallation.getMultilib()});
-   llvm::Triple::ArchType Arch = Triple.getArch();
-  std::string SysRoot = computeSysRoot();
-+  std::string SysRoot = computeSysRoot() + "/";
-   ToolChain::path_list &PPaths = getProgramPaths();
- 
-   Generic_GCC::PushPPaths(PPaths);
diff --git a/recipes-devtools/clang/clang/0009-clang-Look-inside-the-target-sysroot-for-compiler-ru.patch b/recipes-devtools/clang/clang/0009-clang-Look-inside-the-target-sysroot-for-compiler-ru.patch
deleted file mode 100644
index 3149159..0000000
--- a/recipes-devtools/clang/clang/0009-clang-Look-inside-the-target-sysroot-for-compiler-ru.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From fd99d9521a7f9ce8c8de7c05a9636efa5a5c34e2 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 16 Mar 2017 19:06:26 -0700
-Subject: [PATCH] clang: Look inside the target sysroot for compiler runtime
-In OE compiler-rt and libc++ are built and staged into target
-sysroot and not into resourcedir which is relative to clang
-driver installation where the libraries are not instlled
-Specific to cross compiling the way yocto/OE works
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- clang/lib/Driver/ToolChain.cpp | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp
-index 388030592b48..c59700b4a7ab 100644
--- a/clang/lib/Driver/ToolChain.cpp
-+++ b/clang/lib/Driver/ToolChain.cpp
-@@ -15,6 +15,7 @@
- #include "ToolChains/InterfaceStubs.h"
- #include "clang/Basic/ObjCRuntime.h"
- #include "clang/Basic/Sanitizers.h"
-+#include "clang/Basic/Version.h"
- #include "clang/Config/config.h"
- #include "clang/Driver/Action.h"
- #include "clang/Driver/Driver.h"
-@@ -595,7 +596,10 @@ StringRef ToolChain::getOSLibName() const {
- }
- 
- std::string ToolChain::getCompilerRTPath() const {
-  SmallString<128> Path(getDriver().ResourceDir);
-+  SmallString<128> Path(getDriver().SysRoot);
-+  StringRef ClangLibdirBasename(CLANG_INSTALL_LIBDIR_BASENAME);
-+  llvm::sys::path::append(Path, "/usr/", ClangLibdirBasename, "clang",
-+                            CLANG_VERSION_STRING);
-   if (isBareMetal()) {
-     llvm::sys::path::append(Path, "lib", getOSLibName());
-     if (!SelectedMultilibs.empty()) {
diff --git a/recipes-devtools/clang/clang/0010-clang-Define-releative-gcc-installation-dir.patch b/recipes-devtools/clang/clang/0010-clang-Define-releative-gcc-installation-dir.patch
deleted file mode 100644
index 7d56623..0000000
--- a/recipes-devtools/clang/clang/0010-clang-Define-releative-gcc-installation-dir.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From a310e5638205777893228a1c0853bd5494e7d02c Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 20 Mar 2021 16:09:16 -0700
-Subject: [PATCH] clang: Define / releative gcc installation dir
-This is required for OE gcc installation to work.
-Without this its not able to find the paths for libgcc
-and other standard headers and libraries from gcc
-installation in OE
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- clang/lib/Driver/ToolChains/Gnu.cpp | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp
-index 7b43cde6b884..1ea6927d06f3 100644
--- a/clang/lib/Driver/ToolChains/Gnu.cpp
-+++ b/clang/lib/Driver/ToolChains/Gnu.cpp
-@@ -2913,19 +2913,19 @@ void Generic_GCC::GCCInstallationDetector::ScanLibDirForGCCTriple(
-     // Whether this library suffix is relevant for the triple.
-     bool Active;
-   } Suffixes[] = {
-      // This is the normal place.
-      {"gcc/" + CandidateTriple.str(), "../..", GCCDirExists},
-
-      // Debian puts cross-compilers in gcc-cross.
-      {"gcc-cross/" + CandidateTriple.str(), "../..", GCCCrossDirExists},
-
-       // The Freescale PPC SDK has the gcc libraries in
-       // <sysroot>/usr/lib/<triple>/x.y.z so have a look there as well. Only do
-       // this on Freescale triples, though, since some systems put a *lot* of
-       // files in that location, not just GCC installation data.
-       {CandidateTriple.str(), "..",
-        TargetTriple.getVendor() == llvm::Triple::Freescale ||
-           TargetTriple.getVendor() == llvm::Triple::OpenEmbedded}};
-+           TargetTriple.getVendor() == llvm::Triple::OpenEmbedded},
-+
-+      // This is the normal place.
-+      {"gcc/" + CandidateTriple.str(), "../..", GCCDirExists},
-+
-+      // Debian puts cross-compilers in gcc-cross.
-+      {"gcc-cross/" + CandidateTriple.str(), "../..", GCCCrossDirExists}};
- 
-   for (auto &Suffix : Suffixes) {
-     if (!Suffix.Active)
diff --git a/recipes-devtools/clang/clang/0011-clang-Add-lpthread-and-ldl-along-with-lunwind-for-st.patch b/recipes-devtools/clang/clang/0011-clang-Add-lpthread-and-ldl-along-with-lunwind-for-st.patch
deleted file mode 100644
index 4e9360c..0000000
--- a/recipes-devtools/clang/clang/0011-clang-Add-lpthread-and-ldl-along-with-lunwind-for-st.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From bc21d17ff434af5efdb2fac86392862230c6f9e6 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 31 Jul 2019 22:51:39 -0700
-Subject: [PATCH] clang: Add -lpthread and -ldl along with -lunwind for static
- linking
-When doing static liking with --unwindlib=libunwind -static we encounter
-undefined symbols
-libunwind/src/RWMutex.hpp:68: undefined reference to `pthread_rwlock_wrlock'
-and
-libunwind/src/AddressSpace.hpp:597: undefined reference to `dladdr'
-therefore we need to link in libpthread and libdl to fill these symbols
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- clang/lib/Driver/ToolChains/CommonArgs.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-diff --git a/clang/lib/Driver/ToolChains/CommonArgs.cpp b/clang/lib/Driver/ToolChains/CommonArgs.cpp
-index 2b916f000336..de823347a527 100644
--- a/clang/lib/Driver/ToolChains/CommonArgs.cpp
-+++ b/clang/lib/Driver/ToolChains/CommonArgs.cpp
-@@ -2179,6 +2179,8 @@ static void AddUnwindLibrary(const ToolChain &TC, const Driver &D,
-         CmdArgs.push_back("-lunwind");
-     } else if (LGT == LibGccType::StaticLibGcc) {
-       CmdArgs.push_back("-l:libunwind.a");
-+      CmdArgs.push_back("-lpthread");
-+      CmdArgs.push_back("-ldl");
-     } else if (LGT == LibGccType::SharedLibGcc) {
-       if (TC.getTriple().isOSCygMing())
-         CmdArgs.push_back("-l:libunwind.dll.a");
diff --git a/recipes-devtools/clang/clang/0012-Pass-PYTHON_EXECUTABLE-when-cross-compiling-for-nati.patch b/recipes-devtools/clang/clang/0012-Pass-PYTHON_EXECUTABLE-when-cross-compiling-for-nati.patch
deleted file mode 100644
index b6efd2b..0000000
--- a/recipes-devtools/clang/clang/0012-Pass-PYTHON_EXECUTABLE-when-cross-compiling-for-nati.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From a48c97d8a0f5eee9729cad03eac5be677c9963e8 Mon Sep 17 00:00:00 2001
-From: Anuj Mittal <anuj.mittal@intel.com>
-Date: Thu, 26 Dec 2019 12:56:16 -0800
-Subject: [PATCH] Pass PYTHON_EXECUTABLE when cross compiling for native build
-Upstream-Status: Pending
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- llvm/cmake/modules/CrossCompile.cmake | 1 +
- 1 file changed, 1 insertion(+)
-diff --git a/llvm/cmake/modules/CrossCompile.cmake b/llvm/cmake/modules/CrossCompile.cmake
-index 55bf3be75642..71b09ec05b68 100644
--- a/llvm/cmake/modules/CrossCompile.cmake
-+++ b/llvm/cmake/modules/CrossCompile.cmake
-@@ -90,6 +90,7 @@ function(llvm_create_cross_target project_name target_name toolchain buildtype)
-         -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN="${LLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN}"
-         -DLLVM_INCLUDE_BENCHMARKS=OFF
-         -DLLVM_INCLUDE_TESTS=OFF
-+        -DPYTHON_EXECUTABLE="${PYTHON_EXECUTABLE}"
-         ${build_type_flags} ${linker_flag} ${external_clang_dir} ${libc_flags}
-         ${ARGN}
-     WORKING_DIRECTORY ${${project_name}_${target_name}_BUILD}
diff --git a/recipes-devtools/clang/clang/0013-Check-for-atomic-double-intrinsics.patch b/recipes-devtools/clang/clang/0013-Check-for-atomic-double-intrinsics.patch
deleted file mode 100644
index 5a942e6..0000000
--- a/recipes-devtools/clang/clang/0013-Check-for-atomic-double-intrinsics.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 4e96e75d77d0d59399f0b8ad7aa0555e39e7b5cc Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 18 Nov 2019 17:00:29 -0800
-Subject: [PATCH] Check for atomic<double> intrinsics
-On some architectures e.g. x86/32bit gcc decides to inline calls to
-double atomic variables but clang does not and defers it to libatomic
-therefore detect if clang can use built-ins for atomic<double> if not
-then link libatomic, this helps building clangd for x86 on linux systems
-with gcc runtime
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- llvm/cmake/modules/CheckAtomic.cmake | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-diff --git a/llvm/cmake/modules/CheckAtomic.cmake b/llvm/cmake/modules/CheckAtomic.cmake
-index f11cadf39ff6..80a18a92956a 100644
--- a/llvm/cmake/modules/CheckAtomic.cmake
-+++ b/llvm/cmake/modules/CheckAtomic.cmake
-@@ -30,10 +30,11 @@ function(check_working_cxx_atomics64 varname)
- #include <atomic>
- #include <cstdint>
- std::atomic<uint64_t> x (0);
-+std::atomic<double> y (0);
- int main() {
-   uint64_t i = x.load(std::memory_order_relaxed);
-   (void)i;
-  return 0;
-+  return int(y);
- }
- " ${varname})
-   set(CMAKE_REQUIRED_FLAGS ${OLD_CMAKE_REQUIRED_FLAGS})
diff --git a/recipes-devtools/clang/clang/0014-libcxx-Add-compiler-runtime-library-to-link-step-for.patch b/recipes-devtools/clang/clang/0014-libcxx-Add-compiler-runtime-library-to-link-step-for.patch
deleted file mode 100644
index 757917f..0000000
--- a/recipes-devtools/clang/clang/0014-libcxx-Add-compiler-runtime-library-to-link-step-for.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From c0a66d4f358b24bf3acd89910e0f7fc780d16a11 Mon Sep 17 00:00:00 2001
-From: Jeremy Puhlman <jpuhlman@mvista.com>
-Date: Thu, 16 Jan 2020 21:16:10 +0000
-Subject: [PATCH] libcxx: Add compiler runtime library to link step for libcxx
-This corrects "undefined reference to __divti3"
-Upstream-Status: Inappropriate [configuration]
-Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com>
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- libcxx/src/CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/libcxx/src/CMakeLists.txt b/libcxx/src/CMakeLists.txt
-index 1b80625304a4..fe706c9e920f 100644
--- a/libcxx/src/CMakeLists.txt
-+++ b/libcxx/src/CMakeLists.txt
-@@ -198,7 +198,7 @@ if (LIBCXX_ENABLE_SHARED)
-   add_library(cxx_shared SHARED ${exclude_from_all} ${LIBCXX_SOURCES} ${LIBCXX_HEADERS})
-   target_include_directories(cxx_shared PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
-   target_link_libraries(cxx_shared PUBLIC cxx-headers
-                                   PRIVATE ${LIBCXX_LIBRARIES})
-+                                   PRIVATE ${LIBCXX_LIBRARIES} "$$($$CC --print-libgcc-file-name)")
-   set_target_properties(cxx_shared
-     PROPERTIES
-       COMPILE_FLAGS "${LIBCXX_COMPILE_FLAGS}"
-@@ -291,7 +291,7 @@ if (LIBCXX_ENABLE_STATIC)
-   add_library(cxx_static STATIC ${exclude_from_all} ${LIBCXX_SOURCES} ${LIBCXX_HEADERS})
-   target_include_directories(cxx_static PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
-   target_link_libraries(cxx_static PUBLIC cxx-headers
-                                   PRIVATE ${LIBCXX_LIBRARIES}
-+                                   PRIVATE ${LIBCXX_LIBRARIES} "$$($$CC --print-libgcc-file-name)"
-                                    PRIVATE libcxx-abi-static)
-   set_target_properties(cxx_static
-     PROPERTIES
diff --git a/recipes-devtools/clang/clang/0015-clang-llvm-cmake-Fix-configure-for-packages-using-fi.patch b/recipes-devtools/clang/clang/0015-clang-llvm-cmake-Fix-configure-for-packages-using-fi.patch
deleted file mode 100644
index d42836d..0000000
--- a/recipes-devtools/clang/clang/0015-clang-llvm-cmake-Fix-configure-for-packages-using-fi.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From aab6a666bf1094d9750a10e547ebd6fe093af513 Mon Sep 17 00:00:00 2001
-From: Ovidiu Panait <ovidiu.panait@windriver.com>
-Date: Fri, 31 Jan 2020 10:56:11 +0200
-Subject: [PATCH] clang,llvm: cmake: Fix configure for packages using
- find_package()
-Currently, when a package (i.e. bcc [https://github.com/iovisor/bcc.git])
-that depends on LLVM/Clang tries to run cmake find_package() during
-do_configure, it will fail with a similar error:
-|   The imported target "llvm-tblgen" references the file
-|      ".../recipe-sysroot/usr/bin/llvm-tblgen"
-|
-|   but this file does not exist.  Possible reasons include:
-|   * The file was deleted, renamed, or moved to another location.
-|   * An install or uninstall procedure did not complete successfully.
-|   * The installation package was faulty and contained
-|      ".../recipe-sysroot/usr/lib/cmake/LLVMExports.cmake"
-|   but not all the files it references.
-This is due to the fact that currently the cmake scripts look for target
-binaries in sysroot. Work around this by not exporting the target binaries in
-Exports-* cmake files.
-Upstream-Status: Inappropriate [oe-specific]
-Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
---
- clang/cmake/modules/AddClang.cmake | 2 --
- llvm/cmake/modules/AddLLVM.cmake   | 6 ------
- llvm/cmake/modules/TableGen.cmake  | 6 ------
- 3 files changed, 14 deletions(-)
-diff --git a/clang/cmake/modules/AddClang.cmake b/clang/cmake/modules/AddClang.cmake
-index 75b0080f6715..ddf446a13eca 100644
--- a/clang/cmake/modules/AddClang.cmake
-+++ b/clang/cmake/modules/AddClang.cmake
-@@ -168,7 +168,6 @@ macro(add_clang_tool name)
-     if (CLANG_BUILD_TOOLS)
-       get_target_export_arg(${name} Clang export_to_clangtargets)
-       install(TARGETS ${name}
-        ${export_to_clangtargets}
-         RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
-         COMPONENT ${name})
- 
-@@ -177,7 +176,6 @@ macro(add_clang_tool name)
-                                  DEPENDS ${name}
-                                  COMPONENT ${name})
-       endif()
-      set_property(GLOBAL APPEND PROPERTY CLANG_EXPORTS ${name})
-     endif()
-   endif()
- endmacro()
-diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake
-index 3bc78b0dc935..bc492ceb90db 100644
--- a/llvm/cmake/modules/AddLLVM.cmake
-+++ b/llvm/cmake/modules/AddLLVM.cmake
-@@ -1368,7 +1368,6 @@ macro(llvm_add_tool project name)
-       if( LLVM_BUILD_TOOLS )
-         get_target_export_arg(${name} LLVM export_to_llvmexports)
-         install(TARGETS ${name}
-                ${export_to_llvmexports}
-                 RUNTIME DESTINATION ${${project}_TOOLS_INSTALL_DIR}
-                 COMPONENT ${name})
- 
-@@ -1379,9 +1378,6 @@ macro(llvm_add_tool project name)
-         endif()
-       endif()
-     endif()
-    if( LLVM_BUILD_TOOLS )
-      set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${name})
-    endif()
-     set_target_properties(${name} PROPERTIES FOLDER "Tools")
-   endif()
- endmacro(llvm_add_tool project name)
-@@ -1426,7 +1422,6 @@ macro(add_llvm_utility name)
-     if (LLVM_INSTALL_UTILS AND LLVM_BUILD_UTILS)
-       get_target_export_arg(${name} LLVM export_to_llvmexports)
-       install(TARGETS ${name}
-              ${export_to_llvmexports}
-               RUNTIME DESTINATION ${LLVM_UTILS_INSTALL_DIR}
-               COMPONENT ${name})
- 
-@@ -1435,7 +1430,6 @@ macro(add_llvm_utility name)
-                                  DEPENDS ${name}
-                                  COMPONENT ${name})
-       endif()
-      set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${name})
-     elseif(LLVM_BUILD_UTILS)
-       set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS_BUILDTREE_ONLY ${name})
-     endif()
-diff --git a/llvm/cmake/modules/TableGen.cmake b/llvm/cmake/modules/TableGen.cmake
-index 1d18fdde2bb9..c9363ffb3376 100644
--- a/llvm/cmake/modules/TableGen.cmake
-+++ b/llvm/cmake/modules/TableGen.cmake
-@@ -222,12 +222,7 @@ macro(add_tablegen target project)
- 
-   if (ADD_TABLEGEN_DESTINATION AND NOT LLVM_INSTALL_TOOLCHAIN_ONLY AND
-       (LLVM_BUILD_UTILS OR ${target} IN_LIST LLVM_DISTRIBUTION_COMPONENTS))
-    set(export_arg)
-    if(ADD_TABLEGEN_EXPORT)
-      get_target_export_arg(${target} ${ADD_TABLEGEN_EXPORT} export_arg)
-    endif()
-     install(TARGETS ${target}
-            ${export_arg}
-             COMPONENT ${target}
-             RUNTIME DESTINATION "${ADD_TABLEGEN_DESTINATION}")
-     if(NOT LLVM_ENABLE_IDE)
-@@ -238,6 +233,5 @@ macro(add_tablegen target project)
-   endif()
-   if(ADD_TABLEGEN_EXPORT)
-     string(TOUPPER ${ADD_TABLEGEN_EXPORT} export_upper)
-    set_property(GLOBAL APPEND PROPERTY ${export_upper}_EXPORTS ${target})
-   endif()
- endmacro()
diff --git a/recipes-devtools/clang/clang/0016-clang-Fix-resource-dir-location-for-cross-toolchains.patch b/recipes-devtools/clang/clang/0016-clang-Fix-resource-dir-location-for-cross-toolchains.patch
deleted file mode 100644
index b7aeb2b..0000000
--- a/recipes-devtools/clang/clang/0016-clang-Fix-resource-dir-location-for-cross-toolchains.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 58cae5f6f4df0e6fd8529f99f940984e770f4c84 Mon Sep 17 00:00:00 2001
-From: Jim Broadus <jbroadus@xevo.com>
-Date: Thu, 26 Mar 2020 16:05:53 -0700
-Subject: [PATCH] clang: Fix resource dir location for cross toolchains
-When clang looks for the resources directory, it does so based on the binary
-location and assumes that the containing directory is a sibling to lib. The
-Yocto cross.bbclass defines the default bindir as
-${exec_prefix}/bin/${CROSS_TARGET_SYS_DIR}. ex: /usr/bin/aarch64-poky-linux/.
-This causes clang to form a path that looks like /usr/bin/lib/clang/...
-As a fix for this, check the parent directory name. If that is "bin", then
-use that directory's parent.
-Upstream-Status: Pending
-Signed-off-by: Jim Broadus <jbroadus@xevo.com>
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- clang/lib/Driver/Driver.cpp | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp
-index 93cddf742d52..88291dd125d3 100644
--- a/clang/lib/Driver/Driver.cpp
-+++ b/clang/lib/Driver/Driver.cpp
-@@ -179,9 +179,15 @@ std::string Driver::GetResourcesPath(StringRef BinaryPath,
-     // With a static-library build of libclang, LibClangPath will contain the
-     // path of the embedding binary, which for LLVM binaries will be in bin/.
-     // ../lib gets us to lib/ in both cases.
-    P = llvm::sys::path::parent_path(Dir);
-+    Dir = std::string(llvm::sys::path::parent_path(Dir));
-     // This search path is also created in the COFF driver of lld, so any
-     // changes here also needs to happen in lld/COFF/Driver.cpp
-+
-+    // OE cross toolchains are installed, by default, in a subdir of bin.
-+    if (llvm::sys::path::filename(Dir) == "bin") {
-+      Dir = std::string(llvm::sys::path::parent_path(Dir));
-+    }
-+    P = Dir;
-     llvm::sys::path::append(P, CLANG_INSTALL_LIBDIR_BASENAME, "clang",
-                             CLANG_VERSION_MAJOR_STRING);
-   }
diff --git a/recipes-devtools/clang/clang/0017-clang-driver-Add-dyld-prefix-when-checking-sysroot-f.patch b/recipes-devtools/clang/clang/0017-clang-driver-Add-dyld-prefix-when-checking-sysroot-f.patch
deleted file mode 100644
index fca46f4..0000000
--- a/recipes-devtools/clang/clang/0017-clang-driver-Add-dyld-prefix-when-checking-sysroot-f.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 6c83a2e75b42eff98975bebacd446455d60cb128 Mon Sep 17 00:00:00 2001
-From: Oleksandr Ocheretnyi <oocheret@cisco.com>
-Date: Wed, 15 Apr 2020 00:08:39 +0300
-Subject: [PATCH] clang: driver: Add dyld-prefix when checking sysroot for ldso
- path
- * the dyld-prefix shall be taken into account when the default
-   path for the dynamic linker has to be checked.
- * this patch shall be used as annex to the next patch:
-   'clang: driver: Check sysroot for ldso path' which includes
-   the usrmerge scenario.
-Upstream-Status: Pending
-Signed-off-by: Oleksandr Ocheretnyi <oocheret@cisco.com>
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- clang/lib/Driver/ToolChains/Linux.cpp | 20 ++++++++++----------
- 1 file changed, 10 insertions(+), 10 deletions(-)
-diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp
-index 9cfc135ed2c0..6df8c58076c9 100644
--- a/clang/lib/Driver/ToolChains/Linux.cpp
-+++ b/clang/lib/Driver/ToolChains/Linux.cpp
-@@ -500,8 +500,8 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
-         tools::arm::getARMFloatABI(*this, Args) == tools::arm::FloatABI::Hard;
- 
-     LibDir = "lib32";
-    if (!getVFS().exists(getDriver().SysRoot + "/" + LibDir + "/" + Loader) &&
-         getVFS().exists(getDriver().SysRoot + "/lib/" + Loader)) {
-+    if (!getVFS().exists(getDriver().SysRoot + getDriver().DyldPrefix + "/" + LibDir + "/" + Loader) &&
-+         getVFS().exists(getDriver().SysRoot + getDriver().DyldPrefix + "/lib/" + Loader)) {
-         LibDir = "lib";
-     }
-     Loader = HF ? "ld-linux-armhf.so.3" : "ld-linux.so.3";
-@@ -558,8 +558,8 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
-     LibDir = "lib64";
-     Loader =
-         (tools::ppc::hasPPCAbiArg(Args, "elfv2")) ? "ld64.so.2" : "ld64.so.1";
-    if (!getVFS().exists(getDriver().SysRoot + "/" + LibDir + "/" + Loader) &&
-         getVFS().exists(getDriver().SysRoot + "/lib/" + Loader)) {
-+    if (!getVFS().exists(getDriver().SysRoot + getDriver().DyldPrefix + "/" + LibDir + "/" + Loader) &&
-+         getVFS().exists(getDriver().SysRoot + getDriver().DyldPrefix + "/lib/" + Loader)) {
-         LibDir = "lib";
-     }
-     break;
-@@ -567,8 +567,8 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
-     LibDir = "lib64";
-     Loader =
-         (tools::ppc::hasPPCAbiArg(Args, "elfv1")) ? "ld64.so.1" : "ld64.so.2";
-    if (!getVFS().exists(getDriver().SysRoot + "/" + LibDir + "/" + Loader) &&
-         getVFS().exists(getDriver().SysRoot + "/lib/" + Loader)) {
-+    if (!getVFS().exists(getDriver().SysRoot + getDriver().DyldPrefix + "/" + LibDir + "/" + Loader) &&
-+         getVFS().exists(getDriver().SysRoot + getDriver().DyldPrefix + "/lib/" + Loader)) {
-         LibDir = "lib";
-     }
-     break;
-@@ -592,8 +592,8 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
-   case llvm::Triple::sparcv9:
-     LibDir = "lib64";
-     Loader = "ld-linux.so.2";
-    if (!getVFS().exists(getDriver().SysRoot + "/" + LibDir + "/" + Loader) &&
-         getVFS().exists(getDriver().SysRoot + "/lib/" + Loader)) {
-+    if (!getVFS().exists(getDriver().SysRoot + getDriver().DyldPrefix + "/" + LibDir + "/" + Loader) &&
-+         getVFS().exists(getDriver().SysRoot + getDriver().DyldPrefix + "/lib/" + Loader)) {
-         LibDir = "lib";
-     }
-     break;
-@@ -610,8 +610,8 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
- 
-     LibDir = X32 ? "libx32" : "lib64";
-     Loader = X32 ? "ld-linux-x32.so.2" : "ld-linux-x86-64.so.2";
-    if (!getVFS().exists(getDriver().SysRoot + "/" + LibDir + "/" + Loader) &&
-         getVFS().exists(getDriver().SysRoot + "/lib/" + Loader)) {
-+    if (!getVFS().exists(getDriver().SysRoot + getDriver().DyldPrefix + "/" + LibDir + "/" + Loader) &&
-+         getVFS().exists(getDriver().SysRoot + getDriver().DyldPrefix + "/lib/" + Loader)) {
-         LibDir = "lib";
-     }
-     break;
diff --git a/recipes-devtools/clang/clang/0018-clang-Use-python3-in-python-scripts.patch b/recipes-devtools/clang/clang/0018-clang-Use-python3-in-python-scripts.patch
deleted file mode 100644
index d72a623..0000000
--- a/recipes-devtools/clang/clang/0018-clang-Use-python3-in-python-scripts.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 5a572d401005fb992b421d65628267e49d70ee74 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 14 Oct 2020 22:19:57 -0700
-Subject: [PATCH] clang: Use python3 in python scripts
-Some scripts ask for python, but they work fine with python3
-and in OE python symlink is not exposed to build, only python3 is
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- .../find-all-symbols/tool/run-find-all-symbols.py               | 2 +-
- clang/tools/scan-view/bin/scan-view                             | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-diff --git a/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py b/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py
-index 471dbf8c110b..f98385dc6651 100755
--- a/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py
-+++ b/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py
-@@ -1,4 +1,4 @@
-#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- # =- run-find-all-symbols.py - Parallel find-all-symbols runner -*- python  -*-=#
- #
-diff --git a/clang/tools/scan-view/bin/scan-view b/clang/tools/scan-view/bin/scan-view
-index d01aebb4029a..f3375804654d 100755
--- a/clang/tools/scan-view/bin/scan-view
-+++ b/clang/tools/scan-view/bin/scan-view
-@@ -1,4 +1,4 @@
-#!/usr/bin/env python
-+#!/usr/bin/env python3
- 
- from __future__ import print_function
- 
diff --git a/recipes-devtools/clang/clang/0019-For-x86_64-set-Yocto-based-GCC-install-search-path.patch b/recipes-devtools/clang/clang/0019-For-x86_64-set-Yocto-based-GCC-install-search-path.patch
deleted file mode 100644
index 3270872..0000000
--- a/recipes-devtools/clang/clang/0019-For-x86_64-set-Yocto-based-GCC-install-search-path.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From b928740f3def5353a779859c0454666cae1f7d61 Mon Sep 17 00:00:00 2001
-From: Hongxu Jia <hongxu.jia@windriver.com>
-Date: Mon, 25 Jan 2021 16:14:35 +0800
-Subject: [PATCH] For x86_64, set Yocto based GCC install search path
-Under Yocto host, while using clang-native to build, it searches
-install host gcc failed which causing the include file not found
-[snip]
-|clang++ -target x86_64-linux  -MMD -MF src/base/files/file_path_constants.o.d -I../../../tools/gn/src -I. \
-isystem/tmp-glibc/work/x86_64-linux/gn-native/87.0.4280.141-r0/recipe-sysroot-native/usr/include -O2 -pipe \
-std=c++17 -c ../../../tools/gn/src/base/files/file_path_constants.cc -o src/base/files/file_path_constants.o
-|../../../tools/gn/src/base/files/file_path_constants.cc:7:10: fatal error: 'iterator' file not found
-|#include <iterator>
-|         ^~~~~~~~
-[snip]
-Set three Yocto based GCC triple: poky, oe-core and wind river
-Before aplly the patch
-[snip]
-$ ../recipe-sysroot-native/usr/bin/clang++ -v
-clang version 11.0.1 (https://github.com/llvm/llvm-project 43ff75f2c3feef64f9d73328230d34dac8832a91)
-Target: x86_64-unknown-linux-gnu
-Thread model: posix
-InstalledDir:tmp-glibc/work/x86_64-linux/gn-native/87.0.4280.141-r0/chromium-87.0.4280.141/../recipe-sysroot-native/usr/bin
-[snip]
-After aplly the patch:
-[snip]
-$ ../recipe-sysroot-native/usr/bin/clang++ -v
-clang version 11.0.1 (https://github.com/llvm/llvm-project 22c3241ff9a6224261df48d0258957fd8acc3d64)
-Target: x86_64-unknown-linux-gnu
-Thread model: posix
-InstalledDir:tmp-glibc/work/x86_64-linux/gn-native/87.0.4280.141-r0/chromium-87.0.4280.141/../recipe-sysroot-native/usr/bin
-Found candidate GCC installation: /usr/lib//x86_64-wrs-linux/10.1.0
-Found candidate GCC installation: /usr/lib/gcc/x86_64-wrs-linux/10.1.0
-Selected GCC installation: /usr/lib//x86_64-wrs-linux/10.1.0
-Candidate multilib: .;@m64
-Selected multilib: .;@m64
-[snip]
-BTW, it is hardly to insert a triple by the replacement of TARGET_SYS
-(=${TARGET_ARCH}${TARGET_VENDOR}-${TARGET_OS}), since TARGET_VENDOR
-is different between clang and clang-native
-The //CLANG_EXTRA_OE_VENDORS_TRIPLES string is replaced with list of
-additional triples based on CLANG_EXTRA_OE_VENDORS variable in
-recipes-devtools/clang/llvm-project-source.inc:add_distro_vendor()
-Upstream-Status: Inappropriate [oe specific]
-Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- clang/lib/Driver/ToolChains/Gnu.cpp | 1 +
- 1 file changed, 1 insertion(+)
-diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp
-index 1ea6927d06f3..185ea3df16f5 100644
--- a/clang/lib/Driver/ToolChains/Gnu.cpp
-+++ b/clang/lib/Driver/ToolChains/Gnu.cpp
-@@ -2488,6 +2488,7 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
-       "x86_64-redhat-linux",    "x86_64-suse-linux",
-       "x86_64-manbo-linux-gnu", "x86_64-linux-gnu",
-       "x86_64-slackware-linux", "x86_64-unknown-linux",
-+      "x86_64-oe-linux",//CLANG_EXTRA_OE_VENDORS_TRIPLES
-       "x86_64-amazon-linux"};
-   static const char *const X32Triples[] = {"x86_64-linux-gnux32",
-                                            "x86_64-pc-linux-gnux32"};
diff --git a/recipes-devtools/clang/clang/0020-llvm-Do-not-use-find_library-for-ncurses.patch b/recipes-devtools/clang/clang/0020-llvm-Do-not-use-find_library-for-ncurses.patch
deleted file mode 100644
index e14bc9d..0000000
--- a/recipes-devtools/clang/clang/0020-llvm-Do-not-use-find_library-for-ncurses.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 07e74b7f5147d5da67b46067df5d26090a3bb96b Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 7 Feb 2021 23:58:41 -0800
-Subject: [PATCH] llvm: Do not use find_library for ncurses
-This ensures that it lets OE to decide which lib to link
-otherwise it adds absolute paths to linker cmdline and confuses it
-horribly with native and target libs when build clang for target
-TOPDIR/build/tmp/work/cortexa57-yoe-linux-musl/clang/12.0.0-r0/recipe-sysroot-native/usr/lib/libtinfo.so: error adding symbols: file in wrong format
-clang-12: error: linker command failed with exit code 1 (use -v to see invocation)
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- compiler-rt/cmake/config-ix.cmake     | 2 +-
- llvm/cmake/modules/FindTerminfo.cmake | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-diff --git a/compiler-rt/cmake/config-ix.cmake b/compiler-rt/cmake/config-ix.cmake
-index 2ca18ebb4ad4..51c56f1e0b8b 100644
--- a/compiler-rt/cmake/config-ix.cmake
-+++ b/compiler-rt/cmake/config-ix.cmake
-@@ -188,7 +188,7 @@ else()
-   set(MAYBE_REQUIRED)
- endif()
- if(LLVM_ENABLE_TERMINFO)
-  find_library(COMPILER_RT_TERMINFO_LIB NAMES terminfo tinfo curses ncurses ncursesw ${MAYBE_REQUIRED})
-+  find_library(COMPILER_RT_TERMINFO_LIB NAMES terminfo tinfo curses ncurses ncursesw ${MAYBE_REQUIRED} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
- endif()
- if(COMPILER_RT_TERMINFO_LIB)
-   set(LLVM_ENABLE_TERMINFO 1)
-diff --git a/llvm/cmake/modules/FindTerminfo.cmake b/llvm/cmake/modules/FindTerminfo.cmake
-index 163af6697067..bf2e760bed8a 100644
--- a/llvm/cmake/modules/FindTerminfo.cmake
-+++ b/llvm/cmake/modules/FindTerminfo.cmake
-@@ -11,7 +11,7 @@
- # Additionally, the following import target will be defined:
- # Terminfo::terminfo
- 
-find_library(Terminfo_LIBRARIES NAMES terminfo tinfo curses ncurses ncursesw)
-+find_library(Terminfo_LIBRARIES NAMES terminfo tinfo curses ncurses ncursesw NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
- 
- if(Terminfo_LIBRARIES)
-   include(CMakePushCheckState)
diff --git a/recipes-devtools/clang/clang/0021-llvm-Insert-anchor-for-adding-OE-distro-vendor-names.patch b/recipes-devtools/clang/clang/0021-llvm-Insert-anchor-for-adding-OE-distro-vendor-names.patch
deleted file mode 100644
index 4feca04..0000000
--- a/recipes-devtools/clang/clang/0021-llvm-Insert-anchor-for-adding-OE-distro-vendor-names.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From a3dbd6b6c8bfab6877632ec7a1e981aaa2883d90 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 11 Feb 2021 16:42:49 -0800
-Subject: [PATCH] llvm: Insert anchor for adding OE distro vendor names
-This helps in making right detection for OE built gcc toolchains
-The //CLANG_EXTRA_OE_VENDORS_CASES string is replaced with list of
-additional Ceses based on CLANG_EXTRA_OE_VENDORS variable in
-recipes-devtools/clang/llvm-project-source.inc:add_distro_vendor()
-Upstream-Status: Inappropriate [OE-specific]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
---
- llvm/lib/TargetParser/Triple.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/llvm/lib/TargetParser/Triple.cpp b/llvm/lib/TargetParser/Triple.cpp
-index 0bbe8a3cedfd..dbc1240703a0 100644
--- a/llvm/lib/TargetParser/Triple.cpp
-+++ b/llvm/lib/TargetParser/Triple.cpp
-@@ -601,7 +601,7 @@ static Triple::VendorType parseVendor(StringRef VendorName) {
-     .Case("amd", Triple::AMD)
-     .Case("mesa", Triple::Mesa)
-     .Case("suse", Triple::SUSE)
-    .Case("oe", Triple::OpenEmbedded)
-+    .Case("oe", Triple::OpenEmbedded)//CLANG_EXTRA_OE_VENDORS_CASES
-     .Default(Triple::UnknownVendor);
- }
- 
diff --git a/recipes-devtools/clang/clang/0022-compiler-rt-Do-not-use-backtrace-APIs-on-non-glibc-l.patch b/recipes-devtools/clang/clang/0022-compiler-rt-Do-not-use-backtrace-APIs-on-non-glibc-l.patch
deleted file mode 100644
index 5498c70..0000000
--- a/recipes-devtools/clang/clang/0022-compiler-rt-Do-not-use-backtrace-APIs-on-non-glibc-l.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From afed95c05037559e53d9a60b8520b372d54b467d Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 19 May 2021 17:32:13 -0700
-Subject: [PATCH] compiler-rt: Do not use backtrace APIs on non-glibc linux
-musl e.g. does not provide backtrace APIs
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- .../lib/gwp_asan/optional/backtrace_linux_libc.cpp  | 13 ++++++++++++-
- 1 file changed, 12 insertions(+), 1 deletion(-)
-diff --git a/compiler-rt/lib/gwp_asan/optional/backtrace_linux_libc.cpp b/compiler-rt/lib/gwp_asan/optional/backtrace_linux_libc.cpp
-index ea8e72be287d..0344074dd254 100644
--- a/compiler-rt/lib/gwp_asan/optional/backtrace_linux_libc.cpp
-+++ b/compiler-rt/lib/gwp_asan/optional/backtrace_linux_libc.cpp
-@@ -7,7 +7,9 @@
- //===----------------------------------------------------------------------===//
- 
- #include <assert.h>
-+#ifdef __GLIBC__
- #include <execinfo.h>
-+#endif
- #include <stddef.h>
- #include <stdint.h>
- #include <stdlib.h>
-@@ -21,8 +23,11 @@
- namespace {
- size_t Backtrace(uintptr_t *TraceBuffer, size_t Size) {
-   static_assert(sizeof(uintptr_t) == sizeof(void *), "uintptr_t is not void*");
-
-+#ifdef __GLIBC__
-   return backtrace(reinterpret_cast<void **>(TraceBuffer), Size);
-+#else
-+  return -1;
-+#endif
- }
- 
- // We don't need any custom handling for the Segv backtrace - the libc unwinder
-@@ -30,7 +35,11 @@ size_t Backtrace(uintptr_t *TraceBuffer, size_t Size) {
- // to avoid the additional frame.
- GWP_ASAN_ALWAYS_INLINE size_t SegvBacktrace(uintptr_t *TraceBuffer, size_t Size,
-                                             void * /*Context*/) {
-+#ifdef __GLIBC__
-   return Backtrace(TraceBuffer, Size);
-+#else
-+  return -1;
-+#endif
- }
- 
- static void PrintBacktrace(uintptr_t *Trace, size_t TraceLength,
-@@ -40,6 +49,7 @@ static void PrintBacktrace(uintptr_t *Trace, size_t TraceLength,
-     return;
-   }
- 
-+#ifdef __GLIBC__
-   char **BacktraceSymbols =
-       backtrace_symbols(reinterpret_cast<void **>(Trace), TraceLength);
- 
-@@ -53,6 +63,7 @@ static void PrintBacktrace(uintptr_t *Trace, size_t TraceLength,
-   Printf("\n");
-   if (BacktraceSymbols)
-     free(BacktraceSymbols);
-+#endif
- }
- } // anonymous namespace
- 
diff --git a/recipes-devtools/clang/clang/0023-clang-Fix-x86-triple-for-non-debian-multiarch-linux-.patch b/recipes-devtools/clang/clang/0023-clang-Fix-x86-triple-for-non-debian-multiarch-linux-.patch
deleted file mode 100644
index 6f982e9..0000000
--- a/recipes-devtools/clang/clang/0023-clang-Fix-x86-triple-for-non-debian-multiarch-linux-.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 25434c45f0c7079e9171b5ef4027626a64d3e50b Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 19 May 2021 17:56:03 -0700
-Subject: [PATCH] clang: Fix x86 triple for non-debian multiarch linux distros
-OpenEmbedded does not hardcode mutli-arch like debian therefore ensure
-that it still uses the proper tuple
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- clang/lib/Driver/ToolChains/Linux.cpp | 3 +++
- 1 file changed, 3 insertions(+)
-diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp
-index 6df8c58076c9..cf549331d255 100644
--- a/clang/lib/Driver/ToolChains/Linux.cpp
-+++ b/clang/lib/Driver/ToolChains/Linux.cpp
-@@ -707,6 +707,9 @@ void Linux::addLibStdCxxIncludePaths(const llvm::opt::ArgList &DriverArgs,
-       GCCInstallation.getTriple().getArch() == llvm::Triple::x86
-           ? "i386-linux-gnu"
-           : TripleStr;
-+  // OpenEmbedded does not hardcode the triple to i386-linux-gnu like debian
-+  if (GCCInstallation.getTriple().getVendor() == llvm::Triple::OpenEmbedded)
-+         DebianMultiarch = TripleStr;
- 
-   // Try generic GCC detection first.
-   if (Generic_GCC::addGCCLibStdCxxIncludePaths(DriverArgs, CC1Args,
diff --git a/recipes-devtools/clang/clang/0024-libunwind-Added-unw_backtrace-method.patch b/recipes-devtools/clang/clang/0024-libunwind-Added-unw_backtrace-method.patch
deleted file mode 100644
index 887fcd5..0000000
--- a/recipes-devtools/clang/clang/0024-libunwind-Added-unw_backtrace-method.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From c4ec538a1e00eb60ad890df51401f27484b349d9 Mon Sep 17 00:00:00 2001
-From: Maksim Kita <maksim-kita@yandex-team.ru>
-Date: Sun, 23 May 2021 10:27:29 +0000
-Subject: [PATCH] libunwind: Added unw_backtrace method
-Source: https://github.com/ClickHouse-Extras/libunwind/commit/52f0f7861926cbfaef7e6c97d8a6d7ba2a1f6747#diff-a82fc885e2e4facf4b92d26171c13aa4aa5db296f77e1158ba2f8664e3bd1f5c
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- libunwind/include/libunwind.h |  1 +
- libunwind/src/libunwind.cpp   | 20 ++++++++++++++++++++
- 2 files changed, 21 insertions(+)
-diff --git a/libunwind/include/libunwind.h b/libunwind/include/libunwind.h
-index b2dae8feed9a..0ab974c9bfa4 100644
--- a/libunwind/include/libunwind.h
-+++ b/libunwind/include/libunwind.h
-@@ -130,6 +130,7 @@ extern int unw_is_fpreg(unw_cursor_t *, unw_regnum_t) LIBUNWIND_AVAIL;
- extern int unw_is_signal_frame(unw_cursor_t *) LIBUNWIND_AVAIL;
- extern int unw_get_proc_name(unw_cursor_t *, char *, size_t, unw_word_t *) LIBUNWIND_AVAIL;
- //extern int       unw_get_save_loc(unw_cursor_t*, int, unw_save_loc_t*);
-+extern int unw_backtrace(void **, int) LIBUNWIND_AVAIL;
- 
- extern unw_addr_space_t unw_local_addr_space;
- 
-diff --git a/libunwind/src/libunwind.cpp b/libunwind/src/libunwind.cpp
-index 217dde909863..5797c806c084 100644
--- a/libunwind/src/libunwind.cpp
-+++ b/libunwind/src/libunwind.cpp
-@@ -432,6 +432,26 @@ int __unw_remove_find_dynamic_unwind_sections(
- 
- #endif // __APPLE__
- 
-+int unw_backtrace(void **buffer, int size) {
-+  unw_context_t context;
-+  unw_cursor_t cursor;
-+  if (unw_getcontext(&context) || unw_init_local(&cursor, &context)) {
-+    return 0;
-+  }
-+
-+  unw_word_t ip;
-+  int current = 0;
-+  while (unw_step(&cursor) > 0) {
-+    if (current >= size || unw_get_reg(&cursor, UNW_REG_IP, &ip)) {
-+      break;
-+    }
-+
-+    buffer[current++] = reinterpret_cast<void *>(static_cast<uintptr_t>(ip));
-+  }
-+
-+  return current;
-+}
-+
- // Add logging hooks in Debug builds only
- #ifndef NDEBUG
- #include <stdlib.h>
diff --git a/recipes-devtools/clang/clang/0025-clang-Do-not-use-install-relative-libc-headers.patch b/recipes-devtools/clang/clang/0025-clang-Do-not-use-install-relative-libc-headers.patch
deleted file mode 100644
index 0e4a3b3..0000000
--- a/recipes-devtools/clang/clang/0025-clang-Do-not-use-install-relative-libc-headers.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From b759741be82cc87406f5b7ece236617ad5450e78 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 11 Aug 2021 18:37:11 -0700
-Subject: [PATCH] clang: Do not use install relative libc++ headers
-In OE we use same clang for native and cross builds, therefore we need
-to ensure that native sysroot install of libc++ is not searched for
-headers when doing cross compile instead it searches the target sysroot
-this is especially troublesome when libcxx-native is staged along with
-libcxx e.g. chromium
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- clang/lib/Driver/ToolChains/Gnu.cpp | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp
-index 185ea3df16f5..d883dc3e7558 100644
--- a/clang/lib/Driver/ToolChains/Gnu.cpp
-+++ b/clang/lib/Driver/ToolChains/Gnu.cpp
-@@ -3313,8 +3313,11 @@ Generic_GCC::addLibCxxIncludePaths(const llvm::opt::ArgList &DriverArgs,
-   // incompatible with the NDK libraries.
-   SmallString<128> DriverIncludeDir(getDriver().Dir);
-   llvm::sys::path::append(DriverIncludeDir, "..", "include");
-+
-+  // do not add it when --sysroot is specified, since it would expect
-+  // libc++ headers from sysroot and not relative to compiler install location
-   if (AddIncludePath(DriverIncludeDir,
-                     /*TargetDirRequired=*/getTriple().isAndroid()))
-+                     /*TargetDirRequired=*/getTriple().isAndroid() | !computeSysRoot().empty()))
-     return;
-   // If this is a development, non-installed, clang, libcxx will
-   // not be found at ../include/c++ but it likely to be found at
diff --git a/recipes-devtools/clang/clang/0026-clang-Fix-how-driver-finds-GCC-installation-path-on-.patch b/recipes-devtools/clang/clang/0026-clang-Fix-how-driver-finds-GCC-installation-path-on-.patch
deleted file mode 100644
index 7ceccd5..0000000
--- a/recipes-devtools/clang/clang/0026-clang-Fix-how-driver-finds-GCC-installation-path-on-.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From c95b551389ae1622faf630be3ddaf0dc62892595 Mon Sep 17 00:00:00 2001
-From: David Abdurachmanov <david.abdurachmanov@sifive.com>
-Date: Wed, 20 Oct 2021 17:30:36 -0700
-Subject: [PATCH] clang: Fix how driver finds GCC installation path on
- OpenEmbedded
-Fix how Clang Driver finds GCC installation path on OpenEmbedded
- For RISCV (riscv{32,64}) we define new two multi-lib options without any
-  subdirectories (e.g., lib32/ilp32d or lib64/lp64d). OpenEmbedded GCC
-  builds don't use them.
- Modify how Clang Driver finds GCC installation path. This is important
-  because GCC files on OpenEmbedded are in two different directories:
-   (1) /usr/bin/../lib/gcc/riscv64-oe-linux/9.2.0
-   (2) /usr/lib/riscv64-oe-linux/9.2.0
-Clang Driver will check (1) first. The directory exist, but will produce
-no valid multi-libs and there will be no multi-lib selected. (2) contains
-actual GCC run-time objects/libraries, but because the path has exact
-same GCC version (9.2.0) it will be skipped.
-We modify the approach by allowing to check other directories with the same
-GCC version. We also avoid picking GCC installation path if it results in
-an empty multi-lib list.
-Upstream-Status: Pending
-Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- clang/lib/Driver/ToolChains/Gnu.cpp | 57 ++++++++++++++++++++---------
- 1 file changed, 39 insertions(+), 18 deletions(-)
-diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp
-index d883dc3e7558..c627602827c3 100644
--- a/clang/lib/Driver/ToolChains/Gnu.cpp
-+++ b/clang/lib/Driver/ToolChains/Gnu.cpp
-@@ -1909,23 +1909,38 @@ static void findRISCVMultilibs(const Driver &D,
-     return findRISCVBareMetalMultilibs(D, TargetTriple, Path, Args, Result);
- 
-   FilterNonExistent NonExistent(Path, "/crtbegin.o", D.getVFS());
-  MultilibBuilder Ilp32 =
-      MultilibBuilder("lib32/ilp32").flag("-m32").flag("-mabi=ilp32");
-  MultilibBuilder Ilp32f =
-      MultilibBuilder("lib32/ilp32f").flag("-m32").flag("-mabi=ilp32f");
-  MultilibBuilder Ilp32d =
-      MultilibBuilder("lib32/ilp32d").flag("-m32").flag("-mabi=ilp32d");
-  MultilibBuilder Lp64 =
-      MultilibBuilder("lib64/lp64").flag("-m64").flag("-mabi=lp64");
-  MultilibBuilder Lp64f =
-      MultilibBuilder("lib64/lp64f").flag("-m64").flag("-mabi=lp64f");
-  MultilibBuilder Lp64d =
-      MultilibBuilder("lib64/lp64d").flag("-m64").flag("-mabi=lp64d");
-  MultilibSet RISCVMultilibs =
-      MultilibSetBuilder()
-          .Either({Ilp32, Ilp32f, Ilp32d, Lp64, Lp64f, Lp64d})
-          .makeMultilibSet()
-          .FilterOut(NonExistent);
-+
-+  MultilibSet RISCVMultilibs;
-+
-+  if (TargetTriple.getVendor() == llvm::Triple::OpenEmbedded) {
-+    MultilibBuilder OpenEmbeddedIlp32d =
-+        MultilibBuilder("").flag("+m32").flag("+mabi=ilp32d");
-+    MultilibBuilder OpenEmbeddedLp64d =
-+        MultilibBuilder("").flag("+m64").flag("+mabi=lp64d");
-+    RISCVMultilibs =
-+        MultilibSetBuilder()
-+            .Either({OpenEmbeddedIlp32d, OpenEmbeddedLp64d})
-+            .makeMultilibSet()
-+            .FilterOut(NonExistent);
-+  } else {
-+    MultilibBuilder Ilp32 =
-+        MultilibBuilder("lib32/ilp32").flag("-m32").flag("-mabi=ilp32");
-+    MultilibBuilder Ilp32f =
-+        MultilibBuilder("lib32/ilp32f").flag("-m32").flag("-mabi=ilp32f");
-+    MultilibBuilder Ilp32d =
-+        MultilibBuilder("lib32/ilp32d").flag("-m32").flag("-mabi=ilp32d");
-+    MultilibBuilder Lp64 =
-+        MultilibBuilder("lib64/lp64").flag("-m64").flag("-mabi=lp64");
-+    MultilibBuilder Lp64f =
-+        MultilibBuilder("lib64/lp64f").flag("-m64").flag("-mabi=lp64f");
-+    MultilibBuilder Lp64d =
-+        MultilibBuilder("lib64/lp64d").flag("-m64").flag("-mabi=lp64d");
-+    RISCVMultilibs =
-+        MultilibSetBuilder()
-+            .Either({Ilp32, Ilp32f, Ilp32d, Lp64, Lp64f, Lp64d})
-+            .makeMultilibSet()
-+            .FilterOut(NonExistent);
-+  }
- 
-   Multilib::flags_list Flags;
-   bool IsRV64 = TargetTriple.getArch() == llvm::Triple::riscv64;
-@@ -2945,13 +2960,19 @@ void Generic_GCC::GCCInstallationDetector::ScanLibDirForGCCTriple(
-           continue; // Saw this path before; no need to look at it again.
-       if (CandidateVersion.isOlderThan(4, 1, 1))
-         continue;
-      if (CandidateVersion <= Version)
-+      if (CandidateVersion < Version)
-         continue;
- 
-       if (!ScanGCCForMultilibs(TargetTriple, Args, LI->path(),
-                                NeedsBiarchSuffix))
-         continue;
- 
-+      // We might have found existing directory with GCCVersion, but it
-+      // might not have GCC libraries we are looking for (i.e. return an
-+      // empty Mulilibs)
-+      if (Multilibs.size() == 0)
-+        continue;
-+
-       Version = CandidateVersion;
-       GCCTriple.setTriple(CandidateTriple);
-       // FIXME: We hack together the directory name here instead of
diff --git a/recipes-devtools/clang/clang/0027-Fix-lib-paths-for-OpenEmbedded-Host.patch b/recipes-devtools/clang/clang/0027-Fix-lib-paths-for-OpenEmbedded-Host.patch
deleted file mode 100644
index 20ce278..0000000
--- a/recipes-devtools/clang/clang/0027-Fix-lib-paths-for-OpenEmbedded-Host.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 93855bad691059a81906ab632830239039527c6c Mon Sep 17 00:00:00 2001
-From: Changqing Li <changqing.li@windriver.com>
-Date: Tue, 7 Dec 2021 04:08:22 +0000
-Subject: [PATCH] Fix lib paths for OpenEmbedded Host
-Under OpenEmbedded Host, while building with clang-native, it cannot find
-the GCCInstallPath, which causing following error:
-[snip]
-compiler-rt-native/13.0.1-r0/recipe-sysroot-native/usr/bin/clang
-target x86_64-linux
-isystem/path/to/x86_64-linux/compiler-rt-native/13.0.1-r0/recipe-sysroot-native/usr/include
-O2 -pipe
-/path/to/compiler-rt-native/13.0.1-r0/recipe-sysroot-native/usr/share/cmake-3.21/Modules/CMakeCCompilerABI.c`
-hosttools/ld: cannot find crtbeginS.o: No such file or directory
-[snip]
-Before this patch:
-compiler-rt-native/13.0.1-r0/recipe-sysroot-native/usr/bin/clang
-clang version 13.0.1 (https://github.com/llvm/llvm-project 08e3a5ccd952edee36b3c002e3a29c6b1b5153de)
-Target: x86_64-unknown-linux-gnu
-Thread model: posix
-InstalledDir: /build/tmp-glibc/work/x86_64-linux/compiler-rt-native/13.0.1-r0/recipe-sysroot-native/usr/bin
-Found candidate GCC installation: /usr/lib/gcc/x86_64-wrs-linux/10.2.0
-After this patch:
-compiler-rt-native/13.0.1-r0/recipe-sysroot-native/usr/bin/clang
-clang version 13.0.1 (https://github.com/llvm/llvm-project 08e3a5ccd952edee36b3c002e3a29c6b1b5153de)
-Thread model: posix
-InstalledDir: /build/tmp-glibc/work/x86_64-linux/compiler-rt-native/13.0.1-r0/recipe-sysroot-native/usr/bin
-Found candidate GCC installation: /usr/lib/gcc/x86_64-wrs-linux/10.2.0
-Found candidate GCC installation: /usr/lib/x86_64-wrs-linux/10.2.0
-Selected GCC installation: /usr/lib/x86_64-wrs-linux/10.2.0
-Candidate multilib: .;@m64
-Selected multilib: .;@m64
-Summary:
-For OpenEmbedded Host, sysroots are of the form<sysroot>/usr/lib/<triple>/x.y.z.
-Take x86-64 as example, the default triple is x86_64-unknown-linux-gnu.
-For clang-native, the target vendor is '-unknown', need to test current distro
-to follow above form.
-Upstream-Status: Inappropriate [oe specific]
-Signed-off-by: Changqing Li <changqing.li@windriver.com>
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- clang/lib/Driver/ToolChains/Gnu.cpp | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp
-index c627602827c3..98d979ace17b 100644
--- a/clang/lib/Driver/ToolChains/Gnu.cpp
-+++ b/clang/lib/Driver/ToolChains/Gnu.cpp
-@@ -19,6 +19,7 @@
- #include "Linux.h"
- #include "clang/Config/config.h" // for GCC_INSTALL_PREFIX
- #include "clang/Driver/Compilation.h"
-+#include "clang/Driver/Distro.h"
- #include "clang/Driver/Driver.h"
- #include "clang/Driver/DriverDiagnostic.h"
- #include "clang/Driver/MultilibBuilder.h"
-@@ -2918,6 +2919,7 @@ void Generic_GCC::GCCInstallationDetector::ScanLibDirForGCCTriple(
-     const llvm::Triple &TargetTriple, const ArgList &Args,
-     const std::string &LibDir, StringRef CandidateTriple,
-     bool NeedsBiarchSuffix, bool GCCDirExists, bool GCCCrossDirExists) {
-+  Distro Distro(D.getVFS(), TargetTriple);
-   // Locations relative to the system lib directory where GCC's triple-specific
-   // directories might reside.
-   struct GCCLibSuffix {
-@@ -2935,7 +2937,8 @@ void Generic_GCC::GCCInstallationDetector::ScanLibDirForGCCTriple(
-       // files in that location, not just GCC installation data.
-       {CandidateTriple.str(), "..",
-        TargetTriple.getVendor() == llvm::Triple::Freescale ||
-           TargetTriple.getVendor() == llvm::Triple::OpenEmbedded},
-+           TargetTriple.getVendor() == llvm::Triple::OpenEmbedded ||
-+           Distro.IsOpenEmbedded()},
- 
-       // This is the normal place.
-       {"gcc/" + CandidateTriple.str(), "../..", GCCDirExists},
diff --git a/recipes-devtools/clang/clang/0028-Correct-library-search-path-for-OpenEmbedded-Host.patch b/recipes-devtools/clang/clang/0028-Correct-library-search-path-for-OpenEmbedded-Host.patch
deleted file mode 100644
index 554f966..0000000
--- a/recipes-devtools/clang/clang/0028-Correct-library-search-path-for-OpenEmbedded-Host.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 42bf038560a9b0bf688b0a85cbd444445e1c26dc Mon Sep 17 00:00:00 2001
-From: Changqing Li <changqing.li@windriver.com>
-Date: Tue, 7 Dec 2021 04:55:48 +0000
-Subject: [PATCH] Correct library search path for OpenEmbedded Host
-For OpenEmbedded Host, the gcc install path is
-/usr/lib/x86_64-[distroname]-linux/[gcc-version].
-So the library search path is not found with default triple
-'x86_64-linux-gnu' for x86_64. Causing following error:
-[snip]
-compiler-rt-native/13.0.1-r0/recipe-sysroot-native/usr/bin/clang
-target x86_64-linux
-isystem/path/to/x86_64-linux/compiler-rt-native/13.0.1-r0/recipe-sysroot-native/usr/include
-O2 -pipe
-/path/to/compiler-rt-native/13.0.1-r0/recipe-sysroot-native/usr/share/cmake-3.21/Modules/CMakeCCompilerABI.c`
-|     /build/tmp-glibc/hosttools/ld: cannot find -lgcc
-|     /build/tmp-glibc/hosttools/ld: cannot find -lgcc
-|     clang-13: error: linker command failed with exit code 1 (use -v to see invocation)
-[snip]
-before this patch:
-b59da142f2b0:$ /path/to/x86_64-linux/compiler-rt-native/13.0.1-r0/recipe-sysroot-native/usr/bin/clang --print-search-dirs
-programs: =/build/tmp-glibc/work/x86_64-linux/compiler-rt-native/13.0.1-r0/recipe-sysroot-native/usr/bin
-libraries: =/build/tmp-glibc/work/x86_64-linux/compiler-rt-native/13.0.1-r0/recipe-sysroot-native/usr/lib/clang/13.0.1:/build/tmp-glibc/work/x86_64-linux/compiler-rt-native/13.0.1-r0/recipe-sysroot-native/usr/bin/../lib://lib://usr/lib
-after this patch:
-b59da142f2b0:$ /path/to/x86_64-linux/compiler-rt-native/13.0.1-r0/recipe-sysroot-native/usr/bin/clang --print-search-dirs
-programs: =/build/tmp-glibc/work/x86_64-linux/compiler-rt-native/13.0.1-r0/recipe-sysroot-native/usr/bin
-libraries: =/build/tmp-glibc/work/x84_64-linux/compiler-rt-native/13.0.1-r0/recipe-sysroot-native/usr/lib/clang/13.0.1:/usr/lib/x86_64-wrs-linux/10.2.0://lib/x86_64-wrs-linux://usr/lib/x86_64-wrs-linux:/build/tmp-glibc/work/x86_64-linux/compiler-rt-native/13.0.1-r0/recipe-sysroot-native/usr/bin/../lib://lib://usr/lib
-Upstream-Status: Inappropriate [oe specific]
-Signed-off-by: Changqing Li <changqing.li@windriver.com>
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- clang/include/clang/Driver/Distro.h   | 2 ++
- clang/lib/Driver/Distro.cpp           | 1 +
- clang/lib/Driver/ToolChains/Linux.cpp | 1 +
- 3 files changed, 4 insertions(+)
-diff --git a/clang/include/clang/Driver/Distro.h b/clang/include/clang/Driver/Distro.h
-index a8de94163e8b..847d6a3f9d1a 100644
--- a/clang/include/clang/Driver/Distro.h
-+++ b/clang/include/clang/Driver/Distro.h
-@@ -45,6 +45,7 @@ public:
-     RHEL7,
-     Fedora,
-     Gentoo,
-+    //CLANG_EXTRA_OE_DISTRO_NAME
-     OpenSUSE,
-     UbuntuHardy,
-     UbuntuIntrepid,
-@@ -137,6 +138,7 @@ public:
- 
-   bool IsGentoo() const { return DistroVal == Gentoo; }
- 
-+  //CLANG_EXTRA_OE_DISTRO_CHECK
-   /// @}
- };
- 
-diff --git a/clang/lib/Driver/Distro.cpp b/clang/lib/Driver/Distro.cpp
-index a7e7f169dc14..48d4e15196da 100644
--- a/clang/lib/Driver/Distro.cpp
-+++ b/clang/lib/Driver/Distro.cpp
-@@ -44,6 +44,7 @@ static Distro::DistroType DetectOsRelease(llvm::vfs::FileSystem &VFS) {
-                     .Case("sles", Distro::OpenSUSE)
-                     .Case("opensuse", Distro::OpenSUSE)
-                     .Case("exherbo", Distro::Exherbo)
-+                    //CLANG_EXTRA_OE_DISTRO_CASE
-                     .Default(Distro::UnknownDistro);
-   return Version;
- }
-diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp
-index cf549331d255..699ff18b1240 100644
--- a/clang/lib/Driver/ToolChains/Linux.cpp
-+++ b/clang/lib/Driver/ToolChains/Linux.cpp
-@@ -82,6 +82,7 @@ std::string Linux::getMultiarchTriple(const Driver &D,
-       return "x86_64-linux-android";
-     if (TargetEnvironment == llvm::Triple::GNUX32)
-       return "x86_64-linux-gnux32";
-+    //CLANG_EXTRA_OE_DISTRO_TRIPLE
-     return "x86_64-linux-gnu";
-   case llvm::Triple::aarch64:
-     if (IsAndroid)
diff --git a/recipes-devtools/clang/clang/0029-lldb-Link-with-libatomic-on-x86.patch b/recipes-devtools/clang/clang/0029-lldb-Link-with-libatomic-on-x86.patch
deleted file mode 100644
index cbc0549..0000000
--- a/recipes-devtools/clang/clang/0029-lldb-Link-with-libatomic-on-x86.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 0e9dd56bafb1273c784d357fca86a09f9ce02af2 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 8 Feb 2022 01:31:26 -0800
-Subject: [PATCH] lldb: Link with libatomic on x86
-cmake atomic check is not sufficient for i686 target where clang14 still
-generates __atomic_store calls but the check does not entail this
-function and happily thinks that compiler can resolve all atomic via intrinsics
-on i686, but thats not the case, ideally the check for determining
-atomic operation should be make more robust but until then lets ask to
-link with libatomic on i686/linux
-Upstream-Status: Inappropriate [OE-Specific]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- lldb/source/Utility/CMakeLists.txt | 4 ++++
- 1 file changed, 4 insertions(+)
-diff --git a/lldb/source/Utility/CMakeLists.txt b/lldb/source/Utility/CMakeLists.txt
-index a3b0a405b413..a68cfb503dfa 100644
--- a/lldb/source/Utility/CMakeLists.txt
-+++ b/lldb/source/Utility/CMakeLists.txt
-@@ -19,6 +19,10 @@ if (CMAKE_SYSTEM_NAME MATCHES "Windows")
-   list(APPEND LLDB_SYSTEM_LIBS ws2_32 rpcrt4)
- endif ()
- 
-+if (CMAKE_SYSTEM_PROCESSOR MATCHES "i686" AND CMAKE_SYSTEM_NAME MATCHES "Linux")
-+    list(APPEND LLDB_SYSTEM_LIBS atomic)
-+endif()
-+
- if (NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB )
-     list(APPEND LLDB_SYSTEM_LIBS atomic)
- endif()
diff --git a/recipes-devtools/clang/clang/0030-compiler-rt-Enable-__int128-for-ppc32.patch b/recipes-devtools/clang/clang/0030-compiler-rt-Enable-__int128-for-ppc32.patch
deleted file mode 100644
index 8619465..0000000
--- a/recipes-devtools/clang/clang/0030-compiler-rt-Enable-__int128-for-ppc32.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 8ff4e362a824257f89cb77119fe8206667dd88ff Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 9 Mar 2022 16:28:16 -0800
-Subject: [PATCH] compiler-rt: Enable __int128 for ppc32
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- compiler-rt/lib/builtins/CMakeLists.txt | 15 +++++++--------
- compiler-rt/lib/builtins/int_types.h    |  2 +-
- 2 files changed, 8 insertions(+), 9 deletions(-)
-diff --git a/compiler-rt/lib/builtins/CMakeLists.txt b/compiler-rt/lib/builtins/CMakeLists.txt
-index 28ded8766f25..08495c491f08 100644
--- a/compiler-rt/lib/builtins/CMakeLists.txt
-+++ b/compiler-rt/lib/builtins/CMakeLists.txt
-@@ -686,11 +686,9 @@ set(mips64_SOURCES ${GENERIC_TF_SOURCES}
- set(mips64el_SOURCES ${GENERIC_TF_SOURCES}
-                      ${mips_SOURCES})
- 
-set(powerpc_SOURCES ${GENERIC_SOURCES})
-
- set(powerpcspe_SOURCES ${GENERIC_SOURCES})
- 
-set(powerpc64_SOURCES
-+set(powerpc_SOURCES
-   ppc/divtc3.c
-   ppc/fixtfdi.c
-   ppc/fixunstfdi.c
-@@ -705,14 +703,15 @@ set(powerpc64_SOURCES
- )
- # These routines require __int128, which isn't supported on AIX.
- if (NOT OS_NAME MATCHES "AIX")
-  set(powerpc64_SOURCES
-+  set(powerpc_SOURCES
-     ppc/floattitf.c
-     ppc/fixtfti.c
-     ppc/fixunstfti.c
-    ${powerpc64_SOURCES}
-+    ${powerpc_SOURCES}
-   )
- endif()
-set(powerpc64le_SOURCES ${powerpc64_SOURCES})
-+set(powerpc64le_SOURCES ${powerpc_SOURCES})
-+set(powerpc64_SOURCES ${powerpc_SOURCES})
- 
- set(riscv_SOURCES
-   riscv/fp_mode.c
-@@ -847,9 +846,9 @@ else ()
-         list(APPEND BUILTIN_CFLAGS_${arch} -fomit-frame-pointer -DCOMPILER_RT_ARMHF_TARGET)
-       endif()
- 
-      # For RISCV32, we must force enable int128 for compiling long
-+      # For RISCV32/PPC32, we must force enable int128 for compiling long
-       # double routines.
-      if(COMPILER_RT_ENABLE_SOFTWARE_INT128 OR "${arch}" STREQUAL "riscv32")
-+      if(COMPILER_RT_ENABLE_SOFTWARE_INT128 OR "${arch}" STREQUAL "riscv32" OR "${arch}" STREQUAL "powerpc")
-         list(APPEND BUILTIN_CFLAGS_${arch} -fforce-enable-int128)
-       endif()
- 
-diff --git a/compiler-rt/lib/builtins/int_types.h b/compiler-rt/lib/builtins/int_types.h
-index ca97391fc284..6fa1dac2325f 100644
--- a/compiler-rt/lib/builtins/int_types.h
-+++ b/compiler-rt/lib/builtins/int_types.h
-@@ -64,7 +64,7 @@ typedef union {
- } udwords;
- 
- #if defined(__LP64__) || defined(__wasm__) || defined(__mips64) ||             \
-    defined(__SIZEOF_INT128__) || defined(_WIN64)
-+    defined(__SIZEOF_INT128__) || defined(_WIN64) || defined(__powerpc__)
- #define CRT_HAS_128BIT
- #endif
- 
diff --git a/recipes-devtools/clang/clang/0031-llvm-Do-not-use-cmake-infra-to-detect-libzstd.patch b/recipes-devtools/clang/clang/0031-llvm-Do-not-use-cmake-infra-to-detect-libzstd.patch
deleted file mode 100644
index c51326f..0000000
--- a/recipes-devtools/clang/clang/0031-llvm-Do-not-use-cmake-infra-to-detect-libzstd.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 39e87eabd251d5086ef14305a36134053af09ae5 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 12 Aug 2022 11:50:57 -0700
-Subject: [PATCH] llvm: Do not use cmake infra to detect libzstd
-OE's version is build using plain make not cmake as a result we do not
-have the cmake support files and this probing method can get this info
-from build host and force linking with libzstd from /usr/lib which is
-not what we want when cross building.
-Fixes errors building llvm-config like
-/usr/lib/libzstd.so.1.5.2: error adding symbols: file in wrong
-format
-| clang-15: error: linker command failed with exit code 1 (use -v to see invocation)
-| ninja: build stopped: subcommand failed.
-Upstream-Status: Inappropriate [OE-Specific]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- llvm/lib/Support/CMakeLists.txt | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-diff --git a/llvm/lib/Support/CMakeLists.txt b/llvm/lib/Support/CMakeLists.txt
-index e19223fdef4f..9c8af2404545 100644
--- a/llvm/lib/Support/CMakeLists.txt
-+++ b/llvm/lib/Support/CMakeLists.txt
-@@ -22,7 +22,7 @@ if (HAS_WERROR_GLOBAL_CTORS)
- endif()
- 
- if(LLVM_ENABLE_ZLIB)
-  list(APPEND imported_libs ZLIB::ZLIB)
-+  list(APPEND imported_libs z)
- endif()
- 
- if(LLVM_ENABLE_ZSTD)
-@@ -34,7 +34,7 @@ if(LLVM_ENABLE_ZSTD)
- endif()
- 
- if(LLVM_ENABLE_ZSTD)
-  list(APPEND imported_libs ${zstd_target})
-+  list(APPEND imported_libs zstd)
- endif()
- 
- if( MSVC OR MINGW )
-@@ -306,7 +306,7 @@ if(LLVM_ENABLE_ZLIB)
-     get_property(zlib_library TARGET ZLIB::ZLIB PROPERTY LOCATION)
-   endif()
-   get_library_name(${zlib_library} zlib_library)
-  set(llvm_system_libs ${llvm_system_libs} "${zlib_library}")
-+  set(llvm_system_libs ${llvm_system_libs} z)
- endif()
- 
- if(LLVM_ENABLE_ZSTD)
-@@ -319,7 +319,7 @@ if(LLVM_ENABLE_ZSTD)
-     get_property(zstd_library TARGET ${zstd_target} PROPERTY LOCATION)
-   endif()
-   get_library_name(${zstd_library} zstd_library)
-  set(llvm_system_libs ${llvm_system_libs} "${zstd_library}")
-+  set(llvm_system_libs ${llvm_system_libs} zstd)
- endif()
- 
- if(LLVM_ENABLE_TERMINFO)
diff --git a/recipes-devtools/clang/clang/0032-compiler-rt-Fix-stat-struct-s-size-for-O32-ABI.patch b/recipes-devtools/clang/clang/0032-compiler-rt-Fix-stat-struct-s-size-for-O32-ABI.patch
deleted file mode 100644
index ec59ffa..0000000
--- a/recipes-devtools/clang/clang/0032-compiler-rt-Fix-stat-struct-s-size-for-O32-ABI.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 7e735f7b956eca38c2d882f3630af9bfd215f652 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 3 Jan 2023 18:44:34 -0800
-Subject: [PATCH] compiler-rt: Fix stat struct's size for O32 ABI
-stat struct size differs on glibc based on ABI choices e.g. 64bit off_t
-and/or 64bit time_t will make this size different. Therefore separate
-out the O32 case out, makes it more readable.
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- .../sanitizer_platform_limits_posix.h               | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
-index 34bfef1f7ef4..0ba5451c1ccf 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
-+++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
-@@ -98,11 +98,24 @@ const unsigned struct_kernel_stat64_sz = 104;
- const unsigned struct_kernel_stat_sz = 144;
- const unsigned struct_kernel_stat64_sz = 104;
- #elif defined(__mips__)
-+#if defined(__mips_o32) // O32 ABI
-+#if _TIME_BITS == 64
-+const unsigned struct_kernel_stat_sz = 112;
-+const unsigned struct_kernel_stat64_sz = 112;
-+#elif _FILE_OFFSET_BITS == 64
-+const unsigned struct_kernel_stat_sz = 160;
-+const unsigned struct_kernel_stat64_sz = 160;
-+#else
-+const unsigned struct_kernel_stat_sz = 144;
-+const unsigned struct_kernel_stat64_sz = 160;
-+#endif
-+#else // __mips_o32
- const unsigned struct_kernel_stat_sz =
-     SANITIZER_ANDROID
-         ? FIRST_32_SECOND_64(104, 128)
-         : FIRST_32_SECOND_64((_MIPS_SIM == _ABIN32) ? 176 : 160, 216);
- const unsigned struct_kernel_stat64_sz = 104;
-+#endif
- #elif defined(__s390__) && !defined(__s390x__)
- const unsigned struct_kernel_stat_sz = 64;
- const unsigned struct_kernel_stat64_sz = 104;
diff --git a/recipes-devtools/clang/clang/0033-compiler-rt-Undef-_TIME_BITS-along-with-_FILE_OFFSET.patch b/recipes-devtools/clang/clang/0033-compiler-rt-Undef-_TIME_BITS-along-with-_FILE_OFFSET.patch
deleted file mode 100644
index 43cd05b..0000000
--- a/recipes-devtools/clang/clang/0033-compiler-rt-Undef-_TIME_BITS-along-with-_FILE_OFFSET.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From cfeae6f76bbfc62bffca278aa8d58db3981ca100 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 21 Feb 2023 12:46:10 -0800
-Subject: [PATCH] compiler-rt: Undef _TIME_BITS along with _FILE_OFFSET_BITS in
- sanitizers
-On 32bit systems using 64bit time_t build fails because
-_FILE_OFFSET_BITS is undefined here but _TIME_BITS is still set to 64
-Fixes
-In file included from compiler-rt/lib/sanitizer_common/sanitizer_procmaps_solaris.cpp:17:
-In file included from compiler-rt/lib/sanitizer_common/sanitizer_platform.h:25:
-In file included from /usr/include/features.h:393:
-/usr/include/features-time64.h:26:5: error: "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64"
-    ^
-1 error generated.
-Upstream-Status: Submitted [https://reviews.llvm.org/D144514]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- compiler-rt/lib/sanitizer_common/sanitizer_platform.h | 9 +++++++++
- 1 file changed, 9 insertions(+)
-diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform.h b/compiler-rt/lib/sanitizer_common/sanitizer_platform.h
-index 596528155505..8f54ad70999c 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform.h
-+++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform.h
-@@ -22,6 +22,15 @@
- // function declarations into a .S file which doesn't compile.
- // https://crbug.com/1162741
- #if __has_include(<features.h>) && !defined(__ANDROID__)
-+// Some sources undefine _FILE_OFFSET_BITS deliberately e.g.
-+// sanitizer_procmaps_solaris.cpp. This is problematic on glibc systems with
-+// 32-bit architectures using 64-bit time_t and users passing _TIME_BITS=64
-+// from build environment, therefore both _FILE_OFFSET_BITS and _TIME_BITS
-+// need to be undefined together since features.h will check for both being 64
-+// if one is set to 64.
-+#  if !defined(_FILE_OFFSET_BITS)
-+#    undef _TIME_BITS
-+#  endif
- #  include <features.h>
- #endif
- 
diff --git a/recipes-devtools/clang/clang/0034-ToolChains-Gnu.cpp-ARMLibDirs-search-also-in-lib32.patch b/recipes-devtools/clang/clang/0034-ToolChains-Gnu.cpp-ARMLibDirs-search-also-in-lib32.patch
deleted file mode 100644
index 90a6671..0000000
--- a/recipes-devtools/clang/clang/0034-ToolChains-Gnu.cpp-ARMLibDirs-search-also-in-lib32.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 3d2fdb0ab98f479679231435cb3247cfbf9dfaab Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Thu, 31 Aug 2023 18:14:47 +0200
-Subject: [PATCH] ToolChains/Gnu.cpp: ARMLibDirs search also in lib32
-* in some strange multilib configs we build lib32-image where
-  32bit libs are in /usr/lib32 and 64bit in /usr/lib64 but in such
-  setup the clang search for GCC candidate installation doesn't
-  check lib32 directory in sysroot and fails to find the installation
-  X86LibDirs was already searching in lib32 for very long time:
-  https://github.com/llvm/llvm-project/commit/621fed5f5a051a0333415aaed75b8f2ed2350dbd
-  but ARMLibDirs didn't include it for some reason.
-* if we don't add lib32 for arm in getOSLibDir(), then it will
-  find -lgcc, crtbeginS.o, crtendS.o, but still fail to find
-  -lgcc_s, -lc, Scrt1.o, crti.o, crtn.o
-* fixes lib32-compiler-rt build failure:
-- Configuring incomplete, errors occurred!
-CMake Error at TOPDIR/BUILD/work/raspberrypi4_64-oemllib32-linux-gnueabi/lib32-compiler-rt/16.0.6/recipe-sysroot-native/usr/share/cmake-3.26/Modules/CMakeTestCCompiler.cmake:67 (message):
-  The C compiler
-    "TOPDIR/BUILD/work/raspberrypi4_64-oemllib32-linux-gnueabi/lib32-compiler-rt/16.0.6/recipe-sysroot-native/usr/bin/arm-oemllib32-linux-gnueabi/arm-oemllib32-linux-gnueabi-clang"
-  is not able to compile a simple test program.
-  It fails with the following output:
-    Change Dir: TOPDIR/BUILD/work/raspberrypi4_64-oemllib32-linux-gnueabi/lib32-compiler-rt/16.0.6/build/CMakeFiles/CMakeScratch/TryCompile-rWXyQZ
-    Run Build Command(s):ninja -v cmTC_84d18 && [1/2] TOPDIR/BUILD/work/raspberrypi4_64-oemllib32-linux-gnueabi/lib32-compiler-rt/16.0.6/recipe-sysroot-native/usr/bin/arm-oemllib32-linux-gnueabi/arm-oemllib32-linux-gnueabi-clang --target=arm-oemllib32-linux-gnueabi --sysroot=TOPDIR/BUILD/work/raspberrypi4_64-oemllib32-linux-gnueabi/lib32-compiler-rt/16.0.6/lib32-recipe-sysroot   -target arm-oemllib32-linux-gnueabi  -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp -mlittle-endian --dyld-prefix=/usr -Qunused-arguments -funwind-tables -fstack-protector-strong  -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security -Werror=return-type -D_TIME_BITS=64 -D_FILE_OFFSET_BITS=64  --sysroot=TOPDIR/BUILD/work/raspberrypi4_64-oemllib32-linux-gnueabi/lib32-compiler-rt/16.0.6/lib32-recipe-sysroot  -O2 -pipe -g -feliminate-unused-debug-types   -fmacro-prefix-map=TOPDIR/BUILD/work-shared/llvm-project-source-16.0.6-r0/git=/usr/src/debug/lib32-compiler-rt/16.0.6-r0  -fdebug-prefix-map=TOPDIR/BUILD/work-shared/llvm-project-source-16.0.6-r0/git=/usr/src/debug/lib32-compiler-rt/16.0.6-r0  -fmacro-prefix-map=TOPDIR/BUILD/work/raspberrypi4_64-oemllib32-linux-gnueabi/lib32-compiler-rt/16.0.6/build=/usr/src/debug/lib32-compiler-rt/16.0.6-r0  -fdebug-prefix-map=TOPDIR/BUILD/work/raspberrypi4_64-oemllib32-linux-gnueabi/lib32-compiler-rt/16.0.6/build=/usr/src/debug/lib32-compiler-rt/16.0.6-r0  -fdebug-prefix-map=TOPDIR/BUILD/work/raspberrypi4_64-oemllib32-linux-gnueabi/lib32-compiler-rt/16.0.6/lib32-recipe-sysroot=  -fmacro-prefix-map=TOPDIR/BUILD/work/raspberrypi4_64-oemllib32-linux-gnueabi/lib32-compiler-rt/16.0.6/lib32-recipe-sysroot=  -fdebug-prefix-map=TOPDIR/BUILD/work/raspberrypi4_64-oemllib32-linux-gnueabi/lib32-compiler-rt/16.0.6/recipe-sysroot-native=    -fPIE -MD -MT CMakeFiles/cmTC_84d18.dir/testCCompiler.c.o -MF CMakeFiles/cmTC_84d18.dir/testCCompiler.c.o.d -o CMakeFiles/cmTC_84d18.dir/testCCompiler.c.o -c TOPDIR/BUILD/work/raspberrypi4_64-oemllib32-linux-gnueabi/lib32-compiler-rt/16.0.6/build/CMakeFiles/CMakeScratch/TryCompile-rWXyQZ/testCCompiler.c
-    [2/2] : && TOPDIR/BUILD/work/raspberrypi4_64-oemllib32-linux-gnueabi/lib32-compiler-rt/16.0.6/recipe-sysroot-native/usr/bin/arm-oemllib32-linux-gnueabi/arm-oemllib32-linux-gnueabi-clang --target=arm-oemllib32-linux-gnueabi --sysroot=TOPDIR/BUILD/work/raspberrypi4_64-oemllib32-linux-gnueabi/lib32-compiler-rt/16.0.6/lib32-recipe-sysroot -target arm-oemllib32-linux-gnueabi  -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp -mlittle-endian --dyld-prefix=/usr -Qunused-arguments -funwind-tables -fstack-protector-strong  -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security -Werror=return-type -D_TIME_BITS=64 -D_FILE_OFFSET_BITS=64  --sysroot=TOPDIR/BUILD/work/raspberrypi4_64-oemllib32-linux-gnueabi/lib32-compiler-rt/16.0.6/lib32-recipe-sysroot  -O2 -pipe -g -feliminate-unused-debug-types   -fmacro-prefix-map=TOPDIR/BUILD/work-shared/llvm-project-source-16.0.6-r0/git=/usr/src/debug/lib32-compiler-rt/16.0.6-r0  -fdebug-prefix-map=TOPDIR/BUILD/work-shared/llvm-project-source-16.0.6-r0/git=/usr/src/debug/lib32-compiler-rt/16.0.6-r0  -fmacro-prefix-map=TOPDIR/BUILD/work/raspberrypi4_64-oemllib32-linux-gnueabi/lib32-compiler-rt/16.0.6/build=/usr/src/debug/lib32-compiler-rt/16.0.6-r0  -fdebug-prefix-map=TOPDIR/BUILD/work/raspberrypi4_64-oemllib32-linux-gnueabi/lib32-compiler-rt/16.0.6/build=/usr/src/debug/lib32-compiler-rt/16.0.6-r0  -fdebug-prefix-map=TOPDIR/BUILD/work/raspberrypi4_64-oemllib32-linux-gnueabi/lib32-compiler-rt/16.0.6/lib32-recipe-sysroot=  -fmacro-prefix-map=TOPDIR/BUILD/work/raspberrypi4_64-oemllib32-linux-gnueabi/lib32-compiler-rt/16.0.6/lib32-recipe-sysroot=  -fdebug-prefix-map=TOPDIR/BUILD/work/raspberrypi4_64-oemllib32-linux-gnueabi/lib32-compiler-rt/16.0.6/recipe-sysroot-native= -target arm-oemllib32-linux-gnueabi  -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp -mlittle-endian --dyld-prefix=/usr -Qunused-arguments -funwind-tables -fstack-protector-strong  -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security -Werror=return-type -D_TIME_BITS=64 -D_FILE_OFFSET_BITS=64  --sysroot=TOPDIR/BUILD/work/raspberrypi4_64-oemllib32-linux-gnueabi/lib32-compiler-rt/16.0.6/lib32-recipe-sysroot  -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed   -fmacro-prefix-map=TOPDIR/BUILD/work-shared/llvm-project-source-16.0.6-r0/git=/usr/src/debug/lib32-compiler-rt/16.0.6-r0  -fdebug-prefix-map=TOPDIR/BUILD/work-shared/llvm-project-source-16.0.6-r0/git=/usr/src/debug/lib32-compiler-rt/16.0.6-r0  -fmacro-prefix-map=TOPDIR/BUILD/work/raspberrypi4_64-oemllib32-linux-gnueabi/lib32-compiler-rt/16.0.6/build=/usr/src/debug/lib32-compiler-rt/16.0.6-r0  -fdebug-prefix-map=TOPDIR/BUILD/work/raspberrypi4_64-oemllib32-linux-gnueabi/lib32-compiler-rt/16.0.6/build=/usr/src/debug/lib32-compiler-rt/16.0.6-r0  -fdebug-prefix-map=TOPDIR/BUILD/work/raspberrypi4_64-oemllib32-linux-gnueabi/lib32-compiler-rt/16.0.6/lib32-recipe-sysroot=  -fmacro-prefix-map=TOPDIR/BUILD/work/raspberrypi4_64-oemllib32-linux-gnueabi/lib32-compiler-rt/16.0.6/lib32-recipe-sysroot=  -fdebug-prefix-map=TOPDIR/BUILD/work/raspberrypi4_64-oemllib32-linux-gnueabi/lib32-compiler-rt/16.0.6/recipe-sysroot-native=  -Wl,-z,relro,-z,now -unwindlib=libgcc -rtlib=libgcc -stdlib=libstdc++   -fuse-ld=lld -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed   -fmacro-prefix-map=TOPDIR/BUILD/work-shared/llvm-project-source-16.0.6-r0/git=/usr/src/debug/lib32-compiler-rt/16.0.6-r0  -fdebug-prefix-map=TOPDIR/BUILD/work-shared/llvm-project-source-16.0.6-r0/git=/usr/src/debug/lib32-compiler-rt/16.0.6-r0  -fmacro-prefix-map=TOPDIR/BUILD/work/raspberrypi4_64-oemllib32-linux-gnueabi/lib32-compiler-rt/16.0.6/build=/usr/src/debug/lib32-compiler-rt/16.0.6-r0  -fdebug-prefix-map=TOPDIR/BUILD/work/raspberrypi4_64-oemllib32-linux-gnueabi/lib32-compiler-rt/16.0.6/build=/usr/src/debug/lib32-compiler-rt/16.0.6-r0  -fdebug-prefix-map=TOPDIR/BUILD/work/raspberrypi4_64-oemllib32-linux-gnueabi/lib32-compiler-rt/16.0.6/lib32-recipe-sysroot=  -fmacro-prefix-map=TOPDIR/BUILD/work/raspberrypi4_64-oemllib32-linux-gnueabi/lib32-compiler-rt/16.0.6/lib32-recipe-sysroot=  -fdebug-prefix-map=TOPDIR/BUILD/work/raspberrypi4_64-oemllib32-linux-gnueabi/lib32-compiler-rt/16.0.6/recipe-sysroot-native=  -Wl,-z,relro,-z,now -unwindlib=libgcc -rtlib=libgcc -stdlib=libstdc++   -fuse-ld=lld CMakeFiles/cmTC_84d18.dir/testCCompiler.c.o -o cmTC_84d18   && :
-    FAILED: cmTC_84d18
-    : && TOPDIR/BUILD/work/raspberrypi4_64-oemllib32-linux-gnueabi/lib32-compiler-rt/16.0.6/recipe-sysroot-native/usr/bin/arm-oemllib32-linux-gnueabi/arm-oemllib32-linux-gnueabi-clang --target=arm-oemllib32-linux-gnueabi --sysroot=TOPDIR/BUILD/work/raspberrypi4_64-oemllib32-linux-gnueabi/lib32-compiler-rt/16.0.6/lib32-recipe-sysroot -target arm-oemllib32-linux-gnueabi  -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp -mlittle-endian --dyld-prefix=/usr -Qunused-arguments -funwind-tables -fstack-protector-strong  -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security -Werror=return-type -D_TIME_BITS=64 -D_FILE_OFFSET_BITS=64  --sysroot=TOPDIR/BUILD/work/raspberrypi4_64-oemllib32-linux-gnueabi/lib32-compiler-rt/16.0.6/lib32-recipe-sysroot  -O2 -pipe -g -feliminate-unused-debug-types   -fmacro-prefix-map=TOPDIR/BUILD/work-shared/llvm-project-source-16.0.6-r0/git=/usr/src/debug/lib32-compiler-rt/16.0.6-r0  -fdebug-prefix-map=TOPDIR/BUILD/work-shared/llvm-project-source-16.0.6-r0/git=/usr/src/debug/lib32-compiler-rt/16.0.6-r0  -fmacro-prefix-map=TOPDIR/BUILD/work/raspberrypi4_64-oemllib32-linux-gnueabi/lib32-compiler-rt/16.0.6/build=/usr/src/debug/lib32-compiler-rt/16.0.6-r0  -fdebug-prefix-map=TOPDIR/BUILD/work/raspberrypi4_64-oemllib32-linux-gnueabi/lib32-compiler-rt/16.0.6/build=/usr/src/debug/lib32-compiler-rt/16.0.6-r0  -fdebug-prefix-map=TOPDIR/BUILD/work/raspberrypi4_64-oemllib32-linux-gnueabi/lib32-compiler-rt/16.0.6/lib32-recipe-sysroot=  -fmacro-prefix-map=TOPDIR/BUILD/work/raspberrypi4_64-oemllib32-linux-gnueabi/lib32-compiler-rt/16.0.6/lib32-recipe-sysroot=  -fdebug-prefix-map=TOPDIR/BUILD/work/raspberrypi4_64-oemllib32-linux-gnueabi/lib32-compiler-rt/16.0.6/recipe-sysroot-native= -target arm-oemllib32-linux-gnueabi  -march=armv7ve -mthumb -mfpu=neon-vfpv4 -mfloat-abi=softfp -mlittle-endian --dyld-prefix=/usr -Qunused-arguments -funwind-tables -fstack-protector-strong  -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security -Werror=return-type -D_TIME_BITS=64 -D_FILE_OFFSET_BITS=64  --sysroot=TOPDIR/BUILD/work/raspberrypi4_64-oemllib32-linux-gnueabi/lib32-compiler-rt/16.0.6/lib32-recipe-sysroot  -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed   -fmacro-prefix-map=TOPDIR/BUILD/work-shared/llvm-project-source-16.0.6-r0/git=/usr/src/debug/lib32-compiler-rt/16.0.6-r0  -fdebug-prefix-map=TOPDIR/BUILD/work-shared/llvm-project-source-16.0.6-r0/git=/usr/src/debug/lib32-compiler-rt/16.0.6-r0  -fmacro-prefix-map=TOPDIR/BUILD/work/raspberrypi4_64-oemllib32-linux-gnueabi/lib32-compiler-rt/16.0.6/build=/usr/src/debug/lib32-compiler-rt/16.0.6-r0  -fdebug-prefix-map=TOPDIR/BUILD/work/raspberrypi4_64-oemllib32-linux-gnueabi/lib32-compiler-rt/16.0.6/build=/usr/src/debug/lib32-compiler-rt/16.0.6-r0  -fdebug-prefix-map=TOPDIR/BUILD/work/raspberrypi4_64-oemllib32-linux-gnueabi/lib32-compiler-rt/16.0.6/lib32-recipe-sysroot=  -fmacro-prefix-map=TOPDIR/BUILD/work/raspberrypi4_64-oemllib32-linux-gnueabi/lib32-compiler-rt/16.0.6/lib32-recipe-sysroot=  -fdebug-prefix-map=TOPDIR/BUILD/work/raspberrypi4_64-oemllib32-linux-gnueabi/lib32-compiler-rt/16.0.6/recipe-sysroot-native=  -Wl,-z,relro,-z,now -unwindlib=libgcc -rtlib=libgcc -stdlib=libstdc++   -fuse-ld=lld -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed   -fmacro-prefix-map=TOPDIR/BUILD/work-shared/llvm-project-source-16.0.6-r0/git=/usr/src/debug/lib32-compiler-rt/16.0.6-r0  -fdebug-prefix-map=TOPDIR/BUILD/work-shared/llvm-project-source-16.0.6-r0/git=/usr/src/debug/lib32-compiler-rt/16.0.6-r0  -fmacro-prefix-map=TOPDIR/BUILD/work/raspberrypi4_64-oemllib32-linux-gnueabi/lib32-compiler-rt/16.0.6/build=/usr/src/debug/lib32-compiler-rt/16.0.6-r0  -fdebug-prefix-map=TOPDIR/BUILD/work/raspberrypi4_64-oemllib32-linux-gnueabi/lib32-compiler-rt/16.0.6/build=/usr/src/debug/lib32-compiler-rt/16.0.6-r0  -fdebug-prefix-map=TOPDIR/BUILD/work/raspberrypi4_64-oemllib32-linux-gnueabi/lib32-compiler-rt/16.0.6/lib32-recipe-sysroot=  -fmacro-prefix-map=TOPDIR/BUILD/work/raspberrypi4_64-oemllib32-linux-gnueabi/lib32-compiler-rt/16.0.6/lib32-recipe-sysroot=  -fdebug-prefix-map=TOPDIR/BUILD/work/raspberrypi4_64-oemllib32-linux-gnueabi/lib32-compiler-rt/16.0.6/recipe-sysroot-native=  -Wl,-z,relro,-z,now -unwindlib=libgcc -rtlib=libgcc -stdlib=libstdc++   -fuse-ld=lld CMakeFiles/cmTC_84d18.dir/testCCompiler.c.o -o cmTC_84d18   && :
-    arm-oemllib32-linux-gnueabi-ld.lld: error: cannot open Scrt1.o: No such file or directory
-    arm-oemllib32-linux-gnueabi-ld.lld: error: cannot open crti.o: No such file or directory
-    arm-oemllib32-linux-gnueabi-ld.lld: error: cannot open crtbeginS.o: No such file or directory
-    arm-oemllib32-linux-gnueabi-ld.lld: error: unable to find library -lgcc
-    arm-oemllib32-linux-gnueabi-ld.lld: error: unable to find library -lgcc_s
-    arm-oemllib32-linux-gnueabi-ld.lld: error: unable to find library -lc
-    arm-oemllib32-linux-gnueabi-ld.lld: error: unable to find library -lgcc
-    arm-oemllib32-linux-gnueabi-ld.lld: error: unable to find library -lgcc_s
-    arm-oemllib32-linux-gnueabi-ld.lld: error: cannot open crtendS.o: No such file or directory
-    arm-oemllib32-linux-gnueabi-ld.lld: error: cannot open crtn.o: No such file or directory
-    clang-16: error: linker command failed with exit code 1 (use -v to see invocation)
-    ninja: build stopped: subcommand failed.
-Upstream-Status: Pending
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
- clang/lib/Driver/ToolChains/Gnu.cpp   | 2 +-
- clang/lib/Driver/ToolChains/Linux.cpp | 1 +
- 2 files changed, 2 insertions(+), 1 deletion(-)
-diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp
-index 98d979ace17b..c5aed9b47123 100644
--- a/clang/lib/Driver/ToolChains/Gnu.cpp
-+++ b/clang/lib/Driver/ToolChains/Gnu.cpp
-@@ -2479,7 +2479,7 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
-   static const char *const AArch64beTriples[] = {"aarch64_be-none-linux-gnu",
-                                                  "aarch64_be-linux-gnu"};
- 
-  static const char *const ARMLibDirs[] = {"/lib"};
-+  static const char *const ARMLibDirs[] = {"/lib", "/lib32"};
-   static const char *const ARMTriples[] = {"arm-linux-gnueabi"};
-   static const char *const ARMHFTriples[] = {"arm-linux-gnueabihf",
-                                              "armv7hl-redhat-linux-gnueabi",
-diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp
-index 699ff18b1240..4ed91b852562 100644
--- a/clang/lib/Driver/ToolChains/Linux.cpp
-+++ b/clang/lib/Driver/ToolChains/Linux.cpp
-@@ -202,6 +202,7 @@ static StringRef getOSLibDir(const llvm::Triple &Triple, const ArgList &Args) {
-   // reasoning about oslibdir spellings with the lib dir spellings in the
-   // GCCInstallationDetector, but that is a more significant refactoring.
-   if (Triple.getArch() == llvm::Triple::x86 || Triple.isPPC32() ||
-+      Triple.getArch() == llvm::Triple::arm || Triple.getArch() == llvm::Triple::thumb ||
-       Triple.getArch() == llvm::Triple::sparc)
-     return "lib32";
- 
diff --git a/recipes-devtools/clang/clang/0035-compiler-rt-Fix-cmake-check-for-_Float16-and-__bf16.patch b/recipes-devtools/clang/clang/0035-compiler-rt-Fix-cmake-check-for-_Float16-and-__bf16.patch
deleted file mode 100644
index c6115a0..0000000
--- a/recipes-devtools/clang/clang/0035-compiler-rt-Fix-cmake-check-for-_Float16-and-__bf16.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 34a65a1f0ff8bb2d41f32c229dc6b309a7566ecd Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 1 Mar 2024 16:47:46 -0800
-Subject: [PATCH] compiler-rt: Fix cmake check for _Float16 and __bf16
-When using check_c_source_compiles cmake function, main has to be
-provided, otherwise while compile step will be fine but linking step
-will fail as there will be no main function and test will fail and
-disable building HF builtins into compiler-rt
-Fixes configure errors like below
-aarch64-yoe-linux-ld.lld: error: undefined symbol: main
- referenced by start.S:81 (../sysdeps/aarch64/start.S:81)
-               /mnt/b/yoe/master/build/tmp/work/cortexa72-cortexa53-crypto-yoe-linux/compiler-rt/18.1.0/recipe-sysroot/usr/lib/Scrt1.o:(_start)
- referenced by start.S:82 (../sysdeps/aarch64/start.S:82)
-               /mnt/b/yoe/master/build/tmp/work/cortexa72-cortexa53-crypto-yoe-linux/compiler-rt/18.1.0/recipe-sysroot/usr/lib/Scrt1.o:(_start)
- aarch64-yoe-linux-clang: error: linker command failed with exit code 1 (use -v to see invocation)
-Upstream-Status: Submitted [https://github.com/kraj/llvm-project/pull/new/kraj/compiler-rt-float16]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- compiler-rt/lib/builtins/CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/compiler-rt/lib/builtins/CMakeLists.txt b/compiler-rt/lib/builtins/CMakeLists.txt
-index 08495c491f08..bff96ba10bcd 100644
--- a/compiler-rt/lib/builtins/CMakeLists.txt
-+++ b/compiler-rt/lib/builtins/CMakeLists.txt
-@@ -827,10 +827,10 @@ else ()
-           endif()
-         endif()
-       endif()
-      check_c_source_compiles("_Float16 foo(_Float16 x) { return x; }"
-+      check_c_source_compiles("_Float16 foo(_Float16 x) { return x; } int main(void) { return foo(1.0); }"
-                               COMPILER_RT_HAS_${arch}_FLOAT16)
-       append_list_if(COMPILER_RT_HAS_${arch}_FLOAT16 -DCOMPILER_RT_HAS_FLOAT16 BUILTIN_CFLAGS_${arch})
-      check_c_source_compiles("__bf16 foo(__bf16 x) { return x; }"
-+      check_c_source_compiles("__bf16 foo(__bf16 x) { return x; } int main(void) { return foo(1.0); }"
-                               COMPILER_RT_HAS_${arch}_BFLOAT16)
-       # Build BF16 files only when "__bf16" is available.
-       if(COMPILER_RT_HAS_${arch}_BFLOAT16)
diff --git a/recipes-devtools/clang/clang/libunwind.pc.in b/recipes-devtools/clang/clang/libunwind.pc.in
deleted file mode 100644
index a93d676..0000000
--- a/recipes-devtools/clang/clang/libunwind.pc.in
+++ /dev/null
@@ -1,9 +0,0 @@
-prefix=/usr
-exec_prefix=/usr
-libdir=@LIBDIR@
-includedir=/usr/include
-Name: libunwind
-Description: libunwind base library
-Version: @VERSION@
-Libs: -lunwind
diff --git a/recipes-devtools/clang/clang/llvm-config b/recipes-devtools/clang/clang/llvm-config
deleted file mode 100644
index 6a0dd54..0000000
--- a/recipes-devtools/clang/clang/llvm-config
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-#
-# Wrapper script for llvm-config. Supplies the right environment variables
-# for the target and delegates to the native llvm-config for anything else. This
-# is needed because arguments like --ldflags, --cxxflags, etc. are set by the
-# native compile rather than the target compile.
-#
-SCRIPT_DIR="$(dirname "$(readlink -f "$0")")"
-NEXT_LLVM_CONFIG="$(which -a llvm-config | sed -n 2p)"
-export YOCTO_ALTERNATE_EXE_PATH="${YOCTO_ALTERNATE_EXE_PATH:="$(readlink -f "$SCRIPT_DIR/../llvm-config")"}"
-if [ -n "$( echo $base_libdir | sed -n '/lib64/p')" ]; then
-    export YOCTO_ALTERNATE_LIBDIR="${YOCTO_ALTERNATE_LIBDIR:="/lib64"}"
-else
-    export YOCTO_ALTERNATE_LIBDIR="${YOCTO_ALTERNATE_LIBDIR:="/lib"}"
-fi
-if [[ $# == 0 ]]; then
-  exec "$NEXT_LLVM_CONFIG"
-fi
-remain=""
-output=""
-for arg in "$@"; do
-  case "$arg" in
-    --cppflags)
-      output="${output} ${CPPFLAGS}"
-      ;;
-    --cflags)
-      output="${output} ${CFLAGS}"
-      ;;
-    --cxxflags)
-      output="${output} ${CXXFLAGS}"
-      ;;
-    --ldflags)
-      output="${output} ${LDFLAGS}"
-      ;;
-    --shared-mode)
-      output="${output} shared"
-      ;;
-    --link-shared)
-      break
-      ;;
-    *)
-      remain="${remain} ${arg}"
-      ;;
-  esac
-done
-if [ "${remain}" != "" ]; then
-      output="${output} "$("$NEXT_LLVM_CONFIG" ${remain})
-fi
-echo "${output}"
diff --git a/recipes-devtools/clang/clang_git.bb b/recipes-devtools/clang/clang_git.bb
deleted file mode 100644
index 2891a3a..0000000
--- a/recipes-devtools/clang/clang_git.bb
+++ /dev/null
@@ -1,451 +0,0 @@
-# Copyright (C) 2014 Khem Raj <raj.khem@gmail.com>
-# Released under the MIT license (see COPYING.MIT for the terms)
-DESCRIPTION = "LLVM based C/C++ compiler"
-HOMEPAGE = "http://clang.llvm.org/"
-SECTION = "devel"
-require clang.inc
-require common-source.inc
-INHIBIT_DEFAULT_DEPS = "1"
-BUILD_CC:class-nativesdk = "clang"
-BUILD_CXX:class-nativesdk = "clang++"
-BUILD_AR:class-nativesdk = "llvm-ar"
-BUILD_RANLIB:class-nativesdk = "llvm-ranlib"
-BUILD_NM:class-nativesdk = "llvm-nm"
-LDFLAGS:remove:class-nativesdk = "-fuse-ld=lld"
-LDFLAGS:append:class-target:riscv32 = " -Wl,--no-as-needed -latomic -Wl,--as-needed"
-LDFLAGS:append:class-target:mips = " -Wl,--no-as-needed -latomic -Wl,--as-needed"
-inherit cmake cmake-native pkgconfig python3native python3targetconfig
-OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "BOTH"
-def get_clang_experimental_arch(bb, d, arch_var):
-    import re
-    a = d.getVar(arch_var, True)
-    return ""
-def get_clang_arch(bb, d, arch_var):
-    import re
-    a = d.getVar(arch_var, True)
-    if   re.match('(i.86|athlon|x86.64)$', a):         return 'X86'
-    elif re.match('arm$', a):                          return 'ARM'
-    elif re.match('armeb$', a):                        return 'ARM'
-    elif re.match('aarch64$', a):                      return 'AArch64'
-    elif re.match('aarch64_be$', a):                   return 'AArch64'
-    elif re.match('mips(isa|)(32|64|)(r6|)(el|)$', a): return 'Mips'
-    elif re.match('riscv32$', a):                      return 'riscv32'
-    elif re.match('riscv64$', a):                      return 'riscv64'
-    elif re.match('p(pc|owerpc)(|64)', a):             return 'PowerPC'
-    elif re.match('loongarch64$', a):                  return 'loongarch64'
-    else:
-        bb.note("'%s' is not a primary llvm architecture" % a)
-    return ""
-def get_clang_host_arch(bb, d):
-    return get_clang_arch(bb, d, 'HOST_ARCH')
-def get_clang_target_arch(bb, d):
-    return get_clang_arch(bb, d, 'TARGET_ARCH')
-def get_clang_experimental_target_arch(bb, d):
-    return get_clang_experimental_arch(bb, d, 'TARGET_ARCH')
-PACKAGECONFIG_CLANG_COMMON = "eh libedit rtti shared-libs \
-                              ${@bb.utils.contains('TC_CXX_RUNTIME', 'llvm', 'compiler-rt libcplusplus libomp unwindlib', '', d)} \
-                              "
-PACKAGECONFIG ??= "compiler-rt libcplusplus lldb-wchar terminfo \
-                   ${PACKAGECONFIG_CLANG_COMMON} \
-                   ${@bb.utils.filter('DISTRO_FEATURES', 'lto thin-lto', d)} \
-                   "
-PACKAGECONFIG:class-native = "clangd \
-                              ${PACKAGECONFIG_CLANG_COMMON} \
-                              "
-PACKAGECONFIG:class-nativesdk = "clangd \
-                                 ${PACKAGECONFIG_CLANG_COMMON} \
-                                 ${@bb.utils.filter('DISTRO_FEATURES', 'lto thin-lto', d)} \
-                                 "
-PACKAGECONFIG[bootstrap] = "-DCLANG_ENABLE_BOOTSTRAP=On -DCLANG_BOOTSTRAP_PASSTHROUGH='${PASSTHROUGH}' -DBOOTSTRAP_LLVM_ENABLE_LTO=Thin -DBOOTSTRAP_LLVM_ENABLE_LLD=ON,,,"
-PACKAGECONFIG[clangd] = "-DCLANG_ENABLE_CLANGD=ON,-DCLANG_ENABLE_CLANGD=OFF,,"
-PACKAGECONFIG[compiler-rt] = "-DCLANG_DEFAULT_RTLIB=compiler-rt,,"
-PACKAGECONFIG[eh] = "-DLLVM_ENABLE_EH=ON,-DLLVM_ENABLE_EH=OFF,,"
-PACKAGECONFIG[libcplusplus] = "-DCLANG_DEFAULT_CXX_STDLIB=libc++,,"
-PACKAGECONFIG[libedit] = "-DLLVM_ENABLE_LIBEDIT=ON -DLLDB_ENABLE_LIBEDIT=ON,-DLLVM_ENABLE_LIBEDIT=OFF -DLLDB_ENABLE_LIBEDIT=OFF,libedit libedit-native"
-PACKAGECONFIG[libomp] = "-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp,,"
-PACKAGECONFIG[lldb-lua] = "-DLLDB_ENABLE_LUA=ON,-DLLDB_ENABLE_LUA=OFF,lua"
-PACKAGECONFIG[lldb-wchar] = "-DLLDB_EDITLINE_USE_WCHAR=1,-DLLDB_EDITLINE_USE_WCHAR=0,"
-PACKAGECONFIG[lto] = "-DLLVM_ENABLE_LTO=Full -DLLVM_BINUTILS_INCDIR=${STAGING_INCDIR},,binutils,"
-PACKAGECONFIG[pfm] = "-DLLVM_ENABLE_LIBPFM=ON,-DLLVM_ENABLE_LIBPFM=OFF,libpfm,"
-PACKAGECONFIG[rtti] = "-DLLVM_ENABLE_RTTI=ON,-DLLVM_ENABLE_RTTI=OFF,,"
-PACKAGECONFIG[shared-libs] = "-DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_LINK_LLVM_DYLIB=ON,,,"
-PACKAGECONFIG[split-dwarf] = "-DLLVM_USE_SPLIT_DWARF=ON,-DLLVM_USE_SPLIT_DWARF=OFF,,"
-PACKAGECONFIG[terminfo] = "-DLLVM_ENABLE_TERMINFO=ON -DCOMPILER_RT_TERMINFO_LIB=ON,-DLLVM_ENABLE_TERMINFO=OFF -DCOMPILER_RT_TERMINFO_LIB=OFF,ncurses,"
-PACKAGECONFIG[thin-lto] = "-DLLVM_ENABLE_LTO=Thin -DLLVM_BINUTILS_INCDIR=${STAGING_INCDIR},,binutils,"
-PACKAGECONFIG[unwindlib] = "-DCLANG_DEFAULT_UNWINDLIB=libunwind,-DCLANG_DEFAULT_UNWINDLIB=libgcc,,"
-OECMAKE_SOURCEPATH = "${S}/llvm"
-OECMAKE_TARGET_COMPILE = "${@bb.utils.contains('PACKAGECONFIG', 'bootstrap', 'stage2', 'all', d)}"
-OECMAKE_TARGET_INSTALL = "${@bb.utils.contains('PACKAGECONFIG', 'bootstrap', 'stage2-install', 'install', d)}"
-BINPATHPREFIX = "${@bb.utils.contains('PACKAGECONFIG', 'bootstrap', '/tools/clang/stage2-bins/NATIVE', '', d)}"
-PASSTHROUGH = "\
-CLANG_DEFAULT_RTLIB;CLANG_DEFAULT_CXX_STDLIB;LLVM_BUILD_LLVM_DYLIB;LLVM_LINK_LLVM_DYLIB;\
-LLVM_ENABLE_ASSERTIONS;LLVM_ENABLE_EXPENSIVE_CHECKS;LLVM_ENABLE_PIC;\
-LLVM_BINDINGS_LIST;LLVM_ENABLE_FFI;FFI_INCLUDE_DIR;LLVM_OPTIMIZED_TABLEGEN;\
-LLVM_ENABLE_RTTI;LLVM_ENABLE_EH;LLVM_BUILD_EXTERNAL_COMPILER_RT;CMAKE_SYSTEM_NAME;\
-CMAKE_BUILD_TYPE;BUILD_SHARED_LIBS;LLVM_ENABLE_PROJECTS;LLVM_BINUTILS_INCDIR;\
-LLVM_TARGETS_TO_BUILD;LLVM_EXPERIMENTAL_TARGETS_TO_BUILD;PYTHON_EXECUTABLE;\
-PYTHON_LIBRARY;PYTHON_INCLUDE_DIR;LLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN;LLDB_EDITLINE_USE_WCHAR;\
-LLVM_ENABLE_LIBEDIT;LLDB_ENABLE_LIBEDIT;LLDB_PYTHON_RELATIVE_PATH;LLDB_PYTHON_EXE_RELATIVE_PATH;\
-LLDB_PYTHON_EXT_SUFFIX;CMAKE_C_FLAGS_RELEASE;CMAKE_CXX_FLAGS_RELEASE;CMAKE_ASM_FLAGS_RELEASE;\
-CLANG_DEFAULT_CXX_STDLIB;CLANG_DEFAULT_RTLIB;CLANG_DEFAULT_UNWINDLIB;\
-CLANG_DEFAULT_OPENMP_RUNTIME;LLVM_ENABLE_PER_TARGET_RUNTIME_DIR;\
-LLVM_BUILD_TOOLS;LLVM_USE_HOST_TOOLS;LLVM_CONFIG_PATH;\
-"
-#
-# Default to build all OE-Core supported target arches (user overridable).
-# Gennerally setting LLVM_TARGETS_TO_BUILD = "" in local.conf is ok in most simple situations
-# where only one target architecture is needed along with just one build arch (usually X86)
-#
-LLVM_TARGETS_TO_BUILD ?= "AMDGPU;AArch64;ARM;BPF;Mips;PowerPC;RISCV;X86;LoongArch"
-LLVM_EXPERIMENTAL_TARGETS_TO_BUILD ?= ""
-LLVM_EXPERIMENTAL_TARGETS_TO_BUILD:append = ";${@get_clang_experimental_target_arch(bb, d)}"
-HF = ""
-HF:class-target = "${@ bb.utils.contains('TUNE_CCARGS_MFLOAT', 'hard', 'hf', '', d)}"
-HF[vardepvalue] = "${HF}"
-LLVM_PROJECTS ?= "clang;clang-tools-extra;lld${LLDB}"
-LLDB ?= ";lldb"
-# LLDB support for RISCV/Mips32 does not work yet
-LLDB:riscv32 = ""
-LLDB:riscv64 = ""
-LLDB:mips = ""
-LLDB:mipsel = ""
-LLDB:powerpc = ""
-# linux hosts (.so) on Windows .pyd
-SOLIBSDEV:mingw32 = ".pyd"
-#CMAKE_VERBOSE = "VERBOSE=1"
-EXTRA_OECMAKE += "-DLLVM_ENABLE_ASSERTIONS=OFF \
-                  -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF \
-                  -DLLVM_ENABLE_EXPENSIVE_CHECKS=OFF \
-                  -DLLVM_ENABLE_PIC=ON \
-                  -DCLANG_DEFAULT_PIE_ON_LINUX=ON \
-                  -DLLVM_BINDINGS_LIST='' \
-                  -DLLVM_ENABLE_FFI=ON \
-                  -DLLVM_ENABLE_ZSTD=ON \
-                  -DFFI_INCLUDE_DIR=$(pkg-config --variable=includedir libffi) \
-                  -DLLVM_OPTIMIZED_TABLEGEN=ON \
-                  -DLLVM_BUILD_EXTERNAL_COMPILER_RT=ON \
-                  -DCMAKE_SYSTEM_NAME=Linux \
-                  -DCMAKE_BUILD_TYPE=Release \
-                  -DCMAKE_CXX_FLAGS_RELEASE='${CXXFLAGS} -DNDEBUG -g0' \
-                  -DCMAKE_C_FLAGS_RELEASE='${CFLAGS} -DNDEBUG -g0' \
-                  -DBUILD_SHARED_LIBS=OFF \
-                  -DLLVM_ENABLE_PROJECTS='${LLVM_PROJECTS}' \
-                  -DLLVM_BINUTILS_INCDIR=${STAGING_INCDIR} \
-                  -DLLVM_VERSION_SUFFIX='${VER_SUFFIX}' \
-                  -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON \
-                  -DLLVM_TARGETS_TO_BUILD='${LLVM_TARGETS_TO_BUILD}' \
-                  -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD='${LLVM_EXPERIMENTAL_TARGETS_TO_BUILD}' \
-"
-EXTRA_OECMAKE:append:class-native = "\
-                  -DPYTHON_EXECUTABLE='${PYTHON}' \
-"
-EXTRA_OECMAKE:append:class-nativesdk = "\
-                  -DCROSS_TOOLCHAIN_FLAGS_NATIVE='-DLLDB_PYTHON_RELATIVE_PATH=${PYTHON_SITEPACKAGES_DIR} \
-                                                  -DLLDB_PYTHON_EXE_RELATIVE_PATH=${PYTHON} \
-                                                  -DLLDB_PYTHON_EXT_SUFFIX=${SOLIBSDEV} \
-                                                  -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain-native.cmake' \
-                  -DCMAKE_RANLIB=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-ranlib \
-                  -DCMAKE_AR=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-ar \
-                  -DCMAKE_NM=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-nm \
-                  -DCMAKE_STRIP=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-strip \
-                  -DLLVM_NATIVE_TOOL_DIR=${STAGING_BINDIR_NATIVE} \
-                  -DLLVM_HEADERS_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-min-tblgen \
-                  -DPYTHON_LIBRARY=${STAGING_LIBDIR}/lib${PYTHON_DIR}${PYTHON_ABI}.so \
-                  -DLLDB_PYTHON_RELATIVE_PATH=${PYTHON_SITEPACKAGES_DIR} \
-                  -DLLDB_PYTHON_EXE_RELATIVE_PATH=${PYTHON} \
-                  -DLLDB_PYTHON_EXT_SUFFIX=${SOLIBSDEV} \
-                  -DPYTHON_INCLUDE_DIR=${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI} \
-                  -DPYTHON_EXECUTABLE='${PYTHON}' \
-"
-EXTRA_OECMAKE:append:class-target = "\
-                  -DLLVM_NATIVE_TOOL_DIR=${STAGING_BINDIR_NATIVE} \
-                  -DLLVM_HEADERS_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-min-tblgen \
-                  -DCMAKE_RANLIB=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-ranlib \
-                  -DCMAKE_AR=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-ar \
-                  -DCMAKE_NM=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-nm \
-                  -DCMAKE_STRIP=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-strip \
-                  -DLLVM_TARGET_ARCH=${@get_clang_target_arch(bb, d)} \
-                  -DLLVM_DEFAULT_TARGET_TRIPLE=${TARGET_SYS}${HF} \
-                  -DLLVM_HOST_TRIPLE=${TARGET_SYS}${HF} \
-                  -DPYTHON_LIBRARY=${STAGING_LIBDIR}/lib${PYTHON_DIR}${PYTHON_ABI}.so \
-                  -DPYTHON_INCLUDE_DIR=${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI} \
-                  -DLLVM_LIBDIR_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \
-                  -DLLDB_PYTHON_RELATIVE_PATH=${PYTHON_SITEPACKAGES_DIR} \
-                  -DLLDB_PYTHON_EXE_RELATIVE_PATH=${bindir} \
-                  -DLLDB_PYTHON_EXT_SUFFIX=${SOLIBSDEV} \
-"
-DEPENDS = "binutils zlib zstd libffi libxml2 libxml2-native ninja-native swig-native"
-DEPENDS:append:class-nativesdk = " clang-crosssdk-${SDK_ARCH} virtual/${TARGET_PREFIX}binutils nativesdk-python3"
-DEPENDS:append:class-target = " clang-cross-${TARGET_ARCH} python3 compiler-rt libcxx"
-RRECOMMENDS:${PN} = "binutils"
-RRECOMMENDS:${PN}:append:class-target = " libcxx-dev"
-# patch out build host paths for reproducibility
-do_compile:prepend:class-target() {
-    sed -i -e "s,${STAGING_DIR_NATIVE},,g" \
-        -e "s,${STAGING_DIR_TARGET},,g" \
-        -e "s,${S},,g"  \
-        -e "s,${B},,g" \
-        ${B}/tools/llvm-config/BuildVariables.inc
-}
-do_install:append() {
-    rm -rf ${D}${libdir}/python*/site-packages/six.py
-}
-do_install:append:class-target () {
-    # Allow bin path to change based on YOCTO_ALTERNATE_EXE_PATH
-    sed -i 's;${_IMPORT_PREFIX}/bin;${_IMPORT_PREFIX_BIN};g' ${D}${libdir}/cmake/llvm/LLVMExports-release.cmake
-    # Insert function to populate Import Variables
-    sed -i "4i\
-if(DEFINED ENV{YOCTO_ALTERNATE_EXE_PATH})\n\
-  execute_process(COMMAND \"llvm-config\" \"--bindir\" OUTPUT_VARIABLE _IMPORT_PREFIX_BIN OUTPUT_STRIP_TRAILING_WHITESPACE)\n\
-else()\n\
-  set(_IMPORT_PREFIX_BIN \"\${_IMPORT_PREFIX}/bin\")\n\
-endif()\n" ${D}${libdir}/cmake/llvm/LLVMExports-release.cmake
-    if [ -n "${LLVM_LIBDIR_SUFFIX}" ]; then
-        mkdir -p ${D}${nonarch_libdir}
-        mv ${D}${libdir}/clang ${D}${nonarch_libdir}/clang
-        ln -rs ${D}${nonarch_libdir}/clang ${D}${libdir}/clang
-        rmdir --ignore-fail-on-non-empty ${D}${libdir}
-    fi
-    for t in clang clang++ llvm-nm llvm-ar llvm-as llvm-ranlib llvm-strip llvm-objcopy llvm-objdump llvm-readelf \
-        llvm-addr2line llvm-dwp llvm-size llvm-strings llvm-cov; do
-        ln -sf $t ${D}${bindir}/${TARGET_PREFIX}$t
-    done
-    # reproducibility
-    sed -i -e 's,${B},,g' ${D}${libdir}/cmake/llvm/LLVMConfig.cmake
-}
-do_install:append:class-native () {
-    if ${@bb.utils.contains('PACKAGECONFIG', 'clangd', 'true', 'false', d)}; then
-        install -Dm 0755 ${B}${BINPATHPREFIX}/bin/clangd-indexer ${D}${bindir}/clangd-indexer
-    fi
-    install -Dm 0755 ${B}${BINPATHPREFIX}/bin/clang-pseudo-gen ${D}${bindir}/clang-pseudo-gen
-    install -Dm 0755 ${B}${BINPATHPREFIX}/bin/clang-tidy-confusable-chars-gen ${D}${bindir}/clang-tidy-confusable-chars-gen
-    install -Dm 0755 ${B}${BINPATHPREFIX}/bin/clang-tblgen ${D}${bindir}/clang-tblgen
-    install -Dm 0755 ${B}${BINPATHPREFIX}/bin/lldb-tblgen ${D}${bindir}/lldb-tblgen
-    install -Dm 0755 ${B}${BINPATHPREFIX}/bin/llvm-min-tblgen ${D}${bindir}/llvm-min-tblgen
-    for f in `find ${D}${bindir} -executable -type f -not -type l`; do
-        test -n "`file -b $f|grep -i ELF`" && ${STRIP} $f
-        echo "stripped $f"
-    done
-    ln -sf clang-tblgen ${D}${bindir}/clang-tblgen${PV}
-    ln -sf llvm-tblgen ${D}${bindir}/llvm-tblgen${PV}
-    ln -sf llvm-config ${D}${bindir}/llvm-config${PV}
-}
-do_install:append:class-nativesdk () {
-    sed -i -e "s|${B}/./bin/||g" ${D}${libdir}/cmake/llvm/LLVMConfig.cmake
-    if ${@bb.utils.contains('PACKAGECONFIG', 'clangd', 'true', 'false', d)}; then
-        install -Dm 0755 ${B}${BINPATHPREFIX}/bin/clangd-indexer ${D}${bindir}/clangd-indexer
-    fi
-    install -Dm 0755 ${B}${BINPATHPREFIX}/bin/clang-tblgen ${D}${bindir}/clang-tblgen
-    install -Dm 0755 ${B}${BINPATHPREFIX}/bin/clang-pseudo-gen ${D}${bindir}/clang-pseudo-gen
-    install -Dm 0755 ${B}${BINPATHPREFIX}/bin/clang-tidy-confusable-chars-gen ${D}${bindir}/clang-tidy-confusable-chars-gen
-    for f in `find ${D}${bindir} -executable -type f -not -type l`; do
-        test -n "`file -b $f|grep -i ELF`" && ${STRIP} $f
-    done
-    ln -sf clang-tblgen ${D}${bindir}/clang-tblgen${PV}
-    ln -sf llvm-tblgen ${D}${bindir}/llvm-tblgen${PV}
-    ln -sf llvm-config ${D}${bindir}/llvm-config${PV}
-    rm -rf ${D}${datadir}/llvm/cmake
-    rm -rf ${D}${datadir}/llvm
-}
-PACKAGES =+ "${PN}-libllvm ${PN}-lldb-python ${PN}-libclang-cpp ${PN}-tidy ${PN}-format ${PN}-tools \
-             libclang lldb lldb-server liblldb llvm-linker-tools"
-BBCLASSEXTEND = "native nativesdk"
-RDEPENDS:lldb += "${PN}-lldb-python lldb-server"
-RDEPENDS:${PN}-tools += "\
-  perl-module-digest-md5 \
-  perl-module-file-basename \
-  perl-module-file-copy \
-  perl-module-file-find \
-  perl-module-file-path \
-  perl-module-findbin \
-  perl-module-hash-util \
-  perl-module-sys-hostname \
-  perl-module-term-ansicolor \
-"
-RRECOMMENDS:${PN}-tidy += "${PN}-tools"
-FILES:llvm-linker-tools = "${libdir}/LLVMgold* ${libdir}/libLTO.so.* ${libdir}/LLVMPolly*"
-FILES:${PN}-libclang-cpp = "${libdir}/libclang-cpp.so.*"
-FILES:${PN}-lldb-python = "${libdir}/python*/site-packages/lldb/*"
-FILES:${PN}-tidy = "${bindir}/*clang-tidy*"
-FILES:${PN}-format = "${bindir}/*clang-format*"
-FILES:${PN}-tools = "${bindir}/analyze-build \
-  ${bindir}/c-index-test \
-  ${bindir}/clang-apply-replacements \
-  ${bindir}/clang-change-namespace \
-  ${bindir}/clang-check \
-  ${bindir}/clang-doc \
-  ${bindir}/clang-extdef-mapping \
-  ${bindir}/clang-include-fixer \
-  ${bindir}/clang-linker-wrapper \
-  ${bindir}/clang-move \
-  ${bindir}/clang-nvlink-wrapper \
-  ${bindir}/clang-offload-bundler \
-  ${bindir}/clang-offload-packager \
-  ${bindir}/clang-pseudo \
-  ${bindir}/clang-query \
-  ${bindir}/clang-refactor \
-  ${bindir}/clang-rename \
-  ${bindir}/clang-reorder-fields \
-  ${bindir}/clang-repl \
-  ${bindir}/clang-scan-deps \
-  ${bindir}/diagtool \
-  ${bindir}/find-all-symbols \
-  ${bindir}/hmaptool \
-  ${bindir}/hwasan_symbolize \
-  ${bindir}/intercept-build \
-  ${bindir}/modularize \
-  ${bindir}/pp-trace \
-  ${bindir}/sancov \
-  ${bindir}/scan-build \
-  ${bindir}/scan-build-py \
-  ${bindir}/scan-view \
-  ${bindir}/split-file \
-  ${libdir}/libscanbuild/* \
-  ${libdir}/libear/* \
-  ${libexecdir}/analyze-c++ \
-  ${libexecdir}/analyze-cc \
-  ${libexecdir}/c++-analyzer \
-  ${libexecdir}/ccc-analyzer \
-  ${libexecdir}/intercept-c++ \
-  ${libexecdir}/intercept-cc \
-  ${datadir}/scan-build/* \
-  ${datadir}/scan-view/* \
-  ${datadir}/opt-viewer/* \
-  ${datadir}/clang/* \
-"
-FILES:${PN} += "\
-  ${bindir}/clang-cl \
-  ${libdir}/BugpointPasses.so \
-  ${libdir}/LLVMHello.so \
-  ${libdir}/*Plugin.so \
-  ${libdir}/${BPN} \
-  ${nonarch_libdir}/${BPN}/*/include/ \
-"
-FILES:lldb = "\
-  ${bindir}/lldb \
-  ${bindir}/lldb-argdumper \
-  ${bindir}/lldb-instr \
-  ${bindir}/lldb-vscode \
-"
-FILES:lldb-server = "\
-  ${bindir}/lldb-server \
-"
-FILES:liblldb = "\
-  ${libdir}/liblldbIntelFeatures.so.* \
-  ${libdir}/liblldb.so.* \
-"
-FILES:${PN}-libllvm =+ "\
-  ${libdir}/libLLVM.so.${MAJOR_VER}.${MINOR_VER} \
-  ${libdir}/libLLVM-${MAJOR_VER}.so \
-  ${libdir}/libRemarks.so.* \
-"
-FILES:libclang = "\
-  ${libdir}/libclang.so.* \
-"
-FILES:${PN}-dev += "\
-  ${datadir}/llvm/cmake \
-  ${libdir}/cmake \
-  ${nonarch_libdir}/libear \
-  ${nonarch_libdir}/${BPN}/*.la \
-"
-FILES:${PN}-staticdev += "${nonarch_libdir}/${BPN}/*.a"
-FILES:${PN}-staticdev:remove = "${libdir}/${BPN}/*.a"
-FILES:${PN}-dev:remove = "${libdir}/${BPN}/*.la"
-FILES:${PN}:remove = "${libdir}/${BPN}/*"
-INSANE_SKIP:${PN} += "already-stripped"
-#INSANE_SKIP:${PN}-dev += "dev-elf"
-INSANE_SKIP:${PN}-lldb-python += "dev-so dev-deps"
-INSANE_SKIP:${MLPREFIX}liblldb = "dev-so"
-INSANE_SKIP:${PN}-libllvm = "dev-so"
-#Avoid SSTATE_SCAN_COMMAND running sed over llvm-config.
-SSTATE_SCAN_FILES:remove = "*-config"
-TOOLCHAIN = "clang"
-TOOLCHAIN:class-native = "gcc"
-TOOLCHAIN:class-nativesdk = "clang"
-COMPILER_RT:class-nativesdk:toolchain-clang:runtime-llvm = "-rtlib=libgcc --unwindlib=libgcc"
-LIBCPLUSPLUS:class-nativesdk:toolchain-clang:runtime-llvm = "-stdlib=libstdc++"
-SYSROOT_DIRS:append:class-target = " ${nonarch_libdir}"
-SYSROOT_PREPROCESS_FUNCS:append:class-target = " clang_sysroot_preprocess"
-clang_sysroot_preprocess() {
-        install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/
-        install -m 0755 ${S}/../llvm-config ${SYSROOT_DESTDIR}${bindir_crossscripts}/
-        ln -sf llvm-config ${SYSROOT_DESTDIR}${bindir_crossscripts}/llvm-config${PV}
-        # LLDTargets.cmake references the lld executable(!) that some modules/plugins link to
-        install -d ${SYSROOT_DESTDIR}${bindir}
-        binaries="lld diagtool clang-${MAJOR_VER} clang-format clang-offload-packager
-                        clang-offload-bundler clang-scan-deps clang-repl
-                        clang-rename clang-refactor clang-check clang-extdef-mapping clang-apply-replacements
-                        clang-reorder-fields clang-tidy clang-change-namespace clang-doc clang-include-fixer
-                        find-all-symbols clang-move clang-query pp-trace clang-pseudo modularize"
-        if ${@bb.utils.contains('PACKAGECONFIG', 'clangd', 'true', 'false', d)}; then
-                binaries="${binaries} clangd"
-        fi
-        for f in ${binaries}
-        do
-                install -m 755 ${D}${bindir}/$f ${SYSROOT_DESTDIR}${bindir}/
-        done
-}
diff --git a/recipes-devtools/clang/common-source.inc b/recipes-devtools/clang/common-source.inc
deleted file mode 100644
index cd95453..0000000
--- a/recipes-devtools/clang/common-source.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-do_fetch() {
-        :
-}
-do_fetch[noexec] = "1"
-deltask do_unpack
-deltask do_patch
-SRC_URI = ""
-do_configure[depends] += "llvm-project-source-${PV}:do_patch"
-do_populate_lic[depends] += "llvm-project-source-${PV}:do_unpack"
-do_create_spdx[depends] += "llvm-project-source-${PV}:do_patch"
-# spdx shared workdir detection fails as not WORKDIR is altered but S and B
-# return always true to fix that
-def is_work_shared_spdx(d):
-    return True
diff --git a/recipes-devtools/clang/common.inc b/recipes-devtools/clang/common.inc
deleted file mode 100644
index a8a9929..0000000
--- a/recipes-devtools/clang/common.inc
+++ /dev/null
@@ -1,57 +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"
-BASEURI ??= "${LLVM_GIT}/llvm-project.git;protocol=${LLVM_GIT_PROTOCOL};branch=${BRANCH}"
-SRC_URI = "\
-    ${BASEURI} \
-    file://llvm-config \
-    file://libunwind.pc.in \
-    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-libcxx-Add-compiler-runtime-library-to-link-step-for.patch \
-    file://0015-clang-llvm-cmake-Fix-configure-for-packages-using-fi.patch \
-    file://0016-clang-Fix-resource-dir-location-for-cross-toolchains.patch \
-    file://0017-clang-driver-Add-dyld-prefix-when-checking-sysroot-f.patch \
-    file://0018-clang-Use-python3-in-python-scripts.patch \
-    file://0019-For-x86_64-set-Yocto-based-GCC-install-search-path.patch \
-    file://0020-llvm-Do-not-use-find_library-for-ncurses.patch \
-    file://0021-llvm-Insert-anchor-for-adding-OE-distro-vendor-names.patch \
-    file://0022-compiler-rt-Do-not-use-backtrace-APIs-on-non-glibc-l.patch \
-    file://0023-clang-Fix-x86-triple-for-non-debian-multiarch-linux-.patch \
-    file://0024-libunwind-Added-unw_backtrace-method.patch \
-    file://0025-clang-Do-not-use-install-relative-libc-headers.patch \
-    file://0027-Fix-lib-paths-for-OpenEmbedded-Host.patch \
-    file://0028-Correct-library-search-path-for-OpenEmbedded-Host.patch \
-    file://0029-lldb-Link-with-libatomic-on-x86.patch \
-    file://0030-compiler-rt-Enable-__int128-for-ppc32.patch \
-    file://0031-llvm-Do-not-use-cmake-infra-to-detect-libzstd.patch \
-    file://0032-compiler-rt-Fix-stat-struct-s-size-for-O32-ABI.patch \
-    file://0033-compiler-rt-Undef-_TIME_BITS-along-with-_FILE_OFFSET.patch \
-    file://0034-ToolChains-Gnu.cpp-ARMLibDirs-search-also-in-lib32.patch \
-    file://0035-compiler-rt-Fix-cmake-check-for-_Float16-and-__bf16.patch \
-    "
-# Fallback to no-PIE if not set
-GCCPIE ??= ""
-S = "${TMPDIR}/work-shared/llvm-project-source-${PV}-${PR}/git"
-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"
diff --git a/recipes-devtools/clang/compiler-rt-sanitizers_git.bb b/recipes-devtools/clang/compiler-rt-sanitizers_git.bb
deleted file mode 100644
index 06c0e06..0000000
--- a/recipes-devtools/clang/compiler-rt-sanitizers_git.bb
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright (C) 2021 Khem Raj <raj.khem@gmail.com>
-# Released under the MIT license (see COPYING.MIT for the terms)
-DESCRIPTION = "LLVM based C/C++ compiler Runtime"
-HOMEPAGE = "http://compiler-rt.llvm.org/"
-SECTION = "base"
-require clang.inc
-require common-source.inc
-inherit cmake pkgconfig python3native
-LIC_FILES_CHKSUM = "file://compiler-rt/LICENSE.TXT;md5=d846d1d65baf322d4c485d6ee54e877a"
-TUNE_CCARGS:remove = "-no-integrated-as"
-DEPENDS += "ninja-native virtual/crypt compiler-rt"
-DEPENDS:append:class-native = " clang-native libxcrypt-native"
-DEPENDS:append:class-nativesdk = " clang-native clang-crosssdk-${SDK_ARCH} nativesdk-libxcrypt"
-PACKAGECONFIG ??= ""
-PACKAGECONFIG[crt] = "-DCOMPILER_RT_BUILD_CRT:BOOL=ON,-DCOMPILER_RT_BUILD_CRT:BOOL=OFF"
-PACKAGECONFIG[static-libcxx] = "-DSANITIZER_USE_STATIC_CXX_ABI=ON -DSANITIZER_USE_STATIC_LLVM_UNWINDER=ON -DCOMPILER_RT_ENABLE_STATIC_UNWINDER=ON,,"
-HF = ""
-HF:class-target = "${@ bb.utils.contains('TUNE_CCARGS_MFLOAT', 'hard', 'hf', '', d)}"
-HF[vardepvalue] = "${HF}"
-CXXFLAGS:append:libc-musl = " -D_LARGEFILE64_SOURCE"
-OECMAKE_TARGET_COMPILE = "compiler-rt"
-OECMAKE_TARGET_INSTALL = "install-compiler-rt install-compiler-rt-headers"
-OECMAKE_SOURCEPATH = "${S}/llvm"
-EXTRA_OECMAKE += "-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-                  -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF \
-                  -DCOMPILER_RT_STANDALONE_BUILD=OFF \
-                  -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON \
-                  -DCOMPILER_RT_USE_BUILTINS_LIBRARY=ON \
-                  -DCMAKE_C_COMPILER_TARGET=${HOST_ARCH}${HOST_VENDOR}-${HOST_OS}${HF} \
-                  -DCOMPILER_RT_BUILD_BUILTINS=OFF \
-                  -DCOMPILER_RT_INCLUDE_TESTS=OFF \
-                  -DSANITIZER_CXX_ABI_LIBNAME=${@bb.utils.contains("TC_CXX_RUNTIME", "llvm", "libc++", "libstdc++", d)} \
-                  -DCOMPILER_RT_BUILD_XRAY=ON \
-                  -DCOMPILER_RT_BUILD_SANITIZERS=ON \
-                  -DCOMPILER_RT_BUILD_LIBFUZZER=ON \
-                  -DCOMPILER_RT_BUILD_PROFILE=ON \
-                  -DCOMPILER_RT_BUILD_MEMPROF=ON \
-                  -DLLVM_ENABLE_PROJECTS='compiler-rt' \
-                  -DCMAKE_RANLIB=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-ranlib \
-                  -DCMAKE_AR=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-ar \
-                  -DCMAKE_NM=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-nm \
-                  -DLLVM_LIBDIR_SUFFIX=${LLVM_LIBDIR_SUFFIX} \
-"
-EXTRA_OECMAKE:append:class-nativesdk = "\
-               -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen \
-               -DCLANG_TABLEGEN=${STAGING_BINDIR_NATIVE}/clang-tblgen \
-"
-EXTRA_OECMAKE:append:class-target = "\
-               -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
-"
-EXTRA_OECMAKE:append:libc-musl = " -DLIBCXX_HAS_MUSL_LIBC=ON "
-EXTRA_OECMAKE:append:powerpc = " -DCOMPILER_RT_DEFAULT_TARGET_ARCH=powerpc "
-do_install:append () {
-    if [ -n "${LLVM_LIBDIR_SUFFIX}" ]; then
-        mkdir -p ${D}${nonarch_libdir}/clang
-        mv ${D}${libdir}/clang/${MAJOR_VER} ${D}${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}
-        rmdir --ignore-fail-on-non-empty ${D}${libdir}
-    else
-        mv ${D}${libdir}/clang/${MAJOR_VER} ${D}${libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}
-    fi
-    # Already shipped with compile-rt Orc support
-    rm -rf ${D}${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib/linux/liborc_rt-*.a
-    rm -rf ${D}${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/include/orc/
-}
-FILES_SOLIBSDEV = ""
-FILES:${PN} += "${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib/linux/lib*${SOLIBSDEV} \
-                ${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/*.txt \
-                ${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/share/*.txt"
-FILES:${PN}-staticdev += "${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib/linux/*.a"
-FILES:${PN}-dev += "${datadir} ${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib/linux/*.syms \
-                    ${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/include \
-                    ${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib/linux/clang_rt.crt*.o \
-                    ${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib/linux/libclang_rt.asan-preinit*.a"
-INSANE_SKIP:${PN} = "dev-so libdir"
-INSANE_SKIP:${PN}-dbg = "libdir"
-#PROVIDES:append:class-target = "\
-#        virtual/${TARGET_PREFIX}compilerlibs \
-#        libgcc \
-#        libgcc-initial \
-#        libgcc-dev \
-#        libgcc-initial-dev \
-#        "
-#
-RDEPENDS:${PN}-dev += "${PN}-staticdev"
-BBCLASSEXTEND = "native nativesdk"
-ALLOW_EMPTY:${PN} = "1"
-ALLOW_EMPTY:${PN}-dev = "1"
-TOOLCHAIN:forcevariable = "clang"
-SYSROOT_DIRS:append:class-target = " ${nonarch_libdir}"
-# riscv and x86_64 Sanitizers work on musl too
-COMPATIBLE_HOST:libc-musl:x86-64 = "(.*)"
-COMPATIBLE_HOST:libc-musl:riscv64 = "(.*)"
-COMPATIBLE_HOST:libc-musl:riscv32 = "(.*)"
-COMPATIBLE_HOST:libc-musl = "null"
diff --git a/recipes-devtools/clang/compiler-rt_git.bb b/recipes-devtools/clang/compiler-rt_git.bb
deleted file mode 100644
index dad6fbd..0000000
--- a/recipes-devtools/clang/compiler-rt_git.bb
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright (C) 2015 Khem Raj <raj.khem@gmail.com>
-# Released under the MIT license (see COPYING.MIT for the terms)
-DESCRIPTION = "LLVM based C/C++ compiler Runtime"
-HOMEPAGE = "http://compiler-rt.llvm.org/"
-SECTION = "base"
-require clang.inc
-require common-source.inc
-inherit cmake cmake-native pkgconfig python3native
-LIC_FILES_CHKSUM = "file://compiler-rt/LICENSE.TXT;md5=d846d1d65baf322d4c485d6ee54e877a"
-LIBCPLUSPLUS = ""
-COMPILER_RT = ""
-TUNE_CCARGS:remove = "-no-integrated-as"
-INHIBIT_DEFAULT_DEPS = "1"
-DEPENDS += "ninja-native libgcc"
-DEPENDS:append:class-target = " clang-cross-${TARGET_ARCH} virtual/${MLPREFIX}libc gcc-runtime"
-DEPENDS:append:class-nativesdk = " clang-native clang-crosssdk-${SDK_ARCH} nativesdk-gcc-runtime"
-DEPENDS:append:class-native = " clang-native"
-# Trick clang.bbclass into not creating circular dependencies
-UNWINDLIB:class-nativesdk = "--unwindlib=libgcc"
-COMPILER_RT:class-nativesdk:toolchain-clang:runtime-llvm = "-rtlib=libgcc --unwindlib=libgcc"
-LIBCPLUSPLUS:class-nativesdk:toolchain-clang:runtime-llvm = "-stdlib=libstdc++"
-CXXFLAGS += "-stdlib=libstdc++"
-LDFLAGS += "-unwindlib=libgcc -rtlib=libgcc -stdlib=libstdc++"
-BUILD_CXXFLAGS += "-stdlib=libstdc++"
-BUILD_LDFLAGS += "-unwindlib=libgcc -rtlib=libgcc -stdlib=libstdc++"
-BUILD_CPPFLAGS:remove = "-stdlib=libc++"
-BUILD_LDFLAGS:remove = "-stdlib=libc++ -lc++abi"
-BUILD_CC:toolchain-clang  = "${CCACHE}clang"
-BUILD_CXX:toolchain-clang = "${CCACHE}clang++"
-BUILD_CPP:toolchain-clang = "${CCACHE}clang -E"
-BUILD_CCLD:toolchain-clang = "${CCACHE}clang"
-BUILD_RANLIB:toolchain-clang = "llvm-ranlib"
-BUILD_AR:toolchain-clang = "llvm-ar"
-BUILD_NM:toolchain-clang = "llvm-nm"
-PACKAGECONFIG ??= ""
-PACKAGECONFIG[crt] = "-DCOMPILER_RT_BUILD_CRT:BOOL=ON,-DCOMPILER_RT_BUILD_CRT:BOOL=OFF"
-PACKAGECONFIG[profile] ="-DCOMPILER_RT_BUILD_PROFILE=ON,-DCOMPILER_RT_BUILD_PROFILE=OFF"
-HF = ""
-HF:class-target = "${@ bb.utils.contains('TUNE_CCARGS_MFLOAT', 'hard', 'hf', '', d)}"
-HF[vardepvalue] = "${HF}"
-OECMAKE_TARGET_COMPILE = "compiler-rt"
-OECMAKE_TARGET_INSTALL = "install-compiler-rt install-compiler-rt-headers"
-OECMAKE_SOURCEPATH = "${S}/llvm"
-EXTRA_OECMAKE += "-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-                  -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF \
-                  -DCOMPILER_RT_STANDALONE_BUILD=OFF \
-                  -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON \
-                  -DCOMPILER_RT_INCLUDE_TESTS=OFF \
-                  -DCMAKE_C_COMPILER_TARGET=${HOST_ARCH}${HOST_VENDOR}-${HOST_OS}${HF} \
-                  -DCOMPILER_RT_BUILD_XRAY=OFF \
-                  -DCOMPILER_RT_BUILD_SANITIZERS=OFF \
-                  -DCOMPILER_RT_BUILD_MEMPROF=OFF \
-                  -DCOMPILER_RT_BUILD_LIBFUZZER=OFF \
-                  -DLLVM_ENABLE_PROJECTS='compiler-rt' \
-                  -DLLVM_LIBDIR_SUFFIX=${LLVM_LIBDIR_SUFFIX} \
-"
-EXTRA_OECMAKE:append:class-target = "\
-               -DCMAKE_RANLIB=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-ranlib \
-               -DCMAKE_AR=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-ar \
-               -DCMAKE_NM=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-nm \
-               -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
-"
-EXTRA_OECMAKE:append:class-nativesdk = "\
-               -DCMAKE_RANLIB=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-ranlib \
-               -DCMAKE_AR=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-ar \
-               -DCMAKE_NM=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-nm \
-               -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen \
-               -DCLANG_TABLEGEN=${STAGING_BINDIR_NATIVE}/clang-tblgen \
-"
-EXTRA_OECMAKE:append:powerpc = " -DCOMPILER_RT_DEFAULT_TARGET_ARCH=powerpc "
-do_install:append () {
-    if [ -n "${LLVM_LIBDIR_SUFFIX}" ]; then
-        mkdir -p ${D}${nonarch_libdir}/clang
-        mv ${D}${libdir}/clang/${MAJOR_VER} ${D}${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}
-        rmdir --ignore-fail-on-non-empty ${D}${libdir}/clang ${D}${libdir}
-    else
-        mv ${D}${libdir}/clang/${MAJOR_VER} ${D}${libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}
-    fi
-}
-FILES_SOLIBSDEV = ""
-FILES:${PN} += "${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib/linux/lib*${SOLIBSDEV} \
-                ${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/*.txt \
-                ${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/share/*.txt"
-FILES:${PN}-staticdev += "${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib/linux/*.a"
-FILES:${PN}-dev += "${datadir} ${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib/linux/*.syms \
-                    ${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/include \
-                    ${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib/linux/clang_rt.crt*.o \
-                    ${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib/linux/libclang_rt.asan-preinit*.a"
-INSANE_SKIP:${PN} = "dev-so libdir"
-INSANE_SKIP:${PN}-dbg = "libdir"
-#PROVIDES:append:class-target = "\
-#        virtual/${TARGET_PREFIX}compilerlibs \
-#        libgcc \
-#        libgcc-initial \
-#        libgcc-dev \
-#        libgcc-initial-dev \
-#        "
-#
-RDEPENDS:${PN}-dev += "${PN}-staticdev"
-BBCLASSEXTEND = "native nativesdk"
-ALLOW_EMPTY:${PN} = "1"
-ALLOW_EMPTY:${PN}-dev = "1"
-TOOLCHAIN:forcevariable = "clang"
-SYSROOT_DIRS:append:class-target = " ${nonarch_libdir}"
diff --git a/recipes-devtools/clang/libclc_git.bb b/recipes-devtools/clang/libclc_git.bb
deleted file mode 100644
index 2c4ed0a..0000000
--- a/recipes-devtools/clang/libclc_git.bb
+++ /dev/null
@@ -1,48 +0,0 @@
-DESCRIPTION = "LLVM based OpenCL runtime support library"
-HOMEPAGE = "http://libclc.llvm.org/"
-SECTION = "libs"
-require clang.inc
-require common-source.inc
-TOOLCHAIN = "clang"
-LIC_FILES_CHKSUM = "file://libclc/LICENSE.TXT;md5=7cc795f6cbb2d801d84336b83c8017db"
-inherit cmake pkgconfig python3native qemu
-DEPENDS += "qemu-native clang spirv-tools spirv-llvm-translator spirv-llvm-translator-native ncurses"
-OECMAKE_SOURCEPATH = "${S}/libclc"
-EXTRA_OECMAKE += " \
-                                -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-                                -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF \
-                                -DCMAKE_CROSSCOMPILING_EMULATOR=${WORKDIR}/qemuwrapper \
-                                -DLLVM_CLANG=${STAGING_BINDIR_NATIVE}/clang \
-                                -DLLVM_AS=${STAGING_BINDIR_NATIVE}/llvm-as \
-                                -DLLVM_LINK=${STAGING_BINDIR_NATIVE}/llvm-link \
-                                -DLLVM_OPT=${STAGING_BINDIR_NATIVE}/opt \
-                                -DLLVM_SPIRV=${STAGING_BINDIR_NATIVE}/llvm-spirv \
-                                -Dclc_comp_in:FILEPATH=${OECMAKE_SOURCEPATH}/cmake/CMakeCLCCompiler.cmake.in \
-                                -Dll_comp_in:FILEPATH=${OECMAKE_SOURCEPATH}/cmake/CMakeLLAsmCompiler.cmake.in \
-                                -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
-                        "
-do_configure:prepend () {
-        # Write out a qemu wrapper that will be used by cmake
-        # so that it can run target helper binaries through that.
-        qemu_binary="${@qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST'), [d.expand('${STAGING_DIR_HOST}${libdir}'),d.expand('${STAGING_DIR_HOST}${base_libdir}')])}"
-        cat > ${WORKDIR}/qemuwrapper << EOF
-#!/bin/sh
-$qemu_binary "\$@"
-EOF
-        chmod +x ${WORKDIR}/qemuwrapper
-}
-FILES:${PN} += "${datadir}/clc"
-BBCLASSEXTEND = "native nativesdk"
-export YOCTO_ALTERNATE_EXE_PATH
-export YOCTO_ALTERNATE_LIBDIR
diff --git a/recipes-devtools/clang/libcxx_git.bb b/recipes-devtools/clang/libcxx_git.bb
deleted file mode 100644
index 9d4f033..0000000
--- a/recipes-devtools/clang/libcxx_git.bb
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright (C) 2015 Khem Raj <raj.khem@gmail.com>
-# Released under the MIT license (see COPYING.MIT for the terms)
-DESCRIPTION = "libc++ is a new implementation of the C++ standard library, targeting C++11"
-HOMEPAGE = "http://libcxx.llvm.org/"
-SECTION = "base"
-require clang.inc
-require common-source.inc
-inherit cmake cmake-native python3native
-PACKAGECONFIG ??= "compiler-rt exceptions ${@bb.utils.contains("TC_CXX_RUNTIME", "llvm", "unwind unwind-shared", "", d)}"
-PACKAGECONFIG:append:armv5 = " no-atomics"
-PACKAGECONFIG:remove:class-native = "compiler-rt"
-PACKAGECONFIG[unwind] = "-DLIBCXXABI_USE_LLVM_UNWINDER=ON -DLIBCXXABI_ENABLE_STATIC_UNWINDER=ON,-DLIBCXXABI_USE_LLVM_UNWINDER=OFF,,"
-PACKAGECONFIG[exceptions] = "-DLIBCXXABI_ENABLE_EXCEPTIONS=ON -DDLIBCXX_ENABLE_EXCEPTIONS=ON,-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF -DLIBCXX_ENABLE_EXCEPTIONS=OFF -DCMAKE_REQUIRED_FLAGS='-fno-exceptions',"
-PACKAGECONFIG[no-atomics] = "-D_LIBCXXABI_HAS_ATOMIC_BUILTINS=OFF -DCMAKE_SHARED_LINKER_FLAGS='-latomic',,"
-PACKAGECONFIG[compiler-rt] = "-DLIBCXX_USE_COMPILER_RT=ON -DLIBCXXABI_USE_COMPILER_RT=ON -DLIBUNWIND_USE_COMPILER_RT=ON,,compiler-rt"
-PACKAGECONFIG[unwind-shared] = "-DLIBUNWIND_ENABLE_SHARED=ON,-DLIBUNWIND_ENABLE_SHARED=OFF,,"
-DEPENDS += "ninja-native"
-DEPENDS:append:class-target = " clang-cross-${TARGET_ARCH} virtual/${MLPREFIX}libc virtual/${TARGET_PREFIX}compilerlibs"
-DEPENDS:append:class-nativesdk = " clang-crosssdk-${SDK_ARCH} nativesdk-compiler-rt"
-DEPENDS:append:class-native = " clang-native"
-LIBCPLUSPLUS = ""
-COMPILER_RT ?= "-rtlib=compiler-rt"
-# Trick clang.bbclass into not creating circular dependencies
-UNWINDLIB:class-nativesdk = "--unwindlib=libgcc"
-COMPILER_RT:class-nativesdk = "-rtlib=libgcc --unwindlib=libgcc"
-LIBCPLUSPLUS:class-nativesdk = "-stdlib=libstdc++"
-CC:append:toolchain-clang:class-native = " -unwindlib=libgcc -rtlib=libgcc"
-CC:append:toolchain-clang:class-nativesdk = " -unwindlib=libgcc -rtlib=libgcc"
-CXXFLAGS += "-stdlib=libstdc++"
-LDFLAGS += "-unwindlib=libgcc -stdlib=libstdc++"
-BUILD_CXXFLAGS += "-stdlib=libstdc++"
-BUILD_LDFLAGS += "-unwindlib=libgcc -rtlib=libgcc -stdlib=libstdc++"
-BUILD_CPPFLAGS:remove = "-stdlib=libc++"
-BUILD_LDFLAGS:remove = "-stdlib=libc++ -lc++abi"
-INHIBIT_DEFAULT_DEPS = "1"
-LIC_FILES_CHKSUM = "file://libcxx/LICENSE.TXT;md5=55d89dd7eec8d3b4204b680e27da3953 \
-                    file://libcxxabi/LICENSE.TXT;md5=7b9334635b542c56868400a46b272b1e \
-                    file://libunwind/LICENSE.TXT;md5=f66970035d12f196030658b11725e1a1 \
-"
-OECMAKE_TARGET_COMPILE = "cxxabi cxx"
-OECMAKE_TARGET_INSTALL = "install-cxx install-cxxabi ${@bb.utils.contains("TC_CXX_RUNTIME", "llvm", "install-unwind", "", d)}"
-OECMAKE_SOURCEPATH = "${S}/llvm"
-EXTRA_OECMAKE += "\
-                  -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-                  -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF \
-                  -DCMAKE_CROSSCOMPILING=ON \
-                  -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON \
-                  -DLLVM_ENABLE_RTTI=ON \
-                  -DLIBUNWIND_ENABLE_CROSS_UNWINDING=ON \
-                  -DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=ON \
-                  -DLIBCXXABI_INCLUDE_TESTS=OFF \
-                  -DLIBCXXABI_ENABLE_SHARED=ON \
-                  -DLIBCXXABI_LIBCXX_INCLUDES=${S}/libcxx/include \
-                  -DLIBCXX_CXX_ABI=libcxxabi \
-                  -DLIBCXX_CXX_ABI_INCLUDE_PATHS=${S}/libcxxabi/include \
-                  -DLIBCXX_CXX_ABI_LIBRARY_PATH=${B}/lib${LLVM_LIBDIR_SUFFIX} \
-                  -S ${S}/runtimes \
-                  -DLLVM_ENABLE_RUNTIMES='libcxx;libcxxabi;libunwind' \
-                  -DLLVM_RUNTIME_TARGETS=${HOST_SYS} \
-                  -DLLVM_LIBDIR_SUFFIX=${LLVM_LIBDIR_SUFFIX} \
-                  -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \
-"
-EXTRA_OECMAKE:append:class-target = " \
-                  -DCMAKE_AR=${STAGING_BINDIR_TOOLCHAIN}/${AR} \
-                  -DCMAKE_NM=${STAGING_BINDIR_TOOLCHAIN}/${NM} \
-                  -DCMAKE_RANLIB=${STAGING_BINDIR_TOOLCHAIN}/${RANLIB} \
-                  -DLLVM_DEFAULT_TARGET_TRIPLE=${HOST_SYS} \
-                  -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
-"
-EXTRA_OECMAKE:append:class-nativesdk = " \
-                  -DCMAKE_AR=${STAGING_BINDIR_TOOLCHAIN}/${AR} \
-                  -DCMAKE_NM=${STAGING_BINDIR_TOOLCHAIN}/${NM} \
-                  -DCMAKE_RANLIB=${STAGING_BINDIR_TOOLCHAIN}/${RANLIB} \
-                  -DLLVM_DEFAULT_TARGET_TRIPLE=${HOST_SYS} \
-"
-EXTRA_OECMAKE:append:libc-musl = " -DLIBCXX_HAS_MUSL_LIBC=ON "
-CXXFLAGS:append:armv5 = " -mfpu=vfp2"
-ALLOW_EMPTY:${PN} = "1"
-PROVIDES:append:runtime-llvm = " libunwind"
-do_install:append() {
-    if ${@bb.utils.contains("TC_CXX_RUNTIME", "llvm", "true", "false", d)}
-    then
-        for f in libunwind.h __libunwind_config.h unwind.h unwind_itanium.h unwind_arm_ehabi.h
-        do
-            install -Dm 0644 ${S}/libunwind/include/$f ${D}${includedir}/$f
-        done
-        install -d ${D}${libdir}/pkgconfig
-        sed -e 's,@LIBDIR@,${libdir},g;s,@VERSION@,${PV},g' ${S}/../libunwind.pc.in > ${D}${libdir}/pkgconfig/libunwind.pc
-    fi
-}
-PACKAGES:append:runtime-llvm = " libunwind"
-FILES:libunwind:runtime-llvm = "${libdir}/libunwind.so.*"
-BBCLASSEXTEND = "native nativesdk"
-TOOLCHAIN:forcevariable = "clang"
diff --git a/recipes-devtools/clang/llvm-project-source.bb b/recipes-devtools/clang/llvm-project-source.bb
deleted file mode 100644
index 78664c5..0000000
--- a/recipes-devtools/clang/llvm-project-source.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright (C) 2018 Khem Raj <raj.khem@gmail.com>
-# Released under the MIT license (see COPYING.MIT for the terms)
-SUMMARY = "This is the canonical git mirror of the LLVM subversion repository."
-HOMEPAGE = "https://github.com/llvm/llvm-project"
-require llvm-project-source.inc
-require clang.inc
-EXCLUDE_FROM_WORLD = "1"
diff --git a/recipes-devtools/clang/llvm-project-source.inc b/recipes-devtools/clang/llvm-project-source.inc
deleted file mode 100644
index 103373a..0000000
--- a/recipes-devtools/clang/llvm-project-source.inc
+++ /dev/null
@@ -1,96 +0,0 @@
-deltask do_configure
-deltask do_compile
-deltask do_install
-deltask do_populate_sysroot
-deltask do_populate_lic
-RM_WORK_EXCLUDE += "${PN}"
-inherit nopackages
-PN = "llvm-project-source-${PV}"
-WORKDIR = "${TMPDIR}/work-shared/llvm-project-source-${PV}-${PR}"
-SSTATE_SWSPEC = "sstate:llvm-project-source::${PV}:${PR}::${SSTATE_VERSION}:"
-STAMP = "${STAMPS_DIR}/work-shared/llvm-project-source-${PV}-${PR}"
-STAMPCLEAN = "${STAMPS_DIR}/work-shared/llvm-project-source-${PV}-*"
-INHIBIT_DEFAULT_DEPS = "1"
-DEPENDS = ""
-PACKAGES = ""
-TARGET_ARCH = "allarch"
-TARGET_AS_ARCH = "none"
-TARGET_CC_ARCH = "none"
-TARGET_LD_ARCH = "none"
-TARGET_OS = "linux"
-baselib = "lib"
-PACKAGE_ARCH = "all"
-# space separated list of additional distro vendor values we want to support e.g.
-# "yoe webos" or "-yoe -webos" '-' is optional
-CLANG_EXTRA_OE_VENDORS ?= "${TARGET_VENDOR} ${SDK_VENDOR}"
-# Extra OE DISTRO that want to support as build host. space separated list of additional distro.
-# ":" separated the ID in "/etc/os-release" and the triple for finding gcc on this OE DISTRO.
-# eg: "poky:poky wrlinux:wrs"
-CLANG_EXTRA_OE_DISTRO ?= "poky:poky"
-# Match with MULTILIB_GLOBAL_VARIANTS
-MULTILIB_VARIANTS = "lib32 lib64 libx32"
-python add_distro_vendor() {
-    import subprocess
-    case = ""
-    triple = ""
-    vendors = d.getVar('CLANG_EXTRA_OE_VENDORS')
-    multilib_variants = (d.getVar("MULTILIB_VARIANTS") or "").split()
-    vendors_to_add = []
-    for vendor in vendors.split():
-        # convert -yoe into yoe
-        vendor = vendor.lstrip('-')
-        # generate possible multilib vendor names for yoe
-        # such as yoemllib32
-        vendors_to_add.extend([vendor + 'ml' + variant for variant in multilib_variants])
-        # skip oe since already part of the cpp file
-        if vendor != "oe":
-            vendors_to_add.append(vendor)
-    for vendor_to_add in vendors_to_add:
-        case += '\\n    .Case("' + vendor_to_add + '", Triple::OpenEmbedded)'
-        triple += ' "x86_64-' + vendor_to_add + '-linux",'
-    bb.note("Adding support following TARGET_VENDOR values")
-    bb.note(str(vendors_to_add))
-    bb.note("in llvm/lib/TargetParser/Triple.cpp and ${S}/clang/lib/Driver/ToolChains/Gnu.cpp")
-    cmd = d.expand("sed -i 's#//CLANG_EXTRA_OE_VENDORS_TRIPLES#%s#g' ${S}/clang/lib/Driver/ToolChains/Gnu.cpp" % (triple))
-    subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True)
-    cmd = d.expand("sed -i 's#//CLANG_EXTRA_OE_VENDORS_CASES#%s#g' -i ${S}/llvm/lib/TargetParser/Triple.cpp" % (case))
-    subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True)
-    case = ""
-    triple = ""
-    name = ""
-    check = ""
-    oe_names = ""
-    distros = d.getVar('CLANG_EXTRA_OE_DISTRO')
-    for distro in distros.split():
-        distro_id = distro.split(":")[0].replace('-','_')
-        distro_triple = distro.split(":")[1]
-        case += '\\n    .Case("' + distro_id + '", Distro::' + distro_id.upper() + ')'
-        triple += '\\n   if (Distro.Is' + distro_id.upper() + '())\\n     return "x86_64-' + distro_triple + '-linux",'
-        name += '\\n    '+ distro_id.upper() + ','
-        check += '\\nbool Is' + distro_id.upper() + '() const { return DistroVal == ' + distro_id.upper() + '; }'
-        oe_names +=  distro_id.upper() + ' ||'
-    check += '\\nbool IsOpenEmbedded() const { return DistroVal == ' + oe_names[0:-3] + '; }'
-    cmd = d.expand("sed -i 's#//CLANG_EXTRA_OE_DISTRO_NAME#%s#g' ${S}/clang/include/clang/Driver/Distro.h" % (name))
-    subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True)
-    cmd = d.expand("sed -i 's#//CLANG_EXTRA_OE_DISTRO_CHECK#%s#g' ${S}/clang/include/clang/Driver/Distro.h" % (check))
-    subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True)
-    cmd = d.expand("sed -i 's#//CLANG_EXTRA_OE_DISTRO_TRIPLES#%s#g' ${S}/clang/lib/Driver/ToolChains/Linux.cpp" % (triple))
-    subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True)
-    cmd = d.expand("sed -i 's#//CLANG_EXTRA_OE_DISTRO_CASES#%s#g' -i ${S}/clang/lib/Driver/Distro.cpp" % (case))
-    subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True)
-}
-do_patch[vardepsexclude] = "MULTILIBS"
-do_patch[postfuncs] += "add_distro_vendor"
-do_create_spdx[depends] += "${PN}:do_patch"
diff --git a/recipes-devtools/clang/nativesdk-clang-glue.bb b/recipes-devtools/clang/nativesdk-clang-glue.bb
deleted file mode 100644
index 4e0c6fa..0000000
--- a/recipes-devtools/clang/nativesdk-clang-glue.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright (C) 2014 Khem Raj <raj.khem@gmail.com>
-# Released under the MIT license (see COPYING.MIT for the terms)
-DESCRIPTION = "SDK Cross compiler wrappers for LLVM based C/C++ compiler"
-HOMEPAGE = "http://clang.llvm.org/"
-LICENSE = "Apache-2.0-with-LLVM-exception"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0-with-LLVM-exception;md5=0bcd48c3bdfef0c9d9fd17726e4b7dab"
-SECTION = "devel"
-inherit nativesdk
-DEPENDS += "nativesdk-clang"
-do_install() {
-    install -d ${D}${prefix_nativesdk}
-    cd ${D}${prefix_nativesdk}
-    ln -s ..${libdir} .
-    ln -s ..${includedir} .
-    cd ..
-    ln -s .${base_libdir} .
-}
-sysroot_stage_all () {
-        sysroot_stage_dir ${D} ${SYSROOT_DESTDIR}
-}
-FILES:${PN} += "${prefix_nativesdk} ${base_libdir_nativesdk}"
-FILES:${PN}-dbg = ""
-deltask do_configure
-deltask do_compile
-deltask do_patch
-deltask do_fetch
-deltask do_unpack
-deltask do_create_spdx
-deltask do_create_runtime_spdx
diff --git a/recipes-devtools/clang/openmp_git.bb b/recipes-devtools/clang/openmp_git.bb
deleted file mode 100644
index 865dbe6..0000000
--- a/recipes-devtools/clang/openmp_git.bb
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright (C) 2017 Khem Raj <raj.khem@gmail.com>
-# Released under the MIT license (see COPYING.MIT for the terms)
-DESCRIPTION = "LLVM based C/C++ compiler Runtime"
-HOMEPAGE = "https://openmp.llvm.org/"
-SECTION = "libs"
-require clang.inc
-require common-source.inc
-TOOLCHAIN = "clang"
-LIC_FILES_CHKSUM = "file://openmp/LICENSE.TXT;md5=d75288d1ce0450b28b8d58a284c09c79"
-inherit cmake pkgconfig perlnative python3native python3targetconfig
-DEPENDS += "elfutils libffi clang"
-EXTRA_OECMAKE += "-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-                  -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF \
-                  -DOPENMP_LIBDIR_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \
-                  -DOPENMP_STANDALONE_BUILD=ON \
-                  -DCLANG_TOOL=${STAGING_BINDIR_NATIVE}/clang \
-                  -DLINK_TOOL=${STAGING_BINDIR_NATIVE}/llvm-link \
-                  -DOPT_TOOL=${STAGING_BINDIR_NATIVE}/opt \
-                  -DOPENMP_LLVM_LIT_EXECUTABLE=${STAGING_BINDIR_NATIVE}/llvm-lit \
-                  -DEXTRACT_TOOL=${STAGING_BINDIR_NATIVE}/llvm-extract \
-                  -DPACKAGER_TOOL=${STAGING_BINDIR_NATIVE}/clang-offload-packager \
-                  -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
-                  "
-OECMAKE_SOURCEPATH = "${S}/openmp"
-PACKAGECONFIG ?= "ompt-tools offloading-plugin"
-PACKAGECONFIG:remove:arm = "ompt-tools offloading-plugin"
-PACKAGECONFIG:remove:powerpc = "ompt-tools offloading-plugin"
-PACKAGECONFIG:append:mipsarcho32 = " no-atomics"
-PACKAGECONFIG[ompt-tools] = "-DOPENMP_ENABLE_OMPT_TOOLS=ON,-DOPENMP_ENABLE_OMPT_TOOLS=OFF,"
-PACKAGECONFIG[aliases] = "-DLIBOMP_INSTALL_ALIASES=ON,-DLIBOMP_INSTALL_ALIASES=OFF,"
-PACKAGECONFIG[offloading-plugin] = ",,elfutils libffi,libelf libffi"
-PACKAGECONFIG[no-atomics] = "-DLIBOMP_HAVE_BUILTIN_ATOMIC=OFF -DLIBOMP_LIBFLAGS='-latomic',,"
-PACKAGES += "${PN}-libomptarget ${PN}-gdb-plugin"
-FILES_SOLIBSDEV = ""
-FILES:${PN} += "${libdir}/lib*${SOLIBSDEV}"
-FILES:${PN}-libomptarget = "${libdir}/libomptarget-*.bc"
-FILES:${PN}-gdb-plugin = "${datadir}/gdb/python/ompd"
-RDEPENDS:${PN}-gdb-plugin += "python3-core"
-INSANE_SKIP:${PN} = "dev-so"
-# Currently the static libraries contain buildpaths
-INSANE_SKIP:${PN}-staticdev += "buildpaths"
-COMPATIBLE_HOST:mips64 = "null"
-COMPATIBLE_HOST:riscv32 = "null"
-COMPATIBLE_HOST:powerpc = "null"
-BBCLASSEXTEND = "native nativesdk"
-CVE_STATUS[CVE-2022-26345] = "cpe-incorrect: specific to the Intel distribution before 2022.1"
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
new file mode 100644
index 0000000..7c4392f
--- /dev/null
+++ b/recipes-devtools/include-what-you-use/include-what-you-use_0.23.bb
@@ -0,0 +1,24 @@
+SUMMARY = "Include What You Use (IWYU) - Clang based checker for C/C++ header includes"
+DESCRIPTION = "For every symbol (type, function, variable, or macro) that you \
+               use in foo.cc (or foo.cpp), either foo.cc or foo.h should \
+               include a .h file that exports the declaration of that symbol."
+HOMEPAGE = "https://include-what-you-use.org"
+BUGTRACKER = "https://github.com/include-what-you-use/include-what-you-use/issues"
+LICENSE = "NCSA"
+LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=3bb66a14534286912cd6f26649b5c60a \
+                    file://iwyu-check-license-header.py;md5=7bdb749831163fbe9232b3cb7186116f"
+DEPENDS = "clang"
+SRC_URI = "git://github.com/include-what-you-use/include-what-you-use.git;protocol=https;branch=master"
+SRCREV = "fa1094c0b3848f82244778bc6153cc84f8a890f6"
+PV .= "+git"
+inherit cmake python3native
+EXTRA_OECMAKE = "-DIWYU_RESOURCE_RELATIVE_TO=iwyu"
+FILES:${PN} += "${datadir}/${BPN}"
+BBCLASSEXTEND = "nativesdk"
diff --git a/recipes-devtools/python/python3-cffi_%.bbappend b/recipes-devtools/python/python3-cffi_%.bbappend
new file mode 100644
index 0000000..0628a90
--- /dev/null
+++ b/recipes-devtools/python/python3-cffi_%.bbappend
@@ -0,0 +1,5 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+# tests need compiler on target and they need the compiler which was
+# used to build python
+RDEPENDS:${PN}-ptest:append:toolchain-clang = " clang"
diff --git a/recipes-devtools/rust/rust-llvm/0001-sancov-Switch-to-OptTable-from-llvm-cl.patch b/recipes-devtools/rust/rust-llvm/0001-sancov-Switch-to-OptTable-from-llvm-cl.patch
deleted file mode 100644
index e713dfa..0000000
--- a/recipes-devtools/rust/rust-llvm/0001-sancov-Switch-to-OptTable-from-llvm-cl.patch
+++ /dev/null
@@ -1,352 +0,0 @@
-From a8016e296e6ec161897e7421c5efbc25a6aa3a9f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andr=C3=A9s=20Villegas?= <andresvi@google.com>
-Date: Tue, 25 Jul 2023 23:38:09 +0000
-Subject: [PATCH] [sancov] Switch to OptTable from llvm::cl
-Switch the parse of command line options from llvm::cl to OptTable.
-The motivation for this change is to continue adding llvm based tools
-to the llvm driver multicall. For more information about the proposal
-and motivation, please see https://discourse.llvm.org/t/rfc-llvm-busybox-proposal/58494
-Reviewed By: leonardchan
-Drop this patch when upgrading llvm in rust to 18.x or newer
-Upstream-Status: Backport [https://github.com/llvm/llvm-project/commit/a8016e296e6ec161897e7421c5efbc25a6aa3a9f]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Differential Revision: https://reviews.llvm.org/D155119
---
- llvm/tools/sancov/CMakeLists.txt |   8 ++
- llvm/tools/sancov/Opts.td        |  58 +++++++++
- llvm/tools/sancov/sancov.cpp     | 194 +++++++++++++++++++++----------
- 3 files changed, 196 insertions(+), 64 deletions(-)
- create mode 100644 llvm/tools/sancov/Opts.td
--- a/tools/sancov/CMakeLists.txt
-+++ b/tools/sancov/CMakeLists.txt
-@@ -5,11 +5,19 @@ set(LLVM_LINK_COMPONENTS
-   MC
-   MCDisassembler
-   Object
-+  Option
-   Support
-   Symbolize
-   TargetParser
-   )
- 
-+set(LLVM_TARGET_DEFINITIONS Opts.td)
-+tablegen(LLVM Opts.inc -gen-opt-parser-defs)
-+add_public_tablegen_target(SancovOptsTableGen)
-+
- add_llvm_tool(sancov
-   sancov.cpp
-+
-+  DEPENDS
-+  SancovOptsTableGen
-   )
--- /dev/null
-+++ b/tools/sancov/Opts.td
-@@ -0,0 +1,58 @@
-+include "llvm/Option/OptParser.td"
-+
-+class F<string name, string help> : Flag<["-", "--"], name>, HelpText<help>;
-+
-+multiclass B<string name, string help1, string help2> {
-+  def NAME: Flag<["-", "--"], name>, HelpText<help1>;
-+  def no_ # NAME: Flag<["-", "--"], "no-" # name>, HelpText<help2>;
-+}
-+
-+multiclass Eq<string name, string help> {
-+  def NAME #_EQ : Joined<["-", "--"], name #"=">,
-+                  HelpText<help>;
-+  def : Separate<["-", "--"], name>, Alias<!cast<Joined>(NAME #_EQ)>;
-+}
-+
-+def generic_grp : OptionGroup<"Genric Options">, HelpText<"Generic Options">;
-+def help : F<"help", "Display this help">, Group<generic_grp>;
-+def : Flag<["-"], "h">, Alias<help>, HelpText<"Alias for --help">, Group<generic_grp>;
-+def version : F<"version", "Display the version">, Group<generic_grp>;
-+def : Flag<["-"], "v">, Alias<version>, HelpText<"Alias for --version">, Group<generic_grp>;
-+
-+def action_grp : OptionGroup<"Action">, HelpText<"Action (required)">;
-+def print : F<"print", "Print coverage addresses">,
-+  Group<action_grp>;
-+def printCoveragePcs : F<"print-coverage-pcs", "Print coverage instrumentation points addresses.">,
-+  Group<action_grp>;
-+def coveredFunctions : F<"covered-functions", "Print all covered funcions.">,
-+  Group<action_grp>;
-+def notCoveredFunctions : F<"not-covered-functions", "Print all not covered funcions.">,
-+  Group<action_grp>;
-+def printCoverageStats : F<"print-coverage-stats", "Print coverage statistics.">,
-+  Group<action_grp>;
-+def htmlReport : F<"html-report", "REMOVED. Use -symbolize & coverage-report-server.py.">,
-+  Group<action_grp>;
-+def symbolize : F<"symbolize", "Produces a symbolized JSON report from binary report.">,
-+  Group<action_grp>;
-+def merge : F<"merge", "Merges reports.">,
-+  Group<action_grp>;
-+
-+defm demangle : B<"demangle", "Demangle function names", "Do not demangle function names">;
-+defm skipDeadFiles : B<"skip-dead-files", "Do not list dead source files in reports",
-+                                          "List dead source files in reports">;
-+defm useDefaultIgnoreList :
-+  B<"use_default_ignorelist", "Use the default ignore list", "Don't use the default ignore list">,
-+  Flags<[HelpHidden]>;
-+
-+// Compatibility aliases
-+def : Flag<["-"], "demangle=0">, Alias<no_demangle>, HelpText<"Alias for --no-demangle">;
-+def : Flag<["-"], "skip-dead-files=0">, Alias<no_skipDeadFiles>, HelpText<"Alias for --no-skip-dead-files">;
-+def : Flag<["-"], "use_default_ignorelist=0">, Alias<no_useDefaultIgnoreList>, HelpText<"Alias for --no-use_default_ignore_list">;
-+
-+defm stripPathPrefix
-+    : Eq<"strip_path_prefix", "Strip this prefix from files paths in reports">,
-+      MetaVarName<"<string>">;
-+
-+defm ignorelist
-+    : Eq<"ignorelist", "Ignorelist file (sanitizer ignorelist format)">,
-+      MetaVarName<"<string>">;
--- a/tools/sancov/sancov.cpp
-+++ b/tools/sancov/sancov.cpp
-@@ -29,6 +29,8 @@
- #include "llvm/Object/COFF.h"
- #include "llvm/Object/MachO.h"
- #include "llvm/Object/ObjectFile.h"
-+#include "llvm/Option/ArgList.h"
-+#include "llvm/Option/Option.h"
- #include "llvm/Support/Casting.h"
- #include "llvm/Support/CommandLine.h"
- #include "llvm/Support/Errc.h"
-@@ -55,9 +57,44 @@ using namespace llvm;
- 
- namespace {
- 
-// --------- COMMAND LINE FLAGS ---------
-+// Command-line option boilerplate.
-+namespace {
-+using namespace llvm::opt;
-+enum ID {
-+  OPT_INVALID = 0, // This is not an option ID.
-+#define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM,  \
-+               HELPTEXT, METAVAR, VALUES)                                      \
-+  OPT_##ID,
-+#include "Opts.inc"
-+#undef OPTION
-+};
- 
-cl::OptionCategory Cat("sancov Options");
-+#define PREFIX(NAME, VALUE)                                                    \
-+  static constexpr StringLiteral NAME##_init[] = VALUE;                        \
-+  static constexpr ArrayRef<StringLiteral> NAME(NAME##_init,                   \
-+                                                std::size(NAME##_init) - 1);
-+#include "Opts.inc"
-+#undef PREFIX
-+
-+static constexpr opt::OptTable::Info InfoTable[] = {
-+#define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM,  \
-+               HELPTEXT, METAVAR, VALUES)                                      \
-+  {                                                                            \
-+      PREFIX,      NAME,      HELPTEXT,                                        \
-+      METAVAR,     OPT_##ID,  opt::Option::KIND##Class,                        \
-+      PARAM,       FLAGS,     OPT_##GROUP,                                     \
-+      OPT_##ALIAS, ALIASARGS, VALUES},
-+#include "Opts.inc"
-+#undef OPTION
-+};
-+
-+class SancovOptTable : public opt::GenericOptTable {
-+public:
-+  SancovOptTable() : GenericOptTable(InfoTable) {}
-+};
-+} // namespace
-+
-+// --------- COMMAND LINE FLAGS ---------
- 
- enum ActionType {
-   CoveredFunctionsAction,
-@@ -70,53 +107,13 @@ enum ActionType {
-   SymbolizeAction
- };
- 
-cl::opt<ActionType> Action(
-    cl::desc("Action (required)"), cl::Required,
-    cl::values(
-        clEnumValN(PrintAction, "print", "Print coverage addresses"),
-        clEnumValN(PrintCovPointsAction, "print-coverage-pcs",
-                   "Print coverage instrumentation points addresses."),
-        clEnumValN(CoveredFunctionsAction, "covered-functions",
-                   "Print all covered funcions."),
-        clEnumValN(NotCoveredFunctionsAction, "not-covered-functions",
-                   "Print all not covered funcions."),
-        clEnumValN(StatsAction, "print-coverage-stats",
-                   "Print coverage statistics."),
-        clEnumValN(HtmlReportAction, "html-report",
-                   "REMOVED. Use -symbolize & coverage-report-server.py."),
-        clEnumValN(SymbolizeAction, "symbolize",
-                   "Produces a symbolized JSON report from binary report."),
-        clEnumValN(MergeAction, "merge", "Merges reports.")),
-    cl::cat(Cat));
-
-static cl::list<std::string>
-    ClInputFiles(cl::Positional, cl::OneOrMore,
-                 cl::desc("<action> <binary files...> <.sancov files...> "
-                          "<.symcov files...>"),
-                 cl::cat(Cat));
-
-static cl::opt<bool> ClDemangle("demangle", cl::init(true),
-                                cl::desc("Print demangled function name"),
-                                cl::cat(Cat));
-
-static cl::opt<bool>
-    ClSkipDeadFiles("skip-dead-files", cl::init(true),
-                    cl::desc("Do not list dead source files in reports"),
-                    cl::cat(Cat));
-
-static cl::opt<std::string>
-    ClStripPathPrefix("strip_path_prefix", cl::init(""),
-                      cl::desc("Strip this prefix from file paths in reports"),
-                      cl::cat(Cat));
-
-static cl::opt<std::string>
-    ClIgnorelist("ignorelist", cl::init(""),
-                 cl::desc("Ignorelist file (sanitizer ignorelist format)"),
-                 cl::cat(Cat));
-
-static cl::opt<bool> ClUseDefaultIgnorelist(
-    "use_default_ignorelist", cl::init(true), cl::Hidden,
-    cl::desc("Controls if default ignorelist should be used"), cl::cat(Cat));
-+static ActionType Action;
-+static std::vector<std::string> ClInputFiles;
-+static bool ClDemangle;
-+static bool ClSkipDeadFiles;
-+static bool ClUseDefaultIgnorelist;
-+static std::string ClStripPathPrefix;
-+static std::string ClIgnorelist;
- 
- static const char *const DefaultIgnorelistStr = "fun:__sanitizer_.*\n"
-                                                 "src:/usr/include/.*\n"
-@@ -699,8 +696,7 @@ findSanitizerCovFunctions(const object::
- // Ported from
- // compiler-rt/lib/sanitizer_common/sanitizer_stacktrace.h:GetPreviousInstructionPc
- // GetPreviousInstructionPc.
-static uint64_t getPreviousInstructionPc(uint64_t PC,
-                                         Triple TheTriple) {
-+static uint64_t getPreviousInstructionPc(uint64_t PC, Triple TheTriple) {
-   if (TheTriple.isARM())
-     return (PC - 3) & (~1);
-   if (TheTriple.isMIPS() || TheTriple.isSPARC())
-@@ -1145,31 +1141,101 @@ readSymbolizeAndMergeCmdArguments(std::v
- 
- } // namespace
- 
-+static void parseArgs(int Argc, char **Argv) {
-+  SancovOptTable Tbl;
-+  llvm::BumpPtrAllocator A;
-+  llvm::StringSaver Saver{A};
-+  opt::InputArgList Args =
-+      Tbl.parseArgs(Argc, Argv, OPT_UNKNOWN, Saver, [&](StringRef Msg) {
-+        llvm::errs() << Msg << '\n';
-+        std::exit(1);
-+      });
-+
-+  if (Args.hasArg(OPT_help)) {
-+    Tbl.printHelp(
-+        llvm::outs(),
-+        "sancov [options] <action> <binary files...> <.sancov files...> "
-+        "<.symcov files...>",
-+        "Sanitizer Coverage Processing Tool (sancov)\n\n"
-+        "  This tool can extract various coverage-related information from: \n"
-+        "  coverage-instrumented binary files, raw .sancov files and their "
-+        "symbolized .symcov version.\n"
-+        "  Depending on chosen action the tool expects different input files:\n"
-+        "    -print-coverage-pcs     - coverage-instrumented binary files\n"
-+        "    -print-coverage         - .sancov files\n"
-+        "    <other actions>         - .sancov files & corresponding binary "
-+        "files, .symcov files\n");
-+    std::exit(0);
-+  }
-+
-+  if (Args.hasArg(OPT_version)) {
-+    cl::PrintVersionMessage();
-+    std::exit(0);
-+  }
-+
-+  if (Args.hasMultipleArgs(OPT_action_grp)) {
-+    fail("Only one action option is allowed");
-+  }
-+
-+  for (const opt::Arg *A : Args.filtered(OPT_INPUT)) {
-+    ClInputFiles.emplace_back(A->getValue());
-+  }
-+
-+  if (const llvm::opt::Arg *A = Args.getLastArg(OPT_action_grp)) {
-+    switch (A->getOption().getID()) {
-+    case OPT_print:
-+      Action = ActionType::PrintAction;
-+      break;
-+    case OPT_printCoveragePcs:
-+      Action = ActionType::PrintCovPointsAction;
-+      break;
-+    case OPT_coveredFunctions:
-+      Action = ActionType::CoveredFunctionsAction;
-+      break;
-+    case OPT_notCoveredFunctions:
-+      Action = ActionType::NotCoveredFunctionsAction;
-+      break;
-+    case OPT_printCoverageStats:
-+      Action = ActionType::StatsAction;
-+      break;
-+    case OPT_htmlReport:
-+      Action = ActionType::HtmlReportAction;
-+      break;
-+    case OPT_symbolize:
-+      Action = ActionType::SymbolizeAction;
-+      break;
-+    case OPT_merge:
-+      Action = ActionType::MergeAction;
-+      break;
-+    default:
-+      fail("Invalid Action");
-+    }
-+  }
-+
-+  ClDemangle = Args.hasFlag(OPT_demangle, OPT_no_demangle, true);
-+  ClSkipDeadFiles = Args.hasFlag(OPT_skipDeadFiles, OPT_no_skipDeadFiles, true);
-+  ClUseDefaultIgnorelist =
-+      Args.hasFlag(OPT_useDefaultIgnoreList, OPT_no_useDefaultIgnoreList, true);
-+
-+  ClStripPathPrefix = Args.getLastArgValue(OPT_stripPathPrefix_EQ);
-+  ClIgnorelist = Args.getLastArgValue(OPT_ignorelist_EQ);
-+}
-+
- int main(int Argc, char **Argv) {
-   llvm::InitLLVM X(Argc, Argv);
-  cl::HideUnrelatedOptions(Cat);
- 
-   llvm::InitializeAllTargetInfos();
-   llvm::InitializeAllTargetMCs();
-   llvm::InitializeAllDisassemblers();
- 
-  cl::ParseCommandLineOptions(Argc, Argv,
-      "Sanitizer Coverage Processing Tool (sancov)\n\n"
-      "  This tool can extract various coverage-related information from: \n"
-      "  coverage-instrumented binary files, raw .sancov files and their "
-      "symbolized .symcov version.\n"
-      "  Depending on chosen action the tool expects different input files:\n"
-      "    -print-coverage-pcs     - coverage-instrumented binary files\n"
-      "    -print-coverage         - .sancov files\n"
-      "    <other actions>         - .sancov files & corresponding binary "
-      "files, .symcov files\n"
-      );
-+  parseArgs(Argc, Argv);
- 
-   // -print doesn't need object files.
-   if (Action == PrintAction) {
-     readAndPrintRawCoverage(ClInputFiles, outs());
-     return 0;
-  } else if (Action == PrintCovPointsAction) {
-+  }
-+  if (Action == PrintCovPointsAction) {
-     // -print-coverage-points doesn't need coverage files.
-     for (const std::string &ObjFile : ClInputFiles) {
-       printCovPoints(ObjFile, outs());
diff --git a/recipes-devtools/rust/rust-llvm_%.bbappend b/recipes-devtools/rust/rust-llvm_%.bbappend
index 952387e..cc5c255 100644
--- a/recipes-devtools/rust/rust-llvm_%.bbappend
+++ b/recipes-devtools/rust/rust-llvm_%.bbappend
@@ -1,6 +1,3 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-inherit clang-native
+TOOLCHAIN_NATIVE ?= "clang"
-# fix build with clang-18
-SRC_URI:append:runtime-llvm = " file://0001-sancov-Switch-to-OptTable-from-llvm-cl.patch"
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"
diff --git a/recipes-devtools/spirv-llvm-translator/spirv-llvm-translator_git.bb b/recipes-devtools/spirv-llvm-translator/spirv-llvm-translator_git.bb
deleted file mode 100644
index 78f025b..0000000
--- a/recipes-devtools/spirv-llvm-translator/spirv-llvm-translator_git.bb
+++ /dev/null
@@ -1,36 +0,0 @@
-LICENSE = "NCSA"
-LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=47e311aa9caedd1b3abf098bd7814d1d"
-BRANCH = "main"
-SRC_URI = "git://github.com/KhronosGroup/SPIRV-LLVM-Translator;protocol=https;branch=${BRANCH} \
-           git://github.com/KhronosGroup/SPIRV-Headers;protocol=https;destsuffix=git/SPIRV-Headers;name=headers;branch=main \
-          "
-PV = "18.0.0+git"
-SRCREV = "0e87aefecf7c5006e315427189bff87878e392c1"
-SRCREV_headers = "d3c2a6fa95ad463ca8044d7fc45557db381a6a64"
-SRCREV_FORMAT = "default_headers"
-S = "${WORKDIR}/git"
-DEPENDS = "spirv-tools clang"
-inherit cmake pkgconfig python3native
-# Specify any options you want to pass to cmake using EXTRA_OECMAKE:
-# for CMAKE_SHARED_LIBS=OFF see https://github.com/KhronosGroup/SPIRV-LLVM-Translator/issues/1868
-EXTRA_OECMAKE = "\
-        -DBASE_LLVM_VERSION=${LLVMVERSION} \
-        -DBUILD_SHARED_LIBS=OFF \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
-        -DCMAKE_SKIP_RPATH=ON \
-        -DLLVM_EXTERNAL_LIT=lit \
-        -DLLVM_INCLUDE_TESTS=ON \
-        -Wno-dev \
-        -DCCACHE_ALLOWED=FALSE \
-        -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=${S}/SPIRV-Headers \
-"
-BBCLASSEXTEND = "native nativesdk"
diff --git a/scripts/devtool-clang.sh b/scripts/devtool-clang.sh
new file mode 100755
index 0000000..be8359a
--- /dev/null
+++ b/scripts/devtool-clang.sh
@@ -0,0 +1,48 @@
+#!/usr/bin/env sh
+# Clone the repository first if not already done locally
+# git clone https://github.com/kraj/llvm-project -b oe/main /mnt/b/yoe/master/workspace/sources/llvm-project
+#
+# if local repository exists then make a clone/copy
+# git clone /home/kraj/work/llvm-project /mnt/b/yoe/master/workspace/sources/llvm-project
+#
+layerloc="$(dirname "$0")/../conf/layer.conf"
+workspace="$(dirname "$0")/../../../workspace"
+# Change target and SDK host as needed
+target=riscv64
+sdkhost=x86_64
+origver=$(grep "LLVMVERSION =" < "$layerloc" | awk '{print $3}' | tr -d '"')
+major=$(grep -e "set(LLVM_VERSION_MAJOR [0-9]" < "$workspace"/sources/llvm-project/cmake/Modules/LLVMVersion.cmake| cut -d ' ' -f 4 | sed "s/)//")
+minor=$(grep -e "set(LLVM_VERSION_MINOR [0-9]" < "$workspace"/sources/llvm-project/cmake/Modules/LLVMVersion.cmake| cut -d ' ' -f 4 | sed "s/)//")
+patch=$(grep -e "set(LLVM_VERSION_PATCH [0-9]" < "$workspace"/sources/llvm-project/cmake/Modules/LLVMVersion.cmake| cut -d ' ' -f 4 | sed "s/)//")
+recipes="\
+llvm-project-source-$origver \
+clang \
+clang-cross-$target \
+clang-crosssdk-$sdkhost \
+clang-cross-canadian-$target \
+nativesdk-clang-glue \
+compiler-rt \
+compiler-rt-sanitizers \
+libclc \
+libcxx \
+openmp \
+"
+for recipe in $recipes; do
+  devtool modify -n "$recipe" "$workspace/sources/llvm-project"
+  sed -i "/pn-$recipe /p;s/pn-$recipe /pn-nativesdk-$recipe /g" "$workspace"/appends/"$recipe"*.bbappend
+  sed -i "/pn-$recipe /p;s/pn-$recipe /pn-$recipe-native /g" "$workspace"/appends/"$recipe"*.bbappend
+done
+for f in "$workspace"/appends/*.bbappend; do
+  { echo "MAJOR_VER = \"$major\"" ; echo "MINOR_VER = \"$minor\"" ; echo "PATCH_VER = \"$patch\"" ; } >> "$f"
+done
+sed -i -e "s/$origver/$major.$minor.$patch/g" "$workspace"/appends/llvm-project-source.bbappend
+sed -i -e "s/:pn-clang-cross-$target//g" "$workspace"/appends/clang-cross_git.bbappend
+sed -i -e "s/:pn-clang-cross-canadian-$target//g" "$workspace"/appends/clang-cross-canadian_git.bbappend
+sed -i -e "s/:pn-clang-crosssdk-$sdkhost//g" "$workspace"/appends/clang-crosssdk_git.bbappend