38 files changed, 103 insertions, 41 deletions

diff --git a/recipes-devtools/clang/clang.inc b/recipes-devtools/clang/clang.inc
index 85702cf..978bc31 100644
--- a/recipes-devtools/clang/clang.inc
+++ b/recipes-devtools/clang/clang.inc
@@ -8,7 +8,7 @@ MAJOR_VER = "14"
 MINOR_VER = "0"
 PATCH_VER = "0"
 
-SRCREV ?= "42a797ef011bd920bb7b781a752b925362b9754c"
+SRCREV ?= "2fe5bf57172cebf5a3f0b3f82552cf5c2122eca2"
 
 PV = "${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}"
 BRANCH = "release/14.x"
diff --git a/recipes-devtools/clang/clang/0001-libcxxabi-Find-libunwind-headers-when-LIBCXXABI_LIBU.patch b/recipes-devtools/clang/clang/0001-libcxxabi-Find-libunwind-headers-when-LIBCXXABI_LIBU.patch
index 1bf7480..b8fa1c3 100644
--- a/recipes-devtools/clang/clang/0001-libcxxabi-Find-libunwind-headers-when-LIBCXXABI_LIBU.patch
+++ b/recipes-devtools/clang/clang/0001-libcxxabi-Find-libunwind-headers-when-LIBCXXABI_LIBU.patch
@@ -1,4 +1,4 @@
-From 5b502aa8a8a8e33082912e46e48ba43d7eb0f196 Mon Sep 17 00:00:00 2001
+From 0417616e62aaed9438d86bc5b9cd0255378de665 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 58c21059c602..7709aedf0bde 100644
+index 8e8cdf8ad737..9a0edc701752 100644
 --- a/libcxxabi/CMakeLists.txt
 +++ b/libcxxabi/CMakeLists.txt
-@@ -525,14 +525,9 @@ endif()
+@@ -535,14 +535,9 @@ endif()
  # Setup Source Code
  #===============================================================================
  
@@ -36,7 +36,7 @@ index 58c21059c602..7709aedf0bde 100644
      PATHS ${LIBCXXABI_LIBUNWIND_INCLUDES}
            ${LIBCXXABI_LIBUNWIND_PATH}/include
            ${CMAKE_BINARY_DIR}/${LIBCXXABI_LIBUNWIND_INCLUDES}
-@@ -543,15 +538,21 @@ if (LIBCXXABI_USE_LLVM_UNWINDER OR LLVM_NATIVE_ARCH MATCHES ARM)
+@@ -553,15 +548,21 @@ if (LIBCXXABI_USE_LLVM_UNWINDER OR LLVM_NATIVE_ARCH MATCHES ARM)
      NO_CMAKE_FIND_ROOT_PATH
    )
  
