Index: compiler-rt/CMakeLists.txt =================================================================== --- compiler-rt/CMakeLists.txt +++ compiler-rt/CMakeLists.txt @@ -112,9 +112,6 @@ # COMPILER_RT_DEBUG_PYBOOL is used by lit.common.configured.in. pythonize_bool(COMPILER_RT_DEBUG) -include(HandleCompilerRT) -include(config-ix) - if(APPLE AND SANITIZER_MIN_OSX_VERSION AND SANITIZER_MIN_OSX_VERSION VERSION_LESS "10.9") # Mac OS X prior to 10.9 had problems with exporting symbols from # libc++/libc++abi. @@ -133,15 +130,15 @@ set(SANITIZER_CXX_ABI "default" CACHE STRING "Specify C++ ABI library to use.") -set(CXXABIS none default libcxxabi libstdc++ libc++) +set(CXXABIS none default libstdc++ libc++) set_property(CACHE SANITIZER_CXX_ABI PROPERTY STRINGS ;${CXXABIS}) if (SANITIZER_CXX_ABI STREQUAL "default") - if (HAVE_LIBCXXABI AND COMPILER_RT_DEFAULT_TARGET_ONLY) - set(SANITIZER_CXX_ABI_LIBNAME "libcxxabi") + if ((COMPILER_RT_DEFAULT_TARGET_ONLY OR CLANG_DEFAULT_CXX_STDLIB STREQUAL "libc++") AND (TARGET cxx OR HAVE_LIBCXX)) + set(SANITIZER_CXX_ABI_LIBNAME "libc++") set(SANITIZER_CXX_ABI_INTREE 1) elseif (APPLE) - set(SANITIZER_CXX_ABI_LIBNAME "libcxxabi") + set(SANITIZER_CXX_ABI_LIBNAME "libc++") set(SANITIZER_CXX_ABI_SYSTEM 1) else() set(SANITIZER_CXX_ABI_LIBNAME "libstdc++") @@ -149,9 +146,10 @@ endif() else() set(SANITIZER_CXX_ABI_LIBNAME "${SANITIZER_CXX_ABI}") + set(SANITIZER_CXX_ABI_SYSTEM 1) endif() -if (SANITIZER_CXX_ABI_LIBNAME STREQUAL "libcxxabi") +if (SANITIZER_CXX_ABI_LIBNAME STREQUAL "libc++") if (SANITIZER_CXX_ABI_INTREE) if (NOT LIBCXXABI_ENABLE_STATIC_UNWINDER AND (TARGET unwind_shared OR HAVE_LIBUNWIND)) list(APPEND SANITIZER_CXX_ABI_LIBRARY unwind_shared) @@ -164,15 +162,21 @@ list(APPEND SANITIZER_CXX_ABI_LIBRARY cxxabi_static) endif() else() - list(APPEND SANITIZER_CXX_ABI_LIBRARY "c++abi") + list(APPEND SANITIZER_CXX_ABI_LIBRARY "c++") endif() -elseif (SANITIZER_CXX_ABI_LIBNAME STREQUAL "libc++") - list(APPEND SANITIZER_CXX_ABI_LIBRARY "c++") elseif (SANITIZER_CXX_ABI_LIBNAME STREQUAL "libstdc++") append_list_if(COMPILER_RT_HAS_LIBSTDCXX stdc++ SANITIZER_CXX_ABI_LIBRARY) endif() -option(SANITIZER_USE_COMPILER_RT "Use compiler-rt builtins instead of libgcc" OFF) +if(CLANG_DEFAULT_RTLIB STREQUAL "compiler-rt") + set(DEFAULT_USE_COMPILER_RT ON) +else() + set(DEFAULT_USE_COMPILER_RT OFF) +endif() +option(SANITIZER_USE_COMPILER_RT "Use compiler-rt builtins instead of libgcc" ${DEFAULT_USE_COMPILER_RT}) + +include(HandleCompilerRT) +include(config-ix) #================================ # Setup Compiler Flags Index: compiler-rt/cmake/Modules/CompilerRTUtils.cmake =================================================================== --- compiler-rt/cmake/Modules/CompilerRTUtils.cmake +++ compiler-rt/cmake/Modules/CompilerRTUtils.cmake @@ -125,6 +125,16 @@ # 2) simple file can be successfully built. # If successful, saves target flags for this architecture. macro(test_target_arch arch def) + string(RANDOM TARGET_${arch}_NAME) + set(TARGET_${arch}_NAME "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/cmTC_${TARGET_${arch}_NAME}.dir") + file(MAKE_DIRECTORY ${TARGET_${arch}_NAME}) + if(SANITIZER_CXX_ABI_INTREE) + set(TARGET_${arch}_FILENAME "${TARGET_${arch}_NAME}/CheckTarget.c") + else() + set(TARGET_${arch}_FILENAME "${TARGET_${arch}_NAME}/CheckTarget.cpp") + endif() + file(WRITE "${TARGET_${arch}_FILENAME}" "#include \n#include \nint main() { printf(\"hello, world\"); }\n") + set(TARGET_${arch}_CFLAGS ${ARGN}) set(TARGET_${arch}_LINK_FLAGS ${ARGN}) set(argstring "") @@ -144,12 +154,8 @@ endif() set(SAVED_CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS}) set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${argstring}") - if(SANITIZER_CXX_ABI_SYSTEM) - set(FLAG_LINK_LIBRARIES ${SANITIZER_CXX_ABI_LIBRARY}) - endif() - try_compile(CAN_TARGET_${arch} ${CMAKE_BINARY_DIR} ${SIMPLE_SOURCE} + try_compile(CAN_TARGET_${arch} ${CMAKE_BINARY_DIR} ${TARGET_${arch}_FILENAME} COMPILE_DEFINITIONS "${TARGET_${arch}_CFLAGS} ${FLAG_NO_EXCEPTIONS}" - LINK_LIBRARIES ${FLAG_LINK_LIBRARIES} OUTPUT_VARIABLE TARGET_${arch}_OUTPUT) set(CMAKE_EXE_LINKER_FLAGS ${SAVED_CMAKE_EXE_LINKER_FLAGS}) endif() @@ -161,6 +167,8 @@ # Bail out if we cannot target the architecture we plan to test. message(FATAL_ERROR "Cannot compile for ${arch}:\n${TARGET_${arch}_OUTPUT}") endif() + + file(REMOVE_RECURSE ${TARGET_${arch}_NAME}) endmacro() macro(detect_target_arch) Index: compiler-rt/cmake/config-ix.cmake =================================================================== --- compiler-rt/cmake/config-ix.cmake +++ compiler-rt/cmake/config-ix.cmake @@ -121,13 +121,6 @@ # List of all architectures we can target. set(COMPILER_RT_SUPPORTED_ARCH) -# Try to compile a very simple source file to ensure we can target the given -# platform. We use the results of these tests to build only the various target -# runtime libraries supported by our current compilers cross-compiling -# abilities. -set(SIMPLE_SOURCE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/simple.c) -file(WRITE ${SIMPLE_SOURCE} "#include \n#include \nint main() { printf(\"hello, world\"); }\n") - # Detect whether the current target platform is 32-bit or 64-bit, and setup # the correct commandline flags needed to attempt to target 32-bit and 64-bit. if (NOT CMAKE_SIZEOF_VOID_P EQUAL 4 AND Index: llvm/runtimes/CMakeLists.txt =================================================================== --- llvm/runtimes/CMakeLists.txt +++ llvm/runtimes/CMakeLists.txt @@ -376,6 +376,7 @@ -DCMAKE_CXX_COMPILER_WORKS=ON -DCMAKE_ASM_COMPILER_WORKS=ON PASSTHROUGH_PREFIXES LLVM_ENABLE_RUNTIMES + CLANG_DEFAULT ${ARG_PREFIXES} EXTRA_TARGETS ${extra_targets} ${test_targets}