This is an archive of the discontinued LLVM Phabricator instance.

Differential D71641

[unwind] Don't link libpthread and libdl on Fuchsia
ClosedPublic

Authored by phosek on Dec 17 2019, 5:19 PM.

Details

Reviewers
leonardchan
mcgrathr
mclow.lists
Summary

This is a follow up to D71135.

Diff Detail

Event Timeline

phosek created this revision.Dec 17 2019, 5:19 PM
Herald added a project: Restricted Project. · View Herald TranscriptDec 17 2019, 5:19 PM
Herald added subscribers: libcxx-commits, jfb, christof, mgorny. · View Herald Transcript
mcgrathr accepted this revision.Dec 17 2019, 5:21 PM
mcgrathr added a subscriber: mcgrathr.

lgtm

This revision is now accepted and ready to land.Dec 17 2019, 5:21 PM
Herald added a reviewer: mclow.lists. · View Herald TranscriptDec 17 2019, 5:21 PM
phosek closed this revision.Dec 17 2019, 10:08 PM

Revision Contents

PathSize
libunwind/
cmake/
13 lines

Diff 234422

libunwind/cmake/config-ix.cmake

Show First 20 Lines • Show All 65 Lines • ▼ Show 20 Lines
int main() { return 0; } int main() { return 0; }
" LIBUNWIND_HAS_COMMENT_LIB_PRAGMA) " LIBUNWIND_HAS_COMMENT_LIB_PRAGMA)
cmake_pop_check_state() cmake_pop_check_state()
endif() endif()
# Check compiler flags # Check compiler flags
check_cxx_compiler_flag(-nostdinc++ LIBUNWIND_HAS_NOSTDINCXX_FLAG) check_cxx_compiler_flag(-nostdinc++ LIBUNWIND_HAS_NOSTDINCXX_FLAG)
# Check libraries
check_library_exists(dl dladdr "" LIBUNWIND_HAS_DL_LIB)
check_library_exists(pthread pthread_once "" LIBUNWIND_HAS_PTHREAD_LIB)
# Check symbols # Check symbols
check_symbol_exists(__arm__ "" LIBUNWIND_TARGET_ARM) check_symbol_exists(__arm__ "" LIBUNWIND_TARGET_ARM)
check_symbol_exists(__USING_SJLJ_EXCEPTIONS__ "" LIBUNWIND_USES_SJLJ_EXCEPTIONS) check_symbol_exists(__USING_SJLJ_EXCEPTIONS__ "" LIBUNWIND_USES_SJLJ_EXCEPTIONS)
check_symbol_exists(__ARM_DWARF_EH__ "" LIBUNWIND_USES_DWARF_EH) check_symbol_exists(__ARM_DWARF_EH__ "" LIBUNWIND_USES_DWARF_EH)
if(LIBUNWIND_TARGET_ARM AND NOT LIBUNWIND_USES_SJLJ_EXCEPTIONS AND NOT LIBUNWIND_USES_DWARF_EH) if(LIBUNWIND_TARGET_ARM AND NOT LIBUNWIND_USES_SJLJ_EXCEPTIONS AND NOT LIBUNWIND_USES_DWARF_EH)
# This condition is copied from __libunwind_config.h # This condition is copied from __libunwind_config.h
set(LIBUNWIND_USES_ARM_EHABI ON) set(LIBUNWIND_USES_ARM_EHABI ON)
endif() endif()
# Check libraries
if(FUCHSIA)
set(LIBUNWIND_HAS_DL_LIB NO)
set(LIBUNWIND_HAS_PTHREAD_LIB NO)
else()
check_library_exists(dl dladdr "" LIBUNWIND_HAS_DL_LIB)
check_library_exists(pthread pthread_once "" LIBUNWIND_HAS_PTHREAD_LIB)
endif()