aboutsummaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
authorAnton Korobeynikov <asl@math.spbu.ru>2009-05-23 19:50:50 +0000
committerAnton Korobeynikov <asl@math.spbu.ru>2009-05-23 19:50:50 +0000
commit7357d8f48490c42cf6237c3a8f982a36258248db (patch)
tree84e4c7c067cf7671696a466e471ce202604ffb81 /utils
parentdc3e36dd1f8485f55a28fac99fa23a5bfb011e61 (diff)
downloadexternal_llvm-7357d8f48490c42cf6237c3a8f982a36258248db.zip
external_llvm-7357d8f48490c42cf6237c3a8f982a36258248db.tar.gz
external_llvm-7357d8f48490c42cf6237c3a8f982a36258248db.tar.bz2
Propagate CPU string out of SubtargetFeatures
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@72335 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'utils')
-rw-r--r--utils/TableGen/SubtargetEmitter.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/utils/TableGen/SubtargetEmitter.cpp b/utils/TableGen/SubtargetEmitter.cpp
index cb36a76..a28e8bc 100644
--- a/utils/TableGen/SubtargetEmitter.cpp
+++ b/utils/TableGen/SubtargetEmitter.cpp
@@ -451,7 +451,7 @@ void SubtargetEmitter::ParseFeaturesFunction(std::ostream &OS) {
OS << "// ParseSubtargetFeatures - Parses features string setting specified\n"
<< "// subtarget options.\n"
- << "void llvm::";
+ << "std::string llvm::";
OS << Target;
OS << "Subtarget::ParseSubtargetFeatures(const std::string &FS,\n"
<< " const std::string &CPU) {\n"
@@ -481,11 +481,12 @@ void SubtargetEmitter::ParseFeaturesFunction(std::ostream &OS) {
<< "Features.getInfo(ProcItinKV, ProcItinKVSize);\n"
<< " InstrItins = InstrItineraryData(Stages, Itinerary);\n";
}
-
- OS << "}\n";
+
+ OS << " return Features.getCPU();\n"
+ << "}\n";
}
-//
+//
// SubtargetEmitter::run - Main subtarget enumeration emitter.
//
void SubtargetEmitter::run(std::ostream &OS) {