Index: lldb/trunk/source/Plugins/ABI/MacOSX-arm64/ABIMacOSX_arm64.h
===================================================================
--- lldb/trunk/source/Plugins/ABI/MacOSX-arm64/ABIMacOSX_arm64.h
+++ lldb/trunk/source/Plugins/ABI/MacOSX-arm64/ABIMacOSX_arm64.h
@@ -106,9 +106,6 @@
         return GetPluginNameStatic();
     }
 
-    virtual const char *
-    GetShortPluginName();
-    
     virtual uint32_t
     GetPluginVersion();
     
Index: lldb/trunk/source/Plugins/ABI/MacOSX-arm64/ABIMacOSX_arm64.cpp
===================================================================
--- lldb/trunk/source/Plugins/ABI/MacOSX-arm64/ABIMacOSX_arm64.cpp
+++ lldb/trunk/source/Plugins/ABI/MacOSX-arm64/ABIMacOSX_arm64.cpp
@@ -36,7 +36,6 @@
 using namespace lldb_private;
 
 static const char *pluginDesc = "Mac OS X ABI for arm64 targets";
-static const char *pluginShort = "abi.macosx-arm64";
 
 
 static RegisterInfo g_register_infos[] = 
@@ -1092,12 +1091,6 @@
     return g_plugin_name;
 }
 
-const char *
-ABIMacOSX_arm64::GetShortPluginName()
-{
-    return pluginShort;
-}
-
 uint32_t
 ABIMacOSX_arm64::GetPluginVersion()
 {
Index: lldb/trunk/source/Plugins/Instruction/ARM64/EmulateInstructionARM64.h
===================================================================
--- lldb/trunk/source/Plugins/Instruction/ARM64/EmulateInstructionARM64.h
+++ lldb/trunk/source/Plugins/Instruction/ARM64/EmulateInstructionARM64.h
@@ -53,12 +53,6 @@
     virtual lldb_private::ConstString
     GetPluginName();
 
-    virtual lldb_private::ConstString
-    GetShortPluginName()
-    {
-        return GetPluginNameStatic();
-    }
-
     virtual uint32_t
     GetPluginVersion()
     {
Index: lldb/trunk/source/Plugins/Instruction/MIPS/EmulateInstructionMIPS.h
===================================================================
--- lldb/trunk/source/Plugins/Instruction/MIPS/EmulateInstructionMIPS.h
+++ lldb/trunk/source/Plugins/Instruction/MIPS/EmulateInstructionMIPS.h
@@ -63,12 +63,6 @@
     lldb_private::ConstString
     GetPluginName() override;
 
-    virtual lldb_private::ConstString
-    GetShortPluginName()
-    {
-        return GetPluginNameStatic();
-    }
-
     uint32_t
     GetPluginVersion() override
     {
Index: lldb/trunk/source/Plugins/Instruction/MIPS64/EmulateInstructionMIPS64.h
===================================================================
--- lldb/trunk/source/Plugins/Instruction/MIPS64/EmulateInstructionMIPS64.h
+++ lldb/trunk/source/Plugins/Instruction/MIPS64/EmulateInstructionMIPS64.h
@@ -63,12 +63,6 @@
     virtual lldb_private::ConstString
     GetPluginName();
 
-    virtual lldb_private::ConstString
-    GetShortPluginName()
-    {
-        return GetPluginNameStatic();
-    }
-
     virtual uint32_t
     GetPluginVersion()
     {