73 files changed, 481 insertions, 230 deletions

diff --git a/gnu/usr.bin/cc/c++/Makefile.depend b/gnu/usr.bin/cc/c++/Makefile.depend
index e0c846e62e61..d16e7b05543e 100644
--- a/gnu/usr.bin/cc/c++/Makefile.depend
+++ b/gnu/usr.bin/cc/c++/Makefile.depend
@@ -2,8 +2,6 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
 	gnu/lib/libgcc \
 	gnu/usr.bin/cc/cc_tools \
@@ -13,6 +11,7 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libcompiler_rt \
 
 
 .include <dirdeps.mk>
diff --git a/gnu/usr.bin/cc/c++filt/Makefile.depend b/gnu/usr.bin/cc/c++filt/Makefile.depend
index 763be51c55b7..2db3c0066df0 100644
--- a/gnu/usr.bin/cc/c++filt/Makefile.depend
+++ b/gnu/usr.bin/cc/c++filt/Makefile.depend
@@ -2,8 +2,6 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
 	gnu/lib/libgcc \
 	gnu/usr.bin/cc/cc_tools \
@@ -12,6 +10,7 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libcompiler_rt \
 
 
 .include <dirdeps.mk>
diff --git a/gnu/usr.bin/cc/cc/Makefile.depend b/gnu/usr.bin/cc/cc/Makefile.depend
index ce7738d1ce5f..12613ee5fe5b 100644
--- a/gnu/usr.bin/cc/cc/Makefile.depend
+++ b/gnu/usr.bin/cc/cc/Makefile.depend
@@ -2,8 +2,6 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
 	gnu/usr.bin/cc/cc_tools \
 	gnu/usr.bin/cc/libcpp \
@@ -12,6 +10,7 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libcompiler_rt \
 
 
 .include <dirdeps.mk>
diff --git a/gnu/usr.bin/cc/cc1/Makefile.depend b/gnu/usr.bin/cc/cc1/Makefile.depend
index 2e76ab713a5a..be55de564f8f 100644
--- a/gnu/usr.bin/cc/cc1/Makefile.depend
+++ b/gnu/usr.bin/cc/cc1/Makefile.depend
@@ -2,8 +2,6 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
 	gnu/usr.bin/cc/cc_int \
 	gnu/usr.bin/cc/cc_tools \
@@ -14,6 +12,7 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libcompiler_rt \
 
 
 .include <dirdeps.mk>
diff --git a/gnu/usr.bin/cc/cc1plus/Makefile.depend b/gnu/usr.bin/cc/cc1plus/Makefile.depend
index 4d8689895e58..cf800a6311dd 100644
--- a/gnu/usr.bin/cc/cc1plus/Makefile.depend
+++ b/gnu/usr.bin/cc/cc1plus/Makefile.depend
@@ -2,8 +2,6 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
 	gnu/usr.bin/cc/cc_int \
 	gnu/usr.bin/cc/cc_tools \
@@ -14,6 +12,7 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libcompiler_rt \
 
 
 .include <dirdeps.mk>
diff --git a/gnu/usr.bin/cc/cc_tools/Makefile.depend b/gnu/usr.bin/cc/cc_tools/Makefile.depend
index dc535a669625..986bc33a6253 100644
--- a/gnu/usr.bin/cc/cc_tools/Makefile.depend
+++ b/gnu/usr.bin/cc/cc_tools/Makefile.depend
@@ -8,6 +8,7 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libcompiler_rt \
 	lib/msun \
 
 
diff --git a/gnu/usr.bin/cc/cpp/Makefile.depend b/gnu/usr.bin/cc/cpp/Makefile.depend
index e0c846e62e61..d16e7b05543e 100644
--- a/gnu/usr.bin/cc/cpp/Makefile.depend
+++ b/gnu/usr.bin/cc/cpp/Makefile.depend
@@ -2,8 +2,6 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
 	gnu/lib/libgcc \
 	gnu/usr.bin/cc/cc_tools \
@@ -13,6 +11,7 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libcompiler_rt \
 
 
 .include <dirdeps.mk>
diff --git a/gnu/usr.bin/cc/gcov/Makefile.depend b/gnu/usr.bin/cc/gcov/Makefile.depend
index 763be51c55b7..2db3c0066df0 100644
--- a/gnu/usr.bin/cc/gcov/Makefile.depend
+++ b/gnu/usr.bin/cc/gcov/Makefile.depend
@@ -2,8 +2,6 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
 	gnu/lib/libgcc \
 	gnu/usr.bin/cc/cc_tools \
@@ -12,6 +10,7 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libcompiler_rt \
 
 
 .include <dirdeps.mk>
diff --git a/lib/clang/include/Makefile.depend b/lib/clang/include/Makefile.depend
index 29fda55c252f..57b7e10c3d71 100644
--- a/lib/clang/include/Makefile.depend
+++ b/lib/clang/include/Makefile.depend
@@ -2,8 +2,6 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
 
 
diff --git a/lib/clang/libclanganalysis/Makefile.depend b/lib/clang/libclanganalysis/Makefile.depend
index 1a5a8b2f0eff..45402951915d 100644
--- a/lib/clang/libclanganalysis/Makefile.depend
+++ b/lib/clang/libclanganalysis/Makefile.depend
@@ -2,8 +2,6 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
 	gnu/lib/libstdc++ \
 	gnu/lib/libsupc++ \
@@ -26,6 +24,16 @@ AnalysisDeclContext.po: Attrs.inc.h
 AnalysisDeclContext.po: DeclNodes.inc.h
 AnalysisDeclContext.po: DiagnosticCommonKinds.inc.h
 AnalysisDeclContext.po: StmtNodes.inc.h
+BodyFarm.o: AttrList.inc.h
+BodyFarm.o: Attrs.inc.h
+BodyFarm.o: DeclNodes.inc.h
+BodyFarm.o: DiagnosticCommonKinds.inc.h
+BodyFarm.o: StmtNodes.inc.h
+BodyFarm.po: AttrList.inc.h
+BodyFarm.po: Attrs.inc.h
+BodyFarm.po: DeclNodes.inc.h
+BodyFarm.po: DiagnosticCommonKinds.inc.h
+BodyFarm.po: StmtNodes.inc.h
 CFG.o: AttrList.inc.h
 CFG.o: Attrs.inc.h
 CFG.o: DeclNodes.inc.h
@@ -98,6 +106,16 @@ LiveVariables.po: Attrs.inc.h
 LiveVariables.po: DeclNodes.inc.h
 LiveVariables.po: DiagnosticCommonKinds.inc.h
 LiveVariables.po: StmtNodes.inc.h
+ObjCNoReturn.o: AttrList.inc.h
+ObjCNoReturn.o: Attrs.inc.h
+ObjCNoReturn.o: DeclNodes.inc.h
+ObjCNoReturn.o: DiagnosticCommonKinds.inc.h
+ObjCNoReturn.o: StmtNodes.inc.h
+ObjCNoReturn.po: AttrList.inc.h
+ObjCNoReturn.po: Attrs.inc.h
+ObjCNoReturn.po: DeclNodes.inc.h
+ObjCNoReturn.po: DiagnosticCommonKinds.inc.h
+ObjCNoReturn.po: StmtNodes.inc.h
 PostOrderCFGView.o: AttrList.inc.h
 PostOrderCFGView.o: Attrs.inc.h
 PostOrderCFGView.o: DeclNodes.inc.h
diff --git a/lib/clang/libclangarcmigrate/Makefile.depend b/lib/clang/libclangarcmigrate/Makefile.depend
index ba37a31c36c3..8d249a0437e5 100644
--- a/lib/clang/libclangarcmigrate/Makefile.depend
+++ b/lib/clang/libclangarcmigrate/Makefile.depend
@@ -2,9 +2,9 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
+	gnu/lib/libstdc++ \
+	gnu/lib/libsupc++ \
 	include \
 	include/xlocale \
 	lib/msun \
@@ -195,12 +195,14 @@ TransformActions.po: DeclNodes.inc.h
 TransformActions.po: DiagnosticCommonKinds.inc.h
 TransformActions.po: StmtNodes.inc.h
 Transforms.o: AttrList.inc.h
+Transforms.o: AttrParsedAttrList.inc.h
 Transforms.o: Attrs.inc.h
 Transforms.o: DeclNodes.inc.h
 Transforms.o: DiagnosticCommonKinds.inc.h
 Transforms.o: DiagnosticSemaKinds.inc.h
 Transforms.o: StmtNodes.inc.h
 Transforms.po: AttrList.inc.h
+Transforms.po: AttrParsedAttrList.inc.h
 Transforms.po: Attrs.inc.h
 Transforms.po: DeclNodes.inc.h
 Transforms.po: DiagnosticCommonKinds.inc.h
diff --git a/lib/clang/libclangast/Makefile.depend b/lib/clang/libclangast/Makefile.depend
index b15ee05f4621..52ba6508bdae 100644
--- a/lib/clang/libclangast/Makefile.depend
+++ b/lib/clang/libclangast/Makefile.depend
@@ -2,9 +2,9 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
+	gnu/lib/libstdc++ \
+	gnu/lib/libsupc++ \
 	include \
 	include/xlocale \
 	lib/msun \
@@ -24,13 +24,23 @@ APValue.po: Attrs.inc.h
 APValue.po: DeclNodes.inc.h
 APValue.po: DiagnosticCommonKinds.inc.h
 APValue.po: StmtNodes.inc.h
+ASTConsumer.o: AttrList.inc.h
+ASTConsumer.o: Attrs.inc.h
+ASTConsumer.o: DeclNodes.inc.h
+ASTConsumer.o: DiagnosticCommonKinds.inc.h
+ASTConsumer.po: AttrList.inc.h
+ASTConsumer.po: Attrs.inc.h
+ASTConsumer.po: DeclNodes.inc.h
+ASTConsumer.po: DiagnosticCommonKinds.inc.h
 ASTContext.o: AttrList.inc.h
 ASTContext.o: Attrs.inc.h
+ASTContext.o: CommentNodes.inc.h
 ASTContext.o: DeclNodes.inc.h
 ASTContext.o: DiagnosticCommonKinds.inc.h
 ASTContext.o: StmtNodes.inc.h
 ASTContext.po: AttrList.inc.h
 ASTContext.po: Attrs.inc.h
+ASTContext.po: CommentNodes.inc.h
 ASTContext.po: DeclNodes.inc.h
 ASTContext.po: DiagnosticCommonKinds.inc.h
 ASTContext.po: StmtNodes.inc.h
@@ -39,11 +49,13 @@ ASTDiagnostic.o: Attrs.inc.h
 ASTDiagnostic.o: DeclNodes.inc.h
 ASTDiagnostic.o: DiagnosticASTKinds.inc.h
 ASTDiagnostic.o: DiagnosticCommonKinds.inc.h
+ASTDiagnostic.o: StmtNodes.inc.h
 ASTDiagnostic.po: AttrList.inc.h
 ASTDiagnostic.po: Attrs.inc.h
 ASTDiagnostic.po: DeclNodes.inc.h
 ASTDiagnostic.po: DiagnosticASTKinds.inc.h
 ASTDiagnostic.po: DiagnosticCommonKinds.inc.h
+ASTDiagnostic.po: StmtNodes.inc.h
 ASTImporter.o: AttrList.inc.h
 ASTImporter.o: Attrs.inc.h
 ASTImporter.o: DeclNodes.inc.h
@@ -78,6 +90,60 @@ CXXInheritance.po: Attrs.inc.h
 CXXInheritance.po: DeclNodes.inc.h
 CXXInheritance.po: DiagnosticCommonKinds.inc.h
 CXXInheritance.po: StmtNodes.inc.h