diff --git a/recipes-devtools/clang/clang/0002-compiler-rt-support-a-new-embedded-linux-target.patch b/recipes-devtools/clang/clang/0002-compiler-rt-support-a-new-embedded-linux-target.patch
index 89ac3d1..c009cd9 100644
--- a/recipes-devtools/clang/clang/0002-compiler-rt-support-a-new-embedded-linux-target.patch
+++ b/recipes-devtools/clang/clang/0002-compiler-rt-support-a-new-embedded-linux-target.patch
@@ -1,4 +1,4 @@
-From a21dbb76c8ef5812b2e05cf93682da02650b6166 Mon Sep 17 00:00:00 2001
+From 923f84c5142703f22faf22a5886f1d8735460e66 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/0003-compiler-rt-Simplify-cross-compilation.-Don-t-use-na.patch b/recipes-devtools/clang/clang/0003-compiler-rt-Simplify-cross-compilation.-Don-t-use-na.patch
index b573ad8..a7b4a46 100644
--- a/recipes-devtools/clang/clang/0003-compiler-rt-Simplify-cross-compilation.-Don-t-use-na.patch
+++ b/recipes-devtools/clang/clang/0003-compiler-rt-Simplify-cross-compilation.-Don-t-use-na.patch
@@ -1,4 +1,4 @@
-From 1a7e174cddac6738c5bc28fd642be8cc687138bf Mon Sep 17 00:00:00 2001
+From a7afbe16631bd2846353f92e8d8f9c91c02539b8 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/0004-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch b/recipes-devtools/clang/clang/0004-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch
index 897b4c3..b354c29 100644
--- a/recipes-devtools/clang/clang/0004-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch
+++ b/recipes-devtools/clang/clang/0004-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch
@@ -1,4 +1,4 @@
-From cac469f7a8ea6fe4bfb4e6151a5dd058dfa62947 Mon Sep 17 00:00:00 2001
+From 3430cb43036fe464c62d97c79fa6a5b2885f1c8b 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/0005-llvm-allow-env-override-of-exe-path.patch b/recipes-devtools/clang/clang/0005-llvm-allow-env-override-of-exe-path.patch
index beb0091..03f58e8 100644
--- a/recipes-devtools/clang/clang/0005-llvm-allow-env-override-of-exe-path.patch
+++ b/recipes-devtools/clang/clang/0005-llvm-allow-env-override-of-exe-path.patch
@@ -1,4 +1,4 @@
-From 8402337515bc0c75af621551dca9eb1cfc4ae611 Mon Sep 17 00:00:00 2001
+From 8c02d0f6f5fedb5b7bbbdbf5fcd8763481f3b606 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/0006-clang-driver-Check-sysroot-for-ldso-path.patch b/recipes-devtools/clang/clang/0006-clang-driver-Check-sysroot-for-ldso-path.patch
index b32f18e..1d48ba4 100644
--- a/recipes-devtools/clang/clang/0006-clang-driver-Check-sysroot-for-ldso-path.patch
+++ b/recipes-devtools/clang/clang/0006-clang-driver-Check-sysroot-for-ldso-path.patch
@@ -1,4 +1,4 @@
-From 5c8b6edfe03a72a75e698db7cbc7c409f08e3c45 Mon Sep 17 00:00:00 2001
+From d63cfd77ccd45ca5cc927135fcc0367b4949672a 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/0007-clang-Driver-tools.cpp-Add-lssp_nonshared-on-musl.patch b/recipes-devtools/clang/clang/0007-clang-Driver-tools.cpp-Add-lssp_nonshared-on-musl.patch
index fccc41d..bd66784 100644
--- a/recipes-devtools/clang/clang/0007-clang-Driver-tools.cpp-Add-lssp_nonshared-on-musl.patch
+++ b/recipes-devtools/clang/clang/0007-clang-Driver-tools.cpp-Add-lssp_nonshared-on-musl.patch
@@ -1,4 +1,4 @@
-From 00484dc7cdf327f97fe09389fe5fe2ebd9e8fba4 Mon Sep 17 00:00:00 2001
+From 9b79e071bedb6427134a336da8bd9a6c13b04595 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Thu, 19 May 2016 21:11:06 -0700
 Subject: [PATCH] clang: Driver/tools.cpp: Add -lssp_nonshared on musl
diff --git a/recipes-devtools/clang/clang/0008-clang-musl-ppc-does-not-support-128-bit-long-double.patch b/recipes-devtools/clang/clang/0008-clang-musl-ppc-does-not-support-128-bit-long-double.patch
index a8f6335..1ab63b6 100644
--- a/recipes-devtools/clang/clang/0008-clang-musl-ppc-does-not-support-128-bit-long-double.patch
+++ b/recipes-devtools/clang/clang/0008-clang-musl-ppc-does-not-support-128-bit-long-double.patch
@@ -1,4 +1,4 @@
-From bcf28119ce4c70e6d9c140d3393d556af897ddce Mon Sep 17 00:00:00 2001
+From 537fcb8e264af0e8f84ae75d6b98eb8e70d01500 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/0009-clang-Prepend-trailing-to-sysroot.patch b/recipes-devtools/clang/clang/0009-clang-Prepend-trailing-to-sysroot.patch
index 5f41f6a..f277df4 100644
--- a/recipes-devtools/clang/clang/0009-clang-Prepend-trailing-to-sysroot.patch
+++ b/recipes-devtools/clang/clang/0009-clang-Prepend-trailing-to-sysroot.patch
@@ -1,4 +1,4 @@
-From 6ee100ac3386d411e03855c5cdb9df7545a127de Mon Sep 17 00:00:00 2001
+From d06565e3abf15ebf436de330b69934d1126f7683 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/0010-clang-Look-inside-the-target-sysroot-for-compiler-ru.patch b/recipes-devtools/clang/clang/0010-clang-Look-inside-the-target-sysroot-for-compiler-ru.patch
index c735b40..92aab23 100644
--- a/recipes-devtools/clang/clang/0010-clang-Look-inside-the-target-sysroot-for-compiler-ru.patch
+++ b/recipes-devtools/clang/clang/0010-clang-Look-inside-the-target-sysroot-for-compiler-ru.patch
@@ -1,4 +1,4 @@
-From 17bf3579a12359af825ca2815e273470a483ebb7 Mon Sep 17 00:00:00 2001
+From 1415af655aee9c5c4eff7d76b66c5633f95515f3 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/0011-clang-Define-releative-gcc-installation-dir.patch b/recipes-devtools/clang/clang/0011-clang-Define-releative-gcc-installation-dir.patch
index bbe4eb7..8d88377 100644
--- a/recipes-devtools/clang/clang/0011-clang-Define-releative-gcc-installation-dir.patch
+++ b/recipes-devtools/clang/clang/0011-clang-Define-releative-gcc-installation-dir.patch
@@ -1,4 +1,4 @@
-From 8f44109cb3b837966d401233daf2887a0a0d579b Mon Sep 17 00:00:00 2001
+From 7aeee55cfc8c33ce0c1d3a77a4ac1bca28916eb1 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 20 Mar 2021 16:09:16 -0700
 Subject: [PATCH] clang: Define / releative gcc installation dir
