Index: test/asan/TestCases/Linux/local_alias.cc
===================================================================
--- test/asan/TestCases/Linux/local_alias.cc
+++ test/asan/TestCases/Linux/local_alias.cc
@@ -6,7 +6,7 @@
 //
 // FIXME: https://github.com/google/sanitizers/issues/316
 // XFAIL: android
-// XFAIL: mips64
+// XFAIL: target-is-mips64
 //
 // RUN: %clangxx_asan -DBUILD_INSTRUMENTED_DSO=1 -fPIC -shared -mllvm -asan-use-private-alias %s -o %t-INSTRUMENTED-SO.so
 // RUN: %clangxx -DBUILD_UNINSTRUMENTED_DSO=1 -fPIC -shared %s -o %t-UNINSTRUMENTED-SO.so
Index: test/asan/TestCases/Linux/odr-violation.cc
===================================================================
--- test/asan/TestCases/Linux/odr-violation.cc
+++ test/asan/TestCases/Linux/odr-violation.cc
@@ -1,6 +1,6 @@
 // FIXME: https://code.google.com/p/address-sanitizer/issues/detail?id=316
 // XFAIL: android
-// XFAIL: mips64
+// XFAIL: target-is-mips64
 //
 // We use fast_unwind_on_malloc=0 to have full unwinding even w/o frame
 // pointers. This setting is not on by default because it's too expensive.
Index: test/lit.common.configured.in
===================================================================
--- test/lit.common.configured.in
+++ test/lit.common.configured.in
@@ -28,6 +28,7 @@
 set_default("sanitizer_can_use_cxxabi", @SANITIZER_CAN_USE_CXXABI_PYBOOL@)
 set_default("has_lld", @COMPILER_RT_HAS_LLD_SOURCES_PYBOOL@)
 set_default("can_symbolize", @CAN_SYMBOLIZE@)
+config.available_features.add('target-is-%s' % config.target_arch)
 
 # LLVM tools dir can be passed in lit parameters, so try to
 # apply substitution.
Index: test/tsan/ignore_lib4.cc
===================================================================
--- test/tsan/ignore_lib4.cc
+++ test/tsan/ignore_lib4.cc
@@ -4,7 +4,7 @@
 // RUN: %env_tsan_opts=suppressions='%t.supp' %run %t 2>&1 | FileCheck %s
 
 // Longjmp assembly has not been implemented for mips64 yet
-// XFAIL: mips64
+// XFAIL: target-is-mips64
 // powerpc64 big endian bots failed with "FileCheck error: '-' is empty" due
 // to a segmentation fault.
 // UNSUPPORTED: powerpc64-unknown-linux-gnu
Index: test/tsan/longjmp.cc
===================================================================
--- test/tsan/longjmp.cc
+++ test/tsan/longjmp.cc
@@ -1,7 +1,7 @@
 // RUN: %clang_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
 
 // Longjmp assembly has not been implemented for mips64 yet
-// XFAIL: mips64
+// XFAIL: target-is-mips64
 
 #include <stdio.h>
 #include <stdlib.h>
Index: test/tsan/longjmp2.cc
===================================================================
--- test/tsan/longjmp2.cc
+++ test/tsan/longjmp2.cc
@@ -1,7 +1,7 @@
 // RUN: %clang_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
 
 // Longjmp assembly has not been implemented for mips64 yet
-// XFAIL: mips64
+// XFAIL: target-is-mips64
 
 #include <stdio.h>
 #include <stdlib.h>
Index: test/tsan/longjmp3.cc
===================================================================
--- test/tsan/longjmp3.cc
+++ test/tsan/longjmp3.cc
@@ -1,7 +1,7 @@
 // RUN: %clang_tsan -O1 %s -o %t && %deflake %run %t 2>&1 | FileCheck %s
 
 // Longjmp assembly has not been implemented for mips64 yet
-// XFAIL: mips64
+// XFAIL: target-is-mips64
 
 #include <pthread.h>
 #include <stdio.h>
Index: test/tsan/longjmp4.cc
===================================================================
--- test/tsan/longjmp4.cc
+++ test/tsan/longjmp4.cc
@@ -1,7 +1,7 @@
 // RUN: %clang_tsan -O1 %s -o %t && %deflake %run %t 2>&1 | FileCheck %s
 
 // Longjmp assembly has not been implemented for mips64 yet
-// XFAIL: mips64
+// XFAIL: target-is-mips64
 
 #include <pthread.h>
 #include <stdio.h>
Index: test/tsan/map32bit.cc
===================================================================
--- test/tsan/map32bit.cc
+++ test/tsan/map32bit.cc
@@ -8,7 +8,7 @@
 // https://github.com/google/sanitizers/issues/412
 
 // MAP_32BIT flag for mmap is supported only for x86_64.
-// XFAIL: mips64
+// XFAIL: target-is-mips64
 // XFAIL: aarch64
 // XFAIL: powerpc64
 
Index: test/tsan/signal_longjmp.cc
===================================================================
--- test/tsan/signal_longjmp.cc
+++ test/tsan/signal_longjmp.cc
@@ -4,7 +4,7 @@
 // https://github.com/google/sanitizers/issues/482
 
 // Longjmp assembly has not been implemented for mips64 yet
-// XFAIL: mips64
+// XFAIL: target-is-mips64
 // This test fails on powerpc64 BE (VMA=44), a segmentation fault
 // error happens at the second assignment
 // "((volatile int *volatile)mem)[1] = 1".