diff options
Diffstat (limited to 'lldb/source/Plugins')
3 files changed, 3 insertions, 10 deletions
diff --git a/lldb/source/Plugins/Platform/MacOSX/PlatformMacOSX.cpp b/lldb/source/Plugins/Platform/MacOSX/PlatformMacOSX.cpp index d86ac4e0e90..225159347e2 100644 --- a/lldb/source/Plugins/Platform/MacOSX/PlatformMacOSX.cpp +++ b/lldb/source/Plugins/Platform/MacOSX/PlatformMacOSX.cpp @@ -80,7 +80,7 @@ const char * PlatformMacOSX::GetShortPluginNameStatic (bool is_host) { if (is_host) - return "local-macosx"; + return Platform::GetHostPlatformName (); else return "remote-macosx"; } diff --git a/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp b/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp index f8b67a31280..66534c3d323 100644 --- a/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp +++ b/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp @@ -312,7 +312,7 @@ PlatformRemoteGDBServer::LaunchProcess (ProcessLaunchInfo &launch_info) break; } } - const uint32_t old_packet_timeout = m_gdb_client.SetPacketTimeout (3000); // TODO: lower this to 5 seconds prior to checkin!!! + const uint32_t old_packet_timeout = m_gdb_client.SetPacketTimeout (5); int arg_packet_err = m_gdb_client.SendArgumentsPacket (argv); m_gdb_client.SetPacketTimeout (old_packet_timeout); if (arg_packet_err == 0) diff --git a/lldb/source/Plugins/SymbolFile/DWARF/LogChannelDWARF.cpp b/lldb/source/Plugins/SymbolFile/DWARF/LogChannelDWARF.cpp index 9e9f6442071..aa43d4fe933 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/LogChannelDWARF.cpp +++ b/lldb/source/Plugins/SymbolFile/DWARF/LogChannelDWARF.cpp @@ -54,16 +54,9 @@ LogChannelDWARF::CreateInstance () const char * LogChannelDWARF::GetPluginNameStatic() { - static std::string g_plugin_name; - if (g_plugin_name.empty()) - { - g_plugin_name = SymbolFileDWARF::GetPluginNameStatic(); - g_plugin_name += LogChannel::GetPluginSuffix (); - } - return g_plugin_name.c_str(); + return SymbolFileDWARF::GetPluginNameStatic(); } - const char * LogChannelDWARF::GetPluginDescriptionStatic() { |