diff --git a/recipes-devtools/clang/clang/0012-clang-Add-lpthread-and-ldl-along-with-lunwind-for-st.patch b/recipes-devtools/clang/clang/0012-clang-Add-lpthread-and-ldl-along-with-lunwind-for-st.patch
index 4d91a7a..bde750f 100644
--- a/recipes-devtools/clang/clang/0012-clang-Add-lpthread-and-ldl-along-with-lunwind-for-st.patch
+++ b/recipes-devtools/clang/clang/0012-clang-Add-lpthread-and-ldl-along-with-lunwind-for-st.patch
@@ -1,4 +1,4 @@
-From 7d99f8a3c0ddd74d188d54f82f957843456bcdde Mon Sep 17 00:00:00 2001
+From e0b95871ba134b6c22845a08985e801cbe525dda 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 6364cd133e0b..60ba461ea0f5 100644
+index dfcef2304040..dbc91e427dfb 100644
 --- a/clang/lib/Driver/ToolChains/CommonArgs.cpp
 +++ b/clang/lib/Driver/ToolChains/CommonArgs.cpp
 @@ -1472,6 +1472,8 @@ static void AddUnwindLibrary(const ToolChain &TC, const Driver &D,
diff --git a/recipes-devtools/clang/clang/0013-Pass-PYTHON_EXECUTABLE-when-cross-compiling-for-nati.patch b/recipes-devtools/clang/clang/0013-Pass-PYTHON_EXECUTABLE-when-cross-compiling-for-nati.patch
index 4bbe6b5..76a568e 100644
--- a/recipes-devtools/clang/clang/0013-Pass-PYTHON_EXECUTABLE-when-cross-compiling-for-nati.patch
+++ b/recipes-devtools/clang/clang/0013-Pass-PYTHON_EXECUTABLE-when-cross-compiling-for-nati.patch
@@ -1,4 +1,4 @@
-From b6b764295a5d003264dd5b843ff1f513a3c40991 Mon Sep 17 00:00:00 2001
+From d82dd9efbc79492276b481c24261489ae72dbd87 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/0014-Check-for-atomic-double-intrinsics.patch b/recipes-devtools/clang/clang/0014-Check-for-atomic-double-intrinsics.patch
index 4e5ad63..592c968 100644
--- a/recipes-devtools/clang/clang/0014-Check-for-atomic-double-intrinsics.patch
+++ b/recipes-devtools/clang/clang/0014-Check-for-atomic-double-intrinsics.patch
@@ -1,4 +1,4 @@
-From 1b1bcc66f885233a3378ba9819c9a20323490cea Mon Sep 17 00:00:00 2001
+From 70d54f8ef8d98974c553ccac0f846d15c66c2c3c 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/0015-libcxx-Add-compiler-runtime-library-to-link-step-for.patch b/recipes-devtools/clang/clang/0015-libcxx-Add-compiler-runtime-library-to-link-step-for.patch
index cc22366..ff318cb 100644
--- a/recipes-devtools/clang/clang/0015-libcxx-Add-compiler-runtime-library-to-link-step-for.patch
+++ b/recipes-devtools/clang/clang/0015-libcxx-Add-compiler-runtime-library-to-link-step-for.patch
@@ -1,4 +1,4 @@
-From cc0a281fbf68db9fadc74cee24d63b12a0b4d1eb Mon Sep 17 00:00:00 2001
+From 35c3cd4c8e9135c29e6a32f453711ad3b98271dd 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/0016-clang-llvm-cmake-Fix-configure-for-packages-using-fi.patch b/recipes-devtools/clang/clang/0016-clang-llvm-cmake-Fix-configure-for-packages-using-fi.patch
index ba988e0..fe96ce7 100644
--- a/recipes-devtools/clang/clang/0016-clang-llvm-cmake-Fix-configure-for-packages-using-fi.patch
+++ b/recipes-devtools/clang/clang/0016-clang-llvm-cmake-Fix-configure-for-packages-using-fi.patch
@@ -1,4 +1,4 @@
-From ce947e2ae1759e393b387ac115d5540ec6f471f1 Mon Sep 17 00:00:00 2001
+From 4efe98f8c26712edee6b103be6a4279d7b47d251 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
diff --git a/recipes-devtools/clang/clang/0017-clang-Fix-resource-dir-location-for-cross-toolchains.patch b/recipes-devtools/clang/clang/0017-clang-Fix-resource-dir-location-for-cross-toolchains.patch
index 3a2b179..897d50f 100644
--- a/recipes-devtools/clang/clang/0017-clang-Fix-resource-dir-location-for-cross-toolchains.patch
+++ b/recipes-devtools/clang/clang/0017-clang-Fix-resource-dir-location-for-cross-toolchains.patch
@@ -1,4 +1,4 @@
-From 85a600c78bcb5befd0f51e5551d0dd2f4c6b6f54 Mon Sep 17 00:00:00 2001
+From 24730a64a41a28d0716a7b013760eaea94f9b9bb 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
diff --git a/recipes-devtools/clang/clang/0018-clang-driver-Add-dyld-prefix-when-checking-sysroot-f.patch b/recipes-devtools/clang/clang/0018-clang-driver-Add-dyld-prefix-when-checking-sysroot-f.patch
index 70de0a3..6451c9c 100644
--- a/recipes-devtools/clang/clang/0018-clang-driver-Add-dyld-prefix-when-checking-sysroot-f.patch
+++ b/recipes-devtools/clang/clang/0018-clang-driver-Add-dyld-prefix-when-checking-sysroot-f.patch
@@ -1,4 +1,4 @@
-From 26c596cf7f4c3fbac5df62a8f19ebca083fd4d2c Mon Sep 17 00:00:00 2001
+From 9751d930cb00597199337a2776aa49542aed77ca 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/0019-clang-Use-python3-in-python-scripts.patch b/recipes-devtools/clang/clang/0019-clang-Use-python3-in-python-scripts.patch
index 078bc61..d481500 100644
--- a/recipes-devtools/clang/clang/0019-clang-Use-python3-in-python-scripts.patch
+++ b/recipes-devtools/clang/clang/0019-clang-Use-python3-in-python-scripts.patch
@@ -1,4 +1,4 @@
-From df4a3eb433329f68dc6ba74b9bd03664c3a62299 Mon Sep 17 00:00:00 2001
+From d12bbca6d0ea401559e7c97e6afadc2f153b1ab7 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/0020-For-x86_64-set-Yocto-based-GCC-install-search-path.patch b/recipes-devtools/clang/clang/0020-For-x86_64-set-Yocto-based-GCC-install-search-path.patch
index 640562f..c41cf49 100644
--- a/recipes-devtools/clang/clang/0020-For-x86_64-set-Yocto-based-GCC-install-search-path.patch
+++ b/recipes-devtools/clang/clang/0020-For-x86_64-set-Yocto-based-GCC-install-search-path.patch
@@ -1,4 +1,4 @@
-From abd7f4b0e7e10c7102685012cb9db0551be7037c Mon Sep 17 00:00:00 2001
+From 04a38139422e5ec7d03709725b3474e976989287 Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <hongxu.jia@windriver.com>
 Date: Mon, 25 Jan 2021 16:14:35 +0800
 Subject: [PATCH] For x86_64, set Yocto based GCC install search path
diff --git a/recipes-devtools/clang/clang/0021-llvm-Do-not-use-find_library-for-ncurses.patch b/recipes-devtools/clang/clang/0021-llvm-Do-not-use-find_library-for-ncurses.patch
index 28ef7ab..fc614cb 100644
--- a/recipes-devtools/clang/clang/0021-llvm-Do-not-use-find_library-for-ncurses.patch
+++ b/recipes-devtools/clang/clang/0021-llvm-Do-not-use-find_library-for-ncurses.patch
@@ -1,4 +1,4 @@
-From e06d9bce947249e18bd17f55852dad4e3ea671ac Mon Sep 17 00:00:00 2001
+From 138373ea249af22b94f5fee87a25a1151649a4e7 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/0022-llvm-Insert-anchor-for-adding-OE-distro-vendor-names.patch b/recipes-devtools/clang/clang/0022-llvm-Insert-anchor-for-adding-OE-distro-vendor-names.patch
index c0d2b6d..97c530f 100644
--- a/recipes-devtools/clang/clang/0022-llvm-Insert-anchor-for-adding-OE-distro-vendor-names.patch
+++ b/recipes-devtools/clang/clang/0022-llvm-Insert-anchor-for-adding-OE-distro-vendor-names.patch
@@ -1,4 +1,4 @@
-From 4a0571cc9e2401504c0675051c3e66143d0d87f6 Mon Sep 17 00:00:00 2001
+From 2aba65b9a02c484283927fc3273dddd633c54e63 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/0023-compiler-rt-Use-mcr-based-barrier-on-armv6.patch b/recipes-devtools/clang/clang/0023-compiler-rt-Use-mcr-based-barrier-on-armv6.patch
index b67d8d2..c6285c5 100644
--- a/recipes-devtools/clang/clang/0023-compiler-rt-Use-mcr-based-barrier-on-armv6.patch
+++ b/recipes-devtools/clang/clang/0023-compiler-rt-Use-mcr-based-barrier-on-armv6.patch
@@ -1,4 +1,4 @@
-From c4a8eebdbaea9eef3f4422497196627485de920e Mon Sep 17 00:00:00 2001
+From 839eebdbd31760e4bbc77ca047a4c593c3a8b722 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/0024-compiler-rt-Do-not-use-backtrace-APIs-on-non-glibc-l.patch b/recipes-devtools/clang/clang/0024-compiler-rt-Do-not-use-backtrace-APIs-on-non-glibc-l.patch
index 639563d..4e3f75a 100644
--- a/recipes-devtools/clang/clang/0024-compiler-rt-Do-not-use-backtrace-APIs-on-non-glibc-l.patch
+++ b/recipes-devtools/clang/clang/0024-compiler-rt-Do-not-use-backtrace-APIs-on-non-glibc-l.patch
@@ -1,4 +1,4 @@
-From 5ffa9adacd28053b6ff42d30907991fedb2ce75a Mon Sep 17 00:00:00 2001
+From 56d26beabeb171daddc2f55cf07cd16599c8132a 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/0025-clang-Fix-x86-triple-for-non-debian-multiarch-linux-.patch b/recipes-devtools/clang/clang/0025-clang-Fix-x86-triple-for-non-debian-multiarch-linux-.patch
index 56c97b6..d7afd15 100644
--- a/recipes-devtools/clang/clang/0025-clang-Fix-x86-triple-for-non-debian-multiarch-linux-.patch
+++ b/recipes-devtools/clang/clang/0025-clang-Fix-x86-triple-for-non-debian-multiarch-linux-.patch
@@ -1,4 +1,4 @@
-From a92c1148c71e0152d6b2027bf59c8eb46ecee800 Mon Sep 17 00:00:00 2001
+From 6bfee9c0356ef862635d60d33a117bdcb4d92e07 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/0026-compiler-rt-Link-scudo-with-SANITIZER_CXX_ABI_LIBRAR.patch b/recipes-devtools/clang/clang/0026-compiler-rt-Link-scudo-with-SANITIZER_CXX_ABI_LIBRAR.patch
index da038e2..13b13b8 100644
--- a/recipes-devtools/clang/clang/0026-compiler-rt-Link-scudo-with-SANITIZER_CXX_ABI_LIBRAR.patch
+++ b/recipes-devtools/clang/clang/0026-compiler-rt-Link-scudo-with-SANITIZER_CXX_ABI_LIBRAR.patch
@@ -1,4 +1,4 @@
-From 1caf16b9a0a6d195bc66da996d6bcd3f66eeff07 Mon Sep 17 00:00:00 2001
+From c672d84ae78cd4baf447149a0fd6a5586445b1af 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/0027-compiler-rt-Link-scudo-standalone-with-libatomic-on-.patch b/recipes-devtools/clang/clang/0027-compiler-rt-Link-scudo-standalone-with-libatomic-on-.patch
index 4585eed..86e693e 100644
--- a/recipes-devtools/clang/clang/0027-compiler-rt-Link-scudo-standalone-with-libatomic-on-.patch
+++ b/recipes-devtools/clang/clang/0027-compiler-rt-Link-scudo-standalone-with-libatomic-on-.patch
@@ -1,4 +1,4 @@
-From 8653885e3f7f0a90fe49b8d0bfbffc011ff44407 Mon Sep 17 00:00:00 2001
+From e7b99b5a52d64229196c01d79ef21bdb634434d1 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/0028-libunwind-Added-unw_backtrace-method.patch b/recipes-devtools/clang/clang/0028-libunwind-Added-unw_backtrace-method.patch
index f4a7c09..3a1f810 100644
--- a/recipes-devtools/clang/clang/0028-libunwind-Added-unw_backtrace-method.patch
+++ b/recipes-devtools/clang/clang/0028-libunwind-Added-unw_backtrace-method.patch
@@ -1,4 +1,4 @@
-From 2ee8622a6471cfd38878e8f83f72338c275cee8b Mon Sep 17 00:00:00 2001
+From 3e95203ee02d7b5d9d45ee157cf76478b52d36df 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/0029-Do-not-force-thumb-mode-directive.patch b/recipes-devtools/clang/clang/0029-Do-not-force-thumb-mode-directive.patch
index f22fd5c..098e0ee 100644
--- a/recipes-devtools/clang/clang/0029-Do-not-force-thumb-mode-directive.patch
+++ b/recipes-devtools/clang/clang/0029-Do-not-force-thumb-mode-directive.patch
@@ -1,4 +1,4 @@
-From 026dc43875ab8c0c3a28ae4650c5685cd530bb37 Mon Sep 17 00:00:00 2001
+From ce1a02de2daedf9377fd825e0a0a7524794469bb 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] Do not force thumb mode directive
diff --git a/recipes-devtools/clang/clang/0030-clang-Do-not-use-install-relative-libc-headers.patch b/recipes-devtools/clang/clang/0030-clang-Do-not-use-install-relative-libc-headers.patch
index 6f17144..7211cf9 100644
--- a/recipes-devtools/clang/clang/0030-clang-Do-not-use-install-relative-libc-headers.patch
+++ b/recipes-devtools/clang/clang/0030-clang-Do-not-use-install-relative-libc-headers.patch
@@ -1,4 +1,4 @@
-From d60663adf9941780ed5365a5a919cbcd8946ff74 Mon Sep 17 00:00:00 2001
+From 372c112411b2095c193eb972e0303dfa1173ad13 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Wed, 11 Aug 2021 18:37:11 -0700
 Subject: [PATCH] clang: Do not use install relative libc++ headers
