clang: Refresh patches and use static libunwind.a during default link

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

19 files changed, 63 insertions, 63 deletions

diff --git a/recipes-devtools/clang/clang/0000-clang-Enable-SSP-and-PIE-by-default.patch b/recipes-devtools/clang/clang/0001-clang-Enable-SSP-and-PIE-by-default.patch
index d7b76b1..ac7abed 100644
--- a/recipes-devtools/clang/clang/0000-clang-Enable-SSP-and-PIE-by-default.patch
+++ b/recipes-devtools/clang/clang/0001-clang-Enable-SSP-and-PIE-by-default.patch
@@ -1,7 +1,7 @@
-From 76718d7d905029a2304c1ad275cd528b404dc7d4 Mon Sep 17 00:00:00 2001
+From 400745857bc7bbcc31df9cab36d1fa9816c3c07b Mon Sep 17 00:00:00 2001
 From: Evangelos Foutras <evangelos@foutrelis.com>
 Date: Thu, 20 Sep 2018 06:20:28 +0300
-Subject: [PATCH] clang: Enable SSP and PIE by default
+Subject: [PATCH 01/18] clang: Enable SSP and PIE by default
 
 This is a minimal set of changes needed to make clang use SSP and PIE by
 default on Arch Linux. Tests that were easy to adjust have been changed
@@ -22,10 +22,10 @@ of a compile-time option (https://bugs.llvm.org/show_bug.cgi?id=13410)
  2 files changed, 13 insertions(+), 2 deletions(-)
 
 diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp
-index 5dc7b506d6f..4dfef25aa63 100644
+index 65ab9b2daf5..5b757b8028c 100644
 --- a/clang/lib/Driver/ToolChains/Linux.cpp
 +++ b/clang/lib/Driver/ToolChains/Linux.cpp
-@@ -976,8 +976,18 @@ void Linux::AddIAMCUIncludeArgs(const ArgList &DriverArgs,
+@@ -968,8 +968,18 @@ void Linux::AddIAMCUIncludeArgs(const ArgList &DriverArgs,
  }
  
  bool Linux::isPIEDefault() const {
diff --git a/recipes-devtools/clang/clang/0001-clang-driver-Use-lib-for-ldso-on-OE.patch b/recipes-devtools/clang/clang/0002-clang-driver-Use-lib-for-ldso-on-OE.patch
index 42e920a..9b92b69 100644
--- a/recipes-devtools/clang/clang/0001-clang-driver-Use-lib-for-ldso-on-OE.patch
+++ b/recipes-devtools/clang/clang/0002-clang-driver-Use-lib-for-ldso-on-OE.patch
@@ -1,7 +1,7 @@
-From 4fe687292a2b2952a360eecdd6954db11750c903 Mon Sep 17 00:00:00 2001
+From 089b7e146cfc86fafe7c21e74238d638ae997df9 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 21 May 2016 21:52:36 -0700
-Subject: [PATCH 01/15] clang: driver: Use /lib for ldso on OE
+Subject: [PATCH 02/18] clang: driver: Use /lib for ldso on OE
 
 OE does not follow the default base_libdir
 that clang has, therefore adjust it for OE
@@ -15,7 +15,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp
-index 65ab9b2daf5..33e2fcec299 100644
+index 5b757b8028c..552d329e7b8 100644
 --- a/clang/lib/Driver/ToolChains/Linux.cpp
 +++ b/clang/lib/Driver/ToolChains/Linux.cpp
 @@ -590,12 +590,12 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
diff --git a/recipes-devtools/clang/clang/0002-clang-Driver-tools.cpp-Add-lssp_nonshared-on-musl.patch b/recipes-devtools/clang/clang/0003-clang-Driver-tools.cpp-Add-lssp_nonshared-on-musl.patch
index 35b3d4f..217facc 100644
--- a/recipes-devtools/clang/clang/0002-clang-Driver-tools.cpp-Add-lssp_nonshared-on-musl.patch
+++ b/recipes-devtools/clang/clang/0003-clang-Driver-tools.cpp-Add-lssp_nonshared-on-musl.patch
@@ -1,7 +1,7 @@
-From 14a9ed6fa67f7e988d85408554f88a8d72c6a607 Mon Sep 17 00:00:00 2001
+From c4e958d8d61d443cb882214993b129c45bd8a21d 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 02/15] clang: Driver/tools.cpp: Add -lssp_nonshared on musl
+Subject: [PATCH 03/18] clang: Driver/tools.cpp: Add -lssp_nonshared on musl
 
 musl driver will need to add ssp_nonshared for stack_check_local
 on the linker cmdline when using stack protector commands on
diff --git a/recipes-devtools/clang/clang/0003-clang-musl-ppc-does-not-support-128-bit-long-double.patch b/recipes-devtools/clang/clang/0004-clang-musl-ppc-does-not-support-128-bit-long-double.patch
index 80ec006..ca4ef9f 100644
--- a/recipes-devtools/clang/clang/0003-clang-musl-ppc-does-not-support-128-bit-long-double.patch
+++ b/recipes-devtools/clang/clang/0004-clang-musl-ppc-does-not-support-128-bit-long-double.patch
@@ -1,7 +1,7 @@
-From 0f183864a6e89461143e082d4b7e5df4cd0f4480 Mon Sep 17 00:00:00 2001
+From 419cb3ac8f7f23c3f7aa620a93974b366509c2b7 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 03/15] clang: musl/ppc does not support 128-bit long double
+Subject: [PATCH 04/18] clang: musl/ppc does not support 128-bit long double
 
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
diff --git a/recipes-devtools/clang/clang/0004-clang-Prepend-trailing-to-sysroot.patch b/recipes-devtools/clang/clang/0005-clang-Prepend-trailing-to-sysroot.patch
index 0cb81cd..641ca32 100644
--- a/recipes-devtools/clang/clang/0004-clang-Prepend-trailing-to-sysroot.patch
+++ b/recipes-devtools/clang/clang/0005-clang-Prepend-trailing-to-sysroot.patch
@@ -1,7 +1,7 @@
-From 792786fb04bf505cdcd39a22744111cfd57a2ac5 Mon Sep 17 00:00:00 2001
+From dae39fcc475883d6367929d5d4bd39bd82cebb22 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 04/15] clang: Prepend trailing '/' to sysroot
+Subject: [PATCH 05/18] clang: Prepend trailing '/' to sysroot
 
 This is needed to handle a case where clang
 isntall and target sysroot are perilously same
