clang: Update to latest on 13.x release

bump minor release to 13.0.1
Drop patch to remove git from PACKAGE_VERSION, this is already
eliminated from upstream

Following changes are part of this change

  * 08e3a5ccd952 [IntelJITListener] Fix order in JitListener/multiple.ll
  * 26e2c97bf14c [openmp] [elf_common] Fix linking against LLVM dylib
  * eb845520ac3c compiler-rt: Fix arch detection for ppc64le
  * ec4829efcc94 fixes bug #51926 where dangling comma caused overrun
  * 73daeb3d507f [CUDA] Make sure <string.h> is included with original __THROW defined.
  * 3ee9a2b63cfd [Support][mips] Remove unnecessary includes from Memory.inc
  * 47f53eec6485 [Mips] Add glue between CopyFromReg, CopyToReg and RDHWR nodes for TLS
  * 914355ee793c [CMake] Re-enable use --gc-sections on OpenBSD
  * 2ac023cd540a [clang] Omit most AttributedStatements from the CFG
  * 30c05f43b662 [runtimes] Properly handle the sysroot/triple/gcc-toolchain
  * a797306b7721 [clang-format] [PR51640] - New AfterEnum brace wrapping changes have cause C# behaviour to change
  * 0a5ae011cd23 [HIP] Fix test rcom-detect.hip
  * 1a40203f8e94 workflows: Update lldb workaround to latest version of Mac OS X
  * 8a93745a7121 Remove "In Progress" text from release notes
  * 449f3049b507 [GHA] Cancel intermediate builds on PRs
  * cf15ccdeb6d5 Bump version to 13.0.1
  * fd1d8c2f04dd [cte] Release notes for clangd-13

Signed-off-by: Khem Raj <raj.khem@gmail.com>

40 files changed, 57 insertions, 154 deletions

diff --git a/conf/layer.conf b/conf/layer.conf
index 122cfbe..76fb244 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -31,7 +31,7 @@ INHERIT += "clang"
 # Do not include clang in SDK unless user wants to
 CLANGSDK ??= "0"
 
-LLVMVERSION = "13.0.0"
+LLVMVERSION = "13.0.1"
 
 require conf/nonclangable.conf
 require conf/nonscanable.conf
diff --git a/recipes-devtools/clang/clang.inc b/recipes-devtools/clang/clang.inc
index f45d3c9..3293e1f 100644
--- a/recipes-devtools/clang/clang.inc
+++ b/recipes-devtools/clang/clang.inc
@@ -6,9 +6,9 @@ LLVM_GIT_PROTOCOL ?= "https"
 
 MAJOR_VER = "13"
 MINOR_VER = "0"
-PATCH_VER = "0"
+PATCH_VER = "1"
 
-SRCREV ?= "d7b669b3a30345cfcdb2fde2af6f48aa4b94845d"
+SRCREV ?= "08e3a5ccd952edee36b3c002e3a29c6b1b5153de"
 
 PV = "${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}"
 BRANCH = "release/13.x"
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 03cdf13..999bc5e 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 8b3176b08a055a24ea139573b9811658fe4e753c Mon Sep 17 00:00:00 2001
+From 1b71b8fb344a065903ac2fc5b7680e99742be721 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
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 1013fa2..0829f18 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 99f413f6e186984945d2b06887b04719f8b592c5 Mon Sep 17 00:00:00 2001
+From 581275e8e40784c6a3f30e69bb5cc7513fe3b475 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 9fb35860d483..971629d81dbe 100644
+index f3060a5d1f93..bca2178f3203 100644
 --- a/libcxxabi/CMakeLists.txt
 +++ b/libcxxabi/CMakeLists.txt
-@@ -510,14 +510,9 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${LIBCXXABI_C_FLAGS}")
+@@ -511,14 +511,9 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${LIBCXXABI_C_FLAGS}")
  # Setup Source Code
  #===============================================================================
  
@@ -36,7 +36,7 @@ index 9fb35860d483..971629d81dbe 100644
      PATHS ${LIBCXXABI_LIBUNWIND_INCLUDES}
            ${LIBCXXABI_LIBUNWIND_PATH}/include
            ${CMAKE_BINARY_DIR}/${LIBCXXABI_LIBUNWIND_INCLUDES}
