Index: lib/clang/libllvm/Makefile
===================================================================
--- lib/clang/libllvm/Makefile
+++ lib/clang/libllvm/Makefile
@@ -820,7 +820,7 @@
 SRCS_MIN+=	Support/regexec.c
 SRCS_MIN+=	Support/regfree.c
 SRCS_MIN+=	Support/regstrlcpy.c
-SRCS_LLD+=	Support/xxhash.cpp
+SRCS_MIN+=	Support/xxhash.cpp
 SRCS_MIN+=	TableGen/Error.cpp
 SRCS_MIN+=	TableGen/JSONBackend.cpp
 SRCS_MIN+=	TableGen/Main.cpp
Index: lib/clang/libllvmminimal/Makefile
===================================================================
--- lib/clang/libllvmminimal/Makefile
+++ lib/clang/libllvmminimal/Makefile
@@ -19,6 +19,7 @@
 SRCS+=		Support/ErrorHandling.cpp
 SRCS+=		Support/FoldingSet.cpp
 SRCS+=		Support/FormattedStream.cpp
+SRCS+=		Support/FormatVariadic.cpp
 SRCS+=		Support/Hashing.cpp
 SRCS+=		Support/Host.cpp
 SRCS+=		Support/IntEqClasses.cpp