diff --git a/llvm/include/llvm/System/Host.h b/llvm/include/llvm/System/Host.h
index 6de1a4a9befc..4fbf5c177c6e 100644
--- a/llvm/include/llvm/System/Host.h
+++ b/llvm/include/llvm/System/Host.h
@@ -14,6 +14,7 @@
 #ifndef LLVM_SYSTEM_HOST_H
 #define LLVM_SYSTEM_HOST_H
 
+#include "llvm/ADT/StringMap.h"
 #include <string>
 
 namespace llvm {
@@ -47,6 +48,18 @@ namespace sys {
   ///
   /// \return - The host CPU name, or empty if the CPU could not be determined.
   std::string getHostCPUName();
+
+  /// getHostCPUFeatures - Get the LLVM names for the host CPU features.
+  /// The particular format of the names are target dependent, and suitable for
+  /// passing as -mattr to the target which matches the host.
+  ///
+  /// \param Features - A string mapping feature names to either
+  /// true (if enabled) or false (if disabled). This routine makes no guarantees
+  /// about exactly which features may appear in this map, except that they are
+  /// all valid LLVM feature names.
+  ///
+  /// \return - True on success.
+  bool getHostCPUFeatures(StringMap<bool> &Features);
 }
 }
 
diff --git a/llvm/lib/System/Host.cpp b/llvm/lib/System/Host.cpp
index 79897e48bdaa..e7193dbce92e 100644
--- a/llvm/lib/System/Host.cpp
+++ b/llvm/lib/System/Host.cpp
@@ -299,3 +299,7 @@ std::string sys::getHostCPUName() {
   return "generic";
 }
 #endif
+
+bool sys::getHostCPUFeatures(StringMap<bool> &Features){
+  return false;
+}