24 files changed, 76 insertions, 110 deletions

diff --git a/recipes-devtools/clang/clang.inc b/recipes-devtools/clang/clang.inc
index 798f4f1..d43f743 100644
--- a/recipes-devtools/clang/clang.inc
+++ b/recipes-devtools/clang/clang.inc
@@ -8,7 +8,7 @@ MAJOR_VER = "9"
 MINOR_VER = "0"
 PATCH_VER = "0"
 
-SRCREV ?= "1cf7a88045ced9f19f5e6dc0add51723d39eef7f"
+SRCREV ?= "fa0bc006900f17df3c11a40a3eb69e6330433b0e"
 
 PV = "${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}"
 BRANCH = "release/${MAJOR_VER}.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 79ad13f..830679d 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,7 +1,7 @@
-From 79ec5a3eca699011c6f95de36ce027dbfdad0aff Mon Sep 17 00:00:00 2001
+From b0c9e7f42b975ee028726972a3c1298dda1a9e5d 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 01/20] lldb: Add -lxml2 to linker cmdline of xml is found
+Subject: [PATCH] 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
@@ -35,6 +35,3 @@ index 4bb8d363b57..3b58c36c641 100644
    endif()
  endif ()
  if (HAVE_LIBDL)
--- 
-2.22.0
-
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 bdd148e..6d7588c 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,7 +1,7 @@
-From 112e33992bbe21dceb1d14978585bd9d083648ec Mon Sep 17 00:00:00 2001
+From 90be1a0713994d6ca8885e1424950217472dfda8 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 02/20] libcxxabi: Find libunwind headers when
+Subject: [PATCH] libcxxabi: Find libunwind headers when
  LIBCXXABI_LIBUNWIND_INCLUDES is set
 
 Currently, when LIBCXXABI_LIBUNWIND_INCLUDES is set via CMake arguments
@@ -62,6 +62,3 @@ index ce69fff1370..47e09e34fc2 100644
  # Add source code. This also contains all of the logic for deciding linker flags
  # soname, etc...
  add_subdirectory(src)
--- 
-2.22.0
-
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 4a6a915..716ac9a 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,7 +1,7 @@
-From fb4985d596e3f1d74de0b62074b121f8a368c88d Mon Sep 17 00:00:00 2001
+From 640c60ad80ab9c2d577e3ac2288f8e9939b795d1 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 03/20] compiler-rt: support a new embedded linux target
+Subject: [PATCH] compiler-rt: support a new embedded linux target
 
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
@@ -320,6 +320,3 @@ index 00000000000..d0a890075a1
 diff --git a/compiler-rt/make/platform/clang_linux_embedded_test_input.c b/compiler-rt/make/platform/clang_linux_embedded_test_input.c
 new file mode 100644
 index 00000000000..e69de29bb2d
--- 
-2.22.0
-
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 0de7b14..a44524a 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,7 +1,7 @@
-From cf524dbb79dd6cd5ad2daf41683c7ecadd32009d Mon Sep 17 00:00:00 2001
+From a4ba0165332198f7a2fc5401d8ecc2b020b48187 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 04/20] compiler-rt: Simplify cross-compilation. Don't use
+Subject: [PATCH] compiler-rt: Simplify cross-compilation. Don't use
  native-compiled llvm-config.
 
     Note: AddLLVM.cmake does not expose the LLVM source directory.
@@ -20,7 +20,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 10 insertions(+), 1 deletion(-)
 
 diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt
