diff options
| author | Alexey Samsonov <vonosmas@gmail.com> | 2015-09-29 21:43:37 +0000 |
|---|---|---|
| committer | Alexey Samsonov <vonosmas@gmail.com> | 2015-09-29 21:43:37 +0000 |
| commit | 4133c18b1c8d6353b94a74f88384d1796dcee56c (patch) | |
| tree | 174099070dfbc7f419c209f617cc79220da53615 | |
| parent | 7aba3960c7e4a7479f0060f56a6a1a988e332cb3 (diff) | |
| download | bcm5719-llvm-4133c18b1c8d6353b94a74f88384d1796dcee56c.tar.gz bcm5719-llvm-4133c18b1c8d6353b94a74f88384d1796dcee56c.zip | |
[CFI] Make CFI tests require UBSan (for diagnostic mode).
CFI itself, on the other hand, doesn't require anything, including
sanitizer_common.
llvm-svn: 248830
| -rw-r--r-- | compiler-rt/lib/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | compiler-rt/test/CMakeLists.txt | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/compiler-rt/lib/CMakeLists.txt b/compiler-rt/lib/CMakeLists.txt index fb5851aae87..9215b080b7b 100644 --- a/compiler-rt/lib/CMakeLists.txt +++ b/compiler-rt/lib/CMakeLists.txt @@ -15,11 +15,12 @@ if(COMPILER_RT_BUILD_SANITIZERS) if(COMPILER_RT_HAS_SANITIZER_COMMON) add_subdirectory(sanitizer_common) - add_subdirectory(cfi) add_subdirectory(lsan) add_subdirectory(ubsan) endif() + add_subdirectory(cfi) + if(COMPILER_RT_HAS_ASAN) add_subdirectory(asan) endif() diff --git a/compiler-rt/test/CMakeLists.txt b/compiler-rt/test/CMakeLists.txt index 6c898f476c8..684b409bb8f 100644 --- a/compiler-rt/test/CMakeLists.txt +++ b/compiler-rt/test/CMakeLists.txt @@ -60,7 +60,10 @@ if(COMPILER_RT_CAN_EXECUTE_TESTS) if(COMPILER_RT_HAS_UBSAN) add_subdirectory(ubsan) endif() - add_subdirectory(cfi) + # CFI tests require diagnostic mode, which is implemented in UBSan. + if(COMPILER_RT_HAS_UBSAN) + add_subdirectory(cfi) + endif() if(COMPILER_RT_HAS_SAFESTACK) add_subdirectory(safestack) endif() |
