diff options
| -rw-r--r-- | CMakeLists.txt | 12 | ||||
| -rw-r--r-- | lib/lsan/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | test/asan/CMakeLists.txt | 15 | ||||
| -rw-r--r-- | test/ubsan/CMakeLists.txt | 15 |
4 files changed, 13 insertions, 31 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 67d5e83a1..b64893d69 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -215,9 +215,9 @@ else() test_target_arch(i386 ${TARGET_32_BIT_CFLAGS}) elseif("${LLVM_NATIVE_ARCH}" STREQUAL "PowerPC") test_target_arch(powerpc64 ${TARGET_64_BIT_CFLAGS}) + elseif("${LLVM_NATIVE_ARCH}" STREQUAL "ARM") + test_target_arch(arm "") endif() - test_target_arch(arm "-march=armv7-a") - test_target_arch(aarch64 "-march=armv8-a") endif() # We support running instrumented tests when we're not cross compiling @@ -347,14 +347,14 @@ endif() # Architectures supported by Sanitizer runtimes. Specific sanitizers may # support only subset of these (e.g. TSan works on x86_64 only). filter_available_targets(SANITIZER_COMMON_SUPPORTED_ARCH - x86_64 i386 powerpc64 arm aarch64) -filter_available_targets(ASAN_SUPPORTED_ARCH x86_64 i386 powerpc64 arm) + x86_64 i386 powerpc64 arm) +filter_available_targets(ASAN_SUPPORTED_ARCH x86_64 i386 powerpc64) filter_available_targets(DFSAN_SUPPORTED_ARCH x86_64) filter_available_targets(LSAN_SUPPORTED_ARCH x86_64) filter_available_targets(MSAN_SUPPORTED_ARCH x86_64) -filter_available_targets(PROFILE_SUPPORTED_ARCH x86_64 i386 arm aarch64) +filter_available_targets(PROFILE_SUPPORTED_ARCH x86_64 i386 arm) filter_available_targets(TSAN_SUPPORTED_ARCH x86_64) -filter_available_targets(UBSAN_SUPPORTED_ARCH x86_64 i386 arm aarch64) +filter_available_targets(UBSAN_SUPPORTED_ARCH x86_64 i386) add_subdirectory(include) diff --git a/lib/lsan/CMakeLists.txt b/lib/lsan/CMakeLists.txt index f970859c1..0924282a6 100644 --- a/lib/lsan/CMakeLists.txt +++ b/lib/lsan/CMakeLists.txt @@ -19,7 +19,7 @@ set(LSAN_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}) # The common files need to build on every arch supported by ASan. # (Even if they build into dummy object files.) filter_available_targets(LSAN_COMMON_SUPPORTED_ARCH - x86_64 i386 powerpc64 arm aarch64) + x86_64 i386 powerpc64 arm) add_custom_target(lsan) diff --git a/test/asan/CMakeLists.txt b/test/asan/CMakeLists.txt index b20502ae0..52a122ff4 100644 --- a/test/asan/CMakeLists.txt +++ b/test/asan/CMakeLists.txt @@ -34,21 +34,6 @@ if(CAN_TARGET_arm) list(APPEND ASAN_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/ARMLinuxConfig) endif() -if(CAN_TARGET_aarch64) - # This is only true if we are cross-compiling. - # Build all tests with host compiler and use host tools. - set(ASAN_TEST_TARGET_CC ${COMPILER_RT_TEST_COMPILER}) - set(ASAN_TEST_TARGET_CFLAGS ${COMPILER_RT_TEST_COMPILER_CFLAGS}) - set(ASAN_TEST_CONFIG_SUFFIX "-aarch64-linux") - set(ASAN_TEST_BITS "64") - set(ASAN_TEST_DYNAMIC False) - configure_lit_site_cfg( - ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in - ${CMAKE_CURRENT_BINARY_DIR}/AArch64LinuxConfig/lit.site.cfg - ) - list(APPEND ASAN_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/AArch64LinuxConfig) -endif() - if(CAN_TARGET_x86_64 OR CAN_TARGET_powerpc64) set(ASAN_TEST_CONFIG_SUFFIX "64") set(ASAN_TEST_BITS "64") diff --git a/test/ubsan/CMakeLists.txt b/test/ubsan/CMakeLists.txt index 4c6b0bcf7..ded124d16 100644 --- a/test/ubsan/CMakeLists.txt +++ b/test/ubsan/CMakeLists.txt @@ -4,15 +4,11 @@ set(UBSAN_LIT_TEST_MODE "Standalone") configure_lit_site_cfg( ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in ${CMAKE_CURRENT_BINARY_DIR}/UbsanConfig/lit.site.cfg) -set(UBSAN_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/UbsanConfig) -if(ASAN_SUPPORTED_ARCH) - set(UBSAN_LIT_TEST_MODE "AddressSanitizer") - configure_lit_site_cfg( - ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in - ${CMAKE_CURRENT_BINARY_DIR}/AsanConfig/lit.site.cfg) - list(APPEND UBSAN_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/AsanConfig) -endif() +set(UBSAN_LIT_TEST_MODE "AddressSanitizer") +configure_lit_site_cfg( + ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in + ${CMAKE_CURRENT_BINARY_DIR}/AsanConfig/lit.site.cfg) set(UBSAN_TEST_DEPS ${SANITIZER_COMMON_LIT_TEST_DEPS}) if(NOT COMPILER_RT_STANDALONE_BUILD) @@ -20,6 +16,7 @@ if(NOT COMPILER_RT_STANDALONE_BUILD) endif() add_lit_testsuite(check-ubsan "Running UndefinedBehaviorSanitizer tests" - ${UBSAN_TESTSUITES} + ${CMAKE_CURRENT_BINARY_DIR}/UbsanConfig + ${CMAKE_CURRENT_BINARY_DIR}/AsanConfig DEPENDS ${UBSAN_TEST_DEPS}) set_target_properties(check-ubsan PROPERTIES FOLDER "UBSan unittests") |