[llvm-branch-commits] [compiler-rt-branch] r196502 - Merging r196501:

[Alexey Samsonov]

Author: samsonov
Date: Thu Dec  5 06:57:55 2013
New Revision: 196502

URL: http://llvm.org/viewvc/llvm-project?rev=196502&view=rev
Log:
Merging r196501:
------------------------------------------------------------------------
r196501 | samsonov | 2013-12-05 16:53:36 +0400 (Thu, 05 Dec 2013) | 1 line

Run TSan/MSan lit tests only on 64-bit platforms
------------------------------------------------------------------------

Modified:
    compiler-rt/branches/release_34/   (props changed)
    compiler-rt/branches/release_34/lib/msan/lit_tests/CMakeLists.txt
    compiler-rt/branches/release_34/lib/msan/lit_tests/lit.cfg
    compiler-rt/branches/release_34/lib/tsan/lit_tests/CMakeLists.txt
    compiler-rt/branches/release_34/lib/tsan/lit_tests/lit.cfg

Propchange: compiler-rt/branches/release_34/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec  5 06:57:55 2013
@@ -1 +1 @@
-/compiler-rt/trunk:195427,195433-195434,195436,195442,195570,195642-195643,195652,195791
+/compiler-rt/trunk:195427,195433-195434,195436,195442,195570,195642-195643,195652,195791,196501

Modified: compiler-rt/branches/release_34/lib/msan/lit_tests/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_34/lib/msan/lit_tests/CMakeLists.txt?rev=196502&r1=196501&r2=196502&view=diff
==============================================================================
--- compiler-rt/branches/release_34/lib/msan/lit_tests/CMakeLists.txt (original)
+++ compiler-rt/branches/release_34/lib/msan/lit_tests/CMakeLists.txt Thu Dec  5 06:57:55 2013
@@ -11,7 +11,7 @@ if(MSAN_CAN_INSTRUMENT_LIBCXX)
     ${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg)
 endif()
 
-if(COMPILER_RT_CAN_EXECUTE_TESTS)
+if(COMPILER_RT_CAN_EXECUTE_TESTS AND CAN_TARGET_x86_64)
   # Run MSan tests only if we're sure we may produce working binaries.
   set(MSAN_TEST_DEPS
     ${SANITIZER_COMMON_LIT_TEST_DEPS}

Modified: compiler-rt/branches/release_34/lib/msan/lit_tests/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_34/lib/msan/lit_tests/lit.cfg?rev=196502&r1=196501&r2=196502&view=diff
==============================================================================
--- compiler-rt/branches/release_34/lib/msan/lit_tests/lit.cfg (original)
+++ compiler-rt/branches/release_34/lib/msan/lit_tests/lit.cfg Thu Dec  5 06:57:55 2013
@@ -56,7 +56,8 @@ clang_msan_cflags = ["-fsanitize=memory"
                      "-mno-omit-leaf-frame-pointer",
                      "-fno-omit-frame-pointer",
                      "-fno-optimize-sibling-calls",
-                     "-g"]
+                     "-g",
+                     "-m64"]
 clang_msan_cxxflags = ["--driver-mode=g++ "] + clang_msan_cflags
 config.substitutions.append( ("%clang_msan ",
                               " ".join([config.clang] + clang_msan_cflags) + 

Modified: compiler-rt/branches/release_34/lib/tsan/lit_tests/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_34/lib/tsan/lit_tests/CMakeLists.txt?rev=196502&r1=196501&r2=196502&view=diff
==============================================================================
--- compiler-rt/branches/release_34/lib/tsan/lit_tests/CMakeLists.txt (original)
+++ compiler-rt/branches/release_34/lib/tsan/lit_tests/CMakeLists.txt Thu Dec  5 06:57:55 2013
@@ -8,7 +8,7 @@ configure_lit_site_cfg(
   ${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg
   )
 
-if(COMPILER_RT_CAN_EXECUTE_TESTS)
+if(COMPILER_RT_CAN_EXECUTE_TESTS AND CAN_TARGET_x86_64)
   # Run TSan output tests only if we're sure we can produce working binaries.
   set(TSAN_TEST_DEPS
     ${SANITIZER_COMMON_LIT_TEST_DEPS}
@@ -25,7 +25,7 @@ if(COMPILER_RT_CAN_EXECUTE_TESTS)
     DEPENDS ${TSAN_TEST_DEPS}
     )
   set_target_properties(check-tsan PROPERTIES FOLDER "TSan unittests")
-elseif(LLVM_INCLUDE_TESTS)
+elseif(LLVM_INCLUDE_TESTS AND CAN_TARGET_x86_64)
   # Otherwise run only TSan unit tests (they are linked using the
   # host compiler).
   add_lit_testsuite(check-tsan "Running ThreadSanitizer tests"

Modified: compiler-rt/branches/release_34/lib/tsan/lit_tests/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_34/lib/tsan/lit_tests/lit.cfg?rev=196502&r1=196501&r2=196502&view=diff
==============================================================================
--- compiler-rt/branches/release_34/lib/tsan/lit_tests/lit.cfg (original)
+++ compiler-rt/branches/release_34/lib/tsan/lit_tests/lit.cfg Thu Dec  5 06:57:55 2013
@@ -62,7 +62,8 @@ clang_tsan_cflags = ("-fsanitize=thread
                       + "-g "
                       + "-Wall "
                       + "-lpthread "
-                      + "-ldl ")
+                      + "-ldl "
+                      + "-m64 ")
 clang_tsan_cxxflags = "--driver-mode=g++ " + clang_tsan_cflags
 config.substitutions.append( ("%clangxx_tsan ", (" " + config.clang + " " +
                                                 clang_tsan_cxxflags + " ")) )