20 files changed, 154 insertions, 150 deletions

diff --git a/recipes-devtools/clang/clang-cross-canadian_git.bb b/recipes-devtools/clang/clang-cross-canadian_git.bb
index 58e2206..b547f47 100644
--- a/recipes-devtools/clang/clang-cross-canadian_git.bb
+++ b/recipes-devtools/clang/clang-cross-canadian_git.bb
@@ -10,6 +10,7 @@ SECTION = "devel"
 PN = "clang-cross-canadian-${TRANSLATED_TARGET_ARCH}"
 
 require clang.inc
+require common-source.inc
 inherit cross-canadian
 
 DEPENDS += "nativesdk-clang binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} virtual/${HOST_PREFIX}binutils-crosssdk virtual/nativesdk-libc"
@@ -18,8 +19,6 @@ DEPENDS += "nativesdk-clang binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} vi
 EXTRA_OECONF_PATHS[vardepsexclude] = "TUNE_PKGARCH"
 TARGET_ARCH[vardepsexclude] = "TUNE_ARCH"
 
-S = "${WORKDIR}"
-
 do_install() {
         install -d  ${D}${bindir}
         ln -sf ../clang ${D}${bindir}/${TARGET_PREFIX}clang
diff --git a/recipes-devtools/clang/clang-cross_git.bb b/recipes-devtools/clang/clang-cross_git.bb
index 083acb5..618aa5d 100644
--- a/recipes-devtools/clang/clang-cross_git.bb
+++ b/recipes-devtools/clang/clang-cross_git.bb
@@ -10,11 +10,10 @@ SECTION = "devel"
 PN = "clang-cross-${TARGET_ARCH}"
 
 require clang.inc
+require common-source.inc
 inherit cross
 DEPENDS += "clang-native binutils-cross-${TARGET_ARCH}"
 
-S = "${WORKDIR}"
-
 do_install() {
         install -d ${D}${bindir}
         ln -sf ../clang ${D}${bindir}/${TARGET_PREFIX}clang
diff --git a/recipes-devtools/clang/clang-crosssdk_git.bb b/recipes-devtools/clang/clang-crosssdk_git.bb
index d23fc66..0fd80be 100644
--- a/recipes-devtools/clang/clang-crosssdk_git.bb
+++ b/recipes-devtools/clang/clang-crosssdk_git.bb
@@ -10,11 +10,10 @@ SECTION = "devel"
 PN = "clang-crosssdk-${TARGET_ARCH}"
 
 require clang.inc
+require common-source.inc
 inherit crosssdk
 DEPENDS += "clang-native nativesdk-clang-glue virtual/${TARGET_PREFIX}binutils-crosssdk virtual/nativesdk-libc"
 
-S = "${WORKDIR}"
-
 do_install() {
         install -d  ${D}${bindir}
         ln -sf ../clang ${D}${bindir}/${TARGET_PREFIX}clang
diff --git a/recipes-devtools/clang/clang.inc b/recipes-devtools/clang/clang.inc
index bd2dc56..34730f7 100644
--- a/recipes-devtools/clang/clang.inc
+++ b/recipes-devtools/clang/clang.inc
@@ -1,32 +1,24 @@
 LLVM_RELEASE = ""
 LLVM_DIR = "llvm${LLVM_RELEASE}"
 
-LLVM_GIT ?= "git://github.com/llvm-mirror"
+LLVM_GIT ?= "git://github.com/llvm-project"
 LLVM_GIT_PROTOCOL ?= "https"
 
-#
-# Uncomment below to enable master version of clang/llvm
-#
 MAJOR_VER = "7"
 MINOR_VER = "0"
 PATCH_VER = "1"
 
+SRCREV ?= "b8e7044dd2e6e7af9e58cef99b840bd88cfd2dec"
+
 PV = "${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}"
 BRANCH = "release_${MAJOR_VER}${MINOR_VER}"
 
-SRCREV_llvm = "cd98f42d0747826062fc3d2d2fad383aedf58dd6"
-SRCREV_clang = "4519e2637fcc4bf6e3049a0a80e6a5e7b97667cb"
-SRCREV_compiler-rt = "a4cbb02bca3b952117e9ccfbad8a485857f25935"
-SRCREV_cxxabi = "a5b1f6f7644b30c97a59d512d4dbe6825db424d9"
-SRCREV_libcxx = "2ac8add7b38ccbbdf75399caf84aeabaf687da29"
-SRCREV_libunwind = "d1dee9d525dac7d7146b6e197bc330a7bd963075"
-SRCREV_lld = "b9f34e3a65782a9f33fe9eaf2240ec4f1f6e3f6e"
-SRCREV_lldb = "637da661b5ef6fd47f4b077ffd26a79b1c1892f9"
-SRCREV_openmp = "366ce74b85790ed41f94fba7f17a0911bde83500"
-
 LLVMMD5SUM = "c520ed40e11887bb1d24d86f7f5b1f05"
 CLANGMD5SUM = "444af0e124949f07f791f12c928e5994"
 LLDMD5SUM = "f4941ace8ddb3d6cf177fff94966319a"
 LLDBMD5SUM = "b6320ed0b0d00ae661dd94f277bbf024"
 
+# risc-v comes with clang-8+
 COMPATIBLE_HOST_riscv64 = "(null)"
+
+require common.inc
diff --git a/recipes-devtools/clang/compiler-rt/0001-support-a-new-embedded-linux-target.patch b/recipes-devtools/clang/clang/0001-compiler-rt-support-a-new-embedded-linux-target.patch
index 19651d1..8b0c9fe 100644
--- a/recipes-devtools/clang/compiler-rt/0001-support-a-new-embedded-linux-target.patch
+++ b/recipes-devtools/clang/clang/0001-compiler-rt-support-a-new-embedded-linux-target.patch
@@ -1,7 +1,7 @@
-From 0bff81915ecc52416e20b7226dddf6d7f3df29c9 Mon Sep 17 00:00:00 2001
+From 8b0d5d19e8ebec9b6508b51701cb0c64069091cb 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 1/5] support a new embedded linux target
+Subject: [PATCH 1/4] compiler-rt: support a new embedded linux target
 
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
@@ -322,5 +322,5 @@ diff --git a/make/platform/clang_linux_embedded_test_input.c b/make/platform/cla
 new file mode 100644
 index 000000000..e69de29bb
 -- 
-2.18.0
+2.20.1
 
diff --git a/recipes-devtools/clang/lldb/0001-Include-limits.h-for-PATH_MAX-definition.patch b/recipes-devtools/clang/clang/0001-lldb-Include-limits.h-for-PATH_MAX-definition.patch
index b4b835b..1c42931 100644
--- a/recipes-devtools/clang/lldb/0001-Include-limits.h-for-PATH_MAX-definition.patch
+++ b/recipes-devtools/clang/clang/0001-lldb-Include-limits.h-for-PATH_MAX-definition.patch
@@ -1,7 +1,7 @@
-From d1b12ce65b563ed5eb0fdd6460d592d829fabc75 Mon Sep 17 00:00:00 2001
+From ff8d7137ed4d62e9db6d31581822a2ce06d5cbc6 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Thu, 18 May 2017 23:12:34 -0700
-Subject: [PATCH 1/2] Include limits.h for PATH_MAX definition
+Subject: [PATCH 1/2] lldb: Include limits.h for PATH_MAX definition
 
 Helps compiling on musl targets
 
@@ -24,5 +24,5 @@ index b6952f7e3..2cedf5d90 100644
  using namespace lldb_private;
  
 -- 
-2.18.0
+2.20.1
 
diff --git a/recipes-devtools/clang/compiler-rt/0002-Simplify-cross-compilation.-Don-t-use-native-compile.patch b/recipes-devtools/clang/clang/0002-compiler-rt-Simplify-cross-compilation.-Don-t-use-na.patch
index a3d2a66..2ff903b 100644
--- a/recipes-devtools/clang/compiler-rt/0002-Simplify-cross-compilation.-Don-t-use-native-compile.patch
+++ b/recipes-devtools/clang/clang/0002-compiler-rt-Simplify-cross-compilation.-Don-t-use-na.patch
@@ -1,8 +1,8 @@
-From b1b791a330d6399c85fd304f4af12fd01c5b58b2 Mon Sep 17 00:00:00 2001
+From 5ee148af76169aa327bfa0bfc1c2618a68e873fb 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 2/5] Simplify cross-compilation. Don't use native-compiled
- llvm-config.
+Subject: [PATCH 2/4] compiler-rt: Simplify cross-compilation. Don't use
+ native-compiled llvm-config.
 
     Note: AddLLVM.cmake does not expose the LLVM source directory.
     So if you want to run the test suite, you need to either:
@@ -42,5 +42,5 @@ index 86ca2b3ef..07d894c8a 100644
      # Loading the llvm config causes this target to be imported so place it
      # under the appropriate folder in an IDE.
 -- 
-2.18.0
+2.20.1
 
diff --git a/recipes-devtools/clang/lldb/0002-lldb-Add-lxml2-to-linker-cmdline-of-xml-is-found.patch b/recipes-devtools/clang/clang/0002-lldb-Add-lxml2-to-linker-cmdline-of-xml-is-found.patch
index 42e75f2..c331e7a 100644
--- a/recipes-devtools/clang/lldb/0002-lldb-Add-lxml2-to-linker-cmdline-of-xml-is-found.patch
+++ b/recipes-devtools/clang/clang/0002-lldb-Add-lxml2-to-linker-cmdline-of-xml-is-found.patch
@@ -1,4 +1,4 @@
-From 479c943c3b87887d2b93c711220894e94d49979d Mon Sep 17 00:00:00 2001
+From fa140ec90e72da40d49301e674c84854fdac804b 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 2/2] lldb: Add -lxml2 to linker cmdline of xml is found
@@ -36,5 +36,5 @@ index 5a92447ed..22ce6eee4 100644
  endif ()
  if (HAVE_LIBDL)
 -- 