+Comment.o: AttrList.inc.h
+Comment.o: Attrs.inc.h
+Comment.o: CommentNodes.inc.h
+Comment.o: DeclNodes.inc.h
+Comment.o: DiagnosticCommonKinds.inc.h
+Comment.o: StmtNodes.inc.h
+Comment.po: AttrList.inc.h
+Comment.po: Attrs.inc.h
+Comment.po: CommentNodes.inc.h
+Comment.po: DeclNodes.inc.h
+Comment.po: DiagnosticCommonKinds.inc.h
+Comment.po: StmtNodes.inc.h
+CommentCommandTraits.o: CommentCommandInfo.inc.h
+CommentCommandTraits.po: CommentCommandInfo.inc.h
+CommentDumper.o: AttrList.inc.h
+CommentDumper.o: Attrs.inc.h
+CommentDumper.o: CommentNodes.inc.h
+CommentDumper.o: DeclNodes.inc.h
+CommentDumper.o: DiagnosticCommonKinds.inc.h
+CommentDumper.po: AttrList.inc.h
+CommentDumper.po: Attrs.inc.h
+CommentDumper.po: CommentNodes.inc.h
+CommentDumper.po: DeclNodes.inc.h
+CommentDumper.po: DiagnosticCommonKinds.inc.h
+CommentLexer.o: CommentHTMLTags.inc.h
+CommentLexer.po: CommentHTMLTags.inc.h
+CommentParser.o: AttrList.inc.h
+CommentParser.o: Attrs.inc.h
+CommentParser.o: CommentNodes.inc.h
+CommentParser.o: DeclNodes.inc.h
+CommentParser.o: DiagnosticCommentKinds.inc.h
+CommentParser.o: DiagnosticCommonKinds.inc.h
+CommentParser.po: AttrList.inc.h
+CommentParser.po: Attrs.inc.h
+CommentParser.po: CommentNodes.inc.h
+CommentParser.po: DeclNodes.inc.h
+CommentParser.po: DiagnosticCommentKinds.inc.h
+CommentParser.po: DiagnosticCommonKinds.inc.h
+CommentSema.o: AttrList.inc.h
+CommentSema.o: Attrs.inc.h
+CommentSema.o: CommentHTMLTagsProperties.inc.h
+CommentSema.o: CommentNodes.inc.h
+CommentSema.o: DeclNodes.inc.h
+CommentSema.o: DiagnosticCommentKinds.inc.h
+CommentSema.o: DiagnosticCommonKinds.inc.h
+CommentSema.o: StmtNodes.inc.h
+CommentSema.po: AttrList.inc.h
+CommentSema.po: Attrs.inc.h
+CommentSema.po: CommentHTMLTagsProperties.inc.h
+CommentSema.po: CommentNodes.inc.h
+CommentSema.po: DeclNodes.inc.h
+CommentSema.po: DiagnosticCommentKinds.inc.h
+CommentSema.po: DiagnosticCommonKinds.inc.h
+CommentSema.po: StmtNodes.inc.h
 Decl.o: AttrList.inc.h
 Decl.o: Attrs.inc.h
 Decl.o: DeclNodes.inc.h
@@ -300,10 +366,12 @@ NSAPI.o: AttrList.inc.h
 NSAPI.o: Attrs.inc.h
 NSAPI.o: DeclNodes.inc.h
 NSAPI.o: DiagnosticCommonKinds.inc.h
+NSAPI.o: StmtNodes.inc.h
 NSAPI.po: AttrList.inc.h
 NSAPI.po: Attrs.inc.h
 NSAPI.po: DeclNodes.inc.h
 NSAPI.po: DiagnosticCommonKinds.inc.h
+NSAPI.po: StmtNodes.inc.h
 NestedNameSpecifier.o: AttrList.inc.h
 NestedNameSpecifier.o: Attrs.inc.h
 NestedNameSpecifier.o: DeclNodes.inc.h
@@ -324,6 +392,16 @@ ParentMap.po: Attrs.inc.h
 ParentMap.po: DeclNodes.inc.h
 ParentMap.po: DiagnosticCommonKinds.inc.h
 ParentMap.po: StmtNodes.inc.h
+RawCommentList.o: AttrList.inc.h
+RawCommentList.o: Attrs.inc.h
+RawCommentList.o: CommentNodes.inc.h
+RawCommentList.o: DeclNodes.inc.h
+RawCommentList.o: DiagnosticCommonKinds.inc.h
+RawCommentList.po: AttrList.inc.h
+RawCommentList.po: Attrs.inc.h
+RawCommentList.po: CommentNodes.inc.h
+RawCommentList.po: DeclNodes.inc.h
+RawCommentList.po: DiagnosticCommonKinds.inc.h
 RecordLayout.o: AttrList.inc.h
 RecordLayout.o: Attrs.inc.h
 RecordLayout.o: DeclNodes.inc.h
diff --git a/lib/clang/libclangbasic/Makefile.depend b/lib/clang/libclangbasic/Makefile.depend
index 2c9222657df5..74a968f9daef 100644
--- a/lib/clang/libclangbasic/Makefile.depend
+++ b/lib/clang/libclangbasic/Makefile.depend
@@ -2,11 +2,12 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
+	gnu/lib/libstdc++ \
+	gnu/lib/libsupc++ \
 	include \
 	include/xlocale \
+	lib/clang/include \
 	lib/msun \
 
 
@@ -18,6 +19,7 @@ Diagnostic.o: DiagnosticCommonKinds.inc.h
 Diagnostic.po: DiagnosticCommonKinds.inc.h
 DiagnosticIDs.o: DiagnosticASTKinds.inc.h
 DiagnosticIDs.o: DiagnosticAnalysisKinds.inc.h
+DiagnosticIDs.o: DiagnosticCommentKinds.inc.h
 DiagnosticIDs.o: DiagnosticCommonKinds.inc.h
 DiagnosticIDs.o: DiagnosticDriverKinds.inc.h
 DiagnosticIDs.o: DiagnosticFrontendKinds.inc.h
@@ -28,6 +30,7 @@ DiagnosticIDs.o: DiagnosticSemaKinds.inc.h
 DiagnosticIDs.o: DiagnosticSerializationKinds.inc.h
 DiagnosticIDs.po: DiagnosticASTKinds.inc.h
 DiagnosticIDs.po: DiagnosticAnalysisKinds.inc.h
+DiagnosticIDs.po: DiagnosticCommentKinds.inc.h
 DiagnosticIDs.po: DiagnosticCommonKinds.inc.h
 DiagnosticIDs.po: DiagnosticDriverKinds.inc.h
 DiagnosticIDs.po: DiagnosticFrontendKinds.inc.h
diff --git a/lib/clang/libclangcodegen/Makefile.depend b/lib/clang/libclangcodegen/Makefile.depend
index 9ed7af295c39..94780585c27b 100644
--- a/lib/clang/libclangcodegen/Makefile.depend
+++ b/lib/clang/libclangcodegen/Makefile.depend
@@ -2,9 +2,9 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
+	gnu/lib/libstdc++ \
+	gnu/lib/libsupc++ \
 	include \
 	include/xlocale \
 	lib/msun \
@@ -372,10 +372,12 @@ CodeGenTBAA.o: AttrList.inc.h
 CodeGenTBAA.o: Attrs.inc.h
 CodeGenTBAA.o: DeclNodes.inc.h
 CodeGenTBAA.o: DiagnosticCommonKinds.inc.h
+CodeGenTBAA.o: StmtNodes.inc.h
 CodeGenTBAA.po: AttrList.inc.h
 CodeGenTBAA.po: Attrs.inc.h
 CodeGenTBAA.po: DeclNodes.inc.h
 CodeGenTBAA.po: DiagnosticCommonKinds.inc.h
+CodeGenTBAA.po: StmtNodes.inc.h
 CodeGenTypes.o: AttrList.inc.h
 CodeGenTypes.o: Attrs.inc.h
 CodeGenTypes.o: DeclNodes.inc.h
diff --git a/lib/clang/libclangdriver/Makefile.depend b/lib/clang/libclangdriver/Makefile.depend
index dab9912fbc37..ec0ab5d0d338 100644
--- a/lib/clang/libclangdriver/Makefile.depend
+++ b/lib/clang/libclangdriver/Makefile.depend
@@ -2,9 +2,9 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
+	gnu/lib/libstdc++ \
+	gnu/lib/libsupc++ \
 	include \
 	include/xlocale \
 	lib/msun \
@@ -20,8 +20,6 @@ ArgList.po: DiagnosticCommonKinds.inc.h
 ArgList.po: DiagnosticDriverKinds.inc.h
 CC1AsOptions.o: CC1AsOptions.inc.h
 CC1AsOptions.po: CC1AsOptions.inc.h
-CC1Options.o: CC1Options.inc.h
-CC1Options.po: CC1Options.inc.h
 Compilation.o: DiagnosticCommonKinds.inc.h
 Compilation.o: DiagnosticDriverKinds.inc.h
 Compilation.o: Options.inc.h
@@ -36,6 +34,8 @@ Driver.po: DiagnosticDriverKinds.inc.h
 Driver.po: Options.inc.h
 DriverOptions.o: Options.inc.h
 DriverOptions.po: Options.inc.h
+OptTable.o: Options.inc.h
+OptTable.po: Options.inc.h
 ToolChain.o: DiagnosticCommonKinds.inc.h
 ToolChain.o: DiagnosticDriverKinds.inc.h
 ToolChain.o: Options.inc.h
diff --git a/lib/clang/libclangedit/Makefile.depend b/lib/clang/libclangedit/Makefile.depend
index 9c2823c5ff44..9bacc88a2928 100644
--- a/lib/clang/libclangedit/Makefile.depend
+++ b/lib/clang/libclangedit/Makefile.depend
@@ -2,9 +2,9 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
+	gnu/lib/libstdc++ \
+	gnu/lib/libsupc++ \
 	include \
 	include/xlocale \
 	lib/msun \
diff --git a/lib/clang/libclangfrontend/Makefile.depend b/lib/clang/libclangfrontend/Makefile.depend
index a9a8a2a81208..ec1859e27742 100644
--- a/lib/clang/libclangfrontend/Makefile.depend
+++ b/lib/clang/libclangfrontend/Makefile.depend
@@ -2,9 +2,9 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
+	gnu/lib/libstdc++ \
+	gnu/lib/libsupc++ \
 	include \
 	include/xlocale \
 	lib/msun \
@@ -44,7 +44,6 @@ ASTUnit.o: Attrs.inc.h
 ASTUnit.o: DeclNodes.inc.h
 ASTUnit.o: DiagnosticCommonKinds.inc.h
 ASTUnit.o: DiagnosticFrontendKinds.inc.h
-ASTUnit.o: Options.inc.h
 ASTUnit.o: StmtNodes.inc.h
 ASTUnit.po: AttrList.inc.h
 ASTUnit.po: AttrParsedAttrList.inc.h
@@ -52,7 +51,6 @@ ASTUnit.po: Attrs.inc.h
 ASTUnit.po: DeclNodes.inc.h
 ASTUnit.po: DiagnosticCommonKinds.inc.h
 ASTUnit.po: DiagnosticFrontendKinds.inc.h
-ASTUnit.po: Options.inc.h
 ASTUnit.po: StmtNodes.inc.h
 CacheTokens.o: DiagnosticCommonKinds.inc.h
 CacheTokens.po: DiagnosticCommonKinds.inc.h
@@ -86,16 +84,16 @@ CompilerInstance.po: DiagnosticFrontendKinds.inc.h
 CompilerInstance.po: StmtNodes.inc.h
 CompilerInvocation.o: AttrList.inc.h
 CompilerInvocation.o: Attrs.inc.h
-CompilerInvocation.o: CC1Options.inc.h
 CompilerInvocation.o: DeclNodes.inc.h
 CompilerInvocation.o: DiagnosticCommonKinds.inc.h
 CompilerInvocation.o: DiagnosticDriverKinds.inc.h
+CompilerInvocation.o: Options.inc.h
 CompilerInvocation.po: AttrList.inc.h
 CompilerInvocation.po: Attrs.inc.h
