38 files changed, 83 insertions, 193 deletions

diff --git a/recipes-devtools/clang/clang.inc b/recipes-devtools/clang/clang.inc
index b724d2c..f9091da 100644
--- a/recipes-devtools/clang/clang.inc
+++ b/recipes-devtools/clang/clang.inc
@@ -8,7 +8,7 @@ MAJOR_VER = "13"
 MINOR_VER = "0"
 PATCH_VER = "0"
 
-SRCREV ?= "ec08f03be3942d4ae6694d0f7a9b490fe3cbba9b"
+SRCREV ?= "6088f86a2e1ce3ab6fe9573e26fc63a5cf338fa9"
 
 PV = "${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}"
 BRANCH = "main"
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 19c19ff..c059603 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 8bbe4129627506374e857cae7d8ce86f08725cd7 Mon Sep 17 00:00:00 2001
+From 178532a3c0a68bb321eca567e203db33440c460a 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 00eee52..9c9f156 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 3c3aa3d7c09f50ebbece24434d8fe12fc2ce7114 Mon Sep 17 00:00:00 2001
+From bef9616b881669fa9b67788ff86f036cb40e5c13 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
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 2558fe5..b99bb47 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 ddb0abe6cd8e28d744f6f911388bbc5ed67a169c Mon Sep 17 00:00:00 2001
+From 9e608a5afeffb4ffe01791daf92e6d78bedd9c81 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 73dad7c..b982e88 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 ec6de16258fb4eb031dbb502082ee63722b11286 Mon Sep 17 00:00:00 2001
+From 109ad829390ef0eb54bd38cebd4f541b3fc02672 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,7 +20,7 @@ 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 aa4905edb640..37c4479de462 100644
+index f5b07cee45c4..d7ac04f1648b 100644
 --- a/compiler-rt/CMakeLists.txt
 +++ b/compiler-rt/CMakeLists.txt
 @@ -74,7 +74,16 @@ set(COMPILER_RT_BAREMETAL_BUILD OFF CACHE BOOL
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 f2c9a79..33d590f 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 6b27010179b4ca52616a4416ee974145628dbf00 Mon Sep 17 00:00:00 2001
+From 70009eade931cc3ed7a93bdd8df57f7b9f10c9fc 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 defc95d0062a..41d2099d0c5b 100644
+index 66fe96419549..fff073360d50 100644
 --- a/llvm/include/llvm/Analysis/TargetLibraryInfo.def
 +++ b/llvm/include/llvm/Analysis/TargetLibraryInfo.def
-@@ -809,6 +809,9 @@ TLI_DEFINE_STRING_INTERNAL("fmodl")
+@@ -815,6 +815,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 defc95d0062a..41d2099d0c5b 100644
  TLI_DEFINE_ENUM_INTERNAL(fopen64)
  TLI_DEFINE_STRING_INTERNAL("fopen64")
  /// int fork();
-@@ -856,6 +859,9 @@ TLI_DEFINE_STRING_INTERNAL("fseek")
+@@ -862,6 +865,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 defc95d0062a..41d2099d0c5b 100644
  /// int fseeko64(FILE *stream, off64_t offset, int whence)
  TLI_DEFINE_ENUM_INTERNAL(fseeko64)
  TLI_DEFINE_STRING_INTERNAL("fseeko64")
-@@ -866,6 +872,9 @@ TLI_DEFINE_STRING_INTERNAL("fsetpos")
+@@ -872,6 +878,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 defc95d0062a..41d2099d0c5b 100644
  TLI_DEFINE_ENUM_INTERNAL(fstat64)
  TLI_DEFINE_STRING_INTERNAL("fstat64")
  /// int fstatvfs(int fildes, struct statvfs *buf);
-@@ -881,6 +890,9 @@ TLI_DEFINE_STRING_INTERNAL("ftell")
+@@ -887,6 +896,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 defc95d0062a..41d2099d0c5b 100644
  TLI_DEFINE_ENUM_INTERNAL(ftello64)
  TLI_DEFINE_STRING_INTERNAL("ftello64")
  /// int ftrylockfile(FILE *file);
-@@ -1007,6 +1019,9 @@ TLI_DEFINE_STRING_INTERNAL("logl")
+@@ -1013,6 +1025,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 defc95d0062a..41d2099d0c5b 100644
  TLI_DEFINE_ENUM_INTERNAL(lstat64)
  TLI_DEFINE_STRING_INTERNAL("lstat64")
  /// void *malloc(size_t size);
-@@ -1250,6 +1265,9 @@ TLI_DEFINE_STRING_INTERNAL("sscanf")
+@@ -1256,6 +1271,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 defc95d0062a..41d2099d0c5b 100644
  TLI_DEFINE_ENUM_INTERNAL(stat64)
  TLI_DEFINE_STRING_INTERNAL("stat64")
  /// int statvfs(const char *path, struct statvfs *buf);
-@@ -1385,6 +1403,9 @@ TLI_DEFINE_STRING_INTERNAL("times")
+@@ -1391,6 +1409,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/0006-llvm-allow-env-override-of-exe-path.patch b/recipes-devtools/clang/clang/0006-llvm-allow-env-override-of-exe-path.patch
index cda2641..9eea146 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 02f3ffb65786b68550bbe97ed31fbe0cfc525552 Mon Sep 17 00:00:00 2001
+From 07d1cbe94f0841ab55a80ee602be790e9acaedab 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 5213f80..33ce5f9 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 661d95171fbb0c62166299ac22d75f302b089444 Mon Sep 17 00:00:00 2001
+From 2bfe2ac2e914bf1447d0b2dbf8a4fd504e24c5ec 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 5c02abb..98577b8 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 3cf88452ed0fe187741b8973135fb97e0a7055e7 Mon Sep 17 00:00:00 2001
+From ce6295ac3e6e39cd683f5fc0862e1428cc8920d9 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,7 +13,7 @@ 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 517ba60e0b77..42cf98572b95 100644
+index bd5f9c744bba..2208e3db3f40 100644
 --- a/clang/lib/Driver/ToolChains/Gnu.cpp
 +++ b/clang/lib/Driver/ToolChains/Gnu.cpp
 @@ -630,6 +630,12 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
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 968ff37..882c68a 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 bb49fa5b1ced3ae610cc796d72319df8f69630d0 Mon Sep 17 00:00:00 2001
+From 8ab487d8060bfbe02baf2a201d49fd618f41fe27 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 2ceb0b0cbf1c..5b9a47d02f1a 100644
+index 554f2174fee0..18bcfd173ede 100644
 --- a/clang/lib/Basic/Targets/PPC.h
 +++ b/clang/lib/Basic/Targets/PPC.h
-@@ -407,6 +407,10 @@ public:
+@@ -389,6 +389,10 @@ public:
        LongDoubleFormat = &llvm::APFloat::IEEEdouble();
      }
  
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 baba6e6..0f2b20d 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 0c0f1e5f1099ec4fea52cb18a9dc0b31c301a0fb Mon Sep 17 00:00:00 2001
+From 3a0d8a37332bda82c6343917abdf61594bff2096 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 866f680..834599d 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 a0de10cdb0d21d7cfed431586b54832e929f99a6 Mon Sep 17 00:00:00 2001
+From e56e18b218b28d8e2559bbb6dd30d583ad292b6a 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 3c8f102..759df80 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 37ac2d6586a22407ace1cd8cf24ddbf7810f0e9a Mon Sep 17 00:00:00 2001
+From 98cd2a87a8018e93d91635eef5cb3d60db125973 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
@@ -14,7 +14,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 7 insertions(+), 7 deletions(-)
 
 diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp
-index 42cf98572b95..cd0bf93aa299 100644
+index 2208e3db3f40..813f693db2b5 100644
 --- a/clang/lib/Driver/ToolChains/Gnu.cpp
 +++ b/clang/lib/Driver/ToolChains/Gnu.cpp
 @@ -2529,19 +2529,19 @@ void Generic_GCC::GCCInstallationDetector::ScanLibDirForGCCTriple(
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 c5008ae..23659e4 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 5f14a644ff02256d067c706f77ed045d113f7efc Mon Sep 17 00:00:00 2001
+From 227795b6fe097af4ce2f191acc362633fc05115c 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 c123625bb817..7fa84e86045e 100644
+index cfda0ff1852c..3fd28a07f19a 100644
 --- a/clang/lib/Driver/ToolChains/CommonArgs.cpp
 +++ b/clang/lib/Driver/ToolChains/CommonArgs.cpp
-@@ -1450,6 +1450,8 @@ static void AddUnwindLibrary(const ToolChain &TC, const Driver &D,
+@@ -1449,6 +1449,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 55e8d90..30cd980 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 547ad6e37f4fa53e6267cb5cfafaac37192304df Mon Sep 17 00:00:00 2001
+From e93653198e1143ffe30ecd22fbb30bd4d2cff37a 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 4a71996..dca61fb 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 71e2cd6ff51f0f4212c231db9a6626b3a248dfd7 Mon Sep 17 00:00:00 2001
+From 4d77ad180796d5dca4756366968f0146f16b3d1d 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 b1097a3..dda78a5 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 816a9eedc5c031667d495b9ebb1b623773bcdcf4 Mon Sep 17 00:00:00 2001
+From 9c4e9d50d952f3282718846bb87067bf0352fd90 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 832d83b..abe7a0d 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 d362483cf317d224a27c3a1147c4ed50a120aa6e Mon Sep 17 00:00:00 2001
+From a53559aff7c59b120377bca6a2ecd8ced5e3ae22 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 2ed324a..6223fda 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 a55cd03900022a08172d85268ee5630099f68278 Mon Sep 17 00:00:00 2001
+From 517fd1ccf607e843eb87466e595a312eff302dd2 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 689cac474c1a..75f425955e2a 100644
+index 7e91b77adcab..6b46f03f0e2c 100644
 --- a/llvm/cmake/modules/AddLLVM.cmake
 +++ b/llvm/cmake/modules/AddLLVM.cmake
-@@ -1226,7 +1226,6 @@ macro(add_llvm_tool name)
+@@ -1229,7 +1229,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 689cac474c1a..75f425955e2a 100644
                RUNTIME DESTINATION ${LLVM_TOOLS_INSTALL_DIR}
                COMPONENT ${name})
  
-@@ -1237,9 +1236,6 @@ macro(add_llvm_tool name)
+@@ -1240,9 +1239,6 @@ macro(add_llvm_tool name)
        endif()
      endif()
    endif()
@@ -73,7 +73,7 @@ index 689cac474c1a..75f425955e2a 100644
    set_target_properties(${name} PROPERTIES FOLDER "Tools")
  endmacro(add_llvm_tool name)
  
-@@ -1279,7 +1275,6 @@ macro(add_llvm_utility name)
+@@ -1282,7 +1278,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 689cac474c1a..75f425955e2a 100644
                RUNTIME DESTINATION ${LLVM_UTILS_INSTALL_DIR}
                COMPONENT ${name})
  