@@ -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 33e2fcec299..4dfaf052f86 100644
+index 552d329e7b8..7d5a85ed744 100644
 --- a/clang/lib/Driver/ToolChains/Linux.cpp
 +++ b/clang/lib/Driver/ToolChains/Linux.cpp
 @@ -219,7 +219,7 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
diff --git a/recipes-devtools/clang/clang/0005-clang-Look-inside-the-target-sysroot-for-compiler-ru.patch b/recipes-devtools/clang/clang/0006-clang-Look-inside-the-target-sysroot-for-compiler-ru.patch
index 61caa3c..4fd4627 100644
--- a/recipes-devtools/clang/clang/0005-clang-Look-inside-the-target-sysroot-for-compiler-ru.patch
+++ b/recipes-devtools/clang/clang/0006-clang-Look-inside-the-target-sysroot-for-compiler-ru.patch
@@ -1,7 +1,7 @@
-From 0327863d99125908e209e46e2687e9fb77ff25a7 Mon Sep 17 00:00:00 2001
+From 258f04d89f8d7cca4fdd1f4d2fba068b090854b3 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 05/15] clang: Look inside the target sysroot for compiler
+Subject: [PATCH 06/18] clang: Look inside the target sysroot for compiler
  runtime
 
 In OE compiler-rt and libc++ are built and staged into target
diff --git a/recipes-devtools/clang/clang/0006-clang-Define-releative-gcc-installation-dir.patch b/recipes-devtools/clang/clang/0007-clang-Define-releative-gcc-installation-dir.patch
index 92e660c..707a550 100644
--- a/recipes-devtools/clang/clang/0006-clang-Define-releative-gcc-installation-dir.patch
+++ b/recipes-devtools/clang/clang/0007-clang-Define-releative-gcc-installation-dir.patch
@@ -1,7 +1,7 @@
-From 15fab22ab9478935b30d55de1d871553991bc3ad Mon Sep 17 00:00:00 2001
+From b8dbd4166e7ce4d88ca5e6b6da1a07b408a1230d Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sun, 21 May 2017 15:38:25 -0700
-Subject: [PATCH 06/15] clang: Define / releative gcc installation dir
+Subject: [PATCH 07/18] clang: Define / releative gcc installation dir
 
 This is required for OE gcc installation to work.
 Without this its not able to find the paths for libgcc
