diff options
author | Dimitry Andric <dim@FreeBSD.org> | 2015-02-19 22:20:19 +0000 |
---|---|---|
committer | Dimitry Andric <dim@FreeBSD.org> | 2015-02-19 22:20:19 +0000 |
commit | b09980d164a93b277e787f450466f3690ca034c5 (patch) | |
tree | 84663adb8262b7962030778aaba745cd98e8b356 /lib/clang/libllvmruntimedyld | |
parent | 0d36d957d36f2e32ad9bf7fe44ad5a32fdc76b07 (diff) | |
parent | 8af9f2019d565de6161a3ce884a16942fe2dde29 (diff) | |
download | src-b09980d164a93b277e787f450466f3690ca034c5.tar.gz src-b09980d164a93b277e787f450466f3690ca034c5.zip |
Merge llvm 3.6.0rc4 from ^/vendor/llvm/dist, merge clang 3.6.0rc4 from
^/vendor/clang/dist, resolve conflicts, and update patches.
Notes
Notes:
svn path=/projects/clang360-import/; revision=279025
Diffstat (limited to 'lib/clang/libllvmruntimedyld')
-rw-r--r-- | lib/clang/libllvmruntimedyld/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/clang/libllvmruntimedyld/Makefile b/lib/clang/libllvmruntimedyld/Makefile index 0f92c5ad7609..75eb84338bab 100644 --- a/lib/clang/libllvmruntimedyld/Makefile +++ b/lib/clang/libllvmruntimedyld/Makefile @@ -5,7 +5,8 @@ LIB= llvmruntimedyld SRCDIR= lib/ExecutionEngine/RuntimeDyld -SRCS= RuntimeDyld.cpp \ +SRCS= RTDyldMemoryManager.cpp \ + RuntimeDyld.cpp \ RuntimeDyldChecker.cpp \ RuntimeDyldELF.cpp \ RuntimeDyldMachO.cpp |