-@@ -1288,7 +1283,6 @@ macro(add_llvm_utility name)
+@@ -1291,7 +1286,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 4d52d1b..f2144eb 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 9ce38d7cbf9bc38520410da3595d9e18ffcba49f Mon Sep 17 00:00:00 2001
+From 3ffe72a7a7edff730564dbd35460dc84619aaf1d 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 930941fe8558..fad53b15cc52 100644
+index 6ea6e2e47e63..4a5c73999677 100644
 --- a/clang/lib/Driver/Driver.cpp
 +++ b/clang/lib/Driver/Driver.cpp
 @@ -121,7 +121,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 5a1917b..5f9c806 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 e8a30d3d8f2e9b62e9022fab86210e45c3395400 Mon Sep 17 00:00:00 2001
+From abfe886026fdd4c6bf9123fc6fac441277dc360b 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 4b5ff3e..82165ef 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 e2140a10a80e737b42408e7847502f1a7723388f Mon Sep 17 00:00:00 2001
+From e0bae776f771953f8fcf42104379b27de771fa30 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 b771a80..c548c05 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 35659b7324baa809ff04e52e8f0d55584a0e4033 Mon Sep 17 00:00:00 2001
+From 2231e5c5715a97cdc3711a5052e53fd055f16f12 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
@@ -60,7 +60,7 @@ index 6bd05531333b..9e134123ef44 100755
  #===- 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
