Commit 2d3ecade authored by Jonas Devlieghere's avatar Jonas Devlieghere
Browse files

[lldb/Plugins] Move PlatformRemoteiOS into PlatformMacOSX (NFCI) 

Move the logic for initialization and termination for PlatformRemoteiOS
into PlatformMacOSX, like we did for the other Darwin platforms in
a731c6ba.
parent 86f9117d

lldb/source/API/SystemInitializerFull.cpp

+0 −3
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ LLDB_PLUGIN_DECLARE(PlatformNetBSD); 
LLDB_PLUGIN_DECLARE(PlatformOpenBSD);

LLDB_PLUGIN_DECLARE(PlatformWindows);

LLDB_PLUGIN_DECLARE(PlatformAndroid);

LLDB_PLUGIN_DECLARE(PlatformRemoteiOS);

LLDB_PLUGIN_DECLARE(PlatformMacOSX);

LLDB_PLUGIN_DECLARE(TypeSystemClang);

LLDB_PLUGIN_DECLARE(ArchitectureArm);
@@ -187,7 +186,6 @@ llvm::Error SystemInitializerFull::Initialize() { 
  LLDB_PLUGIN_INITIALIZE(PlatformOpenBSD);

  LLDB_PLUGIN_INITIALIZE(PlatformWindows);

  LLDB_PLUGIN_INITIALIZE(PlatformAndroid);

  LLDB_PLUGIN_INITIALIZE(PlatformRemoteiOS);

  LLDB_PLUGIN_INITIALIZE(PlatformMacOSX);



  // Initialize LLVM and Clang
@@ -363,7 +361,6 @@ void SystemInitializerFull::Terminate() { 
  LLDB_PLUGIN_TERMINATE(PlatformOpenBSD);

  LLDB_PLUGIN_TERMINATE(PlatformWindows);

  LLDB_PLUGIN_TERMINATE(PlatformAndroid);

  LLDB_PLUGIN_TERMINATE(PlatformRemoteiOS);

  LLDB_PLUGIN_TERMINATE(PlatformMacOSX);



  LLDB_PLUGIN_TERMINATE(ObjectFileBreakpad);

lldb/source/Plugins/Platform/MacOSX/PlatformMacOSX.cpp

+3 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
//===----------------------------------------------------------------------===//



#include "PlatformMacOSX.h"

#include "PlatformRemoteiOS.h"

#if defined(__APPLE__)

#include "PlatformAppleTVSimulator.h"

#include "PlatformAppleWatchSimulator.h"
@@ -44,6 +45,7 @@ static uint32_t g_initialize_count = 0; 


void PlatformMacOSX::Initialize() {

  PlatformDarwin::Initialize();

  PlatformRemoteiOS::Initialize();

#if defined(__APPLE__)

  PlatformiOSSimulator::Initialize();

  PlatformDarwinKernel::Initialize();
@@ -82,6 +84,7 @@ void PlatformMacOSX::Terminate() { 
  PlatformDarwinKernel::Terminate();

  PlatformiOSSimulator::Terminate();

#endif

  PlatformRemoteiOS::Terminate();

  PlatformDarwin::Terminate();

}

lldb/tools/lldb-test/SystemInitializerTest.cpp

+0 −3
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ LLDB_PLUGIN_DECLARE(PlatformNetBSD); 
LLDB_PLUGIN_DECLARE(PlatformOpenBSD);

LLDB_PLUGIN_DECLARE(PlatformWindows);

LLDB_PLUGIN_DECLARE(PlatformAndroid);

LLDB_PLUGIN_DECLARE(PlatformRemoteiOS);

LLDB_PLUGIN_DECLARE(PlatformMacOSX);

LLDB_PLUGIN_DECLARE(TypeSystemClang);

LLDB_PLUGIN_DECLARE(ArchitectureArm);
@@ -162,7 +161,6 @@ llvm::Error SystemInitializerTest::Initialize() { 
  LLDB_PLUGIN_INITIALIZE(PlatformOpenBSD);

  LLDB_PLUGIN_INITIALIZE(PlatformWindows);

  LLDB_PLUGIN_INITIALIZE(PlatformAndroid);

  LLDB_PLUGIN_INITIALIZE(PlatformRemoteiOS);

  LLDB_PLUGIN_INITIALIZE(PlatformMacOSX);



  // Initialize LLVM and Clang
@@ -338,7 +336,6 @@ void SystemInitializerTest::Terminate() { 
  LLDB_PLUGIN_TERMINATE(PlatformOpenBSD);

  LLDB_PLUGIN_TERMINATE(PlatformWindows);

  LLDB_PLUGIN_TERMINATE(PlatformAndroid);

  LLDB_PLUGIN_TERMINATE(PlatformRemoteiOS);

  LLDB_PLUGIN_TERMINATE(PlatformMacOSX);



  LLDB_PLUGIN_TERMINATE(ObjectFileBreakpad);