Rollback changes to take a different tack.

llvm-svn: 32488

4 files changed, 5 insertions, 7 deletions

diff --git a/llvm/include/llvm/Target/SubtargetFeature.h b/llvm/include/llvm/Target/SubtargetFeature.h
index 70315df484b..89e6efef376 100644
--- a/llvm/include/llvm/Target/SubtargetFeature.h
+++ b/llvm/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/llvm/include/llvm/Target/TargetSubtarget.h b/llvm/include/llvm/Target/TargetSubtarget.h
index 875008deaf6..ba8630f16a3 100644
--- a/llvm/include/llvm/Target/TargetSubtarget.h
+++ b/llvm/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/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp b/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp
index c84c6fb1598..bcdd61d3b75 100644
--- a/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp
+++ b/llvm/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/llvm/utils/TableGen/SubtargetEmitter.cpp b/llvm/utils/TableGen/SubtargetEmitter.cpp
index caff55c4e30..a70dbc97287 100644
--- a/llvm/utils/TableGen/SubtargetEmitter.cpp
+++ b/llvm/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";