-CompilerInvocation.po: CC1Options.inc.h
 CompilerInvocation.po: DeclNodes.inc.h
 CompilerInvocation.po: DiagnosticCommonKinds.inc.h
 CompilerInvocation.po: DiagnosticDriverKinds.inc.h
+CompilerInvocation.po: Options.inc.h
 CreateInvocationFromCommandLine.o: DiagnosticCommonKinds.inc.h
 CreateInvocationFromCommandLine.o: DiagnosticFrontendKinds.inc.h
 CreateInvocationFromCommandLine.o: Options.inc.h
@@ -148,8 +146,14 @@ HeaderIncludeGen.po: DiagnosticCommonKinds.inc.h
 HeaderIncludeGen.po: DiagnosticFrontendKinds.inc.h
 InitHeaderSearch.o: DiagnosticCommonKinds.inc.h
 InitHeaderSearch.po: DiagnosticCommonKinds.inc.h
+InitPreprocessor.o: AttrList.inc.h
+InitPreprocessor.o: Attrs.inc.h
+InitPreprocessor.o: DeclNodes.inc.h
 InitPreprocessor.o: DiagnosticCommonKinds.inc.h
 InitPreprocessor.o: DiagnosticFrontendKinds.inc.h
+InitPreprocessor.po: AttrList.inc.h
+InitPreprocessor.po: Attrs.inc.h
+InitPreprocessor.po: DeclNodes.inc.h
 InitPreprocessor.po: DiagnosticCommonKinds.inc.h
 InitPreprocessor.po: DiagnosticFrontendKinds.inc.h
 LayoutOverrideSource.o: AttrList.inc.h
diff --git a/lib/clang/libclangfrontendtool/Makefile.depend b/lib/clang/libclangfrontendtool/Makefile.depend
index 0c4a02dbc66c..94f1694cf5e0 100644
--- a/lib/clang/libclangfrontendtool/Makefile.depend
+++ b/lib/clang/libclangfrontendtool/Makefile.depend
@@ -2,9 +2,9 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
+	gnu/lib/libstdc++ \
+	gnu/lib/libsupc++ \
 	include \
 	include/xlocale \
 	lib/msun \
@@ -14,10 +14,10 @@ DIRDEPS = \
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
-ExecuteCompilerInvocation.o: CC1Options.inc.h
 ExecuteCompilerInvocation.o: DiagnosticCommonKinds.inc.h
 ExecuteCompilerInvocation.o: DiagnosticFrontendKinds.inc.h
-ExecuteCompilerInvocation.po: CC1Options.inc.h
+ExecuteCompilerInvocation.o: Options.inc.h
 ExecuteCompilerInvocation.po: DiagnosticCommonKinds.inc.h
 ExecuteCompilerInvocation.po: DiagnosticFrontendKinds.inc.h
+ExecuteCompilerInvocation.po: Options.inc.h
 .endif
diff --git a/lib/clang/libclanglex/Makefile.depend b/lib/clang/libclanglex/Makefile.depend
index b0b30a1b09bf..5835901a9b0d 100644
--- a/lib/clang/libclanglex/Makefile.depend
+++ b/lib/clang/libclanglex/Makefile.depend
@@ -2,11 +2,12 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
+	gnu/lib/libstdc++ \
+	gnu/lib/libsupc++ \
 	include \
 	include/xlocale \
+	lib/clang/include \
 	lib/msun \
 
 
diff --git a/lib/clang/libclangparse/Makefile.depend b/lib/clang/libclangparse/Makefile.depend
index ebf96ff7d398..ad1985d933cb 100644
--- a/lib/clang/libclangparse/Makefile.depend
+++ b/lib/clang/libclangparse/Makefile.depend
@@ -2,9 +2,9 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
+	gnu/lib/libstdc++ \
+	gnu/lib/libsupc++ \
 	include \
 	include/xlocale \
 	lib/msun \
@@ -19,12 +19,14 @@ ParseAST.o: AttrParsedAttrList.inc.h
 ParseAST.o: Attrs.inc.h
 ParseAST.o: DeclNodes.inc.h
 ParseAST.o: DiagnosticCommonKinds.inc.h
+ParseAST.o: DiagnosticParseKinds.inc.h
 ParseAST.o: StmtNodes.inc.h
 ParseAST.po: AttrList.inc.h
 ParseAST.po: AttrParsedAttrList.inc.h
 ParseAST.po: Attrs.inc.h
 ParseAST.po: DeclNodes.inc.h
 ParseAST.po: DiagnosticCommonKinds.inc.h
+ParseAST.po: DiagnosticParseKinds.inc.h
 ParseAST.po: StmtNodes.inc.h
 ParseCXXInlineMethods.o: AttrList.inc.h
 ParseCXXInlineMethods.o: AttrParsedAttrList.inc.h
@@ -62,6 +64,7 @@ ParseDeclCXX.o: Attrs.inc.h
 ParseDeclCXX.o: DeclNodes.inc.h
 ParseDeclCXX.o: DiagnosticCommonKinds.inc.h
 ParseDeclCXX.o: DiagnosticParseKinds.inc.h
+ParseDeclCXX.o: DiagnosticSemaKinds.inc.h
 ParseDeclCXX.o: StmtNodes.inc.h
 ParseDeclCXX.po: AttrList.inc.h
 ParseDeclCXX.po: AttrParsedAttrList.inc.h
@@ -69,6 +72,7 @@ ParseDeclCXX.po: Attrs.inc.h
 ParseDeclCXX.po: DeclNodes.inc.h
 ParseDeclCXX.po: DiagnosticCommonKinds.inc.h
 ParseDeclCXX.po: DiagnosticParseKinds.inc.h
+ParseDeclCXX.po: DiagnosticSemaKinds.inc.h
 ParseDeclCXX.po: StmtNodes.inc.h
 ParseExpr.o: AttrList.inc.h
 ParseExpr.o: AttrParsedAttrList.inc.h
diff --git a/lib/clang/libclangsema/Makefile.depend b/lib/clang/libclangsema/Makefile.depend
index d33e42fa913a..8dc76e021c70 100644
--- a/lib/clang/libclangsema/Makefile.depend
+++ b/lib/clang/libclangsema/Makefile.depend
@@ -2,9 +2,9 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
+	gnu/lib/libstdc++ \
+	gnu/lib/libsupc++ \
 	include \
 	include/xlocale \
 	lib/msun \
@@ -71,11 +71,13 @@ DeclSpec.po: DiagnosticParseKinds.inc.h
 DeclSpec.po: DiagnosticSemaKinds.inc.h
 DeclSpec.po: StmtNodes.inc.h
 DelayedDiagnostic.o: AttrList.inc.h
+DelayedDiagnostic.o: AttrParsedAttrList.inc.h
 DelayedDiagnostic.o: Attrs.inc.h
 DelayedDiagnostic.o: DeclNodes.inc.h
 DelayedDiagnostic.o: DiagnosticCommonKinds.inc.h
 DelayedDiagnostic.o: StmtNodes.inc.h
 DelayedDiagnostic.po: AttrList.inc.h
+DelayedDiagnostic.po: AttrParsedAttrList.inc.h
 DelayedDiagnostic.po: Attrs.inc.h
 DelayedDiagnostic.po: DeclNodes.inc.h
 DelayedDiagnostic.po: DiagnosticCommonKinds.inc.h
@@ -102,8 +104,30 @@ JumpDiagnostics.po: DeclNodes.inc.h
 JumpDiagnostics.po: DiagnosticCommonKinds.inc.h
 JumpDiagnostics.po: DiagnosticSemaKinds.inc.h
 JumpDiagnostics.po: StmtNodes.inc.h
+MultiplexExternalSemaSource.o: AttrList.inc.h
+MultiplexExternalSemaSource.o: AttrParsedAttrList.inc.h
+MultiplexExternalSemaSource.o: Attrs.inc.h
+MultiplexExternalSemaSource.o: DeclNodes.inc.h
+MultiplexExternalSemaSource.o: DiagnosticCommonKinds.inc.h
+MultiplexExternalSemaSource.o: StmtNodes.inc.h
+MultiplexExternalSemaSource.po: AttrList.inc.h
+MultiplexExternalSemaSource.po: AttrParsedAttrList.inc.h
+MultiplexExternalSemaSource.po: Attrs.inc.h
+MultiplexExternalSemaSource.po: DeclNodes.inc.h
+MultiplexExternalSemaSource.po: DiagnosticCommonKinds.inc.h
+MultiplexExternalSemaSource.po: StmtNodes.inc.h
 Scope.o: DiagnosticCommonKinds.inc.h
 Scope.po: DiagnosticCommonKinds.inc.h
+ScopeInfo.o: AttrList.inc.h
+ScopeInfo.o: Attrs.inc.h
+ScopeInfo.o: DeclNodes.inc.h
+ScopeInfo.o: DiagnosticCommonKinds.inc.h
+ScopeInfo.o: StmtNodes.inc.h
+ScopeInfo.po: AttrList.inc.h
+ScopeInfo.po: Attrs.inc.h
+ScopeInfo.po: DeclNodes.inc.h
+ScopeInfo.po: DiagnosticCommonKinds.inc.h
+ScopeInfo.po: StmtNodes.inc.h
 Sema.o: AttrList.inc.h
 Sema.o: AttrParsedAttrList.inc.h
 Sema.o: Attrs.inc.h
@@ -210,6 +234,7 @@ SemaDecl.o: AttrList.inc.h
 SemaDecl.o: AttrParsedAttrList.inc.h
 SemaDecl.o: Attrs.inc.h
 SemaDecl.o: DeclNodes.inc.h
+SemaDecl.o: DiagnosticCommentKinds.inc.h
 SemaDecl.o: DiagnosticCommonKinds.inc.h
 SemaDecl.o: DiagnosticParseKinds.inc.h
 SemaDecl.o: DiagnosticSemaKinds.inc.h
@@ -218,6 +243,7 @@ SemaDecl.po: AttrList.inc.h
 SemaDecl.po: AttrParsedAttrList.inc.h
 SemaDecl.po: Attrs.inc.h
 SemaDecl.po: DeclNodes.inc.h
+SemaDecl.po: DiagnosticCommentKinds.inc.h
 SemaDecl.po: DiagnosticCommonKinds.inc.h
 SemaDecl.po: DiagnosticParseKinds.inc.h
 SemaDecl.po: DiagnosticSemaKinds.inc.h
@@ -444,6 +470,20 @@ SemaStmt.po: DeclNodes.inc.h
 SemaStmt.po: DiagnosticCommonKinds.inc.h
 SemaStmt.po: DiagnosticSemaKinds.inc.h
 SemaStmt.po: StmtNodes.inc.h
+SemaStmtAsm.o: AttrList.inc.h
+SemaStmtAsm.o: AttrParsedAttrList.inc.h
+SemaStmtAsm.o: Attrs.inc.h
+SemaStmtAsm.o: DeclNodes.inc.h
+SemaStmtAsm.o: DiagnosticCommonKinds.inc.h
+SemaStmtAsm.o: DiagnosticSemaKinds.inc.h
+SemaStmtAsm.o: StmtNodes.inc.h
+SemaStmtAsm.po: AttrList.inc.h
+SemaStmtAsm.po: AttrParsedAttrList.inc.h
+SemaStmtAsm.po: Attrs.inc.h
+SemaStmtAsm.po: DeclNodes.inc.h
+SemaStmtAsm.po: DiagnosticCommonKinds.inc.h
+SemaStmtAsm.po: DiagnosticSemaKinds.inc.h
+SemaStmtAsm.po: StmtNodes.inc.h
 SemaStmtAttr.o: AttrList.inc.h
 SemaStmtAttr.o: AttrParsedAttrList.inc.h
 SemaStmtAttr.o: Attrs.inc.h
