3 files changed, 4 insertions, 7 deletions

diff --git a/lib/clang/libclang/Makefile b/lib/clang/libclang/Makefile
index 54fb0d7738d8..f1e8c99f7adb 100644
--- a/lib/clang/libclang/Makefile
+++ b/lib/clang/libclang/Makefile
@@ -127,7 +127,6 @@ SRCS_MIN+=	Analysis/ReachableCode.cpp
 SRCS_MIN+=	Analysis/ScanfFormatString.cpp
 SRCS_MIN+=	Analysis/ThreadSafety.cpp
 SRCS_MIN+=	Analysis/ThreadSafetyCommon.cpp
-SRCS_MIN+=	Analysis/ThreadSafetyLogical.cpp
 SRCS_MIN+=	Analysis/ThreadSafetyTIL.cpp
 SRCS_MIN+=	Analysis/UninitializedValues.cpp
 SRCS_MIN+=	Basic/Attributes.cpp
@@ -272,8 +271,6 @@ SRCS_MIN+=	Frontend/Rewrite/FrontendActions.cpp
 SRCS_MIN+=	Frontend/Rewrite/HTMLPrint.cpp
 SRCS_MIN+=	Frontend/Rewrite/InclusionRewriter.cpp
 SRCS_MIN+=	Frontend/Rewrite/RewriteMacros.cpp
-SRCS_MIN+=	Frontend/Rewrite/RewriteModernObjC.cpp
-SRCS_MIN+=	Frontend/Rewrite/RewriteObjC.cpp
 SRCS_MIN+=	Frontend/Rewrite/RewriteTest.cpp
 SRCS_MIN+=	Frontend/SerializedDiagnosticPrinter.cpp
 SRCS_MIN+=	Frontend/SerializedDiagnosticReader.cpp
diff --git a/lib/clang/liblldb/Makefile b/lib/clang/liblldb/Makefile
index 189119a49979..5b3e38b60966 100644
--- a/lib/clang/liblldb/Makefile
+++ b/lib/clang/liblldb/Makefile
@@ -31,7 +31,6 @@ SRCS+=		API/SBEvent.cpp
 SRCS+=		API/SBExecutionContext.cpp
 SRCS+=		API/SBExpressionOptions.cpp
 SRCS+=		API/SBFileSpec.cpp
-SRCS+=		API/SBFileSpecList.cpp
 SRCS+=		API/SBFrame.cpp
 SRCS+=		API/SBFunction.cpp
 SRCS+=		API/SBHostOS.cpp
@@ -42,7 +41,6 @@ SRCS+=		API/SBLaunchInfo.cpp
 SRCS+=		API/SBLineEntry.cpp
 SRCS+=		API/SBListener.cpp
 SRCS+=		API/SBMemoryRegionInfo.cpp
-SRCS+=		API/SBMemoryRegionInfoList.cpp
 SRCS+=		API/SBModule.cpp
 SRCS+=		API/SBModuleSpec.cpp
 SRCS+=		API/SBPlatform.cpp
@@ -71,7 +69,6 @@ SRCS+=		API/SBTypeSummary.cpp
 SRCS+=		API/SBUnixSignals.cpp
 SRCS+=		API/SBValue.cpp
 SRCS+=		API/SBValueList.cpp
-SRCS+=		API/SBVariablesOptions.cpp
 SRCS+=		API/SBWatchpoint.cpp
 SRCS+=		API/SystemInitializerFull.cpp
 SRCS+=		Breakpoint/Breakpoint.cpp
diff --git a/lib/clang/libllvm/Makefile b/lib/clang/libllvm/Makefile
index 1ec73bd8adbc..4aefc49ec6b7 100644
--- a/lib/clang/libllvm/Makefile
+++ b/lib/clang/libllvm/Makefile
@@ -656,7 +656,7 @@ SRCS_MIN+=	Support/Regex.cpp
 SRCS_MIN+=	Support/SHA1.cpp
 SRCS_MIN+=	Support/ScaledNumber.cpp
 SRCS_MIN+=	Support/ScopedPrinter.cpp
-SRCS_MIN+=	Support/SearchForAddressOfSpecialSymbol.cpp
+SRCS_LDB+=	Support/SearchForAddressOfSpecialSymbol.cpp
 SRCS_MIN+=	Support/Signals.cpp
 SRCS_MIN+=	Support/SmallPtrSet.cpp
 SRCS_MIN+=	Support/SmallVector.cpp
@@ -1161,6 +1161,9 @@ SRCS_ALL+=	${SRCS_EXL}
 .if ${MK_LLD} != "no"
 SRCS_ALL+=	${SRCS_LLD}
 .endif
+.if ${MK_LLDB} != "no"
+SRCS_ALL+=	${SRCS_LDB}
+.endif
 .if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLDB} != "no"
 SRCS_ALL+=	${SRCS_XDB}
 .endif