36 files changed, 33 insertions, 34 deletions
diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt
index 97cd6145569..c8aa9c8e3a7 100644
--- a/compiler-rt/CMakeLists.txt
+++ b/compiler-rt/CMakeLists.txt
@@ -231,6 +231,8 @@ endif()
 # 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)
+filter_available_targets(UBSAN_SUPPORTED_ARCH
+  x86_64 i386)
 
 add_subdirectory(include)
 
diff --git a/compiler-rt/lib/ubsan/CMakeLists.txt b/compiler-rt/lib/ubsan/CMakeLists.txt
index 78460dacf97..a74cb93720c 100644
--- a/compiler-rt/lib/ubsan/CMakeLists.txt
+++ b/compiler-rt/lib/ubsan/CMakeLists.txt
@@ -15,10 +15,7 @@ include_directories(..)
 
 set(UBSAN_CFLAGS ${SANITIZER_COMMON_CFLAGS})
 
-filter_available_targets(UBSAN_SUPPORTED_ARCH
-  x86_64 i386)
-
-set(UBSAN_RUNTIME_LIBRARIES)
+add_custom_target(ubsan)
 
 if(APPLE)
   # Build universal binary on APPLE.
@@ -27,7 +24,7 @@ if(APPLE)
     SOURCES ${UBSAN_SOURCES} ${UBSAN_CXX_SOURCES}
             $<TARGET_OBJECTS:RTSanitizerCommon.osx>
     CFLAGS ${UBSAN_CFLAGS})
-  list(APPEND UBSAN_RUNTIME_LIBRARIES clang_rt.ubsan_osx)
+  add_dependencies(ubsan clang_rt.ubsan_osx)
 else()
   # Build separate libraries for each target.
   foreach(arch ${UBSAN_SUPPORTED_ARCH})
@@ -39,20 +36,16 @@ else()
     add_compiler_rt_static_runtime(clang_rt.ubsan_cxx-${arch} ${arch}
       SOURCES ${UBSAN_CXX_SOURCES}
       CFLAGS ${UBSAN_CFLAGS})