diff --git a/lib/clang/libclangserialization/Makefile.depend b/lib/clang/libclangserialization/Makefile.depend
index 96ace8927e93..7aee5f8756e0 100644
--- a/lib/clang/libclangserialization/Makefile.depend
+++ b/lib/clang/libclangserialization/Makefile.depend
@@ -2,9 +2,9 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
+	gnu/lib/libstdc++ \
+	gnu/lib/libsupc++ \
 	include \
 	include/xlocale \
 	lib/msun \
diff --git a/lib/clang/libclangstaticanalyzercheckers/Makefile.depend b/lib/clang/libclangstaticanalyzercheckers/Makefile.depend
index d287f2bc3816..a479b5622ecd 100644
--- a/lib/clang/libclangstaticanalyzercheckers/Makefile.depend
+++ b/lib/clang/libclangstaticanalyzercheckers/Makefile.depend
@@ -2,9 +2,9 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
+	gnu/lib/libstdc++ \
+	gnu/lib/libsupc++ \
 	include \
 	include/xlocale \
 	lib/msun \
@@ -14,18 +14,6 @@ DIRDEPS = \
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
-AdjustedReturnValueChecker.o: AttrList.inc.h
-AdjustedReturnValueChecker.o: Attrs.inc.h
-AdjustedReturnValueChecker.o: Checkers.inc.h
-AdjustedReturnValueChecker.o: DeclNodes.inc.h
-AdjustedReturnValueChecker.o: DiagnosticCommonKinds.inc.h
-AdjustedReturnValueChecker.o: StmtNodes.inc.h
-AdjustedReturnValueChecker.po: AttrList.inc.h
-AdjustedReturnValueChecker.po: Attrs.inc.h
-AdjustedReturnValueChecker.po: Checkers.inc.h
-AdjustedReturnValueChecker.po: DeclNodes.inc.h
-AdjustedReturnValueChecker.po: DiagnosticCommonKinds.inc.h
-AdjustedReturnValueChecker.po: StmtNodes.inc.h
 AnalyzerStatsChecker.o: AttrList.inc.h
 AnalyzerStatsChecker.o: Attrs.inc.h
 AnalyzerStatsChecker.o: Checkers.inc.h
@@ -290,6 +278,18 @@ DereferenceChecker.po: Checkers.inc.h
 DereferenceChecker.po: DeclNodes.inc.h
 DereferenceChecker.po: DiagnosticCommonKinds.inc.h
 DereferenceChecker.po: StmtNodes.inc.h
+DirectIvarAssignment.o: AttrList.inc.h
+DirectIvarAssignment.o: Attrs.inc.h
+DirectIvarAssignment.o: Checkers.inc.h
+DirectIvarAssignment.o: DeclNodes.inc.h
+DirectIvarAssignment.o: DiagnosticCommonKinds.inc.h
+DirectIvarAssignment.o: StmtNodes.inc.h
+DirectIvarAssignment.po: AttrList.inc.h
+DirectIvarAssignment.po: Attrs.inc.h
+DirectIvarAssignment.po: Checkers.inc.h
+DirectIvarAssignment.po: DeclNodes.inc.h
+DirectIvarAssignment.po: DiagnosticCommonKinds.inc.h
+DirectIvarAssignment.po: StmtNodes.inc.h
 DivZeroChecker.o: AttrList.inc.h
 DivZeroChecker.o: Attrs.inc.h
 DivZeroChecker.o: Checkers.inc.h
@@ -302,6 +302,30 @@ DivZeroChecker.po: Checkers.inc.h
 DivZeroChecker.po: DeclNodes.inc.h
 DivZeroChecker.po: DiagnosticCommonKinds.inc.h
 DivZeroChecker.po: StmtNodes.inc.h
+DynamicTypePropagation.o: AttrList.inc.h
+DynamicTypePropagation.o: Attrs.inc.h
+DynamicTypePropagation.o: Checkers.inc.h
+DynamicTypePropagation.o: DeclNodes.inc.h
+DynamicTypePropagation.o: DiagnosticCommonKinds.inc.h
+DynamicTypePropagation.o: StmtNodes.inc.h
+DynamicTypePropagation.po: AttrList.inc.h
+DynamicTypePropagation.po: Attrs.inc.h
+DynamicTypePropagation.po: Checkers.inc.h
+DynamicTypePropagation.po: DeclNodes.inc.h
+DynamicTypePropagation.po: DiagnosticCommonKinds.inc.h
+DynamicTypePropagation.po: StmtNodes.inc.h
+ExprInspectionChecker.o: AttrList.inc.h
+ExprInspectionChecker.o: Attrs.inc.h
+ExprInspectionChecker.o: Checkers.inc.h
+ExprInspectionChecker.o: DeclNodes.inc.h
+ExprInspectionChecker.o: DiagnosticCommonKinds.inc.h
+ExprInspectionChecker.o: StmtNodes.inc.h
+ExprInspectionChecker.po: AttrList.inc.h
+ExprInspectionChecker.po: Attrs.inc.h
+ExprInspectionChecker.po: Checkers.inc.h
+ExprInspectionChecker.po: DeclNodes.inc.h
+ExprInspectionChecker.po: DiagnosticCommonKinds.inc.h
+ExprInspectionChecker.po: StmtNodes.inc.h
 FixedAddressChecker.o: AttrList.inc.h
 FixedAddressChecker.o: Attrs.inc.h
 FixedAddressChecker.o: Checkers.inc.h
@@ -338,18 +362,18 @@ IdempotentOperationChecker.po: Checkers.inc.h
 IdempotentOperationChecker.po: DeclNodes.inc.h
 IdempotentOperationChecker.po: DiagnosticCommonKinds.inc.h
 IdempotentOperationChecker.po: StmtNodes.inc.h
-IteratorsChecker.o: AttrList.inc.h
-IteratorsChecker.o: Attrs.inc.h
-IteratorsChecker.o: Checkers.inc.h
-IteratorsChecker.o: DeclNodes.inc.h
-IteratorsChecker.o: DiagnosticCommonKinds.inc.h
-IteratorsChecker.o: StmtNodes.inc.h
-IteratorsChecker.po: AttrList.inc.h
-IteratorsChecker.po: Attrs.inc.h
-IteratorsChecker.po: Checkers.inc.h
-IteratorsChecker.po: DeclNodes.inc.h
-IteratorsChecker.po: DiagnosticCommonKinds.inc.h
-IteratorsChecker.po: StmtNodes.inc.h
+IvarInvalidationChecker.o: AttrList.inc.h
+IvarInvalidationChecker.o: Attrs.inc.h
+IvarInvalidationChecker.o: Checkers.inc.h
+IvarInvalidationChecker.o: DeclNodes.inc.h
+IvarInvalidationChecker.o: DiagnosticCommonKinds.inc.h
+IvarInvalidationChecker.o: StmtNodes.inc.h
+IvarInvalidationChecker.po: AttrList.inc.h
+IvarInvalidationChecker.po: Attrs.inc.h
+IvarInvalidationChecker.po: Checkers.inc.h
+IvarInvalidationChecker.po: DeclNodes.inc.h
+IvarInvalidationChecker.po: DiagnosticCommonKinds.inc.h
+IvarInvalidationChecker.po: StmtNodes.inc.h
 LLVMConventionsChecker.o: AttrList.inc.h
 LLVMConventionsChecker.o: Attrs.inc.h
 LLVMConventionsChecker.o: Checkers.inc.h
@@ -458,18 +482,6 @@ NoReturnFunctionChecker.po: Checkers.inc.h
 NoReturnFunctionChecker.po: DeclNodes.inc.h
 NoReturnFunctionChecker.po: DiagnosticCommonKinds.inc.h
 NoReturnFunctionChecker.po: StmtNodes.inc.h
-OSAtomicChecker.o: AttrList.inc.h
-OSAtomicChecker.o: Attrs.inc.h
-OSAtomicChecker.o: Checkers.inc.h
-OSAtomicChecker.o: DeclNodes.inc.h
-OSAtomicChecker.o: DiagnosticCommonKinds.inc.h
-OSAtomicChecker.o: StmtNodes.inc.h
-OSAtomicChecker.po: AttrList.inc.h
-OSAtomicChecker.po: Attrs.inc.h
-OSAtomicChecker.po: Checkers.inc.h
-OSAtomicChecker.po: DeclNodes.inc.h
-OSAtomicChecker.po: DiagnosticCommonKinds.inc.h
-OSAtomicChecker.po: StmtNodes.inc.h
 ObjCAtSyncChecker.o: AttrList.inc.h
 ObjCAtSyncChecker.o: Attrs.inc.h
 ObjCAtSyncChecker.o: Checkers.inc.h
@@ -506,6 +518,18 @@ ObjCContainersChecker.po: Checkers.inc.h
 ObjCContainersChecker.po: DeclNodes.inc.h
 ObjCContainersChecker.po: DiagnosticCommonKinds.inc.h
 ObjCContainersChecker.po: StmtNodes.inc.h
+ObjCMissingSuperCallChecker.o: AttrList.inc.h
+ObjCMissingSuperCallChecker.o: Attrs.inc.h
+ObjCMissingSuperCallChecker.o: Checkers.inc.h
+ObjCMissingSuperCallChecker.o: DeclNodes.inc.h
+ObjCMissingSuperCallChecker.o: DiagnosticCommonKinds.inc.h
+ObjCMissingSuperCallChecker.o: StmtNodes.inc.h
+ObjCMissingSuperCallChecker.po: AttrList.inc.h
+ObjCMissingSuperCallChecker.po: Attrs.inc.h
+ObjCMissingSuperCallChecker.po: Checkers.inc.h
+ObjCMissingSuperCallChecker.po: DeclNodes.inc.h
+ObjCMissingSuperCallChecker.po: DiagnosticCommonKinds.inc.h
+ObjCMissingSuperCallChecker.po: StmtNodes.inc.h
 ObjCSelfInitChecker.o: AttrList.inc.h
 ObjCSelfInitChecker.o: Attrs.inc.h
 ObjCSelfInitChecker.o: Checkers.inc.h
@@ -602,6 +626,18 @@ ReturnUndefChecker.po: Checkers.inc.h
 ReturnUndefChecker.po: DeclNodes.inc.h
 ReturnUndefChecker.po: DiagnosticCommonKinds.inc.h
 ReturnUndefChecker.po: StmtNodes.inc.h
+SimpleStreamChecker.o: AttrList.inc.h
+SimpleStreamChecker.o: Attrs.inc.h
+SimpleStreamChecker.o: Checkers.inc.h
+SimpleStreamChecker.o: DeclNodes.inc.h
+SimpleStreamChecker.o: DiagnosticCommonKinds.inc.h
+SimpleStreamChecker.o: StmtNodes.inc.h
+SimpleStreamChecker.po: AttrList.inc.h
+SimpleStreamChecker.po: Attrs.inc.h
+SimpleStreamChecker.po: Checkers.inc.h
+SimpleStreamChecker.po: DeclNodes.inc.h
+SimpleStreamChecker.po: DiagnosticCommonKinds.inc.h
+SimpleStreamChecker.po: StmtNodes.inc.h
 StackAddrEscapeChecker.o: AttrList.inc.h
 StackAddrEscapeChecker.o: Attrs.inc.h
 StackAddrEscapeChecker.o: Checkers.inc.h
@@ -638,6 +674,18 @@ TaintTesterChecker.po: Checkers.inc.h
 TaintTesterChecker.po: DeclNodes.inc.h
 TaintTesterChecker.po: DiagnosticCommonKinds.inc.h
 TaintTesterChecker.po: StmtNodes.inc.h
