37 files changed, 106 insertions, 59 deletions

diff --git a/recipes-devtools/clang/clang.inc b/recipes-devtools/clang/clang.inc
index 7a5966e..b2c6ab3 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 ?= "054cc3b1b469de4b0cb25d1dc3af43c679c5dc44"
+SRCREV ?= "1e50c3d785f4563873ab1ce86559f2a1285b5678"
 
 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 c4d125d..84811a5 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 e20b3c1ef199ea7b5f888c78a64fa21e69d0c269 Mon Sep 17 00:00:00 2001
+From 3f5e7342d5f2490728e5971d9e709b3be736d633 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 fc105da..8c32702 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 a39aaf48e8e0137cba75718b0fb77c68133a7713 Mon Sep 17 00:00:00 2001
+From 9052bcd92350fe8ede577fe876e59951478e1949 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 1e8b73aa38cc..fb656e7db9fb 100644
+index 9bd81075dd14..6a9ba8ec635d 100644
 --- a/libcxxabi/CMakeLists.txt
 +++ b/libcxxabi/CMakeLists.txt
-@@ -512,14 +512,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 1e8b73aa38cc..fb656e7db9fb 100644
      PATHS ${LIBCXXABI_LIBUNWIND_INCLUDES}
            ${LIBCXXABI_LIBUNWIND_PATH}/include
            ${CMAKE_BINARY_DIR}/${LIBCXXABI_LIBUNWIND_INCLUDES}
-@@ -530,15 +525,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 e5913b2..04f02ae 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 d90aa65eb5ab3d12ba8e56fde9cdf5db57a50ccb Mon Sep 17 00:00:00 2001
+From adf258f2809c719a3a52b1d832f0139d8e668a34 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 4282f60..e00b318 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 bce1f130dc86109ba398b756712393b93d7b6fd7 Mon Sep 17 00:00:00 2001
+From 08dabaabc28efd55ba1b77830fc8b92f1ad28894 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 a9bc939..1c773c7 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 87fb84e500d2671be478cb983998afb60d93b7de Mon Sep 17 00:00:00 2001
+From d3adf3b2a689fe006b6b24430b3f52ecd6807efa 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 5e436ba..33d07b6 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 aac14f4dc0fb5f8bf0350d6bcee111e2496c2769 Mon Sep 17 00:00:00 2001
+From 693007ba2f20c6ef45114d73166fb0273d1fdacb 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 03ea399..3b68a2d 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 036a427f39847a8cc56bb5226ad89a3055a0ec28 Mon Sep 17 00:00:00 2001
+From a81fe1f4e85bfb616b914f894c767488ee230792 Mon Sep 17 00:00:00 2001
 From: Dan McGregor <dan.mcgregor@usask.ca>
 Date: Wed, 26 Apr 2017 20:29:41 -0600
 Subject: [PATCH] clang: driver: Check sysroot for ldso path
@@ -14,10 +14,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 16 insertions(+)
 
 diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp
-index e855d337ae64..95d88e0c6d79 100644
+index 886e0b35ece8..5f40847f77a3 100644
 --- a/clang/lib/Driver/ToolChains/Linux.cpp
 +++ b/clang/lib/Driver/ToolChains/Linux.cpp
-@@ -479,11 +479,19 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
+@@ -476,11 +476,19 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
      LibDir = "lib64";
      Loader =
          (tools::ppc::hasPPCAbiArg(Args, "elfv2")) ? "ld64.so.2" : "ld64.so.1";
