diff --git a/lldb/source/Plugins/Process/Utility/FreeBSDSignals.h b/lldb/include/lldb/Target/FreeBSDSignals.h rename from lldb/source/Plugins/Process/Utility/FreeBSDSignals.h rename to lldb/include/lldb/Target/FreeBSDSignals.h diff --git a/lldb/source/Plugins/Process/Utility/GDBRemoteSignals.h b/lldb/include/lldb/Target/GDBRemoteSignals.h rename from lldb/source/Plugins/Process/Utility/GDBRemoteSignals.h rename to lldb/include/lldb/Target/GDBRemoteSignals.h diff --git a/lldb/source/Plugins/Process/Utility/LinuxSignals.h b/lldb/include/lldb/Target/LinuxSignals.h rename from lldb/source/Plugins/Process/Utility/LinuxSignals.h rename to lldb/include/lldb/Target/LinuxSignals.h diff --git a/lldb/source/Plugins/Process/Utility/MipsLinuxSignals.h b/lldb/include/lldb/Target/MipsLinuxSignals.h rename from lldb/source/Plugins/Process/Utility/MipsLinuxSignals.h rename to lldb/include/lldb/Target/MipsLinuxSignals.h diff --git a/lldb/source/Plugins/Process/Utility/NetBSDSignals.h b/lldb/include/lldb/Target/NetBSDSignals.h rename from lldb/source/Plugins/Process/Utility/NetBSDSignals.h rename to lldb/include/lldb/Target/NetBSDSignals.h diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/CMakeLists.txt b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/CMakeLists.txt --- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/CMakeLists.txt +++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/CMakeLists.txt @@ -20,6 +20,7 @@ lldbPluginExpressionParserClang lldbPluginCPPRuntime lldbPluginTypeSystemClang + lldbPluginProcessUtility CLANG_LIBS clangAST LINK_COMPONENTS diff --git a/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.h b/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.h --- a/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.h +++ b/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.h @@ -12,9 +12,9 @@ #include -#include "Plugins/Process/Utility/GDBRemoteSignals.h" #include "Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.h" #include "Plugins/Process/gdb-remote/GDBRemoteCommunicationReplayServer.h" +#include "lldb/Target/GDBRemoteSignals.h" #include "lldb/Target/Platform.h" namespace lldb_private { diff --git a/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp b/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp --- a/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp +++ b/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp @@ -20,6 +20,7 @@ #include "lldb/Host/Host.h" #include "lldb/Host/HostInfo.h" #include "lldb/Host/PosixApi.h" +#include "lldb/Target/GDBRemoteSignals.h" #include "lldb/Target/Process.h" #include "lldb/Target/Target.h" #include "lldb/Utility/FileSpec.h" @@ -29,7 +30,6 @@ #include "lldb/Utility/StreamString.h" #include "lldb/Utility/UriParser.h" -#include "Plugins/Process/Utility/GDBRemoteSignals.h" #include "Plugins/Process/gdb-remote/ProcessGDBRemote.h" using namespace lldb; diff --git a/lldb/source/Plugins/Process/Utility/CMakeLists.txt b/lldb/source/Plugins/Process/Utility/CMakeLists.txt --- a/lldb/source/Plugins/Process/Utility/CMakeLists.txt +++ b/lldb/source/Plugins/Process/Utility/CMakeLists.txt @@ -1,20 +1,15 @@ add_lldb_library(lldbPluginProcessUtility AuxVector.cpp DynamicRegisterInfo.cpp - FreeBSDSignals.cpp - GDBRemoteSignals.cpp HistoryThread.cpp HistoryUnwind.cpp InferiorCallPOSIX.cpp LinuxProcMaps.cpp - LinuxSignals.cpp MemoryTagManagerAArch64MTE.cpp - MipsLinuxSignals.cpp NativeProcessSoftwareSingleStep.cpp NativeRegisterContextDBReg_arm64.cpp NativeRegisterContextDBReg_x86.cpp NativeRegisterContextRegisterInfo.cpp - NetBSDSignals.cpp RegisterContext_x86.cpp RegisterContextDarwin_arm.cpp RegisterContextDarwin_arm64.cpp diff --git a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp --- a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp +++ b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp @@ -60,6 +60,7 @@ #include "lldb/Symbol/ObjectFile.h" #include "lldb/Target/ABI.h" #include "lldb/Target/DynamicLoader.h" +#include "lldb/Target/GDBRemoteSignals.h" #include "lldb/Target/MemoryRegionInfo.h" #include "lldb/Target/SystemRuntime.h" #include "lldb/Target/Target.h" @@ -74,7 +75,6 @@ #include "GDBRemoteRegisterContext.h" #include "Plugins/Platform/MacOSX/PlatformRemoteiOS.h" -#include "Plugins/Process/Utility/GDBRemoteSignals.h" #include "Plugins/Process/Utility/InferiorCallPOSIX.h" #include "Plugins/Process/Utility/StopInfoMachException.h" #include "ProcessGDBRemote.h" diff --git a/lldb/source/Target/CMakeLists.txt b/lldb/source/Target/CMakeLists.txt --- a/lldb/source/Target/CMakeLists.txt +++ b/lldb/source/Target/CMakeLists.txt @@ -10,16 +10,21 @@ ABI.cpp AssertFrameRecognizer.cpp ExecutionContext.cpp + FreeBSDSignals.cpp + GDBRemoteSignals.cpp InstrumentationRuntime.cpp InstrumentationRuntimeStopInfo.cpp JITLoader.cpp JITLoaderList.cpp Language.cpp LanguageRuntime.cpp + LinuxSignals.cpp Memory.cpp MemoryHistory.cpp MemoryRegionInfo.cpp + MipsLinuxSignals.cpp ModuleCache.cpp + NetBSDSignals.cpp OperatingSystem.cpp PathMappingList.cpp Platform.cpp @@ -82,7 +87,6 @@ lldbInterpreter lldbSymbol lldbUtility - lldbPluginProcessUtility LINK_COMPONENTS Support diff --git a/lldb/source/Plugins/Process/Utility/FreeBSDSignals.cpp b/lldb/source/Target/FreeBSDSignals.cpp rename from lldb/source/Plugins/Process/Utility/FreeBSDSignals.cpp rename to lldb/source/Target/FreeBSDSignals.cpp --- a/lldb/source/Plugins/Process/Utility/FreeBSDSignals.cpp +++ b/lldb/source/Target/FreeBSDSignals.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include "FreeBSDSignals.h" +#include "lldb/Target/FreeBSDSignals.h" using namespace lldb_private; diff --git a/lldb/source/Plugins/Process/Utility/GDBRemoteSignals.cpp b/lldb/source/Target/GDBRemoteSignals.cpp rename from lldb/source/Plugins/Process/Utility/GDBRemoteSignals.cpp rename to lldb/source/Target/GDBRemoteSignals.cpp --- a/lldb/source/Plugins/Process/Utility/GDBRemoteSignals.cpp +++ b/lldb/source/Target/GDBRemoteSignals.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include "GDBRemoteSignals.h" +#include "lldb/Target/GDBRemoteSignals.h" using namespace lldb_private; diff --git a/lldb/source/Plugins/Process/Utility/LinuxSignals.cpp b/lldb/source/Target/LinuxSignals.cpp rename from lldb/source/Plugins/Process/Utility/LinuxSignals.cpp rename to lldb/source/Target/LinuxSignals.cpp --- a/lldb/source/Plugins/Process/Utility/LinuxSignals.cpp +++ b/lldb/source/Target/LinuxSignals.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include "LinuxSignals.h" +#include "lldb/Target/LinuxSignals.h" using namespace lldb_private; diff --git a/lldb/source/Plugins/Process/Utility/MipsLinuxSignals.cpp b/lldb/source/Target/MipsLinuxSignals.cpp rename from lldb/source/Plugins/Process/Utility/MipsLinuxSignals.cpp rename to lldb/source/Target/MipsLinuxSignals.cpp --- a/lldb/source/Plugins/Process/Utility/MipsLinuxSignals.cpp +++ b/lldb/source/Target/MipsLinuxSignals.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include "MipsLinuxSignals.h" +#include "lldb/Target/MipsLinuxSignals.h" using namespace lldb_private; diff --git a/lldb/source/Plugins/Process/Utility/NetBSDSignals.cpp b/lldb/source/Target/NetBSDSignals.cpp rename from lldb/source/Plugins/Process/Utility/NetBSDSignals.cpp rename to lldb/source/Target/NetBSDSignals.cpp --- a/lldb/source/Plugins/Process/Utility/NetBSDSignals.cpp +++ b/lldb/source/Target/NetBSDSignals.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include "NetBSDSignals.h" +#include "lldb/Target/NetBSDSignals.h" using namespace lldb_private; diff --git a/lldb/source/Target/UnixSignals.cpp b/lldb/source/Target/UnixSignals.cpp --- a/lldb/source/Target/UnixSignals.cpp +++ b/lldb/source/Target/UnixSignals.cpp @@ -7,12 +7,12 @@ //===----------------------------------------------------------------------===// #include "lldb/Target/UnixSignals.h" -#include "Plugins/Process/Utility/FreeBSDSignals.h" -#include "Plugins/Process/Utility/LinuxSignals.h" -#include "Plugins/Process/Utility/MipsLinuxSignals.h" -#include "Plugins/Process/Utility/NetBSDSignals.h" #include "lldb/Host/HostInfo.h" #include "lldb/Host/StringConvert.h" +#include "lldb/Target/FreeBSDSignals.h" +#include "lldb/Target/LinuxSignals.h" +#include "lldb/Target/MipsLinuxSignals.h" +#include "lldb/Target/NetBSDSignals.h" #include "lldb/Utility/ArchSpec.h" using namespace lldb_private; diff --git a/lldb/unittests/Process/gdb-remote/GDBRemoteClientBaseTest.cpp b/lldb/unittests/Process/gdb-remote/GDBRemoteClientBaseTest.cpp --- a/lldb/unittests/Process/gdb-remote/GDBRemoteClientBaseTest.cpp +++ b/lldb/unittests/Process/gdb-remote/GDBRemoteClientBaseTest.cpp @@ -9,9 +9,9 @@ #include "GDBRemoteTestUtils.h" -#include "Plugins/Process/Utility/LinuxSignals.h" #include "Plugins/Process/gdb-remote/GDBRemoteClientBase.h" #include "Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.h" +#include "lldb/Target/LinuxSignals.h" #include "lldb/Utility/GDBRemote.h" #include "llvm/ADT/STLExtras.h" #include "llvm/Testing/Support/Error.h"