-2.18.0
+2.20.1
 
diff --git a/recipes-devtools/clang/compiler-rt/0003-Disable-tsan-on-OE-glibc.patch b/recipes-devtools/clang/clang/0003-compiler-rt-Disable-tsan-on-OE-glibc.patch
index 83f2d82..8f45c2b 100644
--- a/recipes-devtools/clang/compiler-rt/0003-Disable-tsan-on-OE-glibc.patch
+++ b/recipes-devtools/clang/clang/0003-compiler-rt-Disable-tsan-on-OE-glibc.patch
@@ -1,7 +1,7 @@
-From c90304ffca9c886443e5736ae312e32415651dfe Mon Sep 17 00:00:00 2001
+From c7d41a6e4dd61733530d2f44c377b91e13004b71 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 3/5] Disable tsan on OE/glibc
+Subject: [PATCH 3/4] compiler-rt: Disable tsan on OE/glibc
 
 It does not build see
 http://lists.llvm.org/pipermail/llvm-dev/2016-July/102235.html
@@ -38,5 +38,5 @@ index 4e2c80390..990315f11 100644
    list(APPEND SUPPORTED_TOOLS ubsan)
  endif()
 -- 
-2.18.0
+2.20.1
 
diff --git a/recipes-devtools/clang/compiler-rt/0004-cmake-mips-Do-not-specify-target-with-OE.patch b/recipes-devtools/clang/clang/0004-compiler-rt-cmake-mips-Do-not-specify-target-with-OE.patch
index 5868c6e..0356e2a 100644
--- a/recipes-devtools/clang/compiler-rt/0004-cmake-mips-Do-not-specify-target-with-OE.patch
+++ b/recipes-devtools/clang/clang/0004-compiler-rt-cmake-mips-Do-not-specify-target-with-OE.patch
@@ -1,7 +1,7 @@
-From 4c3f384a73a545183b0210f20ab84e7a5075b209 Mon Sep 17 00:00:00 2001
+From b29deaeb42a8f56bb5dd72b5a8c3e2c755a6bb9e Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 11 Feb 2017 17:54:33 +0000
-Subject: [PATCH 4/5] cmake/mips: Do not specify --target with OE
+Subject: [PATCH 4/4] compiler-rt: cmake/mips: Do not specify --target with OE
 
 OE already specifies cross compiler correctly, adding this additional
 --target confuses the clang driver and it resorts to invoke host assembler