-@@ -528,15 +523,21 @@ if (LIBCXXABI_USE_LLVM_UNWINDER OR LLVM_NATIVE_ARCH MATCHES ARM)
+@@ -529,15 +524,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 944effd..10124a6 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 bc650811b01223a3414803a681d9cc702e913667 Mon Sep 17 00:00:00 2001
+From f02e1904c58e43119ba49c9c8f5831b47e5d6ebe 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
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 d52945d..5717dce 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 efe92b1ce720b6fc28653dcec6f1661cc2e28602 Mon Sep 17 00:00:00 2001
+From 02d7443ec851ccdd64953ec49b12018c1f66a292 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
diff --git a/recipes-devtools/clang/clang/0005-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch b/recipes-devtools/clang/clang/0005-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch
index 9dfd5ef..6d58e94 100644
--- a/recipes-devtools/clang/clang/0005-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch
+++ b/recipes-devtools/clang/clang/0005-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch
@@ -1,4 +1,4 @@
-From 41ffac4cc1d19f415c432c273ccaae37c2e09562 Mon Sep 17 00:00:00 2001
+From 57cc5e82da381cc6a69376dcf9398caa82a59648 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
diff --git a/recipes-devtools/clang/clang/0006-llvm-allow-env-override-of-exe-path.patch b/recipes-devtools/clang/clang/0006-llvm-allow-env-override-of-exe-path.patch
index cbedd9c..9923b54 100644
--- a/recipes-devtools/clang/clang/0006-llvm-allow-env-override-of-exe-path.patch
+++ b/recipes-devtools/clang/clang/0006-llvm-allow-env-override-of-exe-path.patch
@@ -1,4 +1,4 @@
-From 4b513bf033833ebcd1cbd341ea2f8ecda6cdf22f Mon Sep 17 00:00:00 2001
+From 5d8ea7590df4cb9d1973a137ddf260e1df137010 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
diff --git a/recipes-devtools/clang/clang/0007-clang-driver-Check-sysroot-for-ldso-path.patch b/recipes-devtools/clang/clang/0007-clang-driver-Check-sysroot-for-ldso-path.patch
index 814ffa7..61d4761 100644
--- a/recipes-devtools/clang/clang/0007-clang-driver-Check-sysroot-for-ldso-path.patch
+++ b/recipes-devtools/clang/clang/0007-clang-driver-Check-sysroot-for-ldso-path.patch
@@ -1,4 +1,4 @@
-From f497114b87d7bcd6977d25435caeb3aee305932c Mon Sep 17 00:00:00 2001
+From 964f0d68fe16e003c42c75ebfc17fbd01676f652 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
diff --git a/recipes-devtools/clang/clang/0008-clang-Driver-tools.cpp-Add-lssp_nonshared-on-musl.patch b/recipes-devtools/clang/clang/0008-clang-Driver-tools.cpp-Add-lssp_nonshared-on-musl.patch
index 4f356e5..2c29869 100644
--- a/recipes-devtools/clang/clang/0008-clang-Driver-tools.cpp-Add-lssp_nonshared-on-musl.patch
+++ b/recipes-devtools/clang/clang/0008-clang-Driver-tools.cpp-Add-lssp_nonshared-on-musl.patch
@@ -1,4 +1,4 @@
-From d46fbb73eb8a9f80e8963a9a5878f8f3ae909b88 Mon Sep 17 00:00:00 2001
+From 7cf3b10fa0664d856d65ac0ad991e1875ac28be5 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
diff --git a/recipes-devtools/clang/clang/0009-clang-musl-ppc-does-not-support-128-bit-long-double.patch b/recipes-devtools/clang/clang/0009-clang-musl-ppc-does-not-support-128-bit-long-double.patch
index eb875fc..81d18dd 100644
--- a/recipes-devtools/clang/clang/0009-clang-musl-ppc-does-not-support-128-bit-long-double.patch
+++ b/recipes-devtools/clang/clang/0009-clang-musl-ppc-does-not-support-128-bit-long-double.patch
@@ -1,4 +1,4 @@
-From 7370800ae29490b222cf35d6c1fb294d1f280be5 Mon Sep 17 00:00:00 2001
+From db02270329248b6af2e174f12532245eb7f6aaa0 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
diff --git a/recipes-devtools/clang/clang/0010-clang-Prepend-trailing-to-sysroot.patch b/recipes-devtools/clang/clang/0010-clang-Prepend-trailing-to-sysroot.patch
index 563690f..964ecdb 100644
--- a/recipes-devtools/clang/clang/0010-clang-Prepend-trailing-to-sysroot.patch
+++ b/recipes-devtools/clang/clang/0010-clang-Prepend-trailing-to-sysroot.patch
@@ -1,4 +1,4 @@
-From 325b576c6429cf0ce727ddae4959d6eb5c1c8c44 Mon Sep 17 00:00:00 2001
+From 9a6c282dd14e88b477593a185822635fee21330e 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
diff --git a/recipes-devtools/clang/clang/0011-clang-Look-inside-the-target-sysroot-for-compiler-ru.patch b/recipes-devtools/clang/clang/0011-clang-Look-inside-the-target-sysroot-for-compiler-ru.patch
index a1e3ba1..fefa00c 100644
--- a/recipes-devtools/clang/clang/0011-clang-Look-inside-the-target-sysroot-for-compiler-ru.patch
+++ b/recipes-devtools/clang/clang/0011-clang-Look-inside-the-target-sysroot-for-compiler-ru.patch
@@ -1,4 +1,4 @@
-From ddd3e53d43af3a935266e801ab872fd9f513afd3 Mon Sep 17 00:00:00 2001
+From c85d06487d397894aa0fd14ff210789b453d78fc 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
diff --git a/recipes-devtools/clang/clang/0012-clang-Define-releative-gcc-installation-dir.patch b/recipes-devtools/clang/clang/0012-clang-Define-releative-gcc-installation-dir.patch
index 4467f4c..d1a572e 100644
--- a/recipes-devtools/clang/clang/0012-clang-Define-releative-gcc-installation-dir.patch
+++ b/recipes-devtools/clang/clang/0012-clang-Define-releative-gcc-installation-dir.patch
@@ -1,4 +1,4 @@
-From 40e7f980b21498f2716a50b8833480d3b66d68dd Mon Sep 17 00:00:00 2001
+From 71e923b1d1b611ce3a4ae2a08408059a0162b99f Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 20 Mar 2021 16:09:16 -0700
 Subject: [PATCH] clang: Define / releative gcc installation dir