+index de810230b285..200b7c6eb652 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 @@
@@ -70,7 +70,7 @@ index 313ecd2f9571..a298e38b1a45 100755
  #===- run-clang-tidy.py - Parallel clang-tidy runner --------*- python -*--===#
  #
 diff --git a/clang/tools/clang-format/git-clang-format b/clang/tools/clang-format/git-clang-format
-index 3646b4ff41d7..a6a7393448c9 100755
+index 0233ceb3a868..16bc55f98762 100755
 --- a/clang/tools/clang-format/git-clang-format
 +++ b/clang/tools/clang-format/git-clang-format
 @@ -1,4 +1,4 @@
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 1c364db..c067767 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 bac45d7406d40b0ced2841e23bc19e8a641d35be Mon Sep 17 00:00:00 2001
+From 62d734153b18afd919a31f070059ea0a3db669fb 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
@@ -57,7 +57,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp
-index cd0bf93aa299..54ed719c9f0c 100644
+index 813f693db2b5..60297dcddf44 100644
 --- a/clang/lib/Driver/ToolChains/Gnu.cpp
 +++ b/clang/lib/Driver/ToolChains/Gnu.cpp
 @@ -2111,6 +2111,7 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
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 0ef5ea3..09382f6 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 3b8cefb2e85d29da9935e6c8ec2ff7f6d99d7809 Mon Sep 17 00:00:00 2001
+From 45322a3c5e8948ff4d88f49857489fb35fad9959 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
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 a1d5535..2a2970f 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 aef271e12ce0bdf1d19548b4031cadea88d316d1 Mon Sep 17 00:00:00 2001
+From 27aa73bbffbddeef618e9c33b95b2690b8c5ba54 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 adb64d1..f4b8ea5 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 1385f46939352191af3a61e0c924da58eee11a25 Mon Sep 17 00:00:00 2001
+From 2ee84e75df8aa0d7d217d7a32076228d5d0db146 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 05b003a..f6d225d 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 b03d3a24cd49083a2f8e9cbbc9b66ec72b690d6d Mon Sep 17 00:00:00 2001
+From ee8087a34236d81e3b7630c33777120d1a6f2fbe 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 eb13118..e0aec9f 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 24544a16a6a6cf4d37d9277b183eb44514dbebde Mon Sep 17 00:00:00 2001
+From ec2f3fbb247b72a9ba2cf823b6627133f6e318f5 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 e8ec962..3e2b6ba 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 856a1ba88befb17cf65c2f8e8ac068a9a2736cea Mon Sep 17 00:00:00 2001
+From 195b51e0f6b5f776e6f4887e03a5a6b83b9a7158 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 4459916..755aded 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 959fef3b3acc0e9df4e9849828fc1097bbf2bf45 Mon Sep 17 00:00:00 2001
+From e80aae1ea22262da904487229f170caee9f02247 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 1aeeaa3..f99b076 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 0d7941cf793b25319c773067d40e4235576dc630 Mon Sep 17 00:00:00 2001
+From ba6410dbdf4440b2ce79f52e6adbeecf2a81336b 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
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 45b2338..4b6396c 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 84bf553c54b6c1ec19623f0564dde3fb671df612 Mon Sep 17 00:00:00 2001
+From efa3ae538a895376840647ccd8fb06f30d06ff80 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 c6a5ccc..2dc1789 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 2c73193c66359ea0506e4f9ebf69d534ca1aa0fd Mon Sep 17 00:00:00 2001
+From 7f5d4498bcb68924c27680c93bf12c3fea022664 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 26ca048..7f3b9e4 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 127d2d9a234809ba2c76bc3f64b0902cc7b24ba3 Mon Sep 17 00:00:00 2001
+From 5acbaaaec447b9083328cef452b4d7d1c542985d 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/0036-Drop-the-git-suffix-from-various-version-variables.patch b/recipes-devtools/clang/clang/0035-Drop-the-git-suffix-from-various-version-variables.patch
index 81978c0..3ef66d4 100644
--- a/recipes-devtools/clang/clang/0036-Drop-the-git-suffix-from-various-version-variables.patch
+++ b/recipes-devtools/clang/clang/0035-Drop-the-git-suffix-from-various-version-variables.patch
@@ -1,4 +1,4 @@
-From f25f79545c919543e182f629f7101f4b35faaac6 Mon Sep 17 00:00:00 2001
+From ae81bf58c31d5c93190c3dd85a4100b86055193a 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
@@ -6,12 +6,14 @@ 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      | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
+ libcxx/CMakeLists.txt                                           | 2 +-
+ libcxxabi/CMakeLists.txt                                        | 2 +-
+ libunwind/CMakeLists.txt                                        | 2 +-
+ llvm/CMakeLists.txt                                             | 2 +-
+ .../llvm-project-overlay/llvm/include/llvm/Config/llvm-config.h | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/libcxx/CMakeLists.txt b/libcxx/CMakeLists.txt
 index 06ee1d74a03e..1ead84c19fcb 100644
