14 files changed, 111 insertions, 14 deletions
diff --git a/lldb/cmake/modules/AddLLDB.cmake b/lldb/cmake/modules/AddLLDB.cmake
index da52b8931d1..018939561e3 100644
--- a/lldb/cmake/modules/AddLLDB.cmake
+++ b/lldb/cmake/modules/AddLLDB.cmake
@@ -21,13 +21,17 @@ function(add_lldb_library name)
   # only supported parameters to this macro are the optional
   # MODULE;SHARED;STATIC library type and source files
   cmake_parse_arguments(PARAM
-    "MODULE;SHARED;STATIC;OBJECT"
+    "MODULE;SHARED;STATIC;OBJECT;PLUGIN"
     ""
     "DEPENDS;LINK_LIBS;LINK_COMPONENTS"
     ${ARGN})
   llvm_process_sources(srcs ${PARAM_UNPARSED_ARGUMENTS})
   list(APPEND LLVM_LINK_COMPONENTS ${PARAM_LINK_COMPONENTS})
 
+  if(PARAM_PLUGIN)
+    set_property(GLOBAL APPEND PROPERTY LLDB_PLUGINS ${name})
+  endif()
+
   if (MSVC_IDE OR XCODE)
     string(REGEX MATCHALL "/[^/]+" split_path ${CMAKE_CURRENT_SOURCE_DIR})
     list(GET split_path -1 dir)
