Commit f6eb7ae0 authored by Hans Wennborg's avatar Hans Wennborg
Browse files

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.

llvm-svn: 229553
parent 524b6abc

llvm/examples/Kaleidoscope/Chapter4/CMakeLists.txt

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ set(LLVM_LINK_COMPONENTS 
  ExecutionEngine

  InstCombine

  MC

  RuntimeDyld

  ScalarOpts

  Support

  native

llvm/lib/ExecutionEngine/CMakeLists.txt

+0 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ add_llvm_library(LLVMExecutionEngine 
  ExecutionEngine.cpp

  ExecutionEngineBindings.cpp

  GDBRegistrationListener.cpp

  RTDyldMemoryManager.cpp

  TargetSelect.cpp

  )

llvm/lib/ExecutionEngine/LLVMBuild.txt

+1 −1
Original line number Diff line number Diff line
@@ -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

llvm/lib/ExecutionEngine/RuntimeDyld/CMakeLists.txt

+1 −0
Original line number Diff line number Diff line 
add_llvm_library(LLVMRuntimeDyld

  RTDyldMemoryManager.cpp

  RuntimeDyld.cpp

  RuntimeDyldChecker.cpp

  RuntimeDyldELF.cpp