diff --git a/recipes-devtools/clang/clang/0007-clang-Fix-ldso-for-musl-on-x86-and-x32-architectures.patch b/recipes-devtools/clang/clang/0008-clang-Fix-ldso-for-musl-on-x86-and-x32-architectures.patch
index 7965fc6..a223f1a 100644
--- a/recipes-devtools/clang/clang/0007-clang-Fix-ldso-for-musl-on-x86-and-x32-architectures.patch
+++ b/recipes-devtools/clang/clang/0008-clang-Fix-ldso-for-musl-on-x86-and-x32-architectures.patch
@@ -1,7 +1,7 @@
-From e2f49f7535aeb72592f8386cddb611f7bcdf2f32 Mon Sep 17 00:00:00 2001
+From f7908f063e790b2930d969a382a8aabb83e7e2a2 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Wed, 16 Aug 2017 15:16:15 -0700
-Subject: [PATCH 07/15] clang: Fix ldso for musl on x86 and x32 architectures
+Subject: [PATCH 08/18] clang: Fix ldso for musl on x86 and x32 architectures
 
 x32 linker is called ld-musl-x32.so.1 and x86 linker
 is called ld-musl-i386.so.1, Currently, linker for
@@ -14,7 +14,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 8 insertions(+)
 
 diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp
-index 4dfaf052f86..5dc7b506d6f 100644
+index 7d5a85ed744..4dfef25aa63 100644
 --- a/clang/lib/Driver/ToolChains/Linux.cpp
 +++ b/clang/lib/Driver/ToolChains/Linux.cpp
 @@ -516,6 +516,7 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
diff --git a/recipes-devtools/clang/clang/0008-clang-scan-view-needs-python-2.x.patch b/recipes-devtools/clang/clang/0009-clang-scan-view-needs-python-2.x.patch
index 047c038..befbcdc 100644
--- a/recipes-devtools/clang/clang/0008-clang-scan-view-needs-python-2.x.patch
+++ b/recipes-devtools/clang/clang/0009-clang-scan-view-needs-python-2.x.patch
@@ -1,7 +1,7 @@
-From f86a9b4d0b8ee8818a0a86561c33c2dbb1c12535 Mon Sep 17 00:00:00 2001
+From c09c33bec431aa61f36e0ab94bd14c273c5262db Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Tue, 15 May 2018 10:28:43 -0700
-Subject: [PATCH 08/15] clang: scan-view needs python 2.x
+Subject: [PATCH 09/18] clang: scan-view needs python 2.x
 
 Some distributions e.g. archlinux have switched to pointing
 python to python3, therefore its better to be specific about
diff --git a/recipes-devtools/clang/clang/0016-clang-Append-libunwind-to-compiler-rt-for-linking.patch b/recipes-devtools/clang/clang/0010-clang-Append-libunwind-to-compiler-rt-for-linking.patch
index 7fc5795..4f23d69 100644
--- a/recipes-devtools/clang/clang/0016-clang-Append-libunwind-to-compiler-rt-for-linking.patch
+++ b/recipes-devtools/clang/clang/0010-clang-Append-libunwind-to-compiler-rt-for-linking.patch
@@ -1,7 +1,7 @@
-From 89c9b5e2bec26bad047a60bd08722ff138cb7cb3 Mon Sep 17 00:00:00 2001
+From 3ba6f05d35c8b0c405bf62cdd93eecc5a5094165 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Fri, 25 Jan 2019 14:39:04 -0800
-Subject: [PATCH] clang: Append libunwind to compiler-rt for linking
+Subject: [PATCH 10/18] clang: Append libunwind to compiler-rt for linking
 
 Some packages which use libgcc tend to use low level unwind functions
 too, and they are missing in compiler-rt but provided by llvm libunwind
@@ -12,7 +12,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 6 insertions(+)
 
 diff --git a/clang/lib/Driver/ToolChains/CommonArgs.cpp b/clang/lib/Driver/ToolChains/CommonArgs.cpp
