From 3ae77709d22d2f608f1984a73386067d4dcdaea0 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 27 Sep 2019 18:04:47 -0700 Subject: runtime: Automatically add llvm-libunwind based on COMPILER_RT asking for --unwindlib=libunwind Signed-off-by: Khem Raj --- classes/clang.bbclass | 8 ++------ recipes-devtools/clang/compiler-rt_git.bb | 7 +++---- recipes-devtools/clang/libcxx_git.bb | 12 ++---------- recipes-devtools/clang/llvm-libunwind.bb | 6 ++---- 4 files changed, 9 insertions(+), 24 deletions(-) diff --git a/classes/clang.bbclass b/classes/clang.bbclass index 58fe6b6..6d99b45 100644 --- a/classes/clang.bbclass +++ b/classes/clang.bbclass @@ -68,6 +68,8 @@ def clang_dep_prepend(d): ret += " compiler-rt " else: ret += " libgcc " + if (d.getVar('COMPILER_RT').find('--unwindlib=libunwind') != -1): + ret += " llvm-libunwind " if (d.getVar('LIBCPLUSPLUS').find('--stdlib=libc++') != -1): ret += " libcxx " else: @@ -76,9 +78,3 @@ def clang_dep_prepend(d): return "" BASE_DEFAULT_DEPS_toolchain-clang_class-target = "${@clang_dep_prepend(d)}" - -PREFERRED_PROVIDER_libunwind_toolchain-clang = "llvm-libunwind" -PREFERRED_PROVIDER_libunwind ?= "libunwind" -PREFERRED_PROVIDER_libunwind_powerpc = "libunwind" -PREFERRED_PROVIDER_libunwind_riscv32 = "libunwind" -PREFERRED_PROVIDER_libunwind_riscv64 = "libunwind" diff --git a/recipes-devtools/clang/compiler-rt_git.bb b/recipes-devtools/clang/compiler-rt_git.bb index d6ce083..c24329c 100644 --- a/recipes-devtools/clang/compiler-rt_git.bb +++ b/recipes-devtools/clang/compiler-rt_git.bb @@ -13,11 +13,10 @@ inherit cmake pkgconfig pythonnative LIC_FILES_CHKSUM = "file://compiler-rt/LICENSE.TXT;md5=d846d1d65baf322d4c485d6ee54e877a" -BASEDEPENDS_remove_toolchain-clang_class-target = "compiler-rt libcxx" -DEPENDS_append_toolchain-clang_class-target = " virtual/${TARGET_PREFIX}compilerlibs" -TARGET_CXXFLAGS_remove_toolchain-clang = "--stdlib=libc++" -TUNE_CCARGS_remove_toolchain-clang = "--rtlib=compiler-rt --unwindlib=libunwind --stdlib=libc++" +LIBCPLUSPLUS = "" +COMPILER_RT = "" TUNE_CCARGS_remove = "-no-integrated-as" + DEPENDS += "ninja-native" DEPENDS_append_class-nativesdk = " clang-native" diff --git a/recipes-devtools/clang/libcxx_git.bb b/recipes-devtools/clang/libcxx_git.bb index c12831a..6d94ac4 100644 --- a/recipes-devtools/clang/libcxx_git.bb +++ b/recipes-devtools/clang/libcxx_git.bb @@ -10,17 +10,9 @@ require common-source.inc inherit cmake pythonnative -DEPENDS += "ninja-native llvm-libunwind" +DEPENDS += "ninja-native" -DEPENDS_remove_powerpc = "llvm-libunwind" -DEPENDS_remove_riscv32 = "llvm-libunwind" -DEPENDS_remove_riscv64 = "llvm-libunwind" - -BASEDEPENDS_remove_toolchain-clang = "libcxx" -DEPENDS_append_toolchain-clang = " virtual/${TARGET_PREFIX}compilerlibs" - -TARGET_CXXFLAGS_remove_toolchain-clang = "--stdlib=libc++" -TUNE_CCARGS_remove_toolchain-clang = "--stdlib=libc++" +LIBCPLUSPLUS = "" LIC_FILES_CHKSUM = "file://libcxx/LICENSE.TXT;md5=55d89dd7eec8d3b4204b680e27da3953 \ file://libcxxabi/LICENSE.TXT;md5=7b9334635b542c56868400a46b272b1e \ diff --git a/recipes-devtools/clang/llvm-libunwind.bb b/recipes-devtools/clang/llvm-libunwind.bb index eb46e11..1bcad96 100644 --- a/recipes-devtools/clang/llvm-libunwind.bb +++ b/recipes-devtools/clang/llvm-libunwind.bb @@ -13,11 +13,9 @@ inherit cmake pythonnative PROVIDES += "libunwind" DEPENDS += "ninja-native" -BASEDEPENDS_remove_toolchain-clang = "libcxx" -DEPENDS_append_toolchain-clang = " virtual/${TARGET_PREFIX}compilerlibs" -TARGET_CXXFLAGS_remove_toolchain-clang = "--stdlib=libc++" -TUNE_CCARGS_remove_toolchain-clang = "--unwindlib=libunwind --stdlib=libc++" +LIBCPLUSPLUS = "" +UNWINDLIB = "" COMPATIBLE_HOST_powerpc = "null" COMPATIBLE_HOST_riscv32 = "null" -- cgit v1.2.3-54-g00ecf