diff --git a/recipes-devtools/clang/clang/0031-clang-Fix-how-driver-finds-GCC-installation-path-on-.patch b/recipes-devtools/clang/clang/0031-clang-Fix-how-driver-finds-GCC-installation-path-on-.patch
index 8bc5dee..608edc1 100644
--- a/recipes-devtools/clang/clang/0031-clang-Fix-how-driver-finds-GCC-installation-path-on-.patch
+++ b/recipes-devtools/clang/clang/0031-clang-Fix-how-driver-finds-GCC-installation-path-on-.patch
@@ -1,4 +1,4 @@
-From 9b9306ec9e11864631d64d8717763eaec4e25e8f Mon Sep 17 00:00:00 2001
+From 560d906295a0d72ee71f336bb3d01f05ffacc143 Mon Sep 17 00:00:00 2001
 From: David Abdurachmanov <david.abdurachmanov@sifive.com>
 Date: Wed, 20 Oct 2021 17:30:36 -0700
 Subject: [PATCH] clang: Fix how driver finds GCC installation path on
diff --git a/recipes-devtools/clang/clang/0032-Fix-lib-paths-for-OpenEmbedded-Host.patch b/recipes-devtools/clang/clang/0032-Fix-lib-paths-for-OpenEmbedded-Host.patch
index 1668dd5..6ff2d51 100644
--- a/recipes-devtools/clang/clang/0032-Fix-lib-paths-for-OpenEmbedded-Host.patch
+++ b/recipes-devtools/clang/clang/0032-Fix-lib-paths-for-OpenEmbedded-Host.patch
@@ -1,4 +1,4 @@
-From 6c066a1d1930ddaa95b0530c678bac71f47378b5 Mon Sep 17 00:00:00 2001
+From cb561e04416a281222a0b8989ec95f4c9bca4d85 Mon Sep 17 00:00:00 2001
 From: Changqing Li <changqing.li@windriver.com>
 Date: Tue, 7 Dec 2021 04:08:22 +0000
 Subject: [PATCH] Fix lib paths for OpenEmbedded Host
