diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2017-01-04 18:54:20 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2017-01-04 18:54:20 +0000 |
| commit | 0fc5d23818a241ca5661c63c02ba0d118a28a473 (patch) | |
| tree | 0e58ca56fda710a0d05be0bbc7832bb240043bae | |
| parent | 1419873d240235b47e806af0bf8863d6a336c5d2 (diff) | |
| download | src-0fc5d23818a241ca5661c63c02ba0d118a28a473.tar.gz src-0fc5d23818a241ca5661c63c02ba0d118a28a473.zip | |
Update lld Version.inc and libllvm/Makefile to match.
Notes
Notes:
svn path=/projects/clang400-import/; revision=311302
| -rw-r--r-- | lib/clang/include/lld/Config/Version.inc | 10 | ||||
| -rw-r--r-- | lib/clang/libllvm/Makefile | 5 |
2 files changed, 9 insertions, 6 deletions
diff --git a/lib/clang/include/lld/Config/Version.inc b/lib/clang/include/lld/Config/Version.inc index 42ac849c7719..7a5475801c42 100644 --- a/lib/clang/include/lld/Config/Version.inc +++ b/lib/clang/include/lld/Config/Version.inc @@ -1,8 +1,8 @@ // $FreeBSD$ -#define LLD_VERSION 3.9 -#define LLD_VERSION_MAJOR 3 -#define LLD_VERSION_MINOR 9 -#define LLD_REVISION_STRING "3.9" +#define LLD_VERSION 4.0.0 +#define LLD_VERSION_STRING "4.0.0" +#define LLD_VERSION_MAJOR 4 +#define LLD_VERSION_MINOR 0 +#define LLD_REVISION_STRING "290798" #define LLD_REPOSITORY_STRING "FreeBSD" - diff --git a/lib/clang/libllvm/Makefile b/lib/clang/libllvm/Makefile index 5a37e6e8a8ec..252bea9bab81 100644 --- a/lib/clang/libllvm/Makefile +++ b/lib/clang/libllvm/Makefile @@ -692,7 +692,7 @@ SRCS_MIN+= Support/regerror.c SRCS_MIN+= Support/regexec.c SRCS_MIN+= Support/regfree.c SRCS_MIN+= Support/regstrlcpy.c -#SRCS_MIN+= Support/xxhash.cpp +SRCS_LLD+= Support/xxhash.cpp SRCS_MIN+= TableGen/Error.cpp SRCS_MIN+= TableGen/Main.cpp SRCS_MIN+= TableGen/Record.cpp @@ -1156,6 +1156,9 @@ SRCS_ALL+= ${SRCS_FUL} .if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLD} != "no" SRCS_ALL+= ${SRCS_EXL} .endif +.if ${MK_LLD} != "no" +SRCS_ALL+= ${SRCS_LLD} +.endif .if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLDB} != "no" SRCS_ALL+= ${SRCS_XDB} .endif |