@@ -40,5 +40,5 @@ index 91fe2494b..789b80628 100644
        if(WIN32)
          test_target_arch(arm "" "" "")
 -- 
-2.18.0
+2.20.1
 
diff --git a/recipes-devtools/clang/clang_git.bb b/recipes-devtools/clang/clang_git.bb
index 058797c..894c721 100644
--- a/recipes-devtools/clang/clang_git.bb
+++ b/recipes-devtools/clang/clang_git.bb
@@ -3,30 +3,13 @@
 
 DESCRIPTION = "LLVM based C/C++ compiler"
 HOMEPAGE = "http://clang.llvm.org/"
-LICENSE = "NCSA"
 SECTION = "devel"
 
 require clang.inc
-require common.inc
-
-PV .= "+git${SRCPV}"
-
-LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=${LLVMMD5SUM}; \
-                    file://tools/clang/LICENSE.TXT;md5=${CLANGMD5SUM}; \
-                   "
-SRC_URI = "\
-    ${LLVM_GIT}/llvm.git;protocol=${LLVM_GIT_PROTOCOL};branch=${BRANCH};name=llvm \
-    ${LLVM_GIT}/clang.git;protocol=${LLVM_GIT_PROTOCOL};branch=${BRANCH};destsuffix=git/tools/clang;name=clang \
-    ${LLVMPATCHES} \
-    ${CLANGPATCHES} \
-   "
-
-SRCREV_FORMAT = "llvm_clang"
+require common-source.inc
 
 INHIBIT_DEFAULT_DEPS = "1"
 
