diff options
| -rw-r--r-- | include/llvm/Target/SubtargetFeature.h | 3 | ||||
| -rw-r--r-- | include/llvm/Target/TargetSubtarget.h | 3 | ||||
| -rw-r--r-- | lib/Target/PowerPC/PPCAsmPrinter.cpp | 5 | ||||
| -rw-r--r-- | utils/TableGen/SubtargetEmitter.cpp | 1 |
4 files changed, 5 insertions, 7 deletions
diff --git a/include/llvm/Target/SubtargetFeature.h b/include/llvm/Target/SubtargetFeature.h index 70315df484..89e6efef37 100644 --- a/include/llvm/Target/SubtargetFeature.h +++ b/include/llvm/Target/SubtargetFeature.h @@ -81,9 +81,6 @@ public: /// Set the CPU string. Replaces previous setting. Setting to "" clears CPU. void setCPU(const std::string &String); - /// Get the CPU string. - const std::string &getCPU() const { return Features[0]; } - /// Setting CPU string only if no string is set. void setCPUIfNone(const std::string &String); diff --git a/include/llvm/Target/TargetSubtarget.h b/include/llvm/Target/TargetSubtarget.h index 875008deaf..ba8630f16a 100644 --- a/include/llvm/Target/TargetSubtarget.h +++ b/include/llvm/Target/TargetSubtarget.h @@ -27,13 +27,10 @@ namespace llvm { class TargetSubtarget { TargetSubtarget(const TargetSubtarget&); // DO NOT IMPLEMENT void operator=(const TargetSubtarget&); // DO NOT IMPLEMENT - std::string CPU; // CPU name. protected: // Can only create subclasses... TargetSubtarget(); public: virtual ~TargetSubtarget(); - void setCPU(const std::string &C) { CPU = C; } - const std::string &getCPU() const { return CPU; } }; } // End llvm namespace diff --git a/lib/Target/PowerPC/PPCAsmPrinter.cpp b/lib/Target/PowerPC/PPCAsmPrinter.cpp index c84c6fb159..bcdd61d3b7 100644 --- a/lib/Target/PowerPC/PPCAsmPrinter.cpp +++ b/lib/Target/PowerPC/PPCAsmPrinter.cpp @@ -542,6 +542,10 @@ bool DarwinAsmPrinter::runOnMachineFunction(MachineFunction &MF) { bool DarwinAsmPrinter::doInitialization(Module &M) { +#if 1 + if (Subtarget.isGigaProcessor()) + O << "\t.machine ppc970\n"; +#else const std::string &CPU = Subtarget.getCPU(); if (CPU != "generic") @@ -554,6 +558,7 @@ bool DarwinAsmPrinter::doInitialization(Module &M) { O << "\t.machine ppc7400\n"; else O << "\t.machine ppc\n"; +#endif AsmPrinter::doInitialization(M); diff --git a/utils/TableGen/SubtargetEmitter.cpp b/utils/TableGen/SubtargetEmitter.cpp index caff55c4e3..a70dbc9728 100644 --- a/utils/TableGen/SubtargetEmitter.cpp +++ b/utils/TableGen/SubtargetEmitter.cpp @@ -460,7 +460,6 @@ void SubtargetEmitter::ParseFeaturesFunction(std::ostream &OS) { " const std::string &CPU) {\n" " SubtargetFeatures Features(FS);\n" " Features.setCPUIfNone(CPU);\n" - " setCPU(Features.getCPU());\n" " uint32_t Bits = Features.getBits(SubTypeKV, SubTypeKVSize,\n" " FeatureKV, FeatureKVSize);\n"; |