mirror of
https://github.com/RPCSX/llvm.git
synced 2026-01-31 01:05:23 +01:00
Merging r229343 and r229351:
------------------------------------------------------------------------ r229343 | lhames | 2015-02-15 15:22:43 -0800 (Sun, 15 Feb 2015) | 6 lines [ExecutionEngine] Fix dependence issue by moving RTDyldMemoryManager into RuntimeDyld. This should fix http://llvm.org/PR22593. ------------------------------------------------------------------------ r229351 | chapuni | 2015-02-15 18:13:30 -0800 (Sun, 15 Feb 2015) | 1 line [CMake] Add RuntimeDyld to libdeps corresponding to r229343. git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_36@229553 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@@ -4,6 +4,7 @@ set(LLVM_LINK_COMPONENTS
|
||||
ExecutionEngine
|
||||
InstCombine
|
||||
MC
|
||||
RuntimeDyld
|
||||
ScalarOpts
|
||||
Support
|
||||
native
|
||||
|
||||
@@ -4,7 +4,6 @@ add_llvm_library(LLVMExecutionEngine
|
||||
ExecutionEngine.cpp
|
||||
ExecutionEngineBindings.cpp
|
||||
GDBRegistrationListener.cpp
|
||||
RTDyldMemoryManager.cpp
|
||||
TargetSelect.cpp
|
||||
)
|
||||
|
||||
|
||||
@@ -22,4 +22,4 @@ subdirectories = Interpreter MCJIT RuntimeDyld IntelJITEvents OProfileJIT
|
||||
type = Library
|
||||
name = ExecutionEngine
|
||||
parent = Libraries
|
||||
required_libraries = Core MC Object Support
|
||||
required_libraries = Core MC Object Support RuntimeDyld
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
add_llvm_library(LLVMRuntimeDyld
|
||||
RTDyldMemoryManager.cpp
|
||||
RuntimeDyld.cpp
|
||||
RuntimeDyldChecker.cpp
|
||||
RuntimeDyldELF.cpp
|
||||
|
||||
@@ -10,6 +10,7 @@ set(LLVM_LINK_COMPONENTS
|
||||
MC
|
||||
MCJIT
|
||||
Object
|
||||
RuntimeDyld
|
||||
SelectionDAG
|
||||
Support
|
||||
native
|
||||
|
||||
@@ -3,6 +3,7 @@ set(LLVM_LINK_COMPONENTS
|
||||
ExecutionEngine
|
||||
Interpreter
|
||||
MC
|
||||
RuntimeDyld
|
||||
Support
|
||||
)
|
||||
|
||||
|
||||
@@ -5,6 +5,7 @@ set(LLVM_LINK_COMPONENTS
|
||||
IPO
|
||||
MC
|
||||
MCJIT
|
||||
RuntimeDyld
|
||||
ScalarOpts
|
||||
Support
|
||||
Target
|
||||
|
||||
Reference in New Issue
Block a user