-S = "${WORKDIR}/git"
-
 inherit cmake cmake-native
 
 OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "BOTH"
@@ -80,7 +63,8 @@ EXTRA_OECMAKE += "-DLLVM_ENABLE_ASSERTIONS=OFF \
                   -DCMAKE_SYSTEM_NAME=Linux \
                   -DCMAKE_BUILD_TYPE=Release \
                   -DBUILD_SHARED_LIBS=OFF \
-                  -G Ninja \
+                  -DLLVM_ENABLE_PROJECTS='clang;lld' \
+                  -G Ninja ${S}/llvm \
 "
 
 EXTRA_OECMAKE_append_class-native = "\
@@ -90,6 +74,7 @@ EXTRA_OECMAKE_append_class-nativesdk = "\
                   -DCMAKE_CROSSCOMPILING:BOOL=ON \
                   -DCROSS_TOOLCHAIN_FLAGS_NATIVE='-DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain-native.cmake' \
                   -DLLVM_TARGETS_TO_BUILD='${LLVM_TARGETS_TO_BUILD}' \
+                  -DLLVM_ENABLE_RUNTIMES='compiler-rt;libcxx;libcxxabi;libunwind' \
                   -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen \
                   -DCLANG_TABLEGEN=${STAGING_BINDIR_NATIVE}/clang-tblgen \
 "
diff --git a/recipes-devtools/clang/common-source.inc b/recipes-devtools/clang/common-source.inc
new file mode 100644
index 0000000..e7fb06f
--- /dev/null
+++ b/recipes-devtools/clang/common-source.inc
@@ -0,0 +1,11 @@
+do_fetch() {
+        :
+}
+do_fetch[noexec] = "1"
+deltask do_unpack
+deltask do_patch
+
+SRC_URI = ""
+
+do_configure[depends] += "llvm-project-source-${PV}:do_patch"
+do_populate_lic[depends] += "llvm-project-source-${PV}:do_unpack"
diff --git a/recipes-devtools/clang/common.inc b/recipes-devtools/clang/common.inc
index 74bccf4..1b4cf9b 100644
--- a/recipes-devtools/clang/common.inc
+++ b/recipes-devtools/clang/common.inc
@@ -1,33 +1,70 @@
 FILESEXTRAPATHS =. "${FILE_DIRNAME}/clang:"
 
+LIC_FILES_CHKSUM = "file://llvm/LICENSE.TXT;md5=${LLVMMD5SUM} \
+                    file://clang/LICENSE.TXT;md5=${CLANGMD5SUM} \
+"
+LICENSE = "NCSA"
+
+BASEURI ??= "${LLVM_GIT}/llvm-project-20170507;protocol=${LLVM_GIT_PROTOCOL};branch=${BRANCH}"
+SRC_URI = "\
+    ${BASEURI} \
+    ${LLVMPATCHES} \
+    ${CLANGPATCHES} \
+    ${COMPILERRTPATCHES} \
+    ${LIBCXXABIPATCHES} \
+    ${LIBCXXPATCHES} \
+    ${LLDBPATCHES} \
+"
+
 # llvm patches
 #
 LLVMPATCHES = "\
-    file://0001-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch \
-    file://0002-llvm-allow-env-override-of-exe-path.patch \
-    file://0003-llvm-Disable-calls-to-_finite-and-other-glibc-only-f.patch \
+    file://0001-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch;patchdir=llvm \
+    file://0002-llvm-allow-env-override-of-exe-path.patch;patchdir=llvm \
+    file://0003-llvm-Disable-calls-to-_finite-and-other-glibc-only-f.patch;patchdir=llvm \
 "
 # Fallback to no-PIE if not set
 GCCPIE ??= ""
 
 # Clang patches
 CLANGPATCHES = "\
-    file://0001-clang-driver-Use-lib-for-ldso-on-OE.patch;patchdir=tools/clang \
-    file://0002-clang-Driver-tools.cpp-Add-lssp_nonshared-on-musl.patch;patchdir=tools/clang \
-    file://0003-clang-musl-ppc-does-not-support-128-bit-long-double.patch;patchdir=tools/clang \
-    file://0004-clang-Prepend-trailing-to-sysroot.patch;patchdir=tools/clang \
-    file://0005-clang-Look-inside-the-target-sysroot-for-compiler-ru.patch;patchdir=tools/clang \
-    file://0006-clang-Define-releative-gcc-installation-dir.patch;patchdir=tools/clang \
-    file://0007-clang-Fix-ldso-for-musl-on-x86-and-x32-architectures.patch;patchdir=tools/clang \
-    file://0008-clang-scan-view-needs-python-2.x.patch;patchdir=tools/clang \
+    file://0001-clang-driver-Use-lib-for-ldso-on-OE.patch;patchdir=clang \
+    file://0002-clang-Driver-tools.cpp-Add-lssp_nonshared-on-musl.patch;patchdir=clang \
+    file://0003-clang-musl-ppc-does-not-support-128-bit-long-double.patch;patchdir=clang \
+    file://0004-clang-Prepend-trailing-to-sysroot.patch;patchdir=clang \
+    file://0005-clang-Look-inside-the-target-sysroot-for-compiler-ru.patch;patchdir=clang \
+    file://0006-clang-Define-releative-gcc-installation-dir.patch;patchdir=clang \
+    file://0007-clang-Fix-ldso-for-musl-on-x86-and-x32-architectures.patch;patchdir=clang \
+    file://0008-clang-scan-view-needs-python-2.x.patch;patchdir=clang \
 "
