clang: Update to latest on 13.x release branch

Fix libcxx/locale builds on musl

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

38 files changed, 141 insertions, 97 deletions

diff --git a/recipes-devtools/clang/clang.inc b/recipes-devtools/clang/clang.inc
index 45181a9..129ff43 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 ?= "6eaf46beb4628abf8f5b09a333bcd44d2fb2aff9"
+SRCREV ?= "6789c4564a4b33049cb1335d9b8078057af2dc11"
 
 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 c059603..5492983 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 178532a3c0a68bb321eca567e203db33440c460a Mon Sep 17 00:00:00 2001
+From 21550a2d3cc2cde8ab66eacb9a8ba58205e8d22c 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 9c9f156..221952e 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 bef9616b881669fa9b67788ff86f036cb40e5c13 Mon Sep 17 00:00:00 2001
+From aaaa693524e39f5d2b742ff077e085fbd0e5ab4f 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 9bd81075dd14..6a9ba8ec635d 100644
+index 9fb35860d483..971629d81dbe 100644
 --- a/libcxxabi/CMakeLists.txt
 +++ b/libcxxabi/CMakeLists.txt
-@@ -511,14 +511,9 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${LIBCXXABI_C_FLAGS}")
+@@ -510,14 +510,9 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${LIBCXXABI_C_FLAGS}")
  # Setup Source Code
  #===============================================================================
  
@@ -36,7 +36,7 @@ index 9bd81075dd14..6a9ba8ec635d 100644
      PATHS ${LIBCXXABI_LIBUNWIND_INCLUDES}
            ${LIBCXXABI_LIBUNWIND_PATH}/include
            ${CMAKE_BINARY_DIR}/${LIBCXXABI_LIBUNWIND_INCLUDES}
-@@ -529,15 +524,21 @@ if (LIBCXXABI_USE_LLVM_UNWINDER OR LLVM_NATIVE_ARCH MATCHES ARM)
+@@ -528,15 +523,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 b99bb47..f29a6fb 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 9e608a5afeffb4ffe01791daf92e6d78bedd9c81 Mon Sep 17 00:00:00 2001
+From 1bbf35da15f5a3cae13b2dfe14ac3e86a0e10524 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 b982e88..303c707 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 109ad829390ef0eb54bd38cebd4f541b3fc02672 Mon Sep 17 00:00:00 2001
+From 814f8efe5eb563ae8ea65a197ccd25e090e8dccf 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 f5b07cee45c4..d7ac04f1648b 100644
+index e12d1eb1cebf..522a3a6a421c 100644
 --- a/compiler-rt/CMakeLists.txt
 +++ b/compiler-rt/CMakeLists.txt
