From da9d3879294e1f12014d6f9394830584e4091ea7 Mon Sep 17 00:00:00 2001
From: Lang Hames <lhames@gmail.com>
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.

llvm-svn: 229343
---
 llvm/lib/ExecutionEngine/CMakeLists.txt                            | 1 -
 llvm/lib/ExecutionEngine/LLVMBuild.txt                             | 2 +-
 llvm/lib/ExecutionEngine/RuntimeDyld/CMakeLists.txt                | 1 +
 llvm/lib/ExecutionEngine/{ => RuntimeDyld}/RTDyldMemoryManager.cpp | 0
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename llvm/lib/ExecutionEngine/{ => RuntimeDyld}/RTDyldMemoryManager.cpp (100%)

diff --git a/llvm/lib/ExecutionEngine/CMakeLists.txt b/llvm/lib/ExecutionEngine/CMakeLists.txt
index 723cae9..e8a18d3 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 de8918c..8fdda9a 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 5790eee..12bbcc6 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
similarity index 100%
rename from llvm/lib/ExecutionEngine/RTDyldMemoryManager.cpp
rename to llvm/lib/ExecutionEngine/RuntimeDyld/RTDyldMemoryManager.cpp
-- 
2.7.4