-CLANGPATCHES += "${@'file://0009-clang-Enable-SSP-and-PIE-by-default.patch;patchdir=tools/clang' if '${GCCPIE}' else ''}"
+CLANGPATCHES += "${@'file://0009-clang-Enable-SSP-and-PIE-by-default.patch;patchdir=clang' if '${GCCPIE}' else ''}"
 
+# compiler-rt patches
+COMPILERRTPATCHES = "\
+    file://0001-compiler-rt-support-a-new-embedded-linux-target.patch;patchdir=compiler-rt \
+    file://0002-compiler-rt-Simplify-cross-compilation.-Don-t-use-na.patch;patchdir=compiler-rt \
+    file://0003-compiler-rt-Disable-tsan-on-OE-glibc.patch;patchdir=compiler-rt \
+    file://0004-compiler-rt-cmake-mips-Do-not-specify-target-with-OE.patch;patchdir=compiler-rt \
+"
 # libcxxabi patches
 LIBCXXABIPATCHES ="\
-    file://0001-libcxxabi-Find-libunwind-headers-when-LIBCXXABI_LIBU.patch;patchdir=projects/libcxxabi \
+    file://0001-libcxxabi-Find-libunwind-headers-when-LIBCXXABI_LIBU.patch;patchdir=libcxxabi \
 "
 
 # libc++ patches
 LIBCXXPATCHES = "\
 "
+
+# lldb patches
+LLDBPATCHES = "\
+    file://0001-lldb-Include-limits.h-for-PATH_MAX-definition.patch;patchdir=lldb \
+    file://0002-lldb-Add-lxml2-to-linker-cmdline-of-xml-is-found.patch;patchdir=lldb \
+"
+
+S = "${TMPDIR}/work-shared/llvm-project-source-${PV}-${PR}/git"
+B = "${WORKDIR}/llvm-project-source-${PV}/build.${HOST_SYS}.${TARGET_SYS}"
+
+# We need to ensure that for the shared work directory, the do_patch signatures match
+# The real WORKDIR location isn't a dependency for the shared workdir.
+src_patches[vardepsexclude] = "WORKDIR"
+should_apply[vardepsexclude] += "PN"
diff --git a/recipes-devtools/clang/compiler-rt_git.bb b/recipes-devtools/clang/compiler-rt_git.bb
index c458836..0bc5a49 100644
--- a/recipes-devtools/clang/compiler-rt_git.bb
+++ b/recipes-devtools/clang/compiler-rt_git.bb
@@ -7,34 +7,22 @@ LICENSE = "MIT | NCSA"
 SECTION = "base"
 
 require clang.inc
+require common-source.inc
 
-TOOLCHAIN = "clang"
+inherit cmake pkgconfig pythonnative
 
-PV .= "+git${SRCPV}"
 
-LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=92bfbe70fc44c6e5efc6403a31180ed7; \
-"
-SRC_URI =  "\
-    ${LLVM_GIT}/compiler-rt.git;protocol=${LLVM_GIT_PROTOCOL};branch=${BRANCH};name=compiler-rt \
-    file://0001-support-a-new-embedded-linux-target.patch \
-    file://0002-Simplify-cross-compilation.-Don-t-use-native-compile.patch \
-    file://0003-Disable-tsan-on-OE-glibc.patch \
-    file://0004-cmake-mips-Do-not-specify-target-with-OE.patch \
+LIC_FILES_CHKSUM = "file://compiler-rt/LICENSE.TXT;md5=92bfbe70fc44c6e5efc6403a31180ed7; \
 "
 
-SRCREV_FORMAT = "compiler-rt"
-
 BASEDEPENDS_remove_toolchain-clang_class-target = "compiler-rt"
 BASEDEPENDS_remove_toolchain-clang_class-target = "libcxx"
 TARGET_CXXFLAGS_remove_toolchain-clang = " -stdlib=libc++ "
 TUNE_CCARGS_remove = "-no-integrated-as"
+LDFLAGS_append = " -fuse-ld=lld"
 
 DEPENDS += "ninja-native"
 
-S = "${WORKDIR}/git"
-
-inherit cmake pkgconfig pythonnative
-
 THUMB_TUNE_CCARGS = ""
 #TUNE_CCARGS += "-nostdlib"
 
@@ -43,7 +31,7 @@ HF[vardepvalue] = "${HF}"
 EXTRA_OECMAKE += "-DCOMPILER_RT_STANDALONE_BUILD=ON \
                   -DCOMPILER_RT_DEFAULT_TARGET_TRIPLE=${HOST_ARCH}${HF}${HOST_VENDOR}-${HOST_OS} \
                   -DCOMPILER_RT_BUILD_XRAY=OFF \
-                  -G Ninja \
+                  -G Ninja ${S}/compiler-rt \
 "
 
 EXTRA_OECMAKE_append_class-nativesdk = "\
@@ -101,3 +89,5 @@ BBCLASSEXTEND = "native nativesdk"
 
 ALLOW_EMPTY_${PN} = "1"
 ALLOW_EMPTY_${PN}-dev = "1"
+
+TOOLCHAIN = "clang"
diff --git a/recipes-devtools/clang/libcxx_git.bb b/recipes-devtools/clang/libcxx_git.bb
index 10dd3c8..a320e05 100644
--- a/recipes-devtools/clang/libcxx_git.bb
+++ b/recipes-devtools/clang/libcxx_git.bb
@@ -7,10 +7,9 @@ LICENSE = "MIT | NCSA"
 SECTION = "base"
 
 require clang.inc
-require common.inc
+require common-source.inc
 
 inherit cmake pythonnative
-PV .= "+git${SRCPV}"
 
 DEPENDS += "ninja-native"
 BASEDEPENDS_remove_toolchain-clang = "libcxx"
@@ -24,24 +23,10 @@ PACKAGECONFIG[unwind] = "-DLIBCXXABI_USE_LLVM_UNWINDER=ON -DLIBCXXABI_LIBUNWIND_
 
 PROVIDES += "${@bb.utils.contains('PACKAGECONFIG', 'unwind', 'libunwind', '', d)}"
 
-LIC_FILES_CHKSUM = "file://projects/libcxx/LICENSE.TXT;md5=7b3a0e1b99822669d630011defe9bfd9; \
-                    file://projects/libcxxabi/LICENSE.TXT;md5=3600117b7c18121ab04c53e4615dc36e \
-                    file://projects/libunwind/LICENSE.TXT;md5=7ea986af7f70eaea5a297dd2744c79a5 \
+LIC_FILES_CHKSUM = "file://libcxx/LICENSE.TXT;md5=7b3a0e1b99822669d630011defe9bfd9; \
+                    file://libcxxabi/LICENSE.TXT;md5=3600117b7c18121ab04c53e4615dc36e \
+                    file://libunwind/LICENSE.TXT;md5=7ea986af7f70eaea5a297dd2744c79a5 \
 "
-SRC_URI = "\
-    ${LLVM_GIT}/llvm.git;protocol=${LLVM_GIT_PROTOCOL};branch=${BRANCH};name=llvm \
-    ${LLVM_GIT}/libcxx.git;protocol=${LLVM_GIT_PROTOCOL};branch=${BRANCH};name=libcxx;destsuffix=git/projects/libcxx \
-    ${LLVM_GIT}/libcxxabi.git;protocol=${LLVM_GIT_PROTOCOL};branch=${BRANCH};name=cxxabi;destsuffix=git/projects/libcxxabi \
-    ${LLVM_GIT}/libunwind.git;protocol=${LLVM_GIT_PROTOCOL};branch=${BRANCH};name=libunwind;destsuffix=git/projects/libunwind \
-    ${LLVMPATCHES} \
-    ${LIBCXXPATCHES} \
-    ${LIBCXXABIPATCHES} \
-"
-
-SRCREV_FORMAT = "llvm_libcxx_cxxabi_libunwind"
-
-S = "${WORKDIR}/git"
-
 THUMB_TUNE_CCARGS = ""
 #TUNE_CCARGS += "-nostdlib"
 
