Reapply r176133 with testcase fixes.

llvm-svn: 176145

1 files changed, 0 insertions, 13 deletions

diff --git a/clang/lib/CodeGen/CGCall.cpp b/clang/lib/CodeGen/CGCall.cpp
index 33b0475c564..3bcf7d0f50a 100644
--- a/clang/lib/CodeGen/CGCall.cpp
+++ b/clang/lib/CodeGen/CGCall.cpp
@@ -1021,19 +1021,6 @@ void CodeGenModule::ConstructAttributeList(const CGFunctionInfo &FI,
     // Attributes that should go on the call site only.
     if (!CodeGenOpts.SimplifyLibCalls)
       FuncAttrs.addAttribute(llvm::Attribute::NoBuiltin);
-  } else {
-    // Attributes that should go on the function, but not the call site.
-    if (!TargetOpts.CPU.empty())
-      FuncAttrs.addAttribute("target-cpu", TargetOpts.CPU);
-
-    if (TargetOpts.Features.size()) {
-      llvm::SubtargetFeatures Features;
-      for (std::vector<std::string>::const_iterator
-             it = TargetOpts.Features.begin(),
-             ie = TargetOpts.Features.end(); it != ie; ++it)
-        Features.AddFeature(*it);
-      FuncAttrs.addAttribute("target-features", Features.getString());
-    }
   }
 
   QualType RetTy = FI.getReturnType();