@@ -37,7 +37,7 @@ index e855d337ae64..95d88e0c6d79 100644
      break;
    case llvm::Triple::riscv32: {
      StringRef ABIName = tools::riscv::getRISCVABI(Args, Triple);
-@@ -505,6 +513,10 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
+@@ -502,6 +510,10 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
    case llvm::Triple::sparcv9:
      LibDir = "lib64";
      Loader = "ld-linux.so.2";
@@ -48,7 +48,7 @@ index e855d337ae64..95d88e0c6d79 100644
      break;
    case llvm::Triple::systemz:
      LibDir = "lib";
-@@ -519,6 +531,10 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
+@@ -516,6 +528,10 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
  
      LibDir = X32 ? "libx32" : "lib64";
      Loader = X32 ? "ld-linux-x32.so.2" : "ld-linux-x86-64.so.2";
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 309d5a2..9e881c6 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 62cf14e937d10accf5208802a237136caf87036a Mon Sep 17 00:00:00 2001
+From 1d8c23ef1e70a1404224918dd2090c6a2828c7ef 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 a27841dc5985..e0be5e43a10b 100644
+index 517ba60e0b77..42cf98572b95 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 b86adbe..227a5f1 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 ac6c4f6b2eea1f74d66d95d2ca839f94ae54b26e Mon Sep 17 00:00:00 2001
+From 082dd1f20b838510dca1481e9479c57ce8d03dff 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 4f6138d..e7ff5f3 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 e74b86d360243aac37f71970969a41ef2e29b5bc Mon Sep 17 00:00:00 2001
+From 0c0f10bfe6d0b51080b81c73fae52ddb2a768e5d 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,10 +24,10 @@ 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 95d88e0c6d79..d2ccbe635208 100644
+index 5f40847f77a3..50cd166231c9 100644
 --- a/clang/lib/Driver/ToolChains/Linux.cpp
 +++ b/clang/lib/Driver/ToolChains/Linux.cpp
-@@ -182,7 +182,7 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
+@@ -181,7 +181,7 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
    Multilibs = GCCInstallation.getMultilibs();
    SelectedMultilib = GCCInstallation.getMultilib();
    llvm::Triple::ArchType Arch = Triple.getArch();
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 729acf7..d2fc933 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 facdeca80d228bec1684802c6ac2618d9953cad8 Mon Sep 17 00:00:00 2001
+From 1c4f99104db0a5d2504fb9f1d4a5cd57a94aaaef 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 b10459a..1bd3413 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 e1727d4a162c1f0c46caf9792ce32d17729eabf4 Mon Sep 17 00:00:00 2001
+From 9be197ac1d1a80f4f8ec81bb7ea41a393869cab1 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 e0be5e43a10b..19c13afe048d 100644
+index 42cf98572b95..cd0bf93aa299 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 c118b47..ebf4696 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 db17a2f5d14733efa51f44868e21373a038cab61 Mon Sep 17 00:00:00 2001
+From 14c7eb733c03a775de7e828a11af6d43170620e8 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
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 b9d754d..3ad5e3c 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 4840d4d70891e429f64a0b440ebd28eb544e09cc Mon Sep 17 00:00:00 2001
+From 1ea29b33aebd027faf22bf9a0bf1c83c8b7c6571 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 006be77..f528540 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 662447e6dcc04b8cab8af89d164b91cdad8d39fd Mon Sep 17 00:00:00 2001
+From e8f619fae05f543455ec8e1e61e255ac5cbd5f39 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 1aefd5a..317ebc2 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 e797d257fb0e4f8561d39c8a8c4e0bfd2323ed43 Mon Sep 17 00:00:00 2001
+From 24701aa638b8e111d7c93cf129959b63403d2327 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,10 +37,10 @@ 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 d2ccbe635208..5bd2e5061f3c 100644
+index 50cd166231c9..af1f7a6e5c48 100644
 --- a/clang/lib/Driver/ToolChains/Linux.cpp
 +++ b/clang/lib/Driver/ToolChains/Linux.cpp
-@@ -671,8 +671,14 @@ void Linux::AddIAMCUIncludeArgs(const ArgList &DriverArgs,
+@@ -668,8 +668,14 @@ void Linux::AddIAMCUIncludeArgs(const ArgList &DriverArgs,
  }
  
  bool Linux::isPIEDefault() const {
@@ -134,7 +134,7 @@ 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 7febfd02a1ad..1381d9018e32 100644
+index baa37b5fd79d..a6aeb09f6cd8 100644
 --- a/clang/test/Driver/fsanitize.c
 +++ b/clang/test/Driver/fsanitize.c
 @@ -330,15 +330,15 @@
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 b764bc3..d11bf2a 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 f7aa025b6171ce7c9f4a37593f4875a331d73da2 Mon Sep 17 00:00:00 2001
+From 91c7a0a31acf1ab7475b85144d923f70541fae7c 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 857e07e..35da3eb 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 3aa86ff94b54b378637ef3dcc95350d28e014aa9 Mon Sep 17 00:00:00 2001
+From 2682484fb5365d5bfbe4c343f74298e155d20645 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,7 +52,7 @@ index 5752f4277444..f40ea35faf46 100644
  endmacro()
  
 diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake
-index 9c2b85374307..7e4a07b5972c 100644
+index 689cac474c1a..75f425955e2a 100644
 --- a/llvm/cmake/modules/AddLLVM.cmake
 +++ b/llvm/cmake/modules/AddLLVM.cmake
 @@ -1226,7 +1226,6 @@ macro(add_llvm_tool name)
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 26df8cd..a7c3410 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 de696c06d7d00637a1787738b841e4514c65f061 Mon Sep 17 00:00:00 2001
+From f59f431174b876e1fb64e982f1b4f3848376a840 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 287b21864154..42a8141c36bb 100644
+index 930941fe8558..fad53b15cc52 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 1a0d884..126b83e 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 43515a2cf000fef0b08521b14a03191bbbd81865 Mon Sep 17 00:00:00 2001
+From 199b980b8aa03a9d102d33f1353b5e94fb255ea8 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 de9fad7..769dd45 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 6e87ead1a81b300f69a5444b0e32ee2db189d6e3 Mon Sep 17 00:00:00 2001
+From 9b0acc4e9fb202a4d224fbf5eba54576fdb95ea3 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,10 +18,10 @@ 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 5bd2e5061f3c..8a63dd8c0e60 100644
+index af1f7a6e5c48..0b3bbdeab5f3 100644
 --- a/clang/lib/Driver/ToolChains/Linux.cpp
 +++ b/clang/lib/Driver/ToolChains/Linux.cpp
-@@ -479,8 +479,8 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
+@@ -476,8 +476,8 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
      LibDir = "lib64";
      Loader =
          (tools::ppc::hasPPCAbiArg(Args, "elfv2")) ? "ld64.so.2" : "ld64.so.1";
@@ -32,7 +32,7 @@ index 5bd2e5061f3c..8a63dd8c0e60 100644
          LibDir = "lib";
      }
      break;
-@@ -488,8 +488,8 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
+@@ -485,8 +485,8 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
      LibDir = "lib64";
      Loader =
          (tools::ppc::hasPPCAbiArg(Args, "elfv1")) ? "ld64.so.1" : "ld64.so.2";
@@ -43,7 +43,7 @@ index 5bd2e5061f3c..8a63dd8c0e60 100644
          LibDir = "lib";
      }
      break;
-@@ -513,8 +513,8 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
+@@ -510,8 +510,8 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
    case llvm::Triple::sparcv9:
      LibDir = "lib64";
      Loader = "ld-linux.so.2";
@@ -54,7 +54,7 @@ index 5bd2e5061f3c..8a63dd8c0e60 100644
          LibDir = "lib";
      }
      break;
