This is an archive of the discontinued LLVM Phabricator instance.

Differential D36349

[CMake] Build sanitized C++ runtimes for Fuchsia
ClosedPublic

Authored by phosek on Aug 4 2017, 8:16 PM.

Details

Reviewers
beanz
Commits
rG1ed7135e6575: [CMake] Build sanitized C++ runtimes for Fuchsia
rC311033: [CMake] Build sanitized C++ runtimes for Fuchsia
rL311033: [CMake] Build sanitized C++ runtimes for Fuchsia

Diff Detail

Repository
rL LLVM

Event Timeline

phosek created this revision.Aug 4 2017, 8:16 PM
Herald added a subscriber: mgorny. · View Herald TranscriptAug 4 2017, 8:16 PM
phosek added a parent revision: D36348: [CMake][runtimes] Support for building target variants.Aug 4 2017, 8:16 PM
phosek updated this revision to Diff 109852.Aug 4 2017, 8:25 PM
mcgrathr added inline comments.Aug 6 2017, 4:02 PM
cmake/caches/Fuchsia-stage2.cmake
56

Can you do this without duplicating all the identical settings from the block above?
It looks like the asan cases are just all of the above plus two more.

phosek added inline comments.Aug 6 2017, 4:27 PM
cmake/caches/Fuchsia-stage2.cmake
56

Yes, I'm working on this literally right now ;)

phosek updated this revision to Diff 110311.Aug 8 2017, 5:25 PM
beanz accepted this revision.Aug 10 2017, 5:05 PM

This also looks good to me.

This revision is now accepted and ready to land.Aug 10 2017, 5:05 PM
Closed by commit rL311033: [CMake] Build sanitized C++ runtimes for Fuchsia (authored by phosek). · Explain WhyAug 16 2017, 12:07 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
cmake/
caches/
20 lines

Diff 109852

cmake/caches/Fuchsia-stage2.cmake

Show All 30 Linesforeach(target x86_64;aarch64)
set(BUILTINS_${target}-fuchsia_CMAKE_SYSROOT ${FUCHSIA_${target}_SYSROOT} CACHE PATH "") set(BUILTINS_${target}-fuchsia_CMAKE_SYSROOT ${FUCHSIA_${target}_SYSROOT} CACHE PATH "")
set(BUILTINS_${target}-fuchsia_CMAKE_SYSTEM_NAME Fuchsia CACHE STRING "") set(BUILTINS_${target}-fuchsia_CMAKE_SYSTEM_NAME Fuchsia CACHE STRING "")
endforeach() endforeach()
if(NOT APPLE) if(NOT APPLE)
list(APPEND LLVM_BUILTIN_TARGETS "default") list(APPEND LLVM_BUILTIN_TARGETS "default")
endif() endif()
set(LLVM_RUNTIME_TARGETS "default;x86_64-fuchsia;aarch64-fuchsia" CACHE STRING "") set(LLVM_RUNTIME_TARGETS "default;x86_64-fuchsia;aarch64-fuchsia;x86_64-fuchsia-asan:x86_64-fuchsia;aarch64-fuchsia-asan:aarch64-fuchsia" CACHE STRING "")
foreach(target x86_64;aarch64) foreach(target x86_64;aarch64)
set(RUNTIMES_${target}-fuchsia_CMAKE_BUILD_WITH_INSTALL_RPATH ON CACHE BOOL "") set(RUNTIMES_${target}-fuchsia_CMAKE_BUILD_WITH_INSTALL_RPATH ON CACHE BOOL "")
set(RUNTIMES_${target}-fuchsia_CMAKE_SYSROOT ${FUCHSIA_${target}_SYSROOT} CACHE PATH "") set(RUNTIMES_${target}-fuchsia_CMAKE_SYSROOT ${FUCHSIA_${target}_SYSROOT} CACHE PATH "")
set(RUNTIMES_${target}-fuchsia_CMAKE_SYSTEM_NAME Fuchsia CACHE STRING "") set(RUNTIMES_${target}-fuchsia_CMAKE_SYSTEM_NAME Fuchsia CACHE STRING "")
set(RUNTIMES_${target}-fuchsia_UNIX 1 CACHE BOOL "") set(RUNTIMES_${target}-fuchsia_UNIX 1 CACHE BOOL "")
set(RUNTIMES_${target}-fuchsia_LLVM_ENABLE_LIBCXX ON CACHE BOOL "") set(RUNTIMES_${target}-fuchsia_LLVM_ENABLE_LIBCXX ON CACHE BOOL "")
set(RUNTIMES_${target}-fuchsia_LIBUNWIND_USE_COMPILER_RT ON CACHE BOOL "") set(RUNTIMES_${target}-fuchsia_LIBUNWIND_USE_COMPILER_RT ON CACHE BOOL "")
set(RUNTIMES_${target}-fuchsia_LIBCXXABI_USE_COMPILER_RT ON CACHE BOOL "") set(RUNTIMES_${target}-fuchsia_LIBCXXABI_USE_COMPILER_RT ON CACHE BOOL "")
set(RUNTIMES_${target}-fuchsia_LIBCXXABI_USE_LLVM_UNWINDER ON CACHE BOOL "") set(RUNTIMES_${target}-fuchsia_LIBCXXABI_USE_LLVM_UNWINDER ON CACHE BOOL "")
set(RUNTIMES_${target}-fuchsia_LIBCXXABI_ENABLE_STATIC OFF CACHE BOOL "") set(RUNTIMES_${target}-fuchsia_LIBCXXABI_ENABLE_STATIC OFF CACHE BOOL "")
set(RUNTIMES_${target}-fuchsia_LIBCXX_USE_COMPILER_RT ON CACHE BOOL "") set(RUNTIMES_${target}-fuchsia_LIBCXX_USE_COMPILER_RT ON CACHE BOOL "")
set(RUNTIMES_${target}-fuchsia_LIBCXX_ABI_VERSION 2 CACHE STRING "") set(RUNTIMES_${target}-fuchsia_LIBCXX_ABI_VERSION 2 CACHE STRING "")
set(RUNTIMES_${target}-fuchsia_LIBCXX_ENABLE_STATIC OFF CACHE BOOL "") set(RUNTIMES_${target}-fuchsia_LIBCXX_ENABLE_STATIC OFF CACHE BOOL "")
set(RUNTIMES_${target}-fuchsia_SANITIZER_USE_COMPILER_RT ON CACHE BOOL "") set(RUNTIMES_${target}-fuchsia_SANITIZER_USE_COMPILER_RT ON CACHE BOOL "")
endforeach() endforeach()
foreach(target x86_64;aarch64)
mcgrathrUnsubmitted
Not Done
ReplyInline Actions