+TraversalChecker.o: AttrList.inc.h
+TraversalChecker.o: Attrs.inc.h
+TraversalChecker.o: Checkers.inc.h
+TraversalChecker.o: DeclNodes.inc.h
+TraversalChecker.o: DiagnosticCommonKinds.inc.h
+TraversalChecker.o: StmtNodes.inc.h
+TraversalChecker.po: AttrList.inc.h
+TraversalChecker.po: Attrs.inc.h
+TraversalChecker.po: Checkers.inc.h
+TraversalChecker.po: DeclNodes.inc.h
+TraversalChecker.po: DiagnosticCommonKinds.inc.h
+TraversalChecker.po: StmtNodes.inc.h
 UndefBranchChecker.o: AttrList.inc.h
 UndefBranchChecker.o: Attrs.inc.h
 UndefBranchChecker.o: Checkers.inc.h
diff --git a/lib/clang/libclangstaticanalyzercore/Makefile.depend b/lib/clang/libclangstaticanalyzercore/Makefile.depend
index 846f7763bff5..1e4a32fe8b87 100644
--- a/lib/clang/libclangstaticanalyzercore/Makefile.depend
+++ b/lib/clang/libclangstaticanalyzercore/Makefile.depend
@@ -2,9 +2,9 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
+	gnu/lib/libstdc++ \
+	gnu/lib/libsupc++ \
 	include \
 	include/xlocale \
 	lib/msun \
@@ -24,16 +24,6 @@ AnalysisManager.po: Attrs.inc.h
 AnalysisManager.po: DeclNodes.inc.h
 AnalysisManager.po: DiagnosticCommonKinds.inc.h
 AnalysisManager.po: StmtNodes.inc.h
-BasicConstraintManager.o: AttrList.inc.h
-BasicConstraintManager.o: Attrs.inc.h
-BasicConstraintManager.o: DeclNodes.inc.h
-BasicConstraintManager.o: DiagnosticCommonKinds.inc.h
-BasicConstraintManager.o: StmtNodes.inc.h
-BasicConstraintManager.po: AttrList.inc.h
-BasicConstraintManager.po: Attrs.inc.h
-BasicConstraintManager.po: DeclNodes.inc.h
-BasicConstraintManager.po: DiagnosticCommonKinds.inc.h
-BasicConstraintManager.po: StmtNodes.inc.h
 BasicValueFactory.o: AttrList.inc.h
 BasicValueFactory.o: Attrs.inc.h
 BasicValueFactory.o: DeclNodes.inc.h
@@ -64,6 +54,16 @@ BugReporterVisitors.po: Attrs.inc.h
 BugReporterVisitors.po: DeclNodes.inc.h
 BugReporterVisitors.po: DiagnosticCommonKinds.inc.h
 BugReporterVisitors.po: StmtNodes.inc.h
+CallEvent.o: AttrList.inc.h
+CallEvent.o: Attrs.inc.h
+CallEvent.o: DeclNodes.inc.h
+CallEvent.o: DiagnosticCommonKinds.inc.h
+CallEvent.o: StmtNodes.inc.h
+CallEvent.po: AttrList.inc.h
+CallEvent.po: Attrs.inc.h
+CallEvent.po: DeclNodes.inc.h
+CallEvent.po: DiagnosticCommonKinds.inc.h
+CallEvent.po: StmtNodes.inc.h
 Checker.o: AttrList.inc.h
 Checker.o: Attrs.inc.h
 Checker.o: DeclNodes.inc.h
@@ -114,6 +114,16 @@ CheckerRegistry.po: Attrs.inc.h
 CheckerRegistry.po: DeclNodes.inc.h
 CheckerRegistry.po: DiagnosticCommonKinds.inc.h
 CheckerRegistry.po: StmtNodes.inc.h
+ConstraintManager.o: AttrList.inc.h
+ConstraintManager.o: Attrs.inc.h
+ConstraintManager.o: DeclNodes.inc.h
+ConstraintManager.o: DiagnosticCommonKinds.inc.h
+ConstraintManager.o: StmtNodes.inc.h
+ConstraintManager.po: AttrList.inc.h
+ConstraintManager.po: Attrs.inc.h
+ConstraintManager.po: DeclNodes.inc.h
+ConstraintManager.po: DiagnosticCommonKinds.inc.h
+ConstraintManager.po: StmtNodes.inc.h
 CoreEngine.o: AttrList.inc.h
 CoreEngine.o: Attrs.inc.h
 CoreEngine.o: DeclNodes.inc.h
@@ -222,16 +232,6 @@ MemRegion.po: Attrs.inc.h
 MemRegion.po: DeclNodes.inc.h
 MemRegion.po: DiagnosticCommonKinds.inc.h
 MemRegion.po: StmtNodes.inc.h
-ObjCMessage.o: AttrList.inc.h
-ObjCMessage.o: Attrs.inc.h
-ObjCMessage.o: DeclNodes.inc.h
-ObjCMessage.o: DiagnosticCommonKinds.inc.h
-ObjCMessage.o: StmtNodes.inc.h
-ObjCMessage.po: AttrList.inc.h
-ObjCMessage.po: Attrs.inc.h
-ObjCMessage.po: DeclNodes.inc.h
-ObjCMessage.po: DiagnosticCommonKinds.inc.h
-ObjCMessage.po: StmtNodes.inc.h
 PathDiagnostic.o: AttrList.inc.h
 PathDiagnostic.o: Attrs.inc.h
 PathDiagnostic.o: DeclNodes.inc.h
diff --git a/lib/clang/libclangstaticanalyzerfrontend/Makefile.depend b/lib/clang/libclangstaticanalyzerfrontend/Makefile.depend
index bcae1efe21a2..47f5ad017ede 100644
--- a/lib/clang/libclangstaticanalyzerfrontend/Makefile.depend
+++ b/lib/clang/libclangstaticanalyzerfrontend/Makefile.depend
@@ -2,9 +2,9 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
+	gnu/lib/libstdc++ \
+	gnu/lib/libsupc++ \
 	include \
 	include/xlocale \
 	lib/msun \
diff --git a/lib/clang/libllvmanalysis/Makefile.depend b/lib/clang/libllvmanalysis/Makefile.depend
index be777d8409c9..e8d0b1b5fe81 100644
--- a/lib/clang/libllvmanalysis/Makefile.depend
+++ b/lib/clang/libllvmanalysis/Makefile.depend
@@ -2,9 +2,9 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
+	gnu/lib/libstdc++ \
+	gnu/lib/libsupc++ \
 	include \
 	include/xlocale \
 	lib/msun \
@@ -24,20 +24,20 @@ CodeMetrics.o: Intrinsics.inc.h
 CodeMetrics.po: Intrinsics.inc.h
 ConstantFolding.o: Intrinsics.inc.h
 ConstantFolding.po: Intrinsics.inc.h
-DIBuilder.o: Intrinsics.inc.h
-DIBuilder.po: Intrinsics.inc.h
 DbgInfoPrinter.o: Intrinsics.inc.h
 DbgInfoPrinter.po: Intrinsics.inc.h
-DebugInfo.o: Intrinsics.inc.h
-DebugInfo.po: Intrinsics.inc.h
 InlineCost.o: Intrinsics.inc.h
 InlineCost.po: Intrinsics.inc.h
+InstCount.o: Intrinsics.inc.h
+InstCount.po: Intrinsics.inc.h
 LazyValueInfo.o: Intrinsics.inc.h
 LazyValueInfo.po: Intrinsics.inc.h
 Lint.o: Intrinsics.inc.h
 Lint.po: Intrinsics.inc.h
 Loads.o: Intrinsics.inc.h
 Loads.po: Intrinsics.inc.h
+MemoryBuiltins.o: Intrinsics.inc.h
+MemoryBuiltins.po: Intrinsics.inc.h
 MemoryDependenceAnalysis.o: Intrinsics.inc.h
 MemoryDependenceAnalysis.po: Intrinsics.inc.h
 ScalarEvolutionExpander.o: Intrinsics.inc.h
diff --git a/lib/clang/libllvmarchive/Makefile.depend b/lib/clang/libllvmarchive/Makefile.depend
index 6a3fc332584d..422d37c93228 100644
--- a/lib/clang/libllvmarchive/Makefile.depend
+++ b/lib/clang/libllvmarchive/Makefile.depend
@@ -2,9 +2,9 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
+	gnu/lib/libstdc++ \
+	gnu/lib/libsupc++ \
 	include \
 	include/xlocale \
 	lib/msun \
diff --git a/lib/clang/libllvmarmasmparser/Makefile.depend b/lib/clang/libllvmarmasmparser/Makefile.depend
index d4e4af4fd790..971d85199472 100644
--- a/lib/clang/libllvmarmasmparser/Makefile.depend
+++ b/lib/clang/libllvmarmasmparser/Makefile.depend
@@ -2,9 +2,9 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
+	gnu/lib/libstdc++ \
+	gnu/lib/libsupc++ \
 	include \
 	include/xlocale \
 	lib/msun \
diff --git a/lib/clang/libllvmarmcodegen/Makefile.depend b/lib/clang/libllvmarmcodegen/Makefile.depend
index abc1e04e5be4..cda3e6090377 100644
--- a/lib/clang/libllvmarmcodegen/Makefile.depend
+++ b/lib/clang/libllvmarmcodegen/Makefile.depend
@@ -2,9 +2,9 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
+	gnu/lib/libstdc++ \
+	gnu/lib/libsupc++ \
 	include \
 	include/xlocale \
 	lib/msun \
diff --git a/lib/clang/libllvmarmdesc/Makefile.depend b/lib/clang/libllvmarmdesc/Makefile.depend
index 1f4c1657cb3e..d0482a0ff645 100644
--- a/lib/clang/libllvmarmdesc/Makefile.depend
+++ b/lib/clang/libllvmarmdesc/Makefile.depend
@@ -2,9 +2,9 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
+	gnu/lib/libstdc++ \
+	gnu/lib/libsupc++ \
 	include \
 	include/xlocale \
 	lib/msun \
diff --git a/lib/clang/libllvmarmdisassembler/Makefile.depend b/lib/clang/libllvmarmdisassembler/Makefile.depend
index 0e7992868e3a..6fd3c24a1300 100644
--- a/lib/clang/libllvmarmdisassembler/Makefile.depend
+++ b/lib/clang/libllvmarmdisassembler/Makefile.depend
@@ -2,9 +2,9 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
+	gnu/lib/libstdc++ \
+	gnu/lib/libsupc++ \
 	include \
 	include/xlocale \
 	lib/msun \
diff --git a/lib/clang/libllvmarminfo/Makefile.depend b/lib/clang/libllvmarminfo/Makefile.depend
index 06b4fd9e981c..36e229b7b9da 100644
--- a/lib/clang/libllvmarminfo/Makefile.depend
+++ b/lib/clang/libllvmarminfo/Makefile.depend
@@ -2,9 +2,9 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
+	gnu/lib/libstdc++ \
+	gnu/lib/libsupc++ \
 	include \
 	include/xlocale \
 	lib/msun \
diff --git a/lib/clang/libllvmarminstprinter/Makefile.depend b/lib/clang/libllvmarminstprinter/Makefile.depend
index 9bcf0c7abc45..ec220f978f51 100644
--- a/lib/clang/libllvmarminstprinter/Makefile.depend
+++ b/lib/clang/libllvmarminstprinter/Makefile.depend
@@ -2,9 +2,9 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
+	gnu/lib/libstdc++ \
+	gnu/lib/libsupc++ \
 	include \
 	include/xlocale \
 	lib/msun \
diff --git a/lib/clang/libllvmasmparser/Makefile.depend b/lib/clang/libllvmasmparser/Makefile.depend
index 6a3fc332584d..422d37c93228 100644
--- a/lib/clang/libllvmasmparser/Makefile.depend
+++ b/lib/clang/libllvmasmparser/Makefile.depend
@@ -2,9 +2,9 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
+	gnu/lib/libstdc++ \
+	gnu/lib/libsupc++ \
 	include \
 	include/xlocale \
 	lib/msun \