-index ae4ed3857db..dbc10652c28 100644
+index f26ae25ada3..1c68cd96d3a 100644
 --- a/compiler-rt/CMakeLists.txt
 +++ b/compiler-rt/CMakeLists.txt
 @@ -72,7 +72,16 @@ set(COMPILER_RT_BAREMETAL_BUILD OFF CACHE BOOL
@@ -41,6 +41,3 @@ index ae4ed3857db..dbc10652c28 100644
    if (TARGET intrinsics_gen)
      # Loading the llvm config causes this target to be imported so place it
      # under the appropriate folder in an IDE.
--- 
-2.22.0
-
diff --git a/recipes-devtools/clang/clang/0005-compiler-rt-Disable-tsan-on-OE-glibc.patch b/recipes-devtools/clang/clang/0005-compiler-rt-Disable-tsan-on-OE-glibc.patch
index 137c309..cf72939 100644
--- a/recipes-devtools/clang/clang/0005-compiler-rt-Disable-tsan-on-OE-glibc.patch
+++ b/recipes-devtools/clang/clang/0005-compiler-rt-Disable-tsan-on-OE-glibc.patch
@@ -1,7 +1,7 @@
-From 28443a32a50da7631e24e9892f3ab420d1fb4a01 Mon Sep 17 00:00:00 2001
+From e290face40ffc3076d438e7808604974b04658bb 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 05/20] compiler-rt: Disable tsan on OE/glibc
+Subject: [PATCH] compiler-rt: Disable tsan on OE/glibc
 
 It does not build see
 http://lists.llvm.org/pipermail/llvm-dev/2016-July/102235.html
@@ -38,6 +38,3 @@ index 48fccf05855..b4a7f0adf14 100644
  set(SUPPORTED_TOOLS)
    foreach(SANITIZER_TOOL ${SUPPORTED_TOOLS_INIT})
      string(TOUPPER ${SANITIZER_TOOL} SANITIZER_TOOL_UPPER)
--- 
-2.22.0
-
diff --git a/recipes-devtools/clang/clang/0006-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch b/recipes-devtools/clang/clang/0006-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch
index 1d23d71..7167faa 100644
--- a/recipes-devtools/clang/clang/0006-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch
+++ b/recipes-devtools/clang/clang/0006-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch
@@ -1,8 +1,8 @@
-From 45151eede54f84bb1f2c5afae7cfd56eccf8e32b Mon Sep 17 00:00:00 2001
+From dbeecdb307be8b783b42cbc89dcb9c5e7f528989 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 06/20] llvm: TargetLibraryInfo: Undefine libc functions if
- they are macros
+Subject: [PATCH] llvm: TargetLibraryInfo: Undefine libc functions if they are
+ macros
 
 musl defines some functions as macros and not inline functions
 if this is the case then make sure to undefine them
@@ -86,6 +86,3 @@ index afed404f04c..876888656f2 100644
  TLI_DEFINE_ENUM_INTERNAL(tmpfile64)
  TLI_DEFINE_STRING_INTERNAL("tmpfile64")
  /// int toascii(int c);
--- 
-2.22.0
-
diff --git a/recipes-devtools/clang/clang/0007-llvm-allow-env-override-of-exe-path.patch b/recipes-devtools/clang/clang/0007-llvm-allow-env-override-of-exe-path.patch
index 162d4e1..58dce51 100644
--- a/recipes-devtools/clang/clang/0007-llvm-allow-env-override-of-exe-path.patch
+++ b/recipes-devtools/clang/clang/0007-llvm-allow-env-override-of-exe-path.patch
@@ -1,7 +1,7 @@
-From eb2aeff635789738b25907388ea1ef8ea3e12641 Mon Sep 17 00:00:00 2001
+From 61b00e1e051e367f5483d7b5253b6c85a9e8a90f Mon Sep 17 00:00:00 2001
 From: Martin Kelly <mkelly@xevo.com>
 Date: Fri, 19 May 2017 00:22:57 -0700
-Subject: [PATCH 07/20] llvm: allow env override of exe path
+Subject: [PATCH] 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
@@ -32,6 +32,3 @@ index 7ef7c46a262..a4f7ed82c7b 100644
    // This just needs to be some symbol in the binary; C++ doesn't
    // allow taking the address of ::main however.
    void *P = (void *)(intptr_t)GetExecutablePath;