-index d7e316befa6..72226dd09ce 100644
+index d7e316befa6..5f6b24e33eb 100644
 --- a/clang/lib/Driver/ToolChains/CommonArgs.cpp
 +++ b/clang/lib/Driver/ToolChains/CommonArgs.cpp
 @@ -1191,6 +1191,12 @@ void tools::AddRunTimeLibs(const ToolChain &TC, const Driver &D,
@@ -20,7 +20,7 @@ index d7e316befa6..72226dd09ce 100644
    case ToolChain::RLT_CompilerRT:
      CmdArgs.push_back(TC.getCompilerRTArgString(Args, "builtins"));
 +    CmdArgs.push_back("--as-needed");
-+    CmdArgs.push_back("-lunwind");
++    CmdArgs.push_back("-l:libunwind.a");
 +    CmdArgs.push_back("-lpthread");
 +    CmdArgs.push_back("-ldl");
 +    CmdArgs.push_back("--no-as-needed");
diff --git a/recipes-devtools/clang/clang/0009-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch b/recipes-devtools/clang/clang/0011-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch
index 793fbaf..0316f79 100644
--- a/recipes-devtools/clang/clang/0009-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch
+++ b/recipes-devtools/clang/clang/0011-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch
@@ -1,7 +1,7 @@
-From da9fe6d6a6160b7eaeef22dff38bbb3f17f26822 Mon Sep 17 00:00:00 2001
+From 4c6422fe53445384c1d9289000cc4c3c7f16e378 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 09/15] llvm: TargetLibraryInfo: Undefine libc functions if
+Subject: [PATCH 11/18] llvm: TargetLibraryInfo: Undefine libc functions if
  they are macros
 
 musl defines some functions as macros and not inline functions
diff --git a/recipes-devtools/clang/clang/0010-llvm-allow-env-override-of-exe-path.patch b/recipes-devtools/clang/clang/0012-llvm-allow-env-override-of-exe-path.patch
index c28da3c..85d4c85 100644
--- a/recipes-devtools/clang/clang/0010-llvm-allow-env-override-of-exe-path.patch
+++ b/recipes-devtools/clang/clang/0012-llvm-allow-env-override-of-exe-path.patch
@@ -1,7 +1,7 @@
-From 2af0752ca682d14984aac80e1b84a79b9fa69fb9 Mon Sep 17 00:00:00 2001
+From 765b7c57c6102d1b1c7fad2e8cd1be78a4a32960 Mon Sep 17 00:00:00 2001
 From: Martin Kelly <mkelly@xevo.com>
 Date: Fri, 19 May 2017 00:22:57 -0700
-Subject: [PATCH 10/15] llvm: allow env override of exe path
+Subject: [PATCH 12/18] llvm: allow env override of exe path
 
 When using a native llvm-config from inside a sysroot, we need llvm-config to
 return the libraries, include directories, etc. from inside the sysroot rather
diff --git a/recipes-devtools/clang/clang/0017-llvm-AARCH64-Add-support-for-.dword-directives.patch b/recipes-devtools/clang/clang/0013-llvm-AARCH64-Add-support-for-.dword-directives.patch
index 4ac102d..542658b 100644
--- a/recipes-devtools/clang/clang/0017-llvm-AARCH64-Add-support-for-.dword-directives.patch
+++ b/recipes-devtools/clang/clang/0013-llvm-AARCH64-Add-support-for-.dword-directives.patch
@@ -1,7 +1,7 @@
-From 2c85adc50b677e9094932828aa7a51affde892fb Mon Sep 17 00:00:00 2001
+From f55e2d5f21917bca619db7aabffd9488748c8165 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Thu, 31 Jan 2019 10:53:22 -0800
-Subject: [PATCH] llvm: [AARCH64] Add support for .dword directives
+Subject: [PATCH 13/18] llvm: [AARCH64] Add support for .dword directives
 
 This directives is supported in GNU assembler, Add support via addAliasForDirective.
 Add a testcase to check for data directives
diff --git a/recipes-devtools/clang/clang/0011-lldb-Add-lxml2-to-linker-cmdline-of-xml-is-found.patch b/recipes-devtools/clang/clang/0014-lldb-Add-lxml2-to-linker-cmdline-of-xml-is-found.patch
index 737a053..980af36 100644
--- a/recipes-devtools/clang/clang/0011-lldb-Add-lxml2-to-linker-cmdline-of-xml-is-found.patch
+++ b/recipes-devtools/clang/clang/0014-lldb-Add-lxml2-to-linker-cmdline-of-xml-is-found.patch
@@ -1,7 +1,7 @@
-From 61d80370805142f531059d3ea58f363aadd1ff06 Mon Sep 17 00:00:00 2001
+From 392b59a684640eb000dbc4f89dcec44f8e3b4600 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 11/15] lldb: Add -lxml2 to linker cmdline of xml is found
+Subject: [PATCH 14/18] lldb: Add -lxml2 to linker cmdline of xml is found
 
 When cross compiling for systems where static libs
 for libxml are not available cmake's detection mechanism
