From 2fa4342ab4cb20872eb97d2b844e0367b1fad90d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 30 Jul 2019 23:00:33 -0700 Subject: libcxx,compiler-rt: Add --unwindlib=libunwind to COMPILER_RT This is new way of enabling llvm unwinder as default unwinder now build shared libunwind which is needed for new option Signed-off-by: Khem Raj --- classes/clang.bbclass | 2 +- recipes-devtools/clang/compiler-rt_git.bb | 2 +- recipes-devtools/clang/libcxx_git.bb | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/classes/clang.bbclass b/classes/clang.bbclass index d6a4e9b..93d3581 100644 --- a/classes/clang.bbclass +++ b/classes/clang.bbclass @@ -8,7 +8,7 @@ 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" +COMPILER_RT ??= "--rtlib=compiler-rt --unwindlib=libunwind" LIBCPLUSPLUS ??= "--stdlib=libc++" COMPILER_RT_toolchain-gcc = "" diff --git a/recipes-devtools/clang/compiler-rt_git.bb b/recipes-devtools/clang/compiler-rt_git.bb index ff8d353..172d5cc 100644 --- a/recipes-devtools/clang/compiler-rt_git.bb +++ b/recipes-devtools/clang/compiler-rt_git.bb @@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = "file://compiler-rt/LICENSE.TXT;md5=d846d1d65baf322d4c485d6ee 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 --stdlib=libc++" +TUNE_CCARGS_remove_toolchain-clang = "--rtlib=compiler-rt --unwindlib=libunwind --stdlib=libc++" 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 c115da0..76b1ea0 100644 --- a/recipes-devtools/clang/libcxx_git.bb +++ b/recipes-devtools/clang/libcxx_git.bb @@ -14,12 +14,12 @@ 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 = "--rtlib=compiler-rt --stdlib=libc++" +TUNE_CCARGS_remove_toolchain-clang = "--rtlib=compiler-rt --unwindlib=libunwind --stdlib=libc++" PACKAGECONFIG ??= "unwind" PACKAGECONFIG_powerpc = "" PACKAGECONFIG_riscv64 = "" -PACKAGECONFIG[unwind] = "-DLIBCXXABI_USE_LLVM_UNWINDER=ON -DLIBUNWIND_ENABLE_SHARED=OFF -DLIBCXXABI_ENABLE_STATIC_UNWINDER=ON -DLIBCXXABI_LIBUNWIND_INCLUDES=${S}/projects/libunwind/include, -DLIBCXXABI_USE_LLVM_UNWINDER=OFF," +PACKAGECONFIG[unwind] = "-DLIBCXXABI_USE_LLVM_UNWINDER=ON -DLIBUNWIND_ENABLE_SHARED=ON -DLIBCXXABI_ENABLE_STATIC_UNWINDER=ON -DLIBCXXABI_LIBUNWIND_INCLUDES=${S}/projects/libunwind/include, -DLIBCXXABI_USE_LLVM_UNWINDER=OFF," #PROVIDES += "${@bb.utils.contains('PACKAGECONFIG', 'unwind', 'libunwind', '', d)}" LIBUNWIND = "${@bb.utils.contains('PACKAGECONFIG', 'unwind', ';libunwind', '', d)}" @@ -63,7 +63,6 @@ do_compile() { do_install() { if ${@bb.utils.contains('PACKAGECONFIG', 'unwind', 'true', 'false', d)}; then DESTDIR=${D} ninja ${PARALLEL_MAKE} install-unwind - rm -rf ${D}${libdir}/libunwind.so fi DESTDIR=${D} ninja ${PARALLEL_MAKE} install-cxx install-cxxabi } -- cgit v1.2.3-54-g00ecf