diff options
author | Viktor Kutuzov <vkutuzov@accesssoftek.com> | 2009-11-25 22:44:18 +0000 |
---|---|---|
committer | Viktor Kutuzov <vkutuzov@accesssoftek.com> | 2009-11-25 22:44:18 +0000 |
commit | 308f6630a3f413ab32763bc78ab7802df372751d (patch) | |
tree | a3d9619398e9cfbe6b6ceeb1fa850fc90a982326 | |
parent | e7c9195706ce17b5016f74005ecab5523519deea (diff) | |
download | external_llvm-308f6630a3f413ab32763bc78ab7802df372751d.zip external_llvm-308f6630a3f413ab32763bc78ab7802df372751d.tar.gz external_llvm-308f6630a3f413ab32763bc78ab7802df372751d.tar.bz2 |
Rollback changes r89516: 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.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@89893 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | include/llvm/Target/SubtargetFeature.h | 7 | ||||
-rw-r--r-- | lib/Target/SubtargetFeature.cpp | 27 | ||||
-rw-r--r-- | tools/lto/LTOCodeGenerator.cpp | 13 |
3 files changed, 3 insertions, 44 deletions
diff --git a/include/llvm/Target/SubtargetFeature.h b/include/llvm/Target/SubtargetFeature.h index fb5dba1..38a3cc2 100644 --- a/include/llvm/Target/SubtargetFeature.h +++ b/include/llvm/Target/SubtargetFeature.h @@ -22,7 +22,6 @@ #include <vector> #include <cstring> #include "llvm/ADT/Triple.h" -#include "llvm/Support/CommandLine.h" #include "llvm/System/DataTypes.h" namespace llvm { @@ -94,12 +93,6 @@ public: /// Adding Features. void AddFeature(const std::string &String, bool IsEnabled = true); - /// Add a set of features from the comma-separated string. - void AddFeatures(const std::string &String); - - /// Add a set of features from the parsed command line parameters. - void AddFeatures(const cl::list<std::string> &List); - /// Get feature bits. uint32_t getBits(const SubtargetFeatureKV *CPUTable, size_t CPUTableSize, diff --git a/lib/Target/SubtargetFeature.cpp b/lib/Target/SubtargetFeature.cpp index 1085668..590574e 100644 --- a/lib/Target/SubtargetFeature.cpp +++ b/lib/Target/SubtargetFeature.cpp @@ -110,33 +110,6 @@ void SubtargetFeatures::AddFeature(const std::string &String, } } -/// Add a set of features from the comma-separated string. -void SubtargetFeatures::AddFeatures(const std::string &String) -{ - std::vector<std::string> _Features; - - Split(_Features, String); - // Nothing is specified. - if (_Features.size() == 0) - return; - - for (std::vector<std::string>::iterator it = _Features.begin(), - end = _Features.end(); it != end; ++it) { - // AddFeature will take care of feature string normalization. - AddFeature(*it); - } -} - -/// Add a set of features from the parsed command line parameters. -void SubtargetFeatures::AddFeatures(const cl::list<std::string> &List) -{ - for (cl::list<std::string>::const_iterator it = List.begin(), - end = List.end(); it != end; ++it) { - // AddFeature will take care of feature string normalization. - AddFeature(*it); - } -} - /// Find KV in array using binary search. template<typename T> const T *Find(const std::string &S, const T *A, size_t L) { // Make the lower bound element we're looking for diff --git a/tools/lto/LTOCodeGenerator.cpp b/tools/lto/LTOCodeGenerator.cpp index f079c2e..060fc4f 100644 --- a/tools/lto/LTOCodeGenerator.cpp +++ b/tools/lto/LTOCodeGenerator.cpp @@ -304,17 +304,10 @@ 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 - _target = march->createTargetMachine(Triple, features.getString()); + const std::string FeatureStr = + SubtargetFeatures::getDefaultSubtargetFeatures(llvm::Triple(Triple)); + _target = march->createTargetMachine(Triple, FeatureStr); } return false; } |