diff --git a/include/clang/Basic/Attr.td b/include/clang/Basic/Attr.td
index 6f10ee62723d8b11a692f7807e1b73936b733e5c..8523ed92a7104f0afeeacee6d5f462d245b4f211 100644
--- a/include/clang/Basic/Attr.td
+++ b/include/clang/Basic/Attr.td
@@ -1315,9 +1315,52 @@ def Pascal : InheritableAttr {
 
 def Target : InheritableAttr {
   let Spellings = [GCC<"target">];
-  let Args = [StringArgument<"features">];
+  let Args = [StringArgument<"featuresStr">];
   let Subjects = SubjectList<[Function], ErrorDiag>;
   let Documentation = [TargetDocs];
+  let AdditionalMembers = [{
+    StringRef CPU;
+    std::vector<std::string> Features;
+    bool Parsed = false;
+    StringRef getCPU() {
+      if (!Parsed)
+        parse();
+      return CPU;
+    }
+    std::vector<std::string> &getFeatures() {
+      if (!Parsed)
+        parse();
+      return Features;
+    }
+    void parse() {
+      SmallVector<StringRef, 1> AttrFeatures;
+      getFeaturesStr().split(AttrFeatures, ",");
+
+      // Grab the various features and prepend a "+" to turn on the feature to
+      // the backend and add them to our existing set of features.
+      for (auto &Feature : AttrFeatures) {
+        // Go ahead and trim whitespace rather than either erroring or
+        // accepting it weirdly.
+        Feature = Feature.trim();
+
+        // We don't support cpu tuning this way currently.
+        // TODO: Support the fpmath option. It will require checking
+        // overall feature validity for the function with the rest of the
+        // attributes on the function.
+        if (Feature.startswith("fpmath=") || Feature.startswith("tune="))
+	  continue;
+
+        // While we're here iterating check for a different target cpu.
+        if (Feature.startswith("arch="))
+          CPU = Feature.split("=").second.trim();
+        else if (Feature.startswith("no-"))
+          Features.push_back("-" + Feature.split("-").second.str());
+        else
+          Features.push_back("+" + Feature.str());
+      }
+      Parsed = true;
+    }
+  }];
 }
 
 def TransparentUnion : InheritableAttr {
diff --git a/lib/CodeGen/CGCall.cpp b/lib/CodeGen/CGCall.cpp
index 270d9941ec8a0837eeb4cb5184302f22ab94588e..ed7bf60c024c1373717157af1f270f9f8ded5d21 100644
--- a/lib/CodeGen/CGCall.cpp
+++ b/lib/CodeGen/CGCall.cpp
@@ -1499,40 +1499,19 @@ void CodeGenModule::ConstructAttributeList(const CGFunctionInfo &FI,
     const FunctionDecl *FD = dyn_cast_or_null<FunctionDecl>(TargetDecl);
     if (FD && FD->hasAttr<TargetAttr>()) {
       llvm::StringMap<bool> FeatureMap;
-      const auto *TD = FD->getAttr<TargetAttr>();
+      auto *TD = FD->getAttr<TargetAttr>();
 
       // Make a copy of the features as passed on the command line.
       std::vector<std::string> FnFeatures =
           getTarget().getTargetOpts().FeaturesAsWritten;
 
-      // Grab the target attribute string.
-      StringRef FeaturesStr = TD->getFeatures();
-      SmallVector<StringRef, 1> AttrFeatures;
-      FeaturesStr.split(AttrFeatures, ",");
-
-      // Grab the various features and prepend a "+" to turn on the feature to
-      // the backend and add them to our existing set of features.
-      for (auto &Feature : AttrFeatures) {
-        // Go ahead and trim whitespace rather than either erroring or
-        // accepting it weirdly.
-        Feature = Feature.trim();
-
-        // While we're here iterating check for a different target cpu.
-        if (Feature.startswith("arch="))
-          TargetCPU = Feature.split("=").second.trim();
-        else if (Feature.startswith("tune="))
-          // We don't support cpu tuning this way currently.
-          ;
-        else if (Feature.startswith("fpmath="))
-          // TODO: Support the fpmath option this way. It will require checking
-          // overall feature validity for the function with the rest of the
-          // attributes on the function.
-          ;
-        else if (Feature.startswith("no-"))
-          FnFeatures.push_back("-" + Feature.split("-").second.str());
-        else
-          FnFeatures.push_back("+" + Feature.str());
-      }
+      std::vector<std::string> &AttrFeatures = TD->getFeatures();
+      std::copy(AttrFeatures.begin(), AttrFeatures.end(),
+                std::back_inserter(FnFeatures));
+
+      if (TD->getCPU() != "")
+	TargetCPU = TD->getCPU();
+
       // Now populate the feature map, first with the TargetCPU which is either
       // the default or a new one from the target attribute string. Then we'll
       // use the passed in features (FeaturesAsWritten) along with the new ones