The Linux process plugin wasn't returning the correct linux signals. This fixes that.

Thus, this patch also negates a previous fix for handling SIGCHLD.

llvm-svn: 182166

2 files changed, 9 insertions, 11 deletions

diff --git a/lldb/source/Plugins/Process/Linux/ProcessLinux.h b/lldb/source/Plugins/Process/Linux/ProcessLinux.h
index e65f1fac8b7..7e8b593d603 100644
--- a/lldb/source/Plugins/Process/Linux/ProcessLinux.h
+++ b/lldb/source/Plugins/Process/Linux/ProcessLinux.h
@@ -75,6 +75,15 @@ public:
     EnablePluginLogging(lldb_private::Stream *strm,
                         lldb_private::Args &command);
 
+    //------------------------------------------------------------------
+    // Plug-in process overrides
+    //------------------------------------------------------------------
+    virtual lldb_private::UnixSignals &
+    GetUnixSignals ()
+    {
+        return m_linux_signals;
+    }
+
 private:
 
     /// Linux-specific signal set.
diff --git a/lldb/source/Plugins/Process/Linux/ProcessMonitor.cpp b/lldb/source/Plugins/Process/Linux/ProcessMonitor.cpp
index bfb710dd3fb..f2577e26227 100644
--- a/lldb/source/Plugins/Process/Linux/ProcessMonitor.cpp
+++ b/lldb/source/Plugins/Process/Linux/ProcessMonitor.cpp
@@ -1492,17 +1492,6 @@ ProcessMonitor::MonitorSignal(ProcessMonitor *monitor,
         return ProcessMessage::Crash(pid, reason, signo, fault_addr);
     }
 
-    if (signo == SIGCHLD) {
-        assert(monitor);
-        // TODO: Implement tracing of inferiors' children
-        // If we fail to deliver the signal then create a message with the signal
-        if (!monitor->Resume(pid, signo)) {
-            assert(0 && "SIGCHLD delivery failed");
-            message = ProcessMessage::Signal(pid, signo);
-        }
-        return message;
-    }
-
     // Everything else is "normal" and does not require any special action on
     // our part.
     return ProcessMessage::Signal(pid, signo);