diff --git a/recipes-devtools/clang/clang/0033-Correct-library-search-path-for-OpenEmbedded-Host.patch b/recipes-devtools/clang/clang/0033-Correct-library-search-path-for-OpenEmbedded-Host.patch
index 4c365dd..4d29ad9 100644
--- a/recipes-devtools/clang/clang/0033-Correct-library-search-path-for-OpenEmbedded-Host.patch
+++ b/recipes-devtools/clang/clang/0033-Correct-library-search-path-for-OpenEmbedded-Host.patch
@@ -1,4 +1,4 @@
-From 504d643d31a52421c6dc03f617c17e287a1c4ff0 Mon Sep 17 00:00:00 2001
+From a0bdadeaffa94de5b03de7896d04c36114994ffb Mon Sep 17 00:00:00 2001
 From: Changqing Li <changqing.li@windriver.com>
 Date: Tue, 7 Dec 2021 04:55:48 +0000
 Subject: [PATCH] Correct library search path for OpenEmbedded Host
diff --git a/recipes-devtools/clang/clang/0034-lldb-Link-with-libatomic-on-x86.patch b/recipes-devtools/clang/clang/0034-lldb-Link-with-libatomic-on-x86.patch
index 9b142b5..4c1840b 100644
--- a/recipes-devtools/clang/clang/0034-lldb-Link-with-libatomic-on-x86.patch
+++ b/recipes-devtools/clang/clang/0034-lldb-Link-with-libatomic-on-x86.patch
@@ -1,4 +1,4 @@
-From 31902cb8d8d5df41295b489a47a6010e05a02ad7 Mon Sep 17 00:00:00 2001
+From 99cec6623e51de5a8e0edb1c8c36096368644168 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Tue, 8 Feb 2022 01:31:26 -0800
 Subject: [PATCH] lldb: Link with libatomic on x86
