lldb-git: Rebase local ProcessNetBSD to HEAD

[Kamil Rytarowski <n54%gmx.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Fri May 13 00:36:22 2016 +0200
Changeset:	f998b68b429169e1f3a04663d1c4b7c44b4b280a

Modified Files:
	lldb-git/distinfo
	lldb-git/patches/patch-source_Plugins_Process_NetBSD_ProcessMonitor.cpp
	lldb-git/patches/patch-source_Plugins_Process_NetBSD_ProcessMonitor.h

Log Message:
lldb-git: Rebase local ProcessNetBSD to HEAD

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f998b68b429169e1f3a04663d1c4b7c44b4b280a

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 lldb-git/distinfo                                      |  4 ++--
 ...ch-source_Plugins_Process_NetBSD_ProcessMonitor.cpp | 18 +++++++++---------
 ...atch-source_Plugins_Process_NetBSD_ProcessMonitor.h |  7 +++----
 3 files changed, 14 insertions(+), 15 deletions(-)

diffs:
diff --git a/lldb-git/distinfo b/lldb-git/distinfo
index 968b2f6..2d43f3f 100644
--- a/lldb-git/distinfo
+++ b/lldb-git/distinfo
@@ -26,8 +26,8 @@ SHA1 (patch-source_Plugins_Process_NetBSD_NetBSDThread.cpp) = 6669b3fc9964a44f30
 SHA1 (patch-source_Plugins_Process_NetBSD_NetBSDThread.h) = 46853f99f1ae125b01950d2081599922c9ff7ed2
 SHA1 (patch-source_Plugins_Process_NetBSD_POSIXStopInfo.cpp) = c4d75cf30086d148551ab616e7b0c6319db16224
 SHA1 (patch-source_Plugins_Process_NetBSD_POSIXStopInfo.h) = f0586c268f01a86d2a13503b2948f092cad2f2b5
-SHA1 (patch-source_Plugins_Process_NetBSD_ProcessMonitor.cpp) = 8275f84c673ec9d01aa49b94df01ec737498f3e1
-SHA1 (patch-source_Plugins_Process_NetBSD_ProcessMonitor.h) = aebe73b86331ac8c32cbcb77a6c94943b18c8447
+SHA1 (patch-source_Plugins_Process_NetBSD_ProcessMonitor.cpp) = 388a332ef2ab3ad5f6a35bc22bcf25172c4c8198
+SHA1 (patch-source_Plugins_Process_NetBSD_ProcessMonitor.h) = fe48330a6d3548b788945dbea12a5953c5bbf47b
 SHA1 (patch-source_Plugins_Process_NetBSD_ProcessNetBSD.cpp) = daf2cb6b3a07b5713b98ce933b80abb637775a7c
 SHA1 (patch-source_Plugins_Process_NetBSD_ProcessNetBSD.h) = 4b13ed147a41c433ccceeb0504fe9f0311c817d8
 SHA1 (patch-source_Plugins_Process_NetBSD_RegisterContextPOSIX.h) = 04b203f19ff50743362464c57bf3428422e11a66
diff --git a/lldb-git/patches/patch-source_Plugins_Process_NetBSD_ProcessMonitor.cpp b/lldb-git/patches/patch-source_Plugins_Process_NetBSD_ProcessMonitor.cpp
index 24ef03b..bcd9255 100644
--- a/lldb-git/patches/patch-source_Plugins_Process_NetBSD_ProcessMonitor.cpp
+++ b/lldb-git/patches/patch-source_Plugins_Process_NetBSD_ProcessMonitor.cpp
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- source/Plugins/Process/NetBSD/ProcessMonitor.cpp.orig	2016-05-04 00:54:14.452147128 +0000
+--- source/Plugins/Process/NetBSD/ProcessMonitor.cpp.orig	2016-05-12 22:23:45.173739621 +0000
 +++ source/Plugins/Process/NetBSD/ProcessMonitor.cpp
 @@ -0,0 +1,1344 @@
 +//===-- ProcessMonitor.cpp ------------------------------------ -*- C++ -*-===//
@@ -728,6 +728,8 @@ $NetBSD$
 +      m_terminal_fd(-1),
 +      m_operation(0)
 +{
++    using namespace std::placeholders;
++
 +    std::unique_ptr<LaunchArgs> args(new LaunchArgs(this, module, argv, envp,
 +                                                    stdin_file_spec,
 +                                                    stdout_file_spec,
@@ -765,7 +767,7 @@ $NetBSD$
 +
 +    // Finally, start monitoring the child process for change in state.
 +    m_monitor_thread = Host::StartMonitoringChildProcess(
-+        ProcessMonitor::MonitorCallback, this, GetPID(), true);
++        std::bind(&ProcessMonitor::MonitorCallback, this, _1, _2, _3, _4), GetPID(), true);
 +    if (!m_monitor_thread.IsJoinable())
 +    {
 +        error.SetErrorToGenericError();
@@ -782,6 +784,8 @@ $NetBSD$
 +      m_terminal_fd(-1),
 +      m_operation(0)
 +{
++    using namespace std::placeholders;
++
 +    sem_init(&m_operation_pending, 0, 0);
 +    sem_init(&m_operation_done, 0, 0);
 +
@@ -815,7 +819,7 @@ $NetBSD$
 +
 +    // Finally, start monitoring the child process for change in state.
 +    m_monitor_thread = Host::StartMonitoringChildProcess(
-+        ProcessMonitor::MonitorCallback, this, GetPID(), true);
++        std::bind(&ProcessMonitor::MonitorCallback, this, _1, _2, _3, _4), GetPID(), true);
 +    if (!m_monitor_thread.IsJoinable())
 +    {
 +        error.SetErrorToGenericError();
@@ -1066,14 +1070,10 @@ $NetBSD$
 +}
 +
 +bool
-+ProcessMonitor::MonitorCallback(void *callback_baton,
-+                                lldb::pid_t pid,
-+                                bool exited,
-+                                int signal,
-+                                int status)
++ProcessMonitor::MonitorCallback(ProcessMonitor *monitor, lldb::pid_t pid, bool exited, int signal, int status)
 +{
 +    ProcessMessage message;
-+    ProcessMonitor *monitor = static_cast<ProcessMonitor*>(callback_baton);
++
 +    ProcessNetBSD *process = monitor->m_process;
 +    assert(process);
 +    bool stop_monitoring;
diff --git a/lldb-git/patches/patch-source_Plugins_Process_NetBSD_ProcessMonitor.h b/lldb-git/patches/patch-source_Plugins_Process_NetBSD_ProcessMonitor.h
index 45486ee..bd9c07b 100644
--- a/lldb-git/patches/patch-source_Plugins_Process_NetBSD_ProcessMonitor.h
+++ b/lldb-git/patches/patch-source_Plugins_Process_NetBSD_ProcessMonitor.h
@@ -1,8 +1,8 @@
 $NetBSD$
 
---- source/Plugins/Process/NetBSD/ProcessMonitor.h.orig	2016-05-04 00:54:14.458337439 +0000
+--- source/Plugins/Process/NetBSD/ProcessMonitor.h.orig	2016-05-12 22:23:45.179633093 +0000
 +++ source/Plugins/Process/NetBSD/ProcessMonitor.h
-@@ -0,0 +1,303 @@
+@@ -0,0 +1,302 @@
 +//===-- ProcessMonitor.h -------------------------------------- -*- C++ -*-===//
 +//
 +//                     The LLVM Compiler Infrastructure
@@ -290,8 +290,7 @@ $NetBSD$
 +    DupDescriptor(const lldb_private::FileSpec &file_spec, int fd, int flags);
 +
 +    static bool
-+    MonitorCallback(void *callback_baton,
-+                    lldb::pid_t pid, bool exited, int signal, int status);
++    MonitorCallback(ProcessMonitor *monitor, lldb::pid_t pid, bool exited, int signal, int status);
 +
 +    void
 +    DoOperation(Operation *op);