This is an archive of the discontinued LLVM Phabricator instance.

Differential D45242

[compiler-rt] Support statically linked libc++abi and libunwind
ClosedPublic

Authored by phosek on Apr 3 2018, 8:45 PM.

Details

Reviewers
vitalybuka
morehouse
beanz
EricWF
Commits
rGfb6a4a7907fa: [CMake] Support statically linked libc++abi and libunwind
rL329205: [CMake] Support statically linked libc++abi and libunwind
rCRT329205: [CMake] Support statically linked libc++abi and libunwind
Summary

This expands the CMake check to handle both statically and dynamically
linked version of libc++abi and libunwind and matches the implemnetation
used elsewhere in LLVM.

Diff Detail

Event Timeline

phosek created this revision.Apr 3 2018, 8:45 PM
Herald added a reviewer: EricWF. · View Herald TranscriptApr 3 2018, 8:45 PM
Herald added subscribers: Restricted Project, llvm-commits, mgorny, dberris. · View Herald Transcript
morehouse accepted this revision.Apr 4 2018, 9:10 AM

LGTM.

This revision is now accepted and ready to land.Apr 4 2018, 9:10 AM
Closed by commit rCRT329205: [CMake] Support statically linked libc++abi and libunwind (authored by phosek). · Explain WhyApr 4 2018, 9:30 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
8 lines

Diff 140978

CMakeLists.txt

Show First 20 Lines • Show All 146 Lines • ▼ Show 20 Lines else()
set(SANITIZER_CXX_ABI_LIBNAME "libstdc++") set(SANITIZER_CXX_ABI_LIBNAME "libstdc++")
endif() endif()
else() else()
set(SANITIZER_CXX_ABI_LIBNAME "${SANITIZER_CXX_ABI}") set(SANITIZER_CXX_ABI_LIBNAME "${SANITIZER_CXX_ABI}")
endif() endif()
if (SANITIZER_CXX_ABI_LIBNAME STREQUAL "libcxxabi") if (SANITIZER_CXX_ABI_LIBNAME STREQUAL "libcxxabi")
if (SANITIZER_CXX_ABI_INTREE) if (SANITIZER_CXX_ABI_INTREE)
if (TARGET unwind_shared OR HAVE_LIBUNWIND) if (NOT LIBCXXABI_ENABLE_STATIC_UNWINDER AND (TARGET unwind_shared OR HAVE_LIBUNWIND))
list(APPEND SANITIZER_CXX_ABI_LIBRARY unwind_shared) list(APPEND SANITIZER_CXX_ABI_LIBRARY unwind_shared)
elseif (LIBCXXABI_ENABLE_STATIC_UNWINDER AND (TARGET unwind_static OR HAVE_LIBUNWIND))
list(APPEND SANITIZER_CXX_ABI_LIBRARY unwind_static)
endif() endif()
if (TARGET cxxabi_shared OR HAVE_LIBCXXABI) if (NOT LIBCXX_ENABLE_STATIC_ABI_LIBRARY AND (TARGET cxxabi_shared OR HAVE_LIBCXXABI))
list(APPEND SANITIZER_CXX_ABI_LIBRARY cxxabi_shared) list(APPEND SANITIZER_CXX_ABI_LIBRARY cxxabi_shared)
elseif (LIBCXX_ENABLE_STATIC_ABI_LIBRARY AND (TARGET cxxabi_static OR HAVE_LIBCXXABI))
list(APPEND SANITIZER_CXX_ABI_LIBRARY cxxabi_static)
endif() endif()
else() else()
list(APPEND SANITIZER_CXX_ABI_LIBRARY "c++abi") list(APPEND SANITIZER_CXX_ABI_LIBRARY "c++abi")
endif() endif()
elseif (SANITIZER_CXX_ABI_LIBNAME STREQUAL "libc++") elseif (SANITIZER_CXX_ABI_LIBNAME STREQUAL "libc++")
list(APPEND SANITIZER_CXX_ABI_LIBRARY "c++") list(APPEND SANITIZER_CXX_ABI_LIBRARY "c++")
elseif (SANITIZER_CXX_ABI_LIBNAME STREQUAL "libstdc++") elseif (SANITIZER_CXX_ABI_LIBNAME STREQUAL "libstdc++")
append_list_if(COMPILER_RT_HAS_LIBSTDCXX stdc++ SANITIZER_CXX_ABI_LIBRARY) append_list_if(COMPILER_RT_HAS_LIBSTDCXX stdc++ SANITIZER_CXX_ABI_LIBRARY)
▲ Show 20 Lines • Show All 219 Lines • Show Last 20 Lines