diff --git a/recipes-devtools/clang/clang/0035-clang-exclude-openembedded-distributions-from-settin.patch b/recipes-devtools/clang/clang/0035-clang-exclude-openembedded-distributions-from-settin.patch
index 3c2f314..399e1b6 100644
--- a/recipes-devtools/clang/clang/0035-clang-exclude-openembedded-distributions-from-settin.patch
+++ b/recipes-devtools/clang/clang/0035-clang-exclude-openembedded-distributions-from-settin.patch
@@ -1,4 +1,4 @@
-From ff6112490dcfa323f8ffe36d822fda2025003b6e Mon Sep 17 00:00:00 2001
+From c86a1eee2554d972f71930c4233203a1e1072540 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Fri, 11 Feb 2022 12:29:14 -0800
 Subject: [PATCH] clang: exclude openembedded distributions from setting rpath
@@ -18,7 +18,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 5 insertions(+)
 
 diff --git a/clang/lib/Driver/ToolChains/CommonArgs.cpp b/clang/lib/Driver/ToolChains/CommonArgs.cpp
-index 60ba461ea0f5..67d446c0998a 100644
+index dbc91e427dfb..b2cbfca9898c 100644
 --- a/clang/lib/Driver/ToolChains/CommonArgs.cpp
 +++ b/clang/lib/Driver/ToolChains/CommonArgs.cpp
 @@ -648,6 +648,11 @@ void tools::addLTOOptions(const ToolChain &ToolChain, const ArgList &Args,
diff --git a/recipes-devtools/clang/clang/0036-Avoid-infinite-loop-between-DAGCombiner-visitMUL-and.patch b/recipes-devtools/clang/clang/0036-Avoid-infinite-loop-between-DAGCombiner-visitMUL-and.patch
new file mode 100644
index 0000000..040fbc7
--- /dev/null
+++ b/recipes-devtools/clang/clang/0036-Avoid-infinite-loop-between-DAGCombiner-visitMUL-and.patch
@@ -0,0 +1,61 @@
+From 58d93601653d8fb3698b9792a45e5661bbc87924 Mon Sep 17 00:00:00 2001
+From: Alex Bradbury <asb@lowrisc.org>
+Date: Wed, 23 Feb 2022 11:05:46 +0000
+Subject: [PATCH] Avoid infinite loop between DAGCombiner::visitMUL and
+ RISCVISelLowering::transformAddImmMulImm
+
+See https://github.com/llvm/llvm-project/issues/53831 for a full discussion.
+
+The basic issue is that DAGCombiner::visitMUL and
+RISCVISelLowering;:transformAddImmMullImm get stuck in a loop, as the
+current checks in transformAddImmMulImm aren't sufficient to avoid all
+cases where DAGCombiner::isMulAddWithConstProfitable might trigger a
+transformation. This patch makes transformAddImmMulImm bail out if C0
+(the constant used for multiplication) has more than one use.
+
+Differential Revision: https://reviews.llvm.org/D120332
+
+(cherry picked from commit c5bcfb983e47167a8a1826c1a64d7aa1849add06)
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ llvm/lib/Target/RISCV/RISCVISelLowering.cpp |  5 +++++
+ llvm/test/CodeGen/RISCV/addimm-mulimm.ll    | 13 +++++++++++++
+ 2 files changed, 18 insertions(+)
+
+diff --git a/llvm/lib/Target/RISCV/RISCVISelLowering.cpp b/llvm/lib/Target/RISCV/RISCVISelLowering.cpp
+index 2fe491ad5ea4..7f5555b9b7a8 100644
+--- a/llvm/lib/Target/RISCV/RISCVISelLowering.cpp
++++ b/llvm/lib/Target/RISCV/RISCVISelLowering.cpp
+@@ -7203,6 +7203,11 @@ static SDValue transformAddImmMulImm(SDNode *N, SelectionDAG &DAG,
+   auto *N1C = dyn_cast<ConstantSDNode>(N->getOperand(1));
+   if (!N0C || !N1C)
+     return SDValue();
++  // If N0C has multiple uses it's possible one of the cases in
++  // DAGCombiner::isMulAddWithConstProfitable will be true, which would result
++  // in an infinite loop.
++  if (!N0C->hasOneUse())
++    return SDValue();
+   int64_t C0 = N0C->getSExtValue();
+   int64_t C1 = N1C->getSExtValue();
+   int64_t CA, CB;
+diff --git a/llvm/test/CodeGen/RISCV/addimm-mulimm.ll b/llvm/test/CodeGen/RISCV/addimm-mulimm.ll
+index 4706f3904701..adf0b98742e1 100644
+--- a/llvm/test/CodeGen/RISCV/addimm-mulimm.ll
++++ b/llvm/test/CodeGen/RISCV/addimm-mulimm.ll
+@@ -872,3 +872,16 @@ define i64 @mulneg3000_sub8990_c(i64 %x) {
+   %tmp1 = add i64 %tmp0, -8990
+   ret i64 %tmp1
+ }
++
++; This test case previously caused an infinite loop between transformations
++; performed in RISCVISelLowering;:transformAddImmMulImm and
++; DAGCombiner::visitMUL.
++define i1 @pr53831(i32 %x) {
++  %tmp0 = add i32 %x, 1
++  %tmp1 = mul i32 %tmp0, 24
++  %tmp2 = add i32 %tmp1, 1
++  %tmp3 = mul i32 %x, 24
++  %tmp4 = add i32 %tmp3, 2048
++  %tmp5 = icmp eq i32 %tmp4, %tmp2
++       ret i1 %tmp5
++}
diff --git a/recipes-devtools/clang/common.inc b/recipes-devtools/clang/common.inc
index b8489eb..e8db32c 100644
--- a/recipes-devtools/clang/common.inc
+++ b/recipes-devtools/clang/common.inc
@@ -45,6 +45,7 @@ SRC_URI = "\
     file://0033-Correct-library-search-path-for-OpenEmbedded-Host.patch \
     file://0034-lldb-Link-with-libatomic-on-x86.patch \
     file://0035-clang-exclude-openembedded-distributions-from-settin.patch \
+    file://0036-Avoid-infinite-loop-between-DAGCombiner-visitMUL-and.patch \
     "
 # Fallback to no-PIE if not set
 GCCPIE ??= ""