diff --git a/lldb/source/Plugins/ABI/MacOSX-arm/CMakeLists.txt b/lldb/source/Plugins/ABI/MacOSX-arm/CMakeLists.txt
index ea8b011b198..b41814f3237 100644
--- a/lldb/source/Plugins/ABI/MacOSX-arm/CMakeLists.txt
+++ b/lldb/source/Plugins/ABI/MacOSX-arm/CMakeLists.txt
@@ -1,3 +1,11 @@
-add_lldb_library(lldbPluginABIMacOSX_arm
+add_lldb_library(lldbPluginABIMacOSX_arm PLUGIN
   ABIMacOSX_arm.cpp
+
+  LINK_LIBS
+    lldbCore
+    lldbSymbol
+    lldbTarget
+    lldbPluginProcessUtility
+  LINK_COMPONENTS
+    Support
   )
diff --git a/lldb/source/Plugins/ABI/MacOSX-arm64/CMakeLists.txt b/lldb/source/Plugins/ABI/MacOSX-arm64/CMakeLists.txt
index 498bb721863..f769d63bcda 100644
--- a/lldb/source/Plugins/ABI/MacOSX-arm64/CMakeLists.txt
+++ b/lldb/source/Plugins/ABI/MacOSX-arm64/CMakeLists.txt
@@ -1,3 +1,10 @@
-add_lldb_library(lldbPluginABIMacOSX_arm64
+add_lldb_library(lldbPluginABIMacOSX_arm64 PLUGIN
   ABIMacOSX_arm64.cpp
+  
+  LINK_LIBS
+    lldbCore
+    lldbSymbol
+    lldbTarget
+  LINK_COMPONENTS
+    Support
   )
diff --git a/lldb/source/Plugins/ABI/MacOSX-i386/CMakeLists.txt b/lldb/source/Plugins/ABI/MacOSX-i386/CMakeLists.txt
index f6a543a66da..21f153d36e0 100644
--- a/lldb/source/Plugins/ABI/MacOSX-i386/CMakeLists.txt
+++ b/lldb/source/Plugins/ABI/MacOSX-i386/CMakeLists.txt
@@ -1,3 +1,10 @@
-add_lldb_library(lldbPluginABIMacOSX_i386
+add_lldb_library(lldbPluginABIMacOSX_i386 PLUGIN
   ABIMacOSX_i386.cpp
+
+  LINK_LIBS
+    lldbCore
+    lldbSymbol
+    lldbTarget
+  LINK_COMPONENTS
+    Support
   )
diff --git a/lldb/source/Plugins/ABI/SysV-arm/CMakeLists.txt b/lldb/source/Plugins/ABI/SysV-arm/CMakeLists.txt
index c25ce5a1c63..c5979046d36 100644
--- a/lldb/source/Plugins/ABI/SysV-arm/CMakeLists.txt
+++ b/lldb/source/Plugins/ABI/SysV-arm/CMakeLists.txt
@@ -1,3 +1,11 @@
-add_lldb_library(lldbPluginABISysV_arm
+add_lldb_library(lldbPluginABISysV_arm PLUGIN
   ABISysV_arm.cpp
+
+  LINK_LIBS
+    lldbCore
+    lldbSymbol
+    lldbTarget
+    lldbPluginProcessUtility
+  LINK_COMPONENTS
+    Support
   )
diff --git a/lldb/source/Plugins/ABI/SysV-arm64/CMakeLists.txt b/lldb/source/Plugins/ABI/SysV-arm64/CMakeLists.txt
index 0ddb37043ac..077b394823c 100644
--- a/lldb/source/Plugins/ABI/SysV-arm64/CMakeLists.txt
+++ b/lldb/source/Plugins/ABI/SysV-arm64/CMakeLists.txt
@@ -1,3 +1,10 @@
-add_lldb_library(lldbPluginABISysV_arm64
+add_lldb_library(lldbPluginABISysV_arm64 PLUGIN
   ABISysV_arm64.cpp
+
+  LINK_LIBS
+    lldbCore
+    lldbSymbol
+    lldbTarget
+  LINK_COMPONENTS
+    Support
   )
diff --git a/lldb/source/Plugins/ABI/SysV-hexagon/CMakeLists.txt b/lldb/source/Plugins/ABI/SysV-hexagon/CMakeLists.txt
index b8fbb074471..a857fff1239 100644
--- a/lldb/source/Plugins/ABI/SysV-hexagon/CMakeLists.txt
+++ b/lldb/source/Plugins/ABI/SysV-hexagon/CMakeLists.txt
@@ -1,3 +1,10 @@
-add_lldb_library(lldbPluginABISysV_hexagon
+add_lldb_library(lldbPluginABISysV_hexagon PLUGIN
   ABISysV_hexagon.cpp
+
+  LINK_LIBS
+    lldbCore
+    lldbSymbol
+    lldbTarget
+  LINK_COMPONENTS
+    Support
   )
diff --git a/lldb/source/Plugins/ABI/SysV-i386/CMakeLists.txt b/lldb/source/Plugins/ABI/SysV-i386/CMakeLists.txt
index 3528f01ad75..598b3d03c0f 100644
--- a/lldb/source/Plugins/ABI/SysV-i386/CMakeLists.txt
+++ b/lldb/source/Plugins/ABI/SysV-i386/CMakeLists.txt
@@ -1,3 +1,10 @@
-add_lldb_library(lldbPluginABISysV_i386
+add_lldb_library(lldbPluginABISysV_i386 PLUGIN
   ABISysV_i386.cpp
+
+  LINK_LIBS
+    lldbCore
+    lldbSymbol
+    lldbTarget
+  LINK_COMPONENTS
+    Support
   )
diff --git a/lldb/source/Plugins/ABI/SysV-mips/CMakeLists.txt b/lldb/source/Plugins/ABI/SysV-mips/CMakeLists.txt
index 0db3e5c1c7e..a3266a75ae7 100644
--- a/lldb/source/Plugins/ABI/SysV-mips/CMakeLists.txt
+++ b/lldb/source/Plugins/ABI/SysV-mips/CMakeLists.txt
@@ -1,3 +1,10 @@
-add_lldb_library(lldbPluginABISysV_mips
+add_lldb_library(lldbPluginABISysV_mips PLUGIN
   ABISysV_mips.cpp
+
+  LINK_LIBS
+    lldbCore
+    lldbSymbol
+    lldbTarget
+  LINK_COMPONENTS
+    Support
   )
diff --git a/lldb/source/Plugins/ABI/SysV-mips64/CMakeLists.txt b/lldb/source/Plugins/ABI/SysV-mips64/CMakeLists.txt
index 099464821ed..5eddfb539f0 100644
--- a/lldb/source/Plugins/ABI/SysV-mips64/CMakeLists.txt
+++ b/lldb/source/Plugins/ABI/SysV-mips64/CMakeLists.txt
@@ -1,3 +1,10 @@
-add_lldb_library(lldbPluginABISysV_mips64
+add_lldb_library(lldbPluginABISysV_mips64 PLUGIN
   ABISysV_mips64.cpp
+
+  LINK_LIBS
+    lldbCore
+    lldbSymbol
+    lldbTarget
+  LINK_COMPONENTS
+    Support
   )
diff --git a/lldb/source/Plugins/ABI/SysV-ppc/CMakeLists.txt b/lldb/source/Plugins/ABI/SysV-ppc/CMakeLists.txt
index a7784195f77..63bfc4a96cd 100644
--- a/lldb/source/Plugins/ABI/SysV-ppc/CMakeLists.txt
+++ b/lldb/source/Plugins/ABI/SysV-ppc/CMakeLists.txt
@@ -1,3 +1,10 @@
-add_lldb_library(lldbPluginABISysV_ppc
+add_lldb_library(lldbPluginABISysV_ppc PLUGIN
   ABISysV_ppc.cpp
+
+  LINK_LIBS
+    lldbCore
+    lldbSymbol
+    lldbTarget
+  LINK_COMPONENTS
+    Support
   )
diff --git a/lldb/source/Plugins/ABI/SysV-ppc64/CMakeLists.txt b/lldb/source/Plugins/ABI/SysV-ppc64/CMakeLists.txt
index 7a33d292204..b31182dd0f7 100644
--- a/lldb/source/Plugins/ABI/SysV-ppc64/CMakeLists.txt
+++ b/lldb/source/Plugins/ABI/SysV-ppc64/CMakeLists.txt
@@ -1,3 +1,10 @@
-add_lldb_library(lldbPluginABISysV_ppc64
+add_lldb_library(lldbPluginABISysV_ppc64 PLUGIN
   ABISysV_ppc64.cpp
+
+  LINK_LIBS
+    lldbCore
+    lldbSymbol
+    lldbTarget
+  LINK_COMPONENTS
+    Support
   )
diff --git a/lldb/source/Plugins/ABI/SysV-s390x/CMakeLists.txt b/lldb/source/Plugins/ABI/SysV-s390x/CMakeLists.txt
index c3992db023e..f670f0157a6 100644
--- a/lldb/source/Plugins/ABI/SysV-s390x/CMakeLists.txt
+++ b/lldb/source/Plugins/ABI/SysV-s390x/CMakeLists.txt
@@ -1,3 +1,10 @@
-add_lldb_library(lldbPluginABISysV_s390x
+add_lldb_library(lldbPluginABISysV_s390x PLUGIN
   ABISysV_s390x.cpp
+
+  LINK_LIBS
+    lldbCore
+    lldbSymbol
+    lldbTarget
+  LINK_COMPONENTS
+    Support
   )
diff --git a/lldb/source/Plugins/ABI/SysV-x86_64/CMakeLists.txt b/lldb/source/Plugins/ABI/SysV-x86_64/CMakeLists.txt
index a2b62d7240f..17644d74ac2 100644
--- a/lldb/source/Plugins/ABI/SysV-x86_64/CMakeLists.txt
+++ b/lldb/source/Plugins/ABI/SysV-x86_64/CMakeLists.txt
@@ -1,3 +1,10 @@
-add_lldb_library(lldbPluginABISysV_x86_64
+add_lldb_library(lldbPluginABISysV_x86_64 PLUGIN
   ABISysV_x86_64.cpp
+
+  LINK_LIBS
+    lldbCore
+    lldbSymbol
+    lldbTarget
+  LINK_COMPONENTS
+    Support
   )