clang: Build lldb as part of clang unified package

This helps in building lldb which now needs build tree of llvm/clang
to build itself (lldb-tblgen needs the build tree)

Promote RISCV to first class citizen

Package additional files and depend on libedit for lldb

put python lldb files into own package

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

2 files changed, 15 insertions, 73 deletions

diff --git a/recipes-devtools/clang/clang_git.bb b/recipes-devtools/clang/clang_git.bb
index 75b56ce..4f4af8f 100644
--- a/recipes-devtools/clang/clang_git.bb
+++ b/recipes-devtools/clang/clang_git.bb
@@ -24,7 +24,6 @@ OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "BOTH"
 def get_clang_experimental_arch(bb, d, arch_var):
     import re
     a = d.getVar(arch_var, True)
-    if re.match('riscv(32|64)$', a):                 return 'RISCV'
     return ""
 
 def get_clang_arch(bb, d, arch_var):
@@ -36,6 +35,7 @@ def get_clang_arch(bb, d, arch_var):
     elif re.match('aarch64$', a):                      return 'AArch64'
     elif re.match('aarch64_be$', a):                   return 'AArch64'
     elif re.match('mips(isa|)(32|64|)(r6|)(el|)$', a): return 'Mips'
+    elif re.match('riscv(32|64)(eb|)$', a):            return 'RISCV'
     elif re.match('p(pc|owerpc)(|64)', a):             return 'PowerPC'
     else:
         bb.note("'%s' is not a primary llvm architecture" % a)
@@ -61,18 +61,16 @@ PACKAGECONFIG[full-lto] = "-DLLVM_ENABLE_LTO=Full -DLLVM_BINUTILS_INCDIR=${STAGI
 PACKAGECONFIG[shared-libs] = "-DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_LINK_LLVM_DYLIB=ON,,,"
 PACKAGECONFIG[terminfo] = "-DLLVM_ENABLE_TERMINFO=ON,-DLLVM_ENABLE_TERMINFO=OFF,ncurses,"
 PACKAGECONFIG[pfm] = "-DLLVM_ENABLE_LIBPFM=ON,-DLLVM_ENABLE_LIBPFM=OFF,libpfm,"
-PACKAGECONFIG[libedit] = "-DLLVM_ENABLE_LIBEDIT=ON,-DLLVM_ENABLE_LIBEDIT=OFF,libedit,"
-
 #
 # Default to build all OE-Core supported target arches (user overridable).
 #
-LLVM_TARGETS_TO_BUILD ?= "AArch64;ARM;BPF;Mips;PowerPC;X86"
+LLVM_TARGETS_TO_BUILD ?= "AArch64;ARM;BPF;Mips;PowerPC;RISCV;X86"
 LLVM_TARGETS_TO_BUILD_append = ";${@get_clang_host_arch(bb, d)};${@get_clang_target_arch(bb, d)}"
 
 LLVM_TARGETS_TO_BUILD_TARGET ?= ""
 LLVM_TARGETS_TO_BUILD_TARGET_append ?= "${@get_clang_target_arch(bb, d)}"
 
-LLVM_EXPERIMENTAL_TARGETS_TO_BUILD ?= "RISCV"
+LLVM_EXPERIMENTAL_TARGETS_TO_BUILD ?= ""
 LLVM_EXPERIMENTAL_TARGETS_TO_BUILD_append = ";${@get_clang_experimental_target_arch(bb, d)}"
 
 HF = "${@ bb.utils.contains('TUNE_CCARGS_MFLOAT', 'hard', 'hf', '', d)}"
@@ -91,7 +89,7 @@ EXTRA_OECMAKE += "-DLLVM_ENABLE_ASSERTIONS=OFF \
                   -DCMAKE_SYSTEM_NAME=Linux \
                   -DCMAKE_BUILD_TYPE=Release \
                   -DBUILD_SHARED_LIBS=OFF \
-                  -DLLVM_ENABLE_PROJECTS='clang;lld' \
+                  -DLLVM_ENABLE_PROJECTS='clang;lld;lldb' \
                   -DLLVM_BINUTILS_INCDIR=${STAGING_INCDIR} \
                   -G Ninja ${S}/llvm \
                   -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON \
@@ -115,11 +113,13 @@ EXTRA_OECMAKE_append_class-nativesdk = "\
                   -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD='${LLVM_EXPERIMENTAL_TARGETS_TO_BUILD}' \
                   -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen \
                   -DCLANG_TABLEGEN=${STAGING_BINDIR_NATIVE}/clang-tblgen \
+                  -DLLDB_TABLEGEN=${STAGING_BINDIR_NATIVE}/lldb-tblgen \
 "
 EXTRA_OECMAKE_append_class-target = "\
                   -DCMAKE_CROSSCOMPILING:BOOL=ON \
                   -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen \
                   -DCLANG_TABLEGEN=${STAGING_BINDIR_NATIVE}/clang-tblgen \
+                  -DLLDB_TABLEGEN=${STAGING_BINDIR_NATIVE}/lldb-tblgen \
                   -DLLVM_TARGETS_TO_BUILD='${LLVM_TARGETS_TO_BUILD_TARGET}' \
                   -DCMAKE_RANLIB=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-ranlib \
                   -DCMAKE_AR=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-ar \
@@ -127,13 +127,8 @@ EXTRA_OECMAKE_append_class-target = "\
                   -DLLVM_TARGET_ARCH=${@get_clang_target_arch(bb, d)} \
                   -DLLVM_DEFAULT_TARGET_TRIPLE=${TARGET_SYS}${HF} \
 "