-@@ -74,7 +74,16 @@ set(COMPILER_RT_BAREMETAL_BUILD OFF CACHE BOOL
+@@ -78,7 +78,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-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch b/recipes-devtools/clang/clang/0005-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch
index 33d590f..8156f98 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 70009eade931cc3ed7a93bdd8df57f7b9f10c9fc Mon Sep 17 00:00:00 2001
+From d4c741812da36bf80caf294485cbb89e0ff4e656 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,7 +13,7 @@ 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 66fe96419549..fff073360d50 100644
+index ded53617b304..da612e9b4352 100644
 --- a/llvm/include/llvm/Analysis/TargetLibraryInfo.def
 +++ b/llvm/include/llvm/Analysis/TargetLibraryInfo.def
 @@ -815,6 +815,9 @@ TLI_DEFINE_STRING_INTERNAL("fmodl")
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 9eea146..f5a2e2a 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 07d1cbe94f0841ab55a80ee602be790e9acaedab Mon Sep 17 00:00:00 2001
+From bda8d7c1853f418f350bb33b2d7dd77b2bd6978b 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 33ce5f9..9ec8cf3 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 2bfe2ac2e914bf1447d0b2dbf8a4fd504e24c5ec Mon Sep 17 00:00:00 2001
+From 343bc6290910a3dd468116d8f08eb6596193011c 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,7 +14,7 @@ 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 886e0b35ece8..5f40847f77a3 100644
+index c9360fc67165..4b1d6bff7231 100644
 --- a/clang/lib/Driver/ToolChains/Linux.cpp
 +++ b/clang/lib/Driver/ToolChains/Linux.cpp
 @@ -476,11 +476,19 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
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 98577b8..cb252c8 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 ce6295ac3e6e39cd683f5fc0862e1428cc8920d9 Mon Sep 17 00:00:00 2001
+From f4f6b66d6504a8b24d1ee40454af41312556da34 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 bd5f9c744bba..2208e3db3f40 100644
+index da39f29e4619..9103b153d461 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 882c68a..7c923db 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 8ab487d8060bfbe02baf2a201d49fd618f41fe27 Mon Sep 17 00:00:00 2001
+From 7268d68a37b65365a5e864c774004c18fc314a78 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 554f2174fee0..18bcfd173ede 100644
+index 7c14a4eb9410..b182ef53348f 100644
 --- a/clang/lib/Basic/Targets/PPC.h
 +++ b/clang/lib/Basic/Targets/PPC.h
-@@ -389,6 +389,10 @@ public:
+@@ -392,6 +392,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 0f2b20d..fea39d5 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 3a0d8a37332bda82c6343917abdf61594bff2096 Mon Sep 17 00:00:00 2001
+From 5cf7c803df7ca4fafe546a7c66c2956a443d1245 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,7 +24,7 @@ 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 5f40847f77a3..50cd166231c9 100644
+index 4b1d6bff7231..9daf35aefc4e 100644
 --- a/clang/lib/Driver/ToolChains/Linux.cpp
 +++ b/clang/lib/Driver/ToolChains/Linux.cpp
 @@ -181,7 +181,7 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
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 834599d..d8c94ec 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 e56e18b218b28d8e2559bbb6dd30d583ad292b6a Mon Sep 17 00:00:00 2001
+From 06078eb841ff9201903475ff25ac7c8ca50257ec 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,10 +15,10 @@ 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 5791805a6711..ccd65daa055c 100644
+index 6c1b88141c45..ee6a257a6cb4 100644
 --- a/clang/lib/Driver/ToolChain.cpp
 +++ b/clang/lib/Driver/ToolChain.cpp
-@@ -14,6 +14,7 @@
+@@ -13,6 +13,7 @@
  #include "ToolChains/Flang.h"
  #include "clang/Basic/ObjCRuntime.h"
  #include "clang/Basic/Sanitizers.h"
@@ -26,7 +26,7 @@ index 5791805a6711..ccd65daa055c 100644
  #include "clang/Config/config.h"
  #include "clang/Driver/Action.h"
  #include "clang/Driver/Driver.h"
-@@ -407,7 +408,10 @@ StringRef ToolChain::getOSLibName() const {
+@@ -410,7 +411,10 @@ StringRef ToolChain::getOSLibName() const {
  }
  
  std::string ToolChain::getCompilerRTPath() const {
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 759df80..b4233c7 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 98cd2a87a8018e93d91635eef5cb3d60db125973 Mon Sep 17 00:00:00 2001
+From 71efce5c969be5ccc88b6355972e34e5ea7017d3 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 2208e3db3f40..813f693db2b5 100644
+index 9103b153d461..4f12262bbf47 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 23659e4..eda9e5f 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 227795b6fe097af4ce2f191acc362633fc05115c Mon Sep 17 00:00:00 2001
+From 91c00f0141a5f616293f36b7b812fda2c1535518 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,7 +20,7 @@ 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 cfda0ff1852c..3fd28a07f19a 100644
+index 83cab3ac00cb..367e8603ff70 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,
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 30cd980..f62a70f 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 e93653198e1143ffe30ecd22fbb30bd4d2cff37a Mon Sep 17 00:00:00 2001
+From 3135ebc7763fc943ab98a9527821c1fec2437e54 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 dca61fb..ea62359 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 4d77ad180796d5dca4756366968f0146f16b3d1d Mon Sep 17 00:00:00 2001
+From 3637a56392943de9b3580ff880e3773e132c54cd 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 dda78a5..b7f0703 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 9c4e9d50d952f3282718846bb87067bf0352fd90 Mon Sep 17 00:00:00 2001
+From d1badac1289907fb193477c96c073a964bae71dd 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
@@ -37,7 +37,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  13 files changed, 42 insertions(+), 30 deletions(-)
 
 diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp
-index 50cd166231c9..af1f7a6e5c48 100644
+index 9daf35aefc4e..8c6102f47192 100644
 --- a/clang/lib/Driver/ToolChains/Linux.cpp
 +++ b/clang/lib/Driver/ToolChains/Linux.cpp
 @@ -668,8 +668,14 @@ void Linux::AddIAMCUIncludeArgs(const ArgList &DriverArgs,
@@ -134,10 +134,10 @@ index e9b86cbcf428..47f304c0420d 100644
  // CHECK-LD-32: "-L[[SYSROOT]]/usr/lib/gcc/i386-unknown-linux/10.2.0/../../../../i386-unknown-linux/lib"
  // CHECK-LD-32: "-L[[SYSROOT]]/lib"
 diff --git a/clang/test/Driver/fsanitize.c b/clang/test/Driver/fsanitize.c
-index baa37b5fd79d..a6aeb09f6cd8 100644
+index b7d61abe7ec5..461b69b0ac15 100644
 --- a/clang/test/Driver/fsanitize.c
 +++ b/clang/test/Driver/fsanitize.c
-@@ -330,15 +330,15 @@
+@@ -344,15 +344,15 @@
  // RUN: %clang -target x86_64-linux-gnu -fsanitize=vptr -fno-sanitize=vptr -fsanitize=undefined,address %s -### 2>&1
  // OK
  
@@ -157,7 +157,7 @@ index baa37b5fd79d..a6aeb09f6cd8 100644
  
  // CHECK-NO-PIE-NOT: "-pie"
  // CHECK-NO-PIE: "-mrelocation-model" "static"
-@@ -673,12 +673,12 @@
+@@ -687,12 +687,12 @@
  // RUN: %clang -fno-sanitize=safe-stack -### %s 2>&1 | FileCheck %s -check-prefix=NOSP
  // NOSP-NOT: "-fsanitize=safe-stack"
  
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 abe7a0d..d13649d 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 a53559aff7c59b120377bca6a2ecd8ced5e3ae22 Mon Sep 17 00:00:00 2001
+From 0bc6d20c623b55ce93b64942c96422433ca2741a 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,10 +14,10 @@ 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 87b71f7ba334..412374e8820e 100644
+index 496429f3841e..99ca892533b1 100644
 --- a/libcxx/src/CMakeLists.txt
 +++ b/libcxx/src/CMakeLists.txt
-@@ -189,7 +189,7 @@ split_list(LIBCXX_LINK_FLAGS)
+@@ -194,7 +194,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
@@ -26,7 +26,7 @@ index 87b71f7ba334..412374e8820e 100644
    set_target_properties(cxx_shared
      PROPERTIES
        COMPILE_FLAGS "${LIBCXX_COMPILE_FLAGS}"
-@@ -266,7 +266,7 @@ set(CMAKE_STATIC_LIBRARY_PREFIX "lib")
+@@ -272,7 +272,7 @@ set(CMAKE_STATIC_LIBRARY_PREFIX "lib")
  if (LIBCXX_ENABLE_STATIC)
    add_library(cxx_static STATIC ${exclude_from_all} ${LIBCXX_SOURCES} ${LIBCXX_HEADERS})
    target_link_libraries(cxx_static PUBLIC cxx-headers
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 6223fda..c6f16c8 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 517fd1ccf607e843eb87466e595a312eff302dd2 Mon Sep 17 00:00:00 2001
+From 0888ddfdc7d6c07ebc9edd74207066718fff2f7b 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 7e91b77adcab..6b46f03f0e2c 100644
+index 3e009f5061d3..1d40ad3e7ecc 100644
 --- a/llvm/cmake/modules/AddLLVM.cmake
 +++ b/llvm/cmake/modules/AddLLVM.cmake
-@@ -1229,7 +1229,6 @@ macro(add_llvm_tool name)
+@@ -1232,7 +1232,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 7e91b77adcab..6b46f03f0e2c 100644
                RUNTIME DESTINATION ${LLVM_TOOLS_INSTALL_DIR}
                COMPONENT ${name})
  
-@@ -1240,9 +1239,6 @@ macro(add_llvm_tool name)
+@@ -1243,9 +1242,6 @@ macro(add_llvm_tool name)
        endif()
      endif()
    endif()
@@ -73,7 +73,7 @@ index 7e91b77adcab..6b46f03f0e2c 100644
    set_target_properties(${name} PROPERTIES FOLDER "Tools")
  endmacro(add_llvm_tool name)
  
-@@ -1282,7 +1278,6 @@ macro(add_llvm_utility name)
+@@ -1285,7 +1281,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 7e91b77adcab..6b46f03f0e2c 100644
                RUNTIME DESTINATION ${LLVM_UTILS_INSTALL_DIR}
                COMPONENT ${name})
  
-@@ -1291,7 +1286,6 @@ macro(add_llvm_utility name)
+@@ -1294,7 +1289,6 @@ macro(add_llvm_utility name)
                                   DEPENDS ${name}
                                   COMPONENT ${name})
        endif()
@@ -90,10 +90,10 @@ index 7e91b77adcab..6b46f03f0e2c 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 5f07acc1f692..47fe887e083b 100644
+index 5e9e2674405e..3c72df35b308 100644
 --- a/llvm/cmake/modules/TableGen.cmake
 +++ b/llvm/cmake/modules/TableGen.cmake
-@@ -177,14 +177,8 @@ macro(add_tablegen target project)
+@@ -179,14 +179,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)
@@ -108,7 +108,7 @@ index 5f07acc1f692..47fe887e083b 100644
              COMPONENT ${target}
              RUNTIME DESTINATION ${LLVM_TOOLS_INSTALL_DIR})
      if(NOT LLVM_ENABLE_IDE)
-@@ -193,5 +187,4 @@ macro(add_tablegen target project)
+@@ -195,5 +189,4 @@ macro(add_tablegen target project)
                                 COMPONENT ${target})
      endif()
    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 f2144eb..9cdffd7 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 3ffe72a7a7edff730564dbd35460dc84619aaf1d Mon Sep 17 00:00:00 2001
