This is an archive of the discontinued LLVM Phabricator instance.

Differential D33098

Fix Libc++abi linking using compiler-rt under MinGW64
ClosedPublic

Authored by martell on May 11 2017, 5:41 AM.

Details

Reviewers
EricWF
Commits
rG53877bc5b9c3: [Libcxxabi]: Support using compiler-rt for MinGW64
rCXXA302824: [Libcxxabi]: Support using compiler-rt for MinGW64
rL302824: [Libcxxabi]: Support using compiler-rt for MinGW64
Summary

@EricWF you beat me to the punch with rL302760.
Here is a small update to support compiler-rt.

Diff Detail

Repository
rL LLVM

Event Timeline

martell created this revision.May 11 2017, 5:41 AM
Herald added subscribers: mgorny, dberris. · View Herald TranscriptMay 11 2017, 5:41 AM
martell added a subscriber: mamidzic.May 11 2017, 7:49 AM
martell edited subscribers, added: mati865; removed: mamidzic.
EricWF accepted this revision.May 11 2017, 10:46 AM
This revision is now accepted and ready to land.May 11 2017, 10:46 AM
Closed by commit rL302824: [Libcxxabi]: Support using compiler-rt for MinGW64 (authored by martell). · Explain WhyMay 11 2017, 2:29 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
libcxxabi/
trunk/
cmake/
11 lines

Diff 98678

libcxxabi/trunk/cmake/config-ix.cmake

Show All 24 Lines if (LIBCXXABI_USE_COMPILER_RT)
find_compiler_rt_library(builtins LIBCXXABI_BUILTINS_LIBRARY) find_compiler_rt_library(builtins LIBCXXABI_BUILTINS_LIBRARY)
list(APPEND CMAKE_REQUIRED_LIBRARIES "${LIBCXXABI_BUILTINS_LIBRARY}") list(APPEND CMAKE_REQUIRED_LIBRARIES "${LIBCXXABI_BUILTINS_LIBRARY}")
elseif (LIBCXXABI_HAS_GCC_S_LIB) elseif (LIBCXXABI_HAS_GCC_S_LIB)
list(APPEND CMAKE_REQUIRED_LIBRARIES gcc_s) list(APPEND CMAKE_REQUIRED_LIBRARIES gcc_s)
endif () endif ()
if (MINGW) if (MINGW)
# Mingw64 requires quite a few "C" runtime libraries in order for basic # Mingw64 requires quite a few "C" runtime libraries in order for basic
# programs to link successfully with -nodefaultlibs. # programs to link successfully with -nodefaultlibs.
set(MINGW_LIBRARIES mingw32 gcc_s gcc moldname mingwex msvcrt advapi32 if (LIBCXXABI_USE_COMPILER_RT)
shell32 user32 kernel32 iconv mingw32 gcc_s gcc moldname set(MINGW_RUNTIME ${LIBCXXABI_BUILTINS_LIBRARY})
mingwex msvcrt) else ()
set(MINGW_RUNTIME gcc_s gcc)
endif()
set(MINGW_LIBRARIES mingw32 ${MINGW_RUNTIME} moldname mingwex msvcrt advapi32
shell32 user32 kernel32 iconv mingw32 ${MINGW_RUNTIME}
moldname mingwex msvcrt)
list(APPEND CMAKE_REQUIRED_LIBRARIES ${MINGW_LIBRARIES}) list(APPEND CMAKE_REQUIRED_LIBRARIES ${MINGW_LIBRARIES})
endif() endif()
if (CMAKE_C_FLAGS MATCHES -fsanitize OR CMAKE_CXX_FLAGS MATCHES -fsanitize) if (CMAKE_C_FLAGS MATCHES -fsanitize OR CMAKE_CXX_FLAGS MATCHES -fsanitize)
set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -fno-sanitize=all") set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -fno-sanitize=all")
endif () endif ()
if (CMAKE_C_FLAGS MATCHES -fsanitize-coverage OR CMAKE_CXX_FLAGS MATCHES -fsanitize-coverage) if (CMAKE_C_FLAGS MATCHES -fsanitize-coverage OR CMAKE_CXX_FLAGS MATCHES -fsanitize-coverage)
set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -fno-sanitize-coverage=edge,trace-cmp,indirect-calls,8bit-counters") set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -fno-sanitize-coverage=edge,trace-cmp,indirect-calls,8bit-counters")
endif () endif ()
▲ Show 20 Lines • Show All 47 Lines • Show Last 20 Lines