diff options
| -rw-r--r-- | compiler-rt/test/hwasan/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | compiler-rt/test/hwasan/TestCases/cfi.cpp | 2 | ||||
| -rw-r--r-- | compiler-rt/test/hwasan/lit.cfg.py | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/compiler-rt/test/hwasan/CMakeLists.txt b/compiler-rt/test/hwasan/CMakeLists.txt index 632309ae75e..541604037e1 100644 --- a/compiler-rt/test/hwasan/CMakeLists.txt +++ b/compiler-rt/test/hwasan/CMakeLists.txt @@ -23,6 +23,9 @@ endforeach() set(HWASAN_TEST_DEPS ${SANITIZER_COMMON_LIT_TEST_DEPS}) if(NOT COMPILER_RT_STANDALONE_BUILD) list(APPEND HWASAN_TEST_DEPS hwasan) + if(COMPILER_RT_HAS_LLD) + list(APPEND HWASAN_TEST_DEPS lld) + endif() endif() add_lit_testsuite(check-hwasan "Running the HWAddressSanitizer tests" diff --git a/compiler-rt/test/hwasan/TestCases/cfi.cpp b/compiler-rt/test/hwasan/TestCases/cfi.cpp index e64b556171e..64847398387 100644 --- a/compiler-rt/test/hwasan/TestCases/cfi.cpp +++ b/compiler-rt/test/hwasan/TestCases/cfi.cpp @@ -1,4 +1,4 @@ -// RUN: %clangxx_hwasan -fsanitize=cfi -fno-sanitize-trap=cfi -flto -fvisibility=hidden -fuse-ld=lld %s -o %t +// RUN: %clangxx_hwasan -fsanitize=cfi -fno-sanitize-trap=cfi -flto -fvisibility=hidden %s -o %t // RUN: not %run %t 2>&1 | FileCheck %s // REQUIRES: android diff --git a/compiler-rt/test/hwasan/lit.cfg.py b/compiler-rt/test/hwasan/lit.cfg.py index f506e703b51..47d5624ac58 100644 --- a/compiler-rt/test/hwasan/lit.cfg.py +++ b/compiler-rt/test/hwasan/lit.cfg.py @@ -11,7 +11,7 @@ config.test_source_root = os.path.dirname(__file__) # Setup default compiler flags used with -fsanitize=memory option. clang_cflags = [config.target_cflags] + config.debug_info_flags clang_cxxflags = config.cxx_mode_flags + clang_cflags -clang_hwasan_cflags = ["-fsanitize=hwaddress", "-mllvm", "-hwasan-globals"] + clang_cflags +clang_hwasan_cflags = ["-fsanitize=hwaddress", "-mllvm", "-hwasan-globals", "-fuse-ld=lld"] + clang_cflags if config.target_arch == 'x86_64': # This does basically the same thing as tagged-globals on aarch64. Because # the x86_64 implementation is for testing purposes only there is no |
