108 files changed, 3571 insertions, 998 deletions

diff --git a/.drone.yml b/.drone.yml
deleted file mode 100644
index 753dacb..0000000
--- a/.drone.yml
+++ /dev/null
@@ -1,83 +0,0 @@
-kind: pipeline
-type: exec
-name: arm64
-
-platform:
-  os: linux
-  arch: arm64
-
-clone:
-  disable: false
-
-trigger:
-  branch:
-    - dunfell
-  event:
-    - push
-    - pull_request
-
-steps:
-  - name: build
-    commands:
-      - git clone --recurse-submodules -j8 git://github.com/YoeDistro/yoe-distro.git yoe
-      - cd yoe
-      - git checkout -b test origin/dunfell
-      - git pull
-      - git submodule update --recursive --init
-      - rm -rf sources/meta-clang
-      - ln -sf `pwd`/../ sources/meta-clang
-      - export DOCKER_REPO=none
-      - export LANG=en_US.UTF-8
-      - export SSTATE_CACHE_DIR=/scratch/sstate-cache
-      - echo "Started build# $DRONE_BUILD_NUMBER"
-      - echo "sstate cache dir = $SSTATE_CACHE_DIR"
-      - echo "building $DRONE_GIT_HTTP_URL, branch $DRONE_SOURCE_BRANCH"
-      - echo export DOCKER_REPO=none > local.sh
-      - echo export LANG=en_US.UTF-8 >> local.sh
-      - echo export SSTATE_CACHE_DIR=/scratch/sstate-cache >> local.sh
-      - cp conf/local.conf.sample conf/local.conf
-      - echo SSTATE_DIR = \"$SSTATE_CACHE_DIR\" >> conf/local.conf
-      - echo IMAGE_CLASSES += \"testimage testsdk\" >> conf/local.conf
-      - echo INHERIT += \"report-error rm_work blacklist\" >> conf/local.conf
-      - echo ERR_REPORT_SERVER = \"errors.yoctoproject.org\" >> conf/local.conf
-      - echo ERR_REPORT_PORT = \"80\" >> conf/local.conf
-      - echo ERR_REPORT_USERNAME = \"Drone Autobuilder\" >> conf/local.conf
-      - echo ERR_REPORT_EMAIL = \"info@yoedistro.org\" >> conf/local.conf
-      - echo TOOLCHAIN = \"clang\" >> conf/local.conf
-      - echo CLANGSDK = \"1\" >> conf/local.conf
-      - echo IMAGE_INSTALL_append = \" clang \" >> conf/local.conf
-      - echo XZ_DEFAULTS = \"--threads=8\" >> conf/local.conf
-      - echo LICENSE_FLAGS_WHITELIST_append = \" commercial non-commercial\" >> conf/local.conf
-      #- echo TESTIMAGE_AUTO_qemuall = \"1\" >> conf/local.conf
-      - /bin/bash -c ". ./qemux86-64-envsetup.sh && bitbake yoe-debug-image -cpopulate_sdk"
-      - /bin/bash -c ". ./qemux86-64-envsetup.sh && ./sources/openembedded-core/scripts/sstate-cache-management.sh -d -y"
----
-kind: pipeline
-type: exec
-name: cleanup
-
-platform:
-  os: linux
-  arch: arm64
-
-clone:
-  disable: true
-
-trigger:
-  branch:
-    - dunfell
-  event:
-    - push
-    - pull_request
-  status:
-    - success
-    - failure
-
-steps:
-- name: clean
-  commands:
-    - echo "Deleting tmpdir for build# $DRONE_BUILD_NUMBER"
-    - rm -rf /scratch/tmp-clang-$DRONE_BUILD_NUMBER
-
-depends_on:
-- arm64
diff --git a/.github/workflows/yoe.yml b/.github/workflows/yoe.yml
new file mode 100644
index 0000000..ca2885b
--- /dev/null
+++ b/.github/workflows/yoe.yml
@@ -0,0 +1,79 @@
+name: Yoe Distro CI
+
+on:
+  # Trigger the workflow on push or pull request,
+  # but only for the master branch
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+jobs:
+  build:
+    name: Yoe Build
+    runs-on: [self-hosted, Linux]
+    timeout-minutes: 720
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+          submodules: recursive
+      - name: checkout yoe
+        run: |
+          git clone --recurse-submodules -j8 -b master git://github.com/YoeDistro/yoe-distro.git yoe
+          cd yoe
+          git checkout master
+          git pull
+          git submodule update --recursive --init
+          rm -rf sources/meta-clang
+          rsync -av --progress --exclude="yoe" `pwd`/../ sources/meta-clang/
+      - name: Setup
+        run: |
+          cd yoe
+          export DOCKER_REPO=none
+          export LANG=en_US.UTF-8
+          export SSTATE_CACHE_DIR=/scratch/sstate-cache
+          echo export DOCKER_REPO=none > local.sh
+          echo export LANG=en_US.UTF-8 >> local.sh
+          echo export SSTATE_CACHE_DIR=/scratch/sstate-cache >> local.sh
+          cp conf/local.conf.sample conf/local.conf
+          echo SSTATE_DIR = \"$SSTATE_CACHE_DIR\" >> conf/local.conf
+          echo IMAGE_CLASSES += \"testimage testsdk\" >> conf/local.conf
+          echo INHERIT += \"report-error rm_work\" >> conf/local.conf
+          echo ERR_REPORT_SERVER = \"errors.yoctoproject.org\" >> conf/local.conf
+          echo ERR_REPORT_PORT = \"80\" >> conf/local.conf
+          echo ERR_REPORT_USERNAME = \"Drone Autobuilder\" >> conf/local.conf
+          echo ERR_REPORT_EMAIL = \"info@yoedistro.org\" >> conf/local.conf
+          echo TOOLCHAIN = \"clang\" >> conf/local.conf
+          echo BB_NUMBER_THREADS = \"16\" >> conf/local.conf
+          echo PARALLEL_MAKE = \"-j 32\" >> conf/local.conf
+          echo CLANGSDK = \"1\" >> conf/local.conf
+          echo IMAGE_INSTALL_append = \" clang \" >> conf/local.conf
+          echo XZ_DEFAULTS = \"--threads=8\" >> conf/local.conf
+          echo SDKMACHINE = \"aarch64\" >> conf/local.conf
+          /bin/bash -c "sed -i -e 's/PACKAGE_FEED_URI.*$//' conf/site.conf"
+          /bin/bash -c "sed -i -e 's/SDK_UPDATE_URL.*$//' conf/site.conf"
+      - name: Build Image
+        run: |
+          cd yoe
+          /bin/bash -c ". ./qemuarm64-envsetup.sh && bitbake yoe-qt5-image yoe-sdk-image yoe-debug-image"
+      - name: Build SDK
+        run: |
+          cd yoe
+          /bin/bash -c ". ./qemuarm64-envsetup.sh && bitbake yoe-debug-image -cpopulate_sdk_ext"
+      - name: Test Image
+        run: |
+          cd yoe
+          export DISPLAY=":0"
+          echo TESTIMAGE_AUTO_qemuall = \"1\" >> conf/local.conf
+          /bin/bash -c ". ./qemuarm64-envsetup.sh && bitbake yoe-sdk-image"
+      - name: Prepare results
+        run: |
+          cd yoe
+          /bin/bash -c ". ./qemuarm64-envsetup.sh && resulttool report build/tmp/log/oeqa"
+      - name: Clean shared state
+        run: |
+          cd yoe
+          /bin/bash -c ". ./qemuarm64-envsetup.sh && ./sources/openembedded-core/scripts/sstate-cache-management.sh -d -y"
diff --git a/README.md b/README.md
index 5541396..3aa42da 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,10 @@
-[![Build Status](https://drone.yoedistro.org/api/badges/kraj/meta-clang/status.svg)](https://drone.yoedistro.org/kraj/meta-clang)
+[![Yoe Distro CI](https://github.com/kraj/meta-clang/workflows/Yoe%20Distro%20CI/badge.svg?branch=master)](https://github.com/kraj/meta-clang/actions/workflows/yoe.yml?query=workflow%3AYoe+branch%3Amaster)
 
-# meta-clang (a C language family frontend and LLVM compiler backend)
+# meta-clang (C/C++ frontend and LLVM compiler backend)
 
-This layer provides [clang/llvm](http://clang.llvm.org/) as alternative to your system
-C/C++ compiler for OpenEmbedded based distributions along with gcc
+This layer provides [clang/llvm](http://clang.llvm.org/) as alternative to system
+C/C++ compiler for OpenEmbedded/Yocto Project based distributions. This can cohabit
+with GNU Compiler and can be used for specific recipes or full system Compiler
 
 # Getting Started
 
@@ -15,6 +16,15 @@ git clone git://github.com/kraj/meta-clang.git
 
 $ . ./oe-init-build-env
 ```
+If using poky ( Yocto project reference Distribution )
+
+```shell
+git clone https://git.yoctoproject.org/git/poky
+cd poky
+git clone git://github.com/kraj/meta-clang.git
+
+$ . ./oe-init-build-env
+```
 
 Add meta-clang overlay
 ```
@@ -23,7 +33,7 @@ bitbake-layers add-layer ../meta-clang
 
 Check `conf/bblayers.conf` to see that meta-clang is added to layer mix e.g.
 
-# Default Compiler Switch
+# Default Compiler
 
 Note that by default gcc will remain the system compiler, however if you wish
 clang to be the default compiler then set
@@ -38,45 +48,56 @@ you can select clang per recipe too by writing bbappends for them containing
 ```shell
 TOOLCHAIN = "clang"
 ```
+also look at `conf/nonclangable.conf` for list of recipes which do not yet fully
+build with clang
 
-# Default C++ Standard Library Switch
+# Default Compiler Runtime
 
-Note that by default clang libc++ is default C++ standard library, however if you wish
-to keep GNU libstdc++ to be the default then set
+Default is to use GNU runtime `RUNTIME = "gnu"` which consists of libgcc, libstdc++ to provide C/C++
+runtime support. However its possible to use LLVM runtime to replace it where
+compile-rt, llvm libunwind, and libc++ are used to provide C/C++ runtime, while
+GNU runtime works with both GCC and Clang, LLVM runtime is only tested with Clang
+compiler, Switching to use LLVM runtime is done via a config metadata knob
 
 ```shell
-LIBCPLUSPLUS = ""
+RUNTIME = "llvm"
 ```
 
-in `local.conf`.
-You can select libstdc++ per package too by writing bbappends for them containing
+RUNTIME variable influences individual runtime elements and can be set explcitly as well
+e.g. `LIBCPLUSPLUS` `COMPILER_RT` and `UNWINDLIB`
 
-```shell
-LIBCPLUSPLUS_toolchain-clang_pn-<recipe> = ""
-```
+Please note that this will still use crt files from GNU compiler always, while llvm now
+do provide crt files, they have not been yet intergrated into toolchain
 
-# Default Compiler Runtime ( Compiler-rt + libc++ )
+# Default C++ Standard Library Switch
 
-By default, clang build from meta-clang uses clang runtime ( compiler-rt + libc++ + libunwind ) out of box
-However, it is possible to switch to using gcc runtime as default, In order to do that
-following settings are needed in site configurations e.g. in `local.conf`
+Using RUNTIME bariable will select which C++ runtime is used, however it can be overridden
+if needed to by modifying `LIBCPLUSPLUS` variable, usually defaults used by `RUNTIME` is
+best fit. e.g. below we select LLVM C++ as default C++ runtime.
 
 ```shell
-TOOLCHAIN ?= "clang"
-LIBCPLUSPLUS = ""
-COMPILER_RT = ""
-UNWINDLIB = ""
+LIBCPLUSPLUS = "-stdlib=libc++"
+```
 
+in `local.conf`.
+You can select libstdc++ per package too by writing bbappends for them containing
+
+```shell
+LIBCPLUSPLUS_toolchain-clang_pn-<recipe> = "-stdlibc=libc++"
 ```
+Defaults are chosen to be GNU for maximum compatibility with existing GNU systems. Its always
+good to use single runtime on a system, mixing runtimes can cause complications during
+compilation as well as runtime. However, its upto distribution policies to decide which runtime
+to use.
 
-# Removing clang from generated SDK toolchain
+# Adding clang in generated SDK toolchain
 
-clang based cross compiler is automatically included into the generated SDK using `bitbake meta-toolchain` or
-`bitbake -cpopulate_sdk <image>` in circumstanced where clang is not expected to be part of SDK, then reset `CLANGSDK`
-variable in `local.conf`
+clang based cross compiler is not included into the generated SDK using `bitbake meta-toolchain` or
+`bitbake -cpopulate_sdk <image>` if clang is expected to be part of SDK, add `CLANGSDK = "1"`
+in `local.conf`
 
 ```shell
-CLANGSDK = ""
+CLANGSDK = "1"
 ```
 
 # Building
@@ -95,7 +116,7 @@ $ runqemu nographic
 # Limitations
 
 Few components do not build with clang, if you have a component to add to that list
-simply add it to conf/nonclangable.inc e.g.
+simply add it to `conf/nonclangable.inc` e.g.
 
 ```shell
 TOOLCHAIN_pn-<recipe> = "gcc"
@@ -103,12 +124,46 @@ TOOLCHAIN_pn-<recipe> = "gcc"
 
 and OE will start using gcc to cross compile that recipe.
 
-And if a component does not build with libc++, you can add it to `conf/nonclangable.inc` e.g.
+if a component does not build with libc++, you can add it to `conf/nonclangable.inc` e.g.
 
 ```shell
 CXX_remove_pn-<recipe>_toolchain-clang = " -stdlib=libc++ "
 ```
 
+# compiler-rt failing in do_configure with custom TARGET_VENDOR
+
+If your DISTRO sets own value of TARGET_VENDOR, then it's need to be added in
+CLANG_EXTRA_OE_VENDORS, it should be done automatically, but if compiler-rt fails
+like bellow, then check the end of work-shared/llvm-project-source-12.0.0-r0/temp/log.do_patch
+is should have line like:
+NOTE: Adding support following TARGET_VENDOR values: foo in
+  /OE/build/oe-core/tmp-glibc/work-shared/llvm-project-source-12.0.0-r0/git/llvm/lib/Support/Triple.cpp and
+  /OE/build/oe-core/tmp-glibc/work-shared/llvm-project-source-12.0.0-r0/git/clang/lib/Driver/ToolChains/Gnu.cpp
+and check these files if //CLANG_EXTRA_OE_VENDORS* strings were replaced correctly.
+Read add_more_target_vendors function in recipes-devtools/clang/llvm-project-source.inc for more details.
+
+http://errors.yoctoproject.org/Errors/Details/574365/
+```shell
+-- Found assembler: TOPDIR/tmp-glibc/work/core2-64-foo-linux/compiler-rt/12.0.0-r0/recipe-sysroot-native/usr/bin/x86_64-foo-linux/x86_64-foo-linux-clang
+-- Detecting C compiler ABI info
+-- Detecting C compiler ABI info - failed
+-- Check for working C compiler: TOPDIR/tmp-glibc/work/core2-64-foo-linux/compiler-rt/12.0.0-r0/recipe-sysroot-native/usr/bin/x86_64-foo-linux/x86_64-foo-linux-clang
+-- Check for working C compiler: TOPDIR/tmp-glibc/work/core2-64-foo-linux/compiler-rt/12.0.0-r0/recipe-sysroot-native/usr/bin/x86_64-foo-linux/x86_64-foo-linux-clang - broken
+CMake Error at TOPDIR/tmp-glibc/work/core2-64-foo-linux/compiler-rt/12.0.0-r0/recipe-sysroot-native/usr/share/cmake-3.19/Modules/CMakeTestCCompiler.cmake:66 (message):
+  The C compiler
+
+    "TOPDIR/tmp-glibc/work/core2-64-foo-linux/compiler-rt/12.0.0-r0/recipe-sysroot-native/usr/bin/x86_64-foo-linux/x86_64-foo-linux-clang"
+
+  is not able to compile a simple test program.
+
+  It fails with the following output:
+
+    Change Dir: TOPDIR/tmp-glibc/work/core2-64-foo-linux/compiler-rt/12.0.0-r0/build/CMakeFiles/CMakeTmp
+
+    Run Build Command(s):ninja cmTC_928f4 && [1/2] Building C object CMakeFiles/cmTC_928f4.dir/testCCompiler.c.o
+    [2/2] Linking C executable cmTC_928f4
+```
+
 # Dependencies
 
 ```shell
diff --git a/classes/clang.bbclass b/classes/clang.bbclass
index a00eef6..a56084d 100644
--- a/classes/clang.bbclass
+++ b/classes/clang.bbclass
@@ -1,5 +1,5 @@
 # Add the necessary override
-CCACHE_COMPILERCHECK_toolchain-clang = "%compiler% -v"
+CCACHE_COMPILERCHECK_toolchain-clang ?= "%compiler% -v"
 HOST_CC_ARCH_prepend_toolchain-clang = "-target ${HOST_SYS} "
 CC_toolchain-clang  = "${CCACHE}${HOST_PREFIX}clang ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}"
 CXX_toolchain-clang = "${CCACHE}${HOST_PREFIX}clang++ ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}"
@@ -9,11 +9,12 @@ RANLIB_toolchain-clang = "${HOST_PREFIX}llvm-ranlib"
 AR_toolchain-clang = "${HOST_PREFIX}llvm-ar"
 NM_toolchain-clang = "${HOST_PREFIX}llvm-nm"
 
-export CLANG_TIDY_toolchain-clang = "${HOST_PREFIX}clang-tidy"
+LTO_toolchain-clang = "${@bb.utils.contains('DISTRO_FEATURES', 'thin-lto', '-flto=thin', '-flto -fuse-ld=lld', d)}"
+PACKAGE_DEBUG_SPLIT_STYLE_toolchain-clang = "debug-without-src"
 
 COMPILER_RT ??= "${@bb.utils.contains("RUNTIME", "llvm", "-rtlib=compiler-rt ${UNWINDLIB}", "", d)}"
-COMPILER_RT_powerpc = "--rtlib=libgcc ${UNWINDLIB}"
-COMPILER_RT_armeb = "--rtlib=libgcc ${UNWINDLIB}"
+COMPILER_RT_powerpc = "-rtlib=libgcc ${UNWINDLIB}"
+COMPILER_RT_armeb = "-rtlib=libgcc ${UNWINDLIB}"
 
 UNWINDLIB ??= "${@bb.utils.contains("RUNTIME", "llvm", "--unwindlib=libgcc", "", d)}"
 UNWINDLIB_riscv64 = "--unwindlib=libgcc"
@@ -21,7 +22,7 @@ UNWINDLIB_riscv32 = "--unwindlib=libgcc"
 UNWINDLIB_powerpc = "--unwindlib=libgcc"
 UNWINDLIB_armeb = "--unwindlib=libgcc"
 
-LIBCPLUSPLUS ??= "${@bb.utils.contains("RUNTIME", "llvm", "--stdlib=libc++", "", d)}"
+LIBCPLUSPLUS ??= "${@bb.utils.contains("RUNTIME", "llvm", "-stdlib=libc++", "", d)}"
 
 TARGET_CXXFLAGS_append_toolchain-clang = " ${LIBCPLUSPLUS}"
 TUNE_CCARGS_append_toolchain-clang = " ${COMPILER_RT} ${LIBCPLUSPLUS}"
@@ -31,11 +32,18 @@ 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 = "-mtune=cortex-a57.cortex-a53 -mtune=cortex-a72.cortex-a53 -mtune=cortex-a15.cortex-a7 -mtune=cortex-a17.cortex-a7 -mtune=cortex-a72.cortex-a35 -mtune=cortex-a73.cortex-a53 -mtune=cortex-a75.cortex-a55 -mtune=cortex-a76.cortex-a55"
-TUNE_CCARGS_append_toolchain-clang = "${@bb.utils.contains_any("TUNE_FEATURES", "cortexa72-cortexa53 cortexa57-cortexa53 cortexa73-cortexa53", " -mtune=cortex-a53", "", d)}"
-TUNE_CCARGS_append_toolchain-clang = "${@bb.utils.contains_any("TUNE_FEATURES", "cortexa15-cortexa7 cortexa17-cortexa7", " -mtune=cortex-a7", "", d)}"
-TUNE_CCARGS_append_toolchain-clang = "${@bb.utils.contains_any("TUNE_FEATURES", "cortexa72-cortexa35", " -mtune=cortex-a35", "", d)}"
-TUNE_CCARGS_append_toolchain-clang = "${@bb.utils.contains_any("TUNE_FEATURES", "cortexa75-cortex-a55 cortexa76-cortex-a55", " -mtune=cortex-a55", "", d)}"
+TUNE_CCARGS_remove_toolchain-clang = "-mcpu=cortex-a57.cortex-a53 -mcpu=cortex-a72.cortex-a53 -mcpu=cortex-a15.cortex-a7 -mcpu=cortex-a17.cortex-a7 -mcpu=cortex-a72.cortex-a35 -mcpu=cortex-a73.cortex-a53 -mcpu=cortex-a75.cortex-a55 -mcpu=cortex-a76.cortex-a55"
+TUNE_CCARGS_append_toolchain-clang = "${@bb.utils.contains_any("TUNE_FEATURES", "cortexa72-cortexa53 cortexa57-cortexa53 cortexa73-cortexa53", " -mcpu=cortex-a53", "", d)}"
+TUNE_CCARGS_append_toolchain-clang = "${@bb.utils.contains_any("TUNE_FEATURES", "cortexa15-cortexa7 cortexa17-cortexa7", " -mcpu=cortex-a7", "", d)}"
+TUNE_CCARGS_append_toolchain-clang = "${@bb.utils.contains_any("TUNE_FEATURES", "cortexa72-cortexa35", " -mcpu=cortex-a35", "", d)}"
+TUNE_CCARGS_append_toolchain-clang = "${@bb.utils.contains_any("TUNE_FEATURES", "cortexa75-cortex-a55 cortexa76-cortex-a55", " -mcpu=cortex-a55", "", d)}"
+
+# Clang does not support octeontx2 processor
+TUNE_CCARGS_remove_toolchain-clang = "-mcpu=octeontx2"
+
+# LLD does not yet support relaxation for RISCV e.g. https://reviews.freebsd.org/D25210
+TUNE_CCARGS_append_toolchain-clang_riscv32 = " -mno-relax"
+TUNE_CCARGS_append_toolchain-clang_riscv64 = " -mno-relax"
 
 TUNE_CCARGS_remove_toolchain-clang_powerpc = "-mhard-float"
 TUNE_CCARGS_remove_toolchain-clang_powerpc = "-mno-spe"
@@ -81,13 +89,13 @@ def clang_base_deps(d):
     if not d.getVar('INHIBIT_DEFAULT_DEPS', False):
         if not oe.utils.inherits(d, 'allarch') :
             ret = " clang-cross-${TARGET_ARCH} virtual/libc "
-            if (d.getVar('COMPILER_RT').find('--rtlib=compiler-rt') != -1):
+            if (d.getVar('COMPILER_RT').find('-rtlib=compiler-rt') != -1):
                 ret += " compiler-rt "
             else:
                 ret += " libgcc "
             if (d.getVar('COMPILER_RT').find('--unwindlib=libunwind') != -1):
                 ret += " libcxx "
-            if (d.getVar('LIBCPLUSPLUS').find('--stdlib=libc++') != -1):
+            if (d.getVar('LIBCPLUSPLUS').find('-stdlib=libc++') != -1):
                 ret += " libcxx "
             else:
                 ret += " virtual/${TARGET_PREFIX}compilerlibs "
@@ -98,7 +106,16 @@ BASE_DEFAULT_DEPS_toolchain-clang_class-target = "${@clang_base_deps(d)}"
 
 cmake_do_generate_toolchain_file_append_toolchain-clang () {
     cat >> ${WORKDIR}/toolchain.cmake <<EOF
-set( CMAKE_CLANG_TIDY ${CLANG_TIDY} )
+set( CMAKE_CLANG_TIDY ${HOST_PREFIX}clang-tidy )
 EOF
+    sed -i 's/ -mmusl / /g' ${WORKDIR}/toolchain.cmake
 }
-
+#
+# dump recipes which still use gcc
+#python __anonymous() {
+#    toolchain = d.getVar("TOOLCHAIN")
+#    if not toolchain or toolchain == "clang" or 'class-target' not in d.getVar('OVERRIDES').split(':'):
+#        return
+#    pkgn = d.getVar("PN")
+#    bb.warn("%s - %s" % (pkgn, toolchain))
+#}
diff --git a/classes/lto.bbclass b/classes/lto.bbclass
deleted file mode 100644
index 80a3d4d..0000000
--- a/classes/lto.bbclass
+++ /dev/null
@@ -1,7 +0,0 @@
-# Enable LTO based on global distro settings
-TOOLCHAIN_OPTIONS_append_toolchain-clang = "${@bb.utils.contains('DISTRO_FEATURES', 'thin-lto', ' -flto=thin -fuse-ld=gold', '', d)}"
-TOOLCHAIN_OPTIONS_append_toolchain-clang = "${@bb.utils.contains('DISTRO_FEATURES', 'full-lto', ' -flto=full -fuse-ld=gold', '', d)}"
-RANLIB_toolchain-clang = "${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-ranlib"
-AR_toolchain-clang = "${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-ar"
-NM_toolchain-clang = "${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-nm"
-
diff --git a/conf/layer.conf b/conf/layer.conf
index fdea56c..19e348b 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 = "zeus dunfell"
+LAYERSERIES_COMPAT_clang-layer = "dunfell hardknott honister"
 LAYERDEPENDS_clang-layer = "core"
 
 BBFILES_DYNAMIC += " \
@@ -17,6 +17,10 @@ BBFILES_DYNAMIC += " \
     openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/*/*/*.bbappend \
     networking-layer:${LAYERDIR}/dynamic-layers/networking-layer/*/*/*.bb \
     networking-layer:${LAYERDIR}/dynamic-layers/networking-layer/*/*/*.bbappend \
+    stm-st-stm32mp:${LAYERDIR}/dynamic-layers/meta-st-stm32mp/recipes-*/*/*.bb \
+    stm-st-stm32mp:${LAYERDIR}/dynamic-layers/meta-st-stm32mp/recipes-*/*/*.bbappend \
+    intel:${LAYERDIR}/dynamic-layers/meta-intel/recipes-*/*/*.bb \
+    intel:${LAYERDIR}/dynamic-layers/meta-intel/*/*/*.bbappend \
 "
 
 PREFERRED_PROVIDER_libgcc-initial = "libgcc-initial"
@@ -29,9 +33,7 @@ INHERIT += "clang"
 # Do not include clang in SDK unless user wants to
 CLANGSDK ??= "0"
 
-LLVMVERSION = "10.0.1"
+LLVMVERSION = "12.0.0"
 
 require conf/nonclangable.conf
 require conf/nonscanable.conf
-
-NON_MULTILIB_RECIPES_append = " bcc bpftrace"
diff --git a/conf/nonclangable.conf b/conf/nonclangable.conf
index 6ef16fe..f2bee64 100644
--- a/conf/nonclangable.conf
+++ b/conf/nonclangable.conf
@@ -1,7 +1,4 @@
-#babeltrace2: ELF binary /usr/lib/babeltrace2/plugins/babeltrace-plugin-text.so has relocations in .text [textrel]
-TOOLCHAIN_pn-babeltrace2 = "gcc"
 TOOLCHAIN_pn-u-boot = "gcc"
-TOOLCHAIN_pn-cpufrequtils = "gcc"
 # crash embeds version of gdb which is not buildable with clang
 TOOLCHAIN_pn-crash = "gcc"
 TOOLCHAIN_pn-elfutils = "gcc"
@@ -38,6 +35,15 @@ TOOLCHAIN_pn-libgcc = "gcc"
 TOOLCHAIN_pn-libgcc-initial = "gcc"
 TOOLCHAIN_pn-libgfortran = "gcc"
 TOOLCHAIN_pn-libssp-nonshared = "gcc"
+
+# Dunfell is not affected by the ell and iwd breakages.
+# Once we update past dunfell, patches to fix it properly
+# can be found in OpenMandriva packages.
+# ell 0.39 introduced nested functions sadly
+#TOOLCHAIN_pn-ell = "gcc"
+# iwd 1.13 introduced nested functions sadly
+#TOOLCHAIN_pn-iwd = "gcc"
+
 #| cargo:warning=/mnt/a/yoe/build/tmp/work/cortexa7t2hf-neon-vfpv4-yoe-linux-gnueabi/libstd-rs/1.27.1-r0/re
 #cipe-sysroot/usr/include/bits/stdlib.h:90:3: error: "Assumed value of MB_LEN_MAX wrong"
 #| cargo:warning=# error "Assumed value of MB_LEN_MAX wrong"
@@ -49,8 +55,6 @@ TOOLCHAIN_pn-m4_powerpc = "gcc"
 #TOOLCHAIN_pn-mesa_mipsel = "gcc"
 TOOLCHAIN_pn-mesa_riscv64 = "gcc"
 TOOLCHAIN_pn-mesa_powerpc = "gcc"
-# multiple definition of 'mongo::error_details::isNamedCode<0>'
-TOOLCHAIN_pn-mongodb = "gcc"
 # variant-impl.hpp:309:36: error: 'is_variant' does not name a template but is followed by template arguments
 TOOLCHAIN_pn-omxplayer = "gcc"
 # error: return address can be determined only for current frame
@@ -63,14 +67,13 @@ TOOLCHAIN_pn-prelink = "gcc"
 # Qemu cant run profile tests run during build
 # | *** stack smashing detected ***: terminated
 # | ./pgo-wrapper: line 3: 3372346 Aborted
-TOOLCHAIN_pn-python3 = "gcc"
+#TOOLCHAIN_pn-python3 = "gcc"
 # has dpkg source which does not compile
 TOOLCHAIN_pn-start-stop-daemon = "gcc"
 TOOLCHAIN_pn-syslinux = "gcc"
 TOOLCHAIN_pn-systemtap = "gcc"
 # v4l-utils uses nested functions
 TOOLCHAIN_pn-v4l-utils = "gcc"
-TOOLCHAIN_pn-valgrind = "gcc"
 # uses C++ which clang does not like
 TOOLCHAIN_pn-wvstreams = "gcc"
 TOOLCHAIN_pn-wvdial = "gcc"
@@ -90,16 +93,16 @@ TOOLCHAIN_pn-icu_armv5 = "gcc"
 #../../libgcrypt-1.6.5/mpi/mpih-div.c:98:3: error: invalid use of a cast in a inline asm context requiring an l-value: remove the cast or build with -fheinous-gnu-extensions
 TOOLCHAIN_pn-libgcrypt_mips64 = "gcc"
 
-#| ../../pixman-0.34.0/test/utils-prng.c:131:29: error: cannot convert between vector type '__attribute__((__vector_size__(16 * sizeof(char)))) char' (vector of 16 'char' values) and vector type 'uint8x16' (vector of 16 'uint8_t' values) as implicit conversion would cause truncation
-#|                 randdata.vb |= (t.vb >= const_C0#);
-#|                             ^
-# also see http://lists.llvm.org/pipermail/llvm-dev/2016-October/105997.html
-TOOLCHAIN_pn-pixman = "gcc"
+# 32-bit assembly code in pixman uses gas specific extensions
+CFLAGS_append_pn-pixman_toolchain-clang_arm = " -fno-integrated-as"
+# debug information generated by clang 12 confuses the older
+# external gas version
+DEBUG_FLAGS_remove_pn-pixman_toolchain-clang_arm = "-g"
 
 #recipe-sysroot/usr/include/mozjs-60/mozilla/Span.h:634:5: error: statement not allowed in constexpr function
 #|     MOZ_RELEASE_ASSERT(aStart <= len && (aLength == dynamic_extent ||
 #|     ^
-TOOLCHAIN_pn-polkit = "gcc"
+#TOOLCHAIN_pn-polkit = "gcc"
 
 #| ./ports/linux/pseudo_wrappers.c:80:14: error: use of unknown builtin '__builtin_apply' [-Wimplicit-function-declaration]
 #|         void *res = __builtin_apply((void (*)()) real_syscall, __builtin_apply_args(), sizeof(long) * 7);
@@ -117,9 +120,6 @@ TOOLCHAIN_pn-pulseaudio_aarch64 = "gcc"
 TOOLCHAIN_pn-pulseaudio_armv7ve = "gcc"
 TOOLCHAIN_pn-pulseaudio_armv7a = "gcc"
 
-# clang++ hangs see https://bugs.llvm.org/show_bug.cgi?id=45134
-DEBUG_FLAGS_remove_pn-sqlite-orm_toolchain-clang = "-g"
-
 #| /usr/src/debug/qemu/2.6.0-r1/qemu-2.6.0/util/bitmap.c:191: undefined reference to `__atomic_fetch_or_4'
 #| /usr/src/debug/qemu/2.6.0-r1/qemu-2.6.0/util/bitmap.c:210: undefined reference to `__atomic_fetch_or_4'
 #| libqemuutil.a(bitmap.o): In function `bitmap_test_and_clear_atomic':
@@ -142,6 +142,10 @@ TOOLCHAIN_pn-lttng-ust_riscv64 = "gcc"
 #| ../libffi-3.3-rc0/src/arm/sysv.S:132: Error: selected processor does not support `vldmgt sp,{d0-d7}' in ARM mode
 TOOLCHAIN_pn-libffi_armeb = "gcc"
 
+# Clang/mips still generates __sync_fetch_and_add_8 instead of __atomic_fetch_add_8 so it can't even use
+# libatomic to provide these functions, therefore can not compile redis on mips
+TOOLCHAIN_pn-redis_mips = "gcc"
+
 CFLAGS_append_pn-liboil_toolchain-clang_x86-64 = " -fheinous-gnu-extensions "
 
 #io_getevents.c:25:141: error: invalid use of a cast in a inline asm context requiring an l-value: remove the cast or build with -fheinous-gnu-extensions
@@ -151,10 +155,6 @@ CFLAGS_append_pn-libaio_toolchain-clang_mips = " -fheinous-gnu-extensions"
 #| error: unknown warning option '-Wimplicit-fallthrough=0'; did you mean '-Wimplicit-fallthrough'? [-Werror,-Wunknown-warning-option]
 CFLAGS_append_pn-mdadm_toolchain-clang = " -Wno-error=unknown-warning-option"
 
-#../libffi-3.2.1/src/arm/sysv.S:363:2: error: invalid instruction, did you mean: fldmiax?
-# fldmiadgt ip, {d0-d7}
-CFLAGS_append_pn-libffi_arm_toolchain-clang = " -no-integrated-as"
-
 # ../db-5.3.28/src/mutex/mut_tas.c:150:34: error: unknown directive
 #<inline asm>:9:2: note: instantiated into assembly here
 # .force_thumb
@@ -166,17 +166,6 @@ CFLAGS_append_pn-libffi_arm_toolchain-clang = " -no-integrated-as"
 #|  ^
 CFLAGS_append_pn-directfb_toolchain-clang_arm = " -no-integrated-as"
 
-# Disable internal assembler for armv7 since it uses gnu assmebly syntax
-# which should be preprocessed via gcc/compiler
-#
-CFLAGS_append_pn-openssl_toolchain-clang_armv7ve = " -no-integrated-as"
-CFLAGS_append_pn-openssl_toolchain-clang_armv7a = " -no-integrated-as"
-
-#| crypto/bn/bn-mips.S:671:2: error: unknown instruction, did you mean: bgeu, sgtu, tgeu?
-#|  sgeu $1,$4,$6
-#|  ^
-CC_append_pn-openssl_toolchain-clang_mipsarch = " -no-integrated-as"
-
 CFLAGS_append_pn-userland_toolchain-clang = " -no-integrated-as"
 
 # libjpeg-turbo-2.0.2/simd/mips/jsimd_dspr2.S
@@ -207,12 +196,27 @@ CFLAGS_append_pn-tinymembench_toolchain-clang_mipsarch = " -no-integrated-as"
 CFLAGS_append_pn-ne10_toolchain-clang_arm = " -no-integrated-as"
 CFLAGS_append_pn-libde265_toolchain-clang_arm = " -no-integrated-as"
 
-# :5 :    error:    unknown directive 
+# :5 :    error:    unknown directive
 #^
 #    .endfunc
 #    ^
 CFLAGS_append_pn-libsdl2_toolchain-clang_arm = " -no-integrated-as"
 
+#2816:2: error: changed section type for .debug_frame, expected: 0x7000001E
+# .section .debug_frame,"",@progbits
+# ^
+#lj_vm.S:2890:2: error: changed section flags for .eh_frame, expected: 0x2
+# .section .eh_frame,"aw",@progbits
+# ^
+CFLAGS_append_pn-luajit_toolchain-clang_mips = " -no-integrated-as"
+
+# Generated asm file can not be compiled with clang assembler due to presence of .0 label
+# and its references
+#| aes-decrypt-internal-2.s:368:1: error: unexpected token at start of statement
+#| .0:
+#| ^
+CFLAGS_append_pn-nettle_toolchain-clang_powerpc64le = " -no-integrated-as"
+
 # regtest.cc:374:39: error: invalid suffix on literal; C++11 requires a
 # space between literal and identifier [-Wreserved-user-defined-literal]
 #|   snprintf_func (buf, sizeof(buf), "%"Q"u", x);
@@ -236,46 +240,53 @@ TUNE_CCARGS_remove_pn-nfs-utils_toolchain-clang = "-Qunused-arguments"
 
 # We want to error out when -msse option is used otherwise it enables sse on non-x86 arches
 TUNE_CCARGS_remove_pn-pipewire_toolchain-clang = "-Qunused-arguments"
+TUNE_CCARGS_remove_pn-tesseract_toolchain-clang = "-Qunused-arguments"
+TUNE_CCARGS_remove_pn-pulseaudio_toolchain-clang = "-Qunused-arguments"
 
 #| /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)
-COMPILER_RT_pn-ruby_toolchain-clang = "--rtlib=compiler-rt ${UNWINDLIB}"
-COMPILER_RT_pn-python3_toolchain-clang = "--rtlib=compiler-rt ${UNWINDLIB}"
-COMPILER_RT_pn-m4_toolchain-clang = "--rtlib=compiler-rt ${UNWINDLIB}"
-COMPILER_RT_pn-cpio_toolchain-clang = "--rtlib=compiler-rt ${UNWINDLIB}"
-COMPILER_RT_pn-webkitgtk_toolchain-clang = "--rtlib=compiler-rt ${UNWINDLIB}"
-COMPILER_RT_pn-wpewebkit_toolchain-clang = "--rtlib=compiler-rt ${UNWINDLIB}"
-COMPILER_RT_remove_pn-m4_powerpc = "--rtlib=compiler-rt"
-COMPILER_RT_remove_pn-ruby_powerpc = "--rtlib=compiler-rt"
-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"
+COMPILER_RT_pn-ruby_toolchain-clang = "-rtlib=compiler-rt ${UNWINDLIB}"
+COMPILER_RT_pn-python3_toolchain-clang = "-rtlib=compiler-rt ${UNWINDLIB}"
+COMPILER_RT_pn-m4_toolchain-clang = "-rtlib=compiler-rt ${UNWINDLIB}"
+COMPILER_RT_pn-cpio_toolchain-clang = "-rtlib=compiler-rt ${UNWINDLIB}"
+COMPILER_RT_pn-openssh_toolchain-clang = "-rtlib=compiler-rt ${UNWINDLIB}"
+COMPILER_RT_pn-webkitgtk_toolchain-clang = "-rtlib=compiler-rt ${UNWINDLIB}"
+COMPILER_RT_pn-wpewebkit_toolchain-clang = "-rtlib=compiler-rt ${UNWINDLIB}"
+COMPILER_RT_pn-python3-numpy_toolchain-clang = "-rtlib=compiler-rt ${UNWINDLIB}"
+COMPILER_RT_remove_pn-m4_powerpc = "-rtlib=compiler-rt"
+COMPILER_RT_remove_pn-ruby_powerpc = "-rtlib=compiler-rt"
+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-gnutls_toolchain-clang_riscv64 = " -latomic"
 LDFLAGS_append_pn-harfbuzz_toolchain-clang_riscv64 = " -latomic"
 LDFLAGS_append_pn-qtwebengine_toolchain-clang_runtime-gnu_x86 = " -latomic"
+LDFLAGS_append_pn-qemu_toolchain-clang_runtime-gnu_x86 = " -latomic"
 
 # glibc is built with gcc and hence encodes some libgcc specific builtins which are not found
 # when doing static linking with clang using compiler-rt, so use libgcc
 # undefined reference to `__unordtf2'
-COMPILER_RT_pn-libc-bench_libc-glibc_toolchain-clang_x86 = "--rtlib=libgcc"
-COMPILER_RT_pn-aufs-util_libc-glibc_toolchain-clang_x86 = "--rtlib=libgcc"
-COMPILER_RT_pn-libhugetlbfs_libc-glibc_toolchain-clang_x86 = "--rtlib=libgcc"
-COMPILER_RT_pn-tsocks_libc-glibc_toolchain-clang_x86 = "--rtlib=libgcc"
-COMPILER_RT_pn-libc-bench_libc-glibc_toolchain-clang_x86-64 = "--rtlib=libgcc"
-COMPILER_RT_pn-aufs-util_libc-glibc_toolchain-clang_x86-64 = "--rtlib=libgcc"
-COMPILER_RT_pn-libhugetlbfs_libc-glibc_toolchain-clang_x86-64 = "--rtlib=libgcc"
-COMPILER_RT_pn-tsocks_libc-glibc_toolchain-clang_x86-64 = "--rtlib=libgcc"
+COMPILER_RT_pn-libc-bench_libc-glibc_toolchain-clang_x86 = "-rtlib=libgcc"
+COMPILER_RT_pn-aufs-util_libc-glibc_toolchain-clang_x86 = "-rtlib=libgcc"
+COMPILER_RT_pn-libhugetlbfs_libc-glibc_toolchain-clang_x86 = "-rtlib=libgcc"
+COMPILER_RT_pn-tsocks_libc-glibc_toolchain-clang_x86 = "-rtlib=libgcc"
+COMPILER_RT_pn-libc-bench_libc-glibc_toolchain-clang_x86-64 = "-rtlib=libgcc"
+COMPILER_RT_pn-aufs-util_libc-glibc_toolchain-clang_x86-64 = "-rtlib=libgcc"
+COMPILER_RT_pn-libhugetlbfs_libc-glibc_toolchain-clang_x86-64 = "-rtlib=libgcc"
+COMPILER_RT_pn-tsocks_libc-glibc_toolchain-clang_x86-64 = "-rtlib=libgcc"
 
 #(unwind.o): in function `__pthread_unwind':
 #/usr/src/debug/glibc/2.29-r0/git/nptl/unwind.c:121: undefined reference to `_Unwind_ForcedUnwind'
 #clang-8: error: linker command failed with exit code 1 (use -v to see invocation)
-COMPILER_RT_pn-libc-bench_libc-glibc_toolchain-clang_arm = "--rtlib=libgcc"
-COMPILER_RT_pn-aufs-util_libc-glibc_toolchain-clang_arm = "--rtlib=libgcc"
-COMPILER_RT_pn-libhugetlbfs_libc-glibc_toolchain-clang_arm = "--rtlib=libgcc"
-
-RUNTIME_pn-gerbera_toolchain-clang = "llvm"
+COMPILER_RT_pn-libc-bench_libc-glibc_toolchain-clang_arm = "-rtlib=libgcc"
+COMPILER_RT_pn-aufs-util_libc-glibc_toolchain-clang_arm = "-rtlib=libgcc"
+COMPILER_RT_pn-libhugetlbfs_libc-glibc_toolchain-clang_arm = "-rtlib=libgcc"
 
 # 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
@@ -291,3 +302,16 @@ BUILD_CC_pn-nss_toolchain-clang = "clang"
 CXXFLAGS_append_pn-apt_toolchain-clang = " -Wno-c++11-narrowing"
 lcl_maybe_fortify_pn-apt_toolchain-clang = ""
 
+# LTO
+# Seems to use symver ASMs see https://stackoverflow.com/questions/46304742/how-to-combine-lto-with-symbol-versioning
+# lib/puny_encode.c:136: multiple definition of `_idn2_punycode_encode'
+LTO_pn-libidn2_toolchain-clang = ""
+
+#libcairo.so: undefined reference to pthread_mutexattr_init [--no-allow-shlib-undefined]
+LTO_pn-cairo_toolchain-clang = ""
+
+# Hardcoded gcc use in makefiles
+TOOLCHAIN_pn-u-boot-stm32mp = "gcc"
+TOOLCHAIN_pn-tf-a-stm32mp = "gcc"
+TOOLCHAIN_pn-tf-a-stm32mp-serialboot = "gcc"
+TOOLCHAIN_pn-u-boot-seco-imx = "gcc"
diff --git a/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland_%.bbappend b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland_%.bbappend
new file mode 100644
index 0000000..554578e
--- /dev/null
+++ b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland_%.bbappend
@@ -0,0 +1,6 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+DEPENDS_remove = "compiler-rt-native libcxx-native"
+
+BUILD_CPPFLAGS_remove = "-isysroot=${STAGING_DIR_NATIVE} -stdlib=libc++"
+BUILD_LDFLAGS_remove = "-rtlib=libgcc -unwindlib=libgcc -stdlib=libc++ -lc++abi -rpath ${STAGING_LIBDIR_NATIVE}"
diff --git a/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-x11_%.bbappend b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-x11_%.bbappend
new file mode 100644
index 0000000..554578e
--- /dev/null
+++ b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-x11_%.bbappend
@@ -0,0 +1,6 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+DEPENDS_remove = "compiler-rt-native libcxx-native"
+
+BUILD_CPPFLAGS_remove = "-isysroot=${STAGING_DIR_NATIVE} -stdlib=libc++"
+BUILD_LDFLAGS_remove = "-rtlib=libgcc -unwindlib=libgcc -stdlib=libc++ -lc++abi -rpath ${STAGING_LIBDIR_NATIVE}"
diff --git a/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/gn-native_%.bbappend b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/gn-native_%.bbappend
new file mode 100644
index 0000000..cd60c58
--- /dev/null
+++ b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/gn-native_%.bbappend
@@ -0,0 +1,6 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+DEPENDS_remove = "compiler-rt-native libcxx-native"
+
+CXXFLAGS_remove = "-isysroot=${STAGING_DIR_NATIVE} -stdlib=libc++"
+LDFLAGS_remove = "-rtlib=libgcc -unwindlib=libgcc -stdlib=libc++ -lc++abi -rpath ${STAGING_LIBDIR_NATIVE}"
diff --git a/dynamic-layers/meta-intel/recipes-multimedia/mediasdk/intel-mediasdk/intel-mediasdk-20.5.1-no-lgcc.patch b/dynamic-layers/meta-intel/recipes-multimedia/mediasdk/intel-mediasdk/intel-mediasdk-20.5.1-no-lgcc.patch
new file mode 100644
index 0000000..866dbcd
--- /dev/null
+++ b/dynamic-layers/meta-intel/recipes-multimedia/mediasdk/intel-mediasdk/intel-mediasdk-20.5.1-no-lgcc.patch
@@ -0,0 +1,30 @@
+Author: Bernhard Rosenkraenzer <bernhard.rosenkraenzer.ext@huawei.com>
+
+Remove -lgcc -- it's unneeded and breaks building with compiler-rt.
+
+Signed-off-by: Bernhard Rosenkraenzer <bernhard.rosenkraenzer.ext@huawei.com>
+Upstream-Status: Pending
+
+diff -up git/builder/FindFunctions.cmake.omv~ git/builder/FindFunctions.cmake
+--- git/builder/FindFunctions.cmake.omv~        2021-06-03 20:35:11.230895070 +0200
++++ git/builder/FindFunctions.cmake     2021-06-03 20:35:49.750360067 +0200
+@@ -200,10 +200,6 @@ function( make_library name variant type
+   set_target_properties( ${target} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BIN_DIR}/${CMAKE_BUILD_TYPE} FOLDER ${folder} )
+   set_target_properties( ${target} PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_LIB_DIR}/${CMAKE_BUILD_TYPE} FOLDER ${folder} )
+ 
+-  if( Linux )
+-    target_link_libraries( ${target} "-lgcc" )
+-  endif()
+-
+   set( target ${target} PARENT_SCOPE )
+ endfunction()
+ 
+@@ -278,7 +274,7 @@ function( make_executable name variant )
+   endforeach()
+ 
+   if( Linux )
+-    target_link_libraries( ${target} "-Xlinker --end-group -lgcc" )
++    target_link_libraries( ${target} "-Xlinker --end-group" )
+   endif()
+ 
+   set( target ${target} PARENT_SCOPE )
diff --git a/dynamic-layers/meta-intel/recipes-multimedia/mediasdk/intel-mediasdk_%.bbappend b/dynamic-layers/meta-intel/recipes-multimedia/mediasdk/intel-mediasdk_%.bbappend
new file mode 100644
index 0000000..d070d03
--- /dev/null
+++ b/dynamic-layers/meta-intel/recipes-multimedia/mediasdk/intel-mediasdk_%.bbappend
@@ -0,0 +1,3 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI_append_toolchain-clang = " file://intel-mediasdk-20.5.1-no-lgcc.patch"
diff --git a/dynamic-layers/meta-st-stm32mp/recipes-security/optee/optee-os-stm32mp/optee-fix-build-with-clang.patch b/dynamic-layers/meta-st-stm32mp/recipes-security/optee/optee-os-stm32mp/optee-fix-build-with-clang.patch
new file mode 100644
index 0000000..6581d77
--- /dev/null
+++ b/dynamic-layers/meta-st-stm32mp/recipes-security/optee/optee-os-stm32mp/optee-fix-build-with-clang.patch
@@ -0,0 +1,67 @@
+From: Bernhard Rosenkraenzer <bernhard.rosenkraenzer.ext@huawei.com>
+Subject: [optee-os-stm] Fix build with clang
+
+Fix build with clang: No suffix to RCC_MP_ENCLRR_OFFSET (it's used
+in assembly code), fix warning in mbedtls, look for compiler-rt
+inside the sysroot instead of on the system
+
+Signed-off-by: Bernhard Rosenkraenzer <bernhard.rosenkraenzer.ext@huawei.com>
+Upstream-Status: Pending
+
+diff -up git/core/include/drivers/stm32mp1_rcc.h.omv~ git/core/include/drivers/stm32mp1_rcc.h
+--- git/core/include/drivers/stm32mp1_rcc.h.omv~        2021-06-04 23:35:39.741212399 +0200
++++ git/core/include/drivers/stm32mp1_rcc.h     2021-06-04 23:37:28.856900701 +0200
+@@ -280,10 +280,10 @@
+ #define RCC_TIMGXPRER_TIMGXPRE         BIT(0)
+ 
+ /* Offset between RCC_MP_xxxENSETR and RCC_MP_xxxENCLRR registers */
+-#define RCC_MP_ENCLRR_OFFSET           4u
++#define RCC_MP_ENCLRR_OFFSET           4
+ 
+ /* Offset between RCC_MP_xxxRSTSETR and RCC_MP_xxxRSTCLRR registers */
+-#define RCC_MP_RSTCLRR_OFFSET          4u
++#define RCC_MP_RSTCLRR_OFFSET          4
+ 
+ /* Fields of RCC_BDCR register */
+ #define RCC_BDCR_LSEON                 BIT(0)
+diff -up git/lib/libmbedtls/mbedtls/library/md5.c.omv~ git/lib/libmbedtls/mbedtls/library/md5.c
+--- git/lib/libmbedtls/mbedtls/library/md5.c.omv~       2021-06-04 23:35:39.742212415 +0200
++++ git/lib/libmbedtls/mbedtls/library/md5.c    2021-06-04 23:37:28.857900716 +0200
+@@ -428,8 +428,8 @@ static const unsigned char md5_test_buf[
+     { "message digest" },
+     { "abcdefghijklmnopqrstuvwxyz" },
+     { "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789" },
+-    { "12345678901234567890123456789012345678901234567890123456789012"
+-      "345678901234567890" }
++    { ("12345678901234567890123456789012345678901234567890123456789012"
++      "345678901234567890") }
+ };
+ 
+ static const size_t md5_test_buflen[7] =
+diff -up git/mk/clang.mk.omv~ git/mk/clang.mk
+--- git/mk/clang.mk.omv~        2021-06-04 23:35:39.742212415 +0200
++++ git/mk/clang.mk     2021-06-04 23:38:35.887937844 +0200
+@@ -25,10 +25,11 @@ nostdinc$(sm)       := -nostdinc -isystem $(sh
+ comp-cflags-warns-clang := -Wno-language-extension-token \
+                         -Wno-gnu-zero-variadic-macro-arguments
+ 
++SYSROOT := $(shell echo $(CC) |sed -e 's,.*--sysroot=,,;s, .*,,g')
+ # Note, use the compiler runtime library (libclang_rt.builtins.*.a) instead of
+ # libgcc for clang
+-libgcc$(sm)    := $(shell $(CC$(sm)) $(CFLAGS$(arch-bits-$(sm))) \
+-                       -rtlib=compiler-rt -print-libgcc-file-name 2> /dev/null)
++libgcc$(sm)    := $(SYSROOT)/$(shell echo $(shell $(CC$(sm)) $(CFLAGS$(arch-bits-$(sm))) \
++                       -rtlib=compiler-rt -print-libgcc-file-name 2> /dev/null) |sed -e 's,-arm\.a,-armhf.a,')
+ 
+ # Core ASLR relies on the executable being ready to run from its preferred load
+ # address, because some symbols are used before the MMU is enabled and the
+@@ -36,7 +37,8 @@ libgcc$(sm)   := $(shell $(CC$(sm)) $(CFLA
+ ldflag-apply-dynamic-relocs := --apply-dynamic-relocs
+ 
+ # Define these to something to discover accidental use
+-CC             := false
++# Not CC because we need it to determine SYSROOT
++#CC            := false
+ CXX            := false
+ CPP            := false
+ LD             := false
diff --git a/dynamic-layers/meta-st-stm32mp/recipes-security/optee/optee-os-stm32mp_%.bbappend b/dynamic-layers/meta-st-stm32mp/recipes-security/optee/optee-os-stm32mp_%.bbappend
new file mode 100644
index 0000000..cb513d3
--- /dev/null
+++ b/dynamic-layers/meta-st-stm32mp/recipes-security/optee/optee-os-stm32mp_%.bbappend
@@ -0,0 +1,7 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI_append_toolchain-clang = " file://optee-fix-build-with-clang.patch"
+
+EXTRA_OEMAKE_append_toolchain-clang = "COMPILER=clang"
+
+DEPENDS_append_toolchain-clang = "compiler-rt"
diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc/0001-Add-KBUILD_MODNAME-flag-to-default-cflags.patch b/dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc/0001-Add-KBUILD_MODNAME-flag-to-default-cflags.patch
deleted file mode 100644
index 1ca73ba..0000000
--- a/dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc/0001-Add-KBUILD_MODNAME-flag-to-default-cflags.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 9e2415679e41adacc59dd7a426d505232f0b7129 Mon Sep 17 00:00:00 2001
-From: William Findlay <william@williamfindlay.com>
-Date: Wed, 17 Jun 2020 12:07:48 -0400
-Subject: [PATCH 1/2] Add KBUILD_MODNAME flag to default cflags
-
-Upstream-Status: Backported [https://github.com/iovisor/bcc/pull/2974/commits/badd85c58549d0e7f0d536490c41213141e180c5]
-
-Signed-off-by: He Zhe <zhe.he@windriver.com>
----
- src/cc/frontends/clang/kbuild_helper.cc | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/cc/frontends/clang/kbuild_helper.cc b/src/cc/frontends/clang/kbuild_helper.cc
-index db5ca7f6..e3aade89 100644
---- a/src/cc/frontends/clang/kbuild_helper.cc
-+++ b/src/cc/frontends/clang/kbuild_helper.cc
-@@ -101,6 +101,7 @@ int KBuildHelper::get_flags(const char *uname_machine, vector<string> *cflags) {
-   cflags->push_back("-D__HAVE_BUILTIN_BSWAP16__");
-   cflags->push_back("-D__HAVE_BUILTIN_BSWAP32__");
-   cflags->push_back("-D__HAVE_BUILTIN_BSWAP64__");
-+  cflags->push_back("-DKBUILD_MODNAME=\"bcc\"");
- 
-   // If ARCH env variable is set, pass this along.
-   if (archenv)
--- 
-2.26.2
-
diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc/0001-CMakeLists.txt-override-the-PY_CMD_ESCAPED.patch b/dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc/0001-CMakeLists.txt-override-the-PY_CMD_ESCAPED.patch
new file mode 100644
index 0000000..a08c109
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc/0001-CMakeLists.txt-override-the-PY_CMD_ESCAPED.patch
@@ -0,0 +1,46 @@
+From 4f64ed40e1ffea7ea278627f30a01018e57dcbcf Mon Sep 17 00:00:00 2001
+From: Mingli Yu <mingli.yu@windriver.com>
+Date: Wed, 9 Sep 2020 05:48:19 +0000
+Subject: [PATCH] CMakeLists.txt: override the PY_CMD_ESCAPED
+
+Override the PY_CMD_ESCAPED as the PY_CMD_ESCAPED is constructed by
+the full path of the python3. In some cases, the path is so long and
+result in the PY_CMD_ESCAPED exceeds 255 characters and comes below
+do_configure error:
+ | CMake Error at src/python/CMakeLists.txt:18 (configure_file):
+ |   configure_file Problem configuring file
+ |
+ | CMake Error: Could not open file for write in copy operation /buildarea1/test/wr_build/wr1020_20200909_bcc/bcc_long_Kernel/auto-standalone_next/200827/lxbuilds/Intel-Snow-Ridge-NS_platform_up/intel-x86-64-standard-glibc-std/wrlinux/build/tmp-glibc/work/corei7-64-wrs-linux/bcc/0.15.0-r0/build/src/python/bcc--buildarea1-test-wr_build-wr1020_20200909_bcc-bcc_long_Kernel-auto-standalone_next-200827-lxbuilds-Intel-Snow-Ridge-NS_platform_up-intel-x86-64-standard-glibc-std-wrlinux-build-tmp-glibc-work-corei7-64-wrs-linux-bcc-0.15.0-r0-recipe-sysroot-native-usr-bin-python3-native-python3/bcc/version.py.tmp
+
+Upstream-Status: Pending
+
+Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
+---
+ src/python/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt
+index 797e0d14..8afa6ffa 100644
+--- a/src/python/CMakeLists.txt
++++ b/src/python/CMakeLists.txt
+@@ -12,7 +12,7 @@ file(GLOB_RECURSE PYTHON_INCLUDES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+ 
+ foreach(PY_CMD ${PYTHON_CMD})
+   string(REPLACE "/" "-" PY_CMD_ESCAPED ${PY_CMD})
+-  set(PY_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bcc-${PY_CMD_ESCAPED})
++  set(PY_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bcc-python3)
+ 
+   foreach(PY_SRC ${PYTHON_SOURCES})
+     configure_file(${PY_SRC} ${PY_DIRECTORY}/${PY_SRC} COPYONLY)
+@@ -31,7 +31,7 @@ foreach(PY_CMD ${PYTHON_CMD})
+     DEPENDS ${PYTHON_SOURCES} ${PYTHON_INCLUDES}
+     COMMENT "Building sdist for ${PY_CMD}"
+   )
+-  add_custom_target(bcc_py_${PY_CMD_ESCAPED} ALL DEPENDS ${PIP_INSTALLABLE})
++  add_custom_target(bcc_py_python3 ALL DEPENDS ${PIP_INSTALLABLE})
+ 
+   install(
+     CODE "
+-- 
+2.26.2
+
diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc/0001-Delete-existing-kbuild_modname-definitions.patch b/dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc/0001-Delete-existing-kbuild_modname-definitions.patch
deleted file mode 100644
index dd87997..0000000
--- a/dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc/0001-Delete-existing-kbuild_modname-definitions.patch
+++ /dev/null
@@ -1,176 +0,0 @@
-From eb8b0487a05d650499b20fdd5edeb6e47c2c17a5 Mon Sep 17 00:00:00 2001
-From: William Findlay <william@williamfindlay.com>
-Date: Wed, 17 Jun 2020 18:59:43 -0400
-Subject: [PATCH 2/2] Delete existing kbuild_modname definitions
-
-Upstream-Status: Backported [https://github.com/iovisor/bcc/pull/2974/commits/a5bdc9c65746389d7072e1e8e583025dde78e91b]
-
-Adjust context
-
-Signed-off-by: He Zhe <zhe.he@windriver.com>
----
- examples/networking/xdp/xdp_drop_count.py    | 1 -
- examples/networking/xdp/xdp_macswap_count.py | 1 -
- examples/networking/xdp/xdp_redirect_cpu.py  | 1 -
- examples/networking/xdp/xdp_redirect_map.py  | 1 -
- tests/python/test_clang.py                   | 8 --------
- tools/tcplife.lua                            | 1 -
- tools/tcplife.py                             | 1 -
- tools/tcpstates.py                           | 1 -
- 8 files changed, 15 deletions(-)
-
-diff --git a/examples/networking/xdp/xdp_drop_count.py b/examples/networking/xdp/xdp_drop_count.py
-index f03273e9..512e0a20 100755
---- a/examples/networking/xdp/xdp_drop_count.py
-+++ b/examples/networking/xdp/xdp_drop_count.py
-@@ -52,7 +52,6 @@ else:
- 
- # load BPF program
- b = BPF(text = """
--#define KBUILD_MODNAME "foo"
- #include <uapi/linux/bpf.h>
- #include <linux/in.h>
- #include <linux/if_ether.h>
-diff --git a/examples/networking/xdp/xdp_macswap_count.py b/examples/networking/xdp/xdp_macswap_count.py
-index 0e2b21ca..770ce8ca 100755
---- a/examples/networking/xdp/xdp_macswap_count.py
-+++ b/examples/networking/xdp/xdp_macswap_count.py
-@@ -50,7 +50,6 @@ else:
- 
- # load BPF program
- b = BPF(text = """
--#define KBUILD_MODNAME "foo"
- #include <uapi/linux/bpf.h>
- #include <linux/in.h>
- #include <linux/if_ether.h>
-diff --git a/examples/networking/xdp/xdp_redirect_cpu.py b/examples/networking/xdp/xdp_redirect_cpu.py
-index 15b0d09b..470079f4 100755
---- a/examples/networking/xdp/xdp_redirect_cpu.py
-+++ b/examples/networking/xdp/xdp_redirect_cpu.py
-@@ -30,7 +30,6 @@ if (cpu_id > max_cpu):
- 
- # load BPF program
- b = BPF(text = """
--#define KBUILD_MODNAME "foo"
- #include <uapi/linux/bpf.h>
- #include <linux/in.h>
- #include <linux/if_ether.h>
-diff --git a/examples/networking/xdp/xdp_redirect_map.py b/examples/networking/xdp/xdp_redirect_map.py
-index 4a622723..4936ac1e 100755
---- a/examples/networking/xdp/xdp_redirect_map.py
-+++ b/examples/networking/xdp/xdp_redirect_map.py
-@@ -29,7 +29,6 @@ out_idx = ip.link_lookup(ifname=out_if)[0]
- 
- # load BPF program
- b = BPF(text = """
--#define KBUILD_MODNAME "foo"
- #include <uapi/linux/bpf.h>
- #include <linux/in.h>
- #include <linux/if_ether.h>
-diff --git a/tests/python/test_clang.py b/tests/python/test_clang.py
-index 886eebed..648494cf 100755
---- a/tests/python/test_clang.py
-+++ b/tests/python/test_clang.py
-@@ -78,7 +78,6 @@ int count_foo(struct pt_regs *ctx, unsigned long a, unsigned long b) {
- 
-     def test_probe_read3(self):
-         text = """
--#define KBUILD_MODNAME "foo"
- #include <net/tcp.h>
- #define _(P) ({typeof(P) val = 0; bpf_probe_read(&val, sizeof(val), &P); val;})
- int count_tcp(struct pt_regs *ctx, struct sk_buff *skb) {
-@@ -90,7 +89,6 @@ int count_tcp(struct pt_regs *ctx, struct sk_buff *skb) {
- 
-     def test_probe_read4(self):
-         text = """
--#define KBUILD_MODNAME "foo"
- #include <net/tcp.h>
- #define _(P) ({typeof(P) val = 0; bpf_probe_read(&val, sizeof(val), &P); val;})
- int test(struct pt_regs *ctx, struct sk_buff *skb) {
-@@ -102,7 +100,6 @@ int test(struct pt_regs *ctx, struct sk_buff *skb) {
- 
-     def test_probe_read_whitelist1(self):
-         text = """
--#define KBUILD_MODNAME "foo"
- #include <net/tcp.h>
- int count_tcp(struct pt_regs *ctx, struct sk_buff *skb) {
-     // The below define is in net/tcp.h:
-@@ -120,7 +117,6 @@ int count_tcp(struct pt_regs *ctx, struct sk_buff *skb) {
- 
-     def test_probe_read_whitelist2(self):
-         text = """
--#define KBUILD_MODNAME "foo"
- #include <net/tcp.h>
- int count_tcp(struct pt_regs *ctx, struct sk_buff *skb) {
-     // The below define is in net/tcp.h:
-@@ -1072,7 +1068,6 @@ int test(struct __sk_buff *ctx) {
- 
-     def test_probe_read_return(self):
-         text = """
--#define KBUILD_MODNAME "foo"
- #include <uapi/linux/ptrace.h>
- #include <linux/tcp.h>
- static inline unsigned char *my_skb_transport_header(struct sk_buff *skb) {
-@@ -1088,7 +1083,6 @@ int test(struct pt_regs *ctx, struct sock *sk, struct sk_buff *skb) {
- 
-     def test_probe_read_multiple_return(self):
-         text = """
--#define KBUILD_MODNAME "foo"
- #include <uapi/linux/ptrace.h>
- #include <linux/tcp.h>
- static inline u64 error_function() {
-@@ -1109,7 +1103,6 @@ int test(struct pt_regs *ctx, struct sock *sk, struct sk_buff *skb) {
- 
-     def test_probe_read_return_expr(self):
-         text = """
--#define KBUILD_MODNAME "foo"
- #include <uapi/linux/ptrace.h>
- #include <linux/tcp.h>
- static inline unsigned char *my_skb_transport_header(struct sk_buff *skb) {
-@@ -1125,7 +1118,6 @@ int test(struct pt_regs *ctx, struct sock *sk, struct sk_buff *skb) {
- 
-     def test_probe_read_return_call(self):
-         text = """
--#define KBUILD_MODNAME "foo"
- #include <uapi/linux/ptrace.h>
- #include <linux/tcp.h>
- static inline struct tcphdr *my_skb_transport_header(struct sk_buff *skb) {
-diff --git a/tools/tcplife.lua b/tools/tcplife.lua
-index 3f4f6afd..5e311631 100755
---- a/tools/tcplife.lua
-+++ b/tools/tcplife.lua
-@@ -25,7 +25,6 @@ uint16_t ntohs(uint16_t netshort);
- 
- local program = [[
- #include <uapi/linux/ptrace.h>
--#define KBUILD_MODNAME "foo"
- #include <linux/tcp.h>
- #include <net/sock.h>
- #include <bcc/proto.h>
-diff --git a/tools/tcplife.py b/tools/tcplife.py
-index d4e679dd..c2bd8236 100755
---- a/tools/tcplife.py
-+++ b/tools/tcplife.py
-@@ -66,7 +66,6 @@ debug = 0
- # define BPF program
- bpf_text = """
- #include <uapi/linux/ptrace.h>
--#define KBUILD_MODNAME "foo"
- #include <linux/tcp.h>
- #include <net/sock.h>
- #include <bcc/proto.h>
-diff --git a/tools/tcpstates.py b/tools/tcpstates.py
-index b9a64387..09bbe0ce 100755
---- a/tools/tcpstates.py
-+++ b/tools/tcpstates.py
-@@ -61,7 +61,6 @@ debug = 0
- # define BPF program
- bpf_text = """
- #include <uapi/linux/ptrace.h>
--#define KBUILD_MODNAME "foo"
- #include <linux/tcp.h>
- #include <net/sock.h>
- #include <bcc/proto.h>
--- 
-2.26.2
-
diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc/0001-Replace-kprobe-function-blk_account_io_completion-to.patch b/dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc/0001-Replace-kprobe-function-blk_account_io_completion-to.patch
new file mode 100644
index 0000000..ef93296
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc/0001-Replace-kprobe-function-blk_account_io_completion-to.patch
@@ -0,0 +1,169 @@
+From 95c9229ea9f029a1b9e8dcbe86fc67f037c0dfa2 Mon Sep 17 00:00:00 2001
+From: Chen HaoNing <owenchen1997@yeah.net>
+Date: Wed, 1 Jul 2020 15:49:17 -0500
+Subject: [PATCH] Replace kprobe function "blk_account_io_completion" to
+ "blk_account_io_done" for kernel version >= 5.8.0
+
+The kernel function "blk_account_io_completion" is not available anymore as attach point of Kprobe as of kernel version 5.8.0. Therefore, after discussions, we decided to use function "blk_account_io_done" instead in every kprobe attachment to "blk_account_io_completion".
+
+Upstream-Status: Backport
+
+---
+ docs/reference_guide.md               | 4 ++--
+ docs/tutorial_bcc_python_developer.md | 6 +++---
+ examples/lua/kprobe-latency.lua       | 2 +-
+ examples/tracing/bitehist.py          | 2 +-
+ examples/tracing/disksnoop.py         | 2 +-
+ tools/biosnoop.lua                    | 2 +-
+ tools/biosnoop.py                     | 2 +-
+ tools/biotop.py                       | 2 +-
+ tools/old/biosnoop.py                 | 2 +-
+ 9 files changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/docs/reference_guide.md b/docs/reference_guide.md
+index 924fa203..9eaf27a5 100644
+--- a/docs/reference_guide.md
++++ b/docs/reference_guide.md
+@@ -1784,7 +1784,7 @@ Example:
+ b = BPF(text="""
+ BPF_HISTOGRAM(dist);
+ 
+-int kprobe__blk_account_io_completion(struct pt_regs *ctx, struct request *req)
++int kprobe__blk_account_io_done(struct pt_regs *ctx, struct request *req)
+ {
+        dist.increment(bpf_log2l(req->__data_len / 1024));
+        return 0;
+@@ -1835,7 +1835,7 @@ Example:
+ b = BPF(text="""
+ BPF_HISTOGRAM(dist);
+ 
+-int kprobe__blk_account_io_completion(struct pt_regs *ctx, struct request *req)
++int kprobe__blk_account_io_done(struct pt_regs *ctx, struct request *req)
+ {
+        dist.increment(req->__data_len / 1024);
+        return 0;
+diff --git a/docs/tutorial_bcc_python_developer.md b/docs/tutorial_bcc_python_developer.md
+index 0cb0e780..b3b8ed6b 100644
+--- a/docs/tutorial_bcc_python_developer.md
++++ b/docs/tutorial_bcc_python_developer.md
+@@ -220,7 +220,7 @@ void trace_completion(struct pt_regs *ctx, struct request *req) {
+ 
+ b.attach_kprobe(event="blk_start_request", fn_name="trace_start")
+ b.attach_kprobe(event="blk_mq_start_request", fn_name="trace_start")
+-b.attach_kprobe(event="blk_account_io_completion", fn_name="trace_completion")
++b.attach_kprobe(event="blk_account_io_done", fn_name="trace_completion")
+ [...]
+ ```
+ 
+@@ -351,7 +351,7 @@ b = BPF(text="""
+ 
+ BPF_HISTOGRAM(dist);
+ 
+-int kprobe__blk_account_io_completion(struct pt_regs *ctx, struct request *req)
++int kprobe__blk_account_io_done(struct pt_regs *ctx, struct request *req)
+ {
+        dist.increment(bpf_log2l(req->__data_len / 1024));
+        return 0;
+@@ -374,7 +374,7 @@ b["dist"].print_log2_hist("kbytes")
+ A recap from earlier lessons:
+ 
+ - ```kprobe__```: This prefix means the rest will be treated as a kernel function name that will be instrumented using kprobe.
+-- ```struct pt_regs *ctx, struct request *req```: Arguments to kprobe. The ```ctx``` is registers and BPF context, the ```req``` is the first argument to the instrumented function: ```blk_account_io_completion()```.
++- ```struct pt_regs *ctx, struct request *req```: Arguments to kprobe. The ```ctx``` is registers and BPF context, the ```req``` is the first argument to the instrumented function: ```blk_account_io_done()```.
+ - ```req->__data_len```: Dereferencing that member.
+ 
+ New things to learn:
+diff --git a/examples/lua/kprobe-latency.lua b/examples/lua/kprobe-latency.lua
+index 60ac2c1c..98464e5c 100644
+--- a/examples/lua/kprobe-latency.lua
++++ b/examples/lua/kprobe-latency.lua
+@@ -30,7 +30,7 @@ local lat_map = bpf.map('array', bins)
+ local trace_start = bpf.kprobe('myprobe:blk_start_request', function (ptregs)
+        map[ptregs.parm1] = time()
+ end, false, -1, 0)
+-local trace_end = bpf.kprobe('myprobe2:blk_account_io_completion', function (ptregs)
++local trace_end = bpf.kprobe('myprobe2:blk_account_io_done', function (ptregs)
+        -- The lines below are computing index
+        -- using log10(x)*10 = log2(x)*10/log2(10) = log2(x)*3
+        -- index = 29 ~ 1 usec
+diff --git a/examples/tracing/bitehist.py b/examples/tracing/bitehist.py
+index 4d7c7958..89ceb307 100755
+--- a/examples/tracing/bitehist.py
++++ b/examples/tracing/bitehist.py
+@@ -25,7 +25,7 @@ b = BPF(text="""
+ BPF_HISTOGRAM(dist);
+ BPF_HISTOGRAM(dist_linear);
+ 
+-int kprobe__blk_account_io_completion(struct pt_regs *ctx, struct request *req)
++int kprobe__blk_account_io_done(struct pt_regs *ctx, struct request *req)
+ {
+        dist.increment(bpf_log2l(req->__data_len / 1024));
+        dist_linear.increment(req->__data_len / 1024);
+diff --git a/examples/tracing/disksnoop.py b/examples/tracing/disksnoop.py
+index 1101e6f2..a35e1abd 100755
+--- a/examples/tracing/disksnoop.py
++++ b/examples/tracing/disksnoop.py
+@@ -46,7 +46,7 @@ void trace_completion(struct pt_regs *ctx, struct request *req) {
+ if BPF.get_kprobe_functions(b'blk_start_request'):
+         b.attach_kprobe(event="blk_start_request", fn_name="trace_start")
+ b.attach_kprobe(event="blk_mq_start_request", fn_name="trace_start")
+-b.attach_kprobe(event="blk_account_io_completion", fn_name="trace_completion")
++b.attach_kprobe(event="blk_account_io_done", fn_name="trace_completion")
+ 
+ # header
+ print("%-18s %-2s %-7s %8s" % ("TIME(s)", "T", "BYTES", "LAT(ms)"))
+diff --git a/tools/biosnoop.lua b/tools/biosnoop.lua
+index 8d9b6a19..3e0441e2 100755
+--- a/tools/biosnoop.lua
++++ b/tools/biosnoop.lua
+@@ -126,7 +126,7 @@ return function(BPF, utils)
+   bpf:attach_kprobe{event="blk_account_io_start", fn_name="trace_pid_start"}
+   bpf:attach_kprobe{event="blk_start_request", fn_name="trace_req_start"}
+   bpf:attach_kprobe{event="blk_mq_start_request", fn_name="trace_req_start"}
+-  bpf:attach_kprobe{event="blk_account_io_completion",
++  bpf:attach_kprobe{event="blk_account_io_done",
+       fn_name="trace_req_completion"}
+ 
+   print("%-14s %-14s %-6s %-7s %-2s %-9s %-7s %7s" % {"TIME(s)", "COMM", "PID",
+diff --git a/tools/biosnoop.py b/tools/biosnoop.py
+index ff9b842b..5bbc77cd 100755
+--- a/tools/biosnoop.py
++++ b/tools/biosnoop.py
+@@ -160,7 +160,7 @@ b.attach_kprobe(event="blk_account_io_start", fn_name="trace_pid_start")
+ if BPF.get_kprobe_functions(b'blk_start_request'):
+     b.attach_kprobe(event="blk_start_request", fn_name="trace_req_start")
+ b.attach_kprobe(event="blk_mq_start_request", fn_name="trace_req_start")
+-b.attach_kprobe(event="blk_account_io_completion",
++b.attach_kprobe(event="blk_account_io_done",
+     fn_name="trace_req_completion")
+ 
+ # header
+diff --git a/tools/biotop.py b/tools/biotop.py
+index cad3759a..d3a42ef7 100755
+--- a/tools/biotop.py
++++ b/tools/biotop.py
+@@ -178,7 +178,7 @@ b.attach_kprobe(event="blk_account_io_start", fn_name="trace_pid_start")
+ if BPF.get_kprobe_functions(b'blk_start_request'):
+     b.attach_kprobe(event="blk_start_request", fn_name="trace_req_start")
+ b.attach_kprobe(event="blk_mq_start_request", fn_name="trace_req_start")
+-b.attach_kprobe(event="blk_account_io_completion",
++b.attach_kprobe(event="blk_account_io_done",
+     fn_name="trace_req_completion")
+ 
+ print('Tracing... Output every %d secs. Hit Ctrl-C to end' % interval)
+diff --git a/tools/old/biosnoop.py b/tools/old/biosnoop.py
+index 37ee3f9c..847ab91b 100755
+--- a/tools/old/biosnoop.py
++++ b/tools/old/biosnoop.py
+@@ -98,7 +98,7 @@ int trace_req_completion(struct pt_regs *ctx, struct request *req)
+ b.attach_kprobe(event="blk_account_io_start", fn_name="trace_pid_start")
+ b.attach_kprobe(event="blk_start_request", fn_name="trace_req_start")
+ b.attach_kprobe(event="blk_mq_start_request", fn_name="trace_req_start")
+-b.attach_kprobe(event="blk_account_io_completion",
++b.attach_kprobe(event="blk_account_io_done",
+     fn_name="trace_req_completion")
+ 
+ # header
+-- 
+2.17.1
+
diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc/0001-cmake-link-dynamically-to-libclang-cpp-if-found-and-.patch b/dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc/0001-cmake-link-dynamically-to-libclang-cpp-if-found-and-.patch
new file mode 100644
index 0000000..74b2e27
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc/0001-cmake-link-dynamically-to-libclang-cpp-if-found-and-.patch
@@ -0,0 +1,68 @@
+From f14f69d996ffc1c61dd523b839271d4a51328e4d Mon Sep 17 00:00:00 2001
+From: Luca Boccassi <bluca@debian.org>
+Date: Fri, 1 Jan 2021 19:04:37 +0000
+Subject: [PATCH 1/3] cmake: link dynamically to libclang-cpp if found and
+ ENABLE_LLVM_SHARED is set
+
+ENABLE_LLVM_SHARED allows to dynamically link against libLLVM, but
+libclang is still unconditionally linked statically.
+Search for libclang-cpp.so, and if it is found and ENABLE_LLVM_SHARED
+is set dynamically link against it.
+Also expand the libstdc++ static linking check to include this new
+condition.
+---
+ CMakeLists.txt               | 1 +
+ cmake/clang_libs.cmake       | 4 ++++
+ cmake/static_libstdc++.cmake | 2 +-
+ 3 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 74fe4f19..b2e334e9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -76,6 +76,7 @@ find_library(libclangRewrite NAMES clangRewrite clang-cpp HINTS ${CLANG_SEARCH})
+ find_library(libclangSema NAMES clangSema clang-cpp HINTS ${CLANG_SEARCH})
+ find_library(libclangSerialization NAMES clangSerialization clang-cpp HINTS ${CLANG_SEARCH})
+ find_library(libclangASTMatchers NAMES clangASTMatchers clang-cpp HINTS ${CLANG_SEARCH})
++find_library(libclang-shared libclang-cpp.so HINTS ${CLANG_SEARCH})
+ if(libclangBasic STREQUAL "libclangBasic-NOTFOUND")
+   message(FATAL_ERROR "Unable to find clang libraries")
+ endif()
+diff --git a/cmake/clang_libs.cmake b/cmake/clang_libs.cmake
+index c33b635c..3f1523b7 100644
+--- a/cmake/clang_libs.cmake
++++ b/cmake/clang_libs.cmake
+@@ -26,6 +26,9 @@ llvm_map_components_to_libnames(_llvm_libs ${llvm_raw_libs})
+ llvm_expand_dependencies(llvm_libs ${_llvm_libs})
+ endif()
+ 
++if(ENABLE_LLVM_SHARED AND NOT libclang-shared STREQUAL "libclang-shared-NOTFOUND")
++set(clang_libs ${libclang-shared})
++else()
+ # order is important
+ set(clang_libs
+   ${libclangFrontend}
+@@ -46,6 +49,7 @@ list(APPEND clang_libs
+   ${libclangAST}
+   ${libclangLex}
+   ${libclangBasic})
++endif()
+ 
+ # prune unused llvm static library stuff when linking into the new .so
+ set(_exclude_flags)
+diff --git a/cmake/static_libstdc++.cmake b/cmake/static_libstdc++.cmake
+index 3c8ac179..787ed9ad 100644
+--- a/cmake/static_libstdc++.cmake
++++ b/cmake/static_libstdc++.cmake
+@@ -1,7 +1,7 @@
+ # only turn on static-libstdc++ if also linking statically against clang
+ string(REGEX MATCH ".*[.]a$" LIBCLANG_ISSTATIC "${libclangBasic}")
+ # if gcc 4.9 or higher is used, static libstdc++ is a good option
+-if (CMAKE_COMPILER_IS_GNUCC AND LIBCLANG_ISSTATIC)
++if (CMAKE_COMPILER_IS_GNUCC AND LIBCLANG_ISSTATIC AND (NOT ENABLE_LLVM_SHARED OR libclang-shared STREQUAL "libclang-shared-NOTFOUND"))
+   execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
+   if (GCC_VERSION VERSION_GREATER 4.9 OR GCC_VERSION VERSION_EQUAL 4.9)
+     execute_process(COMMAND ${CMAKE_C_COMPILER} -print-libgcc-file-name OUTPUT_VARIABLE GCC_LIB)
+-- 
+2.29.2
+
diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc/0001-fix-compilation-issues-with-latest-llvm12-trunk.patch b/dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc/0001-fix-compilation-issues-with-latest-llvm12-trunk.patch
new file mode 100644
index 0000000..b1f56e6
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc/0001-fix-compilation-issues-with-latest-llvm12-trunk.patch
@@ -0,0 +1,89 @@
+From 675fca6a646812361c16884ccd2ff789f40c4ce8 Mon Sep 17 00:00:00 2001
+From: Yonghong Song <yhs@fb.com>
+Date: Tue, 3 Nov 2020 22:11:57 -0800
+Subject: [PATCH 1/2] fix compilation issues with latest llvm12 trunk
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+With latest llvm12 trunk, we got two compilation bugs.
+
+Bug #1:
+  /home/yhs/work/bcc/src/cc/frontends/clang/b_frontend_action.cc:
+     In member function ‘void ebpf::BFrontendAction::DoMiscWorkAround()’:
+  /home/yhs/work/bcc/src/cc/frontends/clang/b_frontend_action.cc:1706:31:
+     error: ‘class clang::SourceManage’ has no member named ‘getBuffer’; did you mean ‘getBufferData’?
+     rewriter_->getSourceMgr().getBuffer(rewriter_->getSourceMgr().getMainFileID())->getBufferSize(),
+                               ^~~~~~~~~
+                               getBufferData
+
+  This is due to upstream change https://reviews.llvm.org/D89394.
+  To fix, follow upstream examples in https://reviews.llvm.org/D89394.
+
+Bug #2:
+  /home/yhs/work/bcc/src/cc/bpf_module.cc: In member function ‘int ebpf::BPFModule::finalize()’:
+  /home/yhs/work/bcc/src/cc/bpf_module.cc:470:11:
+    error: ‘class llvm::EngineBuilder’ has no member named ‘setUseOrcMCJITReplacement’
+   builder.setUseOrcMCJITReplacement(false);
+           ^~~~~~~~~~~~~~~~~~~~~~~~~
+
+  This is due to upstream
+    https://github.com/llvm/llvm-project/commit/6154c4115cd4b78d0171892aac21e340e72e32bd
+
+  It seems builder.setUseOrcMCJITReplacement() is not needed any more. So just remove it
+  from bcc.
+
+Signed-off-by: Yonghong Song <yhs@fb.com>
+---
+ src/cc/bpf_module.cc                        | 2 ++
+ src/cc/bpf_module_rw_engine.cc              | 2 ++
+ src/cc/frontends/clang/b_frontend_action.cc | 4 ++++
+ 3 files changed, 8 insertions(+)
+
+diff --git a/src/cc/bpf_module.cc b/src/cc/bpf_module.cc
+index 8fba8d27..c194b815 100644
+--- a/src/cc/bpf_module.cc
++++ b/src/cc/bpf_module.cc
+@@ -466,7 +466,9 @@ int BPFModule::finalize() {
+   builder.setErrorStr(&err);
+   builder.setMCJITMemoryManager(ebpf::make_unique<MyMemoryManager>(sections_p));
+   builder.setMArch("bpf");
++#if LLVM_MAJOR_VERSION <= 11
+   builder.setUseOrcMCJITReplacement(false);
++#endif
+   engine_ = unique_ptr<ExecutionEngine>(builder.create());
+   if (!engine_) {
+     fprintf(stderr, "Could not create ExecutionEngine: %s\n", err.c_str());
+diff --git a/src/cc/bpf_module_rw_engine.cc b/src/cc/bpf_module_rw_engine.cc
+index d7e31a71..9890af69 100644
+--- a/src/cc/bpf_module_rw_engine.cc
++++ b/src/cc/bpf_module_rw_engine.cc
+@@ -356,7 +356,9 @@ unique_ptr<ExecutionEngine> BPFModule::finalize_rw(unique_ptr<Module> m) {
+   string err;
+   EngineBuilder builder(move(m));
+   builder.setErrorStr(&err);
++#if LLVM_MAJOR_VERSION <= 11
+   builder.setUseOrcMCJITReplacement(false);
++#endif
+   auto engine = unique_ptr<ExecutionEngine>(builder.create());
+   if (!engine)
+     fprintf(stderr, "Could not create ExecutionEngine: %s\n", err.c_str());
+diff --git a/src/cc/frontends/clang/b_frontend_action.cc b/src/cc/frontends/clang/b_frontend_action.cc
+index 154a3794..80b03b9b 100644
+--- a/src/cc/frontends/clang/b_frontend_action.cc
++++ b/src/cc/frontends/clang/b_frontend_action.cc
+@@ -1694,7 +1694,11 @@ void BFrontendAction::DoMiscWorkAround() {
+     false);
+ 
+   rewriter_->getEditBuffer(rewriter_->getSourceMgr().getMainFileID()).InsertTextAfter(
++#if LLVM_MAJOR_VERSION >= 12
++    rewriter_->getSourceMgr().getBufferOrFake(rewriter_->getSourceMgr().getMainFileID()).getBufferSize(),
++#else
+     rewriter_->getSourceMgr().getBuffer(rewriter_->getSourceMgr().getMainFileID())->getBufferSize(),
++#endif
+     "\n#include <bcc/footer.h>\n");
+ }
+ 
+-- 
+2.30.0
+
diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc/0001-tools-opensnoop-snoop-do_sys_openat2-for-kernel-v5.6.patch b/dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc/0001-tools-opensnoop-snoop-do_sys_openat2-for-kernel-v5.6.patch
index f2b1495..fb659cc 100644
--- a/dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc/0001-tools-opensnoop-snoop-do_sys_openat2-for-kernel-v5.6.patch
+++ b/dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc/0001-tools-opensnoop-snoop-do_sys_openat2-for-kernel-v5.6.patch
@@ -1,4 +1,4 @@
-From 935f7e47f54df1af30f4a1cdfd2f385863ab9dec Mon Sep 17 00:00:00 2001
+From 8e12b10e7576a6d47e0dc2cdc36caeb9ba26fa12 Mon Sep 17 00:00:00 2001
 From: He Zhe <zhe.he@windriver.com>
 Date: Mon, 15 Jun 2020 07:05:24 +0000
 Subject: [PATCH] tools: opensnoop: snoop do_sys_openat2 for kernel v5.6 and
@@ -12,14 +12,14 @@ Upstream-Status: Inappropriate, upstream context has changed and needs more
 
 Signed-off-by: He Zhe <zhe.he@windriver.com>
 ---
- tools/opensnoop.py | 13 +++++++++++--
- 1 file changed, 11 insertions(+), 2 deletions(-)
+ tools/opensnoop.py | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
 
 diff --git a/tools/opensnoop.py b/tools/opensnoop.py
-index 6d1388b3..3f7e48a3 100755
+index 51d3dc05..522812d4 100755
 --- a/tools/opensnoop.py
 +++ b/tools/opensnoop.py
-@@ -21,6 +21,8 @@ from bcc.utils import printb
+@@ -22,6 +22,8 @@ from bcc.utils import printb
  import argparse
  from datetime import datetime, timedelta
  import os
@@ -28,24 +28,23 @@ index 6d1388b3..3f7e48a3 100755
  
  # arguments
  examples = """examples:
-@@ -195,8 +197,15 @@ if debug or args.ebpf:
- 
+@@ -235,8 +237,14 @@ if debug or args.ebpf:
  # initialize BPF
  b = BPF(text=bpf_text)
--b.attach_kprobe(event="do_sys_open", fn_name="trace_entry")
--b.attach_kretprobe(event="do_sys_open", fn_name="trace_return")
-+
-+# Since kernel v5.6, do_sys_openat2 instead of do_sys_open has been used as entry function for open
-+if parse_version(platform.uname().release.split('-')[0]) > parse_version('5.6.0'):
-+    entry = "do_sys_openat2"
-+else:
-+    entry = "do_sys_open"
+ if not is_support_kfunc:
+-    b.attach_kprobe(event="do_sys_open", fn_name="trace_entry")
+-    b.attach_kretprobe(event="do_sys_open", fn_name="trace_return")
++    # Since kernel v5.6, do_sys_openat2 instead of do_sys_open has been used as entry function for open
++    if parse_version(platform.uname().release.split('-')[0]) > parse_version('5.6.0'):
++        entry = "do_sys_openat2"
++    else:
++        entry = "do_sys_open"
 +
-+b.attach_kprobe(event=entry, fn_name="trace_entry")
-+b.attach_kretprobe(event=entry, fn_name="trace_return")
++    b.attach_kprobe(event=entry, fn_name="trace_entry")
++    b.attach_kretprobe(event=entry, fn_name="trace_return")
  
  initial_ts = 0
  
 -- 
-2.24.1
+2.17.1
 
diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc/0001-tools-trace.py-Fix-failing-to-exit.patch b/dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc/0001-tools-trace.py-Fix-failing-to-exit.patch
new file mode 100644
index 0000000..e39e21f
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc/0001-tools-trace.py-Fix-failing-to-exit.patch
@@ -0,0 +1,46 @@
+From a9f59fc8605de1bcca0b6c2d8132585f40c3b9bc Mon Sep 17 00:00:00 2001
+From: He Zhe <zhe.he@windriver.com>
+Date: Thu, 13 Aug 2020 11:25:58 +0800
+Subject: [PATCH] tools/trace.py: Fix failing to exit
+
+Class Probe::print_event is used as a callback of a ctypes wrapper. With
+Yocto latest python v3.8.5, the exception raised by exit() is ignored and
+thus trace cannot exit. Use os._exit(0) instead.
+
+$ /usr/share/bcc/tools/trace do_sys_open -M 1
+PID TID COMM FUNC
+3740 3740 irqbalance do_sys_open
+Exception ignored on calling ctypes callback function:
+<function PerfEventArray.open_perf_buffer.<locals>.raw_cb at 0x7f7c9efea280>
+Traceback (most recent call last):
+File "/usr/lib64/python3.8/site-packages/bcc/table.py", line 685, in raw_cb_
+callback(cpu, data, size)
+File "/usr/share/bcc/tools/trace", line 630, in print_event
+exit()
+File "/usr/lib64/python3.8/sitebuiltins.py", line 26, in __call_
+raise SystemExit(code)
+SystemExit: None
+
+Upstream-Status: Pending
+
+Signed-off-by: He Zhe <zhe.he@windriver.com>
+---
+ tools/trace.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/trace.py b/tools/trace.py
+index 7a61594f..d09dd2a8 100755
+--- a/tools/trace.py
++++ b/tools/trace.py
+@@ -627,7 +627,7 @@ BPF_PERF_OUTPUT(%s);
+                 Probe.event_count += 1
+                 if Probe.max_events is not None and \
+                    Probe.event_count >= Probe.max_events:
+-                        exit()
++                        os._exit(0)
+                 sys.stdout.flush()
+ 
+         def attach(self, bpf, verbose):
+-- 
+2.17.1
+
diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc/0002-cmake-always-link-to-packaged-libbpf-if-CMAKE_USE_LI.patch b/dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc/0002-cmake-always-link-to-packaged-libbpf-if-CMAKE_USE_LI.patch
new file mode 100644
index 0000000..0269fa4
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc/0002-cmake-always-link-to-packaged-libbpf-if-CMAKE_USE_LI.patch
@@ -0,0 +1,239 @@
+From ab9a9dadf294f69e024a8b58c983a6c2085c223a Mon Sep 17 00:00:00 2001
+From: Luca Boccassi <bluca@debian.org>
+Date: Fri, 8 Jan 2021 16:58:56 +0000
+Subject: [PATCH 2/3] cmake: always link to packaged libbpf if
+ CMAKE_USE_LIBBPF_PACKAGE is set (#3210)
+
+Some of the executables still link to the local static versions
+even if the user requested CMAKE_USE_LIBBPF_PACKAGE. Fix this by
+using bcc-shared-no-libbpf more widely if the variable is set.
+
+Skip the git submodule and the extraction commands if the user
+set CMAKE_USE_LIBBPF_PACKAGE
+---
+ CMakeLists.txt                     |  2 +-
+ examples/cpp/CMakeLists.txt        | 59 ++++++++----------------------
+ examples/cpp/pyperf/CMakeLists.txt |  5 +++
+ introspection/CMakeLists.txt       |  8 +++-
+ src/cc/CMakeLists.txt              | 29 ++++++++++-----
+ tests/cc/CMakeLists.txt            | 22 +++++++----
+ 6 files changed, 61 insertions(+), 64 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b2e334e9..b68571ea 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -14,7 +14,7 @@ endif()
+ enable_testing()
+ 
+ # populate submodules (libbpf)
+-if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/src/cc/libbpf/src)
++if(NOT CMAKE_USE_LIBBPF_PACKAGE AND NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/src/cc/libbpf/src)
+   execute_process(COMMAND git submodule update --init --recursive
+                   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+ endif()
+diff --git a/examples/cpp/CMakeLists.txt b/examples/cpp/CMakeLists.txt
+index dae0e9ce..dd343245 100644
+--- a/examples/cpp/CMakeLists.txt
++++ b/examples/cpp/CMakeLists.txt
+@@ -11,49 +11,20 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
+ 
+ option(INSTALL_CPP_EXAMPLES "Install C++ examples. Those binaries are statically linked and can take plenty of disk space" OFF)
+ 
+-add_executable(HelloWorld HelloWorld.cc)
+-target_link_libraries(HelloWorld bcc-static)
+-
+-add_executable(CPUDistribution CPUDistribution.cc)
+-target_link_libraries(CPUDistribution bcc-static)
+-
+-add_executable(RecordMySQLQuery RecordMySQLQuery.cc)
+-target_link_libraries(RecordMySQLQuery bcc-static)
+-
+-add_executable(TCPSendStack TCPSendStack.cc)
+-target_link_libraries(TCPSendStack bcc-static)
+-
+-add_executable(RandomRead RandomRead.cc)
+-target_link_libraries(RandomRead bcc-static)
+-
+-add_executable(LLCStat LLCStat.cc)
+-target_link_libraries(LLCStat bcc-static)
+-
+-add_executable(FollyRequestContextSwitch FollyRequestContextSwitch.cc)
+-target_link_libraries(FollyRequestContextSwitch bcc-static)
+-
+-add_executable(UseExternalMap UseExternalMap.cc)
+-target_link_libraries(UseExternalMap bcc-static)
+-
+-add_executable(CGroupTest CGroupTest.cc)
+-target_link_libraries(CGroupTest bcc-static)
+-
+-add_executable(TaskIterator TaskIterator.cc)
+-target_link_libraries(TaskIterator bcc-static)
+-
+-add_executable(SkLocalStorageIterator SkLocalStorageIterator.cc)
+-target_link_libraries(SkLocalStorageIterator bcc-static)
+-
+-if(INSTALL_CPP_EXAMPLES)
+-  install (TARGETS HelloWorld DESTINATION share/bcc/examples/cpp)
+-  install (TARGETS CPUDistribution DESTINATION share/bcc/examples/cpp)
+-  install (TARGETS RecordMySQLQuery DESTINATION share/bcc/examples/cpp)
+-  install (TARGETS TCPSendStack DESTINATION share/bcc/examples/cpp)
+-  install (TARGETS RandomRead DESTINATION share/bcc/examples/cpp)
+-  install (TARGETS LLCStat DESTINATION share/bcc/examples/cpp)
+-  install (TARGETS FollyRequestContextSwitch DESTINATION share/bcc/examples/cpp)
+-  install (TARGETS UseExternalMap DESTINATION share/bcc/examples/cpp)
+-  install (TARGETS CGroupTest DESTINATION share/bcc/examples/cpp)
+-endif(INSTALL_CPP_EXAMPLES)
++file(GLOB EXAMPLES *.cc)
++foreach(EXAMPLE ${EXAMPLES})
++  get_filename_component(NAME ${EXAMPLE} NAME_WE)
++  add_executable(${NAME} ${EXAMPLE})
++
++  if(NOT CMAKE_USE_LIBBPF_PACKAGE)
++    target_link_libraries(${NAME} bcc-static)
++  else()
++    target_link_libraries(${NAME} bcc-shared-no-libbpf)
++  endif()
++
++  if(INSTALL_CPP_EXAMPLES)
++    install (TARGETS ${NAME} DESTINATION share/bcc/examples/cpp)
++  endif(INSTALL_CPP_EXAMPLES)
++endforeach()
+ 
+ add_subdirectory(pyperf)
+diff --git a/examples/cpp/pyperf/CMakeLists.txt b/examples/cpp/pyperf/CMakeLists.txt
+index 6f963c66..97420806 100644
+--- a/examples/cpp/pyperf/CMakeLists.txt
++++ b/examples/cpp/pyperf/CMakeLists.txt
+@@ -7,6 +7,11 @@ include_directories(${CMAKE_SOURCE_DIR}/src/cc/libbpf/include/uapi)
+ 
+ add_executable(PyPerf PyPerf.cc PyPerfUtil.cc PyPerfBPFProgram.cc PyPerfLoggingHelper.cc PyPerfDefaultPrinter.cc Py36Offsets.cc)
+ target_link_libraries(PyPerf bcc-static)
++if(NOT CMAKE_USE_LIBBPF_PACKAGE)
++  target_link_libraries(PyPerf bcc-static)
++else()
++  target_link_libraries(PyPerf bcc-shared-no-libbpf)
++endif()
+ 
+ if(INSTALL_CPP_EXAMPLES)
+   install (TARGETS PyPerf DESTINATION share/bcc/examples/cpp)
+diff --git a/introspection/CMakeLists.txt b/introspection/CMakeLists.txt
+index 4328ee11..6c83f0c8 100644
+--- a/introspection/CMakeLists.txt
++++ b/introspection/CMakeLists.txt
+@@ -8,7 +8,13 @@ include_directories(${CMAKE_SOURCE_DIR}/src/cc/libbpf/include/uapi)
+ option(INSTALL_INTROSPECTION "Install BPF introspection tools" ON)
+ option(BPS_LINK_RT "Pass -lrt to linker when linking bps tool" ON)
+ 
+-set(bps_libs_to_link bpf-static elf z)
++# Note that the order matters! bpf-static first, the rest later
++if(CMAKE_USE_LIBBPF_PACKAGE AND LIBBPF_FOUND)
++set(bps_libs_to_link bpf-shared ${LIBBPF_LIBRARIES})
++else()
++set(bps_libs_to_link bpf-static)
++endif()
++list(APPEND bps_libs_to_link elf z)
+ if(BPS_LINK_RT)
+ list(APPEND bps_libs_to_link rt)
+ endif()
+diff --git a/src/cc/CMakeLists.txt b/src/cc/CMakeLists.txt
+index 4021c662..c8ea63aa 100644
+--- a/src/cc/CMakeLists.txt
++++ b/src/cc/CMakeLists.txt
+@@ -10,8 +10,12 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/frontends/clang)
+ include_directories(${LLVM_INCLUDE_DIRS})
+ include_directories(${LIBELF_INCLUDE_DIRS})
+ # todo: if check for kernel version
+-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/libbpf/include)
+-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/libbpf/include/uapi)
++if (CMAKE_USE_LIBBPF_PACKAGE AND LIBBPF_FOUND)
++  include_directories(${LIBBPF_INCLUDE_DIRS})
++else()
++  include_directories(${CMAKE_CURRENT_SOURCE_DIR}/libbpf/include)
++  include_directories(${CMAKE_CURRENT_SOURCE_DIR}/libbpf/include/uapi)
++endif()
+ 
+ # add_definitions has a problem parsing "-D_GLIBCXX_USE_CXX11_ABI=0", this is safer
+ separate_arguments(LLVM_DEFINITIONS)
+@@ -41,21 +45,26 @@ if(LIBBPF_INCLUDE_DIR)
+   add_definitions(-DHAVE_EXTERNAL_LIBBPF)
+ endif()
+ 
+-if(LIBBPF_FOUND)
+-  set(extract_dir ${CMAKE_CURRENT_BINARY_DIR}/libbpf_a_extract)
+-  execute_process(COMMAND sh -c "mkdir -p ${extract_dir} && cd ${extract_dir} && ${CMAKE_AR} x ${LIBBPF_STATIC_LIBRARIES}")
+-  file(GLOB libbpf_sources "${extract_dir}/*.o")
+-else()
+-  file(GLOB libbpf_sources "libbpf/src/*.c")
+-endif()
++if(NOT CMAKE_USE_LIBBPF_PACKAGE)
++  if(LIBBPF_FOUND)
++    set(extract_dir ${CMAKE_CURRENT_BINARY_DIR}/libbpf_a_extract)
++    execute_process(COMMAND sh -c "mkdir -p ${extract_dir} && cd ${extract_dir} && ${CMAKE_AR} x ${LIBBPF_STATIC_LIBRARIES}")
++    file(GLOB libbpf_sources "${extract_dir}/*.o")
++  else()
++    file(GLOB libbpf_sources "libbpf/src/*.c")
++  endif()
+ 
+-set(libbpf_uapi libbpf/include/uapi/linux/)
++  set(libbpf_uapi libbpf/include/uapi/linux/)
++endif()
+ 
+ add_library(bpf-static STATIC libbpf.c perf_reader.c ${libbpf_sources})
+ set_target_properties(bpf-static PROPERTIES OUTPUT_NAME bcc_bpf)
+ add_library(bpf-shared SHARED libbpf.c perf_reader.c ${libbpf_sources})
+ set_target_properties(bpf-shared PROPERTIES VERSION ${REVISION_LAST} SOVERSION 0)
+ set_target_properties(bpf-shared PROPERTIES OUTPUT_NAME bcc_bpf)
++if(CMAKE_USE_LIBBPF_PACKAGE AND LIBBPF_FOUND)
++  target_link_libraries(bpf-shared ${LIBBPF_LIBRARIES})
++endif()
+ 
+ set(bcc_common_sources bcc_common.cc bpf_module.cc bcc_btf.cc exported_files.cc)
+ if (${LLVM_PACKAGE_VERSION} VERSION_EQUAL 6 OR ${LLVM_PACKAGE_VERSION} VERSION_GREATER 6)
+diff --git a/tests/cc/CMakeLists.txt b/tests/cc/CMakeLists.txt
+index 528f1bda..b2fba5e3 100644
+--- a/tests/cc/CMakeLists.txt
++++ b/tests/cc/CMakeLists.txt
+@@ -7,7 +7,11 @@ include_directories(${CMAKE_SOURCE_DIR}/src/cc/libbpf/include/uapi)
+ include_directories(${CMAKE_SOURCE_DIR}/tests/python/include)
+ 
+ add_executable(test_static test_static.c)
+-target_link_libraries(test_static bcc-static)
++if(NOT CMAKE_USE_LIBBPF_PACKAGE)
++  target_link_libraries(test_static bcc-static)
++else()
++  target_link_libraries(test_static bcc-shared-no-libbpf)
++endif()
+ 
+ add_test(NAME c_test_static COMMAND ${TEST_WRAPPER} c_test_static sudo ${CMAKE_CURRENT_BINARY_DIR}/test_static)
+ 
+@@ -35,17 +39,19 @@ set(TEST_LIBBCC_SOURCES
+        utils.cc
+        test_parse_tracepoint.cc)
+ 
+-add_executable(test_libbcc ${TEST_LIBBCC_SOURCES})
+-
+ file(COPY dummy_proc_map.txt DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+ add_library(usdt_test_lib SHARED usdt_test_lib.cc)
+ 
+-add_dependencies(test_libbcc bcc-shared)
+-target_link_libraries(test_libbcc ${PROJECT_BINARY_DIR}/src/cc/libbcc.so dl usdt_test_lib)
+-set_target_properties(test_libbcc PROPERTIES INSTALL_RPATH ${PROJECT_BINARY_DIR}/src/cc)
+-target_compile_definitions(test_libbcc PRIVATE -DLIBBCC_NAME=\"libbcc.so\")
++if(NOT CMAKE_USE_LIBBPF_PACKAGE)
++  add_executable(test_libbcc ${TEST_LIBBCC_SOURCES})
++  add_dependencies(test_libbcc bcc-shared)
+ 
+-add_test(NAME test_libbcc COMMAND ${TEST_WRAPPER} c_test_all sudo ${CMAKE_CURRENT_BINARY_DIR}/test_libbcc)
++  target_link_libraries(test_libbcc ${PROJECT_BINARY_DIR}/src/cc/libbcc.so dl usdt_test_lib)
++  set_target_properties(test_libbcc PROPERTIES INSTALL_RPATH ${PROJECT_BINARY_DIR}/src/cc)
++  target_compile_definitions(test_libbcc PRIVATE -DLIBBCC_NAME=\"libbcc.so\")
++
++  add_test(NAME test_libbcc COMMAND ${TEST_WRAPPER} c_test_all sudo ${CMAKE_CURRENT_BINARY_DIR}/test_libbcc)
++endif()
+ 
+ if(LIBBPF_FOUND)
+   add_executable(test_libbcc_no_libbpf ${TEST_LIBBCC_SOURCES})
+-- 
+2.29.2
+
diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc/0002-fix-compilation-error-with-latest-llvm12-trunk.patch b/dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc/0002-fix-compilation-error-with-latest-llvm12-trunk.patch
new file mode 100644
index 0000000..ded9f28
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc/0002-fix-compilation-error-with-latest-llvm12-trunk.patch
@@ -0,0 +1,60 @@
+From 35ff839b1b70b3cd7a9a025d0fd96173e7be566e Mon Sep 17 00:00:00 2001
+From: Yonghong Song <yhs@fb.com>
+Date: Mon, 4 Jan 2021 19:09:20 -0800
+Subject: [PATCH 2/2] fix compilation error with latest llvm12 trunk
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+With latest llvm trunk (llvm12), I hit the following compilation
+error:
+  ...
+  [ 17%] Building CXX object src/cc/frontends/b/CMakeFiles/b_frontend.dir/codegen_llvm.cc.o
+  /home/yhs/work/bcc/src/cc/frontends/b/codegen_llvm.cc: In member function
+     ‘virtual ebpf::StatusTuple ebpf::cc::CodegenLLVM::visit_table_decl_stmt_node(ebpf::cc::TableDeclStmtNode*)’:
+  /home/yhs/work/bcc/src/cc/frontends/b/codegen_llvm.cc:1122:37:
+     error: ‘class llvm::Module’ has no member named ‘getTypeB yName’; did you mean ‘getName’?
+     StructType *decl_struct = mod_->getTypeByName("_struct." + n->id_->name_);
+                                     ^~~~~~~~~~~~~
+                                     getName
+
+This is due to llvm patch https://reviews.llvm.org/D78793 which
+changed how to use getTypeByName(). This patch adjusted the usage
+in bcc based on this patch.
+
+Signed-off-by: Yonghong Song <yhs@fb.com>
+---
+ src/cc/frontends/b/codegen_llvm.cc | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/cc/frontends/b/codegen_llvm.cc b/src/cc/frontends/b/codegen_llvm.cc
+index d8c9470a..71c83b41 100644
+--- a/src/cc/frontends/b/codegen_llvm.cc
++++ b/src/cc/frontends/b/codegen_llvm.cc
+@@ -1119,7 +1119,11 @@ StatusTuple CodegenLLVM::visit_table_decl_stmt_node(TableDeclStmtNode *n) {
+     StructType *key_stype, *leaf_stype;
+     TRY2(lookup_struct_type(n->key_type_, &key_stype));
+     TRY2(lookup_struct_type(n->leaf_type_, &leaf_stype));
++#if LLVM_MAJOR_VERSION >= 12
++    StructType *decl_struct = StructType::getTypeByName(mod_->getContext(), "_struct." + n->id_->name_);
++#else
+     StructType *decl_struct = mod_->getTypeByName("_struct." + n->id_->name_);
++#endif
+     if (!decl_struct)
+       decl_struct = StructType::create(ctx(), "_struct." + n->id_->name_);
+     if (decl_struct->isOpaque())
+@@ -1182,7 +1186,11 @@ StatusTuple CodegenLLVM::visit_func_decl_stmt_node(FuncDeclStmtNode *n) {
+       StructType *stype;
+       //TRY2(lookup_struct_type(formal, &stype));
+       auto var = (StructVariableDeclStmtNode *)formal;
++#if LLVM_MAJOR_VERSION >= 12
++      stype = StructType::getTypeByName(mod_->getContext(), "_struct." + var->struct_id_->name_);
++#else
+       stype = mod_->getTypeByName("_struct." + var->struct_id_->name_);
++#endif
+       if (!stype) return mkstatus_(n, "could not find type %s", var->struct_id_->c_str());
+       formals.push_back(PointerType::getUnqual(stype));
+     } else {
+-- 
+2.30.0
+
diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc/0003-Remove-libbcc-no-libbpf-shared-library-change-libbcc.patch b/dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc/0003-Remove-libbcc-no-libbpf-shared-library-change-libbcc.patch
new file mode 100644
index 0000000..25e744f
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc/0003-Remove-libbcc-no-libbpf-shared-library-change-libbcc.patch
@@ -0,0 +1,156 @@
+From c7509c9e6377a374ca28d73960d505e129aace7b Mon Sep 17 00:00:00 2001
+From: Luca Boccassi <bluca@debian.org>
+Date: Fri, 8 Jan 2021 17:04:03 +0000
+Subject: [PATCH 3/3] Remove libbcc-no-libbpf shared library, change libbcc
+ linkage instead
+
+The current upstream split does not work very well, as the SONAME is mangled so
+nothing recognises it. Applications link against libbcc, not libbcc_no_bpf.
+Remove it entirely, and switch the libbcc.so to dynamically
+link with libbpf if CMAKE_USE_LIBBPF_PACKAGE is set.
+---
+ examples/cpp/CMakeLists.txt        |  2 +-
+ examples/cpp/pyperf/CMakeLists.txt |  2 +-
+ src/cc/CMakeLists.txt              | 36 +++++++++++++-----------------
+ tests/cc/CMakeLists.txt            |  8 +++----
+ 4 files changed, 21 insertions(+), 27 deletions(-)
+
+diff --git a/examples/cpp/CMakeLists.txt b/examples/cpp/CMakeLists.txt
+index dd343245..45b30280 100644
+--- a/examples/cpp/CMakeLists.txt
++++ b/examples/cpp/CMakeLists.txt
+@@ -19,7 +19,7 @@ foreach(EXAMPLE ${EXAMPLES})
+   if(NOT CMAKE_USE_LIBBPF_PACKAGE)
+     target_link_libraries(${NAME} bcc-static)
+   else()
+-    target_link_libraries(${NAME} bcc-shared-no-libbpf)
++    target_link_libraries(${NAME} bcc-shared)
+   endif()
+ 
+   if(INSTALL_CPP_EXAMPLES)
+diff --git a/examples/cpp/pyperf/CMakeLists.txt b/examples/cpp/pyperf/CMakeLists.txt
+index 97420806..618b4e75 100644
+--- a/examples/cpp/pyperf/CMakeLists.txt
++++ b/examples/cpp/pyperf/CMakeLists.txt
+@@ -10,7 +10,7 @@ target_link_libraries(PyPerf bcc-static)
+ if(NOT CMAKE_USE_LIBBPF_PACKAGE)
+   target_link_libraries(PyPerf bcc-static)
+ else()
+-  target_link_libraries(PyPerf bcc-shared-no-libbpf)
++  target_link_libraries(PyPerf bcc-shared)
+ endif()
+ 
+ if(INSTALL_CPP_EXAMPLES)
+diff --git a/src/cc/CMakeLists.txt b/src/cc/CMakeLists.txt
+index c8ea63aa..931de2d9 100644
+--- a/src/cc/CMakeLists.txt
++++ b/src/cc/CMakeLists.txt
+@@ -83,6 +83,9 @@ set(bcc_sym_sources bcc_syms.cc bcc_elf.c bcc_perf_map.c bcc_proc.c)
+ set(bcc_common_headers libbpf.h perf_reader.h "${CMAKE_CURRENT_BINARY_DIR}/bcc_version.h")
+ set(bcc_table_headers file_desc.h table_desc.h table_storage.h)
+ set(bcc_api_headers bcc_common.h bpf_module.h bcc_exception.h bcc_syms.h bcc_proc.h bcc_elf.h)
++if(LIBBPF_FOUND)
++  set(bcc_common_sources ${bcc_common_sources} libbpf.c perf_reader.c)
++endif()
+ 
+ if(ENABLE_CLANG_JIT)
+ add_library(bcc-shared SHARED
+@@ -91,16 +94,6 @@ add_library(bcc-shared SHARED
+ set_target_properties(bcc-shared PROPERTIES VERSION ${REVISION_LAST} SOVERSION 0)
+ set_target_properties(bcc-shared PROPERTIES OUTPUT_NAME bcc)
+ 
+-# If there's libbpf detected we build the libbcc-no-libbpf.so library, that
+-# dynamicaly links libbpf.so, in comparison to static link in libbcc.so.
+-if(LIBBPF_FOUND)
+-  add_library(bcc-shared-no-libbpf SHARED
+-    link_all.cc ${bcc_common_sources} ${bcc_table_sources} ${bcc_sym_sources}
+-    ${bcc_util_sources} libbpf.c perf_reader.c)
+-  set_target_properties(bcc-shared-no-libbpf PROPERTIES VERSION ${REVISION_LAST} SOVERSION 0)
+-  set_target_properties(bcc-shared-no-libbpf PROPERTIES OUTPUT_NAME bcc-no-libbpf)
+-endif()
+-
+ if(ENABLE_USDT)
+   set(bcc_usdt_sources usdt/usdt.cc usdt/usdt_args.cc)
+   # else undefined
+@@ -123,18 +116,25 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${llvm_lib_exclude_f
+ set(bcc_common_libs b_frontend clang_frontend
+   -Wl,--whole-archive ${clang_libs} ${llvm_libs} -Wl,--no-whole-archive
+   ${LIBELF_LIBRARIES})
+-set(bcc_common_libs_for_a ${bcc_common_libs} bpf-static)
+-set(bcc_common_libs_for_s ${bcc_common_libs} bpf-static)
+-set(bcc_common_libs_for_n ${bcc_common_libs})
+-set(bcc_common_libs_for_lua b_frontend clang_frontend bpf-static
++set(bcc_common_libs_for_a ${bcc_common_libs})
++set(bcc_common_libs_for_s ${bcc_common_libs})
++set(bcc_common_libs_for_lua b_frontend clang_frontend
+   ${clang_libs} ${llvm_libs} ${LIBELF_LIBRARIES})
++if(LIBBPF_FOUND)
++  list(APPEND bcc_common_libs_for_a ${LIBBPF_LIBRARIES})
++  list(APPEND bcc_common_libs_for_s ${LIBBPF_LIBRARIES})
++  list(APPEND bcc_common_libs_for_lua ${LIBBPF_LIBRARIES})
++else()
++  list(APPEND bcc_common_libs_for_a bpf-static)
++  list(APPEND bcc_common_libs_for_s bpf-static)
++  list(APPEND bcc_common_libs_for_lua bpf-static)
++endif()
+ 
+ if(ENABLE_CPP_API)
+   add_subdirectory(api)
+   list(APPEND bcc_common_libs_for_a api-static)
+   # Keep all API functions
+   list(APPEND bcc_common_libs_for_s -Wl,--whole-archive api-static -Wl,--no-whole-archive)
+-  list(APPEND bcc_common_libs_for_n -Wl,--whole-archive api-static -Wl,--no-whole-archive)
+ endif()
+ 
+ if(ENABLE_USDT)
+@@ -142,7 +142,6 @@ if(ENABLE_USDT)
+   add_subdirectory(usdt)
+   list(APPEND bcc_common_libs_for_a usdt-static)
+   list(APPEND bcc_common_libs_for_s usdt-static)
+-  list(APPEND bcc_common_libs_for_n usdt-static)
+   list(APPEND bcc_common_libs_for_lua usdt-static)
+ endif()
+ 
+@@ -153,11 +152,6 @@ target_link_libraries(bcc-shared ${bcc_common_libs_for_s})
+ target_link_libraries(bcc-static ${bcc_common_libs_for_a} bcc-loader-static)
+ set(bcc-lua-static ${bcc-lua-static} ${bcc_common_libs_for_lua})
+ 
+-if(LIBBPF_FOUND)
+-  target_link_libraries(bcc-shared-no-libbpf ${bcc_common_libs_for_n} ${LIBBPF_LIBRARIES})
+-  install(TARGETS bcc-shared-no-libbpf LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+-endif()
+-
+ install(TARGETS bcc-shared bcc-static bcc-loader-static bpf-static LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ install(FILES ${bcc_table_headers} DESTINATION include/bcc)
+ install(FILES ${bcc_api_headers} DESTINATION include/bcc)
+diff --git a/tests/cc/CMakeLists.txt b/tests/cc/CMakeLists.txt
+index b2fba5e3..58493248 100644
+--- a/tests/cc/CMakeLists.txt
++++ b/tests/cc/CMakeLists.txt
+@@ -10,7 +10,7 @@ add_executable(test_static test_static.c)
+ if(NOT CMAKE_USE_LIBBPF_PACKAGE)
+   target_link_libraries(test_static bcc-static)
+ else()
+-  target_link_libraries(test_static bcc-shared-no-libbpf)
++  target_link_libraries(test_static bcc-shared)
+ endif()
+ 
+ add_test(NAME c_test_static COMMAND ${TEST_WRAPPER} c_test_static sudo ${CMAKE_CURRENT_BINARY_DIR}/test_static)
+@@ -55,11 +55,11 @@ endif()
+ 
+ if(LIBBPF_FOUND)
+   add_executable(test_libbcc_no_libbpf ${TEST_LIBBCC_SOURCES})
+-  add_dependencies(test_libbcc_no_libbpf bcc-shared-no-libbpf)
++  add_dependencies(test_libbcc_no_libbpf bcc-shared)
+ 
+-  target_link_libraries(test_libbcc_no_libbpf ${PROJECT_BINARY_DIR}/src/cc/libbcc-no-libbpf.so dl usdt_test_lib ${LIBBPF_LIBRARIES})
++  target_link_libraries(test_libbcc_no_libbpf ${PROJECT_BINARY_DIR}/src/cc/libbcc.so dl usdt_test_lib ${LIBBPF_LIBRARIES})
+   set_target_properties(test_libbcc_no_libbpf PROPERTIES INSTALL_RPATH ${PROJECT_BINARY_DIR}/src/cc)
+-  target_compile_definitions(test_libbcc_no_libbpf PRIVATE -DLIBBCC_NAME=\"libbcc-no-libbpf.so\")
++  target_compile_definitions(test_libbcc_no_libbpf PRIVATE -DLIBBCC_NAME=\"libbcc.so\")
+ 
+   add_test(NAME test_libbcc_no_libbpf COMMAND ${TEST_WRAPPER} c_test_all_no_libbpf sudo ${CMAKE_CURRENT_BINARY_DIR}/test_libbcc_no_libbpf)
+ endif()
+-- 
+2.29.2
+
diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc/0004-cmake-look-for-either-static-or-dynamic-libraries.patch b/dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc/0004-cmake-look-for-either-static-or-dynamic-libraries.patch
new file mode 100644
index 0000000..31bcbcd
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc/0004-cmake-look-for-either-static-or-dynamic-libraries.patch
@@ -0,0 +1,69 @@
+From 6b4222cd41b3f5e833307aeff2b10c6b084d3f4f Mon Sep 17 00:00:00 2001
+From: Matteo Croce <mcroce@microsoft.com>
+Date: Wed, 27 Jan 2021 00:26:39 +0100
+Subject: [PATCH] cmake: look for either static or dynamic libraries
+
+On some distro, static libraries are shipped in a separate package.
+Look for either a static or dynamic libbpf, and only fail if neither is found.
+---
+ cmake/FindLibBpf.cmake | 23 ++++++++++++++++-------
+ 1 file changed, 16 insertions(+), 7 deletions(-)
+
+diff --git a/cmake/FindLibBpf.cmake b/cmake/FindLibBpf.cmake
+index 75683ae3d..dc10dcee4 100644
+--- a/cmake/FindLibBpf.cmake
++++ b/cmake/FindLibBpf.cmake
+@@ -28,9 +28,9 @@ find_path (LIBBPF_INCLUDE_DIR
+     /sw/include
+     ENV CPATH)
+ 
+-find_library (LIBBPF_STATIC_LIBRARIES
++find_library (LIBBPF_LIBRARIES
+   NAMES
+-    libbpf.a
++    bpf
+   PATHS
+     /usr/lib
+     /usr/local/lib
+@@ -38,10 +38,13 @@ find_library (LIBBPF_STATIC_LIBRARIES
+     /sw/lib
+     ENV LIBRARY_PATH
+     ENV LD_LIBRARY_PATH)
++if(LIBBPF_LIBRARIES)
++list(APPEND PATHS LIBBPF_LIBRARIES)
++endif()
+ 
+-find_library (LIBBPF_LIBRARIES
++find_library (LIBBPF_STATIC_LIBRARIES
+   NAMES
+-    bpf
++    libbpf.a
+   PATHS
+     /usr/lib
+     /usr/local/lib
+@@ -49,13 +52,19 @@ find_library (LIBBPF_LIBRARIES
+     /sw/lib
+     ENV LIBRARY_PATH
+     ENV LD_LIBRARY_PATH)
++if(LIBBPF_STATIC_LIBRARIES)
++list(APPEND PATHS LIBBPF_STATIC_LIBRARIES)
++endif()
+ 
++if(LIBBPF_STATIC_LIBRARIES OR LIBBPF_LIBRARIES)
+ include (FindPackageHandleStandardArgs)
+ 
+ # handle the QUIETLY and REQUIRED arguments and set LIBBPF_FOUND to TRUE if all listed variables are TRUE
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibBpf "Please install the libbpf development package"
+-  LIBBPF_LIBRARIES
+-  LIBBPF_STATIC_LIBRARIES
++  ${PATHS}
+   LIBBPF_INCLUDE_DIR)
+ 
+-mark_as_advanced(LIBBPF_INCLUDE_DIR LIBBPF_STATIC_LIBRARIES LIBBPF_LIBRARIES)
++mark_as_advanced(LIBBPF_INCLUDE_DIR ${PATHS})
++else()
++message(Please install the libbpf development package)
++endif()
+-- 
+2.29.2
+
diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc_0.13.0.bb b/dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc_0.17.0.bb
index 5a628db..8953fd4 100644
--- a/dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc_0.13.0.bb
+++ b/dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc_0.17.0.bb
@@ -8,20 +8,33 @@ inherit cmake python3native manpages
 DEPENDS += "bison-native \
             flex-native \
             elfutils \
-            luajit \
+            ${LUAJIT} \
             clang \
             "
 
+LUAJIT ?= "luajit"
+LUAJIT_powerpc64le = ""
+LUAJIT_powerpc64 = ""
+
 RDEPENDS_${PN} += "bash python3 python3-core python3-setuptools xz"
 
-SRC_URI = "gitsm://github.com/iovisor/bcc \
+# Don't fetch submodules otherwise we fetch an older, vendored libbpf version
+# We use a dynamic libbpf library instead
+SRC_URI = "git://github.com/iovisor/bcc \
            file://0001-python-CMakeLists.txt-Remove-check-for-host-etc-debi.patch \
-           file://0001-tools-opensnoop-snoop-do_sys_openat2-for-kernel-v5.6.patch \
-           file://0001-Add-KBUILD_MODNAME-flag-to-default-cflags.patch \
-           file://0001-Delete-existing-kbuild_modname-definitions.patch \
+           file://0001-tools-trace.py-Fix-failing-to-exit.patch \
+           file://0001-CMakeLists.txt-override-the-PY_CMD_ESCAPED.patch \
+           file://0001-fix-compilation-issues-with-latest-llvm12-trunk.patch \
+           file://0002-fix-compilation-error-with-latest-llvm12-trunk.patch \
+           file://0001-cmake-link-dynamically-to-libclang-cpp-if-found-and-.patch \
+           file://0002-cmake-always-link-to-packaged-libbpf-if-CMAKE_USE_LI.patch \
+           file://0003-Remove-libbcc-no-libbpf-shared-library-change-libbcc.patch \
+           file://0004-cmake-look-for-either-static-or-dynamic-libraries.patch \
            "
 
-SRCREV = "942227484d3207f6a42103674001ef01fb5335a0"
+DEPENDS += "libbpf"
+
+SRCREV = "ad5b82a5196b222ed2cdc738d8444e8c9546a77f"
 
 S = "${WORKDIR}/git"
 
@@ -34,6 +47,7 @@ EXTRA_OECMAKE = " \
     -DLLVM_PACKAGE_VERSION=${LLVMVERSION} \
     -DPYTHON_CMD=${PYTHON} \
     -DPYTHON_FLAGS=--install-lib=${PYTHON_SITEPACKAGES_DIR} \
+    -DCMAKE_USE_LIBBPF_PACKAGE=ON \
 "
 
 do_install_append() {
diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace/0001-bpforc.h-Include-optional-header.patch b/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace/0001-bpforc.h-Include-optional-header.patch
new file mode 100644
index 0000000..c666bfe
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace/0001-bpforc.h-Include-optional-header.patch
@@ -0,0 +1,31 @@
+From ec41ce71f8cd318ab3ca4ce727e7398289b5d7cf Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 30 Mar 2021 17:25:10 -0700
+Subject: [PATCH] bpforc.h: Include <optional> header
+
+This is required since this header had std::optional<std::tuple<uint8_t *, uintptr_t>>
+
+Fixes buiild errors with clang-12 with gcc11-runtime
+
+Upstream-Status: Submitted [https://github.com/iovisor/bpftrace/pull/1762]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/bpforc.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/bpforc.h b/src/bpforc.h
+index da6345be..5634c544 100644
+--- a/src/bpforc.h
++++ b/src/bpforc.h
+@@ -22,6 +22,8 @@
+ #include <llvm/ExecutionEngine/Orc/JITTargetMachineBuilder.h>
+ #endif
+ 
++#include <optional>
++
+ namespace bpftrace {
+ 
+ const std::string LLVMTargetTriple = "bpf-pc-linux";
+-- 
+2.31.1
+
diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace_0.9.4.bb b/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace_0.11.4.bb
index ad044fd..d6ab0ce 100644
--- a/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace_0.9.4.bb
+++ b/dynamic-layers/openembedded-layer/recipes-devtools/bpftrace/bpftrace_0.11.4.bb
@@ -10,17 +10,20 @@ DEPENDS += "bison-native \
             bcc \
             "
 
+PV .= "+git${SRCREV}"
 RDEPENDS_${PN} += "bash python3 xz"
 
-SRC_URI = "git://github.com/iovisor/bpftrace \
+SRC_URI = "git://github.com/iovisor/bpftrace;branch=master \
+           file://0001-bpforc.h-Include-optional-header.patch \
            "
-SRCREV = "b1200771b61fd77ed7c5b326e7960d24514dd961"
+SRCREV = "6bfa61f505b6b4215328f90762776edd8a22fdb7"
 
 S = "${WORKDIR}/git"
 
 inherit cmake
 
 EXTRA_OECMAKE = " \
+    -DCMAKE_ENABLE_EXPORTS=1 \
     -DCMAKE_BUILD_TYPE=Release \
     -DBUILD_TESTING=OFF \
 "
diff --git a/recipes-bsp/cpufrequtils/cpufrequtils/cpufrequtils-008-fix-build-on-non-x86.patch b/recipes-bsp/cpufrequtils/cpufrequtils/cpufrequtils-008-fix-build-on-non-x86.patch
new file mode 100644
index 0000000..0006add
--- /dev/null
+++ b/recipes-bsp/cpufrequtils/cpufrequtils/cpufrequtils-008-fix-build-on-non-x86.patch
@@ -0,0 +1,32 @@
+From: Bernhard Rosenkränzer <bernhard.rosenkraenzer.ext@huawei.com>
+Date: Thu, 27 May 2021 22:51:00 +0200
+Subject: [PATCH] utils: Fix build on non-x86 with clang
+
+Without this patch, there is an invalid asm construct (forcing EAX) on
+non-x86 architectures in unreachable code.
+
+gcc allows this (because it throws out the unreachable code before checking
+it), but clang does not.
+
+Signed-off-by: Bernhard Rosenkränzer <bernhard.rosenkraenzer.ext@huawei.com>
+Upstream-Status: Pending
+
+diff -up git/utils/cpuid.h.omv~ git/utils/cpuid.h
+--- git/utils/cpuid.h.omv~      2021-05-27 22:44:44.833614642 +0200
++++ git/utils/cpuid.h   2021-05-27 22:45:25.546050445 +0200
+@@ -1,6 +1,8 @@
+ #ifndef _CPUFREQ_CPUID_H
+ #define _CPUFREQ_CPUID_H
+ 
++#if defined(__i386__) || defined(__x86_64__)
++
+ static inline void __cpuid(unsigned int *eax, unsigned int *ebx,
+                                unsigned int *ecx, unsigned int *edx)
+ {
+@@ -72,4 +74,6 @@ static inline unsigned int cpuid_edx(uns
+        return edx;
+ }
+ 
++#endif /* i386 || x86_64 */
++
+ #endif /* _CPUFREQ_CPUID_H */
diff --git a/recipes-bsp/cpufrequtils/cpufrequtils_%.bbappend b/recipes-bsp/cpufrequtils/cpufrequtils_%.bbappend
new file mode 100644
index 0000000..3b201f1
--- /dev/null
+++ b/recipes-bsp/cpufrequtils/cpufrequtils_%.bbappend
@@ -0,0 +1,2 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+SRC_URI_append = " file://cpufrequtils-008-fix-build-on-non-x86.patch"
diff --git a/recipes-connectivity/dhcp/dhcp/dhcp-4.4.2-clang-12.patch b/recipes-connectivity/dhcp/dhcp/dhcp-4.4.2-clang-12.patch
new file mode 100644
index 0000000..4901b91
--- /dev/null
+++ b/recipes-connectivity/dhcp/dhcp/dhcp-4.4.2-clang-12.patch
@@ -0,0 +1,19 @@
+# SPDX-FileCopyrightText: Huawei Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+Fix building with modern compilers, such as clang 12 and gcc 11.
+
+Signed-off-by: Bernhard Rosenkraenzer <bernhard.rosenkraenzer.ext@huawei.com>
+
+diff -up dhcp-4.4.2/server/mdb.c.omv~ dhcp-4.4.2/server/mdb.c
+--- dhcp-4.4.2/server/mdb.c.omv~        2021-03-11 18:08:56.890166779 +0100
++++ dhcp-4.4.2/server/mdb.c     2021-03-11 18:09:01.930189762 +0100
+@@ -67,7 +67,7 @@ static host_id_info_t *host_id_info = NU
+ 
+ int numclasseswritten;
+ 
+-omapi_object_type_t *dhcp_type_host;
++extern omapi_object_type_t *dhcp_type_host;
+ 
+ isc_result_t enter_class(cd, dynamicp, commit)
+        struct class *cd;
diff --git a/recipes-connectivity/dhcp/dhcp_4.4.2%.bbappend b/recipes-connectivity/dhcp/dhcp_4.4.2%.bbappend
new file mode 100644
index 0000000..f1fffde
--- /dev/null
+++ b/recipes-connectivity/dhcp/dhcp_4.4.2%.bbappend
@@ -0,0 +1,7 @@
+# SPDX-FileCopyrightText: Huawei Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+SRC_URI_append = "\
+    file://dhcp-4.4.2-clang-12.patch \
+"
diff --git a/recipes-connectivity/openssh/openssh_%.bbappend b/recipes-connectivity/openssh/openssh_%.bbappend
deleted file mode 100644
index 88966e5..0000000
--- a/recipes-connectivity/openssh/openssh_%.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-do_configure_prepend() {
-        sed -i -e '/-ftrapv/d' ${S}/configure.ac
-}
diff --git a/recipes-core/busybox/busybox/0001-Turn-ptr_to_globals-and-bb_errno-to-be-non-const-1.31.1.patch b/recipes-core/busybox/busybox/0001-Turn-ptr_to_globals-and-bb_errno-to-be-non-const-1.31.1.patch
new file mode 100644
index 0000000..35a419b
--- /dev/null
+++ b/recipes-core/busybox/busybox/0001-Turn-ptr_to_globals-and-bb_errno-to-be-non-const-1.31.1.patch
@@ -0,0 +1,177 @@
+From d941b59087d34cb93053b638c066bf080122e7bb Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 16 Jan 2019 22:39:24 -0800
+Subject: [PATCH] Turn ptr_to_globals and bb_errno to be non const
+
+writing to a const variable is undefined behavior
+
+This is undefined as per (C99 6.7.3 paragraph 5) see [1]
+
+errno and ptr_to_globals is written to in code, this fails with
+segfaults when compiled with clang
+
+unsigned FAST_FUNC bb_strtou(const char *arg, char **endp, int base)
+{
+      unsigned long v;
+      char *endptr;
+
+      if (!endp) endp = &endptr;
+      *endp = (char*) arg;
+
+      if (!isalnum(arg[0])) return ret_ERANGE();
+      errno = 0;
+      v = strtoul(arg, endp, base);
+      if (v > UINT_MAX) return ret_ERANGE();
+      return handle_errors(v, endp);
+  }
+
+without 'const' ( working code )
+
+Dump of assembler code for function bb_strtou:
+   0x0000555555568298 <+0>:     push   %rbx
+   0x0000555555568299 <+1>:     sub    $0x10,%rsp
+   0x000055555556829d <+5>:     test   %rsi,%rsi
+   0x00005555555682a0 <+8>:     lea    0x8(%rsp),%rbx
+   0x00005555555682a5 <+13>:    cmovne %rsi,%rbx
+   0x00005555555682a9 <+17>:    mov    %rdi,(%rbx)
+   0x00005555555682ac <+20>:    mov    (%rdi),%al
+   0x00005555555682ae <+22>:    lea    -0x30(%rax),%ecx
+   0x00005555555682b1 <+25>:    cmp    $0xa,%cl
+   0x00005555555682b4 <+28>:    jb     0x5555555682be <bb_strtou+38>
+   0x00005555555682b6 <+30>:    or     $0x20,%al
+   0x00005555555682b8 <+32>:    add    $0x9f,%al
+   0x00005555555682ba <+34>:    cmp    $0x1a,%al
+   0x00005555555682bc <+36>:    jae    0x5555555682dc <bb_strtou+68>
+   0x00005555555682be <+38>:    mov    0x107da3(%rip),%rax        # 0x555555670068 <bb_errno>
+=> 0x00005555555682c5 <+45>:    movl   $0x0,(%rax)
+   0x00005555555682cb <+51>:    mov    %rbx,%rsi
+   0x00005555555682ce <+54>:    callq  0x555555564310 <strtoul@plt>
+   0x00005555555682d3 <+59>:    mov    %rax,%rcx
+   0x00005555555682d6 <+62>:    shr    $0x20,%rcx
+   0x00005555555682da <+66>:    je     0x5555555682f0 <bb_strtou+88>
+   0x00005555555682dc <+68>:    mov    0x107d85(%rip),%rax        # 0x555555670068 <bb_errno>
+   0x00005555555682e3 <+75>:    movl   $0x22,(%rax)
+   0x00005555555682e9 <+81>:    mov    $0xffffffff,%eax
+   0x00005555555682ee <+86>:    jmp    0x5555555682fb <bb_strtou+99>
+   0x00005555555682f0 <+88>:    mov    %rax,%rdi
+   0x00005555555682f3 <+91>:    mov    %rbx,%rsi
+   0x00005555555682f6 <+94>:    callq  0x5555555681e8 <handle_errors>
+   0x00005555555682fb <+99>:    add    $0x10,%rsp
+   0x00005555555682ff <+103>:   pop    %rbx
+   0x0000555555568300 <+104>:   retq
+
+here address of bb_errno is valid rax = 0x7ffff7cac6c0
+
+with 'const' ( non-working code )
+
+Dump of assembler code for function bb_strtou:
+   0x00005555555682a4 <+0>:     push   %r14
+   0x00005555555682a6 <+2>:     push   %rbx
+   0x00005555555682a7 <+3>:     push   %rax
+   0x00005555555682a8 <+4>:     test   %rsi,%rsi
+   0x00005555555682ab <+7>:     mov    %rsp,%rbx
+   0x00005555555682ae <+10>:    cmovne %rsi,%rbx
+   0x00005555555682b2 <+14>:    mov    %rdi,(%rbx)
+   0x00005555555682b5 <+17>:    mov    (%rdi),%al
+   0x00005555555682b7 <+19>:    lea    -0x30(%rax),%ecx
+   0x00005555555682ba <+22>:    cmp    $0xa,%cl
+   0x00005555555682bd <+25>:    jb     0x5555555682d6 <bb_strtou+50>
+   0x00005555555682bf <+27>:    or     $0x20,%al
+   0x00005555555682c1 <+29>:    add    $0x9f,%al
+   0x00005555555682c3 <+31>:    cmp    $0x1a,%al
+   0x00005555555682c5 <+33>:    jb     0x5555555682d6 <bb_strtou+50>
+   0x00005555555682c7 <+35>:    mov    0x107d9a(%rip),%rax        # 0x555555670068 <bb_errno>
+   0x00005555555682ce <+42>:    movl   $0x22,(%rax)
+   0x00005555555682d4 <+48>:    jmp    0x5555555682fc <bb_strtou+88>
+   0x00005555555682d6 <+50>:    mov    0x107d8b(%rip),%r14        # 0x555555670068 <bb_errno>
+=> 0x00005555555682dd <+57>:    movl   $0x0,(%r14)
+   0x00005555555682e4 <+64>:    mov    %rbx,%rsi
+   0x00005555555682e7 <+67>:    callq  0x555555564300 <strtoul@plt>
+   0x00005555555682ec <+72>:    mov    %rax,%rcx
+   0x00005555555682ef <+75>:    shr    $0x20,%rcx
+   0x00005555555682f3 <+79>:    je     0x555555568303 <bb_strtou+95>
+   0x00005555555682f5 <+81>:    movl   $0x22,(%r14)
+   0x00005555555682fc <+88>:    mov    $0xffffffff,%eax
+   0x0000555555568301 <+93>:    jmp    0x55555556830e <bb_strtou+106>
+   0x0000555555568303 <+95>:    mov    %rax,%rdi
+   0x0000555555568306 <+98>:    mov    %rbx,%rsi
+   0x0000555555568309 <+101>:   callq  0x5555555681f4 <handle_errors>
+   0x000055555556830e <+106>:   add    $0x8,%rsp
+   0x0000555555568312 <+110>:   pop    %rbx
+   0x0000555555568313 <+111>:   pop    %r14
+   0x0000555555568315 <+113>:   retq
+
+r14 is 0x0 and writing to this ofcourse ends up in segfault
+
+[1] https://bugs.llvm.org/show_bug.cgi?id=39919
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+[bero@lindev.ch: rebased to dunfell busybox]
+---
+ coreutils/test.c | 2 +-
+ include/libbb.h  | 4 ++--
+ libbb/lineedit.c | 2 +-
+ shell/ash.c      | 5 ++---
+ 4 files changed, 6 insertions(+), 7 deletions(-)
+
+diff -up busybox-1.31.1/coreutils/test.c.omv~ busybox-1.31.1/coreutils/test.c
+--- busybox-1.31.1/coreutils/test.c.omv~        2021-03-10 21:10:53.399954723 +0100
++++ busybox-1.31.1/coreutils/test.c     2021-03-10 21:11:41.670409905 +0100
+@@ -401,7 +401,7 @@ struct test_statics {
+ };
+ 
+ /* See test_ptr_hack.c */
+-extern struct test_statics *const test_ptr_to_statics;
++extern struct test_statics *test_ptr_to_statics;
+ 
+ #define S (*test_ptr_to_statics)
+ #define args            (S.args         )
+diff -up busybox-1.31.1/include/libbb.h.omv~ busybox-1.31.1/include/libbb.h
+--- busybox-1.31.1/include/libbb.h.omv~ 2021-03-10 21:11:09.916777141 +0100
++++ busybox-1.31.1/include/libbb.h      2021-03-10 21:11:54.123860671 +0100
+@@ -341,7 +341,7 @@ struct BUG_off_t_size_is_misdetected {
+ #if defined(__GLIBC__)
+ /* glibc uses __errno_location() to get a ptr to errno */
+ /* We can just memorize it once - no multithreading in busybox :) */
+-extern int *const bb_errno;
++extern int *bb_errno;
+ #undef errno
+ #define errno (*bb_errno)
+ #endif
+@@ -2109,7 +2109,7 @@ struct globals;
+ /* '*const' ptr makes gcc optimize code much better.
+  * Magic prevents ptr_to_globals from going into rodata.
+  * If you want to assign a value, use SET_PTR_TO_GLOBALS(x) */
+-extern struct globals *const ptr_to_globals;
++extern struct globals *ptr_to_globals;
+ /* At least gcc 3.4.6 on mipsel system needs optimization barrier */
+ #define barrier() __asm__ __volatile__("":::"memory")
+ #define SET_PTR_TO_GLOBALS(x) do { \
+diff -up busybox-1.31.1/libbb/lineedit.c.omv~ busybox-1.31.1/libbb/lineedit.c
+--- busybox-1.31.1/libbb/lineedit.c.omv~        2021-03-10 21:12:14.437385555 +0100
++++ busybox-1.31.1/libbb/lineedit.c     2021-03-10 21:12:21.160782289 +0100
+@@ -181,7 +181,7 @@ struct lineedit_statics {
+ };
+ 
+ /* See lineedit_ptr_hack.c */
+-extern struct lineedit_statics *const lineedit_ptr_to_statics;
++extern struct lineedit_statics *lineedit_ptr_to_statics;
+ 
+ #define S (*lineedit_ptr_to_statics)
+ #define state            (S.state           )
+diff -up busybox-1.31.1/shell/ash.c.omv~ busybox-1.31.1/shell/ash.c
+--- busybox-1.31.1/shell/ash.c.omv~     2021-03-10 21:12:31.460879379 +0100
++++ busybox-1.31.1/shell/ash.c  2021-03-10 21:13:24.368044942 +0100
+@@ -297,10 +297,8 @@ typedef long arith_t;
+  * set "-DBB_GLOBAL_CONST=''" in CONFIG_EXTRA_CFLAGS to disable
+  * this optimization.
+  */
+-#ifndef BB_GLOBAL_CONST
+-# define BB_GLOBAL_CONST const
+-#endif
+-
++#undef BB_GLOBAL_CONST
++#define BB_GLOBAL_CONST
+ 
+ /* ============ Hash table sizes. Configurable. */
+ 
diff --git a/recipes-core/busybox/busybox/0001-Turn-ptr_to_globals-and-bb_errno-to-be-non-const.patch b/recipes-core/busybox/busybox/0001-Turn-ptr_to_globals-and-bb_errno-to-be-non-const.patch
index c14950a..468a32d 100644
--- a/recipes-core/busybox/busybox/0001-Turn-ptr_to_globals-and-bb_errno-to-be-non-const.patch
+++ b/recipes-core/busybox/busybox/0001-Turn-ptr_to_globals-and-bb_errno-to-be-non-const.patch
@@ -113,11 +113,9 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  shell/ash.c      | 5 ++---
  4 files changed, 6 insertions(+), 7 deletions(-)
 
-diff --git a/coreutils/test.c b/coreutils/test.c
-index 868ffbecb..d11fccf5b 100644
 --- a/coreutils/test.c
 +++ b/coreutils/test.c
-@@ -401,7 +401,7 @@ struct test_statics {
+@@ -435,7 +435,7 @@ struct test_statics {
  };
  
  /* See test_ptr_hack.c */
@@ -126,33 +124,29 @@ index 868ffbecb..d11fccf5b 100644
  
  #define S (*test_ptr_to_statics)
  #define args            (S.args         )
-diff --git a/include/libbb.h b/include/libbb.h
-index 111d1b790..a52265e77 100644
 --- a/include/libbb.h
 +++ b/include/libbb.h
-@@ -341,7 +341,7 @@ struct BUG_off_t_size_is_misdetected {
- #if defined(__GLIBC__)
- /* glibc uses __errno_location() to get a ptr to errno */
- /* We can just memorize it once - no multithreading in busybox :) */
+@@ -342,7 +342,7 @@ struct BUG_off_t_size_is_misdetected {
+ #if defined(errno)
+ /* If errno is a define, assume it's "define errno (*__errno_location())"
+  * and we will cache it's result in this variable */
 -extern int *const bb_errno;
 +extern int *bb_errno;
  #undef errno
  #define errno (*bb_errno)
- #endif
-@@ -2152,7 +2152,7 @@ struct globals;
+ #define bb_cached_errno_ptr 1
+@@ -2228,7 +2228,7 @@ struct globals;
  /* '*const' ptr makes gcc optimize code much better.
   * Magic prevents ptr_to_globals from going into rodata.
   * If you want to assign a value, use SET_PTR_TO_GLOBALS(x) */
 -extern struct globals *const ptr_to_globals;
 +extern struct globals *ptr_to_globals;
- /* At least gcc 3.4.6 on mipsel system needs optimization barrier */
- #define barrier() __asm__ __volatile__("":::"memory")
- #define SET_PTR_TO_GLOBALS(x) do { \
-diff --git a/libbb/lineedit.c b/libbb/lineedit.c
-index fbabc6c12..026c42c4c 100644
+ 
+ #if defined(__clang_major__) && __clang_major__ >= 9
+ /* Clang/llvm drops assignment to "constant" storage. Silently.
 --- a/libbb/lineedit.c
 +++ b/libbb/lineedit.c
-@@ -181,7 +181,7 @@ struct lineedit_statics {
+@@ -192,7 +192,7 @@ struct lineedit_statics {
  };
  
  /* See lineedit_ptr_hack.c */
@@ -161,11 +155,9 @@ index fbabc6c12..026c42c4c 100644
  
  #define S (*lineedit_ptr_to_statics)
  #define state            (S.state           )
-diff --git a/shell/ash.c b/shell/ash.c
-index c5588ea66..6f07f7d6d 100644
 --- a/shell/ash.c
 +++ b/shell/ash.c
-@@ -297,10 +297,9 @@ typedef long arith_t;
+@@ -300,10 +300,9 @@ typedef long arith_t;
   * set "-DBB_GLOBAL_CONST=''" in CONFIG_EXTRA_CFLAGS to disable
   * this optimization.
   */
@@ -178,6 +170,3 @@ index c5588ea66..6f07f7d6d 100644
  
  /* ============ Hash table sizes. Configurable. */
  
--- 
-2.23.0
-
diff --git a/recipes-core/busybox/busybox_1.31.%.bbappend b/recipes-core/busybox/busybox_1.31.1%.bbappend
index f26df7e..726ee76 100644
--- a/recipes-core/busybox/busybox_1.31.%.bbappend
+++ b/recipes-core/busybox/busybox_1.31.1%.bbappend
@@ -1,6 +1,6 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 SRC_URI_append_toolchain-clang = "\
-    file://0001-Turn-ptr_to_globals-and-bb_errno-to-be-non-const.patch \
+    file://0001-Turn-ptr_to_globals-and-bb_errno-to-be-non-const-1.31.1.patch \
 "
 
 # networking/tls_pstm_sqr_comba.c:514:4: error: inline assembly requires more registers than available
diff --git a/recipes-core/meta/clang-environment.inc b/recipes-core/meta/clang-environment.inc
new file mode 100644
index 0000000..a238e49
--- /dev/null
+++ b/recipes-core/meta/clang-environment.inc
@@ -0,0 +1,19 @@
+export TARGET_CLANGCC_ARCH = "${TARGET_CC_ARCH}"
+TARGET_CLANGCC_ARCH_remove = "-mthumb-interwork"
+TARGET_CLANGCC_ARCH_remove = "-mmusl"
+TARGET_CLANGCC_ARCH_remove = "-muclibc"
+TARGET_CLANGCC_ARCH_remove = "-meb"
+TARGET_CLANGCC_ARCH_remove = "-mel"
+TARGET_CLANGCC_ARCH_append = "${@bb.utils.contains("TUNE_FEATURES", "bigendian", " -mbig-endian", " -mlittle-endian", d)}"
+TARGET_CLANGCC_ARCH_remove_powerpc = "-mhard-float"
+TARGET_CLANGCC_ARCH_remove_powerpc = "-mno-spe"
+
+create_sdk_files_append() {
+        script=${SDK_OUTPUT}/${SDKPATH}/environment-setup-${REAL_MULTIMACH_TARGET_SYS}
+        if ${@bb.utils.contains('CLANGSDK', '1', 'true', 'false', d)}; then
+            echo 'export CLANGCC="${TARGET_PREFIX}clang --target=${TARGET_SYS} ${TARGET_CLANGCC_ARCH} --sysroot=$SDKTARGETSYSROOT"' >> $script
+            echo 'export CLANGCXX="${TARGET_PREFIX}clang++ --target=${TARGET_SYS} ${TARGET_CLANGCC_ARCH} --sysroot=$SDKTARGETSYSROOT"' >> $script
+            echo 'export CLANGCPP="${TARGET_PREFIX}clang -E --target=${TARGET_SYS} ${TARGET_CLANGCC_ARCH} --sysroot=$SDKTARGETSYSROOT"' >> $script
+            echo 'export CLANG_TIDY_EXE="${TARGET_PREFIX}clang-tidy"' >> $script
+        fi
+}
diff --git a/recipes-core/meta/meta-environment-extsdk.bbappend b/recipes-core/meta/meta-environment-extsdk.bbappend
new file mode 100644
index 0000000..e867074
--- /dev/null
+++ b/recipes-core/meta/meta-environment-extsdk.bbappend
@@ -0,0 +1,3 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+require clang-environment.inc
diff --git a/recipes-core/meta/meta-environment.bbappend b/recipes-core/meta/meta-environment.bbappend
index d59bfd6..e867074 100644
--- a/recipes-core/meta/meta-environment.bbappend
+++ b/recipes-core/meta/meta-environment.bbappend
@@ -1,19 +1,3 @@
-export TARGET_CLANGCC_ARCH = "${TARGET_CC_ARCH}"
-TARGET_CLANGCC_ARCH_remove = "-mthumb-interwork"
-TARGET_CLANGCC_ARCH_remove = "-mmusl"
-TARGET_CLANGCC_ARCH_remove = "-muclibc"
-TARGET_CLANGCC_ARCH_remove = "-meb"
-TARGET_CLANGCC_ARCH_remove = "-mel"
-TARGET_CLANGCC_ARCH_append = "${@bb.utils.contains("TUNE_FEATURES", "bigendian", " -mbig-endian", " -mlittle-endian", d)}"
-TARGET_CLANGCC_ARCH_remove_powerpc = "-mhard-float"
-TARGET_CLANGCC_ARCH_remove_powerpc = "-mno-spe"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-create_sdk_files_append() {
-        script=${SDK_OUTPUT}/${SDKPATH}/environment-setup-${REAL_MULTIMACH_TARGET_SYS}
-        if ${@bb.utils.contains('CLANGSDK', '1', 'true', 'false', d)}; then
-            echo 'export CLANGCC="${TARGET_PREFIX}clang ${TARGET_CLANGCC_ARCH} --sysroot=$SDKTARGETSYSROOT"' >> $script
-            echo 'export CLANGCXX="${TARGET_PREFIX}clang++ ${TARGET_CLANGCC_ARCH} --sysroot=$SDKTARGETSYSROOT"' >> $script
-            echo 'export CLANGCPP="${TARGET_PREFIX}clang -E ${TARGET_CLANGCC_ARCH} --sysroot=$SDKTARGETSYSROOT"' >> $script
-            echo 'export CLANG_TIDY_EXE="${TARGET_PREFIX}clang-tidy"' >> $script
-        fi
-}
+require clang-environment.inc
diff --git a/recipes-core/musl/musl_%.bbappend b/recipes-core/musl/musl_%.bbappend
index a6a1bf5..70fe10c 100644
--- a/recipes-core/musl/musl_%.bbappend
+++ b/recipes-core/musl/musl_%.bbappend
@@ -1,12 +1,4 @@
 DEPENDS_append_toolchain-clang = " clang-cross-${TARGET_ARCH}"
+DEPENDS_remove_toolchain-clang = "virtual/${TARGET_PREFIX}gcc"
 TOOLCHAIN_x86-x32 = "gcc"
-TOOLCHAIN_riscv64 = "gcc"
 TOOLCHAIN_powerpc64 = "gcc"
-
-inherit lto
-
-# workaround until https://bugs.llvm.org/show_bug.cgi?id=44384
-# is fixed
-do_configure_prepend_toolchain-clang () {
-    sed -i -e '/frounding-math/d' ${S}/configure
-}
diff --git a/recipes-core/packagegroups/packagegroup-core-buildessential.bbappend b/recipes-core/packagegroups/packagegroup-core-buildessential.bbappend
new file mode 100644
index 0000000..403af1a
--- /dev/null
+++ b/recipes-core/packagegroups/packagegroup-core-buildessential.bbappend
@@ -0,0 +1,3 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+RDEPENDS_packagegroup-core-buildessential_append_toolchain-clang = " clang "
diff --git a/recipes-core/packagegroups/packagegroup-cross-canadian.bbappend b/recipes-core/packagegroups/packagegroup-cross-canadian.bbappend
index 4bbd4ab..5b397b5 100644
--- a/recipes-core/packagegroups/packagegroup-cross-canadian.bbappend
+++ b/recipes-core/packagegroups/packagegroup-cross-canadian.bbappend
@@ -1,2 +1,3 @@
-CLANGCROSSCANADIAN = "${@bb.utils.contains('CLANGSDK', '1', 'clang-cross-canadian-${TRANSLATED_TARGET_ARCH}', '', d)}"
-RDEPENDS_${PN} += "${@all_multilib_tune_values(d, 'CLANGCROSSCANADIAN')}"
+CLANGCROSSCANADIAN = "clang-cross-canadian-${TRANSLATED_TARGET_ARCH}"
+CLANGCROSSCANADIANDEPS += "${@all_multilib_tune_values(d, 'CLANGCROSSCANADIAN')}"
+RDEPENDS_${PN} += "${@bb.utils.contains('CLANGSDK', '1', '${CLANGCROSSCANADIANDEPS}', '', d)}"
diff --git a/recipes-devtools/castxml/castxml_git.bb b/recipes-devtools/castxml/castxml_git.bb
new file mode 100644
index 0000000..4d3aa8a
--- /dev/null
+++ b/recipes-devtools/castxml/castxml_git.bb
@@ -0,0 +1,29 @@
+SUMMARY = "C-family abstract syntax tree XML output tool."
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
+
+SRC_URI = "git://github.com/CastXML/CastXML"
+
+# 0.3.6 is the release for LLVM/Clang v11.0.0
+SRCREV = "902ac163f0291fcfc459f58691481e88c9f91dea"
+PV = "0.3.6"
+
+S = "${WORKDIR}/git"
+
+DEPENDS = "clang"
+
+# Match clang's idea of what TOOLCHAIN should be.
+TOOLCHAIN = "clang"
+TOOLCHAIN_class-native = "gcc"
+TOOLCHAIN_class-nativesdk = "clang"
+
+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_append_class-nativesdk = " -fuse-ld=gold"
+
+inherit cmake cmake-native pkgconfig python3native
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-devtools/clang/clang.inc b/recipes-devtools/clang/clang.inc
index a99049d..6a08046 100644
--- a/recipes-devtools/clang/clang.inc
+++ b/recipes-devtools/clang/clang.inc
@@ -4,11 +4,11 @@ LLVM_DIR = "llvm${LLVM_RELEASE}"
 LLVM_GIT ?= "git://github.com/llvm"
 LLVM_GIT_PROTOCOL ?= "https"
 
-MAJOR_VER = "10"
+MAJOR_VER = "12"
 MINOR_VER = "0"
-PATCH_VER = "1"
+PATCH_VER = "0"
 
-SRCREV ?= "ef32c611aa214dea855364efd7ba451ec5ec3f74"
+SRCREV ?= "fa0971b87fb2c9d14d1bba2551e61f02f18f329b"
 
 PV = "${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}"
 BRANCH = "release/${MAJOR_VER}.x"
@@ -20,4 +20,7 @@ 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-compiler-rt-Fix-realpath-already-defined-error.patch b/recipes-devtools/clang/clang/0001-compiler-rt-Fix-realpath-already-defined-error.patch
deleted file mode 100755
index 35e65d3..0000000
--- a/recipes-devtools/clang/clang/0001-compiler-rt-Fix-realpath-already-defined-error.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From dde0be40b3628caa4abbb7ca367bc753f7b7e7a6 Mon Sep 17 00:00:00 2001
-From: Alexander Thoma <a.thoma@rational-online.com>
-Date: Wed, 22 Sep 2021 07:46:29 +0200
-Subject: [PATCH] compiler-rt Fix realpath already defined error
-
----
- compiler-rt/lib/tsan/dd/dd_interceptors.cpp | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/compiler-rt/lib/tsan/dd/dd_interceptors.cpp b/compiler-rt/lib/tsan/dd/dd_interceptors.cpp
-index 35a0beb19196..ed819339f3cb 100644
---- a/compiler-rt/lib/tsan/dd/dd_interceptors.cpp
-+++ b/compiler-rt/lib/tsan/dd/dd_interceptors.cpp
-@@ -6,11 +6,11 @@
- //
- //===----------------------------------------------------------------------===//
- 
-+#include <pthread.h>
- #include "dd_rtl.h"
- #include "interception/interception.h"
- #include "sanitizer_common/sanitizer_procmaps.h"
--#include <pthread.h>
--#include <stdlib.h>
-+#include "sanitizer_common/sanitizer_allocator_internal.h"
- 
- using namespace __dsan;
- 
-@@ -163,12 +163,12 @@ static pthread_cond_t *init_cond(pthread_cond_t *c, bool force = false) {
-   uptr cond = atomic_load(p, memory_order_acquire);
-   if (!force && cond != 0)
-     return (pthread_cond_t*)cond;
--  void *newcond = malloc(sizeof(pthread_cond_t));
-+  void *newcond = InternalAlloc(sizeof(pthread_cond_t));
-   internal_memset(newcond, 0, sizeof(pthread_cond_t));
-   if (atomic_compare_exchange_strong(p, &cond, (uptr)newcond,
-       memory_order_acq_rel))
-     return (pthread_cond_t*)newcond;
--  free(newcond);
-+  InternalFree(newcond);
-   return (pthread_cond_t*)cond;
- }
- 
-@@ -216,7 +216,7 @@ INTERCEPTOR(int, pthread_cond_destroy, pthread_cond_t *c) {
-   InitThread();
-   pthread_cond_t *cond = init_cond(c);
-   int res = REAL(pthread_cond_destroy)(cond);
--  free(cond);
-+  InternalFree(cond);
-   atomic_store((atomic_uintptr_t*)c, 0, memory_order_relaxed);
-   return res;
- }
--- 
-2.25.1
-
diff --git a/recipes-devtools/clang/clang/0001-lldb-Add-lxml2-to-linker-cmdline-of-xml-is-found.patch b/recipes-devtools/clang/clang/0001-lldb-Add-lxml2-to-linker-cmdline-of-xml-is-found.patch
index 1a606f4..c1ba432 100644
--- a/recipes-devtools/clang/clang/0001-lldb-Add-lxml2-to-linker-cmdline-of-xml-is-found.patch
+++ b/recipes-devtools/clang/clang/0001-lldb-Add-lxml2-to-linker-cmdline-of-xml-is-found.patch
@@ -1,4 +1,4 @@
-From 9f0c90da3de0706e3dd699ed0eb92744d4d9ea80 Mon Sep 17 00:00:00 2001
+From 42e6673563ca1d0e433e16c3eefa20b98e280ebd Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Mon, 22 May 2017 17:36:16 -0700
 Subject: [PATCH] lldb: Add -lxml2 to linker cmdline of xml is found
@@ -23,15 +23,15 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/lldb/source/Host/CMakeLists.txt b/lldb/source/Host/CMakeLists.txt
-index 2e9bb402227..bfad6703c65 100644
+index 7456cb98bfa1..1a732ec5cb89 100644
 --- a/lldb/source/Host/CMakeLists.txt
 +++ b/lldb/source/Host/CMakeLists.txt
-@@ -149,7 +149,7 @@ if (APPLE)
-   list(APPEND EXTRA_LIBS xml2)
- else ()
-   if (LIBXML2_FOUND)
--    list(APPEND EXTRA_LIBS ${LIBXML2_LIBRARIES})
-+    list(APPEND EXTRA_LIBS xml2)
-   endif()
- endif ()
+@@ -138,7 +138,7 @@ if (CMAKE_SYSTEM_NAME MATCHES "NetBSD")
+   list(APPEND EXTRA_LIBS kvm)
+ endif()
+ if (LLDB_ENABLE_LIBXML2)
+-  list(APPEND EXTRA_LIBS ${LIBXML2_LIBRARIES})
++  list(APPEND EXTRA_LIBS xml2)
+ endif()
  if (HAVE_LIBDL)
+   list(APPEND EXTRA_LIBS ${CMAKE_DL_LIBS})
diff --git a/recipes-devtools/clang/clang/0002-libcxxabi-Find-libunwind-headers-when-LIBCXXABI_LIBU.patch b/recipes-devtools/clang/clang/0002-libcxxabi-Find-libunwind-headers-when-LIBCXXABI_LIBU.patch
index 65fb23d..f101e77 100644
--- a/recipes-devtools/clang/clang/0002-libcxxabi-Find-libunwind-headers-when-LIBCXXABI_LIBU.patch
+++ b/recipes-devtools/clang/clang/0002-libcxxabi-Find-libunwind-headers-when-LIBCXXABI_LIBU.patch
@@ -1,4 +1,4 @@
-From a268e2fb21b30cce26f76536bf133b7a706e460f Mon Sep 17 00:00:00 2001
+From da63df8f02b3a767b68d6de730bb63bba6c3ce33 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
@@ -17,10 +17,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 11 insertions(+), 10 deletions(-)
 
 diff --git a/libcxxabi/CMakeLists.txt b/libcxxabi/CMakeLists.txt
-index 59d99971a76..b0f51ebee3e 100644
+index 426c855288fc..06a62c642898 100644
 --- a/libcxxabi/CMakeLists.txt
 +++ b/libcxxabi/CMakeLists.txt
-@@ -497,14 +497,9 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${LIBCXXABI_C_FLAGS}")
+@@ -478,14 +478,9 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${LIBCXXABI_C_FLAGS}")
  # Setup Source Code
  #===============================================================================
  
@@ -36,7 +36,7 @@ index 59d99971a76..b0f51ebee3e 100644
      PATHS ${LIBCXXABI_LIBUNWIND_INCLUDES}
            ${LIBCXXABI_LIBUNWIND_PATH}/include
            ${CMAKE_BINARY_DIR}/${LIBCXXABI_LIBUNWIND_INCLUDES}
-@@ -515,15 +510,21 @@ if (LIBCXXABI_USE_LLVM_UNWINDER OR LLVM_NATIVE_ARCH MATCHES ARM)
+@@ -496,15 +491,21 @@ if (LIBCXXABI_USE_LLVM_UNWINDER OR LLVM_NATIVE_ARCH MATCHES ARM)
      NO_CMAKE_FIND_ROOT_PATH
    )
  
diff --git a/recipes-devtools/clang/clang/0003-compiler-rt-support-a-new-embedded-linux-target.patch b/recipes-devtools/clang/clang/0003-compiler-rt-support-a-new-embedded-linux-target.patch
index 4c8bc63..e8536d3 100644
--- a/recipes-devtools/clang/clang/0003-compiler-rt-support-a-new-embedded-linux-target.patch
+++ b/recipes-devtools/clang/clang/0003-compiler-rt-support-a-new-embedded-linux-target.patch
@@ -1,4 +1,4 @@
-From 57ba81bfe82f18899b1c846bee6276b1b43ce4cf Mon Sep 17 00:00:00 2001
+From cfeba7ac05c96abddfad1eeb827ba8d0c968ec94 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
@@ -13,7 +13,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  create mode 100644 compiler-rt/make/platform/clang_linux_embedded_test_input.c
 
 diff --git a/compiler-rt/lib/builtins/int_util.c b/compiler-rt/lib/builtins/int_util.c
-index 226a6e93440..efc977acbb3 100644
+index 226a6e93440d..efc977acbb39 100644
 --- a/compiler-rt/lib/builtins/int_util.c
 +++ b/compiler-rt/lib/builtins/int_util.c
 @@ -54,7 +54,7 @@ void __compilerrt_abort_impl(const char *file, int line, const char *function) {
@@ -27,7 +27,7 @@ index 226a6e93440..efc977acbb3 100644
  __attribute__((weak))
 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 00000000000..d0a890075a1
+index 000000000000..d0a890075a1c
 --- /dev/null
 +++ b/compiler-rt/make/platform/clang_linux_embedded.mk
 @@ -0,0 +1,286 @@
@@ -319,4 +319,4 @@ index 00000000000..d0a890075a1
 +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 00000000000..e69de29bb2d
+index 000000000000..e69de29bb2d1
diff --git a/recipes-devtools/clang/clang/0004-compiler-rt-Simplify-cross-compilation.-Don-t-use-na.patch b/recipes-devtools/clang/clang/0004-compiler-rt-Simplify-cross-compilation.-Don-t-use-na.patch
index dfbfb53..8b8edd8 100644
--- a/recipes-devtools/clang/clang/0004-compiler-rt-Simplify-cross-compilation.-Don-t-use-na.patch
+++ b/recipes-devtools/clang/clang/0004-compiler-rt-Simplify-cross-compilation.-Don-t-use-na.patch
@@ -1,4 +1,4 @@
-From 1ecabb645e30330b82754b133f685d96c3e1ee42 Mon Sep 17 00:00:00 2001
+From 6c786d55d560abca076b7c1b718cdcb31ef5b388 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
@@ -20,10 +20,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 10 insertions(+), 1 deletion(-)
 
 diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt
-index 8d768a404f2..1b1a29dc25a 100644
+index b44ad2c2118e..ed8f4bd80e93 100644
 --- a/compiler-rt/CMakeLists.txt
 +++ b/compiler-rt/CMakeLists.txt
-@@ -74,7 +74,16 @@ set(COMPILER_RT_BAREMETAL_BUILD OFF CACHE BOOL
+@@ -72,7 +72,16 @@ set(COMPILER_RT_BAREMETAL_BUILD OFF CACHE BOOL
    "Build for a bare-metal target.")
  
  if (COMPILER_RT_STANDALONE_BUILD)
diff --git a/recipes-devtools/clang/clang/0005-compiler-rt-Disable-tsan-on-OE-glibc.patch b/recipes-devtools/clang/clang/0005-compiler-rt-Disable-tsan-on-OE-glibc.patch
new file mode 100644
index 0000000..97d57c2
--- /dev/null
+++ b/recipes-devtools/clang/clang/0005-compiler-rt-Disable-tsan-on-OE-glibc.patch
@@ -0,0 +1,40 @@
+From 121a71a3923dbace24dbb7bd25f9f286fb9f91fb Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 18 Jul 2016 08:05:02 +0000
+Subject: [PATCH] compiler-rt: Disable tsan on OE/glibc
+
+It does not build see
+http://lists.llvm.org/pipermail/llvm-dev/2016-July/102235.html
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ compiler-rt/cmake/config-ix.cmake                | 2 +-
+ compiler-rt/test/sanitizer_common/CMakeLists.txt | 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 f81b8384cbd5..196aa62fd01c 100644
+--- a/compiler-rt/cmake/config-ix.cmake
++++ b/compiler-rt/cmake/config-ix.cmake
+@@ -723,7 +723,7 @@ else()
+ endif()
+ 
+ if (COMPILER_RT_HAS_SANITIZER_COMMON AND TSAN_SUPPORTED_ARCH AND
+-    OS_NAME MATCHES "Darwin|Linux|FreeBSD|Android|NetBSD")
++    OS_NAME MATCHES "Darwin|FreeBSD|Android|NetBSD")
+   set(COMPILER_RT_HAS_TSAN TRUE)
+ else()
+   set(COMPILER_RT_HAS_TSAN FALSE)
+diff --git a/compiler-rt/test/sanitizer_common/CMakeLists.txt b/compiler-rt/test/sanitizer_common/CMakeLists.txt
+index 7f1b0f257716..2caf78be2511 100644
+--- a/compiler-rt/test/sanitizer_common/CMakeLists.txt
++++ b/compiler-rt/test/sanitizer_common/CMakeLists.txt
+@@ -11,7 +11,7 @@ set(SANITIZER_COMMON_TESTSUITES)
+ # FIXME(dliew): We should switch to COMPILER_RT_SANITIZERS_TO_BUILD instead of
+ # the hard coded `SUPPORTED_TOOLS_INIT` list once we know that the other
+ # sanitizers work.
+-set(SUPPORTED_TOOLS_INIT asan lsan msan tsan ubsan)
++set(SUPPORTED_TOOLS_INIT asan lsan msan ubsan)
+ set(SUPPORTED_TOOLS)
+   foreach(SANITIZER_TOOL ${SUPPORTED_TOOLS_INIT})
+     string(TOUPPER ${SANITIZER_TOOL} SANITIZER_TOOL_UPPER)
diff --git a/recipes-devtools/clang/clang/0006-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch b/recipes-devtools/clang/clang/0006-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch
index fd58c68..4e1120a 100644
--- a/recipes-devtools/clang/clang/0006-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch
+++ b/recipes-devtools/clang/clang/0006-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch
@@ -1,4 +1,4 @@
-From c3f0b7eb02d4b13400f0cf8d8e77f9e898f189e9 Mon Sep 17 00:00:00 2001
+From 4afcffd0c4b3317b5b5e08e3372b2923ab471e4b 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
@@ -13,10 +13,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 21 insertions(+)
 
 diff --git a/llvm/include/llvm/Analysis/TargetLibraryInfo.def b/llvm/include/llvm/Analysis/TargetLibraryInfo.def
-index afed404f04c..876888656f2 100644
+index defc95d0062a..41d2099d0c5b 100644
 --- a/llvm/include/llvm/Analysis/TargetLibraryInfo.def
 +++ b/llvm/include/llvm/Analysis/TargetLibraryInfo.def
-@@ -782,6 +782,9 @@ TLI_DEFINE_STRING_INTERNAL("fmodl")
+@@ -809,6 +809,9 @@ TLI_DEFINE_STRING_INTERNAL("fmodl")
  TLI_DEFINE_ENUM_INTERNAL(fopen)
  TLI_DEFINE_STRING_INTERNAL("fopen")
  /// FILE *fopen64(const char *filename, const char *opentype)
@@ -26,7 +26,7 @@ index afed404f04c..876888656f2 100644
  TLI_DEFINE_ENUM_INTERNAL(fopen64)
  TLI_DEFINE_STRING_INTERNAL("fopen64")
  /// int fork();
-@@ -829,6 +832,9 @@ TLI_DEFINE_STRING_INTERNAL("fseek")
+@@ -856,6 +859,9 @@ TLI_DEFINE_STRING_INTERNAL("fseek")
  /// int fseeko(FILE *stream, off_t offset, int whence);
  TLI_DEFINE_ENUM_INTERNAL(fseeko)
  TLI_DEFINE_STRING_INTERNAL("fseeko")
@@ -36,7 +36,7 @@ index afed404f04c..876888656f2 100644
  /// int fseeko64(FILE *stream, off64_t offset, int whence)
  TLI_DEFINE_ENUM_INTERNAL(fseeko64)
  TLI_DEFINE_STRING_INTERNAL("fseeko64")
-@@ -839,6 +845,9 @@ TLI_DEFINE_STRING_INTERNAL("fsetpos")
+@@ -866,6 +872,9 @@ TLI_DEFINE_STRING_INTERNAL("fsetpos")
  TLI_DEFINE_ENUM_INTERNAL(fstat)
  TLI_DEFINE_STRING_INTERNAL("fstat")
  /// int fstat64(int filedes, struct stat64 *buf)
@@ -46,7 +46,7 @@ index afed404f04c..876888656f2 100644
  TLI_DEFINE_ENUM_INTERNAL(fstat64)
  TLI_DEFINE_STRING_INTERNAL("fstat64")
  /// int fstatvfs(int fildes, struct statvfs *buf);
-@@ -854,6 +863,9 @@ TLI_DEFINE_STRING_INTERNAL("ftell")
+@@ -881,6 +890,9 @@ TLI_DEFINE_STRING_INTERNAL("ftell")
  TLI_DEFINE_ENUM_INTERNAL(ftello)
  TLI_DEFINE_STRING_INTERNAL("ftello")
  /// off64_t ftello64(FILE *stream)
@@ -56,7 +56,7 @@ index afed404f04c..876888656f2 100644
  TLI_DEFINE_ENUM_INTERNAL(ftello64)
  TLI_DEFINE_STRING_INTERNAL("ftello64")
  /// int ftrylockfile(FILE *file);
-@@ -980,6 +992,9 @@ TLI_DEFINE_STRING_INTERNAL("logl")
+@@ -1007,6 +1019,9 @@ TLI_DEFINE_STRING_INTERNAL("logl")
  TLI_DEFINE_ENUM_INTERNAL(lstat)
  TLI_DEFINE_STRING_INTERNAL("lstat")
  /// int lstat64(const char *path, struct stat64 *buf);
@@ -66,7 +66,7 @@ index afed404f04c..876888656f2 100644
  TLI_DEFINE_ENUM_INTERNAL(lstat64)
  TLI_DEFINE_STRING_INTERNAL("lstat64")
  /// void *malloc(size_t size);
-@@ -1205,6 +1220,9 @@ TLI_DEFINE_STRING_INTERNAL("sscanf")
+@@ -1250,6 +1265,9 @@ TLI_DEFINE_STRING_INTERNAL("sscanf")
  TLI_DEFINE_ENUM_INTERNAL(stat)
  TLI_DEFINE_STRING_INTERNAL("stat")
  /// int stat64(const char *path, struct stat64 *buf);
@@ -76,7 +76,7 @@ index afed404f04c..876888656f2 100644
  TLI_DEFINE_ENUM_INTERNAL(stat64)
  TLI_DEFINE_STRING_INTERNAL("stat64")
  /// int statvfs(const char *path, struct statvfs *buf);
-@@ -1340,6 +1358,9 @@ TLI_DEFINE_STRING_INTERNAL("times")
+@@ -1385,6 +1403,9 @@ TLI_DEFINE_STRING_INTERNAL("times")
  TLI_DEFINE_ENUM_INTERNAL(tmpfile)
  TLI_DEFINE_STRING_INTERNAL("tmpfile")
  /// FILE *tmpfile64(void)
diff --git a/recipes-devtools/clang/clang/0007-llvm-allow-env-override-of-exe-path.patch b/recipes-devtools/clang/clang/0007-llvm-allow-env-override-of-exe-path.patch
index 804cde9..4df2d62 100644
--- a/recipes-devtools/clang/clang/0007-llvm-allow-env-override-of-exe-path.patch
+++ b/recipes-devtools/clang/clang/0007-llvm-allow-env-override-of-exe-path.patch
@@ -1,4 +1,4 @@
-From f9e72bc861144d8f77505ce833fc0c8397520e9b Mon Sep 17 00:00:00 2001
+From 4ed6b8848edbe1c453ce0d23d33551ff023f4fb2 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 path
@@ -15,10 +15,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 7 insertions(+)
 
 diff --git a/llvm/tools/llvm-config/llvm-config.cpp b/llvm/tools/llvm-config/llvm-config.cpp
-index 6c31df3e173..f34f3a935ad 100644
+index 1a2f04552d13..019d8f2b5c5e 100644
 --- a/llvm/tools/llvm-config/llvm-config.cpp
 +++ b/llvm/tools/llvm-config/llvm-config.cpp
-@@ -225,6 +225,13 @@ Typical components:\n\
+@@ -247,6 +247,13 @@ Typical components:\n\
  
  /// Compute the path to the main executable.
  std::string GetExecutablePath(const char *Argv0) {
diff --git a/recipes-devtools/clang/clang/0008-clang-driver-Check-sysroot-for-ldso-path.patch b/recipes-devtools/clang/clang/0008-clang-driver-Check-sysroot-for-ldso-path.patch
index 2d0cb1c..ea28de0 100644
--- a/recipes-devtools/clang/clang/0008-clang-driver-Check-sysroot-for-ldso-path.patch
+++ b/recipes-devtools/clang/clang/0008-clang-driver-Check-sysroot-for-ldso-path.patch
@@ -1,4 +1,4 @@
-From 2aa9b771b258b45e7de0bef6a99bcdd248ce3b17 Mon Sep 17 00:00:00 2001
+From 15008103e23b5e1cd65bcc32746aa41579583dc5 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
@@ -14,10 +14,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 16 insertions(+)
 
 diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp
-index bff1ab1009b..02e3d676567 100644
+index 9663a7390ada..06b92cc0bf5b 100644
 --- a/clang/lib/Driver/ToolChains/Linux.cpp
 +++ b/clang/lib/Driver/ToolChains/Linux.cpp
-@@ -596,11 +596,19 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
+@@ -507,11 +507,19 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
      LibDir = "lib64";
      Loader =
          (tools::ppc::hasPPCAbiArg(Args, "elfv2")) ? "ld64.so.2" : "ld64.so.1";
@@ -37,7 +37,7 @@ index bff1ab1009b..02e3d676567 100644
      break;
    case llvm::Triple::riscv32: {
      StringRef ABIName = tools::riscv::getRISCVABI(Args, Triple);
-@@ -622,6 +630,10 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
+@@ -533,6 +541,10 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
    case llvm::Triple::sparcv9:
      LibDir = "lib64";
      Loader = "ld-linux.so.2";
@@ -48,7 +48,7 @@ index bff1ab1009b..02e3d676567 100644
      break;
    case llvm::Triple::systemz:
      LibDir = "lib";
-@@ -636,6 +648,10 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
+@@ -547,6 +559,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";
@@ -58,4 +58,4 @@ index bff1ab1009b..02e3d676567 100644
 +    }
      break;
    }
-   }
+   case llvm::Triple::ve:
diff --git a/recipes-devtools/clang/clang/0009-clang-Driver-tools.cpp-Add-lssp_nonshared-on-musl.patch b/recipes-devtools/clang/clang/0009-clang-Driver-tools.cpp-Add-lssp_nonshared-on-musl.patch
index 51ce720..a0d116b 100644
--- a/recipes-devtools/clang/clang/0009-clang-Driver-tools.cpp-Add-lssp_nonshared-on-musl.patch
+++ b/recipes-devtools/clang/clang/0009-clang-Driver-tools.cpp-Add-lssp_nonshared-on-musl.patch
@@ -1,4 +1,4 @@
-From 42800fd6bf0040ddd0abf280ea205407e9e004b5 Mon Sep 17 00:00:00 2001
+From 1b2f69bc1938d4d65dd88c2e43e1bd160312d074 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
@@ -13,10 +13,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 6 insertions(+)
 
 diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp
-index da197e47662..4821cfebc21 100644
+index 1d8a3cdce92a..195a302c8771 100644
 --- a/clang/lib/Driver/ToolChains/Gnu.cpp
 +++ b/clang/lib/Driver/ToolChains/Gnu.cpp
-@@ -583,6 +583,12 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
+@@ -628,6 +628,12 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
        if (IsIAMCU)
          CmdArgs.push_back("-lgloss");
  
diff --git a/recipes-devtools/clang/clang/0010-clang-musl-ppc-does-not-support-128-bit-long-double.patch b/recipes-devtools/clang/clang/0010-clang-musl-ppc-does-not-support-128-bit-long-double.patch
index 2de6618..8c2ddeb 100644
--- a/recipes-devtools/clang/clang/0010-clang-musl-ppc-does-not-support-128-bit-long-double.patch
+++ b/recipes-devtools/clang/clang/0010-clang-musl-ppc-does-not-support-128-bit-long-double.patch
@@ -1,4 +1,4 @@
-From d4719b78a4d59d572b9de7397d8179a5ed7460e9 Mon Sep 17 00:00:00 2001
+From 7ab52935bc6bd89529a2478af1ea2cdf192eb0d9 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Tue, 10 May 2016 02:00:11 -0700
 Subject: [PATCH] clang: musl/ppc does not support 128-bit long double
@@ -9,10 +9,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 4 insertions(+)
 
 diff --git a/clang/lib/Basic/Targets/PPC.h b/clang/lib/Basic/Targets/PPC.h
-index 270aa7ff918..8b1bb167818 100644
+index 56c8f33ef221..b7e7edf270be 100644
 --- a/clang/lib/Basic/Targets/PPC.h
 +++ b/clang/lib/Basic/Targets/PPC.h
-@@ -364,6 +364,10 @@ public:
+@@ -386,6 +386,10 @@ public:
        LongDoubleFormat = &llvm::APFloat::IEEEdouble();
      }
  
diff --git a/recipes-devtools/clang/clang/0011-clang-Prepend-trailing-to-sysroot.patch b/recipes-devtools/clang/clang/0011-clang-Prepend-trailing-to-sysroot.patch
index 418afba..88d1868 100644
--- a/recipes-devtools/clang/clang/0011-clang-Prepend-trailing-to-sysroot.patch
+++ b/recipes-devtools/clang/clang/0011-clang-Prepend-trailing-to-sysroot.patch
@@ -1,4 +1,4 @@
-From 90ac3c6f6407ed40aa76e779ddbcfc0d24c58780 Mon Sep 17 00:00:00 2001
+From af7639bf4db497300060a22f2cc94b37145b8db5 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
@@ -24,15 +24,15 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp
-index 02e3d676567..d95da11e351 100644
+index 06b92cc0bf5b..726308413dc9 100644
 --- a/clang/lib/Driver/ToolChains/Linux.cpp
 +++ b/clang/lib/Driver/ToolChains/Linux.cpp
-@@ -223,7 +223,7 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
+@@ -218,7 +218,7 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
    Multilibs = GCCInstallation.getMultilibs();
    SelectedMultilib = GCCInstallation.getMultilib();
    llvm::Triple::ArchType Arch = Triple.getArch();
 -  std::string SysRoot = computeSysRoot();
 +  std::string SysRoot = computeSysRoot() + "/";
+   ToolChain::path_list &PPaths = getProgramPaths();
  
-   // Cross-compiling binutils and GCC installations (vanilla and openSUSE at
-   // least) put various tools in a triple-prefixed directory off of the parent
+   Generic_GCC::PushPPaths(PPaths);
diff --git a/recipes-devtools/clang/clang/0012-clang-Look-inside-the-target-sysroot-for-compiler-ru.patch b/recipes-devtools/clang/clang/0012-clang-Look-inside-the-target-sysroot-for-compiler-ru.patch
index 9316157..1e9d395 100644
--- a/recipes-devtools/clang/clang/0012-clang-Look-inside-the-target-sysroot-for-compiler-ru.patch
+++ b/recipes-devtools/clang/clang/0012-clang-Look-inside-the-target-sysroot-for-compiler-ru.patch
@@ -1,4 +1,4 @@
-From 805b4ce637faedee91bb92fdae273b01bd5aa363 Mon Sep 17 00:00:00 2001
+From f946307a70619c45919ac06fa37c267fd25c3ec8 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
@@ -15,7 +15,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp
-index cab97b1a601..059a5e62c40 100644
+index b2ddef141a75..784a946b453f 100644
 --- a/clang/lib/Driver/ToolChain.cpp
 +++ b/clang/lib/Driver/ToolChain.cpp
 @@ -14,6 +14,7 @@
@@ -26,7 +26,7 @@ index cab97b1a601..059a5e62c40 100644
  #include "clang/Config/config.h"
  #include "clang/Driver/Action.h"
  #include "clang/Driver/Driver.h"
-@@ -379,7 +380,10 @@ StringRef ToolChain::getOSLibName() const {
+@@ -404,7 +405,10 @@ StringRef ToolChain::getOSLibName() const {
  }
  
  std::string ToolChain::getCompilerRTPath() const {
diff --git a/recipes-devtools/clang/clang/0013-clang-Define-releative-gcc-installation-dir.patch b/recipes-devtools/clang/clang/0013-clang-Define-releative-gcc-installation-dir.patch
index b1b3f05..1b07e5a 100644
--- a/recipes-devtools/clang/clang/0013-clang-Define-releative-gcc-installation-dir.patch
+++ b/recipes-devtools/clang/clang/0013-clang-Define-releative-gcc-installation-dir.patch
@@ -1,4 +1,4 @@
-From 56a43865d296b6b3293cd35f3e4732dac8b00523 Mon Sep 17 00:00:00 2001
+From 9c61a33cec25c8f2e0a90d5109808131d2e51c2d Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sun, 21 May 2017 15:38:25 -0700
 Subject: [PATCH] clang: Define / releative gcc installation dir
@@ -10,20 +10,36 @@ installation in OE
 
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
- clang/lib/Driver/ToolChains/Gnu.cpp | 3 +++
- 1 file changed, 3 insertions(+)
+ clang/lib/Driver/ToolChains/Gnu.cpp | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp
-index 4821cfebc21..0c8d9e2f475 100644
+index 195a302c8771..05d1d3003881 100644
 --- a/clang/lib/Driver/ToolChains/Gnu.cpp
 +++ b/clang/lib/Driver/ToolChains/Gnu.cpp
-@@ -2428,6 +2428,9 @@ void Generic_GCC::GCCInstallationDetector::ScanLibDirForGCCTriple(
-       {"gcc-cross/" + CandidateTriple.str(), "../..",
-        TargetTriple.getOS() != llvm::Triple::Solaris},
- 
-+      // OE cross-compilers path structures
-+      {"/" + CandidateTriple.str(), "..", true},
-+
+@@ -2514,12 +2514,6 @@ 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
+@@ -2528,6 +2522,12 @@ void Generic_GCC::GCCInstallationDetector::ScanLibDirForGCCTriple(
+        TargetTriple.getVendor() == llvm::Triple::Freescale ||
+        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},
++
+       // Natively multiarch systems sometimes put the GCC triple-specific
+       // directory within their multiarch lib directory, resulting in the
+       // triple appearing twice.
diff --git a/recipes-devtools/clang/clang/0014-clang-Fix-ldso-for-musl-on-x86-and-x32-architectures.patch b/recipes-devtools/clang/clang/0014-clang-Fix-ldso-for-musl-on-x86-and-x32-architectures.patch
index 71c1c52..67cc8de 100644
--- a/recipes-devtools/clang/clang/0014-clang-Fix-ldso-for-musl-on-x86-and-x32-architectures.patch
+++ b/recipes-devtools/clang/clang/0014-clang-Fix-ldso-for-musl-on-x86-and-x32-architectures.patch
@@ -1,4 +1,4 @@
-From b11d1668890778d6d55cadeaec4f6c2e291b583b Mon Sep 17 00:00:00 2001
+From 3166a3b59f406de57f04a0b6fd0f3f1eabfaaa37 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Wed, 16 Aug 2017 15:16:15 -0700
 Subject: [PATCH] clang: Fix ldso for musl on x86 and x32 architectures
@@ -14,10 +14,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 8 insertions(+)
 
 diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp
-index d95da11e351..0a4644dab9f 100644
+index 726308413dc9..b64396647882 100644
 --- a/clang/lib/Driver/ToolChains/Linux.cpp
 +++ b/clang/lib/Driver/ToolChains/Linux.cpp
-@@ -519,6 +519,7 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
+@@ -426,6 +426,7 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
    if (Triple.isMusl()) {
      std::string ArchName;
      bool IsArm = false;
@@ -25,7 +25,7 @@ index d95da11e351..0a4644dab9f 100644
  
      switch (Arch) {
      case llvm::Triple::arm:
-@@ -531,6 +532,13 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
+@@ -438,6 +439,13 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
        ArchName = "armeb";
        IsArm = true;
        break;
diff --git a/recipes-devtools/clang/clang/0015-clang-scan-view-needs-python-2.x.patch b/recipes-devtools/clang/clang/0015-clang-scan-view-needs-python-2.x.patch
index 7b762f1..46b6995 100644
--- a/recipes-devtools/clang/clang/0015-clang-scan-view-needs-python-2.x.patch
+++ b/recipes-devtools/clang/clang/0015-clang-scan-view-needs-python-2.x.patch
@@ -1,4 +1,4 @@
-From 0f969665b80310b90bcb304b2e60c4493687c5a6 Mon Sep 17 00:00:00 2001
+From bd42395fa181d5821f0d756d12c534f2cda525c0 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Tue, 15 May 2018 10:28:43 -0700
 Subject: [PATCH] clang: scan-view needs python 2.x
@@ -13,7 +13,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/clang/tools/scan-view/bin/scan-view b/clang/tools/scan-view/bin/scan-view
-index 6165432e7af..04ad518a60c 100755
+index 6165432e7af8..04ad518a60cd 100755
 --- a/clang/tools/scan-view/bin/scan-view
 +++ b/clang/tools/scan-view/bin/scan-view
 @@ -1,4 +1,4 @@
diff --git a/recipes-devtools/clang/clang/0016-clang-Add-lpthread-and-ldl-along-with-lunwind-for-st.patch b/recipes-devtools/clang/clang/0016-clang-Add-lpthread-and-ldl-along-with-lunwind-for-st.patch
index b77f433..a785bda 100644
--- a/recipes-devtools/clang/clang/0016-clang-Add-lpthread-and-ldl-along-with-lunwind-for-st.patch
+++ b/recipes-devtools/clang/clang/0016-clang-Add-lpthread-and-ldl-along-with-lunwind-for-st.patch
@@ -1,4 +1,4 @@
-From a1fa38408f7524c8452709574b3d83b72ebcfa38 Mon Sep 17 00:00:00 2001
+From c309e121d6aca050119084e3e98371cd8e44ecca 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
@@ -20,15 +20,15 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/clang/lib/Driver/ToolChains/CommonArgs.cpp b/clang/lib/Driver/ToolChains/CommonArgs.cpp
-index 37ec7346857..c849b2242e9 100644
+index bcaea71dca94..95b806e29ef2 100644
 --- a/clang/lib/Driver/ToolChains/CommonArgs.cpp
 +++ b/clang/lib/Driver/ToolChains/CommonArgs.cpp
-@@ -1211,8 +1211,13 @@ static void AddUnwindLibrary(const ToolChain &TC, const Driver &D,
-   case ToolChain::UNW_CompilerRT:
-     if (LGT == LibGccType::StaticLibGcc)
-       CmdArgs.push_back("-l:libunwind.a");
--    else
-+    else {
+@@ -1423,8 +1423,13 @@ static void AddUnwindLibrary(const ToolChain &TC, const Driver &D,
+         // Let the linker choose between libunwind.dll.a and libunwind.a
+         // depending on what's available, and depending on the -static flag
+         CmdArgs.push_back("-lunwind");
+-    } else
++    } else {
        CmdArgs.push_back("-l:libunwind.so");
 +      if (Args.hasArg(options::OPT_static)) {
 +        CmdArgs.push_back("-lpthread");
diff --git a/recipes-devtools/clang/clang/0018-Pass-PYTHON_EXECUTABLE-when-cross-compiling-for-nati.patch b/recipes-devtools/clang/clang/0017-Pass-PYTHON_EXECUTABLE-when-cross-compiling-for-nati.patch
index de92b2f..3f2e16b 100644
--- a/recipes-devtools/clang/clang/0018-Pass-PYTHON_EXECUTABLE-when-cross-compiling-for-nati.patch
+++ b/recipes-devtools/clang/clang/0017-Pass-PYTHON_EXECUTABLE-when-cross-compiling-for-nati.patch
@@ -1,4 +1,4 @@
-From a415287545ffe17f7dbc743a033877fd239856b5 Mon Sep 17 00:00:00 2001
+From 00449fb89e8ab3b34f03d3a09a4d859e5d0a8245 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
@@ -10,7 +10,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/llvm/cmake/modules/CrossCompile.cmake b/llvm/cmake/modules/CrossCompile.cmake
-index 8a6e880c4e2..259211df18e 100644
+index 01cd37124841..f50be9d967df 100644
 --- a/llvm/cmake/modules/CrossCompile.cmake
 +++ b/llvm/cmake/modules/CrossCompile.cmake
 @@ -79,6 +79,7 @@ function(llvm_create_cross_target project_name target_name toolchain buildtype)
diff --git a/recipes-devtools/clang/clang/0017-libclang-Use-CMAKE_DL_LIBS-for-deducing-libdl.patch b/recipes-devtools/clang/clang/0017-libclang-Use-CMAKE_DL_LIBS-for-deducing-libdl.patch
deleted file mode 100644
index f5bc773..0000000
--- a/recipes-devtools/clang/clang/0017-libclang-Use-CMAKE_DL_LIBS-for-deducing-libdl.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From cfe4473e8447cd2c73a2f42c9c235ce1dfd08bec Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 11 Dec 2019 10:23:15 -0800
-Subject: [PATCH] libclang: Use CMAKE_DL_LIBS for deducing libdl
-
-This helps in getting right settings for libdl irrespective of platform
-it also fixes build with -DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_LINK_LLVM_DYLIB=ON
-
-Fixes
-
-tools/clang/tools/libclang/CMakeFiles/libclang.dir/CIndexer.cpp.o: In function clang::CIndexer::getClangResourcesPath[abi:cxx11]()': 2019-12-06T06:04:39.2987601Z | CIndexer.cpp:(.text._ZN5clang8CIndexer21getClangResourcesPathB5cxx11Ev+0x8b): undefined reference to dladdr'
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- clang/tools/libclang/CMakeLists.txt | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/clang/tools/libclang/CMakeLists.txt b/clang/tools/libclang/CMakeLists.txt
-index bd0c945a5e1..723fa95f14b 100644
---- a/clang/tools/libclang/CMakeLists.txt
-+++ b/clang/tools/libclang/CMakeLists.txt
-@@ -60,9 +60,8 @@ if (TARGET clangTidyPlugin)
-   endif()
- endif ()
- 
--find_library(DL_LIBRARY_PATH dl)
--if (DL_LIBRARY_PATH)
--  list(APPEND LIBS dl)
-+if (HAVE_LIBDL)
-+  list(APPEND LIBS ${CMAKE_DL_LIBS})
- endif()
- 
- option(LIBCLANG_BUILD_STATIC
diff --git a/recipes-devtools/clang/clang/0019-Check-for-atomic-double-intrinsics.patch b/recipes-devtools/clang/clang/0018-Check-for-atomic-double-intrinsics.patch
index 0885648..800b58e 100644
--- a/recipes-devtools/clang/clang/0019-Check-for-atomic-double-intrinsics.patch
+++ b/recipes-devtools/clang/clang/0018-Check-for-atomic-double-intrinsics.patch
@@ -1,4 +1,4 @@
-From dd6a749dee10f537fc7cb558ace319041a63e5f3 Mon Sep 17 00:00:00 2001
+From 761be2d8d20d9ebe93fa33719bdd0d25396d812d 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
@@ -15,16 +15,17 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/llvm/cmake/modules/CheckAtomic.cmake b/llvm/cmake/modules/CheckAtomic.cmake
-index 29f3bdd57f0..6460842cf63 100644
+index 04eed1448482..e890cfecd139 100644
 --- a/llvm/cmake/modules/CheckAtomic.cmake
 +++ b/llvm/cmake/modules/CheckAtomic.cmake
-@@ -26,9 +26,10 @@ function(check_working_cxx_atomics64 varname)
+@@ -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);
  }
diff --git a/recipes-devtools/clang/clang/0020-clang-Enable-SSP-and-PIE-by-default.patch b/recipes-devtools/clang/clang/0019-clang-Enable-SSP-and-PIE-by-default.patch
index 39d500c..164503f 100644
--- a/recipes-devtools/clang/clang/0020-clang-Enable-SSP-and-PIE-by-default.patch
+++ b/recipes-devtools/clang/clang/0019-clang-Enable-SSP-and-PIE-by-default.patch
@@ -1,4 +1,4 @@
-From b826518219333760c4632062dc586bbe17a055e6 Mon Sep 17 00:00:00 2001
+From d0f788c1fb3d00350c51e88302ecbcf3506e4b53 Mon Sep 17 00:00:00 2001
 From: Evangelos Foutras <evangelos@foutrelis.com>
 Date: Thu, 26 Dec 2019 15:46:19 -0800
 Subject: [PATCH] clang: Enable SSP and PIE by default
@@ -21,8 +21,8 @@ Taken from ArchLinux - https://git.archlinux.org/svntogit/packages.git/plain/tru
 
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
- clang/lib/Driver/ToolChains/Linux.cpp     | 14 ++++++++++++--
- clang/lib/Driver/ToolChains/Linux.h       |  1 +
+ clang/lib/Driver/ToolChains/Linux.cpp     | 10 ++++++++--
+ clang/lib/Driver/ToolChains/Linux.h       |  4 ++++
  clang/test/Driver/cross-linux.c           | 16 ++++++++--------
  clang/test/Driver/env.c                   |  2 +-
  clang/test/Driver/fsanitize.c             | 14 +++++++-------
@@ -34,13 +34,13 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  clang/test/Driver/riscv32-toolchain.c     |  4 ++--
  clang/test/Driver/riscv64-toolchain.c     |  4 ++--
  clang/test/Driver/stack-protector.c       |  4 ++--
- 13 files changed, 43 insertions(+), 30 deletions(-)
+ 13 files changed, 42 insertions(+), 30 deletions(-)
 
 diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp
-index 0a4644dab9f..fb579e7ad60 100644
+index b64396647882..604024bb3df4 100644
 --- a/clang/lib/Driver/ToolChains/Linux.cpp
 +++ b/clang/lib/Driver/ToolChains/Linux.cpp
-@@ -941,8 +941,18 @@ void Linux::AddIAMCUIncludeArgs(const ArgList &DriverArgs,
+@@ -856,8 +856,14 @@ void Linux::AddIAMCUIncludeArgs(const ArgList &DriverArgs,
  }
  
  bool Linux::isPIEDefault() const {
@@ -54,27 +54,26 @@ index 0a4644dab9f..fb579e7ad60 100644
 +            getTriple().isMusl() || getSanitizerArgs().requiresPIE();
 +
 +  return true;
-+}
-+
-+unsigned Linux::GetDefaultStackProtectorLevel(bool KernelOrKext) const {
-+  return 2;
  }
  
  bool Linux::isNoExecStackDefault() const {
 diff --git a/clang/lib/Driver/ToolChains/Linux.h b/clang/lib/Driver/ToolChains/Linux.h
-index f5518eac218..2d4973cf40c 100644
+index 6b16b0e64990..582d4bef81df 100644
 --- a/clang/lib/Driver/ToolChains/Linux.h
 +++ b/clang/lib/Driver/ToolChains/Linux.h
-@@ -37,6 +37,7 @@ public:
+@@ -39,6 +39,10 @@ public:
    bool isPIEDefault() const override;
    bool isNoExecStackDefault() const override;
    bool IsMathErrnoDefault() const override;
-+  unsigned GetDefaultStackProtectorLevel(bool KernelOrKext) const override;
++  virtual LangOptions::StackProtectorMode
++  GetDefaultStackProtectorLevel(bool KernelOrKext) const override {
++    return LangOptions::SSPStrong;
++  }
    SanitizerMask getSupportedSanitizers() const override;
    void addProfileRTLibs(const llvm::opt::ArgList &Args,
                          llvm::opt::ArgStringList &CmdArgs) const override;
 diff --git a/clang/test/Driver/cross-linux.c b/clang/test/Driver/cross-linux.c
-index 6c2dab26069..c28c5653e34 100644
+index 6c2dab260695..c28c5653e348 100644
 --- a/clang/test/Driver/cross-linux.c
 +++ b/clang/test/Driver/cross-linux.c
 @@ -42,8 +42,8 @@
@@ -122,7 +121,7 @@ index 6c2dab26069..c28c5653e34 100644
  // CHECK-MULTI64-X86-64: "-L[[gcc_install]]/../../../../x86_64-unknown-linux/lib"
  // CHECK-MULTI64-X86-64: "-L[[sysroot]]/lib"
 diff --git a/clang/test/Driver/env.c b/clang/test/Driver/env.c
-index 0371bc91c4a..ea89f525121 100644
+index 0371bc91c4a3..ea89f5251217 100644
 --- a/clang/test/Driver/env.c
 +++ b/clang/test/Driver/env.c
 @@ -20,7 +20,7 @@
@@ -135,10 +134,10 @@ index 0371bc91c4a..ea89f525121 100644
  // CHECK-LD-32: "-L[[SYSROOT]]/usr/lib/gcc/i386-unknown-linux/4.6.0/../../../../i386-unknown-linux/lib"
  // CHECK-LD-32: "-L[[SYSROOT]]/usr/lib/gcc/i386-unknown-linux/4.6.0/../../.."
 diff --git a/clang/test/Driver/fsanitize.c b/clang/test/Driver/fsanitize.c
-index f02f94d8c5a..358917588c7 100644
+index 8926d55a0cf4..40f628ccae45 100644
 --- a/clang/test/Driver/fsanitize.c
 +++ b/clang/test/Driver/fsanitize.c
-@@ -328,15 +328,15 @@
+@@ -330,15 +330,15 @@
  // RUN: %clang -target x86_64-linux-gnu -fsanitize=vptr -fno-sanitize=vptr -fsanitize=undefined,address %s -### 2>&1
  // OK
  
@@ -158,7 +157,7 @@ index f02f94d8c5a..358917588c7 100644
  
  // CHECK-NO-PIE-NOT: "-pie"
  // CHECK-NO-PIE: "-mrelocation-model" "static"
-@@ -661,12 +661,12 @@
+@@ -667,12 +667,12 @@
  // RUN: %clang -fno-sanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NOSP
  // NOSP-NOT: "-fsanitize=safe-stack"
  
@@ -175,7 +174,7 @@ index f02f94d8c5a..358917588c7 100644
  // NO-SP-NOT: stack-protector
  // NO-SP: "-fsanitize=safe-stack"
 diff --git a/clang/test/Driver/gcc-toolchain.cpp b/clang/test/Driver/gcc-toolchain.cpp
-index 6c872f4255c..f5006d1dd9a 100644
+index 6c872f4255c3..f5006d1dd9ab 100644
 --- a/clang/test/Driver/gcc-toolchain.cpp
 +++ b/clang/test/Driver/gcc-toolchain.cpp
 @@ -26,6 +26,6 @@
@@ -187,10 +186,10 @@ index 6c872f4255c..f5006d1dd9a 100644
  // CHECK: "-L[[TOOLCHAIN]]/usr/lib/i386-linux-gnu/gcc/i686-linux-gnu/4.5"
  // CHECK: "-L[[TOOLCHAIN]]/usr/lib/i386-linux-gnu/gcc/i686-linux-gnu/4.5/../../../.."
 diff --git a/clang/test/Driver/hexagon-toolchain-elf.c b/clang/test/Driver/hexagon-toolchain-elf.c
-index 44bff6f703a..6575d032f5d 100644
+index cc11f9fcba9e..1fe8b5db587b 100644
 --- a/clang/test/Driver/hexagon-toolchain-elf.c
 +++ b/clang/test/Driver/hexagon-toolchain-elf.c
-@@ -470,7 +470,7 @@
+@@ -487,7 +487,7 @@
  // RUN:   %s 2>&1 \
  // RUN:   | FileCheck -check-prefix=CHECK042 %s
  // CHECK042:      "-cc1"
@@ -200,7 +199,7 @@ index 44bff6f703a..6575d032f5d 100644
  // CHECK042-NEXT: llvm-mc
  // CHECK042:      "-gpsize=8"
 diff --git a/clang/test/Driver/linux-as.c b/clang/test/Driver/linux-as.c
-index 77ac05f3094..cb474f32898 100644
+index 0959bd7ba0a1..4056a672b6f9 100644
 --- a/clang/test/Driver/linux-as.c
 +++ b/clang/test/Driver/linux-as.c
 @@ -164,7 +164,7 @@
@@ -222,7 +221,7 @@ index 77ac05f3094..cb474f32898 100644
  // CHECK-SPARCV9PIC: as
  // CHECK-SPARCV9PIC: -64
 diff --git a/clang/test/Driver/linux-ld.c b/clang/test/Driver/linux-ld.c
-index 51227550b52..d01d6627131 100644
+index 24d3c78643f8..9ea22e6e0f64 100644
 --- a/clang/test/Driver/linux-ld.c
 +++ b/clang/test/Driver/linux-ld.c
 @@ -1,3 +1,5 @@
@@ -232,28 +231,26 @@ index 51227550b52..d01d6627131 100644
  // sysroot to make these tests independent of the host system.
  //
 diff --git a/clang/test/Driver/ppc-abi.c b/clang/test/Driver/ppc-abi.c
-index acc4981a2ee..0d465516762 100644
+index a74a19953ca2..0ba4a14ab74f 100644
 --- a/clang/test/Driver/ppc-abi.c
 +++ b/clang/test/Driver/ppc-abi.c
-@@ -32,11 +32,11 @@
+@@ -26,9 +26,9 @@
  
  // CHECK-ELFv1: "-mrelocation-model" "static"
  // CHECK-ELFv1: "-target-abi" "elfv1"
 -// CHECK-ELFv1-LE: "-mrelocation-model" "static"
 +// CHECK-ELFv1-LE: "-mrelocation-model" "pic" "-pic-level" "2"
  // CHECK-ELFv1-LE: "-target-abi" "elfv1"
- // CHECK-ELFv1-QPX: "-mrelocation-model" "static"
- // CHECK-ELFv1-QPX: "-target-abi" "elfv1-qpx"
 -// CHECK-ELFv2: "-mrelocation-model" "static"
 +// CHECK-ELFv2: "-mrelocation-model" "pic" "-pic-level" "2"
  // CHECK-ELFv2: "-target-abi" "elfv2"
  // CHECK-ELFv2-BE: "-mrelocation-model" "static"
  // CHECK-ELFv2-BE: "-target-abi" "elfv2"
 diff --git a/clang/test/Driver/riscv32-toolchain.c b/clang/test/Driver/riscv32-toolchain.c
-index 2ff3a585bda..f923b728c0f 100644
+index a5852f5f3997..233d9ef003cf 100644
 --- a/clang/test/Driver/riscv32-toolchain.c
 +++ b/clang/test/Driver/riscv32-toolchain.c
-@@ -76,7 +76,7 @@
+@@ -84,7 +84,7 @@
  // C-RV32-LINUX-MULTI-ILP32: "--sysroot={{.*}}/Inputs/multilib_riscv_linux_sdk/sysroot"
  // C-RV32-LINUX-MULTI-ILP32: "-m" "elf32lriscv"
  // C-RV32-LINUX-MULTI-ILP32: "-dynamic-linker" "/lib/ld-linux-riscv32-ilp32.so.1"
@@ -262,7 +259,7 @@ index 2ff3a585bda..f923b728c0f 100644
  // C-RV32-LINUX-MULTI-ILP32: "-L{{.*}}/Inputs/multilib_riscv_linux_sdk/lib/gcc/riscv64-unknown-linux-gnu/7.2.0/lib32/ilp32"
  // C-RV32-LINUX-MULTI-ILP32: "-L{{.*}}/Inputs/multilib_riscv_linux_sdk/sysroot/lib32/ilp32"
  // C-RV32-LINUX-MULTI-ILP32: "-L{{.*}}/Inputs/multilib_riscv_linux_sdk/sysroot/usr/lib32/ilp32"
-@@ -91,7 +91,7 @@
+@@ -99,7 +99,7 @@
  // C-RV32-LINUX-MULTI-ILP32D: "--sysroot={{.*}}/Inputs/multilib_riscv_linux_sdk/sysroot"
  // C-RV32-LINUX-MULTI-ILP32D: "-m" "elf32lriscv"
  // C-RV32-LINUX-MULTI-ILP32D: "-dynamic-linker" "/lib/ld-linux-riscv32-ilp32d.so.1"
@@ -272,10 +269,10 @@ index 2ff3a585bda..f923b728c0f 100644
  // C-RV32-LINUX-MULTI-ILP32D: "-L{{.*}}/Inputs/multilib_riscv_linux_sdk/sysroot/lib32/ilp32d"
  // C-RV32-LINUX-MULTI-ILP32D: "-L{{.*}}/Inputs/multilib_riscv_linux_sdk/sysroot/usr/lib32/ilp32d"
 diff --git a/clang/test/Driver/riscv64-toolchain.c b/clang/test/Driver/riscv64-toolchain.c
-index 42cac51de59..42a05e02fcc 100644
+index e727f20bb601..a801e5eee462 100644
 --- a/clang/test/Driver/riscv64-toolchain.c
 +++ b/clang/test/Driver/riscv64-toolchain.c
-@@ -76,7 +76,7 @@
+@@ -84,7 +84,7 @@
  // C-RV64-LINUX-MULTI-LP64: "--sysroot={{.*}}/Inputs/multilib_riscv_linux_sdk/sysroot"
  // C-RV64-LINUX-MULTI-LP64: "-m" "elf64lriscv"
  // C-RV64-LINUX-MULTI-LP64: "-dynamic-linker" "/lib/ld-linux-riscv64-lp64.so.1"
@@ -284,7 +281,7 @@ index 42cac51de59..42a05e02fcc 100644
  // C-RV64-LINUX-MULTI-LP64: "-L{{.*}}/Inputs/multilib_riscv_linux_sdk/lib/gcc/riscv64-unknown-linux-gnu/7.2.0/lib64/lp64"
  // C-RV64-LINUX-MULTI-LP64: "-L{{.*}}/Inputs/multilib_riscv_linux_sdk/sysroot/lib64/lp64"
  // C-RV64-LINUX-MULTI-LP64: "-L{{.*}}/Inputs/multilib_riscv_linux_sdk/sysroot/usr/lib64/lp64"
-@@ -91,7 +91,7 @@
+@@ -99,7 +99,7 @@
  // C-RV64-LINUX-MULTI-LP64D: "--sysroot={{.*}}/Inputs/multilib_riscv_linux_sdk/sysroot"
  // C-RV64-LINUX-MULTI-LP64D: "-m" "elf64lriscv"
  // C-RV64-LINUX-MULTI-LP64D: "-dynamic-linker" "/lib/ld-linux-riscv64-lp64d.so.1"
@@ -294,7 +291,7 @@ index 42cac51de59..42a05e02fcc 100644
  // C-RV64-LINUX-MULTI-LP64D: "-L{{.*}}/Inputs/multilib_riscv_linux_sdk/sysroot/lib64/lp64d"
  // C-RV64-LINUX-MULTI-LP64D: "-L{{.*}}/Inputs/multilib_riscv_linux_sdk/sysroot/usr/lib64/lp64d"
 diff --git a/clang/test/Driver/stack-protector.c b/clang/test/Driver/stack-protector.c
-index a3e40b50eed..dfffe0d6cf8 100644
+index a3e40b50eed8..dfffe0d6cf85 100644
 --- a/clang/test/Driver/stack-protector.c
 +++ b/clang/test/Driver/stack-protector.c
 @@ -3,11 +3,11 @@
diff --git a/recipes-devtools/clang/clang/0021-libcxx-Add-compiler-runtime-library-to-link-step-for.patch b/recipes-devtools/clang/clang/0020-libcxx-Add-compiler-runtime-library-to-link-step-for.patch
index ab406d0..1500fc9 100644
--- a/recipes-devtools/clang/clang/0021-libcxx-Add-compiler-runtime-library-to-link-step-for.patch
+++ b/recipes-devtools/clang/clang/0020-libcxx-Add-compiler-runtime-library-to-link-step-for.patch
@@ -1,4 +1,4 @@
-From 6330360e13936fca5625e39ceed7441b45c3efd3 Mon Sep 17 00:00:00 2001
+From 5c0a4264ad87c880ade430022e0f128da86bbf6d 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
@@ -14,24 +14,24 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/libcxx/src/CMakeLists.txt b/libcxx/src/CMakeLists.txt
-index 120505fe18d..b337fa2e403 100644
+index 9965104cb5b2..bee4d80bc67a 100644
 --- a/libcxx/src/CMakeLists.txt
 +++ b/libcxx/src/CMakeLists.txt
-@@ -160,7 +160,7 @@ if (LIBCXX_ENABLE_SHARED)
-   if(COMMAND llvm_setup_rpath)
-     llvm_setup_rpath(cxx_shared)
-   endif()
--  target_link_libraries(cxx_shared PRIVATE ${LIBCXX_LIBRARIES})
-+  target_link_libraries(cxx_shared PRIVATE ${LIBCXX_LIBRARIES} "$$($$CC --print-libgcc-file-name)")
+@@ -177,7 +177,7 @@ split_list(LIBCXX_LINK_FLAGS)
+ if (LIBCXX_ENABLE_SHARED)
+   add_library(cxx_shared SHARED ${exclude_from_all} ${LIBCXX_SOURCES} ${LIBCXX_HEADERS})
+   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}"
-@@ -238,7 +238,7 @@ endif()
- # Build the static library.
+@@ -252,7 +252,7 @@ endif()
  if (LIBCXX_ENABLE_STATIC)
    add_library(cxx_static STATIC ${exclude_from_all} ${LIBCXX_SOURCES} ${LIBCXX_HEADERS})
--  target_link_libraries(cxx_static PRIVATE ${LIBCXX_LIBRARIES})
-+  target_link_libraries(cxx_static PRIVATE ${LIBCXX_LIBRARIES} "$$($$CC --print-libgcc-file-name)")
+   target_link_libraries(cxx_static PUBLIC cxx-headers
+-                                   PRIVATE ${LIBCXX_LIBRARIES})
++                                   PRIVATE ${LIBCXX_LIBRARIES} "$$($$CC --print-libgcc-file-name)")
    set(CMAKE_STATIC_LIBRARY_PREFIX "lib")
    set_target_properties(cxx_static
      PROPERTIES
diff --git a/recipes-devtools/clang/clang/0022-clang-llvm-cmake-Fix-configure-for-packages-using-fi.patch b/recipes-devtools/clang/clang/0021-clang-llvm-cmake-Fix-configure-for-packages-using-fi.patch
index 5413693..a9cd7a7 100644
--- a/recipes-devtools/clang/clang/0022-clang-llvm-cmake-Fix-configure-for-packages-using-fi.patch
+++ b/recipes-devtools/clang/clang/0021-clang-llvm-cmake-Fix-configure-for-packages-using-fi.patch
@@ -1,4 +1,4 @@
-From 9f5949b795a92f85c98277fd8d72954fb52df164 Mon Sep 17 00:00:00 2001
+From 12fe6e45d18add7da95fe637f9e21425330666f9 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
@@ -32,10 +32,10 @@ Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
  3 files changed, 33 deletions(-)
 
 diff --git a/clang/cmake/modules/AddClang.cmake b/clang/cmake/modules/AddClang.cmake
-index 577cc11ab01..5c859d86069 100644
+index 704278a0e93b..6ea99c90772c 100644
 --- a/clang/cmake/modules/AddClang.cmake
 +++ b/clang/cmake/modules/AddClang.cmake
-@@ -151,15 +151,8 @@ macro(add_clang_tool name)
+@@ -161,15 +161,8 @@ macro(add_clang_tool name)
    add_dependencies(${name} clang-resource-headers)
  
    if (CLANG_BUILD_TOOLS)
@@ -51,7 +51,7 @@ index 577cc11ab01..5c859d86069 100644
        RUNTIME DESTINATION bin
        COMPONENT ${name})
  
-@@ -168,7 +161,6 @@ macro(add_clang_tool name)
+@@ -178,7 +171,6 @@ macro(add_clang_tool name)
                                 DEPENDS ${name}
                                 COMPONENT ${name})
      endif()
@@ -60,10 +60,10 @@ index 577cc11ab01..5c859d86069 100644
  endmacro()
  
 diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake
-index fd69786544a..70580ccb129 100644
+index 97c9980c7de3..2cb2ead31ba0 100644
 --- a/llvm/cmake/modules/AddLLVM.cmake
 +++ b/llvm/cmake/modules/AddLLVM.cmake
-@@ -1045,15 +1045,8 @@ macro(add_llvm_tool name)
+@@ -1210,15 +1210,8 @@ macro(add_llvm_tool name)
  
    if ( ${name} IN_LIST LLVM_TOOLCHAIN_TOOLS OR NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
      if( LLVM_BUILD_TOOLS )
@@ -79,7 +79,7 @@ index fd69786544a..70580ccb129 100644
                RUNTIME DESTINATION ${LLVM_TOOLS_INSTALL_DIR}
                COMPONENT ${name})
  
-@@ -1064,9 +1057,6 @@ macro(add_llvm_tool name)
+@@ -1229,9 +1222,6 @@ macro(add_llvm_tool name)
        endif()
      endif()
    endif()
@@ -89,9 +89,9 @@ index fd69786544a..70580ccb129 100644
    set_target_properties(${name} PROPERTIES FOLDER "Tools")
  endmacro(add_llvm_tool name)
  
-@@ -1104,15 +1094,8 @@ macro(add_llvm_utility name)
+@@ -1269,15 +1259,8 @@ macro(add_llvm_utility name)
    set_target_properties(${name} PROPERTIES FOLDER "Utils")
-   if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
+   if ( ${name} IN_LIST LLVM_TOOLCHAIN_UTILITIES OR NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
      if (LLVM_INSTALL_UTILS AND LLVM_BUILD_UTILS)
 -      set(export_to_llvmexports)
 -      if (${name} IN_LIST LLVM_DISTRIBUTION_COMPONENTS OR
@@ -105,7 +105,7 @@ index fd69786544a..70580ccb129 100644
                RUNTIME DESTINATION ${LLVM_UTILS_INSTALL_DIR}
                COMPONENT ${name})
  
-@@ -1121,7 +1104,6 @@ macro(add_llvm_utility name)
+@@ -1286,7 +1269,6 @@ macro(add_llvm_utility name)
                                   DEPENDS ${name}
                                   COMPONENT ${name})
        endif()
@@ -114,10 +114,10 @@ index fd69786544a..70580ccb129 100644
        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 9d2fcd9a793..acdb898149d 100644
+index 5f07acc1f692..47fe887e083b 100644
 --- a/llvm/cmake/modules/TableGen.cmake
 +++ b/llvm/cmake/modules/TableGen.cmake
-@@ -161,14 +161,8 @@ macro(add_tablegen target project)
+@@ -177,14 +177,8 @@ macro(add_tablegen target project)
    endif()
  
    if ((${project} STREQUAL LLVM OR ${project} STREQUAL MLIR) AND NOT LLVM_INSTALL_TOOLCHAIN_ONLY AND LLVM_BUILD_UTILS)
@@ -132,7 +132,7 @@ index 9d2fcd9a793..acdb898149d 100644
              COMPONENT ${target}
              RUNTIME DESTINATION ${LLVM_TOOLS_INSTALL_DIR})
      if(NOT LLVM_ENABLE_IDE)
-@@ -177,5 +171,4 @@ macro(add_tablegen target project)
+@@ -193,5 +187,4 @@ macro(add_tablegen target project)
                                 COMPONENT ${target})
      endif()
    endif()
diff --git a/recipes-devtools/clang/clang/0023-clang-Fix-resource-dir-location-for-cross-toolchains.patch b/recipes-devtools/clang/clang/0022-clang-Fix-resource-dir-location-for-cross-toolchains.patch
index decab68..da4e3fe 100644
--- a/recipes-devtools/clang/clang/0023-clang-Fix-resource-dir-location-for-cross-toolchains.patch
+++ b/recipes-devtools/clang/clang/0022-clang-Fix-resource-dir-location-for-cross-toolchains.patch
@@ -1,4 +1,4 @@
-From ed3b5d8bb197f01556b42dfc2281693475fd830e Mon Sep 17 00:00:00 2001
+From 6ad331a0e464ee28eac7d0a1c658cd007e831297 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
@@ -13,29 +13,27 @@ As a fix for this, check the parent directory name. If that is "bin", then
 use that directory's parent.
 
 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 fb8335a3695..819887944b5 100644
+index 418e1d3e8ec9..44c9f6e59d3f 100644
 --- a/clang/lib/Driver/Driver.cpp
 +++ b/clang/lib/Driver/Driver.cpp
-@@ -110,7 +110,13 @@ std::string Driver::GetResourcesPath(StringRef BinaryPath,
+@@ -119,7 +119,13 @@ 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 = llvm::sys::path::parent_path(Dir);
++    Dir = std::string(llvm::sys::path::parent_path(Dir));
 +
 +    // OE cross toolchains are installed, by default, in a subdir of bin.
 +    if (llvm::sys::path::filename(Dir) == "bin") {
-+      Dir = llvm::sys::path::parent_path(Dir);
++      Dir = std::string(llvm::sys::path::parent_path(Dir));
 +    }
 +    P = Dir;
      llvm::sys::path::append(P, Twine("lib") + CLANG_LIBDIR_SUFFIX, "clang",
                              CLANG_VERSION_STRING);
    }
--- 
-2.24.1
-
diff --git a/recipes-devtools/clang/clang/0024-fix-path-to-libffi.patch b/recipes-devtools/clang/clang/0023-fix-path-to-libffi.patch
index 2890228..e22c0bd 100644
--- a/recipes-devtools/clang/clang/0024-fix-path-to-libffi.patch
+++ b/recipes-devtools/clang/clang/0023-fix-path-to-libffi.patch
@@ -1,4 +1,4 @@
-From 52b4e74809eba796663f0f65194ab4f3eafe2cb1 Mon Sep 17 00:00:00 2001
+From cbcfe7d13dfc5644c9b8a48e951b43bc15d9f4cf Mon Sep 17 00:00:00 2001
 From: Anuj Mittal <anuj.mittal@intel.com>
 Date: Fri, 3 Apr 2020 15:10:37 +0800
 Subject: [PATCH] fix path to libffi
@@ -8,21 +8,19 @@ libLLVMInterpreter, we were looking for libffi in clang's recipe-sysroot instead
 the recipe's sysroot.
 
 Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
  llvm/lib/ExecutionEngine/Interpreter/CMakeLists.txt | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/llvm/lib/ExecutionEngine/Interpreter/CMakeLists.txt b/llvm/lib/ExecutionEngine/Interpreter/CMakeLists.txt
-index b8adea5..7d8434c 100644
+index 976219830d5e..9930e01559e9 100644
 --- a/llvm/lib/ExecutionEngine/Interpreter/CMakeLists.txt
 +++ b/llvm/lib/ExecutionEngine/Interpreter/CMakeLists.txt
-@@ -16,5 +16,5 @@ add_llvm_component_library(LLVMInterpreter
+@@ -22,5 +22,5 @@ add_llvm_component_library(LLVMInterpreter
    )
  
  if( LLVM_ENABLE_FFI )
 -  target_link_libraries( LLVMInterpreter PRIVATE ${FFI_LIBRARY_PATH} )
 +  target_link_libraries( LLVMInterpreter PRIVATE ffi )
  endif()
--- 
-2.7.4
-
diff --git a/recipes-devtools/clang/clang/0025-clang-driver-Add-dyld-prefix-when-checking-sysroot-f.patch b/recipes-devtools/clang/clang/0024-clang-driver-Add-dyld-prefix-when-checking-sysroot-f.patch
index 43161c7..521f06d 100644
--- a/recipes-devtools/clang/clang/0025-clang-driver-Add-dyld-prefix-when-checking-sysroot-f.patch
+++ b/recipes-devtools/clang/clang/0024-clang-driver-Add-dyld-prefix-when-checking-sysroot-f.patch
@@ -1,4 +1,4 @@
-From fcafd24f9062eeecc9c87ac2fe9bce9accbe7534 Mon Sep 17 00:00:00 2001
+From 5f3d1b71c3e87017dfa471f1561f6c28f34a77f8 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
@@ -12,15 +12,16 @@ Subject: [PATCH] clang: driver: Add dyld-prefix when checking sysroot for ldso
    the usrmerge scenario.
 
 Signed-off-by: Oleksandr Ocheretnyi <oocheret@cisco.com>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
  clang/lib/Driver/ToolChains/Linux.cpp | 16 ++++++++--------
  1 file changed, 8 insertions(+), 8 deletions(-)
 
 diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp
-index fb579e7ad60..4ed5938cc59 100644
+index 604024bb3df4..812599cdaf84 100644
 --- a/clang/lib/Driver/ToolChains/Linux.cpp
 +++ b/clang/lib/Driver/ToolChains/Linux.cpp
-@@ -604,8 +604,8 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
+@@ -515,8 +515,8 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
      LibDir = "lib64";
      Loader =
          (tools::ppc::hasPPCAbiArg(Args, "elfv2")) ? "ld64.so.2" : "ld64.so.1";
@@ -31,7 +32,7 @@ index fb579e7ad60..4ed5938cc59 100644
          LibDir = "lib";
      }
      break;
-@@ -613,8 +613,8 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
+@@ -524,8 +524,8 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
      LibDir = "lib64";
      Loader =
          (tools::ppc::hasPPCAbiArg(Args, "elfv1")) ? "ld64.so.1" : "ld64.so.2";
@@ -42,7 +43,7 @@ index fb579e7ad60..4ed5938cc59 100644
          LibDir = "lib";
      }
      break;
-@@ -638,8 +638,8 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
+@@ -549,8 +549,8 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
    case llvm::Triple::sparcv9:
      LibDir = "lib64";
      Loader = "ld-linux.so.2";
@@ -53,7 +54,7 @@ index fb579e7ad60..4ed5938cc59 100644
          LibDir = "lib";
      }
      break;
-@@ -656,8 +656,8 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
+@@ -567,8 +567,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";
@@ -64,6 +65,3 @@ index fb579e7ad60..4ed5938cc59 100644
          LibDir = "lib";
      }
      break;
--- 
-2.17.1
-
diff --git a/recipes-devtools/clang/clang/0025-clang-Use-python3-in-python-scripts.patch b/recipes-devtools/clang/clang/0025-clang-Use-python3-in-python-scripts.patch
new file mode 100644
index 0000000..defbc8d
--- /dev/null
+++ b/recipes-devtools/clang/clang/0025-clang-Use-python3-in-python-scripts.patch
@@ -0,0 +1,112 @@
+From fd3696213eed77e8c217be0ded0e220c0b597f1e 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-extra/clang-tidy/add_new_check.py                   | 2 +-
+ clang-tools-extra/clang-tidy/rename_check.py                    | 2 +-
+ clang-tools-extra/clang-tidy/tool/clang-tidy-diff.py            | 2 +-
+ clang-tools-extra/clang-tidy/tool/run-clang-tidy.py             | 2 +-
+ clang/tools/clang-format/clang-format-diff.py                   | 2 +-
+ clang/tools/clang-format/git-clang-format                       | 2 +-
+ clang/tools/scan-view/bin/scan-view                             | 2 +-
+ clang/utils/hmaptool/hmaptool                                   | 2 +-
+ 9 files changed, 9 insertions(+), 9 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 8655af137bb2..e95ba59a421c 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-extra/clang-tidy/add_new_check.py b/clang-tools-extra/clang-tidy/add_new_check.py
+index 14fcfe8d49ff..ee7e682690b7 100755
+--- a/clang-tools-extra/clang-tidy/add_new_check.py
++++ b/clang-tools-extra/clang-tidy/add_new_check.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ #
+ #===- add_new_check.py - clang-tidy check generator ---------*- python -*--===#
+ #
+diff --git a/clang-tools-extra/clang-tidy/rename_check.py b/clang-tools-extra/clang-tidy/rename_check.py
+index 2410041fd5d2..976a02100cd6 100755
+--- a/clang-tools-extra/clang-tidy/rename_check.py
++++ b/clang-tools-extra/clang-tidy/rename_check.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ #
+ #===- rename_check.py - clang-tidy check renamer ------------*- python -*--===#
+ #
+diff --git a/clang-tools-extra/clang-tidy/tool/clang-tidy-diff.py b/clang-tools-extra/clang-tidy/tool/clang-tidy-diff.py
+index 17086d15053e..a20b1f1f46b2 100755
+--- a/clang-tools-extra/clang-tidy/tool/clang-tidy-diff.py
++++ b/clang-tools-extra/clang-tidy/tool/clang-tidy-diff.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ #
+ #===- clang-tidy-diff.py - ClangTidy Diff Checker -----------*- python -*--===#
+ #
+diff --git a/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py b/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
+index 313ecd2f9571..a298e38b1a45 100755
+--- a/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
++++ b/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ #
+ #===- run-clang-tidy.py - Parallel clang-tidy runner --------*- python -*--===#
+ #
+diff --git a/clang/tools/clang-format/clang-format-diff.py b/clang/tools/clang-format/clang-format-diff.py
+index 6e653a134289..1c31192a4562 100755
+--- a/clang/tools/clang-format/clang-format-diff.py
++++ b/clang/tools/clang-format/clang-format-diff.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ #
+ #===- clang-format-diff.py - ClangFormat Diff Reformatter ----*- python -*--===#
+ #
+diff --git a/clang/tools/clang-format/git-clang-format b/clang/tools/clang-format/git-clang-format
+index ccd2f50fa4ad..cfcfb9fcbaef 100755
+--- a/clang/tools/clang-format/git-clang-format
++++ b/clang/tools/clang-format/git-clang-format
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ #
+ #===- git-clang-format - ClangFormat Git Integration ---------*- python -*--===#
+ #
+diff --git a/clang/tools/scan-view/bin/scan-view b/clang/tools/scan-view/bin/scan-view
+index 04ad518a60cd..07effbca5969 100755
+--- a/clang/tools/scan-view/bin/scan-view
++++ b/clang/tools/scan-view/bin/scan-view
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python2
++#!/usr/bin/env python3
+ 
+ from __future__ import print_function
+ 
+diff --git a/clang/utils/hmaptool/hmaptool b/clang/utils/hmaptool/hmaptool
+index e647cde6bc46..7ed2fdf674b1 100755
+--- a/clang/utils/hmaptool/hmaptool
++++ b/clang/utils/hmaptool/hmaptool
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ from __future__ import absolute_import, division, print_function
+ 
+ import json
diff --git a/recipes-devtools/clang/clang/0026-For-x86_64-set-Yocto-based-GCC-install-search-path.patch b/recipes-devtools/clang/clang/0026-For-x86_64-set-Yocto-based-GCC-install-search-path.patch
new file mode 100644
index 0000000..801696e
--- /dev/null
+++ b/recipes-devtools/clang/clang/0026-For-x86_64-set-Yocto-based-GCC-install-search-path.patch
@@ -0,0 +1,70 @@
+From 13dedb0bbf780f7d66ddad8b1b33b3a1e0de2d25 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_more_target_vendors()
+
+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 05d1d3003881..33b1d7fb7061 100644
+--- a/clang/lib/Driver/ToolChains/Gnu.cpp
++++ b/clang/lib/Driver/ToolChains/Gnu.cpp
+@@ -2109,6 +2109,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",    "x86_64-linux-android"};
+   static const char *const X32LibDirs[] = {"/libx32"};
+   static const char *const X86LibDirs[] = {"/lib32", "/lib"};
diff --git a/recipes-devtools/clang/clang/0026-OpenCL-Fix-support-for-cl_khr_mipmap_image_writes.patch b/recipes-devtools/clang/clang/0026-OpenCL-Fix-support-for-cl_khr_mipmap_image_writes.patch
deleted file mode 100644
index a8798fb..0000000
--- a/recipes-devtools/clang/clang/0026-OpenCL-Fix-support-for-cl_khr_mipmap_image_writes.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From 4770490fa38a03624376b3c3973705a4bf8cc193 Mon Sep 17 00:00:00 2001
-From: Alexey Sotkin <alexey.sotkin@intel.com>
-Date: Mon, 27 Jan 2020 12:25:03 +0300
-Subject: [PATCH] [OpenCL] Fix support for cl_khr_mipmap_image_writes
-
-Text of the extension is available here:
-https://github.com/KhronosGroup/OpenCL-Docs/blob/master/ext/cl_khr_mipmap_image.asciidoc
-
-Patch by Ilya Mashkov
-
-Differential Revision: https://reviews.llvm.org/D71460
-
-Upstream-Status: Backport [https://github.com/llvm/llvm-project/commit/f780e15caf1bed0a9fbc87fde70bd5ab3d80a439]
-
-Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
----
- clang/include/clang/Basic/OpenCLExtensions.def |  1 +
- clang/lib/Headers/opencl-c.h                   | 18 ++++++++++--------
- clang/test/SemaOpenCL/extension-version.cl     | 12 ++++++++++++
- 3 files changed, 23 insertions(+), 8 deletions(-)
-
-diff --git a/clang/include/clang/Basic/OpenCLExtensions.def b/clang/include/clang/Basic/OpenCLExtensions.def
-index 5536a6e8e4d..51748158431 100644
---- a/clang/include/clang/Basic/OpenCLExtensions.def
-+++ b/clang/include/clang/Basic/OpenCLExtensions.def
-@@ -70,6 +70,7 @@ OPENCLEXT_INTERNAL(cl_khr_spir, 120, ~0U)
- OPENCLEXT_INTERNAL(cl_khr_egl_event, 200, ~0U)
- OPENCLEXT_INTERNAL(cl_khr_egl_image, 200, ~0U)
- OPENCLEXT_INTERNAL(cl_khr_mipmap_image, 200, ~0U)
-+OPENCLEXT_INTERNAL(cl_khr_mipmap_image_writes, 200, ~0U)
- OPENCLEXT_INTERNAL(cl_khr_srgb_image_writes, 200, ~0U)
- OPENCLEXT_INTERNAL(cl_khr_subgroups, 200, ~0U)
- OPENCLEXT_INTERNAL(cl_khr_terminate_context, 200, ~0U)
-diff --git a/clang/lib/Headers/opencl-c.h b/clang/lib/Headers/opencl-c.h
-index 06c5ab6a72f..3210f93cc85 100644
---- a/clang/lib/Headers/opencl-c.h
-+++ b/clang/lib/Headers/opencl-c.h
-@@ -14682,7 +14682,7 @@ void __ovld write_imagef(write_only image2d_array_depth_t image, int4 coord, flo
- 
- // OpenCL Extension v2.0 s9.18 - Mipmaps
- #if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)
--#ifdef cl_khr_mipmap_image
-+#if defined(cl_khr_mipmap_image_writes)
- void __ovld write_imagef(write_only image1d_t image, int coord, int lod, float4 color);
- void __ovld write_imagei(write_only image1d_t image, int coord, int lod, int4 color);
- void __ovld write_imageui(write_only image1d_t image, int coord, int lod, uint4 color);
-@@ -14699,15 +14699,16 @@ void __ovld write_imagef(write_only image2d_array_t image_array, int4 coord, int
- void __ovld write_imagei(write_only image2d_array_t image_array, int4 coord, int lod, int4 color);
- void __ovld write_imageui(write_only image2d_array_t image_array, int4 coord, int lod, uint4 color);
- 
--void __ovld write_imagef(write_only image2d_depth_t image, int2 coord, int lod, float color);
--void __ovld write_imagef(write_only image2d_array_depth_t image, int4 coord, int lod, float color);
-+void __ovld write_imagef(write_only image2d_depth_t image, int2 coord, int lod, float depth);
-+void __ovld write_imagef(write_only image2d_array_depth_t image, int4 coord, int lod, float depth);
- 
- #ifdef cl_khr_3d_image_writes
- void __ovld write_imagef(write_only image3d_t image, int4 coord, int lod, float4 color);
- void __ovld write_imagei(write_only image3d_t image, int4 coord, int lod, int4 color);
- void __ovld write_imageui(write_only image3d_t image, int4 coord, int lod, uint4 color);
--#endif
--#endif //cl_khr_mipmap_image
-+#endif //cl_khr_3d_image_writes
-+
-+#endif //defined(cl_khr_mipmap_image_writes)
- #endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)
- 
- // Image write functions for half4 type
-@@ -14756,7 +14757,7 @@ void __ovld write_imagef(read_write image2d_array_depth_t image, int4 coord, flo
- #endif //cl_khr_depth_images
- 
- #if defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)
--#ifdef cl_khr_mipmap_image
-+#if defined(cl_khr_mipmap_image_writes)
- void __ovld write_imagef(read_write image1d_t image, int coord, int lod, float4 color);
- void __ovld write_imagei(read_write image1d_t image, int coord, int lod, int4 color);
- void __ovld write_imageui(read_write image1d_t image, int coord, int lod, uint4 color);
-@@ -14780,8 +14781,9 @@ void __ovld write_imagef(read_write image2d_array_depth_t image, int4 coord, int
- void __ovld write_imagef(read_write image3d_t image, int4 coord, int lod, float4 color);
- void __ovld write_imagei(read_write image3d_t image, int4 coord, int lod, int4 color);
- void __ovld write_imageui(read_write image3d_t image, int4 coord, int lod, uint4 color);
--#endif
--#endif //cl_khr_mipmap_image
-+#endif //cl_khr_3d_image_writes
-+
-+#endif //cl_khr_mipmap_image_writes
- #endif //defined(__OPENCL_CPP_VERSION__) || (__OPENCL_C_VERSION__ >= CL_VERSION_2_0)
- 
- // Image write functions for half4 type
-diff --git a/clang/test/SemaOpenCL/extension-version.cl b/clang/test/SemaOpenCL/extension-version.cl
-index 19d08849535..0e6bbb7d3bc 100644
---- a/clang/test/SemaOpenCL/extension-version.cl
-+++ b/clang/test/SemaOpenCL/extension-version.cl
-@@ -242,6 +242,18 @@
- #endif
- #pragma OPENCL EXTENSION cl_khr_mipmap_image : enable
- 
-+#if (defined(__OPENCL_CPP_VERSION__) || __OPENCL_C_VERSION__ >= 200)
-+#ifndef cl_khr_mipmap_image_writes
-+#error "Missing cl_khr_mipmap_image_writes define"
-+#endif
-+#else
-+#ifdef cl_khr_mipmap_image_writes
-+#error "Incorrect cl_khr_mipmap_image_writes define"
-+#endif
-+// expected-warning@+2{{unsupported OpenCL extension 'cl_khr_mipmap_image_writes' - ignoring}}
-+#endif
-+#pragma OPENCL EXTENSION cl_khr_mipmap_image_writes : enable
-+
- #if (defined(__OPENCL_CPP_VERSION__) || __OPENCL_C_VERSION__ >= 200)
- #ifndef cl_khr_srgb_image_writes
- #error "Missing cl_khr_srgb_image_writes define"
--- 
-2.17.1
-
diff --git a/recipes-devtools/clang/clang/0027-InstCombine-visitBitCast-do-not-crash-on-weird-bitca.patch b/recipes-devtools/clang/clang/0027-InstCombine-visitBitCast-do-not-crash-on-weird-bitca.patch
deleted file mode 100644
index 77ca35b..0000000
--- a/recipes-devtools/clang/clang/0027-InstCombine-visitBitCast-do-not-crash-on-weird-bitca.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 381054a989ebd0b585fee46f2a01a7c5de10acf7 Mon Sep 17 00:00:00 2001
-From: Roman Lebedev <lebedev.ri@gmail.com>
-Date: Wed, 24 Jun 2020 21:12:09 +0300
-Subject: [PATCH] [InstCombine] visitBitCast(): do not crash on weird `bitcast
- <1 x i8*> to i8*`
-
-Even if we know that RHS of a bitcast is a pointer,
-we can't assume LHS is, because it might be
-a single-element vector of pointer.
-
-Upstream-Status: Backport [https://github.com/llvm/llvm-project/commit/381054a989ebd0b585fee46f2a01a7c5de10acf7]
-
-Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
-
----
- lib/Transforms/InstCombine/InstCombineCasts.cpp | 3 ++-
- test/Transforms/InstCombine/bitcast.ll          | 6 ++++++
- 2 files changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/lib/Transforms/InstCombine/InstCombineCasts.cpp b/lib/Transforms/InstCombine/InstCombineCasts.cpp
-index 3750f31e3cf..a8c87ea3558 100644
---- a/lib/Transforms/InstCombine/InstCombineCasts.cpp
-+++ b/lib/Transforms/InstCombine/InstCombineCasts.cpp
-@@ -2471,8 +2471,9 @@ Instruction *InstCombiner::visitBitCast(BitCastInst &CI) {
-   if (DestTy == Src->getType())
-     return replaceInstUsesWith(CI, Src);
-
--  if (PointerType *DstPTy = dyn_cast<PointerType>(DestTy)) {
-+  if (isa<PointerType>(SrcTy) && isa<PointerType>(DestTy)) {
-     PointerType *SrcPTy = cast<PointerType>(SrcTy);
-+    PointerType *DstPTy = cast<PointerType>(DestTy);
-     Type *DstElTy = DstPTy->getElementType();
-     Type *SrcElTy = SrcPTy->getElementType();
-
-diff --git a/test/Transforms/InstCombine/bitcast.ll b/test/Transforms/InstCombine/bitcast.ll
-index 0f0cbdb364a..c4ee52f27a8 100644
---- a/test/Transforms/InstCombine/bitcast.ll
-+++ b/test/Transforms/InstCombine/bitcast.ll
-@@ -561,3 +561,9 @@ define void @constant_fold_vector_to_half() {
-   store volatile half bitcast (<4 x i4> <i4 0, i4 0, i4 0, i4 4> to half), half* undef
-   ret void
- }
-+
-+; Ensure that we do not crash when looking at such a weird bitcast.
-+define i8* @bitcast_from_single_element_pointer_vector_to_pointer(<1 x i8*> %ptrvec) {
-+  %ptr = bitcast <1 x i8*> %ptrvec to i8*
-+  ret i8* %ptr
-+}
---
-2.17.1
-
diff --git a/recipes-devtools/clang/clang/0027-compiler-rt-Include-stddef.h.patch b/recipes-devtools/clang/clang/0027-compiler-rt-Include-stddef.h.patch
new file mode 100644
index 0000000..3bd41ea
--- /dev/null
+++ b/recipes-devtools/clang/clang/0027-compiler-rt-Include-stddef.h.patch
@@ -0,0 +1,27 @@
+From f5367ee64b6e74039c0957e1f7d81dc8d597804d Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 6 Feb 2021 12:44:30 -0800
+Subject: [PATCH] compiler-rt: Include stddef.h
+
+size_t is use in the source needs relevant header to include the
+definition, fixes build on musl
+
+compiler-rt/lib/fuzzer/FuzzerInterceptors.cpp:82:61: error: unknown type name 'size_t'; did you mean 'std::size_t'?
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ compiler-rt/lib/fuzzer/FuzzerInterceptors.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/compiler-rt/lib/fuzzer/FuzzerInterceptors.cpp b/compiler-rt/lib/fuzzer/FuzzerInterceptors.cpp
+index b87798603fda..34e11727d77b 100644
+--- a/compiler-rt/lib/fuzzer/FuzzerInterceptors.cpp
++++ b/compiler-rt/lib/fuzzer/FuzzerInterceptors.cpp
+@@ -26,6 +26,7 @@
+ 
+ #include <cassert>
+ #include <cstdint>
++#include <cstddef> // for size_t
+ #include <dlfcn.h> // for dlsym()
+ 
+ static void *getFuncAddr(const char *name, uintptr_t wrapper_addr) {
diff --git a/recipes-devtools/clang/clang/0028-llvm-Do-not-use-find_library-for-ncurses.patch b/recipes-devtools/clang/clang/0028-llvm-Do-not-use-find_library-for-ncurses.patch
new file mode 100644
index 0000000..ef9b2ed
--- /dev/null
+++ b/recipes-devtools/clang/clang/0028-llvm-Do-not-use-find_library-for-ncurses.patch
@@ -0,0 +1,44 @@
+From 6660c7d48601df4276fb3f51156c96fff103fb79 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)
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ compiler-rt/cmake/config-ix.cmake | 2 +-
+ llvm/cmake/config-ix.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 196aa62fd01c..49bbbd257d97 100644
+--- a/compiler-rt/cmake/config-ix.cmake
++++ b/compiler-rt/cmake/config-ix.cmake
+@@ -140,7 +140,7 @@ else()
+   set(MAYBE_REQUIRED)
+ endif()
+ if(LLVM_ENABLE_TERMINFO)
+-  find_library(COMPILER_RT_TERMINFO_LIB NAMES terminfo tinfo curses ncurses ncursesw ${MAYBE_REQUIRED})
++  set(TERMINFO_LIB tinfo curses ncurses ncursesw)
+ endif()
+ if(COMPILER_RT_TERMINFO_LIB)
+   set(LLVM_ENABLE_TERMINFO 1)
+diff --git a/llvm/cmake/config-ix.cmake b/llvm/cmake/config-ix.cmake
+index 818fafbce148..2f8ad6652334 100644
+--- a/llvm/cmake/config-ix.cmake
++++ b/llvm/cmake/config-ix.cmake
+@@ -175,7 +175,7 @@ if(NOT LLVM_USE_SANITIZER MATCHES "Memory.*")
+       set(MAYBE_REQUIRED)
+     endif()
+     if(LLVM_ENABLE_TERMINFO)
+-      find_library(TERMINFO_LIB NAMES terminfo tinfo curses ncurses ncursesw ${MAYBE_REQUIRED})
++      set(TERMINFO_LIB tinfo curses ncurses ncursesw)
+     endif()
+     if(TERMINFO_LIB)
+       set(LLVM_ENABLE_TERMINFO 1)
diff --git a/recipes-devtools/clang/clang/0028-nfc-Fix-missing-include.patch b/recipes-devtools/clang/clang/0028-nfc-Fix-missing-include.patch
deleted file mode 100644
index 250e0da..0000000
--- a/recipes-devtools/clang/clang/0028-nfc-Fix-missing-include.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From b498303066a63a203d24f739b2d2e0e56dca70d1 Mon Sep 17 00:00:00 2001
-From: serge-sans-paille <sguelton@redhat.com>
-Date: Tue, 10 Nov 2020 14:55:25 +0100
-Subject: [PATCH] [nfc] Fix missing include
-
-Upstream-Status: Backport [https://github.com/llvm/llvm-project/commit/b498303066a63a203d24f739b2d2e0e56dca70d1]
-
-Signed-off-by: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
-
----
- llvm/utils/benchmark/src/benchmark_register.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/llvm/utils/benchmark/src/benchmark_register.h b/llvm/utils/benchmark/src/benchmark_register.h
-index 0705e219f2fa..4caa5ad4da07 100644
---- a/llvm/utils/benchmark/src/benchmark_register.h
-+++ b/llvm/utils/benchmark/src/benchmark_register.h
-@@ -1,6 +1,7 @@
- #ifndef BENCHMARK_REGISTER_H
- #define BENCHMARK_REGISTER_H
- 
-+#include <limits>
- #include <vector>
- 
- #include "check.h"
--- 
-2.31.1
-
diff --git a/recipes-devtools/clang/clang/0029-llvm-Insert-anchor-for-adding-OE-distro-vendor-names.patch b/recipes-devtools/clang/clang/0029-llvm-Insert-anchor-for-adding-OE-distro-vendor-names.patch
new file mode 100644
index 0000000..a9658b3
--- /dev/null
+++ b/recipes-devtools/clang/clang/0029-llvm-Insert-anchor-for-adding-OE-distro-vendor-names.patch
@@ -0,0 +1,32 @@
+From 7bc8252aff944f2efeaad92c431b1f1c5cf606b1 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_more_target_vendors()
+
+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/Support/Triple.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/llvm/lib/Support/Triple.cpp b/llvm/lib/Support/Triple.cpp
+index 4f483c965282..ffd20d223133 100644
+--- a/llvm/lib/Support/Triple.cpp
++++ b/llvm/lib/Support/Triple.cpp
+@@ -489,7 +489,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/0030-AsmMatcherEmitter-sort-ClassInfo-lists-by-name-as-we.patch b/recipes-devtools/clang/clang/0030-AsmMatcherEmitter-sort-ClassInfo-lists-by-name-as-we.patch
new file mode 100644
index 0000000..8093de0
--- /dev/null
+++ b/recipes-devtools/clang/clang/0030-AsmMatcherEmitter-sort-ClassInfo-lists-by-name-as-we.patch
@@ -0,0 +1,32 @@
+From 4d51447a11ee6796594fd55718ea62575ecebc78 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Fri, 27 Nov 2020 10:11:08 +0000
+Subject: [PATCH] AsmMatcherEmitter: sort ClassInfo lists by name as well
+
+Otherwise, there are instances which are identical in
+every other field and therefore sort non-reproducibly
+(which breaks binary and source reproducibiliy).
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ llvm/utils/TableGen/AsmMatcherEmitter.cpp | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/llvm/utils/TableGen/AsmMatcherEmitter.cpp b/llvm/utils/TableGen/AsmMatcherEmitter.cpp
+index 9d304910ba4e..d1b50b04fc71 100644
+--- a/llvm/utils/TableGen/AsmMatcherEmitter.cpp
++++ b/llvm/utils/TableGen/AsmMatcherEmitter.cpp
+@@ -359,7 +359,10 @@ public:
+     // name of a class shouldn't be significant. However, some of the backends
+     // accidentally rely on this behaviour, so it will have to stay like this
+     // until they are fixed.
+-    return ValueName < RHS.ValueName;
++    if (ValueName != RHS.ValueName)
++        return ValueName < RHS.ValueName;
++    // All else being equal, we should sort by name, for source and binary reproducibility
++    return Name < RHS.Name;
+   }
+ };
+ 
diff --git a/recipes-devtools/clang/clang/0031-compiler-rt-Use-mcr-based-barrier-on-armv6.patch b/recipes-devtools/clang/clang/0031-compiler-rt-Use-mcr-based-barrier-on-armv6.patch
new file mode 100644
index 0000000..1f3af25
--- /dev/null
+++ b/recipes-devtools/clang/clang/0031-compiler-rt-Use-mcr-based-barrier-on-armv6.patch
@@ -0,0 +1,71 @@
+From 4f45514fb8841a08d8d3bb68d9cb84b607e652f2 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 24 Mar 2021 00:32:09 -0700
+Subject: [PATCH] compiler-rt: Use mcr based barrier on armv6
+
+dsb is an armv7 instruction and wont work when we are building for armv6.
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ compiler-rt/lib/builtins/arm/sync-ops.h | 8 ++++----
+ compiler-rt/lib/builtins/assembly.h     | 8 ++++++++
+ 2 files changed, 12 insertions(+), 4 deletions(-)
+
+diff --git a/compiler-rt/lib/builtins/arm/sync-ops.h b/compiler-rt/lib/builtins/arm/sync-ops.h
+index c9623249e5d2..7a26170741ad 100644
+--- a/compiler-rt/lib/builtins/arm/sync-ops.h
++++ b/compiler-rt/lib/builtins/arm/sync-ops.h
+@@ -19,14 +19,14 @@
+   .thumb;                                                                      \
+   .syntax unified;                                                             \
+   DEFINE_COMPILERRT_THUMB_FUNCTION(__sync_fetch_and_##op)                      \
+-  dmb;                                                                         \
++  DMB;                                                                         \
+   mov r12, r0;                                                                 \
+   LOCAL_LABEL(tryatomic_##op) : ldrex r0, [r12];                               \
+   op(r2, r0, r1);                                                              \
+   strex r3, r2, [r12];                                                         \
+   cmp r3, #0;                                                                  \
+   bne LOCAL_LABEL(tryatomic_##op);                                             \
+-  dmb;                                                                         \
++  DMB;                                                                         \
+   bx lr
+ 
+ #define SYNC_OP_8(op)                                                          \
+@@ -35,14 +35,14 @@
+   .syntax unified;                                                             \
+   DEFINE_COMPILERRT_THUMB_FUNCTION(__sync_fetch_and_##op)                      \
+   push {r4, r5, r6, lr};                                                       \
+-  dmb;                                                                         \
++  DMB;                                                                         \
+   mov r12, r0;                                                                 \
+   LOCAL_LABEL(tryatomic_##op) : ldrexd r0, r1, [r12];                          \
+   op(r4, r5, r0, r1, r2, r3);                                                  \
+   strexd r6, r4, r5, [r12];                                                    \
+   cmp r6, #0;                                                                  \
+   bne LOCAL_LABEL(tryatomic_##op);                                             \
+-  dmb;                                                                         \
++  DMB;                                                                         \
+   pop { r4, r5, r6, pc }
+ 
+ #define MINMAX_4(rD, rN, rM, cmp_kind)                                         \
+diff --git a/compiler-rt/lib/builtins/assembly.h b/compiler-rt/lib/builtins/assembly.h
+index f6ce6a9fccff..5c6cd9376ac4 100644
+--- a/compiler-rt/lib/builtins/assembly.h
++++ b/compiler-rt/lib/builtins/assembly.h
+@@ -181,6 +181,14 @@
+   JMP(ip)
+ #endif
+ 
++#if __ARM_ARCH >= 7
++#define DMB dmb
++#elif __ARM_ARCH >= 6
++#define DMB mcr p15, #0, r0, c7, c10, #5
++#else
++#error Only use this with ARMv6+
++#endif
++
+ #if defined(USE_THUMB_2)
+ #define WIDE(op) op.w
+ #else
diff --git a/recipes-devtools/clang/clang/0032-clang-Switch-defaults-to-dwarf-5-debug-info-on-Linux.patch b/recipes-devtools/clang/clang/0032-clang-Switch-defaults-to-dwarf-5-debug-info-on-Linux.patch
new file mode 100644
index 0000000..a022a71
--- /dev/null
+++ b/recipes-devtools/clang/clang/0032-clang-Switch-defaults-to-dwarf-5-debug-info-on-Linux.patch
@@ -0,0 +1,28 @@
+From 1d07b3e71bf073da0a25b30efb135adaa876e3df Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Thu, 15 Apr 2021 18:58:07 -0700
+Subject: [PATCH] clang: Switch defaults to dwarf-5 debug info on Linux
+
+GCC 11 has defaulted to DWARF-5 as well, this matches
+debug info formats,  so mix and match of components with GCC 11
+works.
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ clang/lib/Driver/ToolChains/Linux.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/clang/lib/Driver/ToolChains/Linux.h b/clang/lib/Driver/ToolChains/Linux.h
+index 582d4bef81df..82c9494c744e 100644
+--- a/clang/lib/Driver/ToolChains/Linux.h
++++ b/clang/lib/Driver/ToolChains/Linux.h
+@@ -58,6 +58,8 @@ public:
+       const llvm::opt::ArgList &DriverArgs, const JobAction &JA,
+       const llvm::fltSemantics *FPType = nullptr) const override;
+ 
++  unsigned GetDefaultDwarfVersion() const override { return 5; }
++
+ protected:
+   Tool *buildAssembler() const override;
+   Tool *buildLinker() const override;
diff --git a/recipes-devtools/clang/llvm-common/llvm-config b/recipes-devtools/clang/clang/llvm-config
index a139514..a139514 100644
--- a/recipes-devtools/clang/llvm-common/llvm-config
+++ b/recipes-devtools/clang/clang/llvm-config
diff --git a/recipes-devtools/clang/clang_git.bb b/recipes-devtools/clang/clang_git.bb
index 779c4ae..b0c81f1 100644
--- a/recipes-devtools/clang/clang_git.bb
+++ b/recipes-devtools/clang/clang_git.bb
@@ -15,7 +15,6 @@ BUILD_CXX_class-nativesdk = "clang++"
 BUILD_AR_class-nativesdk = "llvm-ar"
 BUILD_RANLIB_class-nativesdk = "llvm-ranlib"
 BUILD_NM_class-nativesdk = "llvm-nm"
-LDFLAGS_append_class-nativesdk = " -fuse-ld=gold"
 
 inherit cmake cmake-native pkgconfig python3native
 
@@ -35,7 +34,8 @@ def get_clang_arch(bb, d, arch_var):
     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('riscv(32|64)(eb|)$', a):            return 'RISCV'
+    elif re.match('riscv32$', a):                      return 'riscv32'
+    elif re.match('riscv64$', a):                      return 'riscv64'
     elif re.match('p(pc|owerpc)(|64)', a):             return 'PowerPC'
     else:
         bb.note("'%s' is not a primary llvm architecture" % a)
@@ -51,19 +51,19 @@ def get_clang_experimental_target_arch(bb, d):
     return get_clang_experimental_arch(bb, d, 'TARGET_ARCH')
 
 PACKAGECONFIG ??= "compiler-rt libcplusplus shared-libs lldb-wchar \
-                   ${@bb.utils.filter('DISTRO_FEATURES', 'thin-lto full-lto', d)} \
-                   rtti eh libedit \
+                   ${@bb.utils.filter('DISTRO_FEATURES', 'thin-lto lto', d)} \
+                   rtti eh libedit terminfo \
                    "
-PACKAGECONFIG_class-native = "rtti eh libedit"
-PACKAGECONFIG_class-nativesdk = "rtti eh libedit ${@bb.utils.filter('DISTRO_FEATURES', 'thin-lto full-lto', d)}"
+PACKAGECONFIG_class-native = "rtti eh libedit shared-libs"
+PACKAGECONFIG_class-nativesdk = "rtti eh libedit shared-libs ${@bb.utils.filter('DISTRO_FEATURES', 'thin-lto lto', d)}"
 
 PACKAGECONFIG[compiler-rt] = "-DCLANG_DEFAULT_RTLIB=compiler-rt,,libcxx,compiler-rt"
 PACKAGECONFIG[libcplusplus] = "-DCLANG_DEFAULT_CXX_STDLIB=libc++,,libcxx"
 PACKAGECONFIG[unwindlib] = "-DCLANG_DEFAULT_UNWINDLIB=libunwind,-DCLANG_DEFAULT_UNWINDLIB=libgcc,libcxx"
 PACKAGECONFIG[thin-lto] = "-DLLVM_ENABLE_LTO=Thin -DLLVM_BINUTILS_INCDIR=${STAGING_INCDIR},,binutils,"
-PACKAGECONFIG[full-lto] = "-DLLVM_ENABLE_LTO=Full -DLLVM_BINUTILS_INCDIR=${STAGING_INCDIR},,binutils,"
+PACKAGECONFIG[lto] = "-DLLVM_ENABLE_LTO=Full -DLLVM_BINUTILS_INCDIR=${STAGING_INCDIR},,binutils,"
 PACKAGECONFIG[shared-libs] = "-DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_LINK_LLVM_DYLIB=ON,,,"
-PACKAGECONFIG[terminfo] = "-DLLVM_ENABLE_TERMINFO=ON,-DLLVM_ENABLE_TERMINFO=OFF,ncurses,"
+PACKAGECONFIG[terminfo] = "-DLLVM_ENABLE_TERMINFO=ON -DCOMPILER_RT_TERMINFO_LIB=ON,-DLLVM_ENABLE_TERMINFO=OFF -DCOMPILER_RT_TERMINFO_LIB=OFF,ncurses,"
 PACKAGECONFIG[pfm] = "-DLLVM_ENABLE_LIBPFM=ON,-DLLVM_ENABLE_LIBPFM=OFF,libpfm,"
 PACKAGECONFIG[lldb-wchar] = "-DLLDB_EDITLINE_USE_WCHAR=1,-DLLDB_EDITLINE_USE_WCHAR=0,"
 PACKAGECONFIG[bootstrap] = "-DCLANG_ENABLE_BOOTSTRAP=On -DCLANG_BOOTSTRAP_PASSTHROUGH='${PASSTHROUGH}' -DBOOTSTRAP_LLVM_ENABLE_LTO=Thin -DBOOTSTRAP_LLVM_ENABLE_LLD=ON,,,"
@@ -91,12 +91,10 @@ CMAKE_C_FLAGS_RELEASE;CMAKE_CXX_FLAGS_RELEASE;CMAKE_ASM_FLAGS_RELEASE;\
 "
 #
 # 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"
-LLVM_TARGETS_TO_BUILD_append = ";${@get_clang_host_arch(bb, d)};${@get_clang_target_arch(bb, d)}"
-
-LLVM_TARGETS_TO_BUILD_TARGET ?= "${LLVM_TARGETS_TO_BUILD}"
-LLVM_TARGETS_TO_BUILD_TARGET_append ?= ";${@get_clang_target_arch(bb, d)}"
 
 LLVM_EXPERIMENTAL_TARGETS_TO_BUILD ?= ""
 LLVM_EXPERIMENTAL_TARGETS_TO_BUILD_append = ";${@get_clang_experimental_target_arch(bb, d)}"
@@ -104,6 +102,13 @@ LLVM_EXPERIMENTAL_TARGETS_TO_BUILD_append = ";${@get_clang_experimental_target_a
 HF = "${@ bb.utils.contains('TUNE_CCARGS_MFLOAT', 'hard', 'hf', '', d)}"
 HF[vardepvalue] = "${HF}"
 
+LLVM_PROJECTS ?= "clang;clang-tools-extra;lld;lldb"
+# There is no LLDB support for RISCV
+LLVM_PROJECTS_riscv32 ?= "clang;clang-tools-extra;lld"
+LLVM_PROJECTS_riscv64 ?= "clang;clang-tools-extra;lld"
+
+#CMAKE_VERBOSE = "VERBOSE=1"
+
 EXTRA_OECMAKE += "-DLLVM_ENABLE_ASSERTIONS=OFF \
                   -DLLVM_ENABLE_EXPENSIVE_CHECKS=OFF \
                   -DLLVM_ENABLE_PIC=ON \
@@ -114,15 +119,17 @@ EXTRA_OECMAKE += "-DLLVM_ENABLE_ASSERTIONS=OFF \
                   -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='clang;clang-tools-extra;lld;lldb' \
+                  -DLLVM_ENABLE_PROJECTS='${LLVM_PROJECTS}' \
                   -DLLVM_BINUTILS_INCDIR=${STAGING_INCDIR} \
                   -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 = "\
-                  -DLLVM_TARGETS_TO_BUILD='${LLVM_TARGETS_TO_BUILD}' \
-                  -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD='${LLVM_EXPERIMENTAL_TARGETS_TO_BUILD}' \
                   -DPYTHON_EXECUTABLE='${PYTHON}' \
 "
 EXTRA_OECMAKE_append_class-nativesdk = "\
@@ -131,8 +138,7 @@ 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_TARGETS_TO_BUILD='${LLVM_TARGETS_TO_BUILD}' \
-                  -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD='${LLVM_EXPERIMENTAL_TARGETS_TO_BUILD}' \
+                  -DCMAKE_STRIP=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-strip \
                   -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen \
                   -DCLANG_TABLEGEN=${STAGING_BINDIR_NATIVE}/clang-tblgen \
                   -DLLDB_TABLEGEN=${STAGING_BINDIR_NATIVE}/lldb-tblgen \
@@ -145,12 +151,13 @@ EXTRA_OECMAKE_append_class-target = "\
                   -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen \
                   -DCLANG_TABLEGEN=${STAGING_BINDIR_NATIVE}/clang-tblgen \
                   -DLLDB_TABLEGEN=${STAGING_BINDIR_NATIVE}/lldb-tblgen \
-                  -DLLVM_TARGETS_TO_BUILD='${LLVM_TARGETS_TO_BUILD_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_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', '')} \
@@ -161,9 +168,6 @@ DEPENDS = "binutils zlib libffi libxml2 libxml2-native ninja-native swig-native"
 DEPENDS_append_class-nativesdk = " clang-crosssdk-${SDK_ARCH} virtual/${TARGET_PREFIX}binutils-crosssdk nativesdk-python3"
 DEPENDS_append_class-target = " clang-cross-${TARGET_ARCH} python3"
 
-COMPATIBLE_HOST_riscv64 = "null"
-COMPATIBLE_HOST_riscv32 = "null"
-
 RRECOMMENDS_${PN} = "binutils"
 RRECOMMENDS_${PN}_append_class-target = " libcxx-dev"
 
@@ -189,13 +193,16 @@ endif()\n" ${D}${libdir}/cmake/llvm/LLVMExports-release.cmake
         lnr ${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; do
+        ln -sf $t ${D}${bindir}/${TARGET_PREFIX}$t
+    done
 }
 
 do_install_append_class-native () {
     install -Dm 0755 ${B}${BINPATHPREFIX}/bin/clang-tblgen ${D}${bindir}/clang-tblgen
     install -Dm 0755 ${B}${BINPATHPREFIX}/bin/lldb-tblgen ${D}${bindir}/lldb-tblgen
     for f in `find ${D}${bindir} -executable -type f -not -type l`; do
-        test -n "`file $f|grep -i ELF`" && ${STRIP} $f
+        test -n "`file -b $f|grep -i ELF`" && ${STRIP} $f
         echo "stripped $f"
     done
     ln -sf clang-tblgen ${D}${bindir}/clang-tblgen${PV}
@@ -207,7 +214,7 @@ do_install_append_class-nativesdk () {
     install -Dm 0755 ${B}${BINPATHPREFIX}/bin/clang-tblgen ${D}${bindir}/clang-tblgen
     install -Dm 0755 ${B}${BINPATHPREFIX}/bin/lldb-tblgen ${D}${bindir}/lldb-tblgen
     for f in `find ${D}${bindir} -executable -type f -not -type l`; do
-        test -n "`file $f|grep -i ELF`" && ${STRIP} $f
+        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}
@@ -288,3 +295,14 @@ TOOLCHAIN_class-native = "gcc"
 TOOLCHAIN_class-nativesdk = "clang"
 
 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}
+        install -m 755 ${D}${bindir}/lld ${SYSROOT_DESTDIR}${bindir}/
+}
diff --git a/recipes-devtools/clang/common.inc b/recipes-devtools/clang/common.inc
index b070428..c94dd69 100644
--- a/recipes-devtools/clang/common.inc
+++ b/recipes-devtools/clang/common.inc
@@ -8,11 +8,12 @@ LICENSE = "Apache-2.0-with-LLVM-exception"
 BASEURI ??= "${LLVM_GIT}/llvm-project;protocol=${LLVM_GIT_PROTOCOL};branch=${BRANCH}"
 SRC_URI = "\
     ${BASEURI} \
+    file://llvm-config \
     file://0001-lldb-Add-lxml2-to-linker-cmdline-of-xml-is-found.patch \
     file://0002-libcxxabi-Find-libunwind-headers-when-LIBCXXABI_LIBU.patch \
     file://0003-compiler-rt-support-a-new-embedded-linux-target.patch \
     file://0004-compiler-rt-Simplify-cross-compilation.-Don-t-use-na.patch \
-    file://0001-compiler-rt-Fix-realpath-already-defined-error.patch \
+    file://0005-compiler-rt-Disable-tsan-on-OE-glibc.patch \
     file://0006-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch \
     file://0007-llvm-allow-env-override-of-exe-path.patch \
     file://0008-clang-driver-Check-sysroot-for-ldso-path.patch \
@@ -24,20 +25,22 @@ SRC_URI = "\
     file://0014-clang-Fix-ldso-for-musl-on-x86-and-x32-architectures.patch \
     file://0015-clang-scan-view-needs-python-2.x.patch \
     file://0016-clang-Add-lpthread-and-ldl-along-with-lunwind-for-st.patch \
-    file://0017-libclang-Use-CMAKE_DL_LIBS-for-deducing-libdl.patch \
-    file://0018-Pass-PYTHON_EXECUTABLE-when-cross-compiling-for-nati.patch \
-    file://0019-Check-for-atomic-double-intrinsics.patch \
-    file://0020-clang-Enable-SSP-and-PIE-by-default.patch \
-    file://0021-libcxx-Add-compiler-runtime-library-to-link-step-for.patch \
-    file://0022-clang-llvm-cmake-Fix-configure-for-packages-using-fi.patch \
-    file://0023-clang-Fix-resource-dir-location-for-cross-toolchains.patch \
-    file://0024-fix-path-to-libffi.patch \
-    file://0025-clang-driver-Add-dyld-prefix-when-checking-sysroot-f.patch \
-    file://0026-OpenCL-Fix-support-for-cl_khr_mipmap_image_writes.patch \
-    file://0027-InstCombine-visitBitCast-do-not-crash-on-weird-bitca.patch;patchdir=llvm \
-    file://0028-nfc-Fix-missing-include.patch \
+    file://0018-Check-for-atomic-double-intrinsics.patch \
+    file://0019-clang-Enable-SSP-and-PIE-by-default.patch \
+    file://0020-libcxx-Add-compiler-runtime-library-to-link-step-for.patch \
+    file://0021-clang-llvm-cmake-Fix-configure-for-packages-using-fi.patch \
+    file://0022-clang-Fix-resource-dir-location-for-cross-toolchains.patch \
+    file://0023-fix-path-to-libffi.patch \
+    file://0024-clang-driver-Add-dyld-prefix-when-checking-sysroot-f.patch \
+    file://0025-clang-Use-python3-in-python-scripts.patch \
+    file://0026-For-x86_64-set-Yocto-based-GCC-install-search-path.patch \
+    file://0027-compiler-rt-Include-stddef.h.patch \
+    file://0028-llvm-Do-not-use-find_library-for-ncurses.patch \
+    file://0029-llvm-Insert-anchor-for-adding-OE-distro-vendor-names.patch \
+    file://0030-AsmMatcherEmitter-sort-ClassInfo-lists-by-name-as-we.patch \
+    file://0031-compiler-rt-Use-mcr-based-barrier-on-armv6.patch \
+    file://0032-clang-Switch-defaults-to-dwarf-5-debug-info-on-Linux.patch \
 "
-
 # Fallback to no-PIE if not set
 GCCPIE ??= ""
 
diff --git a/recipes-devtools/clang/compiler-rt-sanitizers_git.bb b/recipes-devtools/clang/compiler-rt-sanitizers_git.bb
new file mode 100644
index 0000000..aa3a9ac
--- /dev/null
+++ b/recipes-devtools/clang/compiler-rt-sanitizers_git.bb
@@ -0,0 +1,97 @@
+# 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"
+
+RUNTIME = "llvm"
+
+DEPENDS += "ninja-native clang-cross-${TARGET_ARCH} virtual/${MLPREFIX}libc virtual/${TARGET_PREFIX}compilerlibs"
+DEPENDS_append_libc-glibc = " libxcrypt"
+DEPENDS_append_class-nativesdk = " clang-native nativesdk-libxcrypt"
+
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[crt] = "-DCOMPILER_RT_BUILD_CRT:BOOL=ON,-DCOMPILER_RT_BUILD_CRT:BOOL=OFF"
+
+HF = "${@ 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 += "-DCOMPILER_RT_STANDALONE_BUILD=OFF \
+                  -DCOMPILER_RT_DEFAULT_TARGET_TRIPLE=${HOST_ARCH}${HF}${HOST_VENDOR}-${HOST_OS} \
+                  -DCOMPILER_RT_BUILD_BUILTINS=OFF \
+                  -DSANITIZER_CXX_ABI_LIBNAME=${@bb.utils.contains("RUNTIME", "llvm", "libc++", "libstdc++", d)} \
+                  -DSANITIZER_USE_STATIC_CXX_ABI=ON \
+                  -DSANITIZER_USE_STATIC_LLVM_UNWINDER=ON \
+                  -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_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}
+        mv ${D}${libdir}/clang ${D}${nonarch_libdir}/clang
+        rmdir --ignore-fail-on-non-empty ${D}${libdir}
+    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/compiler-rt_git.bb b/recipes-devtools/clang/compiler-rt_git.bb
index 9178031..6dac9f6 100644
--- a/recipes-devtools/clang/compiler-rt_git.bb
+++ b/recipes-devtools/clang/compiler-rt_git.bb
@@ -19,7 +19,7 @@ TUNE_CCARGS_remove = "-no-integrated-as"
 
 INHIBIT_DEFAULT_DEPS = "1"
 
-DEPENDS += "ninja-native clang-cross-${TARGET_ARCH} virtual/${MLPREFIX}libc virtual/${TARGET_PREFIX}compilerlibs virtual/crypt"
+DEPENDS += "ninja-native clang-cross-${TARGET_ARCH} virtual/${MLPREFIX}libc virtual/${TARGET_PREFIX}compilerlibs"
 DEPENDS_append_class-nativesdk = " clang-native"
 
 PACKAGECONFIG ??= ""
@@ -34,6 +34,10 @@ OECMAKE_SOURCEPATH = "${S}/llvm"
 EXTRA_OECMAKE += "-DCOMPILER_RT_STANDALONE_BUILD=OFF \
                   -DCOMPILER_RT_DEFAULT_TARGET_TRIPLE=${HOST_ARCH}${HF}${HOST_VENDOR}-${HOST_OS} \
                   -DCOMPILER_RT_BUILD_XRAY=OFF \
+                  -DCOMPILER_RT_BUILD_SANITIZERS=OFF \
+                  -DCOMPILER_RT_BUILD_MEMPROF=OFF \
+                  -DCOMPILER_RT_BUILD_LIBFUZZER=OFF \
+                  -DCOMPILER_RT_BUILD_PROFILE=ON \
                   -DLLVM_ENABLE_PROJECTS='compiler-rt' \
                   -DCMAKE_RANLIB=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-ranlib \
                   -DCMAKE_AR=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-ar \
@@ -45,10 +49,6 @@ EXTRA_OECMAKE_append_class-nativesdk = "\
                -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen \
                -DCLANG_TABLEGEN=${STAGING_BINDIR_NATIVE}/clang-tblgen \
 "
-
-EXTRA_OECMAKE_append_libc-musl = " -DCOMPILER_RT_BUILD_SANITIZERS=OFF "
-CXXFLAGS_append_libc-musl = " -D_LIBCPP_HAS_MUSL_LIBC=ON "
-EXTRA_OECMAKE_append_mipsarch = " -DCOMPILER_RT_BUILD_SANITIZERS=OFF "
 EXTRA_OECMAKE_append_powerpc = " -DCOMPILER_RT_DEFAULT_TARGET_ARCH=powerpc "
 
 do_install_append () {
diff --git a/recipes-devtools/clang/libclc_git.bb b/recipes-devtools/clang/libclc_git.bb
new file mode 100644
index 0000000..9525b25
--- /dev/null
+++ b/recipes-devtools/clang/libclc_git.bb
@@ -0,0 +1,37 @@
+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_CROSSCOMPILING_EMULATOR=${WORKDIR}/qemuwrapper \
+                                -Dclc_comp_in:FILEPATH=${OECMAKE_SOURCEPATH}/cmake/CMakeCLCCompiler.cmake.in \
+                                -Dll_comp_in:FILEPATH=${OECMAKE_SOURCEPATH}/cmake/CMakeLLAsmCompiler.cmake.in \
+                        "
+
+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"
diff --git a/recipes-devtools/clang/libcxx_git.bb b/recipes-devtools/clang/libcxx_git.bb
index 789da5b..80eaa78 100644
--- a/recipes-devtools/clang/libcxx_git.bb
+++ b/recipes-devtools/clang/libcxx_git.bb
@@ -11,8 +11,6 @@ require common-source.inc
 inherit cmake python3native
 
 PACKAGECONFIG ??= "compiler-rt exceptions ${@bb.utils.contains("RUNTIME", "llvm", "unwind", "", d)}"
-PACKAGECONFIG_riscv32 = "exceptions"
-PACKAGECONFIG_riscv64 = "exceptions"
 PACKAGECONFIG_append_armv5 = " no-atomics"
 
 PACKAGECONFIG[unwind] = "-DLIBCXXABI_USE_LLVM_UNWINDER=ON -DLIBCXXABI_ENABLE_STATIC_UNWINDER=ON -DLIBCXXABI_STATICALLY_LINK_UNWINDER_IN_SHARED_LIBRARY=ON -DLIBCXXABI_STATICALLY_LINK_UNWINDER_IN_STATIC_LIBRARY=ON,-DLIBCXXABI_USE_LLVM_UNWINDER=OFF,,"
@@ -24,7 +22,7 @@ DEPENDS += "ninja-native"
 DEPENDS_append_class-target = " clang-cross-${TARGET_ARCH} virtual/${MLPREFIX}libc virtual/${TARGET_PREFIX}compilerlibs"
 
 LIBCPLUSPLUS = ""
-COMPILER_RT ?= "-rtlib=compiler-rt ${UNWINDLIB}"
+COMPILER_RT ?= "${@bb.utils.contains("PACKAGECONFIG", "compiler-rt", "-rtlib=compiler-rt", "", d)} ${UNWINDLIB}"
 UNWINDLIB ?= "${@bb.utils.contains("RUNTIME", "gnu", "--unwindlib=libgcc", "", d)}"
 
 INHIBIT_DEFAULT_DEPS = "1"
diff --git a/recipes-devtools/clang/llvm-common.bb b/recipes-devtools/clang/llvm-common.bb
deleted file mode 100644
index 893abd1..0000000
--- a/recipes-devtools/clang/llvm-common.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-SUMMARY = "Helper script for OE's llvm support"
-LICENSE = "Apache-2.0-with-LLVM-exception"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0-with-LLVM-exception;md5=0bcd48c3bdfef0c9d9fd17726e4b7dab"
-
-SRC_URI = "file://llvm-config"
-
-S = "${WORKDIR}"
-
-ALLOW_EMPTY_${PN} = "1"
-SYSROOT_PREPROCESS_FUNCS_append_class-target = " llvm_common_sysroot_preprocess"
-
-llvm_common_sysroot_preprocess() {
-    install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/
-    install -m 0755 ${WORKDIR}/llvm-config ${SYSROOT_DESTDIR}${bindir_crossscripts}/
-}
-
-do_install_class-native() {
-    install -d ${D}${bindir}
-    install -m 0755 ${WORKDIR}/llvm-config ${D}${bindir}
-}
-
-BBCLASSEXTEND = "native"
diff --git a/recipes-devtools/clang/llvm-project-source.bbappend b/recipes-devtools/clang/llvm-project-source.bbappend
new file mode 100644
index 0000000..5d47c23
--- /dev/null
+++ b/recipes-devtools/clang/llvm-project-source.bbappend
@@ -0,0 +1,9 @@
+# This needs to override meta-intel (which pulls in the
+# LLVM 10/11 version of SPIRV-LLVM-Translator)
+
+SPIRV_BRANCH = "llvm_release_120"
+SRC_URI_append_intel-x86-common = " \
+                                    git://github.com/KhronosGroup/SPIRV-LLVM-Translator.git;protocol=https;branch=${SPIRV_BRANCH};destsuffix=git/llvm/projects/llvm-spirv;name=spirv \
+                                    "
+SRCREV_spirv = "67d3e271a28287b2c92ecef2f5e98c49134e5946"
+
diff --git a/recipes-devtools/clang/llvm-project-source.inc b/recipes-devtools/clang/llvm-project-source.inc
index f6c552d..d7b91e0 100644
--- a/recipes-devtools/clang/llvm-project-source.inc
+++ b/recipes-devtools/clang/llvm-project-source.inc
@@ -18,3 +18,39 @@ STAMPCLEAN = "${STAMPS_DIR}/work-shared/llvm-project-source-${PV}-*"
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS = ""
 PACKAGES = ""
+
+# 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}"
+
+python add_distro_vendor() {
+    import subprocess
+    case = ""
+    triple = ""
+    vendors = d.getVar('CLANG_EXTRA_OE_VENDORS')
+    multilib_variants = d.getVar('MULTILIB_VARIANTS').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/Support/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/Support/Triple.cpp" % (case))
+    subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True)
+}
+
+do_patch[postfuncs] += "add_distro_vendor"
diff --git a/recipes-devtools/clang/openmp_git.bb b/recipes-devtools/clang/openmp_git.bb
index c8cda45..2a366bc 100644
--- a/recipes-devtools/clang/openmp_git.bb
+++ b/recipes-devtools/clang/openmp_git.bb
@@ -38,8 +38,7 @@ FILES_SOLIBSDEV = ""
 FILES_${PN} += "${libdir}/lib*${SOLIBSDEV}"
 INSANE_SKIP_${PN} = "dev-so"
 
-COMPATIBLE_HOST_riscv64 = "null"
-COMPATIBLE_HOST_riscv32 = "null"
 COMPATIBLE_HOST_mips64 = "null"
+COMPATIBLE_HOST_riscv32 = "null"
 
 BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-devtools/distcc/distcc/distcc-3.3.3-clang-12.patch b/recipes-devtools/distcc/distcc/distcc-3.3.3-clang-12.patch
new file mode 100644
index 0000000..61a26a7
--- /dev/null
+++ b/recipes-devtools/distcc/distcc/distcc-3.3.3-clang-12.patch
@@ -0,0 +1,19 @@
+# SPDX-FileCopyrightText: Huawei Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+Fix build with modern compilers, such as clang 12 and gcc 11
+
+Signed-off-by: Bernhard Rosenkraenzer <bernhard.rosenkraenzer.ext@huawei.com>
+
+diff -up git/src/stats.h.omv~ git/src/stats.h
+--- git/src/stats.h.omv~        2021-03-11 18:38:55.022070855 +0100
++++ git/src/stats.h     2021-03-11 18:38:59.498751697 +0100
+@@ -33,7 +33,7 @@ enum stats_e { STATS_TCP_ACCEPT, STATS_R
+                 STATS_COMPILE_OK, STATS_COMPILE_ERROR, STATS_COMPILE_TIMEOUT,
+                 STATS_CLI_DISCONN, STATS_OTHER, STATS_ENUM_MAX };
+ 
+-const char *stats_text[20];
++extern const char *stats_text[20];
+ 
+ int  dcc_stats_init(void);
+ void dcc_stats_init_kid(void);
diff --git a/recipes-devtools/distcc/distcc_3.3.3%.bbappend b/recipes-devtools/distcc/distcc_3.3.3%.bbappend
new file mode 100644
index 0000000..d2bf964
--- /dev/null
+++ b/recipes-devtools/distcc/distcc_3.3.3%.bbappend
@@ -0,0 +1,4 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+SRC_URI_append = "\
+    file://distcc-3.3.3-clang-12.patch \
+"
diff --git a/recipes-devtools/rpm/rpm_%.bbappend b/recipes-devtools/rpm/rpm_%.bbappend
index 14b3142..732af3f 100644
--- a/recipes-devtools/rpm/rpm_%.bbappend
+++ b/recipes-devtools/rpm/rpm_%.bbappend
@@ -1,3 +1,9 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 DEPENDS_append_toolchain-clang = " openmp"
+DEPENDS_remove_toolchain-clang_riscv32 = "openmp"
+DEPENDS_remove_toolchain-clang_mipsarch = "openmp"
+
+# rpm needs OMP
+TOOLCHAIN_riscv32 = "gcc"
+TOOLCHAIN_mipsarch = "gcc"
diff --git a/recipes-devtools/spirv-llvm-translator/spirv-llvm-translator/0001-Use-12.0.0-for-base-llvm-version.patch b/recipes-devtools/spirv-llvm-translator/spirv-llvm-translator/0001-Use-12.0.0-for-base-llvm-version.patch
new file mode 100644
index 0000000..b52d97b
--- /dev/null
+++ b/recipes-devtools/spirv-llvm-translator/spirv-llvm-translator/0001-Use-12.0.0-for-base-llvm-version.patch
@@ -0,0 +1,26 @@
+From 1e38777c321605d13f9ad254880e73459877d7da Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sun, 14 Feb 2021 18:43:21 -0800
+Subject: [PATCH] Use 12.0.0 for base llvm version
+
+Upstream-Status: Pending
+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 0ddb55ce..a9cd1978 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ cmake_minimum_required(VERSION 3.3)
+ 
+-set (BASE_LLVM_VERSION 13.0.0)
++set (BASE_LLVM_VERSION 12.0.0)
+ set(LLVM_SPIRV_VERSION ${BASE_LLVM_VERSION}.0)
+ 
+ option(LLVM_SPIRV_INCLUDE_TESTS
+-- 
+2.30.1
+
diff --git a/recipes-devtools/spirv-llvm-translator/spirv-llvm-translator/0001-cmake-allow-to-enable-disable-ccache.patch b/recipes-devtools/spirv-llvm-translator/spirv-llvm-translator/0001-cmake-allow-to-enable-disable-ccache.patch
new file mode 100644
index 0000000..68cdda4
--- /dev/null
+++ b/recipes-devtools/spirv-llvm-translator/spirv-llvm-translator/0001-cmake-allow-to-enable-disable-ccache.patch
@@ -0,0 +1,32 @@
+From 13b679eb76e6877b40fd41b91e71cb172bcf7b26 Mon Sep 17 00:00:00 2001
+From: Naveen Saini <naveen.kumar.saini@intel.com>
+Date: Thu, 4 Mar 2021 11:23:20 +0800
+Subject: [PATCH] cmake: allow to enable/disable ccache
+
+By default ccache is enabled.
+
+Upstream-Status: Submitted [https://github.com/KhronosGroup/SPIRV-LLVM-Translator/pull/930]
+
+Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
+---
+ CMakeLists.txt | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0ddb55c..c7d0498 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -50,8 +50,9 @@ if(LLVM_SPIRV_BUILD_EXTERNAL)
+ 
+   message(STATUS "Found LLVM: ${LLVM_VERSION}")
+ 
++  option(CCACHE_ALLOWED "allow use of ccache" TRUE)
+   find_program(CCACHE_EXE_FOUND ccache)
+-  if(CCACHE_EXE_FOUND)
++  if(CCACHE_EXE_FOUND AND CCACHE_ALLOWED)
+     message(STATUS "Found ccache: ${CCACHE_EXE_FOUND}")
+     set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
+     set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
+-- 
+2.17.1
+
diff --git a/recipes-devtools/spirv-llvm-translator/spirv-llvm-translator_git.bb b/recipes-devtools/spirv-llvm-translator/spirv-llvm-translator_git.bb
new file mode 100644
index 0000000..171d54f
--- /dev/null
+++ b/recipes-devtools/spirv-llvm-translator/spirv-llvm-translator_git.bb
@@ -0,0 +1,42 @@
+LICENSE = "NCSA"
+LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=47e311aa9caedd1b3abf098bd7814d1d"
+
+BRANCH = "llvm_release_120"
+SRC_URI = "git://github.com/KhronosGroup/SPIRV-LLVM-Translator/;protocol=https;branch=${BRANCH} \
+           file://0001-Use-12.0.0-for-base-llvm-version.patch \
+           file://0001-cmake-allow-to-enable-disable-ccache.patch \
+          "
+
+PV = "12.0.0"
+SRCREV = "c65388fcd4eac9ce070fc330d5fe263ba2c72d66"
+
+S = "${WORKDIR}/git"
+
+DEPENDS = "spirv-tools clang"
+
+inherit cmake pkgconfig python3native
+
+OECMAKE_GENERATOR = "Unix Makefiles"
+
+# Specify any options you want to pass to cmake using EXTRA_OECMAKE:
+EXTRA_OECMAKE = "\
+        -DBUILD_SHARED_LIBS=ON \
+        -DLLVM_SPIRV_BUILD_EXTERNAL=YES \
+        -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 \
+"
+
+do_compile_append() {
+    oe_runmake llvm-spirv
+}
+
+do_install_append() {
+    install -Dm755 ${B}/tools/llvm-spirv/llvm-spirv ${D}${bindir}/llvm-spirv
+}
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-devtools/valgrind/valgrind/aarch64-inline-asm-clang.patch b/recipes-devtools/valgrind/valgrind/aarch64-inline-asm-clang.patch
new file mode 100644
index 0000000..f65440a
--- /dev/null
+++ b/recipes-devtools/valgrind/valgrind/aarch64-inline-asm-clang.patch
@@ -0,0 +1,643 @@
+From: Bernhard Rosenkraenzer <bernhard.rosenkraenzer.ext@huawei.com>
+
+Fix inline assembly to work with clang
+Clang's builtin assembler is much stricter than gas in syntax checks.
+
+Signed-off-by: Bernhard Rosenkraenzer <bernhard.rosenkraenzer.ext@huawei.com>
+Upstream-Status: Pending
+
+diff -up valgrind-3.15.0/none/tests/arm64/cvtf_imm.c.omv~ valgrind-3.15.0/none/tests/arm64/cvtf_imm.c
+--- valgrind-3.15.0/none/tests/arm64/cvtf_imm.c.omv~    2021-05-31 15:38:57.493204990 +0200
++++ valgrind-3.15.0/none/tests/arm64/cvtf_imm.c 2021-05-31 15:39:44.915571692 +0200
+@@ -17,7 +17,7 @@ __attribute__((noinline)) double do_scvt
+    U block[2]; block[0].i64 = x; block[1].i64 = 0;
+    __asm__ __volatile__(
+       "ldr x13,[%0,#0];  scvtf d18,x13,#1;  str d18, [%0,#8]"
+-      ::"r"(&block[0]) : "memory", "x13","q18");
++      ::"r"(&block[0]) : "memory", "x13","v18");
+    return block[1].d64;
+ }
+ __attribute__((noinline)) double do_scvtf_d_x_imm32 ( Long x )
+@@ -25,7 +25,7 @@ __attribute__((noinline)) double do_scvt
+    U block[2]; block[0].i64 = x; block[1].i64 = 0;
+    __asm__ __volatile__(
+       "ldr x13,[%0,#0];  scvtf d18,x13,#32;  str d18, [%0,#8]"
+-      ::"r"(&block[0]) : "memory", "x13","q18");
++      ::"r"(&block[0]) : "memory", "x13","v18");
+    return block[1].d64;
+ }
+ __attribute__((noinline)) double do_scvtf_d_x_imm64 ( Long x )
+@@ -33,7 +33,7 @@ __attribute__((noinline)) double do_scvt
+    U block[2]; block[0].i64 = x; block[1].i64 = 0;
+    __asm__ __volatile__(
+       "ldr x13,[%0,#0];  scvtf d18,x13,#64;  str d18, [%0,#8]"
+-      ::"r"(&block[0]) : "memory", "x13","q18");
++      ::"r"(&block[0]) : "memory", "x13","v18");
+    return block[1].d64;
+ }
+ 
+@@ -42,7 +42,7 @@ __attribute__((noinline)) double do_ucvt
+    U block[2]; block[0].i64 = x; block[1].i64 = 0;
+    __asm__ __volatile__(
+       "ldr x13,[%0,#0];  ucvtf d18,x13,#1;  str d18, [%0,#8]"
+-      ::"r"(&block[0]) : "memory", "x13","q18");
++      ::"r"(&block[0]) : "memory", "x13","v18");
+    return block[1].d64;
+ }
+ __attribute__((noinline)) double do_ucvtf_d_x_imm32 ( Long x )
+@@ -50,7 +50,7 @@ __attribute__((noinline)) double do_ucvt
+    U block[2]; block[0].i64 = x; block[1].i64 = 0;
+    __asm__ __volatile__(
+       "ldr x13,[%0,#0];  ucvtf d18,x13,#32;  str d18, [%0,#8]"
+-      ::"r"(&block[0]) : "memory", "x13","q18");
++      ::"r"(&block[0]) : "memory", "x13","v18");
+    return block[1].d64;
+ }
+ __attribute__((noinline)) double do_ucvtf_d_x_imm64 ( Long x )
+@@ -58,7 +58,7 @@ __attribute__((noinline)) double do_ucvt
+    U block[2]; block[0].i64 = x; block[1].i64 = 0;
+    __asm__ __volatile__(
+       "ldr x13,[%0,#0];  ucvtf d18,x13,#64;  str d18, [%0,#8]"
+-      ::"r"(&block[0]) : "memory", "x13","q18");
++      ::"r"(&block[0]) : "memory", "x13","v18");
+    return block[1].d64;
+ }
+ 
+@@ -70,7 +70,7 @@ __attribute__((noinline)) double do_scvt
+    U block[2]; block[0].i64 = (Long)x; block[1].i64 = 0;
+    __asm__ __volatile__(
+       "ldr x13,[%0,#0];  scvtf d18,w13,#1;  str d18, [%0,#8]"
+-      ::"r"(&block[0]) : "memory", "x13","q18");
++      ::"r"(&block[0]) : "memory", "x13","v18");
+    return block[1].d64;
+ }
+ __attribute__((noinline)) double do_scvtf_d_w_imm16 ( Int x )
+@@ -78,7 +78,7 @@ __attribute__((noinline)) double do_scvt
+    U block[2]; block[0].i64 = (Long)x; block[1].i64 = 0;
+    __asm__ __volatile__(
+       "ldr x13,[%0,#0];  scvtf d18,w13,#16;  str d18, [%0,#8]"
+-      ::"r"(&block[0]) : "memory", "x13","q18");
++      ::"r"(&block[0]) : "memory", "x13","v18");
+    return block[1].d64;
+ }
+ __attribute__((noinline)) double do_scvtf_d_w_imm32 ( Int x )
+@@ -86,7 +86,7 @@ __attribute__((noinline)) double do_scvt
+    U block[2]; block[0].i64 = (Long)x; block[1].i64 = 0;
+    __asm__ __volatile__(
+       "ldr x13,[%0,#0];  scvtf d18,w13,#32;  str d18, [%0,#8]"
+-      ::"r"(&block[0]) : "memory", "x13","q18");
++      ::"r"(&block[0]) : "memory", "x13","v18");
+    return block[1].d64;
+ }
+ 
+@@ -95,7 +95,7 @@ __attribute__((noinline)) double do_ucvt
+    U block[2]; block[0].i64 = (Long)x; block[1].i64 = 0;
+    __asm__ __volatile__(
+       "ldr x13,[%0,#0];  ucvtf d18,w13,#1;  str d18, [%0,#8]"
+-      ::"r"(&block[0]) : "memory", "x13","q18");
++      ::"r"(&block[0]) : "memory", "x13","v18");
+    return block[1].d64;
+ }
+ __attribute__((noinline)) double do_ucvtf_d_w_imm16 ( Int x )
+@@ -103,7 +103,7 @@ __attribute__((noinline)) double do_ucvt
+    U block[2]; block[0].i64 = (Long)x; block[1].i64 = 0;
+    __asm__ __volatile__(
+       "ldr x13,[%0,#0];  ucvtf d18,w13,#16;  str d18, [%0,#8]"
+-      ::"r"(&block[0]) : "memory", "x13","q18");
++      ::"r"(&block[0]) : "memory", "x13","v18");
+    return block[1].d64;
+ }
+ __attribute__((noinline)) double do_ucvtf_d_w_imm32 ( Int x )
+@@ -111,7 +111,7 @@ __attribute__((noinline)) double do_ucvt
+    U block[2]; block[0].i64 = (Long)x; block[1].i64 = 0;
+    __asm__ __volatile__(
+       "ldr x13,[%0,#0];  ucvtf d18,w13,#32;  str d18, [%0,#8]"
+-      ::"r"(&block[0]) : "memory", "x13","q18");
++      ::"r"(&block[0]) : "memory", "x13","v18");
+    return block[1].d64;
+ }
+ 
+@@ -123,7 +123,7 @@ __attribute__((noinline)) double do_scvt
+    U block[2]; block[0].i64 = x; block[1].i64 = 0;
+    __asm__ __volatile__(
+       "ldr x13,[%0,#0];  scvtf s18,x13,#1;  str s18, [%0,#8]"
+-      ::"r"(&block[0]) : "memory", "x13","q18");
++      ::"r"(&block[0]) : "memory", "x13","v18");
+    return (double)block[1].f32[0];
+ }
+ __attribute__((noinline)) double do_scvtf_s_x_imm32 ( Long x )
+@@ -131,7 +131,7 @@ __attribute__((noinline)) double do_scvt
+    U block[2]; block[0].i64 = x; block[1].i64 = 0;
+    __asm__ __volatile__(
+       "ldr x13,[%0,#0];  scvtf s18,x13,#32;  str s18, [%0,#8]"
+-      ::"r"(&block[0]) : "memory", "x13","q18");
++      ::"r"(&block[0]) : "memory", "x13","v18");
+    return (double)block[1].f32[0];
+ }
+ __attribute__((noinline)) double do_scvtf_s_x_imm64 ( Long x )
+@@ -139,7 +139,7 @@ __attribute__((noinline)) double do_scvt
+    U block[2]; block[0].i64 = x; block[1].i64 = 0;
+    __asm__ __volatile__(
+       "ldr x13,[%0,#0];  scvtf s18,x13,#64;  str s18, [%0,#8]"
+-      ::"r"(&block[0]) : "memory", "x13","q18");
++      ::"r"(&block[0]) : "memory", "x13","v18");
+    return (double)block[1].f32[0];
+ }
+ 
+@@ -148,7 +148,7 @@ __attribute__((noinline)) double do_ucvt
+    U block[2]; block[0].i64 = x; block[1].i64 = 0;
+    __asm__ __volatile__(
+       "ldr x13,[%0,#0];  ucvtf s18,x13,#1;  str s18, [%0,#8]"
+-      ::"r"(&block[0]) : "memory", "x13","q18");
++      ::"r"(&block[0]) : "memory", "x13","v18");
+    return (double)block[1].f32[0];
+ }
+ __attribute__((noinline)) double do_ucvtf_s_x_imm32 ( Long x )
+@@ -156,7 +156,7 @@ __attribute__((noinline)) double do_ucvt
+    U block[2]; block[0].i64 = x; block[1].i64 = 0;
+    __asm__ __volatile__(
+       "ldr x13,[%0,#0];  ucvtf s18,x13,#32;  str s18, [%0,#8]"
+-      ::"r"(&block[0]) : "memory", "x13","q18");
++      ::"r"(&block[0]) : "memory", "x13","v18");
+    return (double)block[1].f32[0];
+ }
+ __attribute__((noinline)) double do_ucvtf_s_x_imm64 ( Long x )
+@@ -164,7 +164,7 @@ __attribute__((noinline)) double do_ucvt
+    U block[2]; block[0].i64 = x; block[1].i64 = 0;
+    __asm__ __volatile__(
+       "ldr x13,[%0,#0];  ucvtf s18,x13,#64;  str s18, [%0,#8]"
+-      ::"r"(&block[0]) : "memory", "x13","q18");
++      ::"r"(&block[0]) : "memory", "x13","v18");
+    return (double)block[1].f32[0];
+ }
+ 
+@@ -176,7 +176,7 @@ __attribute__((noinline)) double do_scvt
+    U block[2]; block[0].i64 = (Long)x; block[1].i64 = 0;
+    __asm__ __volatile__(
+       "ldr x13,[%0,#0];  scvtf s18,w13,#1;  str s18, [%0,#8]"
+-      ::"r"(&block[0]) : "memory", "x13","q18");
++      ::"r"(&block[0]) : "memory", "x13","v18");
+    return (double)block[1].f32[0];
+ }
+ __attribute__((noinline)) double do_scvtf_s_w_imm16 ( Int x )
+@@ -184,7 +184,7 @@ __attribute__((noinline)) double do_scvt
+    U block[2]; block[0].i64 = (Long)x; block[1].i64 = 0;
+    __asm__ __volatile__(
+       "ldr x13,[%0,#0];  scvtf s18,w13,#16;  str s18, [%0,#8]"
+-      ::"r"(&block[0]) : "memory", "x13","q18");
++      ::"r"(&block[0]) : "memory", "x13","v18");
+    return (double)block[1].f32[0];
+ }
+ __attribute__((noinline)) double do_scvtf_s_w_imm32 ( Int x )
+@@ -192,7 +192,7 @@ __attribute__((noinline)) double do_scvt
+    U block[2]; block[0].i64 = (Long)x; block[1].i64 = 0;
+    __asm__ __volatile__(
+       "ldr x13,[%0,#0];  scvtf s18,w13,#32;  str s18, [%0,#8]"
+-      ::"r"(&block[0]) : "memory", "x13","q18");
++      ::"r"(&block[0]) : "memory", "x13","v18");
+    return (double)block[1].f32[0];
+ }
+ 
+@@ -201,7 +201,7 @@ __attribute__((noinline)) double do_ucvt
+    U block[2]; block[0].i64 = (Long)x; block[1].i64 = 0;
+    __asm__ __volatile__(
+       "ldr x13,[%0,#0];  ucvtf s18,w13,#1;  str s18, [%0,#8]"
+-      ::"r"(&block[0]) : "memory", "x13","q18");
++      ::"r"(&block[0]) : "memory", "x13","v18");
+    return (double)block[1].f32[0];
+ }
+ __attribute__((noinline)) double do_ucvtf_s_w_imm16 ( Int x )
+@@ -209,7 +209,7 @@ __attribute__((noinline)) double do_ucvt
+    U block[2]; block[0].i64 = (Long)x; block[1].i64 = 0;
+    __asm__ __volatile__(
+       "ldr x13,[%0,#0];  ucvtf s18,w13,#16;  str s18, [%0,#8]"
+-      ::"r"(&block[0]) : "memory", "x13","q18");
++      ::"r"(&block[0]) : "memory", "x13","v18");
+    return (double)block[1].f32[0];
+ }
+ __attribute__((noinline)) double do_ucvtf_s_w_imm32 ( Int x )
+@@ -217,7 +217,7 @@ __attribute__((noinline)) double do_ucvt
+    U block[2]; block[0].i64 = (Long)x; block[1].i64 = 0;
+    __asm__ __volatile__(
+       "ldr x13,[%0,#0];  ucvtf s18,w13,#32;  str s18, [%0,#8]"
+-      ::"r"(&block[0]) : "memory", "x13","q18");
++      ::"r"(&block[0]) : "memory", "x13","v18");
+    return (double)block[1].f32[0];
+ }
+ 
+diff -up valgrind-3.15.0/none/tests/arm64/fp_and_simd.c.omv~ valgrind-3.15.0/none/tests/arm64/fp_and_simd.c
+--- valgrind-3.15.0/none/tests/arm64/fp_and_simd.c.omv~ 2021-05-31 15:45:55.963884114 +0200
++++ valgrind-3.15.0/none/tests/arm64/fp_and_simd.c      2021-05-31 16:07:36.437096320 +0200
+@@ -1909,7 +1909,7 @@ void test_SMAXV ( void )
+      __asm__ __volatile__( \
+         "ldr x9,  [%0, 48];  msr nzcv, x9; " \
+         "ldr q29, [%0, #0];  ldr q11, [%0, #16];  ldr q9, [%0, #32]; " \
+-        "fcmp d29, #0; " \
++        "fcmp d29, #0.0; " \
+         "mrs x9, nzcv; str x9, [%0, 48]; " \
+         "str q29, [%0, #0];  str q11, [%0, #16];  str q9, [%0, #32]; " \
+         ::"r"(&block[0]) : "x9","cc","memory","v9","v11","v29" \
+@@ -1930,7 +1930,7 @@ void test_SMAXV ( void )
+      __asm__ __volatile__( \
+         "ldr x9,  [%0, 48];  msr nzcv, x9; " \
+         "ldr q29, [%0, #0];  ldr q11, [%0, #16];  ldr q9, [%0, #32]; " \
+-        "fcmp s29, #0; " \
++        "fcmp s29, #0.0; " \
+         "mrs x9, nzcv; str x9, [%0, 48]; " \
+         "str q29, [%0, #0];  str q11, [%0, #16];  str q9, [%0, #32]; " \
+         ::"r"(&block[0]) : "x9","cc","memory","v9","v11","v29" \
+@@ -1951,7 +1951,7 @@ void test_SMAXV ( void )
+      __asm__ __volatile__( \
+         "ldr x9,  [%0, 48];  msr nzcv, x9; " \
+         "ldr q29, [%0, #0];  ldr q11, [%0, #16];  ldr q9, [%0, #32]; " \
+-        "fcmpe d29, #0; " \
++        "fcmpe d29, #0.0; " \
+         "mrs x9, nzcv; str x9, [%0, 48]; " \
+         "str q29, [%0, #0];  str q11, [%0, #16];  str q9, [%0, #32]; " \
+         ::"r"(&block[0]) : "x9","cc","memory","v9","v11","v29" \
+@@ -1972,7 +1972,7 @@ void test_SMAXV ( void )
+      __asm__ __volatile__( \
+         "ldr x9,  [%0, 48];  msr nzcv, x9; " \
+         "ldr q29, [%0, #0];  ldr q11, [%0, #16];  ldr q9, [%0, #32]; " \
+-        "fcmpe s29, #0; " \
++        "fcmpe s29, #0.0; " \
+         "mrs x9, nzcv; str x9, [%0, 48]; " \
+         "str q29, [%0, #0];  str q11, [%0, #16];  str q9, [%0, #32]; " \
+         ::"r"(&block[0]) : "x9","cc","memory","v9","v11","v29" \
+@@ -3054,8 +3054,8 @@ GEN_BINARY_TEST(mul, 16b, 16b, 16b)
+ GEN_BINARY_TEST(mul, 8b, 8b, 8b)
+ 
+ /* overkill -- don't need two vecs, only one */
+-GEN_TWOVEC_TEST(movi_16b_0x9C_lsl0, "movi v22.16b, #0x9C, LSL #0", 22, 23)
+-GEN_TWOVEC_TEST(movi_8b_0x8B_lsl0,  "movi v22.8b,  #0x8B, LSL #0", 22, 23)
++GEN_TWOVEC_TEST(movi_16b_0x9C_lsl0, "movi v22.16b, #0x9C", 22, 23)
++GEN_TWOVEC_TEST(movi_8b_0x8B_lsl0,  "movi v22.8b,  #0x8B", 22, 23)
+ 
+ GEN_TWOVEC_TEST(movi_8h_0x5A_lsl0,  "movi v22.8h,  #0x5A, LSL #0", 22, 23)
+ GEN_TWOVEC_TEST(movi_8h_0xA5_lsl8,  "movi v22.8h,  #0xA5, LSL #8", 22, 23)
+diff -up valgrind-3.15.0/none/tests/arm64/integer.c.omv~ valgrind-3.15.0/none/tests/arm64/integer.c
+--- valgrind-3.15.0/none/tests/arm64/integer.c.omv~     2021-05-31 16:37:19.140073620 +0200
++++ valgrind-3.15.0/none/tests/arm64/integer.c  2021-05-31 16:47:04.202303084 +0200
+@@ -9354,23 +9354,23 @@ printf("ADD/SUB(extended reg)(64)\n");
+ #define NN8 0x2e10f2a4055bec0e
+ #define NN9 0x77f3b8dcc730b96a
+ 
+-TESTINST3("add x21,x22,x23,uxtb #0", NN0, NN1, x21,x22,x23,0);
+-TESTINST3("add x21,x22,x23,uxtb #1", NN2, NN3, x21,x22,x23,0);
+-TESTINST3("add x21,x22,x23,uxtb #2", NN4, NN5, x21,x22,x23,0);
+-TESTINST3("add x21,x22,x23,uxtb #3", NN6, NN7, x21,x22,x23,0);
+-TESTINST3("add x21,x22,x23,uxtb #4", NN8, NN9, x21,x22,x23,0);
+-
+-TESTINST3("add x21,x22,x23,uxth #0", NN0, NN1, x21,x22,x23,0);
+-TESTINST3("add x21,x22,x23,uxth #1", NN2, NN3, x21,x22,x23,0);
+-TESTINST3("add x21,x22,x23,uxth #2", NN4, NN5, x21,x22,x23,0);
+-TESTINST3("add x21,x22,x23,uxth #3", NN6, NN7, x21,x22,x23,0);
+-TESTINST3("add x21,x22,x23,uxth #4", NN8, NN9, x21,x22,x23,0);
+-
+-TESTINST3("add x21,x22,x23,uxtw #0", NN0, NN1, x21,x22,x23,0);
+-TESTINST3("add x21,x22,x23,uxtw #1", NN2, NN3, x21,x22,x23,0);
+-TESTINST3("add x21,x22,x23,uxtw #2", NN4, NN5, x21,x22,x23,0);
+-TESTINST3("add x21,x22,x23,uxtw #3", NN6, NN7, x21,x22,x23,0);
+-TESTINST3("add x21,x22,x23,uxtw #4", NN8, NN9, x21,x22,x23,0);
++TESTINST3("add x21,x22,w23,uxtb #0", NN0, NN1, x21,x22,x23,0);
++TESTINST3("add x21,x22,w23,uxtb #1", NN2, NN3, x21,x22,x23,0);
++TESTINST3("add x21,x22,w23,uxtb #2", NN4, NN5, x21,x22,x23,0);
++TESTINST3("add x21,x22,w23,uxtb #3", NN6, NN7, x21,x22,x23,0);
++TESTINST3("add x21,x22,w23,uxtb #4", NN8, NN9, x21,x22,x23,0);
++
++TESTINST3("add x21,x22,w23,uxth #0", NN0, NN1, x21,x22,x23,0);
++TESTINST3("add x21,x22,w23,uxth #1", NN2, NN3, x21,x22,x23,0);
++TESTINST3("add x21,x22,w23,uxth #2", NN4, NN5, x21,x22,x23,0);
++TESTINST3("add x21,x22,w23,uxth #3", NN6, NN7, x21,x22,x23,0);
++TESTINST3("add x21,x22,w23,uxth #4", NN8, NN9, x21,x22,x23,0);
++
++TESTINST3("add x21,x22,w23,uxtw #0", NN0, NN1, x21,x22,x23,0);
++TESTINST3("add x21,x22,w23,uxtw #1", NN2, NN3, x21,x22,x23,0);
++TESTINST3("add x21,x22,w23,uxtw #2", NN4, NN5, x21,x22,x23,0);
++TESTINST3("add x21,x22,w23,uxtw #3", NN6, NN7, x21,x22,x23,0);
++TESTINST3("add x21,x22,w23,uxtw #4", NN8, NN9, x21,x22,x23,0);
+ 
+ TESTINST3("add x21,x22,x23,uxtx #0", NN0, NN1, x21,x22,x23,0);
+ TESTINST3("add x21,x22,x23,uxtx #1", NN2, NN3, x21,x22,x23,0);
+@@ -9378,23 +9378,23 @@ TESTINST3("add x21,x22,x23,uxtx #2", NN4
+ TESTINST3("add x21,x22,x23,uxtx #3", NN6, NN7, x21,x22,x23,0);
+ TESTINST3("add x21,x22,x23,uxtx #4", NN8, NN9, x21,x22,x23,0);
+ 
+-TESTINST3("add x21,x22,x23,sxtb #0", NN0, NN1, x21,x22,x23,0);
+-TESTINST3("add x21,x22,x23,sxtb #1", NN2, NN3, x21,x22,x23,0);
+-TESTINST3("add x21,x22,x23,sxtb #2", NN4, NN5, x21,x22,x23,0);
+-TESTINST3("add x21,x22,x23,sxtb #3", NN6, NN7, x21,x22,x23,0);
+-TESTINST3("add x21,x22,x23,sxtb #4", NN8, NN9, x21,x22,x23,0);
+-
+-TESTINST3("add x21,x22,x23,sxth #0", NN0, NN1, x21,x22,x23,0);
+-TESTINST3("add x21,x22,x23,sxth #1", NN2, NN3, x21,x22,x23,0);
+-TESTINST3("add x21,x22,x23,sxth #2", NN4, NN5, x21,x22,x23,0);
+-TESTINST3("add x21,x22,x23,sxth #3", NN6, NN7, x21,x22,x23,0);
+-TESTINST3("add x21,x22,x23,sxth #4", NN8, NN9, x21,x22,x23,0);
+-
+-TESTINST3("add x21,x22,x23,sxtw #0", NN0, NN1, x21,x22,x23,0);
+-TESTINST3("add x21,x22,x23,sxtw #1", NN2, NN3, x21,x22,x23,0);
+-TESTINST3("add x21,x22,x23,sxtw #2", NN4, NN5, x21,x22,x23,0);
+-TESTINST3("add x21,x22,x23,sxtw #3", NN6, NN7, x21,x22,x23,0);
+-TESTINST3("add x21,x22,x23,sxtw #4", NN8, NN9, x21,x22,x23,0);
++TESTINST3("add x21,x22,w23,sxtb #0", NN0, NN1, x21,x22,x23,0);
++TESTINST3("add x21,x22,w23,sxtb #1", NN2, NN3, x21,x22,x23,0);
++TESTINST3("add x21,x22,w23,sxtb #2", NN4, NN5, x21,x22,x23,0);
++TESTINST3("add x21,x22,w23,sxtb #3", NN6, NN7, x21,x22,x23,0);
++TESTINST3("add x21,x22,w23,sxtb #4", NN8, NN9, x21,x22,x23,0);
++
++TESTINST3("add x21,x22,w23,sxth #0", NN0, NN1, x21,x22,x23,0);
++TESTINST3("add x21,x22,w23,sxth #1", NN2, NN3, x21,x22,x23,0);
++TESTINST3("add x21,x22,w23,sxth #2", NN4, NN5, x21,x22,x23,0);
++TESTINST3("add x21,x22,w23,sxth #3", NN6, NN7, x21,x22,x23,0);
++TESTINST3("add x21,x22,w23,sxth #4", NN8, NN9, x21,x22,x23,0);
++
++TESTINST3("add x21,x22,w23,sxtw #0", NN0, NN1, x21,x22,x23,0);
++TESTINST3("add x21,x22,w23,sxtw #1", NN2, NN3, x21,x22,x23,0);
++TESTINST3("add x21,x22,w23,sxtw #2", NN4, NN5, x21,x22,x23,0);
++TESTINST3("add x21,x22,w23,sxtw #3", NN6, NN7, x21,x22,x23,0);
++TESTINST3("add x21,x22,w23,sxtw #4", NN8, NN9, x21,x22,x23,0);
+ 
+ TESTINST3("add x21,x22,x23,sxtx #0", NN0, NN1, x21,x22,x23,0);
+ TESTINST3("add x21,x22,x23,sxtx #1", NN2, NN3, x21,x22,x23,0);
+@@ -9403,72 +9403,72 @@ TESTINST3("add x21,x22,x23,sxtx #3", NN6
+ TESTINST3("add x21,x22,x23,sxtx #4", NN8, NN9, x21,x22,x23,0);
+ 
+ 
+-TESTINST3("adds x21,x22,x23,uxtb #0", NN0, NN1, x21,x22,x23,0);
+-TESTINST3("adds x21,x22,x23,uxtb #1", NN2, NN3, x21,x22,x23,0);
+-TESTINST3("adds x21,x22,x23,uxtb #2", NN4, NN5, x21,x22,x23,0);
+-TESTINST3("adds x21,x22,x23,uxtb #3", NN6, NN7, x21,x22,x23,0);
+-TESTINST3("adds x21,x22,x23,uxtb #4", NN8, NN9, x21,x22,x23,0);
+-
+-TESTINST3("adds x21,x22,x23,uxth #0", NN0, NN1, x21,x22,x23,0);
+-TESTINST3("adds x21,x22,x23,uxth #1", NN2, NN3, x21,x22,x23,0);
+-TESTINST3("adds x21,x22,x23,uxth #2", NN4, NN5, x21,x22,x23,0);
+-TESTINST3("adds x21,x22,x23,uxth #3", NN6, NN7, x21,x22,x23,0);
+-TESTINST3("adds x21,x22,x23,uxth #4", NN8, NN9, x21,x22,x23,0);
+-
+-TESTINST3("adds x21,x22,x23,uxtw #0", NN0, NN1, x21,x22,x23,0);
+-TESTINST3("adds x21,x22,x23,uxtw #1", NN2, NN3, x21,x22,x23,0);
+-TESTINST3("adds x21,x22,x23,uxtw #2", NN4, NN5, x21,x22,x23,0);
+-TESTINST3("adds x21,x22,x23,uxtw #3", NN6, NN7, x21,x22,x23,0);
+-TESTINST3("adds x21,x22,x23,uxtw #4", NN8, NN9, x21,x22,x23,0);
+-
+-TESTINST3("adds x21,x22,x23,uxtx #0", NN0, NN1, x21,x22,x23,0);
+-TESTINST3("adds x21,x22,x23,uxtx #1", NN2, NN3, x21,x22,x23,0);
+-TESTINST3("adds x21,x22,x23,uxtx #2", NN4, NN5, x21,x22,x23,0);
+-TESTINST3("adds x21,x22,x23,uxtx #3", NN6, NN7, x21,x22,x23,0);
+-TESTINST3("adds x21,x22,x23,uxtx #4", NN8, NN9, x21,x22,x23,0);
+-
+-TESTINST3("adds x21,x22,x23,sxtb #0", NN0, NN1, x21,x22,x23,0);
+-TESTINST3("adds x21,x22,x23,sxtb #1", NN2, NN3, x21,x22,x23,0);
+-TESTINST3("adds x21,x22,x23,sxtb #2", NN4, NN5, x21,x22,x23,0);
+-TESTINST3("adds x21,x22,x23,sxtb #3", NN6, NN7, x21,x22,x23,0);
+-TESTINST3("adds x21,x22,x23,sxtb #4", NN8, NN9, x21,x22,x23,0);
+-
+-TESTINST3("adds x21,x22,x23,sxth #0", NN0, NN1, x21,x22,x23,0);
+-TESTINST3("adds x21,x22,x23,sxth #1", NN2, NN3, x21,x22,x23,0);
+-TESTINST3("adds x21,x22,x23,sxth #2", NN4, NN5, x21,x22,x23,0);
+-TESTINST3("adds x21,x22,x23,sxth #3", NN6, NN7, x21,x22,x23,0);
+-TESTINST3("adds x21,x22,x23,sxth #4", NN8, NN9, x21,x22,x23,0);
+-
+-TESTINST3("adds x21,x22,x23,sxtw #0", NN0, NN1, x21,x22,x23,0);
+-TESTINST3("adds x21,x22,x23,sxtw #1", NN2, NN3, x21,x22,x23,0);
+-TESTINST3("adds x21,x22,x23,sxtw #2", NN4, NN5, x21,x22,x23,0);
+-TESTINST3("adds x21,x22,x23,sxtw #3", NN6, NN7, x21,x22,x23,0);
+-TESTINST3("adds x21,x22,x23,sxtw #4", NN8, NN9, x21,x22,x23,0);
+-
+-TESTINST3("adds x21,x22,x23,sxtx #0", NN0, NN1, x21,x22,x23,0);
+-TESTINST3("adds x21,x22,x23,sxtx #1", NN2, NN3, x21,x22,x23,0);
+-TESTINST3("adds x21,x22,x23,sxtx #2", NN4, NN5, x21,x22,x23,0);
+-TESTINST3("adds x21,x22,x23,sxtx #3", NN6, NN7, x21,x22,x23,0);
+-TESTINST3("adds x21,x22,x23,sxtx #4", NN8, NN9, x21,x22,x23,0);
+-
+-
+-TESTINST3("sub x21,x22,x23,uxtb #0", NN0, NN1, x21,x22,x23,0);
+-TESTINST3("sub x21,x22,x23,uxtb #1", NN2, NN3, x21,x22,x23,0);
+-TESTINST3("sub x21,x22,x23,uxtb #2", NN4, NN5, x21,x22,x23,0);
+-TESTINST3("sub x21,x22,x23,uxtb #3", NN6, NN7, x21,x22,x23,0);
+-TESTINST3("sub x21,x22,x23,uxtb #4", NN8, NN9, x21,x22,x23,0);
+-
+-TESTINST3("sub x21,x22,x23,uxth #0", NN0, NN1, x21,x22,x23,0);
+-TESTINST3("sub x21,x22,x23,uxth #1", NN2, NN3, x21,x22,x23,0);
+-TESTINST3("sub x21,x22,x23,uxth #2", NN4, NN5, x21,x22,x23,0);
+-TESTINST3("sub x21,x22,x23,uxth #3", NN6, NN7, x21,x22,x23,0);
+-TESTINST3("sub x21,x22,x23,uxth #4", NN8, NN9, x21,x22,x23,0);
+-
+-TESTINST3("sub x21,x22,x23,uxtw #0", NN0, NN1, x21,x22,x23,0);
+-TESTINST3("sub x21,x22,x23,uxtw #1", NN2, NN3, x21,x22,x23,0);
+-TESTINST3("sub x21,x22,x23,uxtw #2", NN4, NN5, x21,x22,x23,0);
+-TESTINST3("sub x21,x22,x23,uxtw #3", NN6, NN7, x21,x22,x23,0);
+-TESTINST3("sub x21,x22,x23,uxtw #4", NN8, NN9, x21,x22,x23,0);
++TESTINST3("adds x21,x22,w23,uxtb #0", NN0, NN1, x21,x22,x23,0);
++TESTINST3("adds x21,x22,w23,uxtb #1", NN2, NN3, x21,x22,x23,0);
++TESTINST3("adds x21,x22,w23,uxtb #2", NN4, NN5, x21,x22,x23,0);
++TESTINST3("adds x21,x22,w23,uxtb #3", NN6, NN7, x21,x22,x23,0);
++TESTINST3("adds x21,x22,w23,uxtb #4", NN8, NN9, x21,x22,x23,0);
++
++TESTINST3("adds x21,x22,w23,uxth #0", NN0, NN1, x21,x22,x23,0);
++TESTINST3("adds x21,x22,w23,uxth #1", NN2, NN3, x21,x22,x23,0);
++TESTINST3("adds x21,x22,w23,uxth #2", NN4, NN5, x21,x22,x23,0);
++TESTINST3("adds x21,x22,w23,uxth #3", NN6, NN7, x21,x22,x23,0);
++TESTINST3("adds x21,x22,w23,uxth #4", NN8, NN9, x21,x22,x23,0);
++
++TESTINST3("adds x21,x22,w23,uxtw #0", NN0, NN1, x21,x22,x23,0);
++TESTINST3("adds x21,x22,w23,uxtw #1", NN2, NN3, x21,x22,x23,0);
++TESTINST3("adds x21,x22,w23,uxtw #2", NN4, NN5, x21,x22,x23,0);
++TESTINST3("adds x21,x22,w23,uxtw #3", NN6, NN7, x21,x22,x23,0);
++TESTINST3("adds x21,x22,w23,uxtw #4", NN8, NN9, x21,x22,x23,0);
++
++TESTINST3("adds x21,x22,w23,uxtx #0", NN0, NN1, x21,x22,x23,0);
++TESTINST3("adds x21,x22,w23,uxtx #1", NN2, NN3, x21,x22,x23,0);
++TESTINST3("adds x21,x22,w23,uxtx #2", NN4, NN5, x21,x22,x23,0);
++TESTINST3("adds x21,x22,w23,uxtx #3", NN6, NN7, x21,x22,x23,0);
++TESTINST3("adds x21,x22,w23,uxtx #4", NN8, NN9, x21,x22,x23,0);
++
++TESTINST3("adds x21,x22,w23,sxtb #0", NN0, NN1, x21,x22,x23,0);
++TESTINST3("adds x21,x22,w23,sxtb #1", NN2, NN3, x21,x22,x23,0);
++TESTINST3("adds x21,x22,w23,sxtb #2", NN4, NN5, x21,x22,x23,0);
++TESTINST3("adds x21,x22,w23,sxtb #3", NN6, NN7, x21,x22,x23,0);
++TESTINST3("adds x21,x22,w23,sxtb #4", NN8, NN9, x21,x22,x23,0);
++
++TESTINST3("adds x21,x22,w23,sxth #0", NN0, NN1, x21,x22,x23,0);
++TESTINST3("adds x21,x22,w23,sxth #1", NN2, NN3, x21,x22,x23,0);
++TESTINST3("adds x21,x22,w23,sxth #2", NN4, NN5, x21,x22,x23,0);
++TESTINST3("adds x21,x22,w23,sxth #3", NN6, NN7, x21,x22,x23,0);
++TESTINST3("adds x21,x22,w23,sxth #4", NN8, NN9, x21,x22,x23,0);
++
++TESTINST3("adds x21,x22,w23,sxtw #0", NN0, NN1, x21,x22,x23,0);
++TESTINST3("adds x21,x22,w23,sxtw #1", NN2, NN3, x21,x22,x23,0);
++TESTINST3("adds x21,x22,w23,sxtw #2", NN4, NN5, x21,x22,x23,0);
++TESTINST3("adds x21,x22,w23,sxtw #3", NN6, NN7, x21,x22,x23,0);
++TESTINST3("adds x21,x22,w23,sxtw #4", NN8, NN9, x21,x22,x23,0);
++
++TESTINST3("adds x21,x22,w23,sxtx #0", NN0, NN1, x21,x22,x23,0);
++TESTINST3("adds x21,x22,w23,sxtx #1", NN2, NN3, x21,x22,x23,0);
++TESTINST3("adds x21,x22,w23,sxtx #2", NN4, NN5, x21,x22,x23,0);
++TESTINST3("adds x21,x22,w23,sxtx #3", NN6, NN7, x21,x22,x23,0);
++TESTINST3("adds x21,x22,w23,sxtx #4", NN8, NN9, x21,x22,x23,0);
++
++
++TESTINST3("sub x21,x22,w23,uxtb #0", NN0, NN1, x21,x22,x23,0);
++TESTINST3("sub x21,x22,w23,uxtb #1", NN2, NN3, x21,x22,x23,0);
++TESTINST3("sub x21,x22,w23,uxtb #2", NN4, NN5, x21,x22,x23,0);
++TESTINST3("sub x21,x22,w23,uxtb #3", NN6, NN7, x21,x22,x23,0);
++TESTINST3("sub x21,x22,w23,uxtb #4", NN8, NN9, x21,x22,x23,0);
++
++TESTINST3("sub x21,x22,w23,uxth #0", NN0, NN1, x21,x22,x23,0);
++TESTINST3("sub x21,x22,w23,uxth #1", NN2, NN3, x21,x22,x23,0);
++TESTINST3("sub x21,x22,w23,uxth #2", NN4, NN5, x21,x22,x23,0);
++TESTINST3("sub x21,x22,w23,uxth #3", NN6, NN7, x21,x22,x23,0);
++TESTINST3("sub x21,x22,w23,uxth #4", NN8, NN9, x21,x22,x23,0);
++
++TESTINST3("sub x21,x22,w23,uxtw #0", NN0, NN1, x21,x22,x23,0);
++TESTINST3("sub x21,x22,w23,uxtw #1", NN2, NN3, x21,x22,x23,0);
++TESTINST3("sub x21,x22,w23,uxtw #2", NN4, NN5, x21,x22,x23,0);
++TESTINST3("sub x21,x22,w23,uxtw #3", NN6, NN7, x21,x22,x23,0);
++TESTINST3("sub x21,x22,w23,uxtw #4", NN8, NN9, x21,x22,x23,0);
+ 
+ TESTINST3("sub x21,x22,x23,uxtx #0", NN0, NN1, x21,x22,x23,0);
+ TESTINST3("sub x21,x22,x23,uxtx #1", NN2, NN3, x21,x22,x23,0);
+@@ -9476,23 +9476,23 @@ TESTINST3("sub x21,x22,x23,uxtx #2", NN4
+ TESTINST3("sub x21,x22,x23,uxtx #3", NN6, NN7, x21,x22,x23,0);
+ TESTINST3("sub x21,x22,x23,uxtx #4", NN8, NN9, x21,x22,x23,0);
+ 
+-TESTINST3("sub x21,x22,x23,sxtb #0", NN0, NN1, x21,x22,x23,0);
+-TESTINST3("sub x21,x22,x23,sxtb #1", NN2, NN3, x21,x22,x23,0);
+-TESTINST3("sub x21,x22,x23,sxtb #2", NN4, NN5, x21,x22,x23,0);
+-TESTINST3("sub x21,x22,x23,sxtb #3", NN6, NN7, x21,x22,x23,0);
+-TESTINST3("sub x21,x22,x23,sxtb #4", NN8, NN9, x21,x22,x23,0);
+-
+-TESTINST3("sub x21,x22,x23,sxth #0", NN0, NN1, x21,x22,x23,0);
+-TESTINST3("sub x21,x22,x23,sxth #1", NN2, NN3, x21,x22,x23,0);
+-TESTINST3("sub x21,x22,x23,sxth #2", NN4, NN5, x21,x22,x23,0);
+-TESTINST3("sub x21,x22,x23,sxth #3", NN6, NN7, x21,x22,x23,0);
+-TESTINST3("sub x21,x22,x23,sxth #4", NN8, NN9, x21,x22,x23,0);
+-
+-TESTINST3("sub x21,x22,x23,sxtw #0", NN0, NN1, x21,x22,x23,0);
+-TESTINST3("sub x21,x22,x23,sxtw #1", NN2, NN3, x21,x22,x23,0);
+-TESTINST3("sub x21,x22,x23,sxtw #2", NN4, NN5, x21,x22,x23,0);
+-TESTINST3("sub x21,x22,x23,sxtw #3", NN6, NN7, x21,x22,x23,0);
+-TESTINST3("sub x21,x22,x23,sxtw #4", NN8, NN9, x21,x22,x23,0);
++TESTINST3("sub x21,x22,w23,sxtb #0", NN0, NN1, x21,x22,x23,0);
++TESTINST3("sub x21,x22,w23,sxtb #1", NN2, NN3, x21,x22,x23,0);
++TESTINST3("sub x21,x22,w23,sxtb #2", NN4, NN5, x21,x22,x23,0);
++TESTINST3("sub x21,x22,w23,sxtb #3", NN6, NN7, x21,x22,x23,0);
++TESTINST3("sub x21,x22,w23,sxtb #4", NN8, NN9, x21,x22,x23,0);
++
++TESTINST3("sub x21,x22,w23,sxth #0", NN0, NN1, x21,x22,x23,0);
++TESTINST3("sub x21,x22,w23,sxth #1", NN2, NN3, x21,x22,x23,0);
++TESTINST3("sub x21,x22,w23,sxth #2", NN4, NN5, x21,x22,x23,0);
++TESTINST3("sub x21,x22,w23,sxth #3", NN6, NN7, x21,x22,x23,0);
++TESTINST3("sub x21,x22,w23,sxth #4", NN8, NN9, x21,x22,x23,0);
++
++TESTINST3("sub x21,x22,w23,sxtw #0", NN0, NN1, x21,x22,x23,0);
++TESTINST3("sub x21,x22,w23,sxtw #1", NN2, NN3, x21,x22,x23,0);
++TESTINST3("sub x21,x22,w23,sxtw #2", NN4, NN5, x21,x22,x23,0);
++TESTINST3("sub x21,x22,w23,sxtw #3", NN6, NN7, x21,x22,x23,0);
++TESTINST3("sub x21,x22,w23,sxtw #4", NN8, NN9, x21,x22,x23,0);
+ 
+ TESTINST3("sub x21,x22,x23,sxtx #0", NN0, NN1, x21,x22,x23,0);
+ TESTINST3("sub x21,x22,x23,sxtx #1", NN2, NN3, x21,x22,x23,0);
+@@ -9501,53 +9501,53 @@ TESTINST3("sub x21,x22,x23,sxtx #3", NN6
+ TESTINST3("sub x21,x22,x23,sxtx #4", NN8, NN9, x21,x22,x23,0);
+ 
+ 
+-TESTINST3("subs x21,x22,x23,uxtb #0", NN0, NN1, x21,x22,x23,0);
+-TESTINST3("subs x21,x22,x23,uxtb #1", NN2, NN3, x21,x22,x23,0);
+-TESTINST3("subs x21,x22,x23,uxtb #2", NN4, NN5, x21,x22,x23,0);
+-TESTINST3("subs x21,x22,x23,uxtb #3", NN6, NN7, x21,x22,x23,0);
+-TESTINST3("subs x21,x22,x23,uxtb #4", NN8, NN9, x21,x22,x23,0);
+-
+-TESTINST3("subs x21,x22,x23,uxth #0", NN0, NN1, x21,x22,x23,0);
+-TESTINST3("subs x21,x22,x23,uxth #1", NN2, NN3, x21,x22,x23,0);
+-TESTINST3("subs x21,x22,x23,uxth #2", NN4, NN5, x21,x22,x23,0);
+-TESTINST3("subs x21,x22,x23,uxth #3", NN6, NN7, x21,x22,x23,0);
+-TESTINST3("subs x21,x22,x23,uxth #4", NN8, NN9, x21,x22,x23,0);
+-
+-TESTINST3("subs x21,x22,x23,uxtw #0", NN0, NN1, x21,x22,x23,0);
+-TESTINST3("subs x21,x22,x23,uxtw #1", NN2, NN3, x21,x22,x23,0);
+-TESTINST3("subs x21,x22,x23,uxtw #2", NN4, NN5, x21,x22,x23,0);
+-TESTINST3("subs x21,x22,x23,uxtw #3", NN6, NN7, x21,x22,x23,0);
+-TESTINST3("subs x21,x22,x23,uxtw #4", NN8, NN9, x21,x22,x23,0);
+-
+-TESTINST3("subs x21,x22,x23,uxtx #0", NN0, NN1, x21,x22,x23,0);
+-TESTINST3("subs x21,x22,x23,uxtx #1", NN2, NN3, x21,x22,x23,0);
+-TESTINST3("subs x21,x22,x23,uxtx #2", NN4, NN5, x21,x22,x23,0);
+-TESTINST3("subs x21,x22,x23,uxtx #3", NN6, NN7, x21,x22,x23,0);
+-TESTINST3("subs x21,x22,x23,uxtx #4", NN8, NN9, x21,x22,x23,0);
+-
+-TESTINST3("subs x21,x22,x23,sxtb #0", NN0, NN1, x21,x22,x23,0);
+-TESTINST3("subs x21,x22,x23,sxtb #1", NN2, NN3, x21,x22,x23,0);
+-TESTINST3("subs x21,x22,x23,sxtb #2", NN4, NN5, x21,x22,x23,0);
+-TESTINST3("subs x21,x22,x23,sxtb #3", NN6, NN7, x21,x22,x23,0);
+-TESTINST3("subs x21,x22,x23,sxtb #4", NN8, NN9, x21,x22,x23,0);
+-
+-TESTINST3("subs x21,x22,x23,sxth #0", NN0, NN1, x21,x22,x23,0);
+-TESTINST3("subs x21,x22,x23,sxth #1", NN2, NN3, x21,x22,x23,0);
+-TESTINST3("subs x21,x22,x23,sxth #2", NN4, NN5, x21,x22,x23,0);
+-TESTINST3("subs x21,x22,x23,sxth #3", NN6, NN7, x21,x22,x23,0);
+-TESTINST3("subs x21,x22,x23,sxth #4", NN8, NN9, x21,x22,x23,0);
+-
+-TESTINST3("subs x21,x22,x23,sxtw #0", NN0, NN1, x21,x22,x23,0);
+-TESTINST3("subs x21,x22,x23,sxtw #1", NN2, NN3, x21,x22,x23,0);
+-TESTINST3("subs x21,x22,x23,sxtw #2", NN4, NN5, x21,x22,x23,0);
+-TESTINST3("subs x21,x22,x23,sxtw #3", NN6, NN7, x21,x22,x23,0);
+-TESTINST3("subs x21,x22,x23,sxtw #4", NN8, NN9, x21,x22,x23,0);
+-
+-TESTINST3("subs x21,x22,x23,sxtx #0", NN0, NN1, x21,x22,x23,0);
+-TESTINST3("subs x21,x22,x23,sxtx #1", NN2, NN3, x21,x22,x23,0);
+-TESTINST3("subs x21,x22,x23,sxtx #2", NN4, NN5, x21,x22,x23,0);
+-TESTINST3("subs x21,x22,x23,sxtx #3", NN6, NN7, x21,x22,x23,0);
+-TESTINST3("subs x21,x22,x23,sxtx #4", NN8, NN9, x21,x22,x23,0);
++TESTINST3("subs x21,x22,w23,uxtb #0", NN0, NN1, x21,x22,x23,0);
++TESTINST3("subs x21,x22,w23,uxtb #1", NN2, NN3, x21,x22,x23,0);
++TESTINST3("subs x21,x22,w23,uxtb #2", NN4, NN5, x21,x22,x23,0);
++TESTINST3("subs x21,x22,w23,uxtb #3", NN6, NN7, x21,x22,x23,0);
++TESTINST3("subs x21,x22,w23,uxtb #4", NN8, NN9, x21,x22,x23,0);
++
++TESTINST3("subs x21,x22,w23,uxth #0", NN0, NN1, x21,x22,x23,0);
++TESTINST3("subs x21,x22,w23,uxth #1", NN2, NN3, x21,x22,x23,0);
++TESTINST3("subs x21,x22,w23,uxth #2", NN4, NN5, x21,x22,x23,0);
++TESTINST3("subs x21,x22,w23,uxth #3", NN6, NN7, x21,x22,x23,0);
++TESTINST3("subs x21,x22,w23,uxth #4", NN8, NN9, x21,x22,x23,0);
++
++TESTINST3("subs x21,x22,w23,uxtw #0", NN0, NN1, x21,x22,x23,0);
++TESTINST3("subs x21,x22,w23,uxtw #1", NN2, NN3, x21,x22,x23,0);
++TESTINST3("subs x21,x22,w23,uxtw #2", NN4, NN5, x21,x22,x23,0);
++TESTINST3("subs x21,x22,w23,uxtw #3", NN6, NN7, x21,x22,x23,0);
++TESTINST3("subs x21,x22,w23,uxtw #4", NN8, NN9, x21,x22,x23,0);
++
++TESTINST3("subs x21,x22,w23,uxtx #0", NN0, NN1, x21,x22,x23,0);
++TESTINST3("subs x21,x22,w23,uxtx #1", NN2, NN3, x21,x22,x23,0);
++TESTINST3("subs x21,x22,w23,uxtx #2", NN4, NN5, x21,x22,x23,0);
++TESTINST3("subs x21,x22,w23,uxtx #3", NN6, NN7, x21,x22,x23,0);
++TESTINST3("subs x21,x22,w23,uxtx #4", NN8, NN9, x21,x22,x23,0);
++
++TESTINST3("subs x21,x22,w23,sxtb #0", NN0, NN1, x21,x22,x23,0);
++TESTINST3("subs x21,x22,w23,sxtb #1", NN2, NN3, x21,x22,x23,0);
++TESTINST3("subs x21,x22,w23,sxtb #2", NN4, NN5, x21,x22,x23,0);
++TESTINST3("subs x21,x22,w23,sxtb #3", NN6, NN7, x21,x22,x23,0);
++TESTINST3("subs x21,x22,w23,sxtb #4", NN8, NN9, x21,x22,x23,0);
++
++TESTINST3("subs x21,x22,w23,sxth #0", NN0, NN1, x21,x22,x23,0);
++TESTINST3("subs x21,x22,w23,sxth #1", NN2, NN3, x21,x22,x23,0);
++TESTINST3("subs x21,x22,w23,sxth #2", NN4, NN5, x21,x22,x23,0);
++TESTINST3("subs x21,x22,w23,sxth #3", NN6, NN7, x21,x22,x23,0);
++TESTINST3("subs x21,x22,w23,sxth #4", NN8, NN9, x21,x22,x23,0);
++
++TESTINST3("subs x21,x22,w23,sxtw #0", NN0, NN1, x21,x22,x23,0);
++TESTINST3("subs x21,x22,w23,sxtw #1", NN2, NN3, x21,x22,x23,0);
++TESTINST3("subs x21,x22,w23,sxtw #2", NN4, NN5, x21,x22,x23,0);
++TESTINST3("subs x21,x22,w23,sxtw #3", NN6, NN7, x21,x22,x23,0);
++TESTINST3("subs x21,x22,w23,sxtw #4", NN8, NN9, x21,x22,x23,0);
++
++TESTINST3("subs x21,x22,w23,sxtx #0", NN0, NN1, x21,x22,x23,0);
++TESTINST3("subs x21,x22,w23,sxtx #1", NN2, NN3, x21,x22,x23,0);
++TESTINST3("subs x21,x22,w23,sxtx #2", NN4, NN5, x21,x22,x23,0);
++TESTINST3("subs x21,x22,w23,sxtx #3", NN6, NN7, x21,x22,x23,0);
++TESTINST3("subs x21,x22,w23,sxtx #4", NN8, NN9, x21,x22,x23,0);
+ 
+ 
+ ////////////////////////////////////////////////////////////////
diff --git a/recipes-devtools/valgrind/valgrind/builtin_setjmp.patch b/recipes-devtools/valgrind/valgrind/builtin_setjmp.patch
new file mode 100644
index 0000000..daa22da
--- /dev/null
+++ b/recipes-devtools/valgrind/valgrind/builtin_setjmp.patch
@@ -0,0 +1,116 @@
+Author: Bernhard Rosenkraenzer <bernhard.rosenkraenzer.ext@huawei.com>
+
+Implement VG_MINIMAL_SETJMP in inline assembly for OHOS/arm64
+
+Signed-off-by: Bernhard Rosenkraenzer <bernhard.rosenkraenzer.ext@huawei.com>
+Upstream-Status: Pending
+
+Based on patch from Android NDK:
+
+commit cebc9a058d2048e8233ee3eeb510e19b8772909f
+Author: Benoit Jacob <benoitjacob@google.com>
+Date:   Wed May 29 21:15:53 2019 -0400
+
+    Implement VG_MINIMAL_SETJMP in inline assembly on Android/arm64
+    because __builtin_setjmp is not implemented in current clang
+    toolchains in current Android NDK.
+
+diff --git a/include/pub_tool_libcsetjmp.h b/include/pub_tool_libcsetjmp.h
+index 681450cef..ccdf295df 100644
+--- a/include/pub_tool_libcsetjmp.h
++++ b/include/pub_tool_libcsetjmp.h
+@@ -126,6 +126,93 @@ UWord VG_MINIMAL_SETJMP(VG_MINIMAL_JMP_BUF(_env));
+ __attribute__((noreturn))
+ void  VG_MINIMAL_LONGJMP(VG_MINIMAL_JMP_BUF(_env));
+ 
++#elif defined __aarch64__
++
++// __builtin_setjmp is not implemented by the standard C library
++// used on Android in current llvm-based toolchains as of NDK r19.
++//
++// Here is a custom implementation of Valgrind's "minimal" setjmp
++// interface. Per the comment at the top of this file, we only need
++// to save integer registers.
++//
++// Per the Procedure Call Standard for the ARM 64-bit Architecture
++// document,
++// http://infocenter.arm.com/help/topic/com.arm.doc.ihi0055b/IHI0055B_aapcs64.pdf
++// Section 5.1.1. General-purpose registers:
++// >
++// > A subroutine invocation must preserve the contents of the
++// > registers r19-r29 and SP."
++//
++// We also need to save and restore r30, the link register, i.e.
++// the default destination that a 'ret' instruction branches to.
++//
++// Note that this document is phrased in terms of 'r' registers
++// (e.g. "r30") because it aims to be agnostic as to A64 vs A32
++// instruction sets, but here we are targeting the A64 instruction
++// set, so we are dealing with 'x' registers.
++
++
++#define VG_MINIMAL_JMP_BUF(_name)        UWord _name [13]
++
++__attribute__((returns_twice))
++inline UWord VG_MINIMAL_SETJMP(VG_MINIMAL_JMP_BUF(_env))
++{
++   asm volatile(
++     // x9 is the first of the regular temporary registers
++     // per the above-mentioned Procedule Call Standard document.
++     // Use it as temporary to hold the value of SP, since str does
++     // not accept SP as operand.
++     "  mov x9, sp                     \n"
++     // Store the general-purpose registers that we need to save
++     // per the above discussion.
++     // Note that x30 is the link register.
++     "  stp x19, x20, [%[_env], 0]     \n"
++     "  stp x21, x22, [%[_env], 0x10]  \n"
++     "  stp x23, x24, [%[_env], 0x20]  \n"
++     "  stp x25, x26, [%[_env], 0x30]  \n"
++     "  stp x27, x28, [%[_env], 0x40]  \n"
++     "  stp x29, x30, [%[_env], 0x50]  \n"
++     // Store the value of SP.
++     "  str x9,       [%[_env], 0x60]  \n"
++     :
++     // No outputs
++     :
++     // Inputs
++     [_env]"r"(_env)
++     :
++     // Clobbers.
++     // We have used x9 as a temporary
++     "x9",
++     // We have written to memory locations
++     "memory");
++
++  // Direct invokation of setjmp always returns 0.
++  // The pseudo returning of the value 1 as a return from longjmp
++  // is implemented in longjmp.
++  return 0;
++}
++
++#define VG_MINIMAL_LONGJMP(x) \
++{ \
++   asm volatile( \
++     "  ldp x19, x20, [%[_env], 0]     \n" \
++     "  ldp x21, x22, [%[_env], 0x10]  \n" \
++     "  ldp x23, x24, [%[_env], 0x20]  \n" \
++     "  ldp x25, x26, [%[_env], 0x30]  \n" \
++     "  ldp x27, x28, [%[_env], 0x40]  \n" \
++     "  ldp x29, x30, [%[_env], 0x50]  \n" \
++     "  ldr x9,       [%[_env], 0x60]  \n" \
++     "  mov sp, x9                     \n" \
++     "  mov x0, 1                      \n" \
++     "  ret                            \n" \
++     : \
++     : \
++     [_env]"r"(x) \
++     : \
++     "x9"); \
++  __builtin_unreachable(); \
++}
++
+ #else
+ 
+ /* The default implementation. */
+
diff --git a/recipes-devtools/valgrind/valgrind_%.bbappend b/recipes-devtools/valgrind/valgrind_%.bbappend
new file mode 100644
index 0000000..2138014
--- /dev/null
+++ b/recipes-devtools/valgrind/valgrind_%.bbappend
@@ -0,0 +1,3 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+SRC_URI_append = " file://builtin_setjmp.patch \
+        file://aarch64-inline-asm-clang.patch"
diff --git a/recipes-extended/logrotate/logrotate/logrotate-3.15.1-fno-common.patch b/recipes-extended/logrotate/logrotate/logrotate-3.15.1-fno-common.patch
new file mode 100644
index 0000000..a5bb8de
--- /dev/null
+++ b/recipes-extended/logrotate/logrotate/logrotate-3.15.1-fno-common.patch
@@ -0,0 +1,30 @@
+This patch fixes building logrotate 3.15.1 with modern compilers
+that default to -fno-common (such as clang >= 10, gcc >= 10)
+
+Signed-off-by: Bernhard Rosenkraenzer <bernhard.rosenkraenzer.ext@huawei.com>
+
+diff -up logrotate-3.15.1/logrotate.h.omv~ logrotate-3.15.1/logrotate.h
+--- logrotate-3.15.1/logrotate.h.omv~   2021-03-18 13:48:57.662529086 +0100
++++ logrotate-3.15.1/logrotate.h        2021-03-18 13:49:28.983736070 +0100
+@@ -89,7 +89,8 @@ struct logInfo {
+     TAILQ_ENTRY(logInfo) list;
+ };
+ 
+-TAILQ_HEAD(logInfoHead, logInfo) logs;
++TAILQ_HEAD(logInfoHead, logInfo);
++extern struct logInfoHead logs;
+ 
+ extern int numLogs;
+ extern int debug;
+diff -up logrotate-3.15.1/config.c.omv~ logrotate-3.15.1/config.c
+--- logrotate-3.15.1/config.c.omv~      2021-03-18 18:22:09.897571389 +0100
++++ logrotate-3.15.1/config.c   2021-03-18 18:22:24.023660076 +0100
+@@ -32,6 +32,8 @@
+ #include "log.h"
+ #include "logrotate.h"
+ 
++struct logInfoHead logs;
++
+ #if !defined(GLOB_ABORTED) && defined(GLOB_ABEND)
+ #define GLOB_ABORTED GLOB_ABEND
+ #endif
diff --git a/recipes-extended/logrotate/logrotate_%.bbappend b/recipes-extended/logrotate/logrotate_%.bbappend
new file mode 100644
index 0000000..884c4df
--- /dev/null
+++ b/recipes-extended/logrotate/logrotate_%.bbappend
@@ -0,0 +1,2 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+SRC_URI_append = " file://logrotate-3.15.1-fno-common.patch"
diff --git a/recipes-extended/ltp/ltp_%.bbappend b/recipes-extended/ltp/ltp_%.bbappend
new file mode 100644
index 0000000..e9ff911
--- /dev/null
+++ b/recipes-extended/ltp/ltp_%.bbappend
@@ -0,0 +1,4 @@
+# Old versions of ltp assume the compiler defaults to -fcommon
+# This can be removed when moving to a newer version of ltp.
+# The fix is also needed when building with gcc >= 10.
+CFLAGS_append = " -fcommon"
diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend
index ce9c2fa..ddf5305 100644
--- a/recipes-graphics/mesa/mesa_%.bbappend
+++ b/recipes-graphics/mesa/mesa_%.bbappend
@@ -6,5 +6,4 @@ EXTRA_OEMASON_append_toolchain-clang_x86-64 = " -Dasm=false"
 
 export YOCTO_ALTERNATE_EXE_PATH = "${STAGING_LIBDIR}/llvm-config"
 
-PACKAGECONFIG[gallium-llvm] = "-Dllvm=true -Dshared-llvm=true, -Dllvm=false, clang clang-native \
-${@'elfutils' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}"
+PACKAGECONFIG[gallium-llvm] = "-Dllvm=true -Dshared-llvm=true, -Dllvm=false, clang clang-native elfutils"
diff --git a/recipes-kernel/lttng/babeltrace2/babeltrace2-2.0.2-fix-reserved-keywords.patch b/recipes-kernel/lttng/babeltrace2/babeltrace2-2.0.2-fix-reserved-keywords.patch
new file mode 100644
index 0000000..43461fe
--- /dev/null
+++ b/recipes-kernel/lttng/babeltrace2/babeltrace2-2.0.2-fix-reserved-keywords.patch
@@ -0,0 +1,31 @@
+From 790d3e55982df7b21caea7eff97dbd0ebce4f8cd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bernhard=20Rosenkr=C3=A4nzer?= <bero@lindev.ch>
+Date: Wed, 26 May 2021 05:06:55 +0200
+Subject: [PATCH] ctf-writer: Fix list of reserved keywords
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The missing comma between "void" and "_Bool" causes the compiler to
+treat it as one string ("void_Bool"), missing both "void" and "_Bool"
+as real reserved keywords.
+
+Signed-off-by: Bernhard Rosenkränzer <bero@lindev.ch>
+Upstream-Status: Submitted [https://github.com/efficios/babeltrace/pull/117]
+---
+ src/ctf-writer/utils.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ctf-writer/utils.c b/src/ctf-writer/utils.c
+index 0cfb5742b..6c4b0ed8f 100644
+--- a/src/ctf-writer/utils.c
++++ b/src/ctf-writer/utils.c
+@@ -25,7 +25,7 @@ const char * const reserved_keywords_str[] = {"align", "callsite",
+        "const", "char", "clock", "double", "enum", "env", "event",
+        "floating_point", "float", "integer", "int", "long", "short", "signed",
+        "stream", "string", "struct", "trace", "typealias", "typedef",
+-       "unsigned", "variant", "void" "_Bool", "_Complex", "_Imaginary"};
++       "unsigned", "variant", "void", "_Bool", "_Complex", "_Imaginary"};
+ 
+ static GHashTable *reserved_keywords_set;
+ static int init_done;
diff --git a/recipes-kernel/lttng/babeltrace2_%.bbappend b/recipes-kernel/lttng/babeltrace2_%.bbappend
new file mode 100644
index 0000000..3f2f08b
--- /dev/null
+++ b/recipes-kernel/lttng/babeltrace2_%.bbappend
@@ -0,0 +1,2 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+SRC_URI_append = " file://babeltrace2-2.0.2-fix-reserved-keywords.patch"