--- 
-2.22.0
-
diff --git a/recipes-devtools/clang/clang/0008-llvm-Enhance-path-prefix-mapping.patch b/recipes-devtools/clang/clang/0008-llvm-Enhance-path-prefix-mapping.patch
index c491bb6..a59fe4c 100644
--- a/recipes-devtools/clang/clang/0008-llvm-Enhance-path-prefix-mapping.patch
+++ b/recipes-devtools/clang/clang/0008-llvm-Enhance-path-prefix-mapping.patch
@@ -1,7 +1,7 @@
-From 262518322d0397ba7fd3876a8710dd453e7d4c59 Mon Sep 17 00:00:00 2001
+From 1bff6786db082e020179cc14d2aa993244351ac0 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Fri, 15 Feb 2019 11:32:09 -0800
-Subject: [PATCH 08/20] llvm: Enhance path prefix mapping
+Subject: [PATCH] llvm: Enhance path prefix mapping
 
 Upstream-Status: Submitted [https://reviews.llvm.org/D56769]
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
@@ -170,6 +170,3 @@ index ccd72d7f176..13af998d8f8 100644
  }
  
  TEST_F(FileSystemTest, OpenFileForRead) {
--- 
-2.22.0
-
diff --git a/recipes-devtools/clang/clang/0009-clang-Enable-SSP-and-PIE-by-default.patch b/recipes-devtools/clang/clang/0009-clang-Enable-SSP-and-PIE-by-default.patch
index 5700fa0..e9672c1 100644
--- a/recipes-devtools/clang/clang/0009-clang-Enable-SSP-and-PIE-by-default.patch
+++ b/recipes-devtools/clang/clang/0009-clang-Enable-SSP-and-PIE-by-default.patch
@@ -1,7 +1,7 @@
-From 6ad9263f3bc8ebbf27467f97233e109dfd7987ed Mon Sep 17 00:00:00 2001
+From 549a201d29521e8c5dd2b21cc12df0ef1e33aa72 Mon Sep 17 00:00:00 2001
 From: Evangelos Foutras <evangelos@foutrelis.com>
 Date: Thu, 20 Sep 2018 06:20:28 +0300
-Subject: [PATCH 09/20] clang: Enable SSP and PIE by default
+Subject: [PATCH] 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
@@ -58,6 +58,3 @@ index 4c61994691c..66134a3a327 100644
    bool IsMathErrnoDefault() const override;
    SanitizerMask getSupportedSanitizers() const override;
    void addProfileRTLibs(const llvm::opt::ArgList &Args,
--- 
-2.22.0
-
diff --git a/recipes-devtools/clang/clang/0010-clang-driver-Use-lib-for-ldso-on-OE.patch b/recipes-devtools/clang/clang/0010-clang-driver-Use-lib-for-ldso-on-OE.patch
index 6d94df2..43df539 100644
--- a/recipes-devtools/clang/clang/0010-clang-driver-Use-lib-for-ldso-on-OE.patch
+++ b/recipes-devtools/clang/clang/0010-clang-driver-Use-lib-for-ldso-on-OE.patch
@@ -1,7 +1,7 @@
-From 07f5fef22be3800e37c5f635781805fcd60ae00a Mon Sep 17 00:00:00 2001
+From 9ed63a91328af8723094198e6d0280794f5f55ab 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 10/20] clang: driver: Use /lib for ldso on OE
+Subject: [PATCH] clang: driver: Use /lib for ldso on OE
 
 OE does not follow the default base_libdir
 that clang has, therefore adjust it for OE
@@ -58,6 +58,3 @@ index 3e68d50dac2..dbe5ed7d89e 100644
      Loader = X32 ? "ld-linux-x32.so.2" : "ld-linux-x86-64.so.2";
      break;
    }
--- 
-2.22.0
-
diff --git a/recipes-devtools/clang/clang/0011-clang-Driver-tools.cpp-Add-lssp_nonshared-on-musl.patch b/recipes-devtools/clang/clang/0011-clang-Driver-tools.cpp-Add-lssp_nonshared-on-musl.patch
index a013a36..1ea3b29 100644
--- a/recipes-devtools/clang/clang/0011-clang-Driver-tools.cpp-Add-lssp_nonshared-on-musl.patch
+++ b/recipes-devtools/clang/clang/0011-clang-Driver-tools.cpp-Add-lssp_nonshared-on-musl.patch
@@ -1,7 +1,7 @@
-From 314859edd5f1a221d4a2c6b787e5bddd9b1c4606 Mon Sep 17 00:00:00 2001
+From e233d35f2ec7c5c4a6a957e9c29cd2663dd297df 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 11/20] clang: Driver/tools.cpp: Add -lssp_nonshared on musl
+Subject: [PATCH] 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
@@ -29,6 +29,3 @@ index 33cdd3585c2..8b14b8ea9cb 100644
        if (IsStatic || IsStaticPIE)
          CmdArgs.push_back("--end-group");
        else
