diff options
| author | Lang Hames <lhames@gmail.com> | 2023-09-28 17:55:44 -0700 |
|---|---|---|
| committer | Lang Hames <lhames@gmail.com> | 2023-09-28 21:34:14 -0700 |
| commit | b2518971d82331b09d7630ac1aecbb49e876a496 (patch) | |
| tree | aac4d503649bcba5c0dbc8e4757f00769a9bd5fc /llvm/tools | |
| parent | ab472cd4ea12b916e53a9121cf72664cf2c9346a (diff) | |
| download | llvm-b2518971d82331b09d7630ac1aecbb49e876a496.zip llvm-b2518971d82331b09d7630ac1aecbb49e876a496.tar.gz llvm-b2518971d82331b09d7630ac1aecbb49e876a496.tar.bz2 | |
Re-apply "[ORC] Add N_SO and N_OSO stabs entries to MachO debug..." with fixes.
This re-applies db51e572893, which was reverted in 05b1a2cb3e6 due to bot
failures. The DebuggerSupportPlugin now depends on DWARF, so it has been moved
to the new OrcDebugging library (as has the enableDebuggerSupport API).
Diffstat (limited to 'llvm/tools')
| -rw-r--r-- | llvm/tools/lli/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | llvm/tools/lli/lli.cpp | 2 | ||||
| -rw-r--r-- | llvm/tools/llvm-jitlink/llvm-jitlink.cpp | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/llvm/tools/lli/CMakeLists.txt b/llvm/tools/lli/CMakeLists.txt index 3b3cf91..315de28 100644 --- a/llvm/tools/lli/CMakeLists.txt +++ b/llvm/tools/lli/CMakeLists.txt @@ -12,8 +12,9 @@ set(LLVM_LINK_COMPONENTS MC MCJIT Object - OrcShared OrcJIT + OrcDebugging + OrcShared OrcTargetProcess Passes RuntimeDyld diff --git a/llvm/tools/lli/lli.cpp b/llvm/tools/lli/lli.cpp index abe1c75..9d95cbc 100644 --- a/llvm/tools/lli/lli.cpp +++ b/llvm/tools/lli/lli.cpp @@ -26,7 +26,7 @@ #include "llvm/ExecutionEngine/MCJIT.h" #include "llvm/ExecutionEngine/ObjectCache.h" #include "llvm/ExecutionEngine/Orc/DebugUtils.h" -#include "llvm/ExecutionEngine/Orc/DebuggerSupport.h" +#include "llvm/ExecutionEngine/Orc/Debugging/DebuggerSupport.h" #include "llvm/ExecutionEngine/Orc/EPCDynamicLibrarySearchGenerator.h" #include "llvm/ExecutionEngine/Orc/EPCEHFrameRegistrar.h" #include "llvm/ExecutionEngine/Orc/EPCGenericRTDyldMemoryManager.h" diff --git a/llvm/tools/llvm-jitlink/llvm-jitlink.cpp b/llvm/tools/llvm-jitlink/llvm-jitlink.cpp index 17aeb30..0709f29 100644 --- a/llvm/tools/llvm-jitlink/llvm-jitlink.cpp +++ b/llvm/tools/llvm-jitlink/llvm-jitlink.cpp @@ -18,8 +18,8 @@ #include "llvm/ExecutionEngine/Orc/COFFPlatform.h" #include "llvm/ExecutionEngine/Orc/COFFVCRuntimeSupport.h" #include "llvm/ExecutionEngine/Orc/DebugObjectManagerPlugin.h" -#include "llvm/ExecutionEngine/Orc/DebuggerSupportPlugin.h" #include "llvm/ExecutionEngine/Orc/Debugging/DebugInfoSupport.h" +#include "llvm/ExecutionEngine/Orc/Debugging/DebuggerSupportPlugin.h" #include "llvm/ExecutionEngine/Orc/Debugging/PerfSupportPlugin.h" #include "llvm/ExecutionEngine/Orc/ELFNixPlatform.h" #include "llvm/ExecutionEngine/Orc/EPCDebugObjectRegistrar.h" |