-@@ -531,8 +531,8 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
+@@ -528,8 +528,8 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
  
      LibDir = X32 ? "libx32" : "lib64";
      Loader = X32 ? "ld-linux-x32.so.2" : "ld-linux-x86-64.so.2";
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 a26574d..84948b2 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 e08f5f92d3d52f3716e71cb5b2a074766eb0e150 Mon Sep 17 00:00:00 2001
+From 90d69c23d95ae59ddbc6c2383ea30f622f09f4eb 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 fd0f3e6..0e23e87 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 2d88ade091c2f3f66de514d398e5d22d0a7bd065 Mon Sep 17 00:00:00 2001
+From 5c6b926de61fb1c7f2bf425fe09bab0bf59ac101 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 19c13afe048d..458acb47a45d 100644
+index cd0bf93aa299..54ed719c9f0c 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-compiler-rt-Include-stddef.h.patch b/recipes-devtools/clang/clang/0024-compiler-rt-Include-stddef.h.patch
index 0144f5c..8a61621 100644
--- a/recipes-devtools/clang/clang/0024-compiler-rt-Include-stddef.h.patch
+++ b/recipes-devtools/clang/clang/0024-compiler-rt-Include-stddef.h.patch
@@ -1,4 +1,4 @@
-From 26bd74255d5fdf7a9dd0fb9140e0f6c2b9be5ac6 Mon Sep 17 00:00:00 2001
+From 83c73d91b61f989a8e3d4b96ada4f10c5c426c73 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 6 Feb 2021 12:44:30 -0800
 Subject: [PATCH] compiler-rt: Include stddef.h