+From 4df8cd257a064ced4ef3eb6d8316ba72508877e0 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,10 +19,10 @@ 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 6ea6e2e47e63..4a5c73999677 100644
+index 5c323cb6ea23..c3ae820c06ab 100644
 --- a/clang/lib/Driver/Driver.cpp
 +++ b/clang/lib/Driver/Driver.cpp
-@@ -121,7 +121,13 @@ std::string Driver::GetResourcesPath(StringRef BinaryPath,
+@@ -122,7 +122,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.
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 5f9c806..9a0447f 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 abfe886026fdd4c6bf9123fc6fac441277dc360b Mon Sep 17 00:00:00 2001
+From afe79daee4ff0e8b09e6b9892db997ae81db9d52 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 82165ef..c98d981 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 e0bae776f771953f8fcf42104379b27de771fa30 Mon Sep 17 00:00:00 2001
+From 289ea0614e9e1febca27761c7e189bd9a4fa144d 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
@@ -18,7 +18,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 8 insertions(+), 8 deletions(-)
 
 diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp
-index af1f7a6e5c48..0b3bbdeab5f3 100644
+index 8c6102f47192..4b39c2bdf14d 100644
 --- a/clang/lib/Driver/ToolChains/Linux.cpp
 +++ b/clang/lib/Driver/ToolChains/Linux.cpp
 @@ -476,8 +476,8 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
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 c548c05..01c8336 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 2231e5c5715a97cdc3711a5052e53fd055f16f12 Mon Sep 17 00:00:00 2001
+From ab7a9baf7df82b79d7239bb188a5c814f3083210 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 de810230b285..200b7c6eb652 100755
+index acd1ed6979c0..12bd7f9c7dc3 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 @@
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 c067767..57285ff 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 62d734153b18afd919a31f070059ea0a3db669fb Mon Sep 17 00:00:00 2001
+From f4ebbd98b3fb1cb6def64ede8ccc4861c7e91b9e 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 813f693db2b5..60297dcddf44 100644
+index 4f12262bbf47..9750c42e1f56 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 09382f6..f205087 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 45322a3c5e8948ff4d88f49857489fb35fad9959 Mon Sep 17 00:00:00 2001
+From 9511c156c10538e702bedb06b711ee419d2a530d 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,7 +17,7 @@ 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 39e0a4b662c7..a186ac60986d 100644
+index 6f13acfa2757..0f269835fd17 100644
 --- a/compiler-rt/cmake/config-ix.cmake
 +++ b/compiler-rt/cmake/config-ix.cmake
 @@ -140,7 +140,7 @@ else()
@@ -30,10 +30,10 @@ index 39e0a4b662c7..a186ac60986d 100644
  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 d4cbf37d19a2..a320cf97b306 100644
+index dd0aaadb47c7..66a50cf01230 100644
 --- a/llvm/cmake/config-ix.cmake
 +++ b/llvm/cmake/config-ix.cmake
-@@ -175,7 +175,7 @@ if(NOT LLVM_USE_SANITIZER MATCHES "Memory.*")
+@@ -176,7 +176,7 @@ if(NOT LLVM_USE_SANITIZER MATCHES "Memory.*")
        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 2a2970f..c3c5acc 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 27aa73bbffbddeef618e9c33b95b2690b8c5ba54 Mon Sep 17 00:00:00 2001
+From e2362f6dc9e3756fa0fc3582c0b981184bc2298b 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 f4b8ea5..885c634 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 2ee84e75df8aa0d7d217d7a32076228d5d0db146 Mon Sep 17 00:00:00 2001
+From 60c000d2bd8045f818359983b45996db1dbcccac 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 f6d225d..e4f5795 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 ee8087a34236d81e3b7630c33777120d1a6f2fbe Mon Sep 17 00:00:00 2001
+From be5c0fb50de4cd165c90d6d6749b8e64f80547d3 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 e0aec9f..2ea0661 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 ec2f3fbb247b72a9ba2cf823b6627133f6e318f5 Mon Sep 17 00:00:00 2001
+From ec9a1d4a64af51a69b770ed2bb229a755178fe18 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 3e2b6ba..9b24404 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 195b51e0f6b5f776e6f4887e03a5a6b83b9a7158 Mon Sep 17 00:00:00 2001
+From e31cbc938bd97095a114c8f179b4fa8719c13da4 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
@@ -12,7 +12,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 3 insertions(+)
 
 diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp
-index 0b3bbdeab5f3..b73644df5641 100644
+index 4b39c2bdf14d..46c83b002e6c 100644
 --- a/clang/lib/Driver/ToolChains/Linux.cpp
 +++ b/clang/lib/Driver/ToolChains/Linux.cpp
 @@ -619,6 +619,9 @@ void Linux::addLibStdCxxIncludePaths(const llvm::opt::ArgList &DriverArgs,
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 755aded..1e15311 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 e80aae1ea22262da904487229f170caee9f02247 Mon Sep 17 00:00:00 2001
+From fa07ed6fe456700579ddbb1bbb61ecbbf22ce872 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 f99b076..ba0ad51 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 ba6410dbdf4440b2ce79f52e6adbeecf2a81336b Mon Sep 17 00:00:00 2001
+From fa42cb05e193173acec7cbcefd77419c90dd1161 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 4b6396c..99e45c4 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 efa3ae538a895376840647ccd8fb06f30d06ff80 Mon Sep 17 00:00:00 2001
+From 791297b55b977423fb2a30b8380d5678c5969095 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 2dc1789..61abcd0 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 7f5d4498bcb68924c27680c93bf12c3fea022664 Mon Sep 17 00:00:00 2001
+From 716d03efa9f7ac77bab5e6c5f62163a328dab393 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 7f3b9e4..9dfea83 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,7 +1,7 @@
-From 5acbaaaec447b9083328cef452b4d7d1c542985d Mon Sep 17 00:00:00 2001
+From 971ac96cbedb42f318f86c6b6baccf58b4a03740 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
+Subject: [PATCH] compiler-rt: Do not force thumb mode directive
 
 .thumb_func was not switching mode until [1]
 so it did not show up but now that .thumb_func (without argument) is
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
index 3ef66d4..ab07116 100644
--- 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
@@ -1,4 +1,4 @@
-From ae81bf58c31d5c93190c3dd85a4100b86055193a Mon Sep 17 00:00:00 2001
+From 400407d9877e4e0408fbf113c6ba7786c341e615 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
@@ -8,18 +8,18 @@ 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 +-
- .../llvm-project-overlay/llvm/include/llvm/Config/llvm-config.h | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
+ 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 06ee1d74a03e..1ead84c19fcb 100644
+index b1e25358d41a..0048f3284ac2 100644
 --- a/libcxx/CMakeLists.txt
 +++ b/libcxx/CMakeLists.txt
-@@ -29,7 +29,7 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR LIBCXX_STANDALONE_BUIL
+@@ -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)
@@ -29,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 6a9ba8ec635d..dcd7b8765de3 100644
+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
@@ -42,7 +42,7 @@ index 6a9ba8ec635d..dcd7b8765de3 100644
    set(PACKAGE_BUGREPORT "llvm-bugs@lists.llvm.org")
  
 diff --git a/libunwind/CMakeLists.txt b/libunwind/CMakeLists.txt
-index a2c03fd3f8aa..82424253c8da 100644
+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
@@ -55,18 +55,29 @@ index a2c03fd3f8aa..82424253c8da 100644
    set(PACKAGE_BUGREPORT "llvm-bugs@lists.llvm.org")
  
 diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt
-index 5d3ad7a4fd58..796b47a3d554 100644
+index 99773a5ee546..4822fc7edd8f 100644
 --- a/llvm/CMakeLists.txt
 +++ b/llvm/CMakeLists.txt
-@@ -20,7 +20,7 @@ if(NOT DEFINED LLVM_VERSION_PATCH)
-   set(LLVM_VERSION_PATCH 0)
+@@ -795,8 +795,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)")
+@@ -828,7 +828,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()
- if(NOT DEFINED LLVM_VERSION_SUFFIX)
--  set(LLVM_VERSION_SUFFIX git)
-+  set(LLVM_VERSION_SUFFIX "")
- endif()
- 
- if (NOT PACKAGE_VERSION)
 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
