Rollback changes to take a different tack.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@32488 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/Target/SubtargetFeature.h b/include/llvm/Target/SubtargetFeature.h
index 70315df484b7cbfd1846915a588e630b0b6d5925..89e6efef37664228de13e6de0a68d51f471a2259 100644 (file)
--- 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 875008deaf6c7cd09f7d0e2f523b88e8b9ef249b..ba8630f16a39f0ffbe7223226f649c16a76280df 100644 (file)
--- 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 c84c6fb15986bb9a39742120e6a46608ce4f2db6..bcdd61d3b750d7ae85f69fb7934289da8f5609fd 100644 (file)
--- 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 caff55c4e308dc37912576a266b40052e60d065c..a70dbc972878020476b70d9ce442655f96054012 100644 (file)
--- 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";