diff --git a/recipes-devtools/clang/clang/0025-llvm-Do-not-use-find_library-for-ncurses.patch b/recipes-devtools/clang/clang/0025-llvm-Do-not-use-find_library-for-ncurses.patch
index dba22ec..2e08284 100644
--- a/recipes-devtools/clang/clang/0025-llvm-Do-not-use-find_library-for-ncurses.patch
+++ b/recipes-devtools/clang/clang/0025-llvm-Do-not-use-find_library-for-ncurses.patch
@@ -1,4 +1,4 @@
-From a39a58f080877b99b1ef580f7915c547ad0112db Mon Sep 17 00:00:00 2001
+From e3f5f4346d0faeca424ce0494fbc2b1f75373e5f 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/0026-llvm-Insert-anchor-for-adding-OE-distro-vendor-names.patch b/recipes-devtools/clang/clang/0026-llvm-Insert-anchor-for-adding-OE-distro-vendor-names.patch
index 412a030..bf4f475 100644
--- a/recipes-devtools/clang/clang/0026-llvm-Insert-anchor-for-adding-OE-distro-vendor-names.patch
+++ b/recipes-devtools/clang/clang/0026-llvm-Insert-anchor-for-adding-OE-distro-vendor-names.patch
@@ -1,4 +1,4 @@
-From c5ea14dd34a2d6ba93c94533b43ad83f560831b6 Mon Sep 17 00:00:00 2001
+From d008023e9fcd2615ca21d74c85e197570ba24502 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/0027-compiler-rt-Use-mcr-based-barrier-on-armv6.patch b/recipes-devtools/clang/clang/0027-compiler-rt-Use-mcr-based-barrier-on-armv6.patch
index c7dd945..0f7d0df 100644
--- a/recipes-devtools/clang/clang/0027-compiler-rt-Use-mcr-based-barrier-on-armv6.patch
+++ b/recipes-devtools/clang/clang/0027-compiler-rt-Use-mcr-based-barrier-on-armv6.patch
@@ -1,4 +1,4 @@
-From e52894aae026b217e0dae193b1c1203de5e7792e Mon Sep 17 00:00:00 2001
+From 656ce3eec5ca681fdbcc137f86cbf48de920f3cc 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/0028-clang-Switch-defaults-to-dwarf-5-debug-info-on-Linux.patch b/recipes-devtools/clang/clang/0028-clang-Switch-defaults-to-dwarf-5-debug-info-on-Linux.patch
index ade74d3..4418904 100644
--- a/recipes-devtools/clang/clang/0028-clang-Switch-defaults-to-dwarf-5-debug-info-on-Linux.patch
+++ b/recipes-devtools/clang/clang/0028-clang-Switch-defaults-to-dwarf-5-debug-info-on-Linux.patch
@@ -1,4 +1,4 @@
-From 332447757e61e5c7ca0b3fbeafcaf0c53b308174 Mon Sep 17 00:00:00 2001
+From b85085aee33ceeee4aee46b8b7c293f1b0de5f6a 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/0029-compiler-rt-Do-not-use-backtrace-APIs-on-non-glibc-l.patch b/recipes-devtools/clang/clang/0029-compiler-rt-Do-not-use-backtrace-APIs-on-non-glibc-l.patch
index 4fd2a2f..fa86857 100644
--- a/recipes-devtools/clang/clang/0029-compiler-rt-Do-not-use-backtrace-APIs-on-non-glibc-l.patch
+++ b/recipes-devtools/clang/clang/0029-compiler-rt-Do-not-use-backtrace-APIs-on-non-glibc-l.patch
@@ -1,4 +1,4 @@
-From 9ff4fbb42c182b11a6b7bd870cb82a6ae4896fe3 Mon Sep 17 00:00:00 2001
+From 8a2e12e1d4054b989018d31c28ec843300001739 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/0030-clang-Fix-x86-triple-for-non-debian-multiarch-linux-.patch b/recipes-devtools/clang/clang/0030-clang-Fix-x86-triple-for-non-debian-multiarch-linux-.patch
index f33663d..57ae8bf 100644
--- a/recipes-devtools/clang/clang/0030-clang-Fix-x86-triple-for-non-debian-multiarch-linux-.patch
+++ b/recipes-devtools/clang/clang/0030-clang-Fix-x86-triple-for-non-debian-multiarch-linux-.patch
@@ -1,4 +1,4 @@
-From 4cb3ad387cb2b4eb9c9ec8243aaafbffc71c9ede Mon Sep 17 00:00:00 2001
+From 329d1ae9d9c5f4b7453865dc6fbb9c5341a4d02d 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,10 +12,10 @@ 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 8a63dd8c0e60..66874319fc44 100644
+index 0b3bbdeab5f3..b73644df5641 100644
 --- a/clang/lib/Driver/ToolChains/Linux.cpp
 +++ b/clang/lib/Driver/ToolChains/Linux.cpp