diff --git a/recipes-devtools/clang/clang/0036-clang-Do-not-use-install-relative-libc-headers.patch b/recipes-devtools/clang/clang/0036-clang-Do-not-use-install-relative-libc-headers.patch
new file mode 100644
index 0000000..87cf169
--- /dev/null
+++ b/recipes-devtools/clang/clang/0036-clang-Do-not-use-install-relative-libc-headers.patch
@@ -0,0 +1,32 @@
+From a812e507582ff1ef74c2ceee9ba4943b21a72948 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 11 Aug 2021 18:37:11 -0700
+Subject: [PATCH] clang: Do not use install relative libc++ headers
+
+In OE we use same clang for native and cross builds, therefore we need
+to ensure that native sysroot install of libc++ is not searched for
+headers when doing cross compile instead it searches the target sysroot
+this is especially troublesome when libcxx-native is staged along with
+libcxx e.g. chromium
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ clang/lib/Driver/ToolChains/Gnu.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp
+index 9750c42e1f56..553cb985737f 100644
+--- a/clang/lib/Driver/ToolChains/Gnu.cpp
++++ b/clang/lib/Driver/ToolChains/Gnu.cpp
+@@ -2928,7 +2928,9 @@ Generic_GCC::addLibCxxIncludePaths(const llvm::opt::ArgList &DriverArgs,
+ 
+   // Android never uses the libc++ headers installed alongside the toolchain,
+   // which are generally incompatible with the NDK libraries anyway.
+-  if (!getTriple().isAndroid())
++  // And also do not add it when --sysroot is specified, since it would expect
++  // libc++ headers from sysroot
++  if (!getTriple().isAndroid() && SysRoot.empty())
+     if (AddIncludePath(getDriver().Dir + "/../include"))
+       return;
+   // If this is a development, non-installed, clang, libcxx will
diff --git a/recipes-devtools/clang/common.inc b/recipes-devtools/clang/common.inc
index a49d4e7..f1bfd19 100644
--- a/recipes-devtools/clang/common.inc
+++ b/recipes-devtools/clang/common.inc
@@ -45,7 +45,8 @@ SRC_URI = "\
     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 \
+    "
 # Fallback to no-PIE if not set
 GCCPIE ??= ""