--- 
-2.22.0
-
diff --git a/recipes-devtools/clang/clang/0012-clang-musl-ppc-does-not-support-128-bit-long-double.patch b/recipes-devtools/clang/clang/0012-clang-musl-ppc-does-not-support-128-bit-long-double.patch
index fe5206f..c8258d7 100644
--- a/recipes-devtools/clang/clang/0012-clang-musl-ppc-does-not-support-128-bit-long-double.patch
+++ b/recipes-devtools/clang/clang/0012-clang-musl-ppc-does-not-support-128-bit-long-double.patch
@@ -1,7 +1,7 @@
-From ed78a6b28aa36afbfc7825dcbbacea46d4ea528d Mon Sep 17 00:00:00 2001
+From b3018df63c758b97774f03873a9e5fed2d6a3db7 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 12/20] clang: musl/ppc does not support 128-bit long double
+Subject: [PATCH] clang: musl/ppc does not support 128-bit long double
 
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
@@ -23,6 +23,3 @@ index 6e5df097921..107cef297e2 100644
      // PPC32 supports atomics up to 4 bytes.
      MaxAtomicPromoteWidth = MaxAtomicInlineWidth = 32;
    }
--- 
-2.22.0
-
diff --git a/recipes-devtools/clang/clang/0013-clang-Prepend-trailing-to-sysroot.patch b/recipes-devtools/clang/clang/0013-clang-Prepend-trailing-to-sysroot.patch
index b8a23c9..f86adf5 100644
--- a/recipes-devtools/clang/clang/0013-clang-Prepend-trailing-to-sysroot.patch
+++ b/recipes-devtools/clang/clang/0013-clang-Prepend-trailing-to-sysroot.patch
@@ -1,7 +1,7 @@
-From c37bf49c9734a1ebc9a286225aa2ceae06427c06 Mon Sep 17 00:00:00 2001
+From 1e461b2dccddf36ec436fd8535441248bde41603 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 13/20] clang: Prepend trailing '/' to sysroot
+Subject: [PATCH] clang: Prepend trailing '/' to sysroot
 
 This is needed to handle a case where clang
 isntall and target sysroot are perilously same
@@ -36,6 +36,3 @@ index dbe5ed7d89e..9bf66207ac9 100644
  
    // Cross-compiling binutils and GCC installations (vanilla and openSUSE at
    // least) put various tools in a triple-prefixed directory off of the parent
--- 
-2.22.0
-
diff --git a/recipes-devtools/clang/clang/0014-clang-Look-inside-the-target-sysroot-for-compiler-ru.patch b/recipes-devtools/clang/clang/0014-clang-Look-inside-the-target-sysroot-for-compiler-ru.patch
index 5bc6020..8262bfd 100644
--- a/recipes-devtools/clang/clang/0014-clang-Look-inside-the-target-sysroot-for-compiler-ru.patch
+++ b/recipes-devtools/clang/clang/0014-clang-Look-inside-the-target-sysroot-for-compiler-ru.patch
@@ -1,8 +1,7 @@
-From ec8c0bb6f7c252b7d58ee988ccb79e49bb348cfa Mon Sep 17 00:00:00 2001
+From d4b1a6b0a4dd8921fb90cf542599405027c74441 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 14/20] clang: Look inside the target sysroot for compiler
- runtime
+Subject: [PATCH] clang: Look inside the target sysroot for compiler runtime
 
 In OE compiler-rt and libc++ are built and staged into target
 sysroot and not into resourcedir which is relative to clang
