diff options
| author | dim <dim@FreeBSD.org> | 2015-02-14 14:13:00 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2015-02-14 14:13:00 +0000 |
| commit | 9377b5ad0feb5dd018ed6cfc6378ac19c1252dfe (patch) | |
| tree | a7bc5b362ad6182396e88b223352f75d52966813 /lib/clang | |
| parent | ff34755926ad8a77e4498e82a23c847d33c6c72d (diff) | |
| download | FreeBSD-src-9377b5ad0feb5dd018ed6cfc6378ac19c1252dfe.zip FreeBSD-src-9377b5ad0feb5dd018ed6cfc6378ac19c1252dfe.tar.gz | |
Merge llvm 3.6.0rc3 from ^/vendor/llvm/dist, merge clang 3.6.0rc3 from
^/vendor/clang/dist, resolve conflicts, and update patches README.
Diffstat (limited to 'lib/clang')
| -rw-r--r-- | lib/clang/include/clang/Basic/Version.inc | 4 | ||||
| -rw-r--r-- | lib/clang/include/llvm/Config/config.h | 3 | ||||
| -rw-r--r-- | lib/clang/liblldbPluginInstrumentationRuntimeAddressSanitizer/Makefile | 3 |
3 files changed, 7 insertions, 3 deletions
diff --git a/lib/clang/include/clang/Basic/Version.inc b/lib/clang/include/clang/Basic/Version.inc index d051870..f771d21 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 " 20150131" +#define CLANG_VENDOR_SUFFIX " 20150214" -#define SVN_REVISION "227651" +#define SVN_REVISION "229040" diff --git a/lib/clang/include/llvm/Config/config.h b/lib/clang/include/llvm/Config/config.h index 8ff9ed8..c6d500a 100644 --- a/lib/clang/include/llvm/Config/config.h +++ b/lib/clang/include/llvm/Config/config.h @@ -14,6 +14,9 @@ /* Define if we have libxml2 */ /* #undef CLANG_HAVE_LIBXML */ +/* Multilib suffix for libdir. */ +/* #undef CLANG_LIBDIR_SUFFIX */ + /* Relative directory for resource files */ #define CLANG_RESOURCE_DIR "" diff --git a/lib/clang/liblldbPluginInstrumentationRuntimeAddressSanitizer/Makefile b/lib/clang/liblldbPluginInstrumentationRuntimeAddressSanitizer/Makefile index 9b3ae98..bb02244 100644 --- a/lib/clang/liblldbPluginInstrumentationRuntimeAddressSanitizer/Makefile +++ b/lib/clang/liblldbPluginInstrumentationRuntimeAddressSanitizer/Makefile @@ -7,7 +7,8 @@ LIB= lldbPluginInstrumentationRuntimeAddressSanitizer SRCDIR= tools/lldb/source/Plugins/InstrumentationRuntime/AddressSanitizer SRCS= AddressSanitizerRuntime.cpp -TGHDRS= Attrs \ +TGHDRS= AttrList \ + Attrs \ DiagnosticCommonKinds \ DeclNodes \ StmtNodes \ |