-    list(APPEND UBSAN_RUNTIME_LIBRARIES
+    add_dependencies(ubsan
       clang_rt.san-${arch}
       clang_rt.ubsan-${arch}
       clang_rt.ubsan_cxx-${arch})
     if (UNIX AND NOT ${arch} STREQUAL "i386")
       add_sanitizer_rt_symbols(clang_rt.ubsan-${arch} ubsan.syms.extra)
       add_sanitizer_rt_symbols(clang_rt.ubsan_cxx-${arch} ubsan.syms.extra)
-      list(APPEND UBSAN_RUNTIME_LIBRARIES
+      add_dependencies(ubsan
         clang_rt.ubsan-${arch}-symbols
         clang_rt.ubsan_cxx-${arch}-symbols)
     endif()
   endforeach()
 endif()
-
-if(UBSAN_SUPPORTED_ARCH)
-  add_subdirectory(lit_tests)
-endif()
diff --git a/compiler-rt/lib/ubsan/lit_tests/CMakeLists.txt b/compiler-rt/lib/ubsan/lit_tests/CMakeLists.txt
deleted file mode 100644
index 36d8dc1f920..00000000000
--- a/compiler-rt/lib/ubsan/lit_tests/CMakeLists.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-set(UBSAN_LIT_TESTS_DIR ${CMAKE_CURRENT_SOURCE_DIR})
-
-configure_lit_site_cfg(
-  ${CMAKE_CURRENT_SOURCE_DIR}/UbsanConfig/lit.site.cfg.in
-  ${CMAKE_CURRENT_BINARY_DIR}/UbsanConfig/lit.site.cfg)
-
-configure_lit_site_cfg(
-  ${CMAKE_CURRENT_SOURCE_DIR}/AsanConfig/lit.site.cfg.in
-  ${CMAKE_CURRENT_BINARY_DIR}/AsanConfig/lit.site.cfg)
-
-if(COMPILER_RT_CAN_EXECUTE_TESTS)
-  # Run UBSan output tests only if we're sure that clang would produce
-  # working binaries.
-  set(UBSAN_TEST_DEPS
-    ${SANITIZER_COMMON_LIT_TEST_DEPS}
-    ${UBSAN_RUNTIME_LIBRARIES}
-    asan_runtime_libraries)
-  add_lit_testsuite(check-ubsan "Running UndefinedBehaviorSanitizer tests"
-    ${CMAKE_CURRENT_BINARY_DIR}/UbsanConfig
-    ${CMAKE_CURRENT_BINARY_DIR}/AsanConfig
-    DEPENDS ${UBSAN_TEST_DEPS})
-  set_target_properties(check-ubsan PROPERTIES FOLDER "UBSan unittests")
-endif()
diff --git a/compiler-rt/test/CMakeLists.txt b/compiler-rt/test/CMakeLists.txt
index 1ab0cb5229b..b497550ea78 100644
--- a/compiler-rt/test/CMakeLists.txt
+++ b/compiler-rt/test/CMakeLists.txt
@@ -5,3 +5,11 @@ configure_lit_site_cfg(
 # BlocksRuntime and builtins testsuites are not yet ported to lit.
 # add_subdirectory(BlocksRuntime)
 # add_subdirectory(builtins)
+
+# Run sanitizer tests only if we're sure that clang would produce
+# working binaries.
+if(COMPILER_RT_CAN_EXECUTE_TESTS)
+  if(UBSAN_SUPPORTED_ARCH)
+    add_subdirectory(ubsan)
+  endif()
+endif()
diff --git a/compiler-rt/lib/ubsan/lit_tests/AsanConfig/lit.cfg b/compiler-rt/test/ubsan/AsanConfig/lit.cfg
index 407e5ec32e6..407e5ec32e6 100644
--- a/compiler-rt/lib/ubsan/lit_tests/AsanConfig/lit.cfg
+++ b/compiler-rt/test/ubsan/AsanConfig/lit.cfg
diff --git a/compiler-rt/lib/ubsan/lit_tests/AsanConfig/lit.site.cfg.in b/compiler-rt/test/ubsan/AsanConfig/lit.site.cfg.in
index 03d55fc56f1..03d55fc56f1 100644
--- a/compiler-rt/lib/ubsan/lit_tests/AsanConfig/lit.site.cfg.in
+++ b/compiler-rt/test/ubsan/AsanConfig/lit.site.cfg.in
diff --git a/compiler-rt/test/ubsan/CMakeLists.txt b/compiler-rt/test/ubsan/CMakeLists.txt
new file mode 100644
index 00000000000..1ae2b876089
--- /dev/null
+++ b/compiler-rt/test/ubsan/CMakeLists.txt
@@ -0,0 +1,19 @@
+set(UBSAN_LIT_TESTS_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+
+configure_lit_site_cfg(
+  ${CMAKE_CURRENT_SOURCE_DIR}/UbsanConfig/lit.site.cfg.in
+  ${CMAKE_CURRENT_BINARY_DIR}/UbsanConfig/lit.site.cfg)
+
+configure_lit_site_cfg(
+  ${CMAKE_CURRENT_SOURCE_DIR}/AsanConfig/lit.site.cfg.in
+  ${CMAKE_CURRENT_BINARY_DIR}/AsanConfig/lit.site.cfg)
+
+set(UBSAN_TEST_DEPS
+  ${SANITIZER_COMMON_LIT_TEST_DEPS}
+  ubsan
+  asan_runtime_libraries)
+add_lit_testsuite(check-ubsan "Running UndefinedBehaviorSanitizer tests"
+  ${CMAKE_CURRENT_BINARY_DIR}/UbsanConfig
+  ${CMAKE_CURRENT_BINARY_DIR}/AsanConfig
+  DEPENDS ${UBSAN_TEST_DEPS})
+set_target_properties(check-ubsan PROPERTIES FOLDER "UBSan unittests")
diff --git a/compiler-rt/lib/ubsan/lit_tests/TestCases/Float/cast-overflow.cpp b/compiler-rt/test/ubsan/TestCases/Float/cast-overflow.cpp
index 35f9336c904..35f9336c904 100644
--- a/compiler-rt/lib/ubsan/lit_tests/TestCases/Float/cast-overflow.cpp
+++ b/compiler-rt/test/ubsan/TestCases/Float/cast-overflow.cpp
diff --git a/compiler-rt/lib/ubsan/lit_tests/TestCases/Integer/add-overflow.cpp b/compiler-rt/test/ubsan/TestCases/Integer/add-overflow.cpp
index 412eb762103..412eb762103 100644
--- a/compiler-rt/lib/ubsan/lit_tests/TestCases/Integer/add-overflow.cpp
+++ b/compiler-rt/test/ubsan/TestCases/Integer/add-overflow.cpp
diff --git a/compiler-rt/lib/ubsan/lit_tests/TestCases/Integer/div-overflow.cpp b/compiler-rt/test/ubsan/TestCases/Integer/div-overflow.cpp
index 83aa854485b..83aa854485b 100644
--- a/compiler-rt/lib/ubsan/lit_tests/TestCases/Integer/div-overflow.cpp
+++ b/compiler-rt/test/ubsan/TestCases/Integer/div-overflow.cpp
diff --git a/compiler-rt/lib/ubsan/lit_tests/TestCases/Integer/div-zero.cpp b/compiler-rt/test/ubsan/TestCases/Integer/div-zero.cpp
index 6b8aadfe15e..6b8aadfe15e 100644
--- a/compiler-rt/lib/ubsan/lit_tests/TestCases/Integer/div-zero.cpp
+++ b/compiler-rt/test/ubsan/TestCases/Integer/div-zero.cpp
diff --git a/compiler-rt/lib/ubsan/lit_tests/TestCases/Integer/incdec-overflow.cpp b/compiler-rt/test/ubsan/TestCases/Integer/incdec-overflow.cpp
index 904250a76c7..904250a76c7 100644
--- a/compiler-rt/lib/ubsan/lit_tests/TestCases/Integer/incdec-overflow.cpp
+++ b/compiler-rt/test/ubsan/TestCases/Integer/incdec-overflow.cpp
diff --git a/compiler-rt/lib/ubsan/lit_tests/TestCases/Integer/mul-overflow.cpp b/compiler-rt/test/ubsan/TestCases/Integer/mul-overflow.cpp
index 1cfe23f5721..1cfe23f5721 100644
--- a/compiler-rt/lib/ubsan/lit_tests/TestCases/Integer/mul-overflow.cpp
+++ b/compiler-rt/test/ubsan/TestCases/Integer/mul-overflow.cpp
diff --git a/compiler-rt/lib/ubsan/lit_tests/TestCases/Integer/negate-overflow.cpp b/compiler-rt/test/ubsan/TestCases/Integer/negate-overflow.cpp
index 6bee3eea298..6bee3eea298 100644
--- a/compiler-rt/lib/ubsan/lit_tests/TestCases/Integer/negate-overflow.cpp
+++ b/compiler-rt/test/ubsan/TestCases/Integer/negate-overflow.cpp
diff --git a/compiler-rt/lib/ubsan/lit_tests/TestCases/Integer/no-recover.cpp b/compiler-rt/test/ubsan/TestCases/Integer/no-recover.cpp
index 64787b7cfbf..64787b7cfbf 100644
--- a/compiler-rt/lib/ubsan/lit_tests/TestCases/Integer/no-recover.cpp
+++ b/compiler-rt/test/ubsan/TestCases/Integer/no-recover.cpp
diff --git a/compiler-rt/lib/ubsan/lit_tests/TestCases/Integer/shift.cpp b/compiler-rt/test/ubsan/TestCases/Integer/shift.cpp
index f35fa1f959a..f35fa1f959a 100644
--- a/compiler-rt/lib/ubsan/lit_tests/TestCases/Integer/shift.cpp
+++ b/compiler-rt/test/ubsan/TestCases/Integer/shift.cpp
diff --git a/compiler-rt/lib/ubsan/lit_tests/TestCases/Integer/sub-overflow.cpp b/compiler-rt/test/ubsan/TestCases/Integer/sub-overflow.cpp
index bf33d293799..bf33d293799 100644
--- a/compiler-rt/lib/ubsan/lit_tests/TestCases/Integer/sub-overflow.cpp
+++ b/compiler-rt/test/ubsan/TestCases/Integer/sub-overflow.cpp
diff --git a/compiler-rt/lib/ubsan/lit_tests/TestCases/Integer/uadd-overflow.cpp b/compiler-rt/test/ubsan/TestCases/Integer/uadd-overflow.cpp
index 2ef31c0640d..2ef31c0640d 100644
--- a/compiler-rt/lib/ubsan/lit_tests/TestCases/Integer/uadd-overflow.cpp
+++ b/compiler-rt/test/ubsan/TestCases/Integer/uadd-overflow.cpp
diff --git a/compiler-rt/lib/ubsan/lit_tests/TestCases/Integer/uincdec-overflow.cpp b/compiler-rt/test/ubsan/TestCases/Integer/uincdec-overflow.cpp
index a14bd6a776f..a14bd6a776f 100644
--- a/compiler-rt/lib/ubsan/lit_tests/TestCases/Integer/uincdec-overflow.cpp
+++ b/compiler-rt/test/ubsan/TestCases/Integer/uincdec-overflow.cpp
diff --git a/compiler-rt/lib/ubsan/lit_tests/TestCases/Integer/umul-overflow.cpp b/compiler-rt/test/ubsan/TestCases/Integer/umul-overflow.cpp
index c84bb39ef2f..c84bb39ef2f 100644
--- a/compiler-rt/lib/ubsan/lit_tests/TestCases/Integer/umul-overflow.cpp
+++ b/compiler-rt/test/ubsan/TestCases/Integer/umul-overflow.cpp
diff --git a/compiler-rt/lib/ubsan/lit_tests/TestCases/Integer/usub-overflow.cpp b/compiler-rt/test/ubsan/TestCases/Integer/usub-overflow.cpp
index 78f74557858..78f74557858 100644
--- a/compiler-rt/lib/ubsan/lit_tests/TestCases/Integer/usub-overflow.cpp
+++ b/compiler-rt/test/ubsan/TestCases/Integer/usub-overflow.cpp
diff --git a/compiler-rt/lib/ubsan/lit_tests/TestCases/Misc/bool.cpp b/compiler-rt/test/ubsan/TestCases/Misc/bool.cpp
index e916e7fb3c1..e916e7fb3c1 100644
--- a/compiler-rt/lib/ubsan/lit_tests/TestCases/Misc/bool.cpp
+++ b/compiler-rt/test/ubsan/TestCases/Misc/bool.cpp
diff --git a/compiler-rt/lib/ubsan/lit_tests/TestCases/Misc/bounds.cpp b/compiler-rt/test/ubsan/TestCases/Misc/bounds.cpp
index dc4c4a513c1..dc4c4a513c1 100644
--- a/compiler-rt/lib/ubsan/lit_tests/TestCases/Misc/bounds.cpp
+++ b/compiler-rt/test/ubsan/TestCases/Misc/bounds.cpp
diff --git a/compiler-rt/lib/ubsan/lit_tests/TestCases/Misc/deduplication.cpp b/compiler-rt/test/ubsan/TestCases/Misc/deduplication.cpp
index d325bf6dd89..d325bf6dd89 100644
--- a/compiler-rt/lib/ubsan/lit_tests/TestCases/Misc/deduplication.cpp
+++ b/compiler-rt/test/ubsan/TestCases/Misc/deduplication.cpp
diff --git a/compiler-rt/lib/ubsan/lit_tests/TestCases/Misc/enum.cpp b/compiler-rt/test/ubsan/TestCases/Misc/enum.cpp
index c5642507ad4..c5642507ad4 100644
--- a/compiler-rt/lib/ubsan/lit_tests/TestCases/Misc/enum.cpp
+++ b/compiler-rt/test/ubsan/TestCases/Misc/enum.cpp
diff --git a/compiler-rt/lib/ubsan/lit_tests/TestCases/Misc/missing_return.cpp b/compiler-rt/test/ubsan/TestCases/Misc/missing_return.cpp
index 7da238e25dc..7da238e25dc 100644
--- a/compiler-rt/lib/ubsan/lit_tests/TestCases/Misc/missing_return.cpp
+++ b/compiler-rt/test/ubsan/TestCases/Misc/missing_return.cpp
diff --git a/compiler-rt/lib/ubsan/lit_tests/TestCases/Misc/unreachable.cpp b/compiler-rt/test/ubsan/TestCases/Misc/unreachable.cpp
index 75fc3e5bd9a..75fc3e5bd9a 100644
--- a/compiler-rt/lib/ubsan/lit_tests/TestCases/Misc/unreachable.cpp
+++ b/compiler-rt/test/ubsan/TestCases/Misc/unreachable.cpp
diff --git a/compiler-rt/lib/ubsan/lit_tests/TestCases/Misc/vla.c b/compiler-rt/test/ubsan/TestCases/Misc/vla.c
index 2fa88addc0d..2fa88addc0d 100644
--- a/compiler-rt/lib/ubsan/lit_tests/TestCases/Misc/vla.c
+++ b/compiler-rt/test/ubsan/TestCases/Misc/vla.c
diff --git a/compiler-rt/lib/ubsan/lit_tests/TestCases/TypeCheck/Function/function.cpp b/compiler-rt/test/ubsan/TestCases/TypeCheck/Function/function.cpp
index 8106ae47ee4..8106ae47ee4 100644
--- a/compiler-rt/lib/ubsan/lit_tests/TestCases/TypeCheck/Function/function.cpp
+++ b/compiler-rt/test/ubsan/TestCases/TypeCheck/Function/function.cpp
diff --git a/compiler-rt/lib/ubsan/lit_tests/TestCases/TypeCheck/Function/lit.local.cfg b/compiler-rt/test/ubsan/TestCases/TypeCheck/Function/lit.local.cfg
index 27c61a34387..27c61a34387 100644
--- a/compiler-rt/lib/ubsan/lit_tests/TestCases/TypeCheck/Function/lit.local.cfg
+++ b/compiler-rt/test/ubsan/TestCases/TypeCheck/Function/lit.local.cfg
diff --git a/compiler-rt/lib/ubsan/lit_tests/TestCases/TypeCheck/misaligned.cpp b/compiler-rt/test/ubsan/TestCases/TypeCheck/misaligned.cpp
index 9b0b9a1197c..9b0b9a1197c 100644
--- a/compiler-rt/lib/ubsan/lit_tests/TestCases/TypeCheck/misaligned.cpp
+++ b/compiler-rt/test/ubsan/TestCases/TypeCheck/misaligned.cpp
diff --git a/compiler-rt/lib/ubsan/lit_tests/TestCases/TypeCheck/null.cpp b/compiler-rt/test/ubsan/TestCases/TypeCheck/null.cpp
index 79726924d21..79726924d21 100644
--- a/compiler-rt/lib/ubsan/lit_tests/TestCases/TypeCheck/null.cpp
+++ b/compiler-rt/test/ubsan/TestCases/TypeCheck/null.cpp
diff --git a/compiler-rt/lib/ubsan/lit_tests/TestCases/TypeCheck/vptr.cpp b/compiler-rt/test/ubsan/TestCases/TypeCheck/vptr.cpp
index 9095f7279a6..9095f7279a6 100644
--- a/compiler-rt/lib/ubsan/lit_tests/TestCases/TypeCheck/vptr.cpp
+++ b/compiler-rt/test/ubsan/TestCases/TypeCheck/vptr.cpp
diff --git a/compiler-rt/lib/ubsan/lit_tests/UbsanConfig/lit.cfg b/compiler-rt/test/ubsan/UbsanConfig/lit.cfg
index fcc93035c60..fcc93035c60 100644
--- a/compiler-rt/lib/ubsan/lit_tests/UbsanConfig/lit.cfg
+++ b/compiler-rt/test/ubsan/UbsanConfig/lit.cfg
diff --git a/compiler-rt/lib/ubsan/lit_tests/UbsanConfig/lit.site.cfg.in b/compiler-rt/test/ubsan/UbsanConfig/lit.site.cfg.in
index 6554bac86c2..6554bac86c2 100644
--- a/compiler-rt/lib/ubsan/lit_tests/UbsanConfig/lit.site.cfg.in
+++ b/compiler-rt/test/ubsan/UbsanConfig/lit.site.cfg.in
diff --git a/compiler-rt/lib/ubsan/lit_tests/lit.common.cfg b/compiler-rt/test/ubsan/lit.common.cfg
index 23c85e9fa06..23c85e9fa06 100644
--- a/compiler-rt/lib/ubsan/lit_tests/lit.common.cfg
+++ b/compiler-rt/test/ubsan/lit.common.cfg