diff --git a/lib/clang/libllvmasmprinter/Makefile.depend b/lib/clang/libllvmasmprinter/Makefile.depend
index 6a3fc332584d..422d37c93228 100644
--- a/lib/clang/libllvmasmprinter/Makefile.depend
+++ b/lib/clang/libllvmasmprinter/Makefile.depend
@@ -2,9 +2,9 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
+	gnu/lib/libstdc++ \
+	gnu/lib/libsupc++ \
 	include \
 	include/xlocale \
 	lib/msun \
diff --git a/lib/clang/libllvmbitreader/Makefile.depend b/lib/clang/libllvmbitreader/Makefile.depend
index 97f57a5f93f1..b947096fea4f 100644
--- a/lib/clang/libllvmbitreader/Makefile.depend
+++ b/lib/clang/libllvmbitreader/Makefile.depend
@@ -2,9 +2,9 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
+	gnu/lib/libstdc++ \
+	gnu/lib/libsupc++ \
 	include \
 	include/xlocale \
 	lib/msun \
diff --git a/lib/clang/libllvmbitwriter/Makefile.depend b/lib/clang/libllvmbitwriter/Makefile.depend
index 6a3fc332584d..422d37c93228 100644
--- a/lib/clang/libllvmbitwriter/Makefile.depend
+++ b/lib/clang/libllvmbitwriter/Makefile.depend
@@ -2,9 +2,9 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
+	gnu/lib/libstdc++ \
+	gnu/lib/libsupc++ \
 	include \
 	include/xlocale \
 	lib/msun \
diff --git a/lib/clang/libllvmcodegen/Makefile.depend b/lib/clang/libllvmcodegen/Makefile.depend
index 026d1de8e952..384bed583cce 100644
--- a/lib/clang/libllvmcodegen/Makefile.depend
+++ b/lib/clang/libllvmcodegen/Makefile.depend
@@ -2,9 +2,9 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
+	gnu/lib/libstdc++ \
+	gnu/lib/libsupc++ \
 	include \
 	include/xlocale \
 	lib/msun \
diff --git a/lib/clang/libllvmcore/Makefile.depend b/lib/clang/libllvmcore/Makefile.depend
index cdb43737d781..489ec2bc7cbe 100644
--- a/lib/clang/libllvmcore/Makefile.depend
+++ b/lib/clang/libllvmcore/Makefile.depend
@@ -2,9 +2,9 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
+	gnu/lib/libstdc++ \
+	gnu/lib/libsupc++ \
 	include \
 	include/xlocale \
 	lib/msun \
@@ -22,6 +22,10 @@ BasicBlock.o: Intrinsics.inc.h
 BasicBlock.po: Intrinsics.inc.h
 Core.o: Intrinsics.inc.h
 Core.po: Intrinsics.inc.h
+DIBuilder.o: Intrinsics.inc.h
+DIBuilder.po: Intrinsics.inc.h
+DebugInfo.o: Intrinsics.inc.h
+DebugInfo.po: Intrinsics.inc.h
 Function.o: Intrinsics.inc.h
 Function.po: Intrinsics.inc.h
 IRBuilder.o: Intrinsics.inc.h
diff --git a/lib/clang/libllvminstcombine/Makefile.depend b/lib/clang/libllvminstcombine/Makefile.depend
index 27d7724f9a75..0851afa916c8 100644
--- a/lib/clang/libllvminstcombine/Makefile.depend
+++ b/lib/clang/libllvminstcombine/Makefile.depend
@@ -2,9 +2,9 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
+	gnu/lib/libstdc++ \
+	gnu/lib/libsupc++ \
 	include \
 	include/xlocale \
 	lib/msun \
diff --git a/lib/clang/libllvminstrumentation/Makefile.depend b/lib/clang/libllvminstrumentation/Makefile.depend
index 2574cd56aa71..a730fc235327 100644
--- a/lib/clang/libllvminstrumentation/Makefile.depend
+++ b/lib/clang/libllvminstrumentation/Makefile.depend
@@ -2,9 +2,9 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
+	gnu/lib/libstdc++ \
+	gnu/lib/libsupc++ \
 	include \
 	include/xlocale \
 	lib/msun \
@@ -16,6 +16,8 @@ DIRDEPS = \
 # local dependencies - needed for -jN in clean tree
 AddressSanitizer.o: Intrinsics.inc.h
 AddressSanitizer.po: Intrinsics.inc.h
+BoundsChecking.o: Intrinsics.inc.h
+BoundsChecking.po: Intrinsics.inc.h
 ThreadSanitizer.o: Intrinsics.inc.h
 ThreadSanitizer.po: Intrinsics.inc.h
 .endif
diff --git a/lib/clang/libllvmipa/Makefile.depend b/lib/clang/libllvmipa/Makefile.depend
index 9b4317f5d016..8c10ddd906d9 100644
--- a/lib/clang/libllvmipa/Makefile.depend
+++ b/lib/clang/libllvmipa/Makefile.depend
@@ -2,9 +2,9 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
+	gnu/lib/libstdc++ \
+	gnu/lib/libsupc++ \
 	include \
 	include/xlocale \
 	lib/msun \
diff --git a/lib/clang/libllvmipo/Makefile.depend b/lib/clang/libllvmipo/Makefile.depend
index 6f90d4d62450..54309eef69b1 100644
--- a/lib/clang/libllvmipo/Makefile.depend
+++ b/lib/clang/libllvmipo/Makefile.depend
@@ -2,9 +2,9 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
+	gnu/lib/libstdc++ \
+	gnu/lib/libsupc++ \
 	include \
 	include/xlocale \
 	lib/msun \
diff --git a/lib/clang/libllvmlinker/Makefile.depend b/lib/clang/libllvmlinker/Makefile.depend
index 6a3fc332584d..422d37c93228 100644
--- a/lib/clang/libllvmlinker/Makefile.depend
+++ b/lib/clang/libllvmlinker/Makefile.depend
@@ -2,9 +2,9 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
+	gnu/lib/libstdc++ \
+	gnu/lib/libsupc++ \
 	include \
 	include/xlocale \
 	lib/msun \
diff --git a/lib/clang/libllvmmc/Makefile.depend b/lib/clang/libllvmmc/Makefile.depend
index 6a3fc332584d..422d37c93228 100644
--- a/lib/clang/libllvmmc/Makefile.depend
+++ b/lib/clang/libllvmmc/Makefile.depend
@@ -2,9 +2,9 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
+	gnu/lib/libstdc++ \
+	gnu/lib/libsupc++ \
 	include \
 	include/xlocale \
 	lib/msun \
diff --git a/lib/clang/libllvmmcparser/Makefile.depend b/lib/clang/libllvmmcparser/Makefile.depend
index 6a3fc332584d..422d37c93228 100644
--- a/lib/clang/libllvmmcparser/Makefile.depend
+++ b/lib/clang/libllvmmcparser/Makefile.depend
@@ -2,9 +2,9 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
+	gnu/lib/libstdc++ \
+	gnu/lib/libsupc++ \
 	include \
 	include/xlocale \
 	lib/msun \
diff --git a/lib/clang/libllvmmipsasmparser/Makefile.depend b/lib/clang/libllvmmipsasmparser/Makefile.depend
index a215c2c9d5ab..89bde7286af8 100644
--- a/lib/clang/libllvmmipsasmparser/Makefile.depend
+++ b/lib/clang/libllvmmipsasmparser/Makefile.depend
@@ -2,9 +2,9 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
+	gnu/lib/libstdc++ \
+	gnu/lib/libsupc++ \
 	include \
 	include/xlocale \
 	lib/msun \
@@ -14,9 +14,11 @@ DIRDEPS = \
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
+MipsAsmParser.o: MipsGenAsmMatcher.inc.h
 MipsAsmParser.o: MipsGenInstrInfo.inc.h
 MipsAsmParser.o: MipsGenRegisterInfo.inc.h
 MipsAsmParser.o: MipsGenSubtargetInfo.inc.h
+MipsAsmParser.po: MipsGenAsmMatcher.inc.h
 MipsAsmParser.po: MipsGenInstrInfo.inc.h
 MipsAsmParser.po: MipsGenRegisterInfo.inc.h
 MipsAsmParser.po: MipsGenSubtargetInfo.inc.h
diff --git a/lib/clang/libllvmmipscodegen/Makefile.depend b/lib/clang/libllvmmipscodegen/Makefile.depend
index 28ee9944de05..f1a985dbeca9 100644
--- a/lib/clang/libllvmmipscodegen/Makefile.depend
+++ b/lib/clang/libllvmmipscodegen/Makefile.depend
@@ -2,9 +2,9 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
+	gnu/lib/libstdc++ \
+	gnu/lib/libsupc++ \
 	include \
 	include/xlocale \
 	lib/msun \
@@ -14,6 +14,24 @@ DIRDEPS = \
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
+Mips16FrameLowering.o: MipsGenInstrInfo.inc.h
+Mips16FrameLowering.o: MipsGenRegisterInfo.inc.h
+Mips16FrameLowering.o: MipsGenSubtargetInfo.inc.h
+Mips16FrameLowering.po: MipsGenInstrInfo.inc.h
+Mips16FrameLowering.po: MipsGenRegisterInfo.inc.h
+Mips16FrameLowering.po: MipsGenSubtargetInfo.inc.h
+Mips16InstrInfo.o: MipsGenInstrInfo.inc.h
+Mips16InstrInfo.o: MipsGenRegisterInfo.inc.h
+Mips16InstrInfo.o: MipsGenSubtargetInfo.inc.h
+Mips16InstrInfo.po: MipsGenInstrInfo.inc.h
+Mips16InstrInfo.po: MipsGenRegisterInfo.inc.h
+Mips16InstrInfo.po: MipsGenSubtargetInfo.inc.h
+Mips16RegisterInfo.o: MipsGenInstrInfo.inc.h
+Mips16RegisterInfo.o: MipsGenRegisterInfo.inc.h
+Mips16RegisterInfo.o: MipsGenSubtargetInfo.inc.h
+Mips16RegisterInfo.po: MipsGenInstrInfo.inc.h
+Mips16RegisterInfo.po: MipsGenRegisterInfo.inc.h
+Mips16RegisterInfo.po: MipsGenSubtargetInfo.inc.h
 MipsAnalyzeImmediate.o: MipsGenInstrInfo.inc.h
 MipsAnalyzeImmediate.o: MipsGenRegisterInfo.inc.h
 MipsAnalyzeImmediate.o: MipsGenSubtargetInfo.inc.h
@@ -21,9 +39,11 @@ MipsAnalyzeImmediate.po: MipsGenInstrInfo.inc.h
 MipsAnalyzeImmediate.po: MipsGenRegisterInfo.inc.h
 MipsAnalyzeImmediate.po: MipsGenSubtargetInfo.inc.h
 MipsAsmPrinter.o: MipsGenInstrInfo.inc.h
+MipsAsmPrinter.o: MipsGenMCPseudoLowering.inc.h
 MipsAsmPrinter.o: MipsGenRegisterInfo.inc.h
 MipsAsmPrinter.o: MipsGenSubtargetInfo.inc.h
 MipsAsmPrinter.po: MipsGenInstrInfo.inc.h
+MipsAsmPrinter.po: MipsGenMCPseudoLowering.inc.h
 MipsAsmPrinter.po: MipsGenRegisterInfo.inc.h
 MipsAsmPrinter.po: MipsGenSubtargetInfo.inc.h
 MipsCodeEmitter.o: MipsGenCodeEmitter.inc.h
@@ -40,18 +60,6 @@ MipsDelaySlotFiller.o: MipsGenSubtargetInfo.inc.h
 MipsDelaySlotFiller.po: MipsGenInstrInfo.inc.h
 MipsDelaySlotFiller.po: MipsGenRegisterInfo.inc.h
 MipsDelaySlotFiller.po: MipsGenSubtargetInfo.inc.h
