Index: test/msan/fork.cc
===================================================================
--- test/msan/fork.cc
+++ test/msan/fork.cc
@@ -10,6 +10,9 @@
 // a kernel bug:
 // https://lkml.org/lkml/2014/2/17/324
 
+// Big-endian mips64 currently hangs on this test. Mark it unsupported to allow
+// llvm-lit to finish.
+// UNSUPPORTED: mips64-arch
 
 #include <pthread.h>
 #include <unistd.h>
Index: test/msan/lit.cfg
===================================================================
--- test/msan/lit.cfg
+++ test/msan/lit.cfg
@@ -26,6 +26,8 @@
 config.substitutions.append( ("%clang_msan ", build_invocation(clang_msan_cflags)) )
 config.substitutions.append( ("%clangxx_msan ", build_invocation(clang_msan_cxxflags)) )
 
+config.available_features.add(config.target_arch + '-arch')
+
 # Default test suffixes.
 config.suffixes = ['.c', '.cc', '.cpp']
 
Index: test/msan/lit.site.cfg.in
===================================================================
--- test/msan/lit.site.cfg.in
+++ test/msan/lit.site.cfg.in
@@ -6,6 +6,7 @@
 
 # Tool-specific config options.
 config.name_suffix = "@MSAN_TEST_CONFIG_SUFFIX@"
+config.target_arch = "@arch@"
 config.target_cflags = "@MSAN_TEST_TARGET_CFLAGS@"
 # Load tool-specific config that would do the real work.
 lit_config.load_config(config, "@MSAN_LIT_SOURCE_DIR@/lit.cfg")