[lldb/Plugin] s/LLDB_PLUGIN/LLDB_PLUGIN_DEFINE/ (NFC)

Rename LLDB_PLUGIN to LLDB_PLUGIN_DEFINE as Pavel suggested in D73067 to avoid name conflict.
2020-02-14 09:46:02 -08:00 · 2020-02-14 09:46:02 -08:00 · bba9ba8d95
parent e8358455a2
commit bba9ba8d95
84 changed files with 85 additions and 85 deletions
--- a/lldb/include/lldb/Core/PluginManager.h
+++ b/lldb/include/lldb/Core/PluginManager.h
@ -22,14 +22,14 @@
 #include <stddef.h>
 #include <stdint.h>

-#define LLDB_PLUGIN(PluginName)                                                \
+#define LLDB_PLUGIN_DEFINE(PluginName)                                         \
  namespace lldb_private {                                                     \
  void lldb_initialize_##PluginName() { PluginName::Initialize(); }            \
  void lldb_terminate_##PluginName() { PluginName::Terminate(); }              \
  }

 // FIXME: Generate me with CMake
-#define LLDB_PLUGIN_DECLARE(PluginName)                                         \
+#define LLDB_PLUGIN_DECLARE(PluginName)                                        \
  namespace lldb_private {                                                     \
  extern void lldb_initialize_##PluginName();                                  \
  extern void lldb_terminate_##PluginName();                                   \
--- a/lldb/source/Plugins/ABI/AArch64/ABIAArch64.cpp
+++ b/lldb/source/Plugins/ABI/AArch64/ABIAArch64.cpp
@ -11,7 +11,7 @@
 #include "ABISysV_arm64.h"
 #include "lldb/Core/PluginManager.h"

-LLDB_PLUGIN(ABIAArch64)
+LLDB_PLUGIN_DEFINE(ABIAArch64)

 void ABIAArch64::Initialize() {
  ABISysV_arm64::Initialize();
--- a/lldb/source/Plugins/ABI/ARC/ABISysV_arc.cpp
+++ b/lldb/source/Plugins/ABI/ARC/ABISysV_arc.cpp
@ -55,7 +55,7 @@
 using namespace lldb;
 using namespace lldb_private;

-LLDB_PLUGIN(ABISysV_arc)
+LLDB_PLUGIN_DEFINE(ABISysV_arc)

 namespace {
 namespace dwarf {
--- a/lldb/source/Plugins/ABI/ARM/ABIARM.cpp
+++ b/lldb/source/Plugins/ABI/ARM/ABIARM.cpp
@ -11,7 +11,7 @@
 #include "ABISysV_arm.h"
 #include "lldb/Core/PluginManager.h"

-LLDB_PLUGIN(ABIARM)
+LLDB_PLUGIN_DEFINE(ABIARM)

 void ABIARM::Initialize() {
  ABISysV_arm::Initialize();
--- a/lldb/source/Plugins/ABI/ARM/ABIMacOSX_arm.cpp
+++ b/lldb/source/Plugins/ABI/ARM/ABIMacOSX_arm.cpp
@ -34,7 +34,7 @@
 using namespace lldb;
 using namespace lldb_private;

-LLDB_PLUGIN(ABIMacOSX_arm)
+LLDB_PLUGIN_DEFINE(ABIMacOSX_arm)

 static RegisterInfo g_register_infos[] = {
    //  NAME       ALT       SZ OFF ENCODING         FORMAT          EH_FRAME
--- a/lldb/source/Plugins/ABI/ARM/ABISysV_arm.cpp
+++ b/lldb/source/Plugins/ABI/ARM/ABISysV_arm.cpp
@ -34,7 +34,7 @@
 using namespace lldb;
 using namespace lldb_private;

-LLDB_PLUGIN(ABISysV_arm)
+LLDB_PLUGIN_DEFINE(ABISysV_arm)

 static RegisterInfo g_register_infos[] = {
    //  NAME       ALT       SZ OFF ENCODING         FORMAT          EH_FRAME
--- a/lldb/source/Plugins/ABI/Hexagon/ABISysV_hexagon.cpp
+++ b/lldb/source/Plugins/ABI/Hexagon/ABISysV_hexagon.cpp
@ -32,7 +32,7 @@
 using namespace lldb;
 using namespace lldb_private;

-LLDB_PLUGIN(ABISysV_hexagon)
+LLDB_PLUGIN_DEFINE(ABISysV_hexagon)

 static RegisterInfo g_register_infos[] = {
    // hexagon-core.xml
--- a/lldb/source/Plugins/ABI/Mips/ABIMips.cpp
+++ b/lldb/source/Plugins/ABI/Mips/ABIMips.cpp
@ -11,7 +11,7 @@
 #include "ABISysV_mips64.h"
 #include "lldb/Core/PluginManager.h"

-LLDB_PLUGIN(ABIMips)
+LLDB_PLUGIN_DEFINE(ABIMips)

 void ABIMips::Initialize() {
  ABISysV_mips::Initialize();
--- a/lldb/source/Plugins/ABI/Mips/ABISysV_mips.cpp
+++ b/lldb/source/Plugins/ABI/Mips/ABISysV_mips.cpp
@ -32,7 +32,7 @@
 using namespace lldb;
 using namespace lldb_private;

-LLDB_PLUGIN(ABISysV_mips)
+LLDB_PLUGIN_DEFINE(ABISysV_mips)

 enum dwarf_regnums {
  dwarf_r0 = 0,
--- a/lldb/source/Plugins/ABI/Mips/ABISysV_mips64.cpp
+++ b/lldb/source/Plugins/ABI/Mips/ABISysV_mips64.cpp
@ -32,7 +32,7 @@
 using namespace lldb;
 using namespace lldb_private;

-LLDB_PLUGIN(ABISysV_mips64)
+LLDB_PLUGIN_DEFINE(ABISysV_mips64)

 enum dwarf_regnums {
  dwarf_r0 = 0,
--- a/lldb/source/Plugins/ABI/PowerPC/ABIPowerPC.cpp
+++ b/lldb/source/Plugins/ABI/PowerPC/ABIPowerPC.cpp
@ -11,7 +11,7 @@
 #include "ABISysV_ppc64.h"
 #include "lldb/Core/PluginManager.h"

-LLDB_PLUGIN(ABIPowerPC)
+LLDB_PLUGIN_DEFINE(ABIPowerPC)

 void ABIPowerPC::Initialize() {
  ABISysV_ppc::Initialize();
--- a/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc.cpp
+++ b/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc.cpp
@ -32,7 +32,7 @@
 using namespace lldb;
 using namespace lldb_private;

-LLDB_PLUGIN(ABISysV_ppc)
+LLDB_PLUGIN_DEFINE(ABISysV_ppc)

 enum dwarf_regnums {
  dwarf_r0 = 0,
--- a/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc64.cpp
+++ b/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc64.cpp
@ -47,7 +47,7 @@
 using namespace lldb;
 using namespace lldb_private;

-LLDB_PLUGIN(ABISysV_ppc64)
+LLDB_PLUGIN_DEFINE(ABISysV_ppc64)

 const lldb_private::RegisterInfo *
 ABISysV_ppc64::GetRegisterInfoArray(uint32_t &count) {
--- a/lldb/source/Plugins/ABI/SystemZ/ABISysV_s390x.cpp
+++ b/lldb/source/Plugins/ABI/SystemZ/ABISysV_s390x.cpp
@ -32,7 +32,7 @@
 using namespace lldb;
 using namespace lldb_private;

-LLDB_PLUGIN(ABISysV_s390x)
+LLDB_PLUGIN_DEFINE(ABISysV_s390x)

 enum dwarf_regnums {
  // General Purpose Registers
--- a/lldb/source/Plugins/ABI/X86/ABIMacOSX_i386.cpp
+++ b/lldb/source/Plugins/ABI/X86/ABIMacOSX_i386.cpp
@ -29,7 +29,7 @@
 using namespace lldb;
 using namespace lldb_private;

-LLDB_PLUGIN(ABIMacOSX_i386)
+LLDB_PLUGIN_DEFINE(ABIMacOSX_i386)

 enum {
  ehframe_eax = 0,
--- a/lldb/source/Plugins/ABI/X86/ABISysV_i386.cpp
+++ b/lldb/source/Plugins/ABI/X86/ABISysV_i386.cpp
@ -31,7 +31,7 @@
 using namespace lldb;
 using namespace lldb_private;

-LLDB_PLUGIN(ABISysV_i386)
+LLDB_PLUGIN_DEFINE(ABISysV_i386)

 //   This source file uses the following document as a reference:
 //====================================================================
--- a/lldb/source/Plugins/ABI/X86/ABISysV_x86_64.cpp
+++ b/lldb/source/Plugins/ABI/X86/ABISysV_x86_64.cpp
@ -35,7 +35,7 @@
 using namespace lldb;
 using namespace lldb_private;

-LLDB_PLUGIN(ABISysV_x86_64)
+LLDB_PLUGIN_DEFINE(ABISysV_x86_64)

 enum dwarf_regnums {
  dwarf_rax = 0,
--- a/lldb/source/Plugins/ABI/X86/ABIWindows_x86_64.cpp
+++ b/lldb/source/Plugins/ABI/X86/ABIWindows_x86_64.cpp
@ -33,7 +33,7 @@
 using namespace lldb;
 using namespace lldb_private;

-LLDB_PLUGIN(ABIWindows_x86_64)
+LLDB_PLUGIN_DEFINE(ABIWindows_x86_64)

 enum dwarf_regnums {
  dwarf_rax = 0,
--- a/lldb/source/Plugins/ABI/X86/ABIX86.cpp
+++ b/lldb/source/Plugins/ABI/X86/ABIX86.cpp
@ -13,7 +13,7 @@
 #include "ABIWindows_x86_64.h"
 #include "lldb/Core/PluginManager.h"

-LLDB_PLUGIN(ABIX86)
+LLDB_PLUGIN_DEFINE(ABIX86)

 void ABIX86::Initialize() {
  ABIMacOSX_i386::Initialize();
--- a/lldb/source/Plugins/Architecture/Arm/ArchitectureArm.cpp
+++ b/lldb/source/Plugins/Architecture/Arm/ArchitectureArm.cpp
@ -17,7 +17,7 @@
 using namespace lldb_private;
 using namespace lldb;

-LLDB_PLUGIN(ArchitectureArm)
+LLDB_PLUGIN_DEFINE(ArchitectureArm)

 ConstString ArchitectureArm::GetPluginNameStatic() {
  return ConstString("arm");
--- a/lldb/source/Plugins/Architecture/Mips/ArchitectureMips.cpp
+++ b/lldb/source/Plugins/Architecture/Mips/ArchitectureMips.cpp
@ -21,7 +21,7 @@
 using namespace lldb_private;
 using namespace lldb;

-LLDB_PLUGIN(ArchitectureMips)
+LLDB_PLUGIN_DEFINE(ArchitectureMips)

 ConstString ArchitectureMips::GetPluginNameStatic() {
  return ConstString("mips");
--- a/lldb/source/Plugins/Architecture/PPC64/ArchitecturePPC64.cpp
+++ b/lldb/source/Plugins/Architecture/PPC64/ArchitecturePPC64.cpp
@ -20,7 +20,7 @@
 using namespace lldb_private;
 using namespace lldb;

-LLDB_PLUGIN(ArchitecturePPC64)
+LLDB_PLUGIN_DEFINE(ArchitecturePPC64)

 ConstString ArchitecturePPC64::GetPluginNameStatic() {
  return ConstString("ppc64");
--- a/lldb/source/Plugins/Disassembler/LLVMC/DisassemblerLLVMC.cpp
+++ b/lldb/source/Plugins/Disassembler/LLVMC/DisassemblerLLVMC.cpp
@ -43,7 +43,7 @@
 using namespace lldb;
 using namespace lldb_private;

-LLDB_PLUGIN(DisassemblerLLVMC)
+LLDB_PLUGIN_DEFINE(DisassemblerLLVMC)

 class DisassemblerLLVMC::MCDisasmInstance {
 public:
--- a/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp
+++ b/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp
@ -44,7 +44,7 @@
 using namespace lldb;
 using namespace lldb_private;

-LLDB_PLUGIN(DynamicLoaderDarwinKernel)
+LLDB_PLUGIN_DEFINE(DynamicLoaderDarwinKernel)

 // Progressively greater amounts of scanning we will allow For some targets
 // very early in startup, we can't do any random reads of memory or we can
--- a/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp
+++ b/lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp
@ -47,7 +47,7 @@
 using namespace lldb;
 using namespace lldb_private;

-LLDB_PLUGIN(DynamicLoaderMacOSXDYLD)
+LLDB_PLUGIN_DEFINE(DynamicLoaderMacOSXDYLD)

 // Create an instance of this class. This function is filled into the plugin
 // info class that gets handed out by the plugin factory and allows the lldb to
--- a/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp
+++ b/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp
@ -29,7 +29,7 @@
 using namespace lldb;
 using namespace lldb_private;

-LLDB_PLUGIN(DynamicLoaderPOSIXDYLD)
+LLDB_PLUGIN_DEFINE(DynamicLoaderPOSIXDYLD)

 void DynamicLoaderPOSIXDYLD::Initialize() {
  PluginManager::RegisterPlugin(GetPluginNameStatic(),
--- a/lldb/source/Plugins/DynamicLoader/Static/DynamicLoaderStatic.cpp
+++ b/lldb/source/Plugins/DynamicLoader/Static/DynamicLoaderStatic.cpp
@ -17,7 +17,7 @@
 using namespace lldb;
 using namespace lldb_private;

-LLDB_PLUGIN(DynamicLoaderStatic)
+LLDB_PLUGIN_DEFINE(DynamicLoaderStatic)

 // Create an instance of this class. This function is filled into the plugin
 // info class that gets handed out by the plugin factory and allows the lldb to
--- a/lldb/source/Plugins/DynamicLoader/Windows-DYLD/DynamicLoaderWindowsDYLD.cpp
+++ b/lldb/source/Plugins/DynamicLoader/Windows-DYLD/DynamicLoaderWindowsDYLD.cpp
@ -23,7 +23,7 @@
 using namespace lldb;
 using namespace lldb_private;

-LLDB_PLUGIN(DynamicLoaderWindowsDYLD)
+LLDB_PLUGIN_DEFINE(DynamicLoaderWindowsDYLD)

 DynamicLoaderWindowsDYLD::DynamicLoaderWindowsDYLD(Process *process)
    : DynamicLoader(process) {}
--- a/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp
+++ b/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp
@ -30,7 +30,7 @@
 using namespace lldb;
 using namespace lldb_private;

-LLDB_PLUGIN(EmulateInstructionARM)
+LLDB_PLUGIN_DEFINE(EmulateInstructionARM)

 // Convenient macro definitions.
 #define APSR_C Bit32(m_opcode_cpsr, CPSR_C_POS)
--- a/lldb/source/Plugins/Instruction/ARM64/EmulateInstructionARM64.cpp
+++ b/lldb/source/Plugins/Instruction/ARM64/EmulateInstructionARM64.cpp
@ -47,7 +47,7 @@
 using namespace lldb;
 using namespace lldb_private;

-LLDB_PLUGIN(EmulateInstructionARM64)
+LLDB_PLUGIN_DEFINE(EmulateInstructionARM64)

 static bool LLDBTableGetRegisterInfo(uint32_t reg_num, RegisterInfo &reg_info) {
  if (reg_num >= llvm::array_lengthof(g_register_infos_arm64_le))
--- a/lldb/source/Plugins/Instruction/MIPS/EmulateInstructionMIPS.cpp
+++ b/lldb/source/Plugins/Instruction/MIPS/EmulateInstructionMIPS.cpp
@ -40,7 +40,7 @@
 using namespace lldb;
 using namespace lldb_private;

-LLDB_PLUGIN(EmulateInstructionMIPS)
+LLDB_PLUGIN_DEFINE(EmulateInstructionMIPS)

 #define UInt(x) ((uint64_t)x)
 #define integer int64_t
--- a/lldb/source/Plugins/Instruction/MIPS64/EmulateInstructionMIPS64.cpp
+++ b/lldb/source/Plugins/Instruction/MIPS64/EmulateInstructionMIPS64.cpp
@ -40,7 +40,7 @@
 using namespace lldb;
 using namespace lldb_private;

-LLDB_PLUGIN(EmulateInstructionMIPS64)
+LLDB_PLUGIN_DEFINE(EmulateInstructionMIPS64)

 #define UInt(x) ((uint64_t)x)
 #define integer int64_t
--- a/lldb/source/Plugins/Instruction/PPC64/EmulateInstructionPPC64.cpp
+++ b/lldb/source/Plugins/Instruction/PPC64/EmulateInstructionPPC64.cpp
@ -25,7 +25,7 @@
 using namespace lldb;
 using namespace lldb_private;

-LLDB_PLUGIN(EmulateInstructionPPC64)
+LLDB_PLUGIN_DEFINE(EmulateInstructionPPC64)

 EmulateInstructionPPC64::EmulateInstructionPPC64(const ArchSpec &arch)
    : EmulateInstruction(arch) {}
--- a/lldb/source/Plugins/InstrumentationRuntime/ASan/InstrumentationRuntimeASan.cpp
+++ b/lldb/source/Plugins/InstrumentationRuntime/ASan/InstrumentationRuntimeASan.cpp
@ -30,7 +30,7 @@
 using namespace lldb;
 using namespace lldb_private;

-LLDB_PLUGIN(InstrumentationRuntimeASan)
+LLDB_PLUGIN_DEFINE(InstrumentationRuntimeASan)

 lldb::InstrumentationRuntimeSP
 InstrumentationRuntimeASan::CreateInstance(const lldb::ProcessSP &process_sp) {
--- a/lldb/source/Plugins/InstrumentationRuntime/MainThreadChecker/InstrumentationRuntimeMainThreadChecker.cpp
+++ b/lldb/source/Plugins/InstrumentationRuntime/MainThreadChecker/InstrumentationRuntimeMainThreadChecker.cpp
@ -29,7 +29,7 @@
 using namespace lldb;
 using namespace lldb_private;

-LLDB_PLUGIN(InstrumentationRuntimeMainThreadChecker)
+LLDB_PLUGIN_DEFINE(InstrumentationRuntimeMainThreadChecker)

 InstrumentationRuntimeMainThreadChecker::
    ~InstrumentationRuntimeMainThreadChecker() {
--- a/lldb/source/Plugins/InstrumentationRuntime/TSan/InstrumentationRuntimeTSan.cpp
+++ b/lldb/source/Plugins/InstrumentationRuntime/TSan/InstrumentationRuntimeTSan.cpp
@ -35,7 +35,7 @@
 using namespace lldb;
 using namespace lldb_private;

-LLDB_PLUGIN(InstrumentationRuntimeTSan)
+LLDB_PLUGIN_DEFINE(InstrumentationRuntimeTSan)

 lldb::InstrumentationRuntimeSP
 InstrumentationRuntimeTSan::CreateInstance(const lldb::ProcessSP &process_sp) {
--- a/lldb/source/Plugins/InstrumentationRuntime/UBSan/InstrumentationRuntimeUBSan.cpp
+++ b/lldb/source/Plugins/InstrumentationRuntime/UBSan/InstrumentationRuntimeUBSan.cpp
@ -36,7 +36,7 @@
 using namespace lldb;
 using namespace lldb_private;

-LLDB_PLUGIN(InstrumentationRuntimeUBSan)
+LLDB_PLUGIN_DEFINE(InstrumentationRuntimeUBSan)

 InstrumentationRuntimeUBSan::~InstrumentationRuntimeUBSan() { Deactivate(); }

--- a/lldb/source/Plugins/JITLoader/GDB/JITLoaderGDB.cpp
+++ b/lldb/source/Plugins/JITLoader/GDB/JITLoaderGDB.cpp
@ -32,7 +32,7 @@
 using namespace lldb;
 using namespace lldb_private;

-LLDB_PLUGIN(JITLoaderGDB)
+LLDB_PLUGIN_DEFINE(JITLoaderGDB)

 // Debug Interface Structures
 enum jit_actions_t { JIT_NOACTION = 0, JIT_REGISTER_FN, JIT_UNREGISTER_FN };
--- a/lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp
@ -43,7 +43,7 @@ using namespace lldb;
 using namespace lldb_private;
 using namespace lldb_private::formatters;

-LLDB_PLUGIN(CPlusPlusLanguage)
+LLDB_PLUGIN_DEFINE(CPlusPlusLanguage)

 void CPlusPlusLanguage::Initialize() {
  PluginManager::RegisterPlugin(GetPluginNameStatic(), "C++ Language",
--- a/lldb/source/Plugins/Language/ObjC/ObjCLanguage.cpp
+++ b/lldb/source/Plugins/Language/ObjC/ObjCLanguage.cpp
@ -37,7 +37,7 @@ using namespace lldb;
 using namespace lldb_private;
 using namespace lldb_private::formatters;

-LLDB_PLUGIN(ObjCLanguage)
+LLDB_PLUGIN_DEFINE(ObjCLanguage)

 void ObjCLanguage::Initialize() {
  PluginManager::RegisterPlugin(GetPluginNameStatic(), "Objective-C Language",
--- a/lldb/source/Plugins/Language/ObjCPlusPlus/ObjCPlusPlusLanguage.cpp
+++ b/lldb/source/Plugins/Language/ObjCPlusPlus/ObjCPlusPlusLanguage.cpp
@ -14,7 +14,7 @@
 using namespace lldb;
 using namespace lldb_private;

-LLDB_PLUGIN(ObjCPlusPlusLanguage)
+LLDB_PLUGIN_DEFINE(ObjCPlusPlusLanguage)

 bool ObjCPlusPlusLanguage::IsSourceFile(llvm::StringRef file_path) const {
  const auto suffixes = {".h", ".mm"};
--- a/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp
+++ b/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp
@ -40,7 +40,7 @@
 using namespace lldb;
 using namespace lldb_private;

-LLDB_PLUGIN(ItaniumABILanguageRuntime)
+LLDB_PLUGIN_DEFINE(ItaniumABILanguageRuntime)

 static const char *vtable_demangled_prefix = "vtable for ";

--- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.cpp
+++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.cpp
@ -44,7 +44,7 @@
 using namespace lldb;
 using namespace lldb_private;

-LLDB_PLUGIN(AppleObjCRuntime)
+LLDB_PLUGIN_DEFINE(AppleObjCRuntime)

 char AppleObjCRuntime::ID = 0;

--- a/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.cpp
+++ b/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.cpp
@ -46,7 +46,7 @@ using namespace lldb;
 using namespace lldb_private;
 using namespace lldb_renderscript;

-LLDB_PLUGIN(RenderScriptRuntime)
+LLDB_PLUGIN_DEFINE(RenderScriptRuntime)

 #define FMT_COORD "(%" PRIu32 ", %" PRIu32 ", %" PRIu32 ")"

--- a/lldb/source/Plugins/MemoryHistory/asan/MemoryHistoryASan.cpp
+++ b/lldb/source/Plugins/MemoryHistory/asan/MemoryHistoryASan.cpp
@ -28,7 +28,7 @@
 using namespace lldb;
 using namespace lldb_private;

-LLDB_PLUGIN(MemoryHistoryASan)
+LLDB_PLUGIN_DEFINE(MemoryHistoryASan)

 MemoryHistorySP MemoryHistoryASan::CreateInstance(const ProcessSP &process_sp) {
  if (!process_sp.get())
--- a/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp
+++ b/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp
@ -40,7 +40,7 @@ typedef struct ar_hdr {
 using namespace lldb;
 using namespace lldb_private;

-LLDB_PLUGIN(ObjectContainerBSDArchive)
+LLDB_PLUGIN_DEFINE(ObjectContainerBSDArchive)

 ObjectContainerBSDArchive::Object::Object()
    : ar_name(), modification_time(0), uid(0), gid(0), mode(0), size(0),
--- a/lldb/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.cpp
+++ b/lldb/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.cpp
@ -20,7 +20,7 @@ using namespace lldb;
 using namespace lldb_private;
 using namespace llvm::MachO;

-LLDB_PLUGIN(ObjectContainerUniversalMachO)
+LLDB_PLUGIN_DEFINE(ObjectContainerUniversalMachO)

 void ObjectContainerUniversalMachO::Initialize() {
  PluginManager::RegisterPlugin(GetPluginNameStatic(),
--- a/lldb/source/Plugins/ObjectFile/Breakpad/ObjectFileBreakpad.cpp
+++ b/lldb/source/Plugins/ObjectFile/Breakpad/ObjectFileBreakpad.cpp
@ -16,7 +16,7 @@ using namespace lldb;
 using namespace lldb_private;
 using namespace lldb_private::breakpad;

-LLDB_PLUGIN(ObjectFileBreakpad)
+LLDB_PLUGIN_DEFINE(ObjectFileBreakpad)

 namespace {
 struct Header {
--- a/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
+++ b/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
@ -51,7 +51,7 @@ using namespace lldb_private;
 using namespace elf;
 using namespace llvm::ELF;

-LLDB_PLUGIN(ObjectFileELF)
+LLDB_PLUGIN_DEFINE(ObjectFileELF)

 namespace {

--- a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
+++ b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
@ -66,7 +66,7 @@ using namespace lldb;
 using namespace lldb_private;
 using namespace llvm::MachO;

-LLDB_PLUGIN(ObjectFileMachO)
+LLDB_PLUGIN_DEFINE(ObjectFileMachO)

 // Some structure definitions needed for parsing the dyld shared cache files
 // found on iOS devices.
--- a/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp
+++ b/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp
@ -41,7 +41,7 @@
 using namespace lldb;
 using namespace lldb_private;

-LLDB_PLUGIN(ObjectFilePECOFF)
+LLDB_PLUGIN_DEFINE(ObjectFilePECOFF)

 struct CVInfoPdb70 {
  // 16-byte GUID
--- a/lldb/source/Plugins/ObjectFile/wasm/ObjectFileWasm.cpp
+++ b/lldb/source/Plugins/ObjectFile/wasm/ObjectFileWasm.cpp
@ -28,7 +28,7 @@ using namespace lldb;
 using namespace lldb_private;
 using namespace lldb_private::wasm;

-LLDB_PLUGIN(ObjectFileWasm)
+LLDB_PLUGIN_DEFINE(ObjectFileWasm)

 static const uint32_t kWasmHeaderSize =
    sizeof(llvm::wasm::WasmMagic) + sizeof(llvm::wasm::WasmVersion);
--- a/lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.cpp
+++ b/lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.cpp
@ -39,7 +39,7 @@
 using namespace lldb;
 using namespace lldb_private;

-LLDB_PLUGIN(OperatingSystemPython)
+LLDB_PLUGIN_DEFINE(OperatingSystemPython)

 void OperatingSystemPython::Initialize() {
  PluginManager::RegisterPlugin(GetPluginNameStatic(),
--- a/lldb/source/Plugins/Platform/Android/PlatformAndroid.cpp
+++ b/lldb/source/Plugins/Platform/Android/PlatformAndroid.cpp
@ -26,7 +26,7 @@ using namespace lldb_private;
 using namespace lldb_private::platform_android;
 using namespace std::chrono;

-LLDB_PLUGIN(PlatformAndroid)
+LLDB_PLUGIN_DEFINE(PlatformAndroid)

 static uint32_t g_initialize_count = 0;
 static const unsigned int g_android_default_cache_size =
--- a/lldb/source/Plugins/Platform/FreeBSD/PlatformFreeBSD.cpp
+++ b/lldb/source/Plugins/Platform/FreeBSD/PlatformFreeBSD.cpp
@ -36,7 +36,7 @@ using namespace lldb;
 using namespace lldb_private;
 using namespace lldb_private::platform_freebsd;

-LLDB_PLUGIN(PlatformFreeBSD)
+LLDB_PLUGIN_DEFINE(PlatformFreeBSD)

 static uint32_t g_initialize_count = 0;

--- a/lldb/source/Plugins/Platform/Linux/PlatformLinux.cpp
+++ b/lldb/source/Plugins/Platform/Linux/PlatformLinux.cpp
@ -34,7 +34,7 @@ using namespace lldb;
 using namespace lldb_private;
 using namespace lldb_private::platform_linux;

-LLDB_PLUGIN(PlatformLinux)
+LLDB_PLUGIN_DEFINE(PlatformLinux)

 static uint32_t g_initialize_count = 0;

--- a/lldb/source/Plugins/Platform/MacOSX/PlatformMacOSX.cpp
+++ b/lldb/source/Plugins/Platform/MacOSX/PlatformMacOSX.cpp
@ -39,7 +39,7 @@
 using namespace lldb;
 using namespace lldb_private;

-LLDB_PLUGIN(PlatformMacOSX)
+LLDB_PLUGIN_DEFINE(PlatformMacOSX)

 static uint32_t g_initialize_count = 0;

--- a/lldb/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp
+++ b/lldb/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp
@ -25,7 +25,7 @@
 using namespace lldb;
 using namespace lldb_private;

-LLDB_PLUGIN(PlatformRemoteiOS)
+LLDB_PLUGIN_DEFINE(PlatformRemoteiOS)

 // Static Variables
 static uint32_t g_initialize_count = 0;
--- a/lldb/source/Plugins/Platform/NetBSD/PlatformNetBSD.cpp
+++ b/lldb/source/Plugins/Platform/NetBSD/PlatformNetBSD.cpp
@ -34,7 +34,7 @@ using namespace lldb;
 using namespace lldb_private;
 using namespace lldb_private::platform_netbsd;

-LLDB_PLUGIN(PlatformNetBSD)
+LLDB_PLUGIN_DEFINE(PlatformNetBSD)

 static uint32_t g_initialize_count = 0;

--- a/lldb/source/Plugins/Platform/OpenBSD/PlatformOpenBSD.cpp
+++ b/lldb/source/Plugins/Platform/OpenBSD/PlatformOpenBSD.cpp
@ -34,7 +34,7 @@ using namespace lldb;
 using namespace lldb_private;
 using namespace lldb_private::platform_openbsd;

-LLDB_PLUGIN(PlatformOpenBSD)
+LLDB_PLUGIN_DEFINE(PlatformOpenBSD)

 static uint32_t g_initialize_count = 0;

--- a/lldb/source/Plugins/Platform/Windows/PlatformWindows.cpp
+++ b/lldb/source/Plugins/Platform/Windows/PlatformWindows.cpp
@ -27,7 +27,7 @@
 using namespace lldb;
 using namespace lldb_private;

-LLDB_PLUGIN(PlatformWindows)
+LLDB_PLUGIN_DEFINE(PlatformWindows)

 static uint32_t g_initialize_count = 0;

--- a/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp
+++ b/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp
@ -35,7 +35,7 @@ using namespace lldb;
 using namespace lldb_private;
 using namespace lldb_private::platform_gdb_server;

-LLDB_PLUGIN(PlatformRemoteGDBServer)
+LLDB_PLUGIN_DEFINE(PlatformRemoteGDBServer)

 static bool g_initialized = false;

--- a/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.cpp
+++ b/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.cpp
@ -56,7 +56,7 @@
 using namespace lldb;
 using namespace lldb_private;

-LLDB_PLUGIN(ProcessFreeBSD)
+LLDB_PLUGIN_DEFINE(ProcessFreeBSD)

 namespace {
 UnixSignalsSP &GetFreeBSDSignals() {
--- a/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp
+++ b/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp
@ -50,7 +50,7 @@
 using namespace lldb;
 using namespace lldb_private;

-LLDB_PLUGIN(ProcessKDP)
+LLDB_PLUGIN_DEFINE(ProcessKDP)

 namespace {

--- a/lldb/source/Plugins/Process/Windows/Common/ProcessWindows.cpp
+++ b/lldb/source/Plugins/Process/Windows/Common/ProcessWindows.cpp
@ -44,7 +44,7 @@
 using namespace lldb;
 using namespace lldb_private;

-LLDB_PLUGIN(ProcessWindows)
+LLDB_PLUGIN_DEFINE(ProcessWindows)

 namespace {
 std::string GetProcessExecutableName(HANDLE process_handle) {
--- a/lldb/source/Plugins/Process/elf-core/ProcessElfCore.cpp
+++ b/lldb/source/Plugins/Process/elf-core/ProcessElfCore.cpp
@ -35,7 +35,7 @@
 using namespace lldb_private;
 namespace ELF = llvm::ELF;

-LLDB_PLUGIN(ProcessElfCore)
+LLDB_PLUGIN_DEFINE(ProcessElfCore)

 ConstString ProcessElfCore::GetPluginNameStatic() {
  static ConstString g_name("elf-core");
--- a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
+++ b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
@ -90,7 +90,7 @@ using namespace lldb;
 using namespace lldb_private;
 using namespace lldb_private::process_gdb_remote;

-LLDB_PLUGIN(ProcessGDBRemote)
+LLDB_PLUGIN_DEFINE(ProcessGDBRemote)

 namespace lldb {
 // Provide a function that can easily dump the packet history if we know a
--- a/lldb/source/Plugins/Process/mach-core/ProcessMachCore.cpp
+++ b/lldb/source/Plugins/Process/mach-core/ProcessMachCore.cpp
@ -44,7 +44,7 @@
 using namespace lldb;
 using namespace lldb_private;

-LLDB_PLUGIN(ProcessMachCore)
+LLDB_PLUGIN_DEFINE(ProcessMachCore)

 ConstString ProcessMachCore::GetPluginNameStatic() {
  static ConstString g_name("mach-o-core");
--- a/lldb/source/Plugins/Process/minidump/ProcessMinidump.cpp
+++ b/lldb/source/Plugins/Process/minidump/ProcessMinidump.cpp
@ -41,7 +41,7 @@ using namespace lldb;
 using namespace lldb_private;
 using namespace minidump;

-LLDB_PLUGIN(ProcessMinidump)
+LLDB_PLUGIN_DEFINE(ProcessMinidump)

 namespace {

--- a/lldb/source/Plugins/ScriptInterpreter/Lua/ScriptInterpreterLua.cpp
+++ b/lldb/source/Plugins/ScriptInterpreter/Lua/ScriptInterpreterLua.cpp
@ -19,7 +19,7 @@
 using namespace lldb;
 using namespace lldb_private;

-LLDB_PLUGIN(ScriptInterpreterLua)
+LLDB_PLUGIN_DEFINE(ScriptInterpreterLua)

 class IOHandlerLuaInterpreter : public IOHandlerDelegate,
                                public IOHandlerEditline {
--- a/lldb/source/Plugins/ScriptInterpreter/None/ScriptInterpreterNone.cpp
+++ b/lldb/source/Plugins/ScriptInterpreter/None/ScriptInterpreterNone.cpp
@ -20,7 +20,7 @@
 using namespace lldb;
 using namespace lldb_private;

-LLDB_PLUGIN(ScriptInterpreterNone)
+LLDB_PLUGIN_DEFINE(ScriptInterpreterNone)

 ScriptInterpreterNone::ScriptInterpreterNone(Debugger &debugger)
    : ScriptInterpreter(debugger, eScriptLanguageNone) {}
--- a/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
+++ b/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
@ -56,7 +56,7 @@ using namespace lldb_private;
 using namespace lldb_private::python;
 using llvm::Expected;

-LLDB_PLUGIN(ScriptInterpreterPython)
+LLDB_PLUGIN_DEFINE(ScriptInterpreterPython)

 // Defined in the SWIG source file
 #if PY_MAJOR_VERSION >= 3
--- a/lldb/source/Plugins/StructuredData/DarwinLog/StructuredDataDarwinLog.cpp
+++ b/lldb/source/Plugins/StructuredData/DarwinLog/StructuredDataDarwinLog.cpp
@ -36,7 +36,7 @@
 using namespace lldb;
 using namespace lldb_private;

-LLDB_PLUGIN(StructuredDataDarwinLog)
+LLDB_PLUGIN_DEFINE(StructuredDataDarwinLog)

 #pragma mark -
 #pragma mark Anonymous Namespace
--- a/lldb/source/Plugins/SymbolFile/Breakpad/SymbolFileBreakpad.cpp
+++ b/lldb/source/Plugins/SymbolFile/Breakpad/SymbolFileBreakpad.cpp
@ -25,7 +25,7 @@ using namespace lldb;
 using namespace lldb_private;
 using namespace lldb_private::breakpad;

-LLDB_PLUGIN(SymbolFileBreakpad)
+LLDB_PLUGIN_DEFINE(SymbolFileBreakpad)

 char SymbolFileBreakpad::ID;

--- a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
+++ b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
@ -94,7 +94,7 @@
 using namespace lldb;
 using namespace lldb_private;

-LLDB_PLUGIN(SymbolFileDWARF)
+LLDB_PLUGIN_DEFINE(SymbolFileDWARF)

 char SymbolFileDWARF::ID;

--- a/lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.cpp
+++ b/lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.cpp
@ -58,7 +58,7 @@ using namespace lldb;
 using namespace lldb_private;
 using namespace llvm::pdb;

-LLDB_PLUGIN(SymbolFilePDB)
+LLDB_PLUGIN_DEFINE(SymbolFilePDB)

 char SymbolFilePDB::ID;

--- a/lldb/source/Plugins/SymbolFile/Symtab/SymbolFileSymtab.cpp
+++ b/lldb/source/Plugins/SymbolFile/Symtab/SymbolFileSymtab.cpp
@ -25,7 +25,7 @@
 using namespace lldb;
 using namespace lldb_private;

-LLDB_PLUGIN(SymbolFileSymtab)
+LLDB_PLUGIN_DEFINE(SymbolFileSymtab)

 char SymbolFileSymtab::ID;

--- a/lldb/source/Plugins/SymbolVendor/ELF/SymbolVendorELF.cpp
+++ b/lldb/source/Plugins/SymbolVendor/ELF/SymbolVendorELF.cpp
@ -25,7 +25,7 @@
 using namespace lldb;
 using namespace lldb_private;

-LLDB_PLUGIN(SymbolVendorELF)
+LLDB_PLUGIN_DEFINE(SymbolVendorELF)

 // SymbolVendorELF constructor
 SymbolVendorELF::SymbolVendorELF(const lldb::ModuleSP &module_sp)
--- a/lldb/source/Plugins/SymbolVendor/MacOSX/SymbolVendorMacOSX.cpp
+++ b/lldb/source/Plugins/SymbolVendor/MacOSX/SymbolVendorMacOSX.cpp
@ -26,7 +26,7 @@
 using namespace lldb;
 using namespace lldb_private;

-LLDB_PLUGIN(SymbolVendorMacOSX)
+LLDB_PLUGIN_DEFINE(SymbolVendorMacOSX)

 // SymbolVendorMacOSX constructor
 SymbolVendorMacOSX::SymbolVendorMacOSX(const lldb::ModuleSP &module_sp)
--- a/lldb/source/Plugins/SymbolVendor/wasm/SymbolVendorWasm.cpp
+++ b/lldb/source/Plugins/SymbolVendor/wasm/SymbolVendorWasm.cpp
@ -26,7 +26,7 @@ using namespace lldb;
 using namespace lldb_private;
 using namespace lldb_private::wasm;

-LLDB_PLUGIN(SymbolVendorWasm)
+LLDB_PLUGIN_DEFINE(SymbolVendorWasm)

 // SymbolVendorWasm constructor
 SymbolVendorWasm::SymbolVendorWasm(const lldb::ModuleSP &module_sp)
--- a/lldb/source/Plugins/SystemRuntime/MacOSX/SystemRuntimeMacOSX.cpp
+++ b/lldb/source/Plugins/SystemRuntime/MacOSX/SystemRuntimeMacOSX.cpp
@ -34,7 +34,7 @@
 using namespace lldb;
 using namespace lldb_private;

-LLDB_PLUGIN(SystemRuntimeMacOSX)
+LLDB_PLUGIN_DEFINE(SystemRuntimeMacOSX)

 // Create an instance of this class. This function is filled into the plugin
 // info class that gets handed out by the plugin factory and allows the lldb to
--- a/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp
+++ b/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp
@ -81,7 +81,7 @@ using namespace lldb_private;
 using namespace clang;
 using llvm::StringSwitch;

-LLDB_PLUGIN(TypeSystemClang)
+LLDB_PLUGIN_DEFINE(TypeSystemClang)

 namespace {
 #ifdef LLDB_CONFIGURATION_DEBUG
--- a/lldb/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.cpp
+++ b/lldb/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.cpp
@ -28,7 +28,7 @@
 using namespace lldb;
 using namespace lldb_private;

-LLDB_PLUGIN(UnwindAssemblyInstEmulation)
+LLDB_PLUGIN_DEFINE(UnwindAssemblyInstEmulation)

 //  UnwindAssemblyInstEmulation method definitions

--- a/lldb/source/Plugins/UnwindAssembly/x86/UnwindAssembly-x86.cpp
+++ b/lldb/source/Plugins/UnwindAssembly/x86/UnwindAssembly-x86.cpp
@ -30,7 +30,7 @@
 using namespace lldb;
 using namespace lldb_private;

-LLDB_PLUGIN(UnwindAssembly_x86)
+LLDB_PLUGIN_DEFINE(UnwindAssembly_x86)

 //  UnwindAssemblyParser_x86 method definitions