@@ -39,6 +38,3 @@ index b1fddb0af55..6eb8fbb8de4 100644
    if (Triple.isOSUnknown()) {
      llvm::sys::path::append(Path, "lib");
    } else {
--- 
-2.22.0
-
diff --git a/recipes-devtools/clang/clang/0015-clang-Define-releative-gcc-installation-dir.patch b/recipes-devtools/clang/clang/0015-clang-Define-releative-gcc-installation-dir.patch
index 905a8bd..5c84ddb 100644
--- a/recipes-devtools/clang/clang/0015-clang-Define-releative-gcc-installation-dir.patch
+++ b/recipes-devtools/clang/clang/0015-clang-Define-releative-gcc-installation-dir.patch
@@ -1,7 +1,7 @@
-From fb1eda44238f4f20f7b0f75cd00d1f715b96693b Mon Sep 17 00:00:00 2001
+From 5be8337e8c28fc45c4b33ffcabe6d46a9f018cf5 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 15/20] clang: Define / releative gcc installation dir
+Subject: [PATCH] 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
@@ -27,6 +27,3 @@ index 8b14b8ea9cb..20517a369f7 100644
        // The Freescale PPC SDK has the gcc libraries in
        // <sysroot>/usr/lib/<triple>/x.y.z so have a look there as well. Only do
        // this on Freescale triples, though, since some systems put a *lot* of
--- 
-2.22.0
-
diff --git a/recipes-devtools/clang/clang/0016-clang-Fix-ldso-for-musl-on-x86-and-x32-architectures.patch b/recipes-devtools/clang/clang/0016-clang-Fix-ldso-for-musl-on-x86-and-x32-architectures.patch
index 7f6e3da..b35fec1 100644
--- a/recipes-devtools/clang/clang/0016-clang-Fix-ldso-for-musl-on-x86-and-x32-architectures.patch
+++ b/recipes-devtools/clang/clang/0016-clang-Fix-ldso-for-musl-on-x86-and-x32-architectures.patch
@@ -1,7 +1,7 @@
-From bb1af5985b7b6e02281be669c28eb897a58c7c2f Mon Sep 17 00:00:00 2001
+From f569a8c2b723d0a1e70e8e45e275636789eeb6e1 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 16/20] clang: Fix ldso for musl on x86 and x32 architectures
+Subject: [PATCH] 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
@@ -39,6 +39,3 @@ index 9bf66207ac9..fc7d6c17484 100644
      default:
        ArchName = Triple.getArchName().str();
      }
--- 
-2.22.0
-
diff --git a/recipes-devtools/clang/clang/0017-clang-scan-view-needs-python-2.x.patch b/recipes-devtools/clang/clang/0017-clang-scan-view-needs-python-2.x.patch
index 5c309ff..8d24325 100644
--- a/recipes-devtools/clang/clang/0017-clang-scan-view-needs-python-2.x.patch
+++ b/recipes-devtools/clang/clang/0017-clang-scan-view-needs-python-2.x.patch
@@ -1,7 +1,7 @@
-From 151f2f72b1bfd1ae7c177912c06324af1bb08d69 Mon Sep 17 00:00:00 2001
+From 4a4a3cc72b59e82e6d14679bfa07c0c5afec96d1 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 17/20] clang: scan-view needs python 2.x
+Subject: [PATCH] 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
@@ -22,6 +22,3 @@ index 6165432e7af..04ad518a60c 100755
  
  from __future__ import print_function
  