diff --git a/recipes-devtools/clang/clang/0013-clang-Add-lpthread-and-ldl-along-with-lunwind-for-st.patch b/recipes-devtools/clang/clang/0013-clang-Add-lpthread-and-ldl-along-with-lunwind-for-st.patch
index 81bf66f..baa612c 100644
--- a/recipes-devtools/clang/clang/0013-clang-Add-lpthread-and-ldl-along-with-lunwind-for-st.patch
+++ b/recipes-devtools/clang/clang/0013-clang-Add-lpthread-and-ldl-along-with-lunwind-for-st.patch
@@ -1,4 +1,4 @@
-From 1634a9346565ff133cdc74141cfa6c2460ec86a3 Mon Sep 17 00:00:00 2001
+From f033f7183eb509f3b99d8f197eb5d5159f961c0b 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,10 +20,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 2 insertions(+)
 
 diff --git a/clang/lib/Driver/ToolChains/CommonArgs.cpp b/clang/lib/Driver/ToolChains/CommonArgs.cpp
-index 83cab3ac00cb..367e8603ff70 100644
+index 0ffe95795381..358eb98cf528 100644
 --- a/clang/lib/Driver/ToolChains/CommonArgs.cpp
 +++ b/clang/lib/Driver/ToolChains/CommonArgs.cpp