-MipsEmitGPRestore.o: MipsGenInstrInfo.inc.h
-MipsEmitGPRestore.o: MipsGenRegisterInfo.inc.h
-MipsEmitGPRestore.o: MipsGenSubtargetInfo.inc.h
-MipsEmitGPRestore.po: MipsGenInstrInfo.inc.h
-MipsEmitGPRestore.po: MipsGenRegisterInfo.inc.h
-MipsEmitGPRestore.po: MipsGenSubtargetInfo.inc.h
-MipsExpandPseudo.o: MipsGenInstrInfo.inc.h
-MipsExpandPseudo.o: MipsGenRegisterInfo.inc.h
-MipsExpandPseudo.o: MipsGenSubtargetInfo.inc.h
-MipsExpandPseudo.po: MipsGenInstrInfo.inc.h
-MipsExpandPseudo.po: MipsGenRegisterInfo.inc.h
-MipsExpandPseudo.po: MipsGenSubtargetInfo.inc.h
 MipsFrameLowering.o: MipsGenInstrInfo.inc.h
 MipsFrameLowering.o: MipsGenRegisterInfo.inc.h
 MipsFrameLowering.o: MipsGenSubtargetInfo.inc.h
@@ -90,6 +98,12 @@ MipsJITInfo.o: MipsGenSubtargetInfo.inc.h
 MipsJITInfo.po: MipsGenInstrInfo.inc.h
 MipsJITInfo.po: MipsGenRegisterInfo.inc.h
 MipsJITInfo.po: MipsGenSubtargetInfo.inc.h
+MipsLongBranch.o: MipsGenInstrInfo.inc.h
+MipsLongBranch.o: MipsGenRegisterInfo.inc.h
+MipsLongBranch.o: MipsGenSubtargetInfo.inc.h
+MipsLongBranch.po: MipsGenInstrInfo.inc.h
+MipsLongBranch.po: MipsGenRegisterInfo.inc.h
+MipsLongBranch.po: MipsGenSubtargetInfo.inc.h
 MipsMCInstLower.o: MipsGenInstrInfo.inc.h
 MipsMCInstLower.o: MipsGenRegisterInfo.inc.h
 MipsMCInstLower.o: MipsGenSubtargetInfo.inc.h
@@ -108,6 +122,24 @@ MipsRegisterInfo.o: MipsGenSubtargetInfo.inc.h
 MipsRegisterInfo.po: MipsGenInstrInfo.inc.h
 MipsRegisterInfo.po: MipsGenRegisterInfo.inc.h
 MipsRegisterInfo.po: MipsGenSubtargetInfo.inc.h
+MipsSEFrameLowering.o: MipsGenInstrInfo.inc.h
+MipsSEFrameLowering.o: MipsGenRegisterInfo.inc.h
+MipsSEFrameLowering.o: MipsGenSubtargetInfo.inc.h
+MipsSEFrameLowering.po: MipsGenInstrInfo.inc.h
+MipsSEFrameLowering.po: MipsGenRegisterInfo.inc.h
+MipsSEFrameLowering.po: MipsGenSubtargetInfo.inc.h
+MipsSEInstrInfo.o: MipsGenInstrInfo.inc.h
+MipsSEInstrInfo.o: MipsGenRegisterInfo.inc.h
+MipsSEInstrInfo.o: MipsGenSubtargetInfo.inc.h
+MipsSEInstrInfo.po: MipsGenInstrInfo.inc.h
+MipsSEInstrInfo.po: MipsGenRegisterInfo.inc.h
+MipsSEInstrInfo.po: MipsGenSubtargetInfo.inc.h
+MipsSERegisterInfo.o: MipsGenInstrInfo.inc.h
+MipsSERegisterInfo.o: MipsGenRegisterInfo.inc.h
+MipsSERegisterInfo.o: MipsGenSubtargetInfo.inc.h
+MipsSERegisterInfo.po: MipsGenInstrInfo.inc.h
+MipsSERegisterInfo.po: MipsGenRegisterInfo.inc.h
+MipsSERegisterInfo.po: MipsGenSubtargetInfo.inc.h
 MipsSelectionDAGInfo.o: MipsGenInstrInfo.inc.h
 MipsSelectionDAGInfo.o: MipsGenRegisterInfo.inc.h
 MipsSelectionDAGInfo.o: MipsGenSubtargetInfo.inc.h
diff --git a/lib/clang/libllvmmipsdesc/Makefile.depend b/lib/clang/libllvmmipsdesc/Makefile.depend
index 1aceb5f3ac2e..431b91616045 100644
--- a/lib/clang/libllvmmipsdesc/Makefile.depend
+++ b/lib/clang/libllvmmipsdesc/Makefile.depend
@@ -2,9 +2,9 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
+	gnu/lib/libstdc++ \
+	gnu/lib/libsupc++ \
 	include \
 	include/xlocale \
 	lib/msun \
@@ -20,6 +20,12 @@ MipsAsmBackend.o: MipsGenSubtargetInfo.inc.h
 MipsAsmBackend.po: MipsGenInstrInfo.inc.h
 MipsAsmBackend.po: MipsGenRegisterInfo.inc.h
 MipsAsmBackend.po: MipsGenSubtargetInfo.inc.h
+MipsDirectObjLower.o: MipsGenInstrInfo.inc.h
+MipsDirectObjLower.o: MipsGenRegisterInfo.inc.h
+MipsDirectObjLower.o: MipsGenSubtargetInfo.inc.h
+MipsDirectObjLower.po: MipsGenInstrInfo.inc.h
+MipsDirectObjLower.po: MipsGenRegisterInfo.inc.h
+MipsDirectObjLower.po: MipsGenSubtargetInfo.inc.h
 MipsELFObjectWriter.o: MipsGenInstrInfo.inc.h
 MipsELFObjectWriter.o: MipsGenRegisterInfo.inc.h
 MipsELFObjectWriter.o: MipsGenSubtargetInfo.inc.h
diff --git a/lib/clang/libllvmmipsinfo/Makefile.depend b/lib/clang/libllvmmipsinfo/Makefile.depend
index 54441b5d8752..d137771a1589 100644
--- a/lib/clang/libllvmmipsinfo/Makefile.depend
+++ b/lib/clang/libllvmmipsinfo/Makefile.depend
@@ -2,9 +2,9 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
+	gnu/lib/libstdc++ \
+	gnu/lib/libsupc++ \
 	include \
 	include/xlocale \
 	lib/msun \
diff --git a/lib/clang/libllvmmipsinstprinter/Makefile.depend b/lib/clang/libllvmmipsinstprinter/Makefile.depend
index 5ecd0b52f349..e30b14ba5aa7 100644
--- a/lib/clang/libllvmmipsinstprinter/Makefile.depend
+++ b/lib/clang/libllvmmipsinstprinter/Makefile.depend
@@ -2,9 +2,9 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
+	gnu/lib/libstdc++ \
+	gnu/lib/libsupc++ \
 	include \
 	include/xlocale \
 	lib/msun \
@@ -15,5 +15,11 @@ DIRDEPS = \
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
 MipsInstPrinter.o: MipsGenAsmWriter.inc.h
+MipsInstPrinter.o: MipsGenInstrInfo.inc.h
+MipsInstPrinter.o: MipsGenRegisterInfo.inc.h
+MipsInstPrinter.o: MipsGenSubtargetInfo.inc.h
 MipsInstPrinter.po: MipsGenAsmWriter.inc.h
+MipsInstPrinter.po: MipsGenInstrInfo.inc.h
+MipsInstPrinter.po: MipsGenRegisterInfo.inc.h
+MipsInstPrinter.po: MipsGenSubtargetInfo.inc.h
 .endif
diff --git a/lib/clang/libllvmobject/Makefile.depend b/lib/clang/libllvmobject/Makefile.depend
index 6a3fc332584d..422d37c93228 100644
--- a/lib/clang/libllvmobject/Makefile.depend
+++ b/lib/clang/libllvmobject/Makefile.depend
@@ -2,9 +2,9 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
+	gnu/lib/libstdc++ \
+	gnu/lib/libsupc++ \
 	include \
 	include/xlocale \
 	lib/msun \
diff --git a/lib/clang/libllvmpowerpccodegen/Makefile.depend b/lib/clang/libllvmpowerpccodegen/Makefile.depend
index 988435f466bf..ae70ab60647a 100644
--- a/lib/clang/libllvmpowerpccodegen/Makefile.depend
+++ b/lib/clang/libllvmpowerpccodegen/Makefile.depend
@@ -2,9 +2,9 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
+	gnu/lib/libstdc++ \
+	gnu/lib/libsupc++ \
 	include \
 	include/xlocale \
 	lib/msun \
@@ -26,6 +26,12 @@ PPCBranchSelector.o: PPCGenSubtargetInfo.inc.h
 PPCBranchSelector.po: PPCGenInstrInfo.inc.h
 PPCBranchSelector.po: PPCGenRegisterInfo.inc.h
 PPCBranchSelector.po: PPCGenSubtargetInfo.inc.h
+PPCCTRLoops.o: PPCGenInstrInfo.inc.h
+PPCCTRLoops.o: PPCGenRegisterInfo.inc.h
+PPCCTRLoops.o: PPCGenSubtargetInfo.inc.h
+PPCCTRLoops.po: PPCGenInstrInfo.inc.h
+PPCCTRLoops.po: PPCGenRegisterInfo.inc.h
+PPCCTRLoops.po: PPCGenSubtargetInfo.inc.h
 PPCCodeEmitter.o: PPCGenCodeEmitter.inc.h
 PPCCodeEmitter.o: PPCGenInstrInfo.inc.h
 PPCCodeEmitter.o: PPCGenRegisterInfo.inc.h
diff --git a/lib/clang/libllvmpowerpcdesc/Makefile.depend b/lib/clang/libllvmpowerpcdesc/Makefile.depend
index b67f8a9b2d39..e08c52ee04f0 100644
--- a/lib/clang/libllvmpowerpcdesc/Makefile.depend
+++ b/lib/clang/libllvmpowerpcdesc/Makefile.depend
@@ -2,9 +2,9 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
+	gnu/lib/libstdc++ \
+	gnu/lib/libsupc++ \
 	include \
 	include/xlocale \
 	lib/msun \
diff --git a/lib/clang/libllvmpowerpcinfo/Makefile.depend b/lib/clang/libllvmpowerpcinfo/Makefile.depend
index 22102dc6f313..000ccdafcf74 100644
--- a/lib/clang/libllvmpowerpcinfo/Makefile.depend
+++ b/lib/clang/libllvmpowerpcinfo/Makefile.depend
@@ -2,9 +2,9 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
+	gnu/lib/libstdc++ \
+	gnu/lib/libsupc++ \
 	include \
 	include/xlocale \
 	lib/msun \
diff --git a/lib/clang/libllvmpowerpcinstprinter/Makefile.depend b/lib/clang/libllvmpowerpcinstprinter/Makefile.depend
index da1fa0fb4964..b684e2531769 100644
--- a/lib/clang/libllvmpowerpcinstprinter/Makefile.depend
+++ b/lib/clang/libllvmpowerpcinstprinter/Makefile.depend
@@ -2,9 +2,9 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
+	gnu/lib/libstdc++ \
+	gnu/lib/libsupc++ \
 	include \
 	include/xlocale \
 	lib/msun \
diff --git a/lib/clang/libllvmscalaropts/Makefile.depend b/lib/clang/libllvmscalaropts/Makefile.depend
index 5b49aa40b311..4eb3de81ec94 100644
--- a/lib/clang/libllvmscalaropts/Makefile.depend
+++ b/lib/clang/libllvmscalaropts/Makefile.depend
@@ -2,9 +2,9 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
+	gnu/lib/libstdc++ \
+	gnu/lib/libsupc++ \
 	include \
 	include/xlocale \
 	lib/msun \