--- 
-2.22.0
-
diff --git a/recipes-devtools/clang/clang/0018-clang-Initial-implementation-of-fmacro-prefix-map-an.patch b/recipes-devtools/clang/clang/0018-clang-Initial-implementation-of-fmacro-prefix-map-an.patch
index d58c4f5..facef80 100644
--- a/recipes-devtools/clang/clang/0018-clang-Initial-implementation-of-fmacro-prefix-map-an.patch
+++ b/recipes-devtools/clang/clang/0018-clang-Initial-implementation-of-fmacro-prefix-map-an.patch
@@ -1,7 +1,7 @@
-From a4a34addc4d6942bb68a3c298fb07d0e4794e295 Mon Sep 17 00:00:00 2001
+From 6c8fcbbcce2003de4c7df649c01fbe0479405cf0 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Fri, 15 Feb 2019 10:02:52 -0800
-Subject: [PATCH 18/20] clang: Initial implementation of -fmacro-prefix-map and
+Subject: [PATCH] clang: Initial implementation of -fmacro-prefix-map and
  -ffile-prefix-map
 
 Upstream-Status: Submitted [https://reviews.llvm.org/D49466]
@@ -111,10 +111,10 @@ index 7edbea86633..7077d0f043c 100644
    /// Cache that maps VLA types to size expressions for that type,
    /// represented by instantiated Metadata nodes.
 diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp
-index cb861f27aed..1c788d97c16 100644
+index 2508178423b..38970814432 100644
 --- a/clang/lib/Driver/ToolChains/Clang.cpp
 +++ b/clang/lib/Driver/ToolChains/Clang.cpp
-@@ -612,16 +612,30 @@ static void addDebugCompDirArg(const ArgList &Args, ArgStringList &CmdArgs,
+@@ -617,16 +617,30 @@ static void addDebugCompDirArg(const ArgList &Args, ArgStringList &CmdArgs,
  
  /// Add a CC1 and CC1AS option to specify the debug file path prefix map.
  static void addDebugPrefixMapArg(const Driver &D, const ArgList &Args, ArgStringList &CmdArgs) {
@@ -147,7 +147,7 @@ index cb861f27aed..1c788d97c16 100644
  /// Vectorize at all optimization levels greater than 1 except for -Oz.
  /// For -Oz the loop vectorizer is disabled, while the slp vectorizer is
  /// enabled.
-@@ -1306,6 +1320,8 @@ void Clang::AddPreprocessingOptions(Compilation &C, const JobAction &JA,
+@@ -1311,6 +1325,8 @@ void Clang::AddPreprocessingOptions(Compilation &C, const JobAction &JA,
      // For IAMCU add special include arguments.
      getToolChain().AddIAMCUIncludeArgs(Args, CmdArgs);
    }
@@ -378,6 +378,3 @@ index 00000000000..c289e5c8362
 @@ -0,0 +1,2 @@
 +filename: __FILE__
 +basefile: __BASE_FILE__
--- 
-2.22.0
-
diff --git a/recipes-devtools/clang/clang/0019-clang-Add-lpthread-and-ldl-along-with-lunwind-for-st.patch b/recipes-devtools/clang/clang/0019-clang-Add-lpthread-and-ldl-along-with-lunwind-for-st.patch
index 6fa3d5a..f1026c3 100644
--- a/recipes-devtools/clang/clang/0019-clang-Add-lpthread-and-ldl-along-with-lunwind-for-st.patch
+++ b/recipes-devtools/clang/clang/0019-clang-Add-lpthread-and-ldl-along-with-lunwind-for-st.patch
@@ -1,8 +1,8 @@
-From 7d855716ab05ec3d7b693cf302713efad5c118fa Mon Sep 17 00:00:00 2001
+From 52ce78a53a6fd63547a2e2d2977784711b10377e 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 19/20] clang: Add -lpthread and -ldl along with -lunwind for
- static linking
+Subject: [PATCH] clang: Add -lpthread and -ldl along with -lunwind for static
+ linking
 
 When doing static liking with --unwindlib=libunwind -static we encounter
 undefined symbols
@@ -34,6 +34,3 @@ index 99691cb43dc..92b3bfbd77f 100644
      break;
    }
  
--- 
-2.22.0
-
diff --git a/recipes-devtools/clang/clang/0020-clang-default-to-lp64d-ABI-and-rv64gc-ISA.patch b/recipes-devtools/clang/clang/0020-clang-default-to-lp64d-ABI-and-rv64gc-ISA.patch
index 0c931ce..cc20795 100644
--- a/recipes-devtools/clang/clang/0020-clang-default-to-lp64d-ABI-and-rv64gc-ISA.patch
+++ b/recipes-devtools/clang/clang/0020-clang-default-to-lp64d-ABI-and-rv64gc-ISA.patch
@@ -1,7 +1,7 @@
-From db66a7c23a2462e618b12e06f1920d30a49f5dce Mon Sep 17 00:00:00 2001
+From 84e077c32b919c358b6c94cffe425acfdaddfa6a Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Mon, 12 Aug 2019 08:59:28 -0700
-Subject: [PATCH 20/20] clang: default to lp64d ABI and rv64gc ISA
+Subject: [PATCH] clang: default to lp64d ABI and rv64gc ISA
 
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
@@ -35,10 +35,10 @@ index b6768de4d29..9671ea270ef 100644
 +  return Triple.getArch() == llvm::Triple::riscv32 ? "ilp32" : "lp64d";
  }
 diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp
-index 1c788d97c16..50839de1bf9 100644
+index 38970814432..29db0ea218a 100644
 --- a/clang/lib/Driver/ToolChains/Clang.cpp
 +++ b/clang/lib/Driver/ToolChains/Clang.cpp
-@@ -1867,7 +1867,7 @@ void Clang::AddRISCVTargetArgs(const ArgList &Args,
+@@ -1872,7 +1872,7 @@ void Clang::AddRISCVTargetArgs(const ArgList &Args,
    else if (Triple.getArch() == llvm::Triple::riscv32)
      ABIName = "ilp32";
    else if (Triple.getArch() == llvm::Triple::riscv64)
@@ -47,6 +47,3 @@ index 1c788d97c16..50839de1bf9 100644
    else
      llvm_unreachable("Unexpected triple!");
  
--- 
-2.22.0
-
diff --git a/recipes-devtools/clang/clang/0021-lldb-Do-not-look-for-interpreter.patch b/recipes-devtools/clang/clang/0021-lldb-Do-not-look-for-interpreter.patch
new file mode 100644
index 0000000..d8f790d
--- /dev/null
+++ b/recipes-devtools/clang/clang/0021-lldb-Do-not-look-for-interpreter.patch
@@ -0,0 +1,24 @@
+From 52d4ec36f9d3635750ff5d4fb006ec625833fd12 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 4 Sep 2019 22:17:18 -0700
+Subject: [PATCH] lldb: Do not look for interpreter
+
+We pass PYTHON_EXECUTABLE explicitly
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ lldb/cmake/modules/LLDBConfig.cmake | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/lldb/cmake/modules/LLDBConfig.cmake b/lldb/cmake/modules/LLDBConfig.cmake
+index 0dca557601f..0bfd498ef9a 100644
+--- a/lldb/cmake/modules/LLDBConfig.cmake
++++ b/lldb/cmake/modules/LLDBConfig.cmake
+@@ -213,7 +213,6 @@ if (NOT LLDB_DISABLE_PYTHON)
+       add_definitions( -DLLDB_PYTHON_HOME="${LLDB_PYTHON_HOME}" )
+     endif()
+   else()
+-    find_package(PythonInterp REQUIRED)
+     find_package(PythonLibs REQUIRED)
+   endif()
+ 
diff --git a/recipes-devtools/clang/clang_git.bb b/recipes-devtools/clang/clang_git.bb
index 79e29ef..6e68747 100644
--- a/recipes-devtools/clang/clang_git.bb
+++ b/recipes-devtools/clang/clang_git.bb
@@ -94,6 +94,8 @@ EXTRA_OECMAKE += "-DLLVM_ENABLE_ASSERTIONS=OFF \
                   -G Ninja ${S}/llvm \
                   -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON \
                   -DPYTHON_EXECUTABLE=${PYTHON} \
+                  -DPYTHON_LIBRARY=${PYTHON_LIBRARY} \
+                  -DPYTHON_INCLUDE_DIR=${PYTHON_INCLUDE_DIR} \
 "
 
 EXTRA_OECMAKE_append_class-native = "\
diff --git a/recipes-devtools/clang/common.inc b/recipes-devtools/clang/common.inc
index dc73081..6c03622 100644
--- a/recipes-devtools/clang/common.inc
+++ b/recipes-devtools/clang/common.inc
@@ -28,6 +28,7 @@ SRC_URI = "\
     file://0018-clang-Initial-implementation-of-fmacro-prefix-map-an.patch \
     file://0019-clang-Add-lpthread-and-ldl-along-with-lunwind-for-st.patch \
     file://0020-clang-default-to-lp64d-ABI-and-rv64gc-ISA.patch \
+    file://0021-lldb-Do-not-look-for-interpreter.patch \
 "
 
 # Fallback to no-PIE if not set