-@@ -1449,6 +1449,8 @@ static void AddUnwindLibrary(const ToolChain &TC, const Driver &D,
+@@ -1450,6 +1450,8 @@ static void AddUnwindLibrary(const ToolChain &TC, const Driver &D,
          CmdArgs.push_back("-lunwind");
      } else if (LGT == LibGccType::StaticLibGcc) {
        CmdArgs.push_back("-l:libunwind.a");
diff --git a/recipes-devtools/clang/clang/0014-Pass-PYTHON_EXECUTABLE-when-cross-compiling-for-nati.patch b/recipes-devtools/clang/clang/0014-Pass-PYTHON_EXECUTABLE-when-cross-compiling-for-nati.patch
index 63551f5..e6998fb 100644
--- a/recipes-devtools/clang/clang/0014-Pass-PYTHON_EXECUTABLE-when-cross-compiling-for-nati.patch
+++ b/recipes-devtools/clang/clang/0014-Pass-PYTHON_EXECUTABLE-when-cross-compiling-for-nati.patch
@@ -1,4 +1,4 @@
-From 2dc51ab94f34186bc4010aa4aced1107b7bcf9d0 Mon Sep 17 00:00:00 2001
+From 6e6960945953dead105f229da0cd34d860ebfe6c 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
diff --git a/recipes-devtools/clang/clang/0015-Check-for-atomic-double-intrinsics.patch b/recipes-devtools/clang/clang/0015-Check-for-atomic-double-intrinsics.patch
index 420d668..04e8abc 100644
--- a/recipes-devtools/clang/clang/0015-Check-for-atomic-double-intrinsics.patch
+++ b/recipes-devtools/clang/clang/0015-Check-for-atomic-double-intrinsics.patch
@@ -1,4 +1,4 @@
-From fcbcc842fb332137484b97247a06c33428f8d9eb Mon Sep 17 00:00:00 2001
+From 806b95e07916c0647957e7ed1ee1d4d6bcf55bc9 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
diff --git a/recipes-devtools/clang/clang/0016-clang-Enable-SSP-and-PIE-by-default.patch b/recipes-devtools/clang/clang/0016-clang-Enable-SSP-and-PIE-by-default.patch
index d4fe8cb..e1e7cbf 100644
--- a/recipes-devtools/clang/clang/0016-clang-Enable-SSP-and-PIE-by-default.patch
+++ b/recipes-devtools/clang/clang/0016-clang-Enable-SSP-and-PIE-by-default.patch
@@ -1,4 +1,4 @@
-From 3b9e71add277ac2e23f57e839b486c1b69162a52 Mon Sep 17 00:00:00 2001
+From 64d8a913cfee1e8d0cf4019a18ead5edaadb6303 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
diff --git a/recipes-devtools/clang/clang/0017-libcxx-Add-compiler-runtime-library-to-link-step-for.patch b/recipes-devtools/clang/clang/0017-libcxx-Add-compiler-runtime-library-to-link-step-for.patch
index 1d2d8ea..e089ebb 100644
--- a/recipes-devtools/clang/clang/0017-libcxx-Add-compiler-runtime-library-to-link-step-for.patch
+++ b/recipes-devtools/clang/clang/0017-libcxx-Add-compiler-runtime-library-to-link-step-for.patch
@@ -1,4 +1,4 @@
-From 8c753b4791fb7f736c06218b059377e680c80c88 Mon Sep 17 00:00:00 2001
+From ddbda1f2de59192ff883ba49c68dfac8e2fb98b3 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
diff --git a/recipes-devtools/clang/clang/0018-clang-llvm-cmake-Fix-configure-for-packages-using-fi.patch b/recipes-devtools/clang/clang/0018-clang-llvm-cmake-Fix-configure-for-packages-using-fi.patch
index e1f86d4..1c342c6 100644
--- a/recipes-devtools/clang/clang/0018-clang-llvm-cmake-Fix-configure-for-packages-using-fi.patch
+++ b/recipes-devtools/clang/clang/0018-clang-llvm-cmake-Fix-configure-for-packages-using-fi.patch
@@ -1,4 +1,4 @@
-From 9d505591b46e8a0f37713266efe9ee7a5dd66f41 Mon Sep 17 00:00:00 2001
+From 4c9bb41e62058144e041a0f850a6d2ad5df03e0d 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
@@ -52,10 +52,10 @@ index 5752f4277444..f40ea35faf46 100644
  endmacro()
  
 diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake
-index 3e009f5061d3..1d40ad3e7ecc 100644
+index 5a9480aa6768..0f199f91e67c 100644
 --- a/llvm/cmake/modules/AddLLVM.cmake
 +++ b/llvm/cmake/modules/AddLLVM.cmake
-@@ -1232,7 +1232,6 @@ macro(add_llvm_tool name)
+@@ -1233,7 +1233,6 @@ macro(add_llvm_tool name)
      if( LLVM_BUILD_TOOLS )
        get_target_export_arg(${name} LLVM export_to_llvmexports)
        install(TARGETS ${name}
@@ -63,7 +63,7 @@ index 3e009f5061d3..1d40ad3e7ecc 100644
                RUNTIME DESTINATION ${LLVM_TOOLS_INSTALL_DIR}
                COMPONENT ${name})
  
-@@ -1243,9 +1242,6 @@ macro(add_llvm_tool name)
+@@ -1244,9 +1243,6 @@ macro(add_llvm_tool name)
        endif()
      endif()
    endif()
@@ -73,7 +73,7 @@ index 3e009f5061d3..1d40ad3e7ecc 100644
    set_target_properties(${name} PROPERTIES FOLDER "Tools")
  endmacro(add_llvm_tool name)
  
-@@ -1285,7 +1281,6 @@ macro(add_llvm_utility name)
+@@ -1286,7 +1282,6 @@ macro(add_llvm_utility name)
      if (LLVM_INSTALL_UTILS AND LLVM_BUILD_UTILS)
        get_target_export_arg(${name} LLVM export_to_llvmexports)
        install(TARGETS ${name}
@@ -81,7 +81,7 @@ index 3e009f5061d3..1d40ad3e7ecc 100644
                RUNTIME DESTINATION ${LLVM_UTILS_INSTALL_DIR}
                COMPONENT ${name})
  
-@@ -1294,7 +1289,6 @@ macro(add_llvm_utility name)
+@@ -1295,7 +1290,6 @@ macro(add_llvm_utility name)
                                   DEPENDS ${name}
                                   COMPONENT ${name})
        endif()
diff --git a/recipes-devtools/clang/clang/0019-clang-Fix-resource-dir-location-for-cross-toolchains.patch b/recipes-devtools/clang/clang/0019-clang-Fix-resource-dir-location-for-cross-toolchains.patch
index b91209c..f1cc2a3 100644
--- a/recipes-devtools/clang/clang/0019-clang-Fix-resource-dir-location-for-cross-toolchains.patch
+++ b/recipes-devtools/clang/clang/0019-clang-Fix-resource-dir-location-for-cross-toolchains.patch
@@ -1,4 +1,4 @@
-From 2c3bdfd798dbf7de310252d3af93162784affa49 Mon Sep 17 00:00:00 2001
+From 3bb1761c3685792ccbcb96a9106dab6595ea11d2 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
@@ -19,7 +19,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 7 insertions(+), 1 deletion(-)
 
 diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp
-index 5c323cb6ea23..c3ae820c06ab 100644
+index 94a7553e273b..5b353e6670f0 100644
 --- a/clang/lib/Driver/Driver.cpp
 +++ b/clang/lib/Driver/Driver.cpp
 @@ -122,7 +122,13 @@ std::string Driver::GetResourcesPath(StringRef BinaryPath,
diff --git a/recipes-devtools/clang/clang/0020-fix-path-to-libffi.patch b/recipes-devtools/clang/clang/0020-fix-path-to-libffi.patch
index 2695e22..54c9382 100644
--- a/recipes-devtools/clang/clang/0020-fix-path-to-libffi.patch
+++ b/recipes-devtools/clang/clang/0020-fix-path-to-libffi.patch
@@ -1,4 +1,4 @@
-From eda78e4ad137cd8e27f3a22faa22dc43f408e000 Mon Sep 17 00:00:00 2001
+From 4b2b4a51abcc347176f8c1c6bdfa28e1a2c9e57b 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
diff --git a/recipes-devtools/clang/clang/0021-clang-driver-Add-dyld-prefix-when-checking-sysroot-f.patch b/recipes-devtools/clang/clang/0021-clang-driver-Add-dyld-prefix-when-checking-sysroot-f.patch
index b459b99..5ddc7d6 100644
--- a/recipes-devtools/clang/clang/0021-clang-driver-Add-dyld-prefix-when-checking-sysroot-f.patch
+++ b/recipes-devtools/clang/clang/0021-clang-driver-Add-dyld-prefix-when-checking-sysroot-f.patch
@@ -1,4 +1,4 @@
-From 705f0ac6e987b1c9776012fd933a94b61a25eacd Mon Sep 17 00:00:00 2001
+From 2d6e13dbd89ab50125e86ef8f240e50d0c8dd576 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
diff --git a/recipes-devtools/clang/clang/0022-clang-Use-python3-in-python-scripts.patch b/recipes-devtools/clang/clang/0022-clang-Use-python3-in-python-scripts.patch
index fc9a3e2..ac014b1 100644
--- a/recipes-devtools/clang/clang/0022-clang-Use-python3-in-python-scripts.patch
+++ b/recipes-devtools/clang/clang/0022-clang-Use-python3-in-python-scripts.patch
@@ -1,4 +1,4 @@
-From b3aca4fcbef8ee80cda0305f3682ae99fee56495 Mon Sep 17 00:00:00 2001
+From 40138d88b4371d1e253dc5a86fe517bceba655aa 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
diff --git a/recipes-devtools/clang/clang/0023-For-x86_64-set-Yocto-based-GCC-install-search-path.patch b/recipes-devtools/clang/clang/0023-For-x86_64-set-Yocto-based-GCC-install-search-path.patch
index baf3367..c46e3dd 100644
--- a/recipes-devtools/clang/clang/0023-For-x86_64-set-Yocto-based-GCC-install-search-path.patch
+++ b/recipes-devtools/clang/clang/0023-For-x86_64-set-Yocto-based-GCC-install-search-path.patch
@@ -1,4 +1,4 @@
-From 5d0adaf8fbc52c473134510e1f746468e229e93d Mon Sep 17 00:00:00 2001
+From c23934d24ed6cbb08e3ce6c67c458509c6d46291 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
diff --git a/recipes-devtools/clang/clang/0024-llvm-Do-not-use-find_library-for-ncurses.patch b/recipes-devtools/clang/clang/0024-llvm-Do-not-use-find_library-for-ncurses.patch
index c34c522..caaf668 100644
--- a/recipes-devtools/clang/clang/0024-llvm-Do-not-use-find_library-for-ncurses.patch
+++ b/recipes-devtools/clang/clang/0024-llvm-Do-not-use-find_library-for-ncurses.patch
@@ -1,4 +1,4 @@
-From 46cf43ff4f206adaeeb7022c598bd7a5eef2fd86 Mon Sep 17 00:00:00 2001
+From 5d9680264c351bc98b1ae385f129deef48ed12a1 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
@@ -17,10 +17,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/compiler-rt/cmake/config-ix.cmake b/compiler-rt/cmake/config-ix.cmake
-index 6f13acfa2757..0f269835fd17 100644
+index 39b9120f00ad..8ac28303b8ad 100644
 --- a/compiler-rt/cmake/config-ix.cmake
 +++ b/compiler-rt/cmake/config-ix.cmake
-@@ -140,7 +140,7 @@ else()
+@@ -141,7 +141,7 @@ else()
    set(MAYBE_REQUIRED)
  endif()
  if(LLVM_ENABLE_TERMINFO)
diff --git a/recipes-devtools/clang/clang/0025-llvm-Insert-anchor-for-adding-OE-distro-vendor-names.patch b/recipes-devtools/clang/clang/0025-llvm-Insert-anchor-for-adding-OE-distro-vendor-names.patch
index 8ea914a..baf4f1f 100644
--- a/recipes-devtools/clang/clang/0025-llvm-Insert-anchor-for-adding-OE-distro-vendor-names.patch
+++ b/recipes-devtools/clang/clang/0025-llvm-Insert-anchor-for-adding-OE-distro-vendor-names.patch
@@ -1,4 +1,4 @@
-From 6eae70b44b9e67160891e4206c80b64ab9779dc1 Mon Sep 17 00:00:00 2001
+From 5fd5e653e9662971e62c03353cc7981ab387d5c7 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
diff --git a/recipes-devtools/clang/clang/0026-compiler-rt-Use-mcr-based-barrier-on-armv6.patch b/recipes-devtools/clang/clang/0026-compiler-rt-Use-mcr-based-barrier-on-armv6.patch
index 8ef564f..cb5397c 100644
--- a/recipes-devtools/clang/clang/0026-compiler-rt-Use-mcr-based-barrier-on-armv6.patch
+++ b/recipes-devtools/clang/clang/0026-compiler-rt-Use-mcr-based-barrier-on-armv6.patch
@@ -1,4 +1,4 @@
-From f55aaf7648c036e0206da45254ff9698c4c5e12c Mon Sep 17 00:00:00 2001
+From 9053e875d68b32c56398a1e07c06cc8575ef6533 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
diff --git a/recipes-devtools/clang/clang/0027-clang-Switch-defaults-to-dwarf-5-debug-info-on-Linux.patch b/recipes-devtools/clang/clang/0027-clang-Switch-defaults-to-dwarf-5-debug-info-on-Linux.patch
index be85bd3..af3a940 100644
--- a/recipes-devtools/clang/clang/0027-clang-Switch-defaults-to-dwarf-5-debug-info-on-Linux.patch
+++ b/recipes-devtools/clang/clang/0027-clang-Switch-defaults-to-dwarf-5-debug-info-on-Linux.patch
@@ -1,4 +1,4 @@
-From a88d2df9239ae4acd27ae2fa8097e957c9af82c1 Mon Sep 17 00:00:00 2001
+From e636f163882891bc71e45f6cf4051e9909fe624c 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
diff --git a/recipes-devtools/clang/clang/0028-compiler-rt-Do-not-use-backtrace-APIs-on-non-glibc-l.patch b/recipes-devtools/clang/clang/0028-compiler-rt-Do-not-use-backtrace-APIs-on-non-glibc-l.patch
index 668cbe9..731df51 100644
--- a/recipes-devtools/clang/clang/0028-compiler-rt-Do-not-use-backtrace-APIs-on-non-glibc-l.patch
+++ b/recipes-devtools/clang/clang/0028-compiler-rt-Do-not-use-backtrace-APIs-on-non-glibc-l.patch
@@ -1,4 +1,4 @@
-From 98477da239c066b9630b969c66b6468bbc35a980 Mon Sep 17 00:00:00 2001
+From a1bd4222dea53463bd2c15c6a98842be715a7b8f Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Wed, 19 May 2021 17:32:13 -0700
 Subject: [PATCH] compiler-rt: Do not use backtrace APIs on non-glibc linux
diff --git a/recipes-devtools/clang/clang/0029-clang-Fix-x86-triple-for-non-debian-multiarch-linux-.patch b/recipes-devtools/clang/clang/0029-clang-Fix-x86-triple-for-non-debian-multiarch-linux-.patch
index 0cf9292..d58ea76 100644
--- a/recipes-devtools/clang/clang/0029-clang-Fix-x86-triple-for-non-debian-multiarch-linux-.patch
+++ b/recipes-devtools/clang/clang/0029-clang-Fix-x86-triple-for-non-debian-multiarch-linux-.patch
@@ -1,4 +1,4 @@
-From a7855091d730910093cd3922ec8364b5d7ad9416 Mon Sep 17 00:00:00 2001
+From 24ace165961972b9c228cd580eb5cacfde006c4c Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Wed, 19 May 2021 17:56:03 -0700
 Subject: [PATCH] clang: Fix x86 triple for non-debian multiarch linux distros
diff --git a/recipes-devtools/clang/clang/0030-compiler-rt-Link-scudo-with-SANITIZER_CXX_ABI_LIBRAR.patch b/recipes-devtools/clang/clang/0030-compiler-rt-Link-scudo-with-SANITIZER_CXX_ABI_LIBRAR.patch
index a20cb7f..8c0eaa4 100644
--- a/recipes-devtools/clang/clang/0030-compiler-rt-Link-scudo-with-SANITIZER_CXX_ABI_LIBRAR.patch
+++ b/recipes-devtools/clang/clang/0030-compiler-rt-Link-scudo-with-SANITIZER_CXX_ABI_LIBRAR.patch
@@ -1,4 +1,4 @@
-From a1ef57c134d9a9c8b1914f1d6e462f2cbf47c1ba Mon Sep 17 00:00:00 2001
+From adbadcc16f0dc7c323644bfc2f0e5752644f9e4c Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Wed, 19 May 2021 21:49:18 -0700
 Subject: [PATCH] compiler-rt: Link scudo with SANITIZER_CXX_ABI_LIBRARIES
diff --git a/recipes-devtools/clang/clang/0031-compiler-rt-Link-scudo-standalone-with-libatomic-on-.patch b/recipes-devtools/clang/clang/0031-compiler-rt-Link-scudo-standalone-with-libatomic-on-.patch
index a00853e..94f9272 100644
--- a/recipes-devtools/clang/clang/0031-compiler-rt-Link-scudo-standalone-with-libatomic-on-.patch
+++ b/recipes-devtools/clang/clang/0031-compiler-rt-Link-scudo-standalone-with-libatomic-on-.patch
@@ -1,4 +1,4 @@
-From f94c4a49fecce77c7c217a445e4db0ee840dcdae Mon Sep 17 00:00:00 2001
+From 019c9ff3e7ae0d5710618d1562995359805f9aea Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Fri, 21 May 2021 08:14:29 -0700
 Subject: [PATCH] compiler-rt: Link scudo standalone with libatomic on mips
@@ -13,10 +13,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 4 insertions(+)
 
 diff --git a/compiler-rt/lib/scudo/standalone/CMakeLists.txt b/compiler-rt/lib/scudo/standalone/CMakeLists.txt
-index 8c3708d3a45f..f6687db1a663 100644
+index d6ffa448d7e0..22caf11f6223 100644
 --- a/compiler-rt/lib/scudo/standalone/CMakeLists.txt
 +++ b/compiler-rt/lib/scudo/standalone/CMakeLists.txt
-@@ -134,6 +134,10 @@ append_list_if(COMPILER_RT_HAS_LIBPTHREAD -pthread SCUDO_LINK_FLAGS)
+@@ -137,6 +137,10 @@ append_list_if(COMPILER_RT_HAS_LIBPTHREAD -pthread SCUDO_LINK_FLAGS)
  
  append_list_if(FUCHSIA zircon SCUDO_LINK_LIBS)
  
diff --git a/recipes-devtools/clang/clang/0032-libunwind-Added-unw_backtrace-method.patch b/recipes-devtools/clang/clang/0032-libunwind-Added-unw_backtrace-method.patch
index 3fd61c5..5a99074 100644
--- a/recipes-devtools/clang/clang/0032-libunwind-Added-unw_backtrace-method.patch
+++ b/recipes-devtools/clang/clang/0032-libunwind-Added-unw_backtrace-method.patch
@@ -1,4 +1,4 @@
-From 9ddf8c26e50067029fbee9072e2066567f3f29b1 Mon Sep 17 00:00:00 2001
+From 014e2f701a92e9cd82a1f1dbccb0037057825ac4 Mon Sep 17 00:00:00 2001
 From: Maksim Kita <maksim-kita@yandex-team.ru>
 Date: Sun, 23 May 2021 10:27:29 +0000
 Subject: [PATCH] libunwind: Added unw_backtrace method
diff --git a/recipes-devtools/clang/clang/0033-compiler-rt-Use-uintptr_t-instead-of-_Unwind_Word.patch b/recipes-devtools/clang/clang/0033-compiler-rt-Use-uintptr_t-instead-of-_Unwind_Word.patch
index 18697ec..0651406 100644
--- a/recipes-devtools/clang/clang/0033-compiler-rt-Use-uintptr_t-instead-of-_Unwind_Word.patch
+++ b/recipes-devtools/clang/clang/0033-compiler-rt-Use-uintptr_t-instead-of-_Unwind_Word.patch
@@ -1,4 +1,4 @@
-From bf3f1e570a08c1d78d025db054fe670512083def Mon Sep 17 00:00:00 2001
+From ad072b670c36eb51cfc20daa53cfe7ba4cd19e25 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 29 May 2021 13:42:25 -0700
 Subject: [PATCH] compiler-rt: Use uintptr_t instead of _Unwind_Word
diff --git a/recipes-devtools/clang/clang/0034-compiler-rt-Do-not-force-thumb-mode-directive.patch b/recipes-devtools/clang/clang/0034-compiler-rt-Do-not-force-thumb-mode-directive.patch
index 7034ea6..515f980 100644
--- a/recipes-devtools/clang/clang/0034-compiler-rt-Do-not-force-thumb-mode-directive.patch
+++ b/recipes-devtools/clang/clang/0034-compiler-rt-Do-not-force-thumb-mode-directive.patch
@@ -1,4 +1,4 @@
-From 8868489317495de1175cd353e4b793e89f2dbdc6 Mon Sep 17 00:00:00 2001
+From 16736f026aeb9db163fb296e088316252f2578e0 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 12 Jun 2021 08:42:36 -0700
 Subject: [PATCH] compiler-rt: Do not force thumb mode directive
diff --git a/recipes-devtools/clang/clang/0035-Drop-the-git-suffix-from-various-version-variables.patch b/recipes-devtools/clang/clang/0035-Drop-the-git-suffix-from-various-version-variables.patch
deleted file mode 100644
index 4983d32..0000000
--- a/recipes-devtools/clang/clang/0035-Drop-the-git-suffix-from-various-version-variables.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 5786d2b8541cf95e26e99bd4e6d5d5b094e269c6 Mon Sep 17 00:00:00 2001
-From: Changqing Li <changqing.li@windriver.com>
-Date: Wed, 23 Jun 2021 16:25:06 +0800
-Subject: [PATCH] Drop the 'git' suffix from various version variables
-
-Upstream-Status: Backport [cherry-picked from branch 12.0.0]
-
-Signed-off-by: Changqing Li <changqing.li@windriver.com>
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- libcxx/CMakeLists.txt                                       | 2 +-
- libcxxabi/CMakeLists.txt                                    | 2 +-
- libunwind/CMakeLists.txt                                    | 2 +-
- llvm/CMakeLists.txt                                         | 6 +++---
- .../llvm/include/llvm/Config/llvm-config.h                  | 2 +-
- 5 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/libcxx/CMakeLists.txt b/libcxx/CMakeLists.txt
-index b1e25358d41a..0048f3284ac2 100644
---- a/libcxx/CMakeLists.txt
-+++ b/libcxx/CMakeLists.txt
-@@ -27,7 +27,7 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR LIBCXX_STANDALONE_BUIL
-   project(libcxx CXX C)
- 
-   set(PACKAGE_NAME libcxx)
--  set(PACKAGE_VERSION 13.0.0git)
-+  set(PACKAGE_VERSION 13.0.0)
-   set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
-   set(PACKAGE_BUGREPORT "llvm-bugs@lists.llvm.org")
- 
-diff --git a/libcxxabi/CMakeLists.txt b/libcxxabi/CMakeLists.txt
-index 971629d81dbe..a3e25d8e67ca 100644
---- a/libcxxabi/CMakeLists.txt
-+++ b/libcxxabi/CMakeLists.txt
-@@ -28,7 +28,7 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR LIBCXXABI_STANDALONE_B
-   project(libcxxabi CXX C)
- 
-   set(PACKAGE_NAME libcxxabi)
--  set(PACKAGE_VERSION 11.0.0git)
-+  set(PACKAGE_VERSION 11.0.0)
-   set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
-   set(PACKAGE_BUGREPORT "llvm-bugs@lists.llvm.org")
- 
-diff --git a/libunwind/CMakeLists.txt b/libunwind/CMakeLists.txt
-index 81eddbc24879..8b6811ac648e 100644
---- a/libunwind/CMakeLists.txt
-+++ b/libunwind/CMakeLists.txt
-@@ -24,7 +24,7 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR LIBUNWIND_STANDALONE_B
-   project(libunwind LANGUAGES C CXX ASM)
- 
-   set(PACKAGE_NAME libunwind)
--  set(PACKAGE_VERSION 13.0.0git)
-+  set(PACKAGE_VERSION 13.0.0)
-   set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
-   set(PACKAGE_BUGREPORT "llvm-bugs@lists.llvm.org")
- 
-diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt
-index af53a26d2d67..052bdb4e7881 100644
---- a/llvm/CMakeLists.txt
-+++ b/llvm/CMakeLists.txt
-@@ -800,8 +800,8 @@ if (TENSORFLOW_C_LIB_PATH)
-   include_directories(${TENSORFLOW_C_LIB_PATH}/include)
-   if (NOT TF_PROTO_HEADERS)
-     message(STATUS "TF_PROTO_HEADERS not defined. Looking for tensorflow pip package.")
--    execute_process(COMMAND 
--      ${Python3_EXECUTABLE} "-m" "pip" "show" "tensorflow" 
-+    execute_process(COMMAND
-+      ${Python3_EXECUTABLE} "-m" "pip" "show" "tensorflow"
-       OUTPUT_VARIABLE TF_PIP_OUT)
-     if ("${TF_PIP_OUT}" STREQUAL "")
-       message(FATAL ERROR "Tensorflow pip package is also required for 'development' mode (protobuf headers)")
-@@ -833,7 +833,7 @@ if (NOT TENSORFLOW_AOT_PATH STREQUAL "")
-   include_directories(${TENSORFLOW_AOT_PATH}/include)
-   add_subdirectory(${TENSORFLOW_AOT_PATH}/xla_aot_runtime_src
-     ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/tf_runtime)
--  install(TARGETS tf_xla_runtime EXPORT LLVMExports 
-+  install(TARGETS tf_xla_runtime EXPORT LLVMExports
-     ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT tf_xla_runtime)
-   set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS tf_xla_runtime)
- endif()
-diff --git a/utils/bazel/llvm-project-overlay/llvm/include/llvm/Config/llvm-config.h b/utils/bazel/llvm-project-overlay/llvm/include/llvm/Config/llvm-config.h
-index ba85df023ae6..f19c22ad13c0 100644
---- a/utils/bazel/llvm-project-overlay/llvm/include/llvm/Config/llvm-config.h
-+++ b/utils/bazel/llvm-project-overlay/llvm/include/llvm/Config/llvm-config.h
-@@ -80,7 +80,7 @@
- #define LLVM_VERSION_PATCH 0
- 
- /* LLVM version string */
--#define LLVM_VERSION_STRING "13.0.0git"
-+#define LLVM_VERSION_STRING "13.0.0"
- 
- /* Whether LLVM records statistics for use with GetStatistics(),
-  * PrintStatistics() or PrintStatisticsJSON()
diff --git a/recipes-devtools/clang/clang/0036-clang-Do-not-use-install-relative-libc-headers.patch b/recipes-devtools/clang/clang/0035-clang-Do-not-use-install-relative-libc-headers.patch
index 4706f10..f17c35f 100644
--- a/recipes-devtools/clang/clang/0036-clang-Do-not-use-install-relative-libc-headers.patch
+++ b/recipes-devtools/clang/clang/0035-clang-Do-not-use-install-relative-libc-headers.patch
@@ -1,4 +1,4 @@
-From 7415c342c26a8cb09ccb7279d3e8cbe958adcc44 Mon Sep 17 00:00:00 2001
+From 75fbe5c2c8f4798dbffca047d18e5831de61aef5 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Wed, 11 Aug 2021 18:37:11 -0700
 Subject: [PATCH] clang: Do not use install relative libc++ headers
diff --git a/recipes-devtools/clang/clang/0037-clang-Fix-how-driver-finds-GCC-installation-path-on-.patch b/recipes-devtools/clang/clang/0036-clang-Fix-how-driver-finds-GCC-installation-path-on-.patch
index 6b6ad04..43efcfb 100644
--- a/recipes-devtools/clang/clang/0037-clang-Fix-how-driver-finds-GCC-installation-path-on-.patch
+++ b/recipes-devtools/clang/clang/0036-clang-Fix-how-driver-finds-GCC-installation-path-on-.patch
@@ -1,7 +1,7 @@
-From aafdcb50517464cc915da3108e1d7422610a4fde Mon Sep 17 00:00:00 2001
+From 46b27761196036bc0d076bfe31636bdb43f4df6b Mon Sep 17 00:00:00 2001
 From: David Abdurachmanov <david.abdurachmanov@sifive.com>
 Date: Wed, 20 Oct 2021 17:30:36 -0700
-Subject: [PATCH 37/37] clang: Fix how driver finds GCC installation path on
+Subject: [PATCH] clang: Fix how driver finds GCC installation path on
  OpenEmbedded
 
 Fix how Clang Driver finds GCC installation path on OpenEmbedded
@@ -95,6 +95,3 @@ index 553cb985737f..355c7798a7aa 100644
        Version = CandidateVersion;
        GCCTriple.setTriple(CandidateTriple);
        // FIXME: We hack together the directory name here instead of
--- 
-2.33.1
-
diff --git a/recipes-devtools/clang/common.inc b/recipes-devtools/clang/common.inc
index 913d831..c0d0cd8 100644
--- a/recipes-devtools/clang/common.inc
+++ b/recipes-devtools/clang/common.inc
@@ -44,9 +44,8 @@ SRC_URI = "\
     file://0032-libunwind-Added-unw_backtrace-method.patch \
     file://0033-compiler-rt-Use-uintptr_t-instead-of-_Unwind_Word.patch \
     file://0034-compiler-rt-Do-not-force-thumb-mode-directive.patch \
-    file://0035-Drop-the-git-suffix-from-various-version-variables.patch \
-    file://0036-clang-Do-not-use-install-relative-libc-headers.patch \
-    file://0037-clang-Fix-how-driver-finds-GCC-installation-path-on-.patch \
+    file://0035-clang-Do-not-use-install-relative-libc-headers.patch \
+    file://0036-clang-Fix-how-driver-finds-GCC-installation-path-on-.patch \
     "
 # Fallback to no-PIE if not set
 GCCPIE ??= ""