@@ -49,11 +34,12 @@ EXTRA_OECMAKE += "\
                   -DLIBCXX_CXX_ABI=libcxxabi \
                   -DLLVM_BUILD_EXTERNAL_COMPILER_RT=ON \
                   -DCXX_SUPPORTS_CXX11=ON \
-                  -DLIBCXXABI_LIBCXX_INCLUDES=${S}/projects/libcxx/include \
-                  -DLIBCXX_CXX_ABI_INCLUDE_PATHS=${S}/projects/libcxxabi/include \
+                  -DLIBCXXABI_LIBCXX_INCLUDES=${S}/libcxx/include \
+                  -DLIBCXX_CXX_ABI_INCLUDE_PATHS=${S}/libcxxabi/include \
                   -DLIBCXX_CXX_ABI_LIBRARY_PATH=${B}/lib \
+                  -DLLVM_ENABLE_PROJECTS='libcxx;libcxxabi;libunwind' \
                   -G Ninja \
-                  ${S} \
+                  ${S}/llvm \
 "
 
 EXTRA_OECMAKE_append_class-native = " -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF"
diff --git a/recipes-devtools/clang/lldb_git.bb b/recipes-devtools/clang/lldb_git.bb
index 3488d6b..7c4be42 100644
--- a/recipes-devtools/clang/lldb_git.bb
+++ b/recipes-devtools/clang/lldb_git.bb
@@ -8,34 +8,15 @@ SECTION = "devel"
 
 DEPENDS += "clang-native zlib libxml2 ninja-native"
 
-FILESPATH =. "${FILE_DIRNAME}/clang:"
 require clang.inc
-require common.inc
+require common-source.inc
 
 inherit cmake pkgconfig
-PV .= "+git${SRCPV}"
 
-LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=${LLVMMD5SUM}; \
-                    file://tools/clang/LICENSE.TXT;md5=${CLANGMD5SUM}; \
-                    file://tools/lldb/LICENSE.TXT;md5=${LLDBMD5SUM}; \
-                   "
-
-SRC_URI = "\
-    ${LLVM_GIT}/llvm.git;protocol=${LLVM_GIT_PROTOCOL};branch=${BRANCH};name=llvm \
-    ${LLVM_GIT}/clang.git;protocol=${LLVM_GIT_PROTOCOL};branch=${BRANCH};destsuffix=git/tools/clang;name=clang \
-    ${LLVM_GIT}/lldb.git;protocol=${LLVM_GIT_PROTOCOL};branch=${BRANCH};destsuffix=git/tools/lldb;name=lldb \
-    ${LLVMPATCHES} \
-    ${CLANGPATCHES} \
-   "
-
-# lldb patches
-SRC_URI += "\
-    file://0001-Include-limits.h-for-PATH_MAX-definition.patch;patchdir=tools/lldb \
-    file://0002-lldb-Add-lxml2-to-linker-cmdline-of-xml-is-found.patch;patchdir=tools/lldb \
-   "
-SRCREV_FORMAT = "llvm_clang_lldb"
-
-S = "${WORKDIR}/git"
+LIC_FILES_CHKSUM = "file://llvm/LICENSE.TXT;md5=${LLVMMD5SUM}; \
+                    file://clang/LICENSE.TXT;md5=${CLANGMD5SUM}; \
+                    file://lldb/LICENSE.TXT;md5=${LLDBMD5SUM}; \
+"
 
 OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "BOTH"
 
@@ -52,10 +33,15 @@ EXTRA_OECMAKE="\
     -DLLVM_ENABLE_TERMINFO=0 \
     -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen \
     -DCLANG_TABLEGEN=${STAGING_BINDIR_NATIVE}/clang-tblgen \
+    -DLLVM_HOST_TRIPLE=${TARGET_SYS} \
+    -DLLDB_TEST_USE_CUSTOM_C_COMPILER=ON \
+    -DLLDB_TEST_USE_CUSTOM_CXX_COMPILER=ON \
+    -DLLDB_TEST_C_COMPILER='${CC}' \
+    -DLLDB_TEST_CXX_COMPILER='${CXX}' \
     -DCMAKE_BUILD_TYPE=Release \
-    -G Ninja \
-    ${S} \
-    "
+    -DLLVM_ENABLE_PROJECTS='clang;lldb' \
+    -G Ninja ${S}/llvm \
+"
 
 EXTRA_OEMAKE = "VERBOSE=1"
 
