summaryrefslogtreecommitdiffstats
path: root/llvm/lib/ExecutionEngine
diff options
context:
space:
mode:
authorLang Hames <lhames@gmail.com>2015-02-15 23:22:43 +0000
committerLang Hames <lhames@gmail.com>2015-02-15 23:22:43 +0000
commitda9d3879294e1f12014d6f9394830584e4091ea7 (patch)
tree1681053b239669023cc1c454bc53febca8d83639 /llvm/lib/ExecutionEngine
parent432092ebdbfc7d2506502d65040c45538763294e (diff)
downloadbcm5719-llvm-da9d3879294e1f12014d6f9394830584e4091ea7.tar.gz
bcm5719-llvm-da9d3879294e1f12014d6f9394830584e4091ea7.zip
[ExecutionEngine] Fix dependence issue by moving RTDyldMemoryManager into
RuntimeDyld. This should fix http://llvm.org/PR22593. llvm-svn: 229343
Diffstat (limited to 'llvm/lib/ExecutionEngine')
-rw-r--r--llvm/lib/ExecutionEngine/CMakeLists.txt1
-rw-r--r--llvm/lib/ExecutionEngine/LLVMBuild.txt2
-rw-r--r--llvm/lib/ExecutionEngine/RuntimeDyld/CMakeLists.txt1
-rw-r--r--llvm/lib/ExecutionEngine/RuntimeDyld/RTDyldMemoryManager.cpp (renamed from llvm/lib/ExecutionEngine/RTDyldMemoryManager.cpp)0
4 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/ExecutionEngine/CMakeLists.txt b/llvm/lib/ExecutionEngine/CMakeLists.txt
index 723cae98464..e8a18d3e5af 100644
--- a/llvm/lib/ExecutionEngine/CMakeLists.txt
+++ b/llvm/lib/ExecutionEngine/CMakeLists.txt
@@ -4,7 +4,6 @@ add_llvm_library(LLVMExecutionEngine
ExecutionEngine.cpp
ExecutionEngineBindings.cpp
GDBRegistrationListener.cpp
- RTDyldMemoryManager.cpp
SectionMemoryManager.cpp
TargetSelect.cpp
diff --git a/llvm/lib/ExecutionEngine/LLVMBuild.txt b/llvm/lib/ExecutionEngine/LLVMBuild.txt
index de8918c806b..8fdda9a6a39 100644
--- a/llvm/lib/ExecutionEngine/LLVMBuild.txt
+++ b/llvm/lib/ExecutionEngine/LLVMBuild.txt
@@ -22,4 +22,4 @@ subdirectories = Interpreter MCJIT RuntimeDyld IntelJITEvents OProfileJIT Orc
type = Library
name = ExecutionEngine
parent = Libraries
-required_libraries = Core MC Object Support
+required_libraries = Core MC Object Support RuntimeDyld
diff --git a/llvm/lib/ExecutionEngine/RuntimeDyld/CMakeLists.txt b/llvm/lib/ExecutionEngine/RuntimeDyld/CMakeLists.txt
index 5790eee9c82..12bbcc61db7 100644
--- a/llvm/lib/ExecutionEngine/RuntimeDyld/CMakeLists.txt
+++ b/llvm/lib/ExecutionEngine/RuntimeDyld/CMakeLists.txt
@@ -1,4 +1,5 @@
add_llvm_library(LLVMRuntimeDyld
+ RTDyldMemoryManager.cpp
RuntimeDyld.cpp
RuntimeDyldChecker.cpp
RuntimeDyldELF.cpp
diff --git a/llvm/lib/ExecutionEngine/RTDyldMemoryManager.cpp b/llvm/lib/ExecutionEngine/RuntimeDyld/RTDyldMemoryManager.cpp
index 2a5e4f83228..2a5e4f83228 100644
--- a/llvm/lib/ExecutionEngine/RTDyldMemoryManager.cpp
+++ b/llvm/lib/ExecutionEngine/RuntimeDyld/RTDyldMemoryManager.cpp
OpenPOWER on IntegriCloud