diff --git a/recipes-devtools/clang/clang/0012-libcxxabi-Find-libunwind-headers-when-LIBCXXABI_LIBU.patch b/recipes-devtools/clang/clang/0015-libcxxabi-Find-libunwind-headers-when-LIBCXXABI_LIBU.patch
index 92fe682..7ea17e4 100644
--- a/recipes-devtools/clang/clang/0012-libcxxabi-Find-libunwind-headers-when-LIBCXXABI_LIBU.patch
+++ b/recipes-devtools/clang/clang/0015-libcxxabi-Find-libunwind-headers-when-LIBCXXABI_LIBU.patch
@@ -1,7 +1,7 @@
-From 058935ad2f27735cedf838b82a8a2d7d1883ab5f Mon Sep 17 00:00:00 2001
+From da86f4425f23511b6af49b10c532a9c7788017a9 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 12/15] libcxxabi: Find libunwind headers when
+Subject: [PATCH 15/18] libcxxabi: Find libunwind headers when
  LIBCXXABI_LIBUNWIND_INCLUDES is set
 
 Currently, when LIBCXXABI_LIBUNWIND_INCLUDES is set via CMake arguments
diff --git a/recipes-devtools/clang/clang/0013-compiler-rt-support-a-new-embedded-linux-target.patch b/recipes-devtools/clang/clang/0016-compiler-rt-support-a-new-embedded-linux-target.patch
index 8951241..0c93b47 100644
--- a/recipes-devtools/clang/clang/0013-compiler-rt-support-a-new-embedded-linux-target.patch
+++ b/recipes-devtools/clang/clang/0016-compiler-rt-support-a-new-embedded-linux-target.patch
@@ -1,7 +1,7 @@
-From b56bc6f9b522b0359cb09e73d719622990dd2c38 Mon Sep 17 00:00:00 2001
+From 6c509374a016e149c06d7cf8db6032864197f89c 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 13/15] compiler-rt: support a new embedded linux target
+Subject: [PATCH 16/18] compiler-rt: support a new embedded linux target
 
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
diff --git a/recipes-devtools/clang/clang/0014-compiler-rt-Simplify-cross-compilation.-Don-t-use-na.patch b/recipes-devtools/clang/clang/0017-compiler-rt-Simplify-cross-compilation.-Don-t-use-na.patch
index 40168b0..d7d57f7 100644
--- a/recipes-devtools/clang/clang/0014-compiler-rt-Simplify-cross-compilation.-Don-t-use-na.patch
+++ b/recipes-devtools/clang/clang/0017-compiler-rt-Simplify-cross-compilation.-Don-t-use-na.patch
@@ -1,7 +1,7 @@
-From a010673fd33c7311763620cf62159993255bb559 Mon Sep 17 00:00:00 2001
+From bdd021f901d8bc4ed9f09fa53902674e1517662c 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 14/15] compiler-rt: Simplify cross-compilation. Don't use
+Subject: [PATCH 17/18] compiler-rt: Simplify cross-compilation. Don't use
  native-compiled llvm-config.
 
     Note: AddLLVM.cmake does not expose the LLVM source directory.
diff --git a/recipes-devtools/clang/clang/0015-compiler-rt-Disable-tsan-on-OE-glibc.patch b/recipes-devtools/clang/clang/0018-compiler-rt-Disable-tsan-on-OE-glibc.patch
index f6a8743..4c64d04 100644
--- a/recipes-devtools/clang/clang/0015-compiler-rt-Disable-tsan-on-OE-glibc.patch
+++ b/recipes-devtools/clang/clang/0018-compiler-rt-Disable-tsan-on-OE-glibc.patch
@@ -1,7 +1,7 @@
-From e166d4e3568de2718b687c046b1d8b89504d1451 Mon Sep 17 00:00:00 2001
+From 4a9f02d94f311a866b663d5ff163bbea8fde490e Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Mon, 18 Jul 2016 08:05:02 +0000
-Subject: [PATCH 15/15] compiler-rt: Disable tsan on OE/glibc
+Subject: [PATCH 18/18] compiler-rt: Disable tsan on OE/glibc
 
 It does not build see
 http://lists.llvm.org/pipermail/llvm-dev/2016-July/102235.html