@@ -46,6 +46,10 @@ ObjCARC.o: Intrinsics.inc.h
 ObjCARC.po: Intrinsics.inc.h
 Reassociate.o: Intrinsics.inc.h
 Reassociate.po: Intrinsics.inc.h
+SCCP.o: Intrinsics.inc.h
+SCCP.po: Intrinsics.inc.h
+SROA.o: Intrinsics.inc.h
+SROA.po: Intrinsics.inc.h
 ScalarReplAggregates.o: Intrinsics.inc.h
 ScalarReplAggregates.po: Intrinsics.inc.h
 SimplifyCFGPass.o: Intrinsics.inc.h
diff --git a/lib/clang/libllvmselectiondag/Makefile.depend b/lib/clang/libllvmselectiondag/Makefile.depend
index cae65c829615..6db6d7ed1eaa 100644
--- a/lib/clang/libllvmselectiondag/Makefile.depend
+++ b/lib/clang/libllvmselectiondag/Makefile.depend
@@ -2,9 +2,9 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
+	gnu/lib/libstdc++ \
+	gnu/lib/libsupc++ \
 	include \
 	include/xlocale \
 	lib/msun \
diff --git a/lib/clang/libllvmsupport/Makefile.depend b/lib/clang/libllvmsupport/Makefile.depend
index 65a0021777cb..422d37c93228 100644
--- a/lib/clang/libllvmsupport/Makefile.depend
+++ b/lib/clang/libllvmsupport/Makefile.depend
@@ -2,8 +2,6 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
 	gnu/lib/libstdc++ \
 	gnu/lib/libsupc++ \
diff --git a/lib/clang/libllvmtablegen/Makefile.depend b/lib/clang/libllvmtablegen/Makefile.depend
index 65a0021777cb..422d37c93228 100644
--- a/lib/clang/libllvmtablegen/Makefile.depend
+++ b/lib/clang/libllvmtablegen/Makefile.depend
@@ -2,8 +2,6 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
 	gnu/lib/libstdc++ \
 	gnu/lib/libsupc++ \
diff --git a/lib/clang/libllvmtarget/Makefile.depend b/lib/clang/libllvmtarget/Makefile.depend
index 6a3fc332584d..422d37c93228 100644
--- a/lib/clang/libllvmtarget/Makefile.depend
+++ b/lib/clang/libllvmtarget/Makefile.depend
@@ -2,9 +2,9 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
+	gnu/lib/libstdc++ \
+	gnu/lib/libsupc++ \
 	include \
 	include/xlocale \
 	lib/msun \
diff --git a/lib/clang/libllvmtransformutils/Makefile.depend b/lib/clang/libllvmtransformutils/Makefile.depend
index 16320acc92a5..f7d03f410666 100644
--- a/lib/clang/libllvmtransformutils/Makefile.depend
+++ b/lib/clang/libllvmtransformutils/Makefile.depend
@@ -2,9 +2,9 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
+	gnu/lib/libstdc++ \
+	gnu/lib/libsupc++ \
 	include \
 	include/xlocale \
 	lib/msun \
@@ -24,6 +24,8 @@ CodeExtractor.o: Intrinsics.inc.h
 CodeExtractor.po: Intrinsics.inc.h
 InlineFunction.o: Intrinsics.inc.h
 InlineFunction.po: Intrinsics.inc.h
+IntegerDivision.o: Intrinsics.inc.h
+IntegerDivision.po: Intrinsics.inc.h
 Local.o: Intrinsics.inc.h
 Local.po: Intrinsics.inc.h
 LoopSimplify.o: Intrinsics.inc.h
diff --git a/lib/clang/libllvmvectorize/Makefile.depend b/lib/clang/libllvmvectorize/Makefile.depend
index 4bf19437a5f0..f44ea477f2c6 100644
--- a/lib/clang/libllvmvectorize/Makefile.depend
+++ b/lib/clang/libllvmvectorize/Makefile.depend
@@ -2,9 +2,9 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
+	gnu/lib/libstdc++ \
+	gnu/lib/libsupc++ \
 	include \
 	include/xlocale \
 	lib/msun \
diff --git a/lib/clang/libllvmx86asmparser/Makefile.depend b/lib/clang/libllvmx86asmparser/Makefile.depend
index 22486a920273..e89abf7c1290 100644
--- a/lib/clang/libllvmx86asmparser/Makefile.depend
+++ b/lib/clang/libllvmx86asmparser/Makefile.depend
@@ -2,9 +2,9 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
+	gnu/lib/libstdc++ \
+	gnu/lib/libsupc++ \
 	include \
 	include/xlocale \
 	lib/msun \
diff --git a/lib/clang/libllvmx86codegen/Makefile.depend b/lib/clang/libllvmx86codegen/Makefile.depend
index f1da7d609dab..47eea8c800cc 100644
--- a/lib/clang/libllvmx86codegen/Makefile.depend
+++ b/lib/clang/libllvmx86codegen/Makefile.depend
@@ -2,9 +2,9 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
+	gnu/lib/libstdc++ \
+	gnu/lib/libsupc++ \
 	include \
 	include/xlocale \
 	lib/msun \
diff --git a/lib/clang/libllvmx86desc/Makefile.depend b/lib/clang/libllvmx86desc/Makefile.depend
index 2c335d731977..a5e3e540a7a5 100644
--- a/lib/clang/libllvmx86desc/Makefile.depend
+++ b/lib/clang/libllvmx86desc/Makefile.depend
@@ -2,9 +2,9 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
+	gnu/lib/libstdc++ \
+	gnu/lib/libsupc++ \
 	include \
 	include/xlocale \
 	lib/msun \
diff --git a/lib/clang/libllvmx86disassembler/Makefile.depend b/lib/clang/libllvmx86disassembler/Makefile.depend
index 4c1fae90e03d..802a851c07cb 100644
--- a/lib/clang/libllvmx86disassembler/Makefile.depend
+++ b/lib/clang/libllvmx86disassembler/Makefile.depend
@@ -2,9 +2,9 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
+	gnu/lib/libstdc++ \
+	gnu/lib/libsupc++ \
 	include \
 	include/xlocale \
 	lib/msun \
diff --git a/lib/clang/libllvmx86info/Makefile.depend b/lib/clang/libllvmx86info/Makefile.depend
index 2da8b5381f3d..1540a5fab645 100644
--- a/lib/clang/libllvmx86info/Makefile.depend
+++ b/lib/clang/libllvmx86info/Makefile.depend
@@ -2,9 +2,9 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
+	gnu/lib/libstdc++ \
+	gnu/lib/libsupc++ \
 	include \
 	include/xlocale \
 	lib/msun \
diff --git a/lib/clang/libllvmx86instprinter/Makefile.depend b/lib/clang/libllvmx86instprinter/Makefile.depend
index 9eafb9145f9e..ab56eb6eee79 100644
--- a/lib/clang/libllvmx86instprinter/Makefile.depend
+++ b/lib/clang/libllvmx86instprinter/Makefile.depend
@@ -2,9 +2,9 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
+	gnu/lib/libstdc++ \
+	gnu/lib/libsupc++ \
 	include \
 	include/xlocale \
 	lib/msun \
diff --git a/lib/clang/libllvmx86utils/Makefile.depend b/lib/clang/libllvmx86utils/Makefile.depend
index 6a3fc332584d..422d37c93228 100644
--- a/lib/clang/libllvmx86utils/Makefile.depend
+++ b/lib/clang/libllvmx86utils/Makefile.depend
@@ -2,9 +2,9 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
+	gnu/lib/libstdc++ \
+	gnu/lib/libsupc++ \
 	include \
 	include/xlocale \
 	lib/msun \
diff --git a/usr.bin/clang/clang-tblgen/Makefile.depend b/usr.bin/clang/clang-tblgen/Makefile.depend
index 9148fc2c7e55..1a3fce45f4e3 100644
--- a/usr.bin/clang/clang-tblgen/Makefile.depend
+++ b/usr.bin/clang/clang-tblgen/Makefile.depend
@@ -2,8 +2,6 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
 	gnu/lib/libgcc \
 	gnu/lib/libstdc++ \
@@ -14,6 +12,7 @@ DIRDEPS = \
 	lib/clang/libllvmsupport \
 	lib/clang/libllvmtablegen \
 	lib/libc \
+	lib/libcompiler_rt \
 	lib/msun \
 
 
diff --git a/usr.bin/clang/clang/Makefile.depend b/usr.bin/clang/clang/Makefile.depend
index 9c26a6933977..f7b95b070285 100644
--- a/usr.bin/clang/clang/Makefile.depend
+++ b/usr.bin/clang/clang/Makefile.depend
@@ -2,11 +2,9 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
-	gnu/lib/libgcc \
 	gnu/lib/libstdc++ \
+	gnu/lib/libsupc++ \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
@@ -21,7 +19,8 @@ DIRDEPS = \
 	lib/clang/libclangfrontendtool \
 	lib/clang/libclanglex \
 	lib/clang/libclangparse \
-	lib/clang/libclangrewrite \
+	lib/clang/libclangrewritecore \
+	lib/clang/libclangrewritefrontend \
 	lib/clang/libclangsema \
 	lib/clang/libclangserialization \
 	lib/clang/libclangstaticanalyzercheckers \
@@ -51,6 +50,7 @@ DIRDEPS = \
 	lib/clang/libllvmmipsasmparser \
 	lib/clang/libllvmmipscodegen \
 	lib/clang/libllvmmipsdesc \
+	lib/clang/libllvmmipsdisassembler \
 	lib/clang/libllvmmipsinfo \
 	lib/clang/libllvmmipsinstprinter \
 	lib/clang/libllvmobject \
@@ -72,6 +72,7 @@ DIRDEPS = \
 	lib/clang/libllvmx86instprinter \
 	lib/clang/libllvmx86utils \
 	lib/libc \
+	lib/libcompiler_rt \
 	lib/msun \
 
 
@@ -79,14 +80,14 @@ DIRDEPS = \
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
-cc1_main.o: CC1Options.inc.h
 cc1_main.o: DiagnosticCommonKinds.inc.h
 cc1_main.o: DiagnosticDriverKinds.inc.h
 cc1_main.o: DiagnosticFrontendKinds.inc.h
-cc1_main.po: CC1Options.inc.h
+cc1_main.o: Options.inc.h
 cc1_main.po: DiagnosticCommonKinds.inc.h
 cc1_main.po: DiagnosticDriverKinds.inc.h
 cc1_main.po: DiagnosticFrontendKinds.inc.h
+cc1_main.po: Options.inc.h
 cc1as_main.o: CC1AsOptions.inc.h
 cc1as_main.o: DiagnosticCommonKinds.inc.h
 cc1as_main.o: DiagnosticDriverKinds.inc.h
@@ -97,8 +98,8 @@ cc1as_main.po: DiagnosticCommonKinds.inc.h
 cc1as_main.po: DiagnosticDriverKinds.inc.h
 cc1as_main.po: DiagnosticFrontendKinds.inc.h
 cc1as_main.po: Options.inc.h
-driver.o: CC1Options.inc.h
 driver.o: DiagnosticCommonKinds.inc.h
-driver.po: CC1Options.inc.h
+driver.o: Options.inc.h
 driver.po: DiagnosticCommonKinds.inc.h
+driver.po: Options.inc.h
 .endif
diff --git a/usr.bin/clang/tblgen/Makefile.depend b/usr.bin/clang/tblgen/Makefile.depend
index 9148fc2c7e55..1a3fce45f4e3 100644
--- a/usr.bin/clang/tblgen/Makefile.depend
+++ b/usr.bin/clang/tblgen/Makefile.depend
@@ -2,8 +2,6 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
 	gnu/lib/libgcc \
 	gnu/lib/libstdc++ \
@@ -14,6 +12,7 @@ DIRDEPS = \
 	lib/clang/libllvmsupport \
 	lib/clang/libllvmtablegen \
 	lib/libc \
+	lib/libcompiler_rt \
 	lib/msun \