3 files changed, 4 insertions, 12 deletions
diff --git a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp
index 9df0d9437d0..47e6ddb208c 100644
--- a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp
+++ b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVM.cpp
@@ -767,13 +767,13 @@ DisassemblerLLVM::Terminate()
 const char *
 DisassemblerLLVM::GetPluginNameStatic()
 {
-    return "llvm";
+    return "llvm-edis";
 }
 
 const char *
 DisassemblerLLVM::GetPluginDescriptionStatic()
 {
-    return "Disassembler that uses LLVM opcode tables to disassemble i386, x86_64 and ARM.";
+    return "Disassembler that uses the LLVM enhanced disassembler to disassemble i386, x86_64 and ARM.";
 }
 
 //------------------------------------------------------------------
diff --git a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp
index 2667ff0d456..cd8a1352d19 100644
--- a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp
+++ b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp
@@ -541,13 +541,13 @@ DisassemblerLLVMC::Terminate()
 const char *
 DisassemblerLLVMC::GetPluginNameStatic()
 {
-    return "llvm";
+    return "llvm-mc";
 }
 
 const char *
 DisassemblerLLVMC::GetPluginDescriptionStatic()
 {
-    return "Disassembler that uses LLVM opcode tables to disassemble i386, x86_64 and ARM.";
+    return "Disassembler that uses LLVM MC to disassemble i386, x86_64 and ARM.";
 }
 
 int DisassemblerLLVMC::OpInfoCallback (void *DisInfo,
diff --git a/lldb/source/lldb.cpp b/lldb/source/lldb.cpp
index fb377b2228a..a4d0f571b58 100644
--- a/lldb/source/lldb.cpp
+++ b/lldb/source/lldb.cpp
@@ -73,8 +73,6 @@
 using namespace lldb;
 using namespace lldb_private;
 
-#define USE_NEW_DISASSEMBLER
-
 void
 lldb_private::Initialize ()
 {
@@ -93,11 +91,8 @@ lldb_private::Initialize ()
         ABIMacOSX_i386::Initialize();
         ABIMacOSX_arm::Initialize();
         ABISysV_x86_64::Initialize();
-#if defined (USE_NEW_DISASSEMBLER)
         DisassemblerLLVMC::Initialize();
-#else
         DisassemblerLLVM::Initialize();
-#endif
         ObjectContainerBSDArchive::Initialize();
         ObjectFileELF::Initialize();
         SymbolFileDWARF::Initialize();
@@ -172,11 +167,8 @@ lldb_private::Terminate ()
     ABIMacOSX_i386::Terminate();
     ABIMacOSX_arm::Terminate();
     ABISysV_x86_64::Terminate();
-#if defined (USE_NEW_DISASSEMBLER)
     DisassemblerLLVMC::Terminate();
-#else
     DisassemblerLLVM::Terminate();
-#endif
     ObjectContainerBSDArchive::Terminate();
     ObjectFileELF::Terminate();
     SymbolFileDWARF::Terminate();