Added two SubtargetFeatures::AddFeatures methods, which accept a comma-separated string or already parsed command line parameters as input, and some code re-factoring to use these new methods.

llvm-svn: 89516

1 files changed, 10 insertions, 3 deletions

diff --git a/llvm/tools/lto/LTOCodeGenerator.cpp b/llvm/tools/lto/LTOCodeGenerator.cpp
index 0b9cb2952e8..f079c2e3601 100644
--- a/llvm/tools/lto/LTOCodeGenerator.cpp
+++ b/llvm/tools/lto/LTOCodeGenerator.cpp
@@ -304,10 +304,17 @@ bool LTOCodeGenerator::determineTarget(std::string& errMsg)
             break;
         }
 
+        // Prepare subtarget feature set for the given command line options.
+        SubtargetFeatures features;
+
+        // Set the rest of features by default.
+        // Note: Please keep this after all explict feature settings to make sure
+        // defaults will not override explicitly set options.
+        features.AddFeatures(
+            SubtargetFeatures::getDefaultSubtargetFeatures(llvm::Triple(Triple)));
+
         // construct LTModule, hand over ownership of module and target
-        const std::string FeatureStr = 
-            SubtargetFeatures::getDefaultSubtargetFeatures(llvm::Triple(Triple));
-        _target = march->createTargetMachine(Triple, FeatureStr);
+        _target = march->createTargetMachine(Triple, features.getString());
     }
     return false;
 }