Reverting r199886 (Prevent repetitive warnings for unrecognized processors and features)

[oota-llvm.git] / lib / MC / MCSubtargetInfo.cpp

diff --git a/lib/MC/MCSubtargetInfo.cpp b/lib/MC/MCSubtargetInfo.cpp
index ead7aa96d14b9d0c464790d7efd290b0ab9ca3db..8d8e2900b678cc919b05a26c3d695b5e5d8abe3b 100644 (file)
--- a/lib/MC/MCSubtargetInfo.cpp
+++ b/lib/MC/MCSubtargetInfo.cpp
@@ -96,11 +96,14 @@ MCSubtargetInfo::getSchedModelForCPU(StringRef CPU) const {
 #endif
 
   // Find entry
-  const SubtargetInfoKV *Found = SubtargetFeatures::Find(CPU, ProcSchedModels,
-                                                         NumProcs, "processor");
-  if (!Found)
+  const SubtargetInfoKV *Found =
+    std::lower_bound(ProcSchedModels, ProcSchedModels+NumProcs, CPU);
+  if (Found == ProcSchedModels+NumProcs || StringRef(Found->Key) != CPU) {
+    errs() << "'" << CPU
+           << "' is not a recognized processor for this target"
+           << " (ignoring processor)\n";
     return &MCSchedModel::DefaultSchedModel;
-
+  }
   assert(Found->Value && "Missing processor SchedModel value");
   return (const MCSchedModel *)Found->Value;
 }