--- a/test/lit.cfg	Tue Oct 13 17:49:56 2015 +0900
+++ b/test/lit.cfg	Tue Jan 26 22:53:40 2016 +0900
@@ -194,6 +194,7 @@
 config.substitutions.append( ('%shlibext', config.llvm_shlib_ext) )
 config.substitutions.append( ('%exeext', config.llvm_exe_ext) )
 config.substitutions.append( ('%python', config.python_executable) )
+config.substitutions.append( ('%host_cc', config.host_cc) )
 
 # OCaml substitutions.
 # Support tests for both native and bytecode builds.
@@ -236,10 +237,14 @@
     tool_path = lit_config.params.get(tool_name)
     if tool_path is None:
         tool_path = lit.util.which(tool_name, llvm_tools_dir)
+        if tool_path is None:
+            return tool_name, tool_path, tool_pipe
     if (tool_name == "llc" and
        'LLVM_ENABLE_MACHINE_VERIFIER' in os.environ and
        os.environ['LLVM_ENABLE_MACHINE_VERIFIER'] == "1"):
         tool_path += " -verify-machineinstrs"
+    if (tool_name == "llvm-go"):
+        tool_path += " go=" + config.go_executable
     return tool_name, tool_path, tool_pipe
 
 
@@ -272,9 +277,12 @@
                 r"\bllvm-split\b",
                 r"\bllvm-tblgen\b",
                 r"\bllvm-c-test\b",
+                NOJUNK + r"\bllvm-symbolizer\b",
                 NOJUNK + r"\bopt\b",
                 r"\bFileCheck\b",
                 r"\bobj2yaml\b",
+                NOJUNK + r"\bsancov\b",
+                NOJUNK + r"\bsanstats\b",
                 r"\byaml2obj\b",
                 r"\byaml-bench\b",
                 r"\bverify-uselistorder\b",
@@ -335,6 +343,8 @@
 if (config.llvm_use_sanitizer == "Memory" or
         config.llvm_use_sanitizer == "MemoryWithOrigins"):
     config.available_features.add("msan")
+else:
+    config.available_features.add("not_msan")
 if config.llvm_use_sanitizer == "Undefined":
     config.available_features.add("ubsan")
 else:
@@ -345,8 +355,7 @@
     config.available_features.add("long_tests")
 
 # Direct object generation
-# Suppress x86_64-mingw32 while investigating since r219108.
-if not 'hexagon' in config.target_triple and not re.match(r'^x86_64.*-(mingw32|windows-gnu|win32)', config.target_triple):
+if not 'hexagon' in config.target_triple:
     config.available_features.add("object-emission")
 
 if config.have_zlib == "1":
@@ -358,6 +367,8 @@
 # Some tests are "generic" and require a valid default triple
 if config.target_triple:
     config.available_features.add("default_triple")
+    if re.match(r'^x86_64.*-linux', config.target_triple):
+      config.available_features.add("x86_64-linux")
 
 # Native compilation: host arch == default triple arch
 # FIXME: Consider cases that target can be executed