Can you do this without duplicating all the identical settings from the block above?
It looks like the asan cases are just all of the above plus two more.

mcgrathr: Can you do this without duplicating all the identical settings from the block above? It looks…
phosekAuthorUnsubmitted
Not Done
ReplyInline Actions

Yes, I'm working on this literally right now ;)

phosek: Yes, I'm working on this literally right now ;)
set(RUNTIMES_${target}-fuchsia-asan_CMAKE_BUILD_WITH_INSTALL_RPATH ON CACHE BOOL "")
set(RUNTIMES_${target}-fuchsia-asan_CMAKE_SYSROOT ${FUCHSIA_${target}_SYSROOT} CACHE PATH "")
set(RUNTIMES_${target}-fuchsia-asan_CMAKE_SYSTEM_NAME Fuchsia CACHE STRING "")
set(RUNTIMES_${target}-fuchsia-asan_LLVM_USE_SANITIZER Address CACHE STRING "")
set(RUNTIMES_${target}-fuchsia-asan_LLVM_BUILD_COMPILER_RT OFF CACHE BOOL "")
set(RUNTIMES_${target}-fuchsia-asan_LLVM_RUNTIMES_PREFIX "${target}-fuchsia/asan" CACHE STRING "")
set(RUNTIMES_${target}-fuchsia-asan_UNIX 1 CACHE BOOL "")
set(RUNTIMES_${target}-fuchsia-asan_LLVM_ENABLE_LIBCXX ON CACHE BOOL "")
set(RUNTIMES_${target}-fuchsia-asan_LIBUNWIND_USE_COMPILER_RT ON CACHE BOOL "")
set(RUNTIMES_${target}-fuchsia-asan_LIBCXXABI_USE_COMPILER_RT ON CACHE BOOL "")
set(RUNTIMES_${target}-fuchsia-asan_LIBCXXABI_USE_LLVM_UNWINDER ON CACHE BOOL "")
set(RUNTIMES_${target}-fuchsia-asan_LIBCXXABI_ENABLE_STATIC OFF CACHE BOOL "")
set(RUNTIMES_${target}-fuchsia-asan_LIBCXX_USE_COMPILER_RT ON CACHE BOOL "")
set(RUNTIMES_${target}-fuchsia-asan_LIBCXX_ABI_VERSION 2 CACHE STRING "")
set(RUNTIMES_${target}-fuchsia-asan_LIBCXX_ENABLE_STATIC OFF CACHE BOOL "")
endforeach()
# Setup toolchain. # Setup toolchain.
set(LLVM_INSTALL_TOOLCHAIN_ONLY ON CACHE BOOL "") set(LLVM_INSTALL_TOOLCHAIN_ONLY ON CACHE BOOL "")
set(LLVM_TOOLCHAIN_TOOLS set(LLVM_TOOLCHAIN_TOOLS
llc llc
llvm-ar llvm-ar
llvm-cov llvm-cov
llvm-cxxfilt llvm-cxxfilt
llvm-dwarfdump llvm-dwarfdump
Show All 29 Lines