[Lldb-commits] [lldb] r202980 - Build JITLoader on FreeBSD also

[Ed Maste]

Author: emaste
Date: Wed Mar  5 07:57:24 2014
New Revision: 202980

URL: http://llvm.org/viewvc/llvm-project?rev=202980&view=rev
Log:
Build JITLoader on FreeBSD also

Modified:
    lldb/trunk/lib/Makefile
    lldb/trunk/source/CMakeLists.txt
    lldb/trunk/source/Plugins/JITLoader/CMakeLists.txt
    lldb/trunk/source/Plugins/Makefile
    lldb/trunk/source/lldb.cpp

Modified: lldb/trunk/lib/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lib/Makefile?rev=202980&r1=202979&r2=202980&view=diff
==============================================================================
--- lldb/trunk/lib/Makefile (original)
+++ lldb/trunk/lib/Makefile Wed Mar  5 07:57:24 2014
@@ -113,7 +113,8 @@ ifneq (,$(filter $(HOST_OS), FreeBSD GNU
   USEDLIBS += lldbHostFreeBSD.a \
               lldbPluginProcessPOSIX.a \
               lldbPluginProcessFreeBSD.a \
-              lldbPluginProcessElfCore.a
+              lldbPluginProcessElfCore.a \
+              lldbPluginJITLoaderGDB.a
 endif
 
 include $(LEVEL)/Makefile.common

Modified: lldb/trunk/source/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/CMakeLists.txt?rev=202980&r1=202979&r2=202980&view=diff
==============================================================================
--- lldb/trunk/source/CMakeLists.txt (original)
+++ lldb/trunk/source/CMakeLists.txt Wed Mar  5 07:57:24 2014
@@ -114,6 +114,7 @@ if ( CMAKE_SYSTEM_NAME MATCHES "FreeBSD"
     lldbPluginProcessFreeBSD
     lldbPluginProcessPOSIX
     lldbPluginProcessElfCore
+    lldbPluginJITLoaderGDB
     )
 endif ()
 

Modified: lldb/trunk/source/Plugins/JITLoader/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/JITLoader/CMakeLists.txt?rev=202980&r1=202979&r2=202980&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/JITLoader/CMakeLists.txt (original)
+++ lldb/trunk/source/Plugins/JITLoader/CMakeLists.txt Wed Mar  5 07:57:24 2014
@@ -1,3 +1,3 @@
-if (CMAKE_SYSTEM_NAME MATCHES "Linux")
+if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR CMAKE_SYSTEM_NAME MATCHES "Linux")
   add_subdirectory(GDB)
 endif()

Modified: lldb/trunk/source/Plugins/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Makefile?rev=202980&r1=202979&r2=202980&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Makefile (original)
+++ lldb/trunk/source/Plugins/Makefile Wed Mar  5 07:57:24 2014
@@ -43,6 +43,7 @@ endif
 ifneq (,$(filter $(HOST_OS), FreeBSD GNU/kFreeBSD))
 DIRS += Process/FreeBSD Process/POSIX
 DIRS += Process/elf-core
+DIRS += JITLoader/GDB
 endif
 
 include $(LLDB_LEVEL)/Makefile

Modified: lldb/trunk/source/lldb.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/lldb.cpp?rev=202980&r1=202979&r2=202980&view=diff
==============================================================================
--- lldb/trunk/source/lldb.cpp (original)
+++ lldb/trunk/source/lldb.cpp Wed Mar  5 07:57:24 2014
@@ -68,11 +68,11 @@
 
 #if defined(__linux__) || defined(__FreeBSD__)
 #include "Plugins/Process/elf-core/ProcessElfCore.h"
+#include "Plugins/JITLoader/GDB/JITLoaderGDB.h"
 #endif
 
 #if defined (__linux__)
 #include "Plugins/Process/Linux/ProcessLinux.h"
-#include "Plugins/JITLoader/GDB/JITLoaderGDB.h"
 #endif
 
 #if defined (__FreeBSD__)
@@ -150,7 +150,6 @@ lldb_private::Initialize ()
         // Linux hosted plugins
         //----------------------------------------------------------------------
         ProcessLinux::Initialize();
-        JITLoaderGDB::Initialize();
 #endif
 #if defined (__FreeBSD__)
         ProcessFreeBSD::Initialize();
@@ -158,6 +157,7 @@ lldb_private::Initialize ()
 
 #if defined(__linux__) || defined(__FreeBSD__)
         ProcessElfCore::Initialize();
+        JITLoaderGDB::Initialize();
 #endif
         //----------------------------------------------------------------------
         // Platform agnostic plugins
@@ -233,7 +233,6 @@ lldb_private::Terminate ()
 
 #if defined (__linux__)
     ProcessLinux::Terminate();
-    JITLoaderGDB::Terminate();
 #endif
 
 #if defined (__FreeBSD__)
@@ -242,6 +241,7 @@ lldb_private::Terminate ()
 
 #if defined(__linux__) || defined(__FreeBSD__)
     ProcessElfCore::Terminate();
+    JITLoaderGDB::Terminate();
 #endif
     ProcessGDBRemote::Terminate();
     DynamicLoaderStatic::Terminate();