@@ -13,10 +13,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  2 files changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/compiler-rt/cmake/config-ix.cmake b/compiler-rt/cmake/config-ix.cmake
-index db5c4645dc0..83ebc95fc98 100644
+index 5b943387717..151b6069e16 100644
 --- a/compiler-rt/cmake/config-ix.cmake
 +++ b/compiler-rt/cmake/config-ix.cmake
-@@ -593,7 +593,7 @@ else()
+@@ -594,7 +594,7 @@ else()
  endif()
  
  if (COMPILER_RT_HAS_SANITIZER_COMMON AND TSAN_SUPPORTED_ARCH AND
diff --git a/recipes-devtools/clang/common.inc b/recipes-devtools/clang/common.inc
index 65589f9..f2c5d74 100644
--- a/recipes-devtools/clang/common.inc
+++ b/recipes-devtools/clang/common.inc
@@ -8,24 +8,24 @@ LICENSE = "NCSA"
 BASEURI ??= "${LLVM_GIT}/llvm-project;protocol=${LLVM_GIT_PROTOCOL};branch=${BRANCH}"
 SRC_URI = "\
     ${BASEURI} \
-    ${@'file://0000-clang-Enable-SSP-and-PIE-by-default.patch' if '${GCCPIE}' else ''} \
-    file://0001-clang-driver-Use-lib-for-ldso-on-OE.patch \
-    file://0002-clang-Driver-tools.cpp-Add-lssp_nonshared-on-musl.patch \
-    file://0003-clang-musl-ppc-does-not-support-128-bit-long-double.patch \
-    file://0004-clang-Prepend-trailing-to-sysroot.patch \
-    file://0005-clang-Look-inside-the-target-sysroot-for-compiler-ru.patch \
-    file://0006-clang-Define-releative-gcc-installation-dir.patch \
-    file://0007-clang-Fix-ldso-for-musl-on-x86-and-x32-architectures.patch \
-    file://0008-clang-scan-view-needs-python-2.x.patch \
-    file://0009-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch \
-    file://0010-llvm-allow-env-override-of-exe-path.patch \
-    file://0011-lldb-Add-lxml2-to-linker-cmdline-of-xml-is-found.patch \
-    file://0012-libcxxabi-Find-libunwind-headers-when-LIBCXXABI_LIBU.patch \
-    file://0013-compiler-rt-support-a-new-embedded-linux-target.patch \
-    file://0014-compiler-rt-Simplify-cross-compilation.-Don-t-use-na.patch \
-    file://0015-compiler-rt-Disable-tsan-on-OE-glibc.patch \
-    file://0016-clang-Append-libunwind-to-compiler-rt-for-linking.patch \
-    file://0017-llvm-AARCH64-Add-support-for-.dword-directives.patch \
+    ${@'file://0001-clang-Enable-SSP-and-PIE-by-default.patch' if '${GCCPIE}' else ''} \
+    file://0002-clang-driver-Use-lib-for-ldso-on-OE.patch \
+    file://0003-clang-Driver-tools.cpp-Add-lssp_nonshared-on-musl.patch \
+    file://0004-clang-musl-ppc-does-not-support-128-bit-long-double.patch \
+    file://0005-clang-Prepend-trailing-to-sysroot.patch \
+    file://0006-clang-Look-inside-the-target-sysroot-for-compiler-ru.patch \
+    file://0007-clang-Define-releative-gcc-installation-dir.patch \
+    file://0008-clang-Fix-ldso-for-musl-on-x86-and-x32-architectures.patch \
+    file://0009-clang-scan-view-needs-python-2.x.patch \
+    file://0010-clang-Append-libunwind-to-compiler-rt-for-linking.patch \
+    file://0011-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch \
+    file://0012-llvm-allow-env-override-of-exe-path.patch \
+    file://0013-llvm-AARCH64-Add-support-for-.dword-directives.patch \
+    file://0014-lldb-Add-lxml2-to-linker-cmdline-of-xml-is-found.patch \
+    file://0015-libcxxabi-Find-libunwind-headers-when-LIBCXXABI_LIBU.patch \
+    file://0016-compiler-rt-support-a-new-embedded-linux-target.patch \
+    file://0017-compiler-rt-Simplify-cross-compilation.-Don-t-use-na.patch \
+    file://0018-compiler-rt-Disable-tsan-on-OE-glibc.patch \
 "
 
 # Fallback to no-PIE if not set