diff options
| author | dim <dim@FreeBSD.org> | 2015-02-19 22:20:19 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2015-02-19 22:20:19 +0000 |
| commit | 1e024675bcd5e4ace8bffb2dd6afd3fa8b8ad7f3 (patch) | |
| tree | 84663adb8262b7962030778aaba745cd98e8b356 /lib/clang | |
| parent | 184b3c7999c408b8e298b506ccfdff9d81c9ffd5 (diff) | |
| parent | 49b6407b6cc89756540e2097c1cf8b9bb4a422e1 (diff) | |
| download | FreeBSD-src-1e024675bcd5e4ace8bffb2dd6afd3fa8b8ad7f3.zip FreeBSD-src-1e024675bcd5e4ace8bffb2dd6afd3fa8b8ad7f3.tar.gz | |
Merge llvm 3.6.0rc4 from ^/vendor/llvm/dist, merge clang 3.6.0rc4 from
^/vendor/clang/dist, resolve conflicts, and update patches.
Diffstat (limited to 'lib/clang')
| -rw-r--r-- | lib/clang/include/clang/Basic/Version.inc | 4 | ||||
| -rw-r--r-- | lib/clang/libllvmexecutionengine/Makefile | 1 | ||||
| -rw-r--r-- | lib/clang/libllvmruntimedyld/Makefile | 3 |
3 files changed, 4 insertions, 4 deletions
diff --git a/lib/clang/include/clang/Basic/Version.inc b/lib/clang/include/clang/Basic/Version.inc index f771d21..775196c 100644 --- a/lib/clang/include/clang/Basic/Version.inc +++ b/lib/clang/include/clang/Basic/Version.inc @@ -6,6 +6,6 @@ #define CLANG_VERSION_PATCHLEVEL 0 #define CLANG_VENDOR "FreeBSD " -#define CLANG_VENDOR_SUFFIX " 20150214" +#define CLANG_VENDOR_SUFFIX " 20150219" -#define SVN_REVISION "229040" +#define SVN_REVISION "229772" diff --git a/lib/clang/libllvmexecutionengine/Makefile b/lib/clang/libllvmexecutionengine/Makefile index f8b5901..5a7e6c3 100644 --- a/lib/clang/libllvmexecutionengine/Makefile +++ b/lib/clang/libllvmexecutionengine/Makefile @@ -8,7 +8,6 @@ SRCDIR= lib/ExecutionEngine SRCS= ExecutionEngine.cpp \ ExecutionEngineBindings.cpp \ GDBRegistrationListener.cpp \ - RTDyldMemoryManager.cpp \ TargetSelect.cpp .include "../clang.lib.mk" diff --git a/lib/clang/libllvmruntimedyld/Makefile b/lib/clang/libllvmruntimedyld/Makefile index 0f92c5a..75eb843 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 |
