From 8f6718bcb1caa40184b4287eb4540610bf0d189c Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 27 Jul 2021 18:17:58 +0200 Subject: [PATCH] Make libc++abi use libunwind --- debian/changelog | 20 ++++++++++++++++++++ debian/rules | 1 + 2 files changed, 21 insertions(+) diff --git a/debian/changelog b/debian/changelog index 90446719..38594715 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,25 @@ llvm-toolchain-12 (1:12.0.1-2) unstable; urgency=medium to address upstream bug 46321 * Make libc++abi use libunwind + [ Kasper Kantz ] + * Add riscv64 architecture in control + enable liblldb, libomp and others which are + currently unavailable in riscv64 repository. + + [ Krzysztof Aleksander Pyrkosz ] + * Add libxml2 as a dependency as it is necessary + for llvm manifest tool (llvm-mt) + (Closes: #990537) + + [ Jordan Justen ] + * d/rules: Adjust cmake defines to fix libclc.pc paths + * Add the following option to the libc++ build: + -DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=ON + -DLIBCXX_STATICALLY_LINK_ABI_IN_STATIC_LIBRARY=ON + -DLIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY=OFF + to address upstream bug 46321 + * Build libunwind + [ Kasper Kantz ] * Add riscv64 architecture in control enable liblldb, libomp and others which are @@ -28,6 +47,7 @@ llvm-toolchain-12 (1:12.0.1-2) unstable; urgency=medium -DLIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY=OFF to address upstream bug 46321 * Build libunwind + * Make libc++abi use libunwind [ Kasper Kantz ] * Add riscv64 architecture in control diff --git a/debian/rules b/debian/rules index aa13a4ef..d3c73159 100755 --- a/debian/rules +++ b/debian/rules @@ -473,6 +473,7 @@ LIBCXX_CMAKE_OPTIONS := \ -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON \ -DLIBCXX_USE_COMPILER_RT=YES \ -DLIBCXXABI_USE_COMPILER_RT=YES \ + -DLIBCXXABI_USE_LLVM_UNWINDER=YES \ -DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=ON \ -DLIBCXX_STATICALLY_LINK_ABI_IN_STATIC_LIBRARY=ON \ -DLIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY=OFF \