Index: test/lit.cfg.py
===================================================================
--- test/lit.cfg.py
+++ test/lit.cfg.py
@@ -168,6 +168,11 @@
     config.available_features.add(arch.lower() + '-registered-target')
 
 # Features
+config.available_features.add(config.host_arch + "-host-arch")
+
+for host_arch64 in ["x86_64", "mips64", "ppc64", "aarch64"]:
+  if config.llvm_host_triple.startswith(host_arch64):
+    config.available_features.add("host-arch-is-64bit")
 
 # Others/can-execute.txt
 if sys.platform not in ['win32']:
Index: test/lit.site.cfg.py.in
===================================================================
--- test/lit.site.cfg.py.in
+++ test/lit.site.cfg.py.in
@@ -42,6 +42,7 @@
 config.build_shared_libs = @BUILD_SHARED_LIBS@
 config.link_llvm_dylib = @LLVM_LINK_LLVM_DYLIB@
 config.llvm_libxml2_enabled = "@LLVM_LIBXML2_ENABLED@"
+config.llvm_host_triple = '@LLVM_HOST_TRIPLE@'
 
 # Support substitution of the tools_dir with user parameters. This is
 # used when we can't determine the tool dir at configuration time.