This is an archive of the discontinued LLVM Phabricator instance.

Differential D4953

libcxxabi must link to dl if using bundled unwind
ClosedPublic

Authored by ismail on Aug 18 2014, 1:18 AM.

Details

Reviewers
danalbert
Summary

Hi,

src/Unwind/AddressSpace.hpp uses dladdr symbol which is defined in dl library. Attached patch adds support for linking to dl library for CMake build system.

Please have a look. Thanks.

Diff Detail

Event Timeline

ismail updated this revision to Diff 12612.Aug 18 2014, 1:18 AM
ismail retitled this revision from to libcxxabi must link to dl if using bundled unwind.
ismail updated this object.
ismail edited the test plan for this revision. (Show Details)
ismail added a reviewer: danalbert.
ismail set the repository for this revision to rL LLVM.
ismail added a subscriber: Unknown Object (MLST).
danalbert accepted this revision.Aug 18 2014, 9:10 AM
danalbert edited edge metadata.
This revision is now accepted and ready to land.Aug 18 2014, 9:10 AM
ismail closed this revision.Aug 19 2014, 1:35 AM

Revision Contents

PathSize
libcxxabi/
libcxxabi.orig/
cmake/
1 line
src/
Unwind/
1 line

Diff 12612

libcxxabi/cmake/config-ix.cmake

Context not available.
# Check libraries # Check libraries
check_library_exists(c printf "" LIBCXXABI_HAS_C_LIB) check_library_exists(c printf "" LIBCXXABI_HAS_C_LIB)
check_library_exists(dl dladdr "" LIBCXXABI_HAS_DL_LIB)
check_library_exists(pthread pthread_once "" LIBCXXABI_HAS_PTHREAD_LIB) check_library_exists(pthread pthread_once "" LIBCXXABI_HAS_PTHREAD_LIB)
check_library_exists(gcc_eh _Unwind_GetRegionStart "" LIBCXXABI_HAS_GCC_EH_LIB) check_library_exists(gcc_eh _Unwind_GetRegionStart "" LIBCXXABI_HAS_GCC_EH_LIB)
Context not available.

libcxxabi/src/Unwind/CMakeLists.txt

Context not available.
# Generate library list. # Generate library list.
set(libraries ${LIBCXXABI_CXX_ABI_LIBRARIES}) set(libraries ${LIBCXXABI_CXX_ABI_LIBRARIES})
append_if(libraries LIBCXXABI_HAS_C_LIB c) append_if(libraries LIBCXXABI_HAS_C_LIB c)
append_if(libraries LIBCXXABI_HAS_DL_LIB dl)
append_if(libraries LIBCXXABI_HAS_PTHREAD_LIB pthread) append_if(libraries LIBCXXABI_HAS_PTHREAD_LIB pthread)
target_link_libraries(unwind ${libraries}) target_link_libraries(unwind ${libraries})
Context not available.