@@ -27,7 +29,7 @@ index 06ee1d74a03e..1ead84c19fcb 100644
    set(PACKAGE_BUGREPORT "llvm-bugs@lists.llvm.org")
  
 diff --git a/libcxxabi/CMakeLists.txt b/libcxxabi/CMakeLists.txt
-index fb656e7db9fb..405bc3ceeaa7 100644
+index 6a9ba8ec635d..dcd7b8765de3 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
@@ -53,7 +55,7 @@ index a2c03fd3f8aa..82424253c8da 100644
    set(PACKAGE_BUGREPORT "llvm-bugs@lists.llvm.org")
  
 diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt
-index 135036f509d2..c28bc3f8d19d 100644
+index 5d3ad7a4fd58..796b47a3d554 100644
 --- a/llvm/CMakeLists.txt
 +++ b/llvm/CMakeLists.txt
 @@ -20,7 +20,7 @@ if(NOT DEFINED LLVM_VERSION_PATCH)
@@ -65,6 +67,16 @@ index 135036f509d2..c28bc3f8d19d 100644
  endif()
  
  if (NOT PACKAGE_VERSION)
--- 
-2.17.1
-
+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/0035-openmp-Fix-build-on-non-x86-targets.patch b/recipes-devtools/clang/clang/0035-openmp-Fix-build-on-non-x86-targets.patch
deleted file mode 100644
index 3ce1096..0000000
--- a/recipes-devtools/clang/clang/0035-openmp-Fix-build-on-non-x86-targets.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-[OpenMP] Fix builds for non-x86 after distributed barrier patch
-
-Upstream-Status: Submitted [https://reviews.llvm.org/D104788]
-
-diff --git a/openmp/runtime/cmake/config-ix.cmake b/openmp/runtime/cmake/config-ix.cmake
---- a/openmp/runtime/cmake/config-ix.cmake
-+++ b/openmp/runtime/cmake/config-ix.cmake
-@@ -109,6 +109,23 @@
-   set(CMAKE_REQUIRED_LIBRARIES)
- endif()
- 
-+# Check for aligned memory allocator function
-+check_include_file(xmmintrin.h LIBOMP_HAVE_XMMINTRIN_H)
-+set(OLD_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
-+if (LIBOMP_HAVE_XMMINTRIN_H)
-+  set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -DLIBOMP_HAVE_XMMINTRIN_H")
-+endif()
-+set(source_code "// check for _mm_malloc
-+    #ifdef LIBOMP_HAVE_XMMINTRIN_H
-+    #include <xmmintrin.h>
-+    #endif
-+    int main() { void *ptr = _mm_malloc(sizeof(int) * 1000, 64); _mm_free(ptr); return 0; }")
-+check_cxx_source_compiles("${source_code}" LIBOMP_HAVE__MM_MALLOC)
-+set(CMAKE_REQUIRED_FLAGS ${OLD_CMAKE_REQUIRED_FLAGS})
-+check_symbol_exists(aligned_alloc "stdlib.h" LIBOMP_HAVE_ALIGNED_ALLOC)
-+check_symbol_exists(posix_memalign "stdlib.h" LIBOMP_HAVE_POSIX_MEMALIGN)
-+check_symbol_exists(_aligned_malloc "malloc.h" LIBOMP_HAVE__ALIGNED_MALLOC)
-+
- # Check linker flags
- if(WIN32)
-   libomp_check_linker_flag(/SAFESEH LIBOMP_HAVE_SAFESEH_FLAG)
-diff --git a/openmp/runtime/src/kmp_barrier.h b/openmp/runtime/src/kmp_barrier.h
---- a/openmp/runtime/src/kmp_barrier.h
-+++ b/openmp/runtime/src/kmp_barrier.h
-@@ -15,6 +15,34 @@
- 
- #include "kmp.h"
- 
-+#if KMP_HAVE_XMMINTRIN_H && KMP_HAVE__MM_MALLOC
-+#include <xmmintrin.h>
-+#define KMP_ALIGNED_ALLOCATE(size, alignment) _mm_malloc(size, alignment)
-+#define KMP_ALIGNED_FREE(ptr) _mm_free(ptr)
-+#elif KMP_HAVE_ALIGNED_ALLOC
-+#define KMP_ALIGNED_ALLOCATE(size, alignment) aligned_alloc(alignment, size)
-+#define KMP_ALIGNED_FREE(ptr) free(ptr)
-+#elif KMP_HAVE_POSIX_MEMALIGN
-+#include "kmp_i18n.h"
-+static inline void *KMP_ALIGNED_ALLOCATE(size_t size, size_t alignment) {
-+  void *ptr;
-+  int n = posix_memalign(&ptr, alignment, size);
-+  if (n != 0) {
-+    __kmp_fatal(KMP_MSG(FunctionError, "posix_memalign()"), KMP_ERR(errno),
-+                __kmp_msg_null);
-+  }
-+  return ptr;
-+}
-+#define KMP_ALIGNED_FREE(ptr) free(ptr)
-+#elif KMP_HAVE__ALIGNED_MALLOC
-+#include <malloc.h>
-+#define KMP_ALIGNED_ALLOCATE(size, alignment) _aligned_malloc(size, alignment)
-+#define KMP_ALIGNED_FREE(ptr) _aligned_free(ptr)
-+#else
-+#define KMP_ALIGNED_ALLOCATE(size, alignment) KMP_INTERNAL_MALLOC(size)
-+#define KMP_ALIGNED_FREE(ptr) KMP_INTERNAL_FREE(ptr)
-+#endif
-+
- // Use four cache lines: MLC tends to prefetch the next or previous cache line
- // creating a possible fake conflict between cores, so this is the only way to
- // guarantee that no such prefetch can happen.
-@@ -79,7 +107,7 @@
- 
-   // Used instead of constructor to create aligned data
-   static distributedBarrier *allocate(int nThreads) {
--    distributedBarrier *d = (distributedBarrier *)_mm_malloc(
-+    distributedBarrier *d = (distributedBarrier *)KMP_ALIGNED_ALLOCATE(
-         sizeof(distributedBarrier), 4 * CACHE_LINE);
-     d->num_threads = 0;
-     d->max_threads = 0;
-@@ -96,7 +124,7 @@
-     return d;
-   }
- 
--  static void deallocate(distributedBarrier *db) { _mm_free(db); }
-+  static void deallocate(distributedBarrier *db) { KMP_ALIGNED_FREE(db); }
- 
-   void update_num_threads(size_t nthr) { init(nthr); }
- 
-diff --git a/openmp/runtime/src/kmp_config.h.cmake b/openmp/runtime/src/kmp_config.h.cmake
---- a/openmp/runtime/src/kmp_config.h.cmake
-+++ b/openmp/runtime/src/kmp_config.h.cmake
-@@ -88,6 +88,16 @@
- #define KMP_HAVE_ATTRIBUTE_RTM LIBOMP_HAVE_ATTRIBUTE_RTM
- #cmakedefine01 LIBOMP_ARCH_AARCH64_A64FX
- #define KMP_ARCH_AARCH64_A64FX LIBOMP_ARCH_AARCH64_A64FX
-+#cmakedefine01 LIBOMP_HAVE_XMMINTRIN_H
-+#define KMP_HAVE_XMMINTRIN_H LIBOMP_HAVE_XMMINTRIN_H
-+#cmakedefine01 LIBOMP_HAVE__MM_MALLOC
-+#define KMP_HAVE__MM_MALLOC LIBOMP_HAVE__MM_MALLOC
-+#cmakedefine01 LIBOMP_HAVE_ALIGNED_ALLOC
-+#define KMP_HAVE_ALIGNED_ALLOC LIBOMP_HAVE_ALIGNED_ALLOC
-+#cmakedefine01 LIBOMP_HAVE_POSIX_MEMALIGN
-+#define KMP_HAVE_POSIX_MEMALIGN LIBOMP_HAVE_POSIX_MEMALIGN
-+#cmakedefine01 LIBOMP_HAVE__ALIGNED_MALLOC
-+#define KMP_HAVE__ALIGNED_MALLOC LIBOMP_HAVE__ALIGNED_MALLOC
- 
- // Configured cache line based on architecture
- #if KMP_ARCH_PPC64
-diff --git a/openmp/runtime/src/kmp_os.h b/openmp/runtime/src/kmp_os.h
---- a/openmp/runtime/src/kmp_os.h
-+++ b/openmp/runtime/src/kmp_os.h
-@@ -1038,6 +1038,9 @@
-     KMP_MFENCE_();                                                             \
-   }
- #define KMP_SFENCE() KMP_SFENCE_()
-+#else
-+#define KMP_MFENCE() KMP_MB()
-+#define KMP_SFENCE() KMP_MB()
- #endif
- 
- #ifndef KMP_IMB
-
diff --git a/recipes-devtools/clang/common.inc b/recipes-devtools/clang/common.inc
index 8f89fb4..a49d4e7 100644
--- a/recipes-devtools/clang/common.inc
+++ b/recipes-devtools/clang/common.inc
@@ -44,8 +44,7 @@ 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-openmp-Fix-build-on-non-x86-targets.patch \
-    file://0036-Drop-the-git-suffix-from-various-version-variables.patch \
+    file://0035-Drop-the-git-suffix-from-various-version-variables.patch \
 "
 # Fallback to no-PIE if not set
 GCCPIE ??= ""