A while back in revison 244716 we added support for getting the host OS version info from debugserver. We added keys to "qHostInfo" that were "osmajor", "osminor" and "ospatch", but no one ever parsed those, so I am removing them from debugserver. We accidentally also added a "version" key to qHostInfo instead of "os_version". So now we need to support both "version" and "os_version" in qHostInfo since we have debugserver binaries out in the wild that support this old packet type. I have updated debugserver ot use the correct "os_version" for future compatability or correctness.

<rdar://problem/24378699> 

llvm-svn: 259003

1 files changed, 2 insertions, 1 deletions

diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp
index c0ea9cceea2..9cb0b3e50d4 100644
--- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp
+++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp
@@ -2064,7 +2064,8 @@ GDBRemoteCommunicationClient::GetHostInfo (bool force)
                         if (pointer_byte_size != 0)
                             ++num_keys_decoded;
                     }
-                    else if (name.compare("os_version") == 0)
+                    else if ((name.compare("os_version") == 0) ||
+                             (name.compare("version") == 0)) // Older debugserver binaries used the "version" key instead of "os_version"...
                     {
                         Args::StringToVersion (value.c_str(), 
                                                m_os_version_major,