From 34c98ae16d995a21e95f1af7f5535ee3b4cbed38 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 31 Jul 2019 17:08:37 -0700 Subject: libcxx: Provide libunwind and fix risv support Use llvm libunwind as default for clang toolchain Signed-off-by: Khem Raj --- classes/clang.bbclass | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'classes') diff --git a/classes/clang.bbclass b/classes/clang.bbclass index 93d3581..cfd92d9 100644 --- a/classes/clang.bbclass +++ b/classes/clang.bbclass @@ -8,7 +8,12 @@ RANLIB_toolchain-clang = "${HOST_PREFIX}llvm-ranlib" AR_toolchain-clang = "${HOST_PREFIX}llvm-ar" NM_toolchain-clang = "${HOST_PREFIX}llvm-nm" -COMPILER_RT ??= "--rtlib=compiler-rt --unwindlib=libunwind" +COMPILER_RT ??= "--rtlib=compiler-rt ${UNWINDLIB}" + +UNWINDLIB ??= "--unwindlib=libunwind" +UNWINDLIB_riscv64 = "--unwindlib=libgcc" +UNWINDLIB_riscv32 = "--unwindlib=libgcc" + LIBCPLUSPLUS ??= "--stdlib=libc++" COMPILER_RT_toolchain-gcc = "" @@ -62,5 +67,8 @@ def clang_dep_prepend(d): BASEDEPENDS_remove_toolchain-clang_class-target = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}compilerlibs" BASEDEPENDS_append_toolchain-clang_class-target = "${@clang_dep_prepend(d)}" -PREFERRED_PROVIDER_libunwind = "libunwind" +PREFERRED_PROVIDER_libunwind_toolchain-clang = "libcxx" +PREFERRED_PROVIDER_libunwind ?= "libunwind" PREFERRED_PROVIDER_libunwind_mipsarch = "libunwind" +PREFERRED_PROVIDER_libunwind_riscv32 = "libunwind" +PREFERRED_PROVIDER_libunwind_riscv64 = "libunwind" -- cgit v1.2.3-54-g00ecf