Revert previous change. For some reason this went into the main branch

llvm-svn: 8805

1 files changed, 2 insertions, 19 deletions

diff --git a/llvm/lib/Target/X86/X86TargetMachine.cpp b/llvm/lib/Target/X86/X86TargetMachine.cpp
index e58ac31c7f2..60f8bbca19b 100644
--- a/llvm/lib/Target/X86/X86TargetMachine.cpp
+++ b/llvm/lib/Target/X86/X86TargetMachine.cpp
@@ -16,14 +16,6 @@
 #include "Support/Statistic.h"
 
 namespace {
-  cl::opt<RegAllocName>
-  RegAlloc("regalloc",
-           cl::desc("Register allocator to use:"), cl::Prefix,
-           cl::values(clEnumVal(simple, "simple register allocator)"),
-                      clEnumVal(local, "local register allocator"),
-                      clEnumVal(linearscan, "linear scan global register allocator")),
-           cl::init(local));
-
   cl::opt<bool> NoLocalRA("disable-local-ra",
                           cl::desc("Use Simple RA instead of Local RegAlloc"));
   cl::opt<bool> PrintCode("print-machineinstrs",
@@ -121,19 +113,10 @@ bool X86TargetMachine::addPassesToJITCompile(FunctionPassManager &PM) {
     PM.add(createMachineFunctionPrinterPass());
 
   // Perform register allocation to convert to a concrete x86 representation
-  switch (RegAlloc) {
-  case simple:
+  if (NoLocalRA)
     PM.add(createSimpleRegisterAllocator());
-    break;
-  case local:
+  else
     PM.add(createLocalRegisterAllocator());
-    break;
-  case linearscan:
-    PM.add(createLinearScanRegisterAllocator());
-    break;
-  default:
-    assert(0 && "no register allocator selected");
-  }
 
   if (PrintCode)
     PM.add(createMachineFunctionPrinterPass());