diff --git a/lib/Target/Mips/Mips.td b/lib/Target/Mips/Mips.td
index 8beb3fb8953..c4b40e24f75 100644
--- a/lib/Target/Mips/Mips.td
+++ b/lib/Target/Mips/Mips.td
@@ -33,6 +33,7 @@ def MipsInstrInfo : InstrInfo {
 // CPU Directives                                                             //
 //===----------------------------------------------------------------------===//
 
+// Not currently supported, but work as SubtargetFeature placeholder.
 def FeatureMipsIII : SubtargetFeature<"mips3", "IsMipsIII", "true",
                                       "MipsIII ISA Support">;
 
@@ -40,8 +41,9 @@ def FeatureMipsIII : SubtargetFeature<"mips3", "IsMipsIII", "true",
 // Mips processors supported.
 //===----------------------------------------------------------------------===//
 
-def : Processor<"generic", MipsGenericItineraries, []>;
-//def : Processor<"r4000",   MipsR4000Itineraries,   [FeatureMipsIII]>;
+def : Processor<"mips1", MipsGenericItineraries, []>;
+def : Processor<"r2000", MipsGenericItineraries, []>;
+def : Processor<"r3000", MipsGenericItineraries, []>;
 
 def Mips : Target {
   let InstructionSet = MipsInstrInfo;
diff --git a/lib/Target/Mips/MipsSubtarget.cpp b/lib/Target/Mips/MipsSubtarget.cpp
index 4665279df69..d7dd53b96b3 100644
--- a/lib/Target/Mips/MipsSubtarget.cpp
+++ b/lib/Target/Mips/MipsSubtarget.cpp
@@ -20,7 +20,7 @@ MipsSubtarget::MipsSubtarget(const TargetMachine &TM, const Module &M,
                              const std::string &FS) : 
   IsMipsIII(false)
 {
-  std::string CPU = "generic";
+  std::string CPU = "mips1";
 
   // Parse features string.
   ParseSubtargetFeatures(FS, CPU);