2 files changed, 12 insertions, 15 deletions
diff --git a/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.cpp b/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.cpp
index 9fb022dc916..4b488444de1 100644
--- a/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.cpp
+++ b/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.cpp
@@ -22,12 +22,23 @@
 #include "ProcessFreeBSD.h"
 #include "ProcessPOSIXLog.h"
 #include "Plugins/Process/Utility/InferiorCallPOSIX.h"
+#include "Plugins/Process/Utility/FreeBSDSignals.h"
 #include "ProcessMonitor.h"
 #include "FreeBSDThread.h"
 
 using namespace lldb;
 using namespace lldb_private;
 
+namespace
+{
+    UnixSignalsSP&
+    GetFreeBSDSignals ()
+    {
+        static UnixSignalsSP s_freebsd_signals_sp (new FreeBSDSignals ());
+        return s_freebsd_signals_sp;
+    }
+}
+
 //------------------------------------------------------------------------------
 // Static functions.
 
@@ -113,7 +124,7 @@ ProcessFreeBSD::EnablePluginLogging(Stream *strm, Args &command)
 // Constructors and destructors.
 
 ProcessFreeBSD::ProcessFreeBSD(Target& target, Listener &listener)
-    : ProcessPOSIX(target, listener),
+    : ProcessPOSIX(target, listener, GetFreeBSDSignals ()),
       m_resume_signo(0)
 {
 }
@@ -271,4 +282,3 @@ ProcessFreeBSD::SendMessage(const ProcessMessage &message)
 
     m_message_queue.push(message);
 }
-
diff --git a/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.h b/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.h
index 9702a65b9af..d6ae3462c73 100644
--- a/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.h
+++ b/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.h
@@ -18,7 +18,6 @@
 // Other libraries and framework includes
 #include "lldb/Target/Process.h"
 #include "lldb/Target/ThreadList.h"
-#include "Plugins/Process/Utility/FreeBSDSignals.h"
 #include "ProcessMessage.h"
 #include "ProcessPOSIX.h"
 
@@ -90,21 +89,9 @@ public:
     EnablePluginLogging(lldb_private::Stream *strm,
                         lldb_private::Args &command);
 
-    //------------------------------------------------------------------
-    // Plugin process overrides
-    //------------------------------------------------------------------
-    virtual lldb_private::UnixSignals &
-    GetUnixSignals()
-    {
-        return m_freebsd_signals;
-    }
-
 protected:
     friend class FreeBSDThread;
 
-    // FreeBSD-specific signal set.
-    FreeBSDSignals m_freebsd_signals;
-
     typedef std::vector<lldb::tid_t> tid_collection;
     tid_collection m_suspend_tids;
     tid_collection m_run_tids;