-EXTRA_OECMAKE_append_class-target_riscv64 = "\
-                  -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD='${LLVM_EXPERIMENTAL_TARGETS_TO_BUILD}' \
-"
-EXTRA_OECMAKE_append_class-target_riscv32 = "\
-                  -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD='${LLVM_EXPERIMENTAL_TARGETS_TO_BUILD}' \
-"
-DEPENDS = "binutils zlib libffi libxml2 ninja-native"
+
+DEPENDS = "binutils zlib libffi libxml2 libedit ninja-native swig-native"
 DEPENDS_append_class-nativesdk = " clang-crosssdk-${SDK_ARCH} virtual/${TARGET_PREFIX}binutils-crosssdk"
 DEPENDS_append_class-target = " clang-cross-${TARGET_ARCH}"
 
@@ -165,6 +160,7 @@ do_install() {
 
 do_install_append_class-native () {
         install -Dm 0755 ${B}/bin/clang-tblgen ${D}${bindir}/clang-tblgen
+        install -Dm 0755 ${B}/tools/clang/stage2-bins/bin/lldb-tblgen ${D}${bindir}/lldb-tblgen
         for f in `find ${D}${bindir} -executable -type f -not -type l`; do
                 test -n "`file $f|grep -i ELF`" && ${STRIP} $f
                 echo "stripped $f"
@@ -173,6 +169,7 @@ do_install_append_class-native () {
 
 do_install_append_class-nativesdk () {
         install -Dm 0755 ${B}/bin/clang-tblgen ${D}${bindir}/clang-tblgen
+        install -Dm 0755 ${B}/bin/lldb-tblgen ${D}${bindir}/lldb-tblgen
         for f in `find ${D}${bindir} -executable -type f -not -type l`; do
                 test -n "`file $f|grep -i ELF`" && ${STRIP} $f
         done
@@ -182,15 +179,17 @@ do_install_append_class-nativesdk () {
 
 PACKAGE_DEBUG_SPLIT_STYLE_class-nativesdk = "debug-without-src"
 
-PACKAGES =+ "${PN}-libllvm libclang"
+PACKAGES =+ "${PN}-libllvm libclang python-lldb"
 
 BBCLASSEXTEND = "native nativesdk"
 
+FILES_python-lldb = "${libdir}/python3*/site-packages/lldb/*"
+
 FILES_${PN} += "\
   ${libdir}/BugpointPasses.so \
   ${libdir}/LLVMHello.so \
-  ${libdir}/TestPlugin.so \
   ${libdir}/LLVMgold.so \
+  ${libdir}/*Plugin.so \
   ${datadir}/scan-* \
   ${datadir}/opt-viewer/ \
 "
@@ -212,6 +211,7 @@ FILES_${PN}-dev += "\
 
 INSANE_SKIP_${PN} += "already-stripped"
 INSANE_SKIP_${PN}-dev += "dev-elf"
+INSANE_SKIP_python-lldb += "dev-so dev-deps"
 
 #Avoid SSTATE_SCAN_COMMAND running sed over llvm-config.
 SSTATE_SCAN_FILES_remove = "*-config"
diff --git a/recipes-devtools/clang/lldb_git.bb b/recipes-devtools/clang/lldb_git.bb
deleted file mode 100644
index 933aa44..0000000
--- a/recipes-devtools/clang/lldb_git.bb
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright (C) 2017 Kai Ruhnau <kai.ruhnau@target-sg.com>
-# Released under the MIT license (see COPYING.MIT for the terms)
-
-DESCRIPTION = "Next generation, high-performance debugger"
-HOMEPAGE = "http://lldb.llvm.org/"
-SECTION = "devel"
-
-DEPENDS += "clang-native zlib libxml2 ninja-native"
-
-require clang.inc
-require common-source.inc
-
-inherit cmake pkgconfig
-
-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"
-
-EXTRA_OECMAKE="\
-    -DCMAKE_CROSSCOMPILING=1 \
-    -DLLVM_ENABLE_CXX11=ON \
-    -DLLVM_BUILD_LLVM_DYLIB=ON \
-    -DBUILD_SHARED_LIBS=OFF \
-    -DLLVM_BUILD_LLVM_DYLIB=ON \
-    -DLLVM_ENABLE_PIC=ON \
-    -DLLDB_DISABLE_LIBEDIT=1 \
-    -DLLDB_DISABLE_CURSES=1 \
-    -DLLDB_DISABLE_PYTHON=1 \
-    -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 \
-    -DLLVM_ENABLE_PROJECTS='clang;lldb' \
-    -G Ninja ${S}/llvm \
-"
-
-EXTRA_OEMAKE = "VERBOSE=1"
-
-CXXFLAGS_append_toolchain-gcc = " -Wno-error=format-security"
-
-do_compile() {
-       ninja ${PARALLEL_MAKE} lldb
-}
-
-do_install() {
-       DESTDIR=${D} ninja ${PARALLEL_MAKE} tools/lldb/install
-}
-
-INSANE_SKIP_${PN}-dbg = "libdir"
-INSANE_SKIP_${PN} = "libdir"