diff --git a/recipes-devtools/clang/llvm-project-source.bb b/recipes-devtools/clang/llvm-project-source.bb
new file mode 100644
index 0000000..a3133b2
--- /dev/null
+++ b/recipes-devtools/clang/llvm-project-source.bb
@@ -0,0 +1,10 @@
+# Copyright (C) 2018 Khem Raj <raj.khem@gmail.com>
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+SUMMARY = "Flat monorepo imported from http://llvm.org/git/ (17 repos)"
+HOMEPAGE = "https://github.com/llvm-project/llvm-project-20170507"
+
+require llvm-project-source.inc
+require clang.inc
+
+EXCLUDE_FROM_WORLD = "1"
diff --git a/recipes-devtools/clang/llvm-project-source.inc b/recipes-devtools/clang/llvm-project-source.inc
new file mode 100644
index 0000000..f6c552d
--- /dev/null
+++ b/recipes-devtools/clang/llvm-project-source.inc
@@ -0,0 +1,20 @@
+deltask do_configure
+deltask do_compile
+deltask do_install
+deltask do_populate_sysroot
+deltask do_populate_lic
+RM_WORK_EXCLUDE += "${PN}"
+
+inherit nopackages
+
+PN = "llvm-project-source-${PV}"
+
+WORKDIR = "${TMPDIR}/work-shared/llvm-project-source-${PV}-${PR}"
+SSTATE_SWSPEC = "sstate:llvm-project-source::${PV}:${PR}::${SSTATE_VERSION}:"
+
+STAMP = "${STAMPS_DIR}/work-shared/llvm-project-source-${PV}-${PR}"
+STAMPCLEAN = "${STAMPS_DIR}/work-shared/llvm-project-source-${PV}-*"
+
+INHIBIT_DEFAULT_DEPS = "1"
+DEPENDS = ""
+PACKAGES = ""
diff --git a/recipes-devtools/clang/nativesdk-clang-glue.bb b/recipes-devtools/clang/nativesdk-clang-glue.bb
index 5453990..6824bcb 100644
--- a/recipes-devtools/clang/nativesdk-clang-glue.bb
+++ b/recipes-devtools/clang/nativesdk-clang-glue.bb
@@ -8,11 +8,10 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/NCSA;md5=1b5fdec70ee13ad8a91667
 SECTION = "devel"
 
 require clang.inc
+require common-source.inc
 inherit nativesdk
 DEPENDS += "nativesdk-clang"
 
-S = "${WORKDIR}"
-
 do_install() {
     install -d ${D}${prefix_nativesdk}
     cd ${D}${prefix_nativesdk}
diff --git a/recipes-devtools/clang/openmp_git.bb b/recipes-devtools/clang/openmp_git.bb
index b141b98..30bc307 100644
--- a/recipes-devtools/clang/openmp_git.bb
+++ b/recipes-devtools/clang/openmp_git.bb
@@ -7,6 +7,7 @@ LICENSE = "MIT | NCSA"
 SECTION = "base"
 
 require clang.inc
+require common-source.inc
 
 DEPENDS += "ninja-native"
 
@@ -15,24 +16,14 @@ RPROVIDES_${PN}-dev += "libgomp-dev"
 
 TOOLCHAIN = "clang"
 
-PV .= "+git${SRCPV}"
-
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=5dcbca021bcb2fbc22186bc7a8a159e6; \
-"
-SRC_URI =  "\
-    ${LLVM_GIT}/openmp.git;protocol=${LLVM_GIT_PROTOCOL};branch=${BRANCH};name=openmp \
-"
-
-SRCREV_FORMAT = "openmp"
+LIC_FILES_CHKSUM = "file://openmp/LICENSE.txt;md5=5dcbca021bcb2fbc22186bc7a8a159e6"
 
 BASEDEPENDS_remove_toolchain-clang_class-target = "compiler-rt"
 BASEDEPENDS_remove_toolchain-clang_class-target = "libcxx"
 
-S = "${WORKDIR}/git"
-
 inherit cmake pkgconfig perlnative
 
-EXTRA_OECMAKE = "-G Ninja"
+EXTRA_OECMAKE = "-G Ninja ${S}/openmp"
 
 THUMB_TUNE_CCARGS = ""