Upstreaming the apple internal changes that accumulated during the

previous release.  Most of the diffs are duplication in the xcode
project file caused by adding a "debugserver-mini" target.  Jim
Ingham added support for a new SPI needed to request app launches
on iOS.  Greg Clayton added code to indicate the platform of the
binary (macosx, ios, watchos, tvos) based on Mach-O load commands.
Jason Molenda added code so debugserver will identify when it is
running on a tvos/watchos device to lldb.

llvm-svn: 251091

1 files changed, 2 insertions, 2 deletions

diff --git a/lldb/tools/debugserver/source/DNB.cpp b/lldb/tools/debugserver/source/DNB.cpp
index 53b42cd267a..03c85df441d 100644
--- a/lldb/tools/debugserver/source/DNB.cpp
+++ b/lldb/tools/debugserver/source/DNB.cpp
@@ -747,7 +747,7 @@ DNBProcessAttachWait (const char *waitfor_process_name,
         if (attach_token != NULL)
         {
             nub_process_t pid;
-            pid = MachProcess::CheckForProcess(attach_token);
+            pid = MachProcess::CheckForProcess(attach_token, launch_flavor);
             if (pid != INVALID_NUB_PROCESS)
             {
                 waitfor_pid = pid;
@@ -825,7 +825,7 @@ DNBProcessAttachWait (const char *waitfor_process_name,
     }
 
     bool success = waitfor_pid != INVALID_NUB_PROCESS;
-    MachProcess::CleanupAfterAttach (attach_token, success, prepare_error);
+    MachProcess::CleanupAfterAttach (attach_token, launch_flavor, success, prepare_error);
 
     return waitfor_pid;
 }