-@@ -622,6 +622,9 @@ void Linux::addLibStdCxxIncludePaths(const llvm::opt::ArgList &DriverArgs,
+@@ -619,6 +619,9 @@ void Linux::addLibStdCxxIncludePaths(const llvm::opt::ArgList &DriverArgs,
        GCCInstallation.getTriple().getArch() == llvm::Triple::x86
            ? "i386-linux-gnu"
            : TripleStr;
diff --git a/recipes-devtools/clang/clang/0031-compiler-rt-Link-scudo-with-SANITIZER_CXX_ABI_LIBRAR.patch b/recipes-devtools/clang/clang/0031-compiler-rt-Link-scudo-with-SANITIZER_CXX_ABI_LIBRAR.patch
index e3ba90b..0d05abc 100644
--- a/recipes-devtools/clang/clang/0031-compiler-rt-Link-scudo-with-SANITIZER_CXX_ABI_LIBRAR.patch
+++ b/recipes-devtools/clang/clang/0031-compiler-rt-Link-scudo-with-SANITIZER_CXX_ABI_LIBRAR.patch
@@ -1,4 +1,4 @@
-From ce655e90531061414002634584590761734ce229 Mon Sep 17 00:00:00 2001
+From 3b4033d5a25f03ec9496151ae868cf0f0e63a6ae 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/0032-compiler-rt-Link-scudo-standalone-with-libatomic-on-.patch b/recipes-devtools/clang/clang/0032-compiler-rt-Link-scudo-standalone-with-libatomic-on-.patch
index ea86ce6..79fef6d 100644
--- a/recipes-devtools/clang/clang/0032-compiler-rt-Link-scudo-standalone-with-libatomic-on-.patch
+++ b/recipes-devtools/clang/clang/0032-compiler-rt-Link-scudo-standalone-with-libatomic-on-.patch
@@ -1,4 +1,4 @@
-From b7dab91761d8656d802da8d0d754352f58fb05c9 Mon Sep 17 00:00:00 2001
+From 1e5dfaf08426f235a92081aadda5ae2a149ff871 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/0033-libunwind-Added-unw_backtrace-method.patch b/recipes-devtools/clang/clang/0033-libunwind-Added-unw_backtrace-method.patch
index b04c440..ef2a7f3 100644
--- a/recipes-devtools/clang/clang/0033-libunwind-Added-unw_backtrace-method.patch
+++ b/recipes-devtools/clang/clang/0033-libunwind-Added-unw_backtrace-method.patch
@@ -1,4 +1,4 @@
-From a9ac0832f39e10a08d8b49b7c4968cc30100f706 Mon Sep 17 00:00:00 2001
+From 049cffbdf0e6e19037a5bc49483e6d68b18d6a0e 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/0034-compiler-rt-Use-uintptr_t-instead-of-_Unwind_Word.patch b/recipes-devtools/clang/clang/0034-compiler-rt-Use-uintptr_t-instead-of-_Unwind_Word.patch
index c1097db..ea40098 100644
--- a/recipes-devtools/clang/clang/0034-compiler-rt-Use-uintptr_t-instead-of-_Unwind_Word.patch
+++ b/recipes-devtools/clang/clang/0034-compiler-rt-Use-uintptr_t-instead-of-_Unwind_Word.patch
@@ -1,4 +1,4 @@
-From 4ff7a960f67ee8b0df09fb76113d9a2380e4b802 Mon Sep 17 00:00:00 2001
+From 54593b1564c12f55da088f3d6c68d4a55e411083 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/0035-compiler-rt-Do-not-force-thumb-mode-directive.patch b/recipes-devtools/clang/clang/0035-compiler-rt-Do-not-force-thumb-mode-directive.patch
new file mode 100644
index 0000000..2597926
--- /dev/null
+++ b/recipes-devtools/clang/clang/0035-compiler-rt-Do-not-force-thumb-mode-directive.patch
@@ -0,0 +1,46 @@
+From 69a653669e6cdad91803143aca02706e7f7228d3 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
+
+.thumb_func was not switching mode until [1]
+so it did not show up but now that .thumb_func (without argument) is
+switching mode, its causing build failures on armv6 ( rpi0 ) even when
+build is explicitly asking for this file to be built with -marm (ARM
+mode), therefore use DEFINE_COMPILERRT_FUNCTION macro to add function
+header which considers arch and mode from compiler cmdline to decide if
+the function is built using thumb mode or arm mode.
+
+[1] https://reviews.llvm.org/D101975
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ compiler-rt/lib/builtins/arm/sync-ops.h | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/compiler-rt/lib/builtins/arm/sync-ops.h b/compiler-rt/lib/builtins/arm/sync-ops.h
+index 7a26170741ad..d914f9d3a109 100644
+--- a/compiler-rt/lib/builtins/arm/sync-ops.h
++++ b/compiler-rt/lib/builtins/arm/sync-ops.h
+@@ -16,9 +16,8 @@
+ 
+ #define SYNC_OP_4(op)                                                          \
+   .p2align 2;                                                                  \
+-  .thumb;                                                                      \
+   .syntax unified;                                                             \
+-  DEFINE_COMPILERRT_THUMB_FUNCTION(__sync_fetch_and_##op)                      \
++  DEFINE_COMPILERRT_FUNCTION(__sync_fetch_and_##op)                            \
+   DMB;                                                                         \
+   mov r12, r0;                                                                 \
+   LOCAL_LABEL(tryatomic_##op) : ldrex r0, [r12];                               \
+@@ -31,9 +30,8 @@
+ 
+ #define SYNC_OP_8(op)                                                          \
+   .p2align 2;                                                                  \
+-  .thumb;                                                                      \
+   .syntax unified;                                                             \
+-  DEFINE_COMPILERRT_THUMB_FUNCTION(__sync_fetch_and_##op)                      \
++  DEFINE_COMPILERRT_FUNCTION(__sync_fetch_and_##op)                            \
+   push {r4, r5, r6, lr};                                                       \
+   DMB;                                                                         \
+   mov r12, r0;                                                                 \
diff --git a/recipes-devtools/clang/common.inc b/recipes-devtools/clang/common.inc
index 71017f1..b01abf9 100644
--- a/recipes-devtools/clang/common.inc
+++ b/recipes-devtools/clang/common.inc
@@ -44,6 +44,7 @@ SRC_URI = "\
     file://0032-compiler-rt-Link-scudo-standalone-with-libatomic-on-.patch \
     file://0033-libunwind-Added-unw_backtrace-method.patch \
     file://0034-compiler-rt-Use-uintptr_t-instead-of-_Unwind_Word.patch \
+    file://0035-compiler-rt-Do-not-force-thumb-mode-directive.patch \
 "
 # Fallback to no-PIE if not set
 GCCPIE ??= ""