From 52b43c0fb339303fa58c68fddc31918e3ffb1672 Mon Sep 17 00:00:00 2001 From: Lang Hames Date: Sun, 15 Feb 2015 23:22:43 +0000 Subject: [PATCH] [ExecutionEngine] Fix dependence issue by moving RTDyldMemoryManager into RuntimeDyld. This should fix http://llvm.org/PR22593. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@229343 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/ExecutionEngine/CMakeLists.txt | 1 - lib/ExecutionEngine/LLVMBuild.txt | 2 +- lib/ExecutionEngine/RuntimeDyld/CMakeLists.txt | 1 + lib/ExecutionEngine/{ => RuntimeDyld}/RTDyldMemoryManager.cpp | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename lib/ExecutionEngine/{ => RuntimeDyld}/RTDyldMemoryManager.cpp (100%) diff --git a/lib/ExecutionEngine/CMakeLists.txt b/lib/ExecutionEngine/CMakeLists.txt index 723cae98464..e8a18d3e5af 100644 --- a/lib/ExecutionEngine/CMakeLists.txt +++ b/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/lib/ExecutionEngine/LLVMBuild.txt b/lib/ExecutionEngine/LLVMBuild.txt index de8918c806b..8fdda9a6a39 100644 --- a/lib/ExecutionEngine/LLVMBuild.txt +++ b/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/lib/ExecutionEngine/RuntimeDyld/CMakeLists.txt b/lib/ExecutionEngine/RuntimeDyld/CMakeLists.txt index 5790eee9c82..12bbcc61db7 100644 --- a/lib/ExecutionEngine/RuntimeDyld/CMakeLists.txt +++ b/lib/ExecutionEngine/RuntimeDyld/CMakeLists.txt @@ -1,4 +1,5 @@ add_llvm_library(LLVMRuntimeDyld + RTDyldMemoryManager.cpp RuntimeDyld.cpp RuntimeDyldChecker.cpp RuntimeDyldELF.cpp diff --git a/lib/ExecutionEngine/RTDyldMemoryManager.cpp b/lib/ExecutionEngine/RuntimeDyld/RTDyldMemoryManager.cpp similarity index 100% rename from lib/ExecutionEngine/RTDyldMemoryManager.cpp rename to lib/ExecutionEngine/RuntimeDyld/RTDyldMemoryManager.cpp -- 2.34.1