Vendor import of lldb trunk r306956:vendor/lldb/lldb-trunk-r306956

https://llvm.org/svn/llvm-project/lldb/trunk@306956

3 files changed, 5 insertions, 5 deletions

diff --git a/tools/debugserver/source/RNBRemote.cpp b/tools/debugserver/source/RNBRemote.cpp
index 038142a0351e..cf6b4b626914 100644
--- a/tools/debugserver/source/RNBRemote.cpp
+++ b/tools/debugserver/source/RNBRemote.cpp
@@ -6058,7 +6058,7 @@ rnb_err_t RNBRemote::HandlePacket_qProcessInfo(const char *p) {
         // need to override the host cpusubtype (which is in the
         // CPU_SUBTYPE_ARM64 subtype namespace)
         // with a reasonable CPU_SUBTYPE_ARMV7 subtype.
-        cpusubtype = 11; // CPU_SUBTYPE_ARM_V7S
+        cpusubtype = 12; // CPU_SUBTYPE_ARM_V7K
       }
     }
     rep << "cpusubtype:" << std::hex << cpusubtype << ';';
diff --git a/tools/debugserver/source/debugserver.cpp b/tools/debugserver/source/debugserver.cpp
index bc1954de334a..318e72e971a5 100644
--- a/tools/debugserver/source/debugserver.cpp
+++ b/tools/debugserver/source/debugserver.cpp
@@ -876,8 +876,8 @@ static struct option g_long_options[] = {
      'u'}, // If we need to handshake with our parent process, an option will be
            // passed down that specifies a unix socket name to use
     {"fd", required_argument, NULL,
-     'FDSC'}, // A file descriptor was passed to this process when spawned that
-              // is already open and ready for communication
+     '2'}, // A file descriptor was passed to this process when spawned that
+           // is already open and ready for communication
     {"named-pipe", required_argument, NULL, 'P'},
     {"reverse-connect", no_argument, NULL, 'R'},
     {"env", required_argument, NULL,
@@ -1261,7 +1261,7 @@ int main(int argc, char *argv[]) {
       }
       break;
 
-    case 'FDSC':
+    case '2':
       // File descriptor passed to this process during fork/exec and is already
       // open and ready for communication.
       communication_fd = atoi(optarg);
diff --git a/tools/lldb-server/Acceptor.h b/tools/lldb-server/Acceptor.h
index 207bb4d973a5..7d1a5695a364 100644
--- a/tools/lldb-server/Acceptor.h
+++ b/tools/lldb-server/Acceptor.h
@@ -9,8 +9,8 @@
 #ifndef lldb_server_Acceptor_h_
 #define lldb_server_Acceptor_h_
 
-#include "lldb/Core/Connection.h"
 #include "lldb/Host/Socket.h"
+#include "lldb/Utility/Connection.h"
 #include "lldb/Utility/Status.h"
 
 #include <functional>