Updated dependencies

166 files changed, 1360 insertions, 918 deletions

diff --git a/bin/csh/Makefile.depend b/bin/csh/Makefile.depend
index 84ceca8..09144ca 100644
--- a/bin/csh/Makefile.depend
+++ b/bin/csh/Makefile.depend
@@ -19,329 +19,225 @@ DIRDEPS = \
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
 ed.chared.o: ed.defns.h
-ed.chared.o: iconv.h
 ed.chared.o: sh.err.h
 ed.chared.o: tc.const.h
 ed.chared.po: ed.defns.h
-ed.chared.po: iconv.h
 ed.chared.po: sh.err.h
 ed.chared.po: tc.const.h
-ed.defns.o: iconv.h
 ed.defns.o: sh.err.h
 ed.defns.o: tc.const.h
-ed.defns.po: iconv.h
 ed.defns.po: sh.err.h
 ed.defns.po: tc.const.h
 ed.init.o: ed.defns.h
-ed.init.o: iconv.h
 ed.init.o: sh.err.h
 ed.init.o: tc.const.h
 ed.init.po: ed.defns.h
-ed.init.po: iconv.h
 ed.init.po: sh.err.h
 ed.init.po: tc.const.h
 ed.inputl.o: ed.defns.h
-ed.inputl.o: iconv.h
 ed.inputl.o: sh.err.h
 ed.inputl.o: tc.const.h
 ed.inputl.po: ed.defns.h
-ed.inputl.po: iconv.h
 ed.inputl.po: sh.err.h
 ed.inputl.po: tc.const.h
-ed.refresh.o: iconv.h
 ed.refresh.o: sh.err.h
 ed.refresh.o: tc.const.h
-ed.refresh.po: iconv.h
 ed.refresh.po: sh.err.h
 ed.refresh.po: tc.const.h
 ed.screen.o: ed.defns.h
-ed.screen.o: iconv.h
 ed.screen.o: sh.err.h
 ed.screen.o: tc.const.h
 ed.screen.po: ed.defns.h
-ed.screen.po: iconv.h
 ed.screen.po: sh.err.h
 ed.screen.po: tc.const.h
-ed.term.o: iconv.h
 ed.term.o: sh.err.h
 ed.term.o: tc.const.h
-ed.term.po: iconv.h
 ed.term.po: sh.err.h
 ed.term.po: tc.const.h
 ed.xmap.o: ed.defns.h
-ed.xmap.o: iconv.h
 ed.xmap.o: sh.err.h
 ed.xmap.o: tc.const.h
 ed.xmap.po: ed.defns.h
-ed.xmap.po: iconv.h
 ed.xmap.po: sh.err.h
 ed.xmap.po: tc.const.h
-glob.o: iconv.h
 glob.o: sh.err.h
 glob.o: tc.const.h
-glob.po: iconv.h
 glob.po: sh.err.h
 glob.po: tc.const.h
-iconv_stub.o: iconv.h
-iconv_stub.po: iconv.h
-mi.termios.o: iconv.h
 mi.termios.o: sh.err.h
 mi.termios.o: tc.const.h
-mi.termios.po: iconv.h
 mi.termios.po: sh.err.h
 mi.termios.po: tc.const.h
-sh.char.o: iconv.h
 sh.char.o: sh.err.h
 sh.char.o: tc.const.h
-sh.char.po: iconv.h
 sh.char.po: sh.err.h
 sh.char.po: tc.const.h
-sh.dir.o: iconv.h
 sh.dir.o: sh.err.h
 sh.dir.o: tc.const.h
-sh.dir.po: iconv.h
 sh.dir.po: sh.err.h
 sh.dir.po: tc.const.h
-sh.dol.o: iconv.h
 sh.dol.o: sh.err.h
 sh.dol.o: tc.const.h
-sh.dol.po: iconv.h
 sh.dol.po: sh.err.h
 sh.dol.po: tc.const.h
-sh.err.o: iconv.h
 sh.err.o: sh.err.h
 sh.err.o: tc.const.h
-sh.err.po: iconv.h
 sh.err.po: sh.err.h
 sh.err.po: tc.const.h
-sh.exec.o: iconv.h
 sh.exec.o: sh.err.h
 sh.exec.o: tc.const.h
-sh.exec.po: iconv.h
 sh.exec.po: sh.err.h
 sh.exec.po: tc.const.h
-sh.exp.o: iconv.h
 sh.exp.o: sh.err.h
 sh.exp.o: tc.const.h
-sh.exp.po: iconv.h
 sh.exp.po: sh.err.h
 sh.exp.po: tc.const.h
-sh.file.o: iconv.h
 sh.file.o: sh.err.h
 sh.file.o: tc.const.h
-sh.file.po: iconv.h
 sh.file.po: sh.err.h
 sh.file.po: tc.const.h
-sh.func.o: iconv.h
 sh.func.o: sh.err.h
 sh.func.o: tc.const.h
-sh.func.po: iconv.h
 sh.func.po: sh.err.h
 sh.func.po: tc.const.h
-sh.glob.o: iconv.h
 sh.glob.o: sh.err.h
 sh.glob.o: tc.const.h
-sh.glob.po: iconv.h
 sh.glob.po: sh.err.h
 sh.glob.po: tc.const.h
-sh.hist.o: iconv.h
 sh.hist.o: sh.err.h
 sh.hist.o: tc.const.h
-sh.hist.po: iconv.h
 sh.hist.po: sh.err.h
 sh.hist.po: tc.const.h
-sh.init.o: iconv.h
 sh.init.o: sh.err.h
 sh.init.o: tc.const.h
-sh.init.po: iconv.h
 sh.init.po: sh.err.h
 sh.init.po: tc.const.h
-sh.lex.o: iconv.h
 sh.lex.o: sh.err.h
 sh.lex.o: tc.const.h
-sh.lex.po: iconv.h
 sh.lex.po: sh.err.h
 sh.lex.po: tc.const.h
-sh.misc.o: iconv.h
 sh.misc.o: sh.err.h
 sh.misc.o: tc.const.h
-sh.misc.po: iconv.h
 sh.misc.po: sh.err.h
 sh.misc.po: tc.const.h
-sh.o: iconv.h
 sh.o: sh.err.h
 sh.o: tc.const.h
-sh.parse.o: iconv.h
 sh.parse.o: sh.err.h
 sh.parse.o: tc.const.h
-sh.parse.po: iconv.h
 sh.parse.po: sh.err.h
 sh.parse.po: tc.const.h
-sh.po: iconv.h
 sh.po: sh.err.h
 sh.po: tc.const.h
-sh.print.o: iconv.h
 sh.print.o: sh.err.h
 sh.print.o: tc.const.h
-sh.print.po: iconv.h
 sh.print.po: sh.err.h
 sh.print.po: tc.const.h
-sh.proc.o: iconv.h
 sh.proc.o: sh.err.h
 sh.proc.o: tc.const.h
-sh.proc.po: iconv.h
 sh.proc.po: sh.err.h
 sh.proc.po: tc.const.h
-sh.sem.o: iconv.h
 sh.sem.o: sh.err.h
 sh.sem.o: tc.const.h
-sh.sem.po: iconv.h
 sh.sem.po: sh.err.h
 sh.sem.po: tc.const.h
-sh.set.o: iconv.h
 sh.set.o: sh.err.h
 sh.set.o: tc.const.h
-sh.set.po: iconv.h
 sh.set.po: sh.err.h
 sh.set.po: tc.const.h
-sh.time.o: iconv.h
 sh.time.o: sh.err.h
 sh.time.o: tc.const.h
-sh.time.po: iconv.h
 sh.time.po: sh.err.h
 sh.time.po: tc.const.h
-tc.alloc.o: iconv.h
 tc.alloc.o: sh.err.h
 tc.alloc.o: tc.const.h
-tc.alloc.po: iconv.h
 tc.alloc.po: sh.err.h
 tc.alloc.po: tc.const.h
 tc.bind.o: ed.defns.h
-tc.bind.o: iconv.h
 tc.bind.o: sh.err.h
 tc.bind.o: tc.const.h
 tc.bind.po: ed.defns.h
-tc.bind.po: iconv.h
 tc.bind.po: sh.err.h
 tc.bind.po: tc.const.h
-tc.const.o: iconv.h
 tc.const.o: sh.err.h
 tc.const.o: tc.const.h
-tc.const.po: iconv.h
 tc.const.po: sh.err.h
 tc.const.po: tc.const.h
-tc.defs.o: iconv.h
 tc.defs.o: sh.err.h
 tc.defs.o: tc.const.h
 tc.defs.o: tc.defs.c
-tc.defs.po: iconv.h
 tc.defs.po: sh.err.h
 tc.defs.po: tc.const.h
 tc.defs.po: tc.defs.c
-tc.disc.o: iconv.h
 tc.disc.o: sh.err.h
 tc.disc.o: tc.const.h
-tc.disc.po: iconv.h
 tc.disc.po: sh.err.h
 tc.disc.po: tc.const.h
 tc.func.o: ed.defns.h
-tc.func.o: iconv.h
 tc.func.o: sh.err.h
 tc.func.o: tc.const.h
 tc.func.po: ed.defns.h
-tc.func.po: iconv.h
 tc.func.po: sh.err.h
 tc.func.po: tc.const.h
-tc.nls.o: iconv.h
 tc.nls.o: sh.err.h
 tc.nls.o: tc.const.h
-tc.nls.po: iconv.h
 tc.nls.po: sh.err.h
 tc.nls.po: tc.const.h
 tc.os.o: ed.defns.h
-tc.os.o: iconv.h
 tc.os.o: sh.err.h
 tc.os.o: tc.const.h
 tc.os.po: ed.defns.h
-tc.os.po: iconv.h
 tc.os.po: sh.err.h
 tc.os.po: tc.const.h
-tc.printf.o: iconv.h
 tc.printf.o: sh.err.h
 tc.printf.o: tc.const.h
-tc.printf.po: iconv.h
 tc.printf.po: sh.err.h
 tc.printf.po: tc.const.h
-tc.prompt.o: iconv.h
 tc.prompt.o: sh.err.h
 tc.prompt.o: tc.const.h
-tc.prompt.po: iconv.h
 tc.prompt.po: sh.err.h
 tc.prompt.po: tc.const.h
-tc.sched.o: iconv.h
 tc.sched.o: sh.err.h
 tc.sched.o: tc.const.h
-tc.sched.po: iconv.h
 tc.sched.po: sh.err.h
 tc.sched.po: tc.const.h
-tc.sig.o: iconv.h
 tc.sig.o: sh.err.h
 tc.sig.o: tc.const.h
-tc.sig.po: iconv.h
 tc.sig.po: sh.err.h
 tc.sig.po: tc.const.h
-tc.str.o: iconv.h
 tc.str.o: sh.err.h
 tc.str.o: tc.const.h
-tc.str.po: iconv.h
 tc.str.po: sh.err.h
 tc.str.po: tc.const.h
-tc.vers.o: iconv.h
 tc.vers.o: sh.err.h
 tc.vers.o: tc.const.h
-tc.vers.po: iconv.h
 tc.vers.po: sh.err.h
 tc.vers.po: tc.const.h
-tc.who.o: iconv.h
 tc.who.o: sh.err.h
 tc.who.o: tc.const.h
-tc.who.po: iconv.h
 tc.who.po: sh.err.h
 tc.who.po: tc.const.h
-tw.color.o: iconv.h
 tw.color.o: sh.err.h
 tw.color.o: tc.const.h
-tw.color.po: iconv.h
 tw.color.po: sh.err.h
 tw.color.po: tc.const.h
-tw.comp.o: iconv.h
 tw.comp.o: sh.err.h
 tw.comp.o: tc.const.h
-tw.comp.po: iconv.h
 tw.comp.po: sh.err.h
 tw.comp.po: tc.const.h
-tw.help.o: iconv.h
 tw.help.o: sh.err.h
 tw.help.o: tc.const.h
-tw.help.po: iconv.h
 tw.help.po: sh.err.h
 tw.help.po: tc.const.h
-tw.init.o: iconv.h
 tw.init.o: sh.err.h
 tw.init.o: tc.const.h
-tw.init.po: iconv.h
 tw.init.po: sh.err.h
 tw.init.po: tc.const.h
-tw.parse.o: iconv.h
 tw.parse.o: sh.err.h
 tw.parse.o: tc.const.h
-tw.parse.po: iconv.h
 tw.parse.po: sh.err.h
 tw.parse.po: tc.const.h
-tw.spell.o: iconv.h
 tw.spell.o: sh.err.h
 tw.spell.o: tc.const.h
-tw.spell.po: iconv.h
 tw.spell.po: sh.err.h
 tw.spell.po: tc.const.h
 .endif
diff --git a/bin/sh/Makefile.depend b/bin/sh/Makefile.depend
index 7841ce0..1ce8bcc 100644
--- a/bin/sh/Makefile.depend
+++ b/bin/sh/Makefile.depend
@@ -53,8 +53,6 @@ expand.po: nodes.h
 expand.po: syntax.h
 histedit.o: builtins.h
 histedit.po: builtins.h
-init.o: init.c
-init.po: init.c
 input.o: syntax.h
 input.po: syntax.h
 jobs.o: builtins.h
diff --git a/cddl/sbin/zfs/Makefile.depend b/cddl/sbin/zfs/Makefile.depend
index 713889f..ea888b8 100644
--- a/cddl/sbin/zfs/Makefile.depend
+++ b/cddl/sbin/zfs/Makefile.depend
@@ -14,8 +14,12 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
+	lib/libexpat \
 	lib/libgeom \
 	lib/libjail \
+	lib/libmd \
+	lib/libsbuf \
+	lib/libthr \
 	lib/libutil \
 	lib/msun \
 
diff --git a/cddl/sbin/zpool/Makefile.depend b/cddl/sbin/zpool/Makefile.depend
index 29ad8ef..2182000 100644
--- a/cddl/sbin/zpool/Makefile.depend
+++ b/cddl/sbin/zpool/Makefile.depend
@@ -15,7 +15,11 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
+	lib/libexpat \
 	lib/libgeom \
+	lib/libmd \
+	lib/libsbuf \
+	lib/libthr \
 	lib/libutil \
 	lib/msun \
 
diff --git a/cddl/usr.bin/zinject/Makefile.depend b/cddl/usr.bin/zinject/Makefile.depend
index f3c17d0..866f4df 100644
--- a/cddl/usr.bin/zinject/Makefile.depend
+++ b/cddl/usr.bin/zinject/Makefile.depend
@@ -15,7 +15,13 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
+	lib/libexpat \
 	lib/libgeom \
+	lib/libmd \
+	lib/libsbuf \
+	lib/libthr \
+	lib/libutil \
+	lib/libz \
 	lib/msun \
 
 
diff --git a/cddl/usr.bin/zstreamdump/Makefile.depend b/cddl/usr.bin/zstreamdump/Makefile.depend
index 9aedb23..7b76f1b 100644
--- a/cddl/usr.bin/zstreamdump/Makefile.depend
+++ b/cddl/usr.bin/zstreamdump/Makefile.depend
@@ -13,6 +13,7 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
+	lib/libmd \
 	lib/libthr \
 	lib/libz \
 	lib/msun \
diff --git a/cddl/usr.bin/ztest/Makefile.depend b/cddl/usr.bin/ztest/Makefile.depend
index 6d50957..d6ce1e9 100644
--- a/cddl/usr.bin/ztest/Makefile.depend
+++ b/cddl/usr.bin/ztest/Makefile.depend
@@ -16,8 +16,13 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
+	lib/libexpat \
 	lib/libgeom \
+	lib/libmd \
+	lib/libsbuf \
 	lib/libthr \
+	lib/libutil \
+	lib/libz \
 	lib/msun \
 
 
diff --git a/cddl/usr.sbin/zdb/Makefile.depend b/cddl/usr.sbin/zdb/Makefile.depend
index 05444d4..866f4df 100644
--- a/cddl/usr.sbin/zdb/Makefile.depend
+++ b/cddl/usr.sbin/zdb/Makefile.depend
@@ -15,8 +15,13 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
+	lib/libexpat \
 	lib/libgeom \
+	lib/libmd \
+	lib/libsbuf \
 	lib/libthr \
+	lib/libutil \
+	lib/libz \
 	lib/msun \
 
 
diff --git a/cddl/usr.sbin/zhack/Makefile.depend b/cddl/usr.sbin/zhack/Makefile.depend
index 05444d4..866f4df 100644
--- a/cddl/usr.sbin/zhack/Makefile.depend
+++ b/cddl/usr.sbin/zhack/Makefile.depend
@@ -15,8 +15,13 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
+	lib/libexpat \
 	lib/libgeom \
+	lib/libmd \
+	lib/libsbuf \
 	lib/libthr \
+	lib/libutil \
+	lib/libz \
 	lib/msun \
 
 
diff --git a/gnu/usr.bin/gdb/libgdb/Makefile.depend.amd64 b/gnu/usr.bin/gdb/libgdb/Makefile.depend.amd64
index 17e8178..2517bc1 100644
--- a/gnu/usr.bin/gdb/libgdb/Makefile.depend.amd64
+++ b/gnu/usr.bin/gdb/libgdb/Makefile.depend.amd64
@@ -434,14 +434,12 @@ frame-base.o: xm.h
 frame-base.po: nm.h
 frame-base.po: tm.h
 frame-base.po: xm.h
-frame-unwind-kluge.o: frame-unwind-kluge.c
-frame-unwind-kluge.o: nm.h
-frame-unwind-kluge.o: tm.h
-frame-unwind-kluge.o: xm.h
-frame-unwind-kluge.po: frame-unwind-kluge.c
-frame-unwind-kluge.po: nm.h
-frame-unwind-kluge.po: tm.h
-frame-unwind-kluge.po: xm.h
+frame-unwind.o: nm.h
+frame-unwind.o: tm.h
+frame-unwind.o: xm.h
+frame-unwind.po: nm.h
+frame-unwind.po: tm.h
+frame-unwind.po: xm.h
 frame.o: nm.h
 frame.o: tm.h
 frame.o: xm.h
diff --git a/gnu/usr.bin/groff/font/devX100-12/Makefile.depend b/gnu/usr.bin/groff/font/devX100-12/Makefile.depend
index 29fda55..57b7e10 100644
--- a/gnu/usr.bin/groff/font/devX100-12/Makefile.depend
+++ b/gnu/usr.bin/groff/font/devX100-12/Makefile.depend
@@ -2,8 +2,6 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
 
 
diff --git a/gnu/usr.bin/groff/font/devX100/Makefile.depend b/gnu/usr.bin/groff/font/devX100/Makefile.depend
index 29fda55..57b7e10 100644
--- a/gnu/usr.bin/groff/font/devX100/Makefile.depend
+++ b/gnu/usr.bin/groff/font/devX100/Makefile.depend
@@ -2,8 +2,6 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
 
 
diff --git a/gnu/usr.bin/groff/font/devX75-12/Makefile.depend b/gnu/usr.bin/groff/font/devX75-12/Makefile.depend
index 29fda55..57b7e10 100644
--- a/gnu/usr.bin/groff/font/devX75-12/Makefile.depend
+++ b/gnu/usr.bin/groff/font/devX75-12/Makefile.depend
@@ -2,8 +2,6 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
 
 
diff --git a/gnu/usr.bin/groff/font/devX75/Makefile.depend b/gnu/usr.bin/groff/font/devX75/Makefile.depend
index 29fda55..57b7e10 100644
--- a/gnu/usr.bin/groff/font/devX75/Makefile.depend
+++ b/gnu/usr.bin/groff/font/devX75/Makefile.depend
@@ -2,8 +2,6 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
 
 
diff --git a/kerberos5/lib/libheimipcc/Makefile.depend b/kerberos5/lib/libheimipcc/Makefile.depend
index db82c43..120f352 100644
--- a/kerberos5/lib/libheimipcc/Makefile.depend
+++ b/kerberos5/lib/libheimipcc/Makefile.depend
@@ -3,11 +3,17 @@
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
 DIRDEPS = \
+	gnu/lib/libgcc \
 	include \
 	include/arpa \
 	include/xlocale \
 	kerberos5/lib/libasn1 \
+	kerberos5/lib/libheimbase \
 	kerberos5/lib/libroken \
+	lib/${CSU_DIR} \
+	lib/libc \
+	lib/libcompiler_rt \
+	lib/libthr \
 
 
 .include <dirdeps.mk>
diff --git a/kerberos5/lib/libheimipcs/Makefile.depend b/kerberos5/lib/libheimipcs/Makefile.depend
index ef25c4e..7e91e8a 100644
--- a/kerberos5/lib/libheimipcs/Makefile.depend
+++ b/kerberos5/lib/libheimipcs/Makefile.depend
@@ -3,12 +3,18 @@
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
 DIRDEPS = \
+	gnu/lib/libgcc \
 	include \
 	include/arpa \
 	include/xlocale \
 	kerberos5/lib/libasn1 \
+	kerberos5/lib/libheimbase \
 	kerberos5/lib/libkrb5 \
 	kerberos5/lib/libroken \
+	lib/${CSU_DIR} \
+	lib/libc \
+	lib/libcompiler_rt \
+	lib/libthr \
 
 
 .include <dirdeps.mk>
diff --git a/kerberos5/libexec/digest-service/Makefile.depend b/kerberos5/libexec/digest-service/Makefile.depend
index 547f3d1..898ac2e 100644
--- a/kerberos5/libexec/digest-service/Makefile.depend
+++ b/kerberos5/libexec/digest-service/Makefile.depend
@@ -10,8 +10,10 @@ DIRDEPS = \
 	kerberos5/lib/libasn1 \
 	kerberos5/lib/libhdb \
 	kerberos5/lib/libheimbase \
+	kerberos5/lib/libheimipcc \
 	kerberos5/lib/libheimipcs \
 	kerberos5/lib/libheimntlm \
+	kerberos5/lib/libheimsqlite \
 	kerberos5/lib/libhx509 \
 	kerberos5/lib/libkdc \
 	kerberos5/lib/libkrb5 \
@@ -23,6 +25,7 @@ DIRDEPS = \
 	lib/libcom_err \
 	lib/libcompiler_rt \
 	lib/libcrypt \
+	lib/libthr \
 	lib/libutil \
 	secure/lib/libcrypto \
 
diff --git a/kerberos5/libexec/hprop/Makefile.depend b/kerberos5/libexec/hprop/Makefile.depend
index fcc6c0e..26bea35 100644
--- a/kerberos5/libexec/hprop/Makefile.depend
+++ b/kerberos5/libexec/hprop/Makefile.depend
@@ -10,7 +10,9 @@ DIRDEPS = \
 	kerberos5/lib/libasn1 \
 	kerberos5/lib/libhdb \
 	kerberos5/lib/libheimbase \
+	kerberos5/lib/libheimipcc \
 	kerberos5/lib/libheimntlm \
+	kerberos5/lib/libheimsqlite \
 	kerberos5/lib/libhx509 \
 	kerberos5/lib/libkadm5clnt \
 	kerberos5/lib/libkrb5 \
@@ -22,6 +24,7 @@ DIRDEPS = \
 	lib/libcom_err \
 	lib/libcompiler_rt \
 	lib/libcrypt \
+	lib/libthr \
 	lib/libutil \
 	secure/lib/libcrypto \
 
diff --git a/kerberos5/libexec/hpropd/Makefile.depend b/kerberos5/libexec/hpropd/Makefile.depend
index 67b8878..053da8c 100644
--- a/kerberos5/libexec/hpropd/Makefile.depend
+++ b/kerberos5/libexec/hpropd/Makefile.depend
@@ -10,7 +10,9 @@ DIRDEPS = \
 	kerberos5/lib/libasn1 \
 	kerberos5/lib/libhdb \
 	kerberos5/lib/libheimbase \
+	kerberos5/lib/libheimipcc \
 	kerberos5/lib/libheimntlm \
+	kerberos5/lib/libheimsqlite \
 	kerberos5/lib/libhx509 \
 	kerberos5/lib/libkrb5 \
 	kerberos5/lib/libroken \
@@ -21,6 +23,7 @@ DIRDEPS = \
 	lib/libcom_err \
 	lib/libcompiler_rt \
 	lib/libcrypt \
+	lib/libthr \
 	lib/libutil \
 	secure/lib/libcrypto \
 
diff --git a/kerberos5/libexec/ipropd-master/Makefile.depend b/kerberos5/libexec/ipropd-master/Makefile.depend
index e3775f6..d204f95 100644
--- a/kerberos5/libexec/ipropd-master/Makefile.depend
+++ b/kerberos5/libexec/ipropd-master/Makefile.depend
@@ -9,16 +9,21 @@ DIRDEPS = \
 	include/xlocale \
 	kerberos5/lib/libasn1 \
 	kerberos5/lib/libhdb \
+	kerberos5/lib/libheimbase \
+	kerberos5/lib/libheimipcc \
+	kerberos5/lib/libheimsqlite \
 	kerberos5/lib/libhx509 \
 	kerberos5/lib/libkadm5srv \
 	kerberos5/lib/libkrb5 \
 	kerberos5/lib/libroken \
 	kerberos5/lib/libvers \
+	kerberos5/lib/libwind \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcom_err \
 	lib/libcompiler_rt \
 	lib/libcrypt \
+	lib/libthr \
 	secure/lib/libcrypto \
 
 
diff --git a/kerberos5/libexec/ipropd-slave/Makefile.depend b/kerberos5/libexec/ipropd-slave/Makefile.depend
index cb6ce21..c55271d 100644
--- a/kerberos5/libexec/ipropd-slave/Makefile.depend
+++ b/kerberos5/libexec/ipropd-slave/Makefile.depend
@@ -9,16 +9,21 @@ DIRDEPS = \
 	include/xlocale \
 	kerberos5/lib/libasn1 \
 	kerberos5/lib/libhdb \
+	kerberos5/lib/libheimbase \
+	kerberos5/lib/libheimipcc \
+	kerberos5/lib/libheimsqlite \
 	kerberos5/lib/libhx509 \
 	kerberos5/lib/libkadm5srv \
 	kerberos5/lib/libkrb5 \
 	kerberos5/lib/libroken \
 	kerberos5/lib/libvers \
+	kerberos5/lib/libwind \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcom_err \
 	lib/libcompiler_rt \
 	lib/libcrypt \
+	lib/libthr \
 	secure/lib/libcrypto \
 
 
diff --git a/kerberos5/libexec/kadmind/Makefile.depend b/kerberos5/libexec/kadmind/Makefile.depend
index 2a17599..5c380b2 100644
--- a/kerberos5/libexec/kadmind/Makefile.depend
+++ b/kerberos5/libexec/kadmind/Makefile.depend
@@ -11,6 +11,8 @@ DIRDEPS = \
 	kerberos5/lib/libasn1 \
 	kerberos5/lib/libhdb \
 	kerberos5/lib/libheimbase \
+	kerberos5/lib/libheimipcc \
+	kerberos5/lib/libheimsqlite \
 	kerberos5/lib/libhx509 \
 	kerberos5/lib/libkadm5clnt \
 	kerberos5/lib/libkadm5srv \
@@ -24,6 +26,7 @@ DIRDEPS = \
 	lib/libcompiler_rt \
 	lib/libcrypt \
 	lib/libgssapi \
+	lib/libthr \
 	lib/libutil \
 	secure/lib/libcrypto \
 
diff --git a/kerberos5/libexec/kcm/Makefile.depend b/kerberos5/libexec/kcm/Makefile.depend
index e41f376..b9d7a6d 100644
--- a/kerberos5/libexec/kcm/Makefile.depend
+++ b/kerberos5/libexec/kcm/Makefile.depend
@@ -9,15 +9,22 @@ DIRDEPS = \
 	include/xlocale \
 	kerberos5/lib/libasn1 \
 	kerberos5/lib/libhdb \
+	kerberos5/lib/libheimbase \
+	kerberos5/lib/libheimipcc \
 	kerberos5/lib/libheimipcs \
 	kerberos5/lib/libheimntlm \
+	kerberos5/lib/libheimsqlite \
+	kerberos5/lib/libhx509 \
 	kerberos5/lib/libkrb5 \
 	kerberos5/lib/libroken \
 	kerberos5/lib/libvers \
+	kerberos5/lib/libwind \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libcom_err \
 	lib/libcompiler_rt \
 	lib/libcrypt \
+	lib/libthr \
 	lib/libutil \
 	secure/lib/libcrypto \
 
diff --git a/kerberos5/libexec/kdc/Makefile.depend b/kerberos5/libexec/kdc/Makefile.depend
index a053454..fe889f1 100644
--- a/kerberos5/libexec/kdc/Makefile.depend
+++ b/kerberos5/libexec/kdc/Makefile.depend
@@ -10,7 +10,9 @@ DIRDEPS = \
 	kerberos5/lib/libasn1 \
 	kerberos5/lib/libhdb \
 	kerberos5/lib/libheimbase \
+	kerberos5/lib/libheimipcc \
 	kerberos5/lib/libheimntlm \
+	kerberos5/lib/libheimsqlite \
 	kerberos5/lib/libhx509 \
 	kerberos5/lib/libkdc \
 	kerberos5/lib/libkrb5 \
@@ -22,6 +24,7 @@ DIRDEPS = \
 	lib/libcom_err \
 	lib/libcompiler_rt \
 	lib/libcrypt \
+	lib/libthr \
 	lib/libutil \
 	secure/lib/libcrypto \
 
diff --git a/kerberos5/libexec/kdigest/Makefile.depend b/kerberos5/libexec/kdigest/Makefile.depend
index 3a78241..05ab28f 100644
--- a/kerberos5/libexec/kdigest/Makefile.depend
+++ b/kerberos5/libexec/kdigest/Makefile.depend
@@ -8,17 +8,24 @@ DIRDEPS = \
 	include/arpa \
 	include/xlocale \
 	kerberos5/lib/libasn1 \
+	kerberos5/lib/libheimbase \
+	kerberos5/lib/libheimipcc \
 	kerberos5/lib/libheimntlm \
+	kerberos5/lib/libhx509 \
 	kerberos5/lib/libkafs5 \
 	kerberos5/lib/libkrb5 \
 	kerberos5/lib/libroken \
 	kerberos5/lib/libsl \
 	kerberos5/lib/libvers \
+	kerberos5/lib/libwind \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libcom_err \
 	lib/libcompiler_rt \
 	lib/libcrypt \
 	lib/libedit \
+	lib/libthr \
+	lib/ncurses/ncurses \
 	secure/lib/libcrypto \
 
 
diff --git a/kerberos5/libexec/kfd/Makefile.depend b/kerberos5/libexec/kfd/Makefile.depend
index e6b860e..94c1eaa 100644
--- a/kerberos5/libexec/kfd/Makefile.depend
+++ b/kerberos5/libexec/kfd/Makefile.depend
@@ -8,13 +8,19 @@ DIRDEPS = \
 	include/arpa \
 	include/xlocale \
 	kerberos5/lib/libasn1 \
+	kerberos5/lib/libheimbase \
+	kerberos5/lib/libheimipcc \
+	kerberos5/lib/libhx509 \
 	kerberos5/lib/libkrb5 \
 	kerberos5/lib/libroken \
 	kerberos5/lib/libvers \
+	kerberos5/lib/libwind \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libcom_err \
 	lib/libcompiler_rt \
 	lib/libcrypt \
+	lib/libthr \
 	secure/lib/libcrypto \
 
 
diff --git a/kerberos5/libexec/kimpersonate/Makefile.depend b/kerberos5/libexec/kimpersonate/Makefile.depend
index bd55a19..8bbf5d7 100644
--- a/kerberos5/libexec/kimpersonate/Makefile.depend
+++ b/kerberos5/libexec/kimpersonate/Makefile.depend
@@ -8,15 +8,21 @@ DIRDEPS = \
 	include/arpa \
 	include/xlocale \
 	kerberos5/lib/libasn1 \
+	kerberos5/lib/libheimbase \
+	kerberos5/lib/libheimipcc \
 	kerberos5/lib/libheimntlm \
+	kerberos5/lib/libhx509 \
 	kerberos5/lib/libkafs5 \
 	kerberos5/lib/libkrb5 \
 	kerberos5/lib/libroken \
 	kerberos5/lib/libvers \
+	kerberos5/lib/libwind \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libcom_err \
 	lib/libcompiler_rt \
 	lib/libcrypt \
+	lib/libthr \
 	secure/lib/libcrypto \
 
 
diff --git a/kerberos5/libexec/kpasswdd/Makefile.depend b/kerberos5/libexec/kpasswdd/Makefile.depend
index 1aaf856..7d45ea2 100644
--- a/kerberos5/libexec/kpasswdd/Makefile.depend
+++ b/kerberos5/libexec/kpasswdd/Makefile.depend
@@ -9,17 +9,22 @@ DIRDEPS = \
 	include/xlocale \
 	kerberos5/lib/libasn1 \
 	kerberos5/lib/libhdb \
+	kerberos5/lib/libheimbase \
+	kerberos5/lib/libheimipcc \
+	kerberos5/lib/libheimsqlite \
 	kerberos5/lib/libhx509 \
 	kerberos5/lib/libkadm5clnt \
 	kerberos5/lib/libkadm5srv \
 	kerberos5/lib/libkrb5 \
 	kerberos5/lib/libroken \
 	kerberos5/lib/libvers \
+	kerberos5/lib/libwind \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcom_err \
 	lib/libcompiler_rt \
 	lib/libcrypt \
+	lib/libthr \
 	lib/libutil \
 	secure/lib/libcrypto \
 
diff --git a/kerberos5/usr.bin/hxtool/Makefile.depend b/kerberos5/usr.bin/hxtool/Makefile.depend
index 812660b..5f5b0c8 100644
--- a/kerberos5/usr.bin/hxtool/Makefile.depend
+++ b/kerberos5/usr.bin/hxtool/Makefile.depend
@@ -12,12 +12,14 @@ DIRDEPS = \
 	kerberos5/lib/libroken \
 	kerberos5/lib/libsl \
 	kerberos5/lib/libvers \
+	kerberos5/lib/libwind \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcom_err \
 	lib/libcompiler_rt \
 	lib/libcrypt \
 	lib/libedit \
+	lib/ncurses/ncurses \
 	secure/lib/libcrypto \
 
 
diff --git a/kerberos5/usr.bin/kadmin/Makefile.depend b/kerberos5/usr.bin/kadmin/Makefile.depend
index edbc6a3..378e201 100644
--- a/kerberos5/usr.bin/kadmin/Makefile.depend
+++ b/kerberos5/usr.bin/kadmin/Makefile.depend
@@ -10,6 +10,8 @@ DIRDEPS = \
 	kerberos5/lib/libasn1 \
 	kerberos5/lib/libhdb \
 	kerberos5/lib/libheimbase \
+	kerberos5/lib/libheimipcc \
+	kerberos5/lib/libheimsqlite \
 	kerberos5/lib/libhx509 \
 	kerberos5/lib/libkadm5clnt \
 	kerberos5/lib/libkadm5srv \
@@ -24,6 +26,7 @@ DIRDEPS = \
 	lib/libcompiler_rt \
 	lib/libcrypt \
 	lib/libedit \
+	lib/libthr \
 	lib/libutil \
 	lib/ncurses/ncurses \
 	secure/lib/libcrypto \
diff --git a/kerberos5/usr.bin/kcc/Makefile.depend b/kerberos5/usr.bin/kcc/Makefile.depend
index 50a9a43..3a3a863 100644
--- a/kerberos5/usr.bin/kcc/Makefile.depend
+++ b/kerberos5/usr.bin/kcc/Makefile.depend
@@ -8,17 +8,24 @@ DIRDEPS = \
 	include/arpa \
 	include/xlocale \
 	kerberos5/lib/libasn1 \
+	kerberos5/lib/libheimbase \
+	kerberos5/lib/libheimipcc \
 	kerberos5/lib/libheimntlm \
+	kerberos5/lib/libhx509 \
 	kerberos5/lib/libkafs5 \
 	kerberos5/lib/libkrb5 \
 	kerberos5/lib/libroken \
 	kerberos5/lib/libsl \
 	kerberos5/lib/libvers \
+	kerberos5/lib/libwind \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libcom_err \
 	lib/libcompiler_rt \
 	lib/libcrypt \
 	lib/libedit \
+	lib/libthr \
+	lib/ncurses/ncurses \
 	secure/lib/libcrypto \
 
 
diff --git a/kerberos5/usr.bin/kdestroy/Makefile.depend b/kerberos5/usr.bin/kdestroy/Makefile.depend
index bd55a19..8bbf5d7 100644
--- a/kerberos5/usr.bin/kdestroy/Makefile.depend
+++ b/kerberos5/usr.bin/kdestroy/Makefile.depend
@@ -8,15 +8,21 @@ DIRDEPS = \
 	include/arpa \
 	include/xlocale \
 	kerberos5/lib/libasn1 \
+	kerberos5/lib/libheimbase \
+	kerberos5/lib/libheimipcc \
 	kerberos5/lib/libheimntlm \
+	kerberos5/lib/libhx509 \
 	kerberos5/lib/libkafs5 \
 	kerberos5/lib/libkrb5 \
 	kerberos5/lib/libroken \
 	kerberos5/lib/libvers \
+	kerberos5/lib/libwind \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libcom_err \
 	lib/libcompiler_rt \
 	lib/libcrypt \
+	lib/libthr \
 	secure/lib/libcrypto \
 
 
diff --git a/kerberos5/usr.bin/kf/Makefile.depend b/kerberos5/usr.bin/kf/Makefile.depend
index e6b860e..94c1eaa 100644
--- a/kerberos5/usr.bin/kf/Makefile.depend
+++ b/kerberos5/usr.bin/kf/Makefile.depend
@@ -8,13 +8,19 @@ DIRDEPS = \
 	include/arpa \
 	include/xlocale \
 	kerberos5/lib/libasn1 \
+	kerberos5/lib/libheimbase \
+	kerberos5/lib/libheimipcc \
+	kerberos5/lib/libhx509 \
 	kerberos5/lib/libkrb5 \
 	kerberos5/lib/libroken \
 	kerberos5/lib/libvers \
+	kerberos5/lib/libwind \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libcom_err \
 	lib/libcompiler_rt \
 	lib/libcrypt \
+	lib/libthr \
 	secure/lib/libcrypto \
 
 
diff --git a/kerberos5/usr.bin/kgetcred/Makefile.depend b/kerberos5/usr.bin/kgetcred/Makefile.depend
index 24f2774..6ac7a46 100644
--- a/kerberos5/usr.bin/kgetcred/Makefile.depend
+++ b/kerberos5/usr.bin/kgetcred/Makefile.depend
@@ -8,14 +8,20 @@ DIRDEPS = \
 	include/arpa \
 	include/xlocale \
 	kerberos5/lib/libasn1 \
+	kerberos5/lib/libheimbase \
+	kerberos5/lib/libheimipcc \
+	kerberos5/lib/libhx509 \
 	kerberos5/lib/libkafs5 \
 	kerberos5/lib/libkrb5 \
 	kerberos5/lib/libroken \
 	kerberos5/lib/libvers \
+	kerberos5/lib/libwind \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libcom_err \
 	lib/libcompiler_rt \
 	lib/libcrypt \
+	lib/libthr \
 	secure/lib/libcrypto \
 
 
diff --git a/kerberos5/usr.bin/kinit/Makefile.depend b/kerberos5/usr.bin/kinit/Makefile.depend
index b268a2c..8bbf5d7 100644
--- a/kerberos5/usr.bin/kinit/Makefile.depend
+++ b/kerberos5/usr.bin/kinit/Makefile.depend
@@ -8,16 +8,21 @@ DIRDEPS = \
 	include/arpa \
 	include/xlocale \
 	kerberos5/lib/libasn1 \
+	kerberos5/lib/libheimbase \
+	kerberos5/lib/libheimipcc \
 	kerberos5/lib/libheimntlm \
+	kerberos5/lib/libhx509 \
 	kerberos5/lib/libkafs5 \
 	kerberos5/lib/libkrb5 \
 	kerberos5/lib/libroken \
 	kerberos5/lib/libvers \
+	kerberos5/lib/libwind \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcom_err \
 	lib/libcompiler_rt \
 	lib/libcrypt \
+	lib/libthr \
 	secure/lib/libcrypto \
 
 
diff --git a/kerberos5/usr.bin/kpasswd/Makefile.depend b/kerberos5/usr.bin/kpasswd/Makefile.depend
index faa19fe..693ae4b 100644
--- a/kerberos5/usr.bin/kpasswd/Makefile.depend
+++ b/kerberos5/usr.bin/kpasswd/Makefile.depend
@@ -8,15 +8,19 @@ DIRDEPS = \
 	include/arpa \
 	include/xlocale \
 	kerberos5/lib/libasn1 \
+	kerberos5/lib/libheimbase \
+	kerberos5/lib/libheimipcc \
 	kerberos5/lib/libhx509 \
 	kerberos5/lib/libkrb5 \
 	kerberos5/lib/libroken \
 	kerberos5/lib/libvers \
+	kerberos5/lib/libwind \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcom_err \
 	lib/libcompiler_rt \
 	lib/libcrypt \
+	lib/libthr \
 	lib/libutil \
 	secure/lib/libcrypto \
 
diff --git a/kerberos5/usr.bin/ksu/Makefile.depend b/kerberos5/usr.bin/ksu/Makefile.depend
index 067c51c..6ac7a46 100644
--- a/kerberos5/usr.bin/ksu/Makefile.depend
+++ b/kerberos5/usr.bin/ksu/Makefile.depend
@@ -8,16 +8,20 @@ DIRDEPS = \
 	include/arpa \
 	include/xlocale \
 	kerberos5/lib/libasn1 \
+	kerberos5/lib/libheimbase \
+	kerberos5/lib/libheimipcc \
 	kerberos5/lib/libhx509 \
 	kerberos5/lib/libkafs5 \
 	kerberos5/lib/libkrb5 \
 	kerberos5/lib/libroken \
 	kerberos5/lib/libvers \
+	kerberos5/lib/libwind \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcom_err \
 	lib/libcompiler_rt \
 	lib/libcrypt \
+	lib/libthr \
 	secure/lib/libcrypto \
 
 
diff --git a/kerberos5/usr.bin/string2key/Makefile.depend b/kerberos5/usr.bin/string2key/Makefile.depend
index 67b8878..053da8c 100644
--- a/kerberos5/usr.bin/string2key/Makefile.depend
+++ b/kerberos5/usr.bin/string2key/Makefile.depend
@@ -10,7 +10,9 @@ DIRDEPS = \
 	kerberos5/lib/libasn1 \
 	kerberos5/lib/libhdb \
 	kerberos5/lib/libheimbase \
+	kerberos5/lib/libheimipcc \
 	kerberos5/lib/libheimntlm \
+	kerberos5/lib/libheimsqlite \
 	kerberos5/lib/libhx509 \
 	kerberos5/lib/libkrb5 \
 	kerberos5/lib/libroken \
@@ -21,6 +23,7 @@ DIRDEPS = \
 	lib/libcom_err \
 	lib/libcompiler_rt \
 	lib/libcrypt \
+	lib/libthr \
 	lib/libutil \
 	secure/lib/libcrypto \
 
diff --git a/kerberos5/usr.bin/verify_krb5_conf/Makefile.depend b/kerberos5/usr.bin/verify_krb5_conf/Makefile.depend
index e90fd24..6ac7a46 100644
--- a/kerberos5/usr.bin/verify_krb5_conf/Makefile.depend
+++ b/kerberos5/usr.bin/verify_krb5_conf/Makefile.depend
@@ -9,6 +9,7 @@ DIRDEPS = \
 	include/xlocale \
 	kerberos5/lib/libasn1 \
 	kerberos5/lib/libheimbase \
+	kerberos5/lib/libheimipcc \
 	kerberos5/lib/libhx509 \
 	kerberos5/lib/libkafs5 \
 	kerberos5/lib/libkrb5 \
@@ -20,6 +21,7 @@ DIRDEPS = \
 	lib/libcom_err \
 	lib/libcompiler_rt \
 	lib/libcrypt \
+	lib/libthr \
 	secure/lib/libcrypto \
 
 
diff --git a/kerberos5/usr.sbin/iprop-log/Makefile.depend b/kerberos5/usr.sbin/iprop-log/Makefile.depend
index 17672cd..adaaf04 100644
--- a/kerberos5/usr.sbin/iprop-log/Makefile.depend
+++ b/kerberos5/usr.sbin/iprop-log/Makefile.depend
@@ -9,16 +9,24 @@ DIRDEPS = \
 	include/xlocale \
 	kerberos5/lib/libasn1 \
 	kerberos5/lib/libhdb \
+	kerberos5/lib/libheimbase \
+	kerberos5/lib/libheimipcc \
+	kerberos5/lib/libheimsqlite \
+	kerberos5/lib/libhx509 \
 	kerberos5/lib/libkadm5srv \
 	kerberos5/lib/libkrb5 \
 	kerberos5/lib/libroken \
 	kerberos5/lib/libsl \
 	kerberos5/lib/libvers \
+	kerberos5/lib/libwind \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libcom_err \
 	lib/libcompiler_rt \
 	lib/libcrypt \
 	lib/libedit \
+	lib/libthr \
+	lib/ncurses/ncurses \
 	secure/lib/libcrypto \
 
 
diff --git a/kerberos5/usr.sbin/kstash/Makefile.depend b/kerberos5/usr.sbin/kstash/Makefile.depend
index 67b8878..053da8c 100644
--- a/kerberos5/usr.sbin/kstash/Makefile.depend
+++ b/kerberos5/usr.sbin/kstash/Makefile.depend
@@ -10,7 +10,9 @@ DIRDEPS = \
 	kerberos5/lib/libasn1 \
 	kerberos5/lib/libhdb \
 	kerberos5/lib/libheimbase \
+	kerberos5/lib/libheimipcc \
 	kerberos5/lib/libheimntlm \
+	kerberos5/lib/libheimsqlite \
 	kerberos5/lib/libhx509 \
 	kerberos5/lib/libkrb5 \
 	kerberos5/lib/libroken \
@@ -21,6 +23,7 @@ DIRDEPS = \
 	lib/libcom_err \
 	lib/libcompiler_rt \
 	lib/libcrypt \
+	lib/libthr \
 	lib/libutil \
 	secure/lib/libcrypto \
 
diff --git a/kerberos5/usr.sbin/ktutil/Makefile.depend b/kerberos5/usr.sbin/ktutil/Makefile.depend
index ecb965b..9c78351 100644
--- a/kerberos5/usr.sbin/ktutil/Makefile.depend
+++ b/kerberos5/usr.sbin/ktutil/Makefile.depend
@@ -8,16 +8,23 @@ DIRDEPS = \
 	include/arpa \
 	include/xlocale \
 	kerberos5/lib/libasn1 \
+	kerberos5/lib/libheimbase \
+	kerberos5/lib/libheimipcc \
+	kerberos5/lib/libhx509 \
 	kerberos5/lib/libkadm5clnt \
 	kerberos5/lib/libkrb5 \
 	kerberos5/lib/libroken \
 	kerberos5/lib/libsl \
 	kerberos5/lib/libvers \
+	kerberos5/lib/libwind \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libcom_err \
 	lib/libcompiler_rt \
 	lib/libcrypt \
 	lib/libedit \
+	lib/libthr \
+	lib/ncurses/ncurses \
 	secure/lib/libcrypto \
 
 
diff --git a/lib/clang/libclanganalysis/Makefile.depend b/lib/clang/libclanganalysis/Makefile.depend
index 4540295..c50852e 100644
--- a/lib/clang/libclanganalysis/Makefile.depend
+++ b/lib/clang/libclanganalysis/Makefile.depend
@@ -8,170 +8,125 @@ DIRDEPS = \
 	include \
 	include/xlocale \
 	lib/msun \
+	usr.bin/clang/clang-tblgen.host \
 
 
 .include <dirdeps.mk>
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
-AnalysisDeclContext.o: AttrList.inc.h
-AnalysisDeclContext.o: Attrs.inc.h
+AnalysisDeclContext.o: CommentCommandList.inc.h
 AnalysisDeclContext.o: DeclNodes.inc.h
 AnalysisDeclContext.o: DiagnosticCommonKinds.inc.h
 AnalysisDeclContext.o: StmtNodes.inc.h
-AnalysisDeclContext.po: AttrList.inc.h
-AnalysisDeclContext.po: Attrs.inc.h
+AnalysisDeclContext.po: CommentCommandList.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: CommentCommandList.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: CommentCommandList.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: CommentCommandList.inc.h
 CFG.o: DeclNodes.inc.h
 CFG.o: DiagnosticCommonKinds.inc.h
 CFG.o: StmtNodes.inc.h
 CFG.po: AttrList.inc.h
 CFG.po: Attrs.inc.h
+CFG.po: CommentCommandList.inc.h
 CFG.po: DeclNodes.inc.h
 CFG.po: DiagnosticCommonKinds.inc.h
 CFG.po: StmtNodes.inc.h
-CFGReachabilityAnalysis.o: AttrList.inc.h
-CFGReachabilityAnalysis.o: Attrs.inc.h
-CFGReachabilityAnalysis.o: DiagnosticCommonKinds.inc.h
 CFGReachabilityAnalysis.o: StmtNodes.inc.h
-CFGReachabilityAnalysis.po: AttrList.inc.h
-CFGReachabilityAnalysis.po: Attrs.inc.h
-CFGReachabilityAnalysis.po: DiagnosticCommonKinds.inc.h
 CFGReachabilityAnalysis.po: StmtNodes.inc.h
-CFGStmtMap.o: AttrList.inc.h
-CFGStmtMap.o: Attrs.inc.h
-CFGStmtMap.o: DiagnosticCommonKinds.inc.h
 CFGStmtMap.o: StmtNodes.inc.h
-CFGStmtMap.po: AttrList.inc.h
-CFGStmtMap.po: Attrs.inc.h
-CFGStmtMap.po: DiagnosticCommonKinds.inc.h
 CFGStmtMap.po: StmtNodes.inc.h
-CallGraph.o: AttrList.inc.h
-CallGraph.o: Attrs.inc.h
+CallGraph.o: CommentCommandList.inc.h
 CallGraph.o: DeclNodes.inc.h
 CallGraph.o: DiagnosticCommonKinds.inc.h
 CallGraph.o: StmtNodes.inc.h
-CallGraph.po: AttrList.inc.h
-CallGraph.po: Attrs.inc.h
+CallGraph.po: CommentCommandList.inc.h
 CallGraph.po: DeclNodes.inc.h
 CallGraph.po: DiagnosticCommonKinds.inc.h
 CallGraph.po: StmtNodes.inc.h
-CocoaConventions.o: AttrList.inc.h
-CocoaConventions.o: Attrs.inc.h
 CocoaConventions.o: DeclNodes.inc.h
 CocoaConventions.o: DiagnosticCommonKinds.inc.h
-CocoaConventions.po: AttrList.inc.h
-CocoaConventions.po: Attrs.inc.h
 CocoaConventions.po: DeclNodes.inc.h
 CocoaConventions.po: DiagnosticCommonKinds.inc.h
-Dominators.o: AttrList.inc.h
-Dominators.o: Attrs.inc.h
 Dominators.o: DeclNodes.inc.h
 Dominators.o: DiagnosticCommonKinds.inc.h
 Dominators.o: StmtNodes.inc.h
-Dominators.po: AttrList.inc.h
-Dominators.po: Attrs.inc.h
 Dominators.po: DeclNodes.inc.h
 Dominators.po: DiagnosticCommonKinds.inc.h
 Dominators.po: StmtNodes.inc.h
-FormatString.o: AttrList.inc.h
-FormatString.o: Attrs.inc.h
+FormatString.o: CommentCommandList.inc.h
 FormatString.o: DeclNodes.inc.h
 FormatString.o: DiagnosticCommonKinds.inc.h
-FormatString.po: AttrList.inc.h
-FormatString.po: Attrs.inc.h
+FormatString.o: StmtNodes.inc.h
+FormatString.po: CommentCommandList.inc.h
 FormatString.po: DeclNodes.inc.h
 FormatString.po: DiagnosticCommonKinds.inc.h
-LiveVariables.o: AttrList.inc.h
-LiveVariables.o: Attrs.inc.h
+FormatString.po: StmtNodes.inc.h
 LiveVariables.o: DeclNodes.inc.h
 LiveVariables.o: DiagnosticCommonKinds.inc.h
 LiveVariables.o: StmtNodes.inc.h
-LiveVariables.po: AttrList.inc.h
-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: CommentCommandList.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: CommentCommandList.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
 PostOrderCFGView.o: DiagnosticCommonKinds.inc.h
 PostOrderCFGView.o: StmtNodes.inc.h
-PostOrderCFGView.po: AttrList.inc.h
-PostOrderCFGView.po: Attrs.inc.h
 PostOrderCFGView.po: DeclNodes.inc.h
 PostOrderCFGView.po: DiagnosticCommonKinds.inc.h
 PostOrderCFGView.po: StmtNodes.inc.h
-PrintfFormatString.o: AttrList.inc.h
-PrintfFormatString.o: Attrs.inc.h
+PrintfFormatString.o: CommentCommandList.inc.h
 PrintfFormatString.o: DeclNodes.inc.h
 PrintfFormatString.o: DiagnosticCommonKinds.inc.h
-PrintfFormatString.po: AttrList.inc.h
-PrintfFormatString.po: Attrs.inc.h
+PrintfFormatString.o: StmtNodes.inc.h
+PrintfFormatString.po: CommentCommandList.inc.h
 PrintfFormatString.po: DeclNodes.inc.h
 PrintfFormatString.po: DiagnosticCommonKinds.inc.h
-ProgramPoint.o: AttrList.inc.h
-ProgramPoint.o: Attrs.inc.h
+PrintfFormatString.po: StmtNodes.inc.h
 ProgramPoint.o: DeclNodes.inc.h
 ProgramPoint.o: DiagnosticCommonKinds.inc.h
 ProgramPoint.o: StmtNodes.inc.h
-ProgramPoint.po: AttrList.inc.h
-ProgramPoint.po: Attrs.inc.h
 ProgramPoint.po: DeclNodes.inc.h
 ProgramPoint.po: DiagnosticCommonKinds.inc.h
 ProgramPoint.po: StmtNodes.inc.h
-PseudoConstantAnalysis.o: AttrList.inc.h
-PseudoConstantAnalysis.o: Attrs.inc.h
 PseudoConstantAnalysis.o: DeclNodes.inc.h
 PseudoConstantAnalysis.o: DiagnosticCommonKinds.inc.h
 PseudoConstantAnalysis.o: StmtNodes.inc.h
-PseudoConstantAnalysis.po: AttrList.inc.h
-PseudoConstantAnalysis.po: Attrs.inc.h
 PseudoConstantAnalysis.po: DeclNodes.inc.h
 PseudoConstantAnalysis.po: DiagnosticCommonKinds.inc.h
 PseudoConstantAnalysis.po: StmtNodes.inc.h
-ReachableCode.o: AttrList.inc.h
-ReachableCode.o: Attrs.inc.h
 ReachableCode.o: DeclNodes.inc.h
 ReachableCode.o: DiagnosticCommonKinds.inc.h
 ReachableCode.o: StmtNodes.inc.h
-ReachableCode.po: AttrList.inc.h
-ReachableCode.po: Attrs.inc.h
 ReachableCode.po: DeclNodes.inc.h
 ReachableCode.po: DiagnosticCommonKinds.inc.h
 ReachableCode.po: StmtNodes.inc.h
-ScanfFormatString.o: AttrList.inc.h
-ScanfFormatString.o: Attrs.inc.h
+ScanfFormatString.o: CommentCommandList.inc.h
 ScanfFormatString.o: DeclNodes.inc.h
 ScanfFormatString.o: DiagnosticCommonKinds.inc.h
-ScanfFormatString.po: AttrList.inc.h
-ScanfFormatString.po: Attrs.inc.h
+ScanfFormatString.o: StmtNodes.inc.h
+ScanfFormatString.po: CommentCommandList.inc.h
 ScanfFormatString.po: DeclNodes.inc.h
 ScanfFormatString.po: DiagnosticCommonKinds.inc.h
+ScanfFormatString.po: StmtNodes.inc.h
 ThreadSafety.o: AttrList.inc.h
 ThreadSafety.o: Attrs.inc.h
 ThreadSafety.o: DeclNodes.inc.h
@@ -184,11 +139,13 @@ ThreadSafety.po: DiagnosticCommonKinds.inc.h
 ThreadSafety.po: StmtNodes.inc.h
 UninitializedValues.o: AttrList.inc.h
 UninitializedValues.o: Attrs.inc.h
+UninitializedValues.o: CommentCommandList.inc.h
 UninitializedValues.o: DeclNodes.inc.h
 UninitializedValues.o: DiagnosticCommonKinds.inc.h
 UninitializedValues.o: StmtNodes.inc.h
 UninitializedValues.po: AttrList.inc.h
 UninitializedValues.po: Attrs.inc.h
+UninitializedValues.po: CommentCommandList.inc.h
 UninitializedValues.po: DeclNodes.inc.h
 UninitializedValues.po: DiagnosticCommonKinds.inc.h
 UninitializedValues.po: StmtNodes.inc.h
diff --git a/lib/clang/libclangarcmigrate/Makefile.depend b/lib/clang/libclangarcmigrate/Makefile.depend
index 8d249a0..5ce1899 100644
--- a/lib/clang/libclangarcmigrate/Makefile.depend
+++ b/lib/clang/libclangarcmigrate/Makefile.depend
@@ -8,6 +8,7 @@ DIRDEPS = \
 	include \
 	include/xlocale \
 	lib/msun \
+	usr.bin/clang/clang-tblgen.host \
 
 
 .include <dirdeps.mk>
@@ -17,6 +18,7 @@ DIRDEPS = \
 ARCMT.o: AttrList.inc.h
 ARCMT.o: AttrParsedAttrList.inc.h
 ARCMT.o: Attrs.inc.h
+ARCMT.o: CommentCommandList.inc.h
 ARCMT.o: DeclNodes.inc.h
 ARCMT.o: DiagnosticCommonKinds.inc.h
 ARCMT.o: DiagnosticGroups.inc.h
@@ -25,6 +27,7 @@ ARCMT.o: StmtNodes.inc.h
 ARCMT.po: AttrList.inc.h
 ARCMT.po: AttrParsedAttrList.inc.h
 ARCMT.po: Attrs.inc.h
+ARCMT.po: CommentCommandList.inc.h
 ARCMT.po: DeclNodes.inc.h
 ARCMT.po: DiagnosticCommonKinds.inc.h
 ARCMT.po: DiagnosticGroups.inc.h
@@ -34,169 +37,158 @@ ARCMTActions.o: DiagnosticCommonKinds.inc.h
 ARCMTActions.po: DiagnosticCommonKinds.inc.h
 FileRemapper.o: DiagnosticCommonKinds.inc.h
 FileRemapper.po: DiagnosticCommonKinds.inc.h
-ObjCMT.o: AttrList.inc.h
-ObjCMT.o: Attrs.inc.h
+ObjCMT.o: CommentCommandList.inc.h
 ObjCMT.o: DeclNodes.inc.h
 ObjCMT.o: DiagnosticCommonKinds.inc.h
 ObjCMT.o: StmtNodes.inc.h
-ObjCMT.po: AttrList.inc.h
-ObjCMT.po: Attrs.inc.h
+ObjCMT.po: CommentCommandList.inc.h
 ObjCMT.po: DeclNodes.inc.h
 ObjCMT.po: DiagnosticCommonKinds.inc.h
 ObjCMT.po: StmtNodes.inc.h
 PlistReporter.o: DiagnosticCommonKinds.inc.h
 PlistReporter.po: DiagnosticCommonKinds.inc.h
-TransAPIUses.o: AttrList.inc.h
-TransAPIUses.o: Attrs.inc.h
+TransAPIUses.o: CommentCommandList.inc.h
 TransAPIUses.o: DeclNodes.inc.h
 TransAPIUses.o: DiagnosticCommonKinds.inc.h
 TransAPIUses.o: DiagnosticSemaKinds.inc.h
 TransAPIUses.o: StmtNodes.inc.h
-TransAPIUses.po: AttrList.inc.h
-TransAPIUses.po: Attrs.inc.h
+TransAPIUses.po: CommentCommandList.inc.h
 TransAPIUses.po: DeclNodes.inc.h
 TransAPIUses.po: DiagnosticCommonKinds.inc.h
 TransAPIUses.po: DiagnosticSemaKinds.inc.h
 TransAPIUses.po: StmtNodes.inc.h
-TransARCAssign.o: AttrList.inc.h
-TransARCAssign.o: Attrs.inc.h
+TransARCAssign.o: CommentCommandList.inc.h
 TransARCAssign.o: DeclNodes.inc.h
 TransARCAssign.o: DiagnosticCommonKinds.inc.h
 TransARCAssign.o: DiagnosticSemaKinds.inc.h
 TransARCAssign.o: StmtNodes.inc.h
-TransARCAssign.po: AttrList.inc.h
-TransARCAssign.po: Attrs.inc.h
+TransARCAssign.po: CommentCommandList.inc.h
 TransARCAssign.po: DeclNodes.inc.h
 TransARCAssign.po: DiagnosticCommonKinds.inc.h
 TransARCAssign.po: DiagnosticSemaKinds.inc.h
 TransARCAssign.po: StmtNodes.inc.h
-TransAutoreleasePool.o: AttrList.inc.h
-TransAutoreleasePool.o: Attrs.inc.h
+TransAutoreleasePool.o: CommentCommandList.inc.h
 TransAutoreleasePool.o: DeclNodes.inc.h
 TransAutoreleasePool.o: DiagnosticCommonKinds.inc.h
 TransAutoreleasePool.o: DiagnosticSemaKinds.inc.h
 TransAutoreleasePool.o: StmtNodes.inc.h
-TransAutoreleasePool.po: AttrList.inc.h
-TransAutoreleasePool.po: Attrs.inc.h
+TransAutoreleasePool.po: CommentCommandList.inc.h
 TransAutoreleasePool.po: DeclNodes.inc.h
 TransAutoreleasePool.po: DiagnosticCommonKinds.inc.h
 TransAutoreleasePool.po: DiagnosticSemaKinds.inc.h
 TransAutoreleasePool.po: StmtNodes.inc.h
 TransBlockObjCVariable.o: AttrList.inc.h
 TransBlockObjCVariable.o: Attrs.inc.h
+TransBlockObjCVariable.o: CommentCommandList.inc.h
 TransBlockObjCVariable.o: DeclNodes.inc.h
 TransBlockObjCVariable.o: DiagnosticCommonKinds.inc.h
 TransBlockObjCVariable.o: StmtNodes.inc.h
 TransBlockObjCVariable.po: AttrList.inc.h
 TransBlockObjCVariable.po: Attrs.inc.h
+TransBlockObjCVariable.po: CommentCommandList.inc.h
 TransBlockObjCVariable.po: DeclNodes.inc.h
 TransBlockObjCVariable.po: DiagnosticCommonKinds.inc.h
 TransBlockObjCVariable.po: StmtNodes.inc.h
-TransEmptyStatementsAndDealloc.o: AttrList.inc.h
-TransEmptyStatementsAndDealloc.o: Attrs.inc.h
+TransEmptyStatementsAndDealloc.o: CommentCommandList.inc.h
 TransEmptyStatementsAndDealloc.o: DeclNodes.inc.h
 TransEmptyStatementsAndDealloc.o: DiagnosticCommonKinds.inc.h
 TransEmptyStatementsAndDealloc.o: StmtNodes.inc.h
-TransEmptyStatementsAndDealloc.po: AttrList.inc.h
-TransEmptyStatementsAndDealloc.po: Attrs.inc.h
+TransEmptyStatementsAndDealloc.po: CommentCommandList.inc.h
 TransEmptyStatementsAndDealloc.po: DeclNodes.inc.h
 TransEmptyStatementsAndDealloc.po: DiagnosticCommonKinds.inc.h
 TransEmptyStatementsAndDealloc.po: StmtNodes.inc.h
-TransGCAttrs.o: AttrList.inc.h
-TransGCAttrs.o: Attrs.inc.h
+TransGCAttrs.o: CommentCommandList.inc.h
 TransGCAttrs.o: DeclNodes.inc.h
 TransGCAttrs.o: DiagnosticCommonKinds.inc.h
 TransGCAttrs.o: DiagnosticSemaKinds.inc.h
 TransGCAttrs.o: StmtNodes.inc.h
-TransGCAttrs.po: AttrList.inc.h
-TransGCAttrs.po: Attrs.inc.h
+TransGCAttrs.po: CommentCommandList.inc.h
 TransGCAttrs.po: DeclNodes.inc.h
 TransGCAttrs.po: DiagnosticCommonKinds.inc.h
 TransGCAttrs.po: DiagnosticSemaKinds.inc.h
 TransGCAttrs.po: StmtNodes.inc.h
-TransGCCalls.o: AttrList.inc.h
-TransGCCalls.o: Attrs.inc.h
+TransGCCalls.o: CommentCommandList.inc.h
 TransGCCalls.o: DeclNodes.inc.h
 TransGCCalls.o: DiagnosticCommonKinds.inc.h
 TransGCCalls.o: DiagnosticSemaKinds.inc.h
 TransGCCalls.o: StmtNodes.inc.h
-TransGCCalls.po: AttrList.inc.h
-TransGCCalls.po: Attrs.inc.h
+TransGCCalls.po: CommentCommandList.inc.h
 TransGCCalls.po: DeclNodes.inc.h
 TransGCCalls.po: DiagnosticCommonKinds.inc.h
 TransGCCalls.po: DiagnosticSemaKinds.inc.h
 TransGCCalls.po: StmtNodes.inc.h
-TransProperties.o: AttrList.inc.h
-TransProperties.o: Attrs.inc.h
 TransProperties.o: DeclNodes.inc.h
 TransProperties.o: DiagnosticCommonKinds.inc.h
 TransProperties.o: DiagnosticSemaKinds.inc.h
 TransProperties.o: StmtNodes.inc.h
-TransProperties.po: AttrList.inc.h
-TransProperties.po: Attrs.inc.h
 TransProperties.po: DeclNodes.inc.h
 TransProperties.po: DiagnosticCommonKinds.inc.h
 TransProperties.po: DiagnosticSemaKinds.inc.h
 TransProperties.po: StmtNodes.inc.h
-TransRetainReleaseDealloc.o: AttrList.inc.h
-TransRetainReleaseDealloc.o: Attrs.inc.h
+TransProtectedScope.o: CommentCommandList.inc.h
+TransProtectedScope.o: DeclNodes.inc.h
+TransProtectedScope.o: DiagnosticCommonKinds.inc.h
+TransProtectedScope.o: DiagnosticSemaKinds.inc.h
+TransProtectedScope.o: StmtNodes.inc.h
+TransProtectedScope.po: CommentCommandList.inc.h
+TransProtectedScope.po: DeclNodes.inc.h
+TransProtectedScope.po: DiagnosticCommonKinds.inc.h
+TransProtectedScope.po: DiagnosticSemaKinds.inc.h
+TransProtectedScope.po: StmtNodes.inc.h
+TransRetainReleaseDealloc.o: CommentCommandList.inc.h
 TransRetainReleaseDealloc.o: DeclNodes.inc.h
 TransRetainReleaseDealloc.o: DiagnosticCommonKinds.inc.h
 TransRetainReleaseDealloc.o: DiagnosticSemaKinds.inc.h
 TransRetainReleaseDealloc.o: StmtNodes.inc.h
-TransRetainReleaseDealloc.po: AttrList.inc.h
-TransRetainReleaseDealloc.po: Attrs.inc.h
+TransRetainReleaseDealloc.po: CommentCommandList.inc.h
 TransRetainReleaseDealloc.po: DeclNodes.inc.h
 TransRetainReleaseDealloc.po: DiagnosticCommonKinds.inc.h
 TransRetainReleaseDealloc.po: DiagnosticSemaKinds.inc.h
 TransRetainReleaseDealloc.po: StmtNodes.inc.h
 TransUnbridgedCasts.o: AttrList.inc.h
 TransUnbridgedCasts.o: Attrs.inc.h
+TransUnbridgedCasts.o: CommentCommandList.inc.h
 TransUnbridgedCasts.o: DeclNodes.inc.h
 TransUnbridgedCasts.o: DiagnosticCommonKinds.inc.h
 TransUnbridgedCasts.o: DiagnosticSemaKinds.inc.h
 TransUnbridgedCasts.o: StmtNodes.inc.h
 TransUnbridgedCasts.po: AttrList.inc.h
 TransUnbridgedCasts.po: Attrs.inc.h
+TransUnbridgedCasts.po: CommentCommandList.inc.h
 TransUnbridgedCasts.po: DeclNodes.inc.h
 TransUnbridgedCasts.po: DiagnosticCommonKinds.inc.h
 TransUnbridgedCasts.po: DiagnosticSemaKinds.inc.h
 TransUnbridgedCasts.po: StmtNodes.inc.h
-TransUnusedInitDelegate.o: AttrList.inc.h
-TransUnusedInitDelegate.o: Attrs.inc.h
+TransUnusedInitDelegate.o: CommentCommandList.inc.h
 TransUnusedInitDelegate.o: DeclNodes.inc.h
 TransUnusedInitDelegate.o: DiagnosticCommonKinds.inc.h
 TransUnusedInitDelegate.o: DiagnosticSemaKinds.inc.h
 TransUnusedInitDelegate.o: StmtNodes.inc.h
-TransUnusedInitDelegate.po: AttrList.inc.h
-TransUnusedInitDelegate.po: Attrs.inc.h
+TransUnusedInitDelegate.po: CommentCommandList.inc.h
 TransUnusedInitDelegate.po: DeclNodes.inc.h
 TransUnusedInitDelegate.po: DiagnosticCommonKinds.inc.h
 TransUnusedInitDelegate.po: DiagnosticSemaKinds.inc.h
 TransUnusedInitDelegate.po: StmtNodes.inc.h
-TransZeroOutPropsInDealloc.o: AttrList.inc.h
-TransZeroOutPropsInDealloc.o: Attrs.inc.h
+TransZeroOutPropsInDealloc.o: CommentCommandList.inc.h
 TransZeroOutPropsInDealloc.o: DeclNodes.inc.h
 TransZeroOutPropsInDealloc.o: DiagnosticCommonKinds.inc.h
 TransZeroOutPropsInDealloc.o: StmtNodes.inc.h
-TransZeroOutPropsInDealloc.po: AttrList.inc.h
-TransZeroOutPropsInDealloc.po: Attrs.inc.h
+TransZeroOutPropsInDealloc.po: CommentCommandList.inc.h
 TransZeroOutPropsInDealloc.po: DeclNodes.inc.h
 TransZeroOutPropsInDealloc.po: DiagnosticCommonKinds.inc.h
 TransZeroOutPropsInDealloc.po: StmtNodes.inc.h
-TransformActions.o: AttrList.inc.h
-TransformActions.o: Attrs.inc.h
+TransformActions.o: CommentCommandList.inc.h
 TransformActions.o: DeclNodes.inc.h
 TransformActions.o: DiagnosticCommonKinds.inc.h
 TransformActions.o: StmtNodes.inc.h
-TransformActions.po: AttrList.inc.h
-TransformActions.po: Attrs.inc.h
+TransformActions.po: CommentCommandList.inc.h
 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: CommentCommandList.inc.h
 Transforms.o: DeclNodes.inc.h
 Transforms.o: DiagnosticCommonKinds.inc.h
 Transforms.o: DiagnosticSemaKinds.inc.h
@@ -204,6 +196,7 @@ Transforms.o: StmtNodes.inc.h
 Transforms.po: AttrList.inc.h
 Transforms.po: AttrParsedAttrList.inc.h
 Transforms.po: Attrs.inc.h
+Transforms.po: CommentCommandList.inc.h
 Transforms.po: DeclNodes.inc.h
 Transforms.po: DiagnosticCommonKinds.inc.h
 Transforms.po: DiagnosticSemaKinds.inc.h
diff --git a/lib/clang/libclangast/Makefile.depend b/lib/clang/libclangast/Makefile.depend
index 52ba650..44813d6 100644
--- a/lib/clang/libclangast/Makefile.depend
+++ b/lib/clang/libclangast/Makefile.depend
@@ -8,62 +8,71 @@ DIRDEPS = \
 	include \
 	include/xlocale \
 	lib/msun \
+	usr.bin/clang/clang-tblgen.host \
 
 
 .include <dirdeps.mk>
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
-APValue.o: AttrList.inc.h
-APValue.o: Attrs.inc.h
+APValue.o: CommentCommandList.inc.h
 APValue.o: DeclNodes.inc.h
 APValue.o: DiagnosticCommonKinds.inc.h
 APValue.o: StmtNodes.inc.h
-APValue.po: AttrList.inc.h
-APValue.po: Attrs.inc.h
+APValue.po: CommentCommandList.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: CommentCommandList.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: CommentCommandList.inc.h
 ASTContext.po: CommentNodes.inc.h
 ASTContext.po: DeclNodes.inc.h
 ASTContext.po: DiagnosticCommonKinds.inc.h
 ASTContext.po: StmtNodes.inc.h
-ASTDiagnostic.o: AttrList.inc.h
-ASTDiagnostic.o: Attrs.inc.h
+ASTDiagnostic.o: CommentCommandList.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: CommentCommandList.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
+ASTDumper.o: AttrDump.inc.h
+ASTDumper.o: AttrList.inc.h
+ASTDumper.o: Attrs.inc.h
+ASTDumper.o: CommentCommandList.inc.h
+ASTDumper.o: CommentNodes.inc.h
+ASTDumper.o: DeclNodes.inc.h
+ASTDumper.o: DiagnosticCommonKinds.inc.h
+ASTDumper.o: StmtNodes.inc.h
+ASTDumper.po: AttrDump.inc.h
+ASTDumper.po: AttrList.inc.h
+ASTDumper.po: Attrs.inc.h
+ASTDumper.po: CommentCommandList.inc.h
+ASTDumper.po: CommentNodes.inc.h
+ASTDumper.po: DeclNodes.inc.h
+ASTDumper.po: DiagnosticCommonKinds.inc.h
+ASTDumper.po: StmtNodes.inc.h
+ASTImporter.o: CommentCommandList.inc.h
 ASTImporter.o: DeclNodes.inc.h
 ASTImporter.o: DiagnosticASTKinds.inc.h
 ASTImporter.o: DiagnosticCommonKinds.inc.h
 ASTImporter.o: StmtNodes.inc.h
-ASTImporter.po: AttrList.inc.h
-ASTImporter.po: Attrs.inc.h
+ASTImporter.po: CommentCommandList.inc.h
 ASTImporter.po: DeclNodes.inc.h
 ASTImporter.po: DiagnosticASTKinds.inc.h
 ASTImporter.po: DiagnosticCommonKinds.inc.h
@@ -71,65 +80,66 @@ ASTImporter.po: StmtNodes.inc.h
 AttrImpl.o: AttrImpl.inc.h
 AttrImpl.o: AttrList.inc.h
 AttrImpl.o: Attrs.inc.h
+AttrImpl.o: CommentCommandList.inc.h
 AttrImpl.o: DeclNodes.inc.h
 AttrImpl.o: DiagnosticCommonKinds.inc.h
 AttrImpl.o: StmtNodes.inc.h
 AttrImpl.po: AttrImpl.inc.h
 AttrImpl.po: AttrList.inc.h
 AttrImpl.po: Attrs.inc.h
+AttrImpl.po: CommentCommandList.inc.h
 AttrImpl.po: DeclNodes.inc.h
 AttrImpl.po: DiagnosticCommonKinds.inc.h
 AttrImpl.po: StmtNodes.inc.h
-CXXInheritance.o: AttrList.inc.h
-CXXInheritance.o: Attrs.inc.h
+CXXInheritance.o: CommentCommandList.inc.h
 CXXInheritance.o: DeclNodes.inc.h
 CXXInheritance.o: DiagnosticCommonKinds.inc.h
 CXXInheritance.o: StmtNodes.inc.h
-CXXInheritance.po: AttrList.inc.h
-CXXInheritance.po: Attrs.inc.h
+CXXInheritance.po: CommentCommandList.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: CommentCommandList.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: CommentCommandList.inc.h
 Comment.po: CommentNodes.inc.h
 Comment.po: DeclNodes.inc.h
 Comment.po: DiagnosticCommonKinds.inc.h
 Comment.po: StmtNodes.inc.h
+CommentBriefParser.o: CommentCommandList.inc.h
+CommentBriefParser.o: DiagnosticCommonKinds.inc.h
+CommentBriefParser.po: CommentCommandList.inc.h
+CommentBriefParser.po: DiagnosticCommonKinds.inc.h
 CommentCommandTraits.o: CommentCommandInfo.inc.h
+CommentCommandTraits.o: CommentCommandList.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
+CommentCommandTraits.po: CommentCommandList.inc.h
+CommentLexer.o: CommentCommandList.inc.h
+CommentLexer.o: CommentHTMLNamedCharacterReferences.inc.h
 CommentLexer.o: CommentHTMLTags.inc.h
+CommentLexer.o: DiagnosticCommentKinds.inc.h
+CommentLexer.o: DiagnosticCommonKinds.inc.h
+CommentLexer.po: CommentCommandList.inc.h
+CommentLexer.po: CommentHTMLNamedCharacterReferences.inc.h
 CommentLexer.po: CommentHTMLTags.inc.h
-CommentParser.o: AttrList.inc.h
-CommentParser.o: Attrs.inc.h
+CommentLexer.po: DiagnosticCommentKinds.inc.h
+CommentLexer.po: DiagnosticCommonKinds.inc.h
+CommentParser.o: CommentCommandList.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: CommentCommandList.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: CommentCommandList.inc.h
 CommentSema.o: CommentHTMLTagsProperties.inc.h
 CommentSema.o: CommentNodes.inc.h
 CommentSema.o: DeclNodes.inc.h
@@ -138,6 +148,7 @@ CommentSema.o: DiagnosticCommonKinds.inc.h
 CommentSema.o: StmtNodes.inc.h
 CommentSema.po: AttrList.inc.h
 CommentSema.po: Attrs.inc.h
+CommentSema.po: CommentCommandList.inc.h
 CommentSema.po: CommentHTMLTagsProperties.inc.h
 CommentSema.po: CommentNodes.inc.h
 CommentSema.po: DeclNodes.inc.h
@@ -146,421 +157,383 @@ CommentSema.po: DiagnosticCommonKinds.inc.h
 CommentSema.po: StmtNodes.inc.h
 Decl.o: AttrList.inc.h
 Decl.o: Attrs.inc.h
+Decl.o: CommentCommandList.inc.h
 Decl.o: DeclNodes.inc.h
 Decl.o: DiagnosticCommonKinds.inc.h
 Decl.o: StmtNodes.inc.h
 Decl.po: AttrList.inc.h
 Decl.po: Attrs.inc.h
+Decl.po: CommentCommandList.inc.h
 Decl.po: DeclNodes.inc.h
 Decl.po: DiagnosticCommonKinds.inc.h
 Decl.po: StmtNodes.inc.h
 DeclBase.o: AttrList.inc.h
 DeclBase.o: Attrs.inc.h
+DeclBase.o: CommentCommandList.inc.h
 DeclBase.o: DeclNodes.inc.h
 DeclBase.o: DiagnosticCommonKinds.inc.h
 DeclBase.o: StmtNodes.inc.h
 DeclBase.po: AttrList.inc.h
 DeclBase.po: Attrs.inc.h
+DeclBase.po: CommentCommandList.inc.h
 DeclBase.po: DeclNodes.inc.h
 DeclBase.po: DiagnosticCommonKinds.inc.h
 DeclBase.po: StmtNodes.inc.h
-DeclCXX.o: AttrList.inc.h
-DeclCXX.o: Attrs.inc.h
+DeclCXX.o: CommentCommandList.inc.h
 DeclCXX.o: DeclNodes.inc.h
 DeclCXX.o: DiagnosticCommonKinds.inc.h
 DeclCXX.o: StmtNodes.inc.h
-DeclCXX.po: AttrList.inc.h
-DeclCXX.po: Attrs.inc.h
+DeclCXX.po: CommentCommandList.inc.h
 DeclCXX.po: DeclNodes.inc.h
 DeclCXX.po: DiagnosticCommonKinds.inc.h
 DeclCXX.po: StmtNodes.inc.h
-DeclFriend.o: AttrList.inc.h
-DeclFriend.o: Attrs.inc.h
+DeclFriend.o: CommentCommandList.inc.h
 DeclFriend.o: DeclNodes.inc.h
 DeclFriend.o: DiagnosticCommonKinds.inc.h
 DeclFriend.o: StmtNodes.inc.h
-DeclFriend.po: AttrList.inc.h
-DeclFriend.po: Attrs.inc.h
+DeclFriend.po: CommentCommandList.inc.h
 DeclFriend.po: DeclNodes.inc.h
 DeclFriend.po: DiagnosticCommonKinds.inc.h
 DeclFriend.po: StmtNodes.inc.h
-DeclGroup.o: AttrList.inc.h
-DeclGroup.o: Attrs.inc.h
+DeclGroup.o: CommentCommandList.inc.h
 DeclGroup.o: DeclNodes.inc.h
 DeclGroup.o: DiagnosticCommonKinds.inc.h
-DeclGroup.po: AttrList.inc.h
-DeclGroup.po: Attrs.inc.h
+DeclGroup.o: StmtNodes.inc.h
+DeclGroup.po: CommentCommandList.inc.h
 DeclGroup.po: DeclNodes.inc.h
 DeclGroup.po: DiagnosticCommonKinds.inc.h
+DeclGroup.po: StmtNodes.inc.h
 DeclObjC.o: AttrList.inc.h
 DeclObjC.o: Attrs.inc.h
+DeclObjC.o: CommentCommandList.inc.h
 DeclObjC.o: DeclNodes.inc.h
 DeclObjC.o: DiagnosticCommonKinds.inc.h
 DeclObjC.o: StmtNodes.inc.h
 DeclObjC.po: AttrList.inc.h
 DeclObjC.po: Attrs.inc.h
+DeclObjC.po: CommentCommandList.inc.h
 DeclObjC.po: DeclNodes.inc.h
 DeclObjC.po: DiagnosticCommonKinds.inc.h
 DeclObjC.po: StmtNodes.inc.h
+DeclOpenMP.o: CommentCommandList.inc.h
+DeclOpenMP.o: DeclNodes.inc.h
+DeclOpenMP.o: DiagnosticCommonKinds.inc.h
+DeclOpenMP.o: StmtNodes.inc.h
+DeclOpenMP.po: CommentCommandList.inc.h
+DeclOpenMP.po: DeclNodes.inc.h
+DeclOpenMP.po: DiagnosticCommonKinds.inc.h
+DeclOpenMP.po: StmtNodes.inc.h
 DeclPrinter.o: AttrList.inc.h
 DeclPrinter.o: Attrs.inc.h
+DeclPrinter.o: CommentCommandList.inc.h
 DeclPrinter.o: DeclNodes.inc.h
 DeclPrinter.o: DiagnosticCommonKinds.inc.h
 DeclPrinter.o: StmtNodes.inc.h
 DeclPrinter.po: AttrList.inc.h
 DeclPrinter.po: Attrs.inc.h
+DeclPrinter.po: CommentCommandList.inc.h
 DeclPrinter.po: DeclNodes.inc.h
 DeclPrinter.po: DiagnosticCommonKinds.inc.h
 DeclPrinter.po: StmtNodes.inc.h
-DeclTemplate.o: AttrList.inc.h
-DeclTemplate.o: Attrs.inc.h
+DeclTemplate.o: CommentCommandList.inc.h
 DeclTemplate.o: DeclNodes.inc.h
 DeclTemplate.o: DiagnosticCommonKinds.inc.h
 DeclTemplate.o: StmtNodes.inc.h
-DeclTemplate.po: AttrList.inc.h
-DeclTemplate.po: Attrs.inc.h
+DeclTemplate.po: CommentCommandList.inc.h
 DeclTemplate.po: DeclNodes.inc.h
 DeclTemplate.po: DiagnosticCommonKinds.inc.h
 DeclTemplate.po: StmtNodes.inc.h
-DeclarationName.o: AttrList.inc.h
-DeclarationName.o: Attrs.inc.h
+DeclarationName.o: CommentCommandList.inc.h
 DeclarationName.o: DeclNodes.inc.h
 DeclarationName.o: DiagnosticCommonKinds.inc.h
-DeclarationName.po: AttrList.inc.h
-DeclarationName.po: Attrs.inc.h
+DeclarationName.o: StmtNodes.inc.h
+DeclarationName.po: CommentCommandList.inc.h
 DeclarationName.po: DeclNodes.inc.h
 DeclarationName.po: DiagnosticCommonKinds.inc.h
+DeclarationName.po: StmtNodes.inc.h
 DumpXML.o: AttrList.inc.h
 DumpXML.o: Attrs.inc.h
+DumpXML.o: CommentCommandList.inc.h
 DumpXML.o: DeclNodes.inc.h
 DumpXML.o: DiagnosticCommonKinds.inc.h
 DumpXML.o: StmtNodes.inc.h
 DumpXML.po: AttrList.inc.h
 DumpXML.po: Attrs.inc.h
+DumpXML.po: CommentCommandList.inc.h
 DumpXML.po: DeclNodes.inc.h
 DumpXML.po: DiagnosticCommonKinds.inc.h
 DumpXML.po: StmtNodes.inc.h
 Expr.o: AttrList.inc.h
 Expr.o: Attrs.inc.h
+Expr.o: CommentCommandList.inc.h
 Expr.o: DeclNodes.inc.h
 Expr.o: DiagnosticCommonKinds.inc.h
 Expr.o: DiagnosticSemaKinds.inc.h
 Expr.o: StmtNodes.inc.h
 Expr.po: AttrList.inc.h
 Expr.po: Attrs.inc.h
+Expr.po: CommentCommandList.inc.h
 Expr.po: DeclNodes.inc.h
 Expr.po: DiagnosticCommonKinds.inc.h
 Expr.po: DiagnosticSemaKinds.inc.h
 Expr.po: StmtNodes.inc.h
 ExprCXX.o: AttrList.inc.h
 ExprCXX.o: Attrs.inc.h
+ExprCXX.o: CommentCommandList.inc.h
 ExprCXX.o: DeclNodes.inc.h
 ExprCXX.o: DiagnosticCommonKinds.inc.h
 ExprCXX.o: StmtNodes.inc.h
 ExprCXX.po: AttrList.inc.h
 ExprCXX.po: Attrs.inc.h
+ExprCXX.po: CommentCommandList.inc.h
 ExprCXX.po: DeclNodes.inc.h
 ExprCXX.po: DiagnosticCommonKinds.inc.h
 ExprCXX.po: StmtNodes.inc.h
-ExprClassification.o: AttrList.inc.h
-ExprClassification.o: Attrs.inc.h
+ExprClassification.o: CommentCommandList.inc.h
 ExprClassification.o: DeclNodes.inc.h
 ExprClassification.o: DiagnosticCommonKinds.inc.h
 ExprClassification.o: StmtNodes.inc.h
-ExprClassification.po: AttrList.inc.h
-ExprClassification.po: Attrs.inc.h
+ExprClassification.po: CommentCommandList.inc.h
 ExprClassification.po: DeclNodes.inc.h
 ExprClassification.po: DiagnosticCommonKinds.inc.h
 ExprClassification.po: StmtNodes.inc.h
-ExprConstant.o: AttrList.inc.h
-ExprConstant.o: Attrs.inc.h
+ExprConstant.o: CommentCommandList.inc.h
 ExprConstant.o: DeclNodes.inc.h
 ExprConstant.o: DiagnosticASTKinds.inc.h
 ExprConstant.o: DiagnosticCommonKinds.inc.h
 ExprConstant.o: StmtNodes.inc.h
-ExprConstant.po: AttrList.inc.h
-ExprConstant.po: Attrs.inc.h
+ExprConstant.po: CommentCommandList.inc.h
 ExprConstant.po: DeclNodes.inc.h
 ExprConstant.po: DiagnosticASTKinds.inc.h
 ExprConstant.po: DiagnosticCommonKinds.inc.h
 ExprConstant.po: StmtNodes.inc.h
-ExternalASTSource.o: AttrList.inc.h
-ExternalASTSource.o: Attrs.inc.h
 ExternalASTSource.o: DeclNodes.inc.h
 ExternalASTSource.o: DiagnosticCommonKinds.inc.h
-ExternalASTSource.po: AttrList.inc.h
-ExternalASTSource.po: Attrs.inc.h
 ExternalASTSource.po: DeclNodes.inc.h
 ExternalASTSource.po: DiagnosticCommonKinds.inc.h
-InheritViz.o: AttrList.inc.h
-InheritViz.o: Attrs.inc.h
+InheritViz.o: CommentCommandList.inc.h
 InheritViz.o: DeclNodes.inc.h
 InheritViz.o: DiagnosticCommonKinds.inc.h
 InheritViz.o: StmtNodes.inc.h
-InheritViz.po: AttrList.inc.h
-InheritViz.po: Attrs.inc.h
+InheritViz.po: CommentCommandList.inc.h
 InheritViz.po: DeclNodes.inc.h
 InheritViz.po: DiagnosticCommonKinds.inc.h
 InheritViz.po: StmtNodes.inc.h
-ItaniumCXXABI.o: AttrList.inc.h
-ItaniumCXXABI.o: Attrs.inc.h
+ItaniumCXXABI.o: CommentCommandList.inc.h
 ItaniumCXXABI.o: DeclNodes.inc.h
 ItaniumCXXABI.o: DiagnosticCommonKinds.inc.h
 ItaniumCXXABI.o: StmtNodes.inc.h
-ItaniumCXXABI.po: AttrList.inc.h
-ItaniumCXXABI.po: Attrs.inc.h
+ItaniumCXXABI.po: CommentCommandList.inc.h
 ItaniumCXXABI.po: DeclNodes.inc.h
 ItaniumCXXABI.po: DiagnosticCommonKinds.inc.h
 ItaniumCXXABI.po: StmtNodes.inc.h
 ItaniumMangle.o: AttrList.inc.h
 ItaniumMangle.o: Attrs.inc.h
+ItaniumMangle.o: CommentCommandList.inc.h
 ItaniumMangle.o: DeclNodes.inc.h
 ItaniumMangle.o: DiagnosticCommonKinds.inc.h
 ItaniumMangle.o: StmtNodes.inc.h
 ItaniumMangle.po: AttrList.inc.h
 ItaniumMangle.po: Attrs.inc.h
+ItaniumMangle.po: CommentCommandList.inc.h
 ItaniumMangle.po: DeclNodes.inc.h
 ItaniumMangle.po: DiagnosticCommonKinds.inc.h
 ItaniumMangle.po: StmtNodes.inc.h
-LambdaMangleContext.o: AttrList.inc.h
-LambdaMangleContext.o: Attrs.inc.h
+LambdaMangleContext.o: CommentCommandList.inc.h
 LambdaMangleContext.o: DeclNodes.inc.h
 LambdaMangleContext.o: DiagnosticCommonKinds.inc.h
 LambdaMangleContext.o: StmtNodes.inc.h
-LambdaMangleContext.po: AttrList.inc.h
-LambdaMangleContext.po: Attrs.inc.h
+LambdaMangleContext.po: CommentCommandList.inc.h
 LambdaMangleContext.po: DeclNodes.inc.h
 LambdaMangleContext.po: DiagnosticCommonKinds.inc.h
 LambdaMangleContext.po: StmtNodes.inc.h
-Mangle.o: AttrList.inc.h
-Mangle.o: Attrs.inc.h
+Mangle.o: CommentCommandList.inc.h
 Mangle.o: DeclNodes.inc.h
 Mangle.o: DiagnosticCommonKinds.inc.h
 Mangle.o: StmtNodes.inc.h
-Mangle.po: AttrList.inc.h
-Mangle.po: Attrs.inc.h
+Mangle.po: CommentCommandList.inc.h
 Mangle.po: DeclNodes.inc.h
 Mangle.po: DiagnosticCommonKinds.inc.h
 Mangle.po: StmtNodes.inc.h
 MicrosoftCXXABI.o: AttrList.inc.h
 MicrosoftCXXABI.o: Attrs.inc.h
+MicrosoftCXXABI.o: CommentCommandList.inc.h
 MicrosoftCXXABI.o: DeclNodes.inc.h
 MicrosoftCXXABI.o: DiagnosticCommonKinds.inc.h
 MicrosoftCXXABI.o: StmtNodes.inc.h
 MicrosoftCXXABI.po: AttrList.inc.h
 MicrosoftCXXABI.po: Attrs.inc.h
+MicrosoftCXXABI.po: CommentCommandList.inc.h
 MicrosoftCXXABI.po: DeclNodes.inc.h
 MicrosoftCXXABI.po: DiagnosticCommonKinds.inc.h
 MicrosoftCXXABI.po: StmtNodes.inc.h
 MicrosoftMangle.o: AttrList.inc.h
 MicrosoftMangle.o: Attrs.inc.h
+MicrosoftMangle.o: CommentCommandList.inc.h
 MicrosoftMangle.o: DeclNodes.inc.h
 MicrosoftMangle.o: DiagnosticCommonKinds.inc.h
 MicrosoftMangle.o: StmtNodes.inc.h
 MicrosoftMangle.po: AttrList.inc.h
 MicrosoftMangle.po: Attrs.inc.h
+MicrosoftMangle.po: CommentCommandList.inc.h
 MicrosoftMangle.po: DeclNodes.inc.h
 MicrosoftMangle.po: DiagnosticCommonKinds.inc.h
 MicrosoftMangle.po: StmtNodes.inc.h
-NSAPI.o: AttrList.inc.h
-NSAPI.o: Attrs.inc.h
+NSAPI.o: CommentCommandList.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: CommentCommandList.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: CommentCommandList.inc.h
 NestedNameSpecifier.o: DeclNodes.inc.h
 NestedNameSpecifier.o: DiagnosticCommonKinds.inc.h
 NestedNameSpecifier.o: StmtNodes.inc.h
-NestedNameSpecifier.po: AttrList.inc.h
-NestedNameSpecifier.po: Attrs.inc.h
+NestedNameSpecifier.po: CommentCommandList.inc.h
 NestedNameSpecifier.po: DeclNodes.inc.h
 NestedNameSpecifier.po: DiagnosticCommonKinds.inc.h
 NestedNameSpecifier.po: StmtNodes.inc.h
-ParentMap.o: AttrList.inc.h
-ParentMap.o: Attrs.inc.h
 ParentMap.o: DeclNodes.inc.h
 ParentMap.o: DiagnosticCommonKinds.inc.h
 ParentMap.o: StmtNodes.inc.h
-ParentMap.po: AttrList.inc.h
-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: CommentCommandList.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.o: StmtNodes.inc.h
+RawCommentList.po: CommentCommandList.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
+RawCommentList.po: StmtNodes.inc.h
+RecordLayout.o: CommentCommandList.inc.h
 RecordLayout.o: DeclNodes.inc.h
 RecordLayout.o: DiagnosticCommonKinds.inc.h
 RecordLayout.o: StmtNodes.inc.h
-RecordLayout.po: AttrList.inc.h
-RecordLayout.po: Attrs.inc.h
+RecordLayout.po: CommentCommandList.inc.h
 RecordLayout.po: DeclNodes.inc.h
 RecordLayout.po: DiagnosticCommonKinds.inc.h
 RecordLayout.po: StmtNodes.inc.h
 RecordLayoutBuilder.o: AttrList.inc.h
 RecordLayoutBuilder.o: Attrs.inc.h
+RecordLayoutBuilder.o: CommentCommandList.inc.h
 RecordLayoutBuilder.o: DeclNodes.inc.h
 RecordLayoutBuilder.o: DiagnosticCommonKinds.inc.h
 RecordLayoutBuilder.o: DiagnosticSemaKinds.inc.h
 RecordLayoutBuilder.o: StmtNodes.inc.h
 RecordLayoutBuilder.po: AttrList.inc.h
 RecordLayoutBuilder.po: Attrs.inc.h
+RecordLayoutBuilder.po: CommentCommandList.inc.h
 RecordLayoutBuilder.po: DeclNodes.inc.h
 RecordLayoutBuilder.po: DiagnosticCommonKinds.inc.h
 RecordLayoutBuilder.po: DiagnosticSemaKinds.inc.h
 RecordLayoutBuilder.po: StmtNodes.inc.h
-SelectorLocationsKind.o: AttrList.inc.h
-SelectorLocationsKind.o: Attrs.inc.h
 SelectorLocationsKind.o: DeclNodes.inc.h
 SelectorLocationsKind.o: DiagnosticCommonKinds.inc.h
 SelectorLocationsKind.o: StmtNodes.inc.h
-SelectorLocationsKind.po: AttrList.inc.h
-SelectorLocationsKind.po: Attrs.inc.h
 SelectorLocationsKind.po: DeclNodes.inc.h
 SelectorLocationsKind.po: DiagnosticCommonKinds.inc.h
 SelectorLocationsKind.po: StmtNodes.inc.h
-Stmt.o: AttrList.inc.h
-Stmt.o: Attrs.inc.h
+Stmt.o: CommentCommandList.inc.h
 Stmt.o: DeclNodes.inc.h
 Stmt.o: DiagnosticASTKinds.inc.h
 Stmt.o: DiagnosticCommonKinds.inc.h
 Stmt.o: StmtNodes.inc.h
-Stmt.po: AttrList.inc.h
-Stmt.po: Attrs.inc.h
+Stmt.po: CommentCommandList.inc.h
 Stmt.po: DeclNodes.inc.h
 Stmt.po: DiagnosticASTKinds.inc.h
 Stmt.po: DiagnosticCommonKinds.inc.h
 Stmt.po: StmtNodes.inc.h
-StmtDumper.o: AttrList.inc.h
-StmtDumper.o: Attrs.inc.h
-StmtDumper.o: DeclNodes.inc.h
-StmtDumper.o: DiagnosticCommonKinds.inc.h
-StmtDumper.o: StmtNodes.inc.h
-StmtDumper.po: AttrList.inc.h
-StmtDumper.po: Attrs.inc.h
-StmtDumper.po: DeclNodes.inc.h
-StmtDumper.po: DiagnosticCommonKinds.inc.h
-StmtDumper.po: StmtNodes.inc.h
-StmtIterator.o: AttrList.inc.h
-StmtIterator.o: Attrs.inc.h
 StmtIterator.o: DeclNodes.inc.h
 StmtIterator.o: DiagnosticCommonKinds.inc.h
-StmtIterator.po: AttrList.inc.h
-StmtIterator.po: Attrs.inc.h
 StmtIterator.po: DeclNodes.inc.h
 StmtIterator.po: DiagnosticCommonKinds.inc.h
 StmtPrinter.o: AttrList.inc.h
 StmtPrinter.o: Attrs.inc.h
+StmtPrinter.o: CommentCommandList.inc.h
 StmtPrinter.o: DeclNodes.inc.h
 StmtPrinter.o: DiagnosticCommonKinds.inc.h
 StmtPrinter.o: StmtNodes.inc.h
 StmtPrinter.po: AttrList.inc.h
 StmtPrinter.po: Attrs.inc.h
+StmtPrinter.po: CommentCommandList.inc.h
 StmtPrinter.po: DeclNodes.inc.h
 StmtPrinter.po: DiagnosticCommonKinds.inc.h
 StmtPrinter.po: StmtNodes.inc.h
-StmtProfile.o: AttrList.inc.h
-StmtProfile.o: Attrs.inc.h
+StmtProfile.o: CommentCommandList.inc.h
 StmtProfile.o: DeclNodes.inc.h
 StmtProfile.o: DiagnosticCommonKinds.inc.h
 StmtProfile.o: StmtNodes.inc.h
-StmtProfile.po: AttrList.inc.h
-StmtProfile.po: Attrs.inc.h
+StmtProfile.po: CommentCommandList.inc.h
 StmtProfile.po: DeclNodes.inc.h
 StmtProfile.po: DiagnosticCommonKinds.inc.h
 StmtProfile.po: StmtNodes.inc.h
-StmtViz.o: AttrList.inc.h
-StmtViz.o: Attrs.inc.h
 StmtViz.o: DeclNodes.inc.h
 StmtViz.o: DiagnosticCommonKinds.inc.h
 StmtViz.o: StmtNodes.inc.h
-StmtViz.po: AttrList.inc.h
-StmtViz.po: Attrs.inc.h
 StmtViz.po: DeclNodes.inc.h
 StmtViz.po: DiagnosticCommonKinds.inc.h
 StmtViz.po: StmtNodes.inc.h
-TemplateBase.o: AttrList.inc.h
-TemplateBase.o: Attrs.inc.h
+TemplateBase.o: CommentCommandList.inc.h
 TemplateBase.o: DeclNodes.inc.h
 TemplateBase.o: DiagnosticCommonKinds.inc.h
 TemplateBase.o: StmtNodes.inc.h
-TemplateBase.po: AttrList.inc.h
-TemplateBase.po: Attrs.inc.h
+TemplateBase.po: CommentCommandList.inc.h
 TemplateBase.po: DeclNodes.inc.h
 TemplateBase.po: DiagnosticCommonKinds.inc.h
 TemplateBase.po: StmtNodes.inc.h
-TemplateName.o: AttrList.inc.h
-TemplateName.o: Attrs.inc.h
 TemplateName.o: DeclNodes.inc.h
 TemplateName.o: DiagnosticCommonKinds.inc.h
 TemplateName.o: StmtNodes.inc.h
-TemplateName.po: AttrList.inc.h
-TemplateName.po: Attrs.inc.h
 TemplateName.po: DeclNodes.inc.h
 TemplateName.po: DiagnosticCommonKinds.inc.h
 TemplateName.po: StmtNodes.inc.h
 Type.o: AttrList.inc.h
 Type.o: Attrs.inc.h
+Type.o: CommentCommandList.inc.h
 Type.o: DeclNodes.inc.h
 Type.o: DiagnosticCommonKinds.inc.h
 Type.o: StmtNodes.inc.h
 Type.po: AttrList.inc.h
 Type.po: Attrs.inc.h
+Type.po: CommentCommandList.inc.h
 Type.po: DeclNodes.inc.h
 Type.po: DiagnosticCommonKinds.inc.h
 Type.po: StmtNodes.inc.h
-TypeLoc.o: AttrList.inc.h
-TypeLoc.o: Attrs.inc.h
+TypeLoc.o: CommentCommandList.inc.h
 TypeLoc.o: DeclNodes.inc.h
 TypeLoc.o: DiagnosticCommonKinds.inc.h
 TypeLoc.o: StmtNodes.inc.h
-TypeLoc.po: AttrList.inc.h
-TypeLoc.po: Attrs.inc.h
+TypeLoc.po: CommentCommandList.inc.h
 TypeLoc.po: DeclNodes.inc.h
 TypeLoc.po: DiagnosticCommonKinds.inc.h
 TypeLoc.po: StmtNodes.inc.h
-TypePrinter.o: AttrList.inc.h
-TypePrinter.o: Attrs.inc.h
+TypePrinter.o: CommentCommandList.inc.h
 TypePrinter.o: DeclNodes.inc.h
 TypePrinter.o: DiagnosticCommonKinds.inc.h
 TypePrinter.o: StmtNodes.inc.h
-TypePrinter.po: AttrList.inc.h
-TypePrinter.po: Attrs.inc.h
+TypePrinter.po: CommentCommandList.inc.h
 TypePrinter.po: DeclNodes.inc.h
 TypePrinter.po: DiagnosticCommonKinds.inc.h
 TypePrinter.po: StmtNodes.inc.h
-VTTBuilder.o: AttrList.inc.h
-VTTBuilder.o: Attrs.inc.h
+VTTBuilder.o: CommentCommandList.inc.h
 VTTBuilder.o: DeclNodes.inc.h
 VTTBuilder.o: DiagnosticCommonKinds.inc.h
 VTTBuilder.o: StmtNodes.inc.h
-VTTBuilder.po: AttrList.inc.h
-VTTBuilder.po: Attrs.inc.h
+VTTBuilder.po: CommentCommandList.inc.h
 VTTBuilder.po: DeclNodes.inc.h
 VTTBuilder.po: DiagnosticCommonKinds.inc.h
 VTTBuilder.po: StmtNodes.inc.h
-VTableBuilder.o: AttrList.inc.h
-VTableBuilder.o: Attrs.inc.h
+VTableBuilder.o: CommentCommandList.inc.h
 VTableBuilder.o: DeclNodes.inc.h
 VTableBuilder.o: DiagnosticCommonKinds.inc.h
 VTableBuilder.o: StmtNodes.inc.h
-VTableBuilder.po: AttrList.inc.h
-VTableBuilder.po: Attrs.inc.h
+VTableBuilder.po: CommentCommandList.inc.h
 VTableBuilder.po: DeclNodes.inc.h
 VTableBuilder.po: DiagnosticCommonKinds.inc.h
 VTableBuilder.po: StmtNodes.inc.h
diff --git a/lib/clang/libclangbasic/Makefile.depend b/lib/clang/libclangbasic/Makefile.depend
index 74a968f..30ba0f0 100644
--- a/lib/clang/libclangbasic/Makefile.depend
+++ b/lib/clang/libclangbasic/Makefile.depend
@@ -9,6 +9,7 @@ DIRDEPS = \
 	include/xlocale \
 	lib/clang/include \
 	lib/msun \
+	usr.bin/clang/clang-tblgen.host \
 
 
 .include <dirdeps.mk>
diff --git a/lib/clang/libclangcodegen/Makefile.depend b/lib/clang/libclangcodegen/Makefile.depend
index 9478058..6883464 100644
--- a/lib/clang/libclangcodegen/Makefile.depend
+++ b/lib/clang/libclangcodegen/Makefile.depend
@@ -8,6 +8,8 @@ DIRDEPS = \
 	include \
 	include/xlocale \
 	lib/msun \
+	usr.bin/clang/clang-tblgen.host \
+	usr.bin/clang/tblgen.host \
 
 
 .include <dirdeps.mk>
@@ -18,18 +20,35 @@ BackendUtil.o: DiagnosticCommonKinds.inc.h
 BackendUtil.o: DiagnosticFrontendKinds.inc.h
 BackendUtil.po: DiagnosticCommonKinds.inc.h
 BackendUtil.po: DiagnosticFrontendKinds.inc.h
+CGAtomic.o: AttrList.inc.h
+CGAtomic.o: Attrs.inc.h
+CGAtomic.o: CommentCommandList.inc.h
+CGAtomic.o: DeclNodes.inc.h
+CGAtomic.o: DiagnosticCommonKinds.inc.h
+CGAtomic.o: Intrinsics.inc.h
+CGAtomic.o: StmtNodes.inc.h
+CGAtomic.po: AttrList.inc.h
+CGAtomic.po: Attrs.inc.h
+CGAtomic.po: CommentCommandList.inc.h
+CGAtomic.po: DeclNodes.inc.h
+CGAtomic.po: DiagnosticCommonKinds.inc.h
+CGAtomic.po: Intrinsics.inc.h
+CGAtomic.po: StmtNodes.inc.h
 CGBlocks.o: AttrList.inc.h
 CGBlocks.o: Attrs.inc.h
+CGBlocks.o: CommentCommandList.inc.h
 CGBlocks.o: DeclNodes.inc.h
 CGBlocks.o: DiagnosticCommonKinds.inc.h
 CGBlocks.o: StmtNodes.inc.h
 CGBlocks.po: AttrList.inc.h
 CGBlocks.po: Attrs.inc.h
+CGBlocks.po: CommentCommandList.inc.h
 CGBlocks.po: DeclNodes.inc.h
 CGBlocks.po: DiagnosticCommonKinds.inc.h
 CGBlocks.po: StmtNodes.inc.h
 CGBuiltin.o: AttrList.inc.h
 CGBuiltin.o: Attrs.inc.h
+CGBuiltin.o: CommentCommandList.inc.h
 CGBuiltin.o: DeclNodes.inc.h
 CGBuiltin.o: DiagnosticCommonKinds.inc.h
 CGBuiltin.o: Intrinsics.inc.h
@@ -37,6 +56,7 @@ CGBuiltin.o: StmtNodes.inc.h
 CGBuiltin.o: arm_neon.inc.h
 CGBuiltin.po: AttrList.inc.h
 CGBuiltin.po: Attrs.inc.h
+CGBuiltin.po: CommentCommandList.inc.h
 CGBuiltin.po: DeclNodes.inc.h
 CGBuiltin.po: DiagnosticCommonKinds.inc.h
 CGBuiltin.po: Intrinsics.inc.h
@@ -44,389 +64,461 @@ CGBuiltin.po: StmtNodes.inc.h
 CGBuiltin.po: arm_neon.inc.h
 CGCUDANV.o: AttrList.inc.h
 CGCUDANV.o: Attrs.inc.h
+CGCUDANV.o: CommentCommandList.inc.h
 CGCUDANV.o: DeclNodes.inc.h
 CGCUDANV.o: DiagnosticCommonKinds.inc.h
 CGCUDANV.o: StmtNodes.inc.h
 CGCUDANV.po: AttrList.inc.h
 CGCUDANV.po: Attrs.inc.h
+CGCUDANV.po: CommentCommandList.inc.h
 CGCUDANV.po: DeclNodes.inc.h
 CGCUDANV.po: DiagnosticCommonKinds.inc.h
 CGCUDANV.po: StmtNodes.inc.h
 CGCUDARuntime.o: AttrList.inc.h
 CGCUDARuntime.o: Attrs.inc.h
+CGCUDARuntime.o: CommentCommandList.inc.h
 CGCUDARuntime.o: DeclNodes.inc.h
 CGCUDARuntime.o: DiagnosticCommonKinds.inc.h
 CGCUDARuntime.o: StmtNodes.inc.h
 CGCUDARuntime.po: AttrList.inc.h
 CGCUDARuntime.po: Attrs.inc.h
+CGCUDARuntime.po: CommentCommandList.inc.h
 CGCUDARuntime.po: DeclNodes.inc.h
 CGCUDARuntime.po: DiagnosticCommonKinds.inc.h
 CGCUDARuntime.po: StmtNodes.inc.h
 CGCXX.o: AttrList.inc.h
 CGCXX.o: Attrs.inc.h
+CGCXX.o: CommentCommandList.inc.h
 CGCXX.o: DeclNodes.inc.h
 CGCXX.o: DiagnosticCommonKinds.inc.h
 CGCXX.o: StmtNodes.inc.h
 CGCXX.po: AttrList.inc.h
 CGCXX.po: Attrs.inc.h
+CGCXX.po: CommentCommandList.inc.h
 CGCXX.po: DeclNodes.inc.h
 CGCXX.po: DiagnosticCommonKinds.inc.h
 CGCXX.po: StmtNodes.inc.h
 CGCXXABI.o: AttrList.inc.h
 CGCXXABI.o: Attrs.inc.h
+CGCXXABI.o: CommentCommandList.inc.h
 CGCXXABI.o: DeclNodes.inc.h
 CGCXXABI.o: DiagnosticCommonKinds.inc.h
 CGCXXABI.o: StmtNodes.inc.h
 CGCXXABI.po: AttrList.inc.h
 CGCXXABI.po: Attrs.inc.h
+CGCXXABI.po: CommentCommandList.inc.h
 CGCXXABI.po: DeclNodes.inc.h
 CGCXXABI.po: DiagnosticCommonKinds.inc.h
 CGCXXABI.po: StmtNodes.inc.h
 CGCall.o: AttrList.inc.h
 CGCall.o: Attrs.inc.h
+CGCall.o: CommentCommandList.inc.h
 CGCall.o: DeclNodes.inc.h
 CGCall.o: DiagnosticCommonKinds.inc.h
 CGCall.o: StmtNodes.inc.h
 CGCall.po: AttrList.inc.h
 CGCall.po: Attrs.inc.h
+CGCall.po: CommentCommandList.inc.h
 CGCall.po: DeclNodes.inc.h
 CGCall.po: DiagnosticCommonKinds.inc.h
 CGCall.po: StmtNodes.inc.h
 CGClass.o: AttrList.inc.h
 CGClass.o: Attrs.inc.h
+CGClass.o: CommentCommandList.inc.h
 CGClass.o: DeclNodes.inc.h
 CGClass.o: DiagnosticCommonKinds.inc.h
 CGClass.o: StmtNodes.inc.h
+CGClass.o: arm_neon.inc.h
 CGClass.po: AttrList.inc.h
 CGClass.po: Attrs.inc.h
+CGClass.po: CommentCommandList.inc.h
 CGClass.po: DeclNodes.inc.h
 CGClass.po: DiagnosticCommonKinds.inc.h
 CGClass.po: StmtNodes.inc.h
+CGClass.po: arm_neon.inc.h
 CGCleanup.o: AttrList.inc.h
 CGCleanup.o: Attrs.inc.h
+CGCleanup.o: CommentCommandList.inc.h
 CGCleanup.o: DeclNodes.inc.h
 CGCleanup.o: DiagnosticCommonKinds.inc.h
 CGCleanup.o: StmtNodes.inc.h
 CGCleanup.po: AttrList.inc.h
 CGCleanup.po: Attrs.inc.h
+CGCleanup.po: CommentCommandList.inc.h
 CGCleanup.po: DeclNodes.inc.h
 CGCleanup.po: DiagnosticCommonKinds.inc.h
 CGCleanup.po: StmtNodes.inc.h
 CGDebugInfo.o: AttrList.inc.h
 CGDebugInfo.o: Attrs.inc.h
+CGDebugInfo.o: CommentCommandList.inc.h
 CGDebugInfo.o: DeclNodes.inc.h
 CGDebugInfo.o: DiagnosticCommonKinds.inc.h
 CGDebugInfo.o: Intrinsics.inc.h
 CGDebugInfo.o: StmtNodes.inc.h
 CGDebugInfo.po: AttrList.inc.h
 CGDebugInfo.po: Attrs.inc.h
+CGDebugInfo.po: CommentCommandList.inc.h
 CGDebugInfo.po: DeclNodes.inc.h
 CGDebugInfo.po: DiagnosticCommonKinds.inc.h
 CGDebugInfo.po: Intrinsics.inc.h
 CGDebugInfo.po: StmtNodes.inc.h
 CGDecl.o: AttrList.inc.h
 CGDecl.o: Attrs.inc.h
+CGDecl.o: CommentCommandList.inc.h
 CGDecl.o: DeclNodes.inc.h
 CGDecl.o: DiagnosticCommonKinds.inc.h
 CGDecl.o: Intrinsics.inc.h
 CGDecl.o: StmtNodes.inc.h
 CGDecl.po: AttrList.inc.h
 CGDecl.po: Attrs.inc.h
+CGDecl.po: CommentCommandList.inc.h
 CGDecl.po: DeclNodes.inc.h
 CGDecl.po: DiagnosticCommonKinds.inc.h
 CGDecl.po: Intrinsics.inc.h
 CGDecl.po: StmtNodes.inc.h
 CGDeclCXX.o: AttrList.inc.h
 CGDeclCXX.o: Attrs.inc.h
+CGDeclCXX.o: CommentCommandList.inc.h
 CGDeclCXX.o: DeclNodes.inc.h
 CGDeclCXX.o: DiagnosticCommonKinds.inc.h
 CGDeclCXX.o: Intrinsics.inc.h
 CGDeclCXX.o: StmtNodes.inc.h
 CGDeclCXX.po: AttrList.inc.h
 CGDeclCXX.po: Attrs.inc.h
+CGDeclCXX.po: CommentCommandList.inc.h
 CGDeclCXX.po: DeclNodes.inc.h
 CGDeclCXX.po: DiagnosticCommonKinds.inc.h
 CGDeclCXX.po: Intrinsics.inc.h
 CGDeclCXX.po: StmtNodes.inc.h
 CGException.o: AttrList.inc.h
 CGException.o: Attrs.inc.h
+CGException.o: CommentCommandList.inc.h
 CGException.o: DeclNodes.inc.h
 CGException.o: DiagnosticCommonKinds.inc.h
 CGException.o: Intrinsics.inc.h
 CGException.o: StmtNodes.inc.h
 CGException.po: AttrList.inc.h
 CGException.po: Attrs.inc.h
+CGException.po: CommentCommandList.inc.h
 CGException.po: DeclNodes.inc.h
 CGException.po: DiagnosticCommonKinds.inc.h
 CGException.po: Intrinsics.inc.h
 CGException.po: StmtNodes.inc.h
 CGExpr.o: AttrList.inc.h
 CGExpr.o: Attrs.inc.h
+CGExpr.o: CommentCommandList.inc.h
 CGExpr.o: DeclNodes.inc.h
 CGExpr.o: DiagnosticCommonKinds.inc.h
 CGExpr.o: Intrinsics.inc.h
 CGExpr.o: StmtNodes.inc.h
 CGExpr.po: AttrList.inc.h
 CGExpr.po: Attrs.inc.h
+CGExpr.po: CommentCommandList.inc.h
 CGExpr.po: DeclNodes.inc.h
 CGExpr.po: DiagnosticCommonKinds.inc.h
 CGExpr.po: Intrinsics.inc.h
 CGExpr.po: StmtNodes.inc.h
 CGExprAgg.o: AttrList.inc.h
 CGExprAgg.o: Attrs.inc.h
+CGExprAgg.o: CommentCommandList.inc.h
 CGExprAgg.o: DeclNodes.inc.h
 CGExprAgg.o: DiagnosticCommonKinds.inc.h
 CGExprAgg.o: Intrinsics.inc.h
 CGExprAgg.o: StmtNodes.inc.h
 CGExprAgg.po: AttrList.inc.h
 CGExprAgg.po: Attrs.inc.h
+CGExprAgg.po: CommentCommandList.inc.h
 CGExprAgg.po: DeclNodes.inc.h
 CGExprAgg.po: DiagnosticCommonKinds.inc.h
 CGExprAgg.po: Intrinsics.inc.h
 CGExprAgg.po: StmtNodes.inc.h
 CGExprCXX.o: AttrList.inc.h
 CGExprCXX.o: Attrs.inc.h
+CGExprCXX.o: CommentCommandList.inc.h
 CGExprCXX.o: DeclNodes.inc.h
 CGExprCXX.o: DiagnosticCommonKinds.inc.h
 CGExprCXX.o: Intrinsics.inc.h
 CGExprCXX.o: StmtNodes.inc.h
 CGExprCXX.po: AttrList.inc.h
 CGExprCXX.po: Attrs.inc.h
+CGExprCXX.po: CommentCommandList.inc.h
 CGExprCXX.po: DeclNodes.inc.h
 CGExprCXX.po: DiagnosticCommonKinds.inc.h
 CGExprCXX.po: Intrinsics.inc.h
 CGExprCXX.po: StmtNodes.inc.h
 CGExprComplex.o: AttrList.inc.h
 CGExprComplex.o: Attrs.inc.h
+CGExprComplex.o: CommentCommandList.inc.h
 CGExprComplex.o: DeclNodes.inc.h
 CGExprComplex.o: DiagnosticCommonKinds.inc.h
 CGExprComplex.o: StmtNodes.inc.h
 CGExprComplex.po: AttrList.inc.h
 CGExprComplex.po: Attrs.inc.h
+CGExprComplex.po: CommentCommandList.inc.h
 CGExprComplex.po: DeclNodes.inc.h
 CGExprComplex.po: DiagnosticCommonKinds.inc.h
 CGExprComplex.po: StmtNodes.inc.h
 CGExprConstant.o: AttrList.inc.h
 CGExprConstant.o: Attrs.inc.h
+CGExprConstant.o: CommentCommandList.inc.h
 CGExprConstant.o: DeclNodes.inc.h
 CGExprConstant.o: DiagnosticCommonKinds.inc.h
 CGExprConstant.o: StmtNodes.inc.h
 CGExprConstant.po: AttrList.inc.h
 CGExprConstant.po: Attrs.inc.h
+CGExprConstant.po: CommentCommandList.inc.h
 CGExprConstant.po: DeclNodes.inc.h
 CGExprConstant.po: DiagnosticCommonKinds.inc.h
 CGExprConstant.po: StmtNodes.inc.h
 CGExprScalar.o: AttrList.inc.h
 CGExprScalar.o: Attrs.inc.h
+CGExprScalar.o: CommentCommandList.inc.h
 CGExprScalar.o: DeclNodes.inc.h
 CGExprScalar.o: DiagnosticCommonKinds.inc.h
 CGExprScalar.o: Intrinsics.inc.h
 CGExprScalar.o: StmtNodes.inc.h
 CGExprScalar.po: AttrList.inc.h
 CGExprScalar.po: Attrs.inc.h
+CGExprScalar.po: CommentCommandList.inc.h
 CGExprScalar.po: DeclNodes.inc.h
 CGExprScalar.po: DiagnosticCommonKinds.inc.h
 CGExprScalar.po: Intrinsics.inc.h
 CGExprScalar.po: StmtNodes.inc.h
 CGObjC.o: AttrList.inc.h
 CGObjC.o: Attrs.inc.h
+CGObjC.o: CommentCommandList.inc.h
 CGObjC.o: DeclNodes.inc.h
 CGObjC.o: DiagnosticCommonKinds.inc.h
 CGObjC.o: StmtNodes.inc.h
 CGObjC.po: AttrList.inc.h
 CGObjC.po: Attrs.inc.h
+CGObjC.po: CommentCommandList.inc.h
 CGObjC.po: DeclNodes.inc.h
 CGObjC.po: DiagnosticCommonKinds.inc.h
 CGObjC.po: StmtNodes.inc.h
 CGObjCGNU.o: AttrList.inc.h
 CGObjCGNU.o: Attrs.inc.h
+CGObjCGNU.o: CommentCommandList.inc.h
 CGObjCGNU.o: DeclNodes.inc.h
 CGObjCGNU.o: DiagnosticCommonKinds.inc.h
 CGObjCGNU.o: Intrinsics.inc.h
 CGObjCGNU.o: StmtNodes.inc.h
 CGObjCGNU.po: AttrList.inc.h
 CGObjCGNU.po: Attrs.inc.h
+CGObjCGNU.po: CommentCommandList.inc.h
 CGObjCGNU.po: DeclNodes.inc.h
 CGObjCGNU.po: DiagnosticCommonKinds.inc.h
 CGObjCGNU.po: Intrinsics.inc.h
 CGObjCGNU.po: StmtNodes.inc.h
 CGObjCMac.o: AttrList.inc.h
 CGObjCMac.o: Attrs.inc.h
+CGObjCMac.o: CommentCommandList.inc.h
 CGObjCMac.o: DeclNodes.inc.h
 CGObjCMac.o: DiagnosticCommonKinds.inc.h
 CGObjCMac.o: Intrinsics.inc.h
 CGObjCMac.o: StmtNodes.inc.h
 CGObjCMac.po: AttrList.inc.h
 CGObjCMac.po: Attrs.inc.h
+CGObjCMac.po: CommentCommandList.inc.h
 CGObjCMac.po: DeclNodes.inc.h
 CGObjCMac.po: DiagnosticCommonKinds.inc.h
 CGObjCMac.po: Intrinsics.inc.h
 CGObjCMac.po: StmtNodes.inc.h
 CGObjCRuntime.o: AttrList.inc.h
 CGObjCRuntime.o: Attrs.inc.h
+CGObjCRuntime.o: CommentCommandList.inc.h
 CGObjCRuntime.o: DeclNodes.inc.h
 CGObjCRuntime.o: DiagnosticCommonKinds.inc.h
 CGObjCRuntime.o: StmtNodes.inc.h
 CGObjCRuntime.po: AttrList.inc.h
 CGObjCRuntime.po: Attrs.inc.h
+CGObjCRuntime.po: CommentCommandList.inc.h
 CGObjCRuntime.po: DeclNodes.inc.h
 CGObjCRuntime.po: DiagnosticCommonKinds.inc.h
 CGObjCRuntime.po: StmtNodes.inc.h
 CGOpenCLRuntime.o: AttrList.inc.h
 CGOpenCLRuntime.o: Attrs.inc.h
+CGOpenCLRuntime.o: CommentCommandList.inc.h
 CGOpenCLRuntime.o: DeclNodes.inc.h
 CGOpenCLRuntime.o: DiagnosticCommonKinds.inc.h
 CGOpenCLRuntime.o: StmtNodes.inc.h
 CGOpenCLRuntime.po: AttrList.inc.h
 CGOpenCLRuntime.po: Attrs.inc.h
+CGOpenCLRuntime.po: CommentCommandList.inc.h
 CGOpenCLRuntime.po: DeclNodes.inc.h
 CGOpenCLRuntime.po: DiagnosticCommonKinds.inc.h
 CGOpenCLRuntime.po: StmtNodes.inc.h
 CGRTTI.o: AttrList.inc.h
 CGRTTI.o: Attrs.inc.h
+CGRTTI.o: CommentCommandList.inc.h
 CGRTTI.o: DeclNodes.inc.h
 CGRTTI.o: DiagnosticCommonKinds.inc.h
 CGRTTI.o: StmtNodes.inc.h
 CGRTTI.po: AttrList.inc.h
 CGRTTI.po: Attrs.inc.h
+CGRTTI.po: CommentCommandList.inc.h
 CGRTTI.po: DeclNodes.inc.h
 CGRTTI.po: DiagnosticCommonKinds.inc.h
 CGRTTI.po: StmtNodes.inc.h
 CGRecordLayoutBuilder.o: AttrList.inc.h
 CGRecordLayoutBuilder.o: Attrs.inc.h
+CGRecordLayoutBuilder.o: CommentCommandList.inc.h
 CGRecordLayoutBuilder.o: DeclNodes.inc.h
 CGRecordLayoutBuilder.o: DiagnosticCommonKinds.inc.h
 CGRecordLayoutBuilder.o: StmtNodes.inc.h
 CGRecordLayoutBuilder.po: AttrList.inc.h
 CGRecordLayoutBuilder.po: Attrs.inc.h
+CGRecordLayoutBuilder.po: CommentCommandList.inc.h
 CGRecordLayoutBuilder.po: DeclNodes.inc.h
 CGRecordLayoutBuilder.po: DiagnosticCommonKinds.inc.h
 CGRecordLayoutBuilder.po: StmtNodes.inc.h
 CGStmt.o: AttrList.inc.h
 CGStmt.o: Attrs.inc.h
+CGStmt.o: CommentCommandList.inc.h
 CGStmt.o: DeclNodes.inc.h
 CGStmt.o: DiagnosticCommonKinds.inc.h
 CGStmt.o: Intrinsics.inc.h
 CGStmt.o: StmtNodes.inc.h
 CGStmt.po: AttrList.inc.h
 CGStmt.po: Attrs.inc.h
+CGStmt.po: CommentCommandList.inc.h
 CGStmt.po: DeclNodes.inc.h
 CGStmt.po: DiagnosticCommonKinds.inc.h
 CGStmt.po: Intrinsics.inc.h
 CGStmt.po: StmtNodes.inc.h
 CGVTT.o: AttrList.inc.h
 CGVTT.o: Attrs.inc.h
+CGVTT.o: CommentCommandList.inc.h
 CGVTT.o: DeclNodes.inc.h
 CGVTT.o: DiagnosticCommonKinds.inc.h
 CGVTT.o: StmtNodes.inc.h
 CGVTT.po: AttrList.inc.h
 CGVTT.po: Attrs.inc.h
+CGVTT.po: CommentCommandList.inc.h
 CGVTT.po: DeclNodes.inc.h
 CGVTT.po: DiagnosticCommonKinds.inc.h
 CGVTT.po: StmtNodes.inc.h
 CGVTables.o: AttrList.inc.h
 CGVTables.o: Attrs.inc.h
+CGVTables.o: CommentCommandList.inc.h
 CGVTables.o: DeclNodes.inc.h
 CGVTables.o: DiagnosticCommonKinds.inc.h
 CGVTables.o: StmtNodes.inc.h
 CGVTables.po: AttrList.inc.h
 CGVTables.po: Attrs.inc.h
+CGVTables.po: CommentCommandList.inc.h
 CGVTables.po: DeclNodes.inc.h
 CGVTables.po: DiagnosticCommonKinds.inc.h
 CGVTables.po: StmtNodes.inc.h
-CodeGenAction.o: AttrList.inc.h
-CodeGenAction.o: Attrs.inc.h
+CodeGenAction.o: CommentCommandList.inc.h
 CodeGenAction.o: DeclNodes.inc.h
 CodeGenAction.o: DiagnosticCommonKinds.inc.h
 CodeGenAction.o: DiagnosticFrontendKinds.inc.h
-CodeGenAction.po: AttrList.inc.h
-CodeGenAction.po: Attrs.inc.h
+CodeGenAction.o: StmtNodes.inc.h
+CodeGenAction.po: CommentCommandList.inc.h
 CodeGenAction.po: DeclNodes.inc.h
 CodeGenAction.po: DiagnosticCommonKinds.inc.h
 CodeGenAction.po: DiagnosticFrontendKinds.inc.h
+CodeGenAction.po: StmtNodes.inc.h
 CodeGenFunction.o: AttrList.inc.h
 CodeGenFunction.o: Attrs.inc.h
+CodeGenFunction.o: CommentCommandList.inc.h
 CodeGenFunction.o: DeclNodes.inc.h
 CodeGenFunction.o: DiagnosticCommonKinds.inc.h
 CodeGenFunction.o: Intrinsics.inc.h
 CodeGenFunction.o: StmtNodes.inc.h
 CodeGenFunction.po: AttrList.inc.h
 CodeGenFunction.po: Attrs.inc.h
+CodeGenFunction.po: CommentCommandList.inc.h
 CodeGenFunction.po: DeclNodes.inc.h
 CodeGenFunction.po: DiagnosticCommonKinds.inc.h
 CodeGenFunction.po: Intrinsics.inc.h
 CodeGenFunction.po: StmtNodes.inc.h
 CodeGenModule.o: AttrList.inc.h
 CodeGenModule.o: Attrs.inc.h
+CodeGenModule.o: CommentCommandList.inc.h
 CodeGenModule.o: DeclNodes.inc.h
 CodeGenModule.o: DiagnosticCommonKinds.inc.h
 CodeGenModule.o: Intrinsics.inc.h
 CodeGenModule.o: StmtNodes.inc.h
 CodeGenModule.po: AttrList.inc.h
 CodeGenModule.po: Attrs.inc.h
+CodeGenModule.po: CommentCommandList.inc.h
 CodeGenModule.po: DeclNodes.inc.h
 CodeGenModule.po: DiagnosticCommonKinds.inc.h
 CodeGenModule.po: Intrinsics.inc.h
 CodeGenModule.po: StmtNodes.inc.h
 CodeGenTBAA.o: AttrList.inc.h
 CodeGenTBAA.o: Attrs.inc.h
+CodeGenTBAA.o: CommentCommandList.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: CommentCommandList.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: CommentCommandList.inc.h
 CodeGenTypes.o: DeclNodes.inc.h
 CodeGenTypes.o: DiagnosticCommonKinds.inc.h
 CodeGenTypes.o: StmtNodes.inc.h
 CodeGenTypes.po: AttrList.inc.h
 CodeGenTypes.po: Attrs.inc.h
+CodeGenTypes.po: CommentCommandList.inc.h
 CodeGenTypes.po: DeclNodes.inc.h
 CodeGenTypes.po: DiagnosticCommonKinds.inc.h
 CodeGenTypes.po: StmtNodes.inc.h
 ItaniumCXXABI.o: AttrList.inc.h
 ItaniumCXXABI.o: Attrs.inc.h
+ItaniumCXXABI.o: CommentCommandList.inc.h
 ItaniumCXXABI.o: DeclNodes.inc.h
 ItaniumCXXABI.o: DiagnosticCommonKinds.inc.h
 ItaniumCXXABI.o: Intrinsics.inc.h
 ItaniumCXXABI.o: StmtNodes.inc.h
 ItaniumCXXABI.po: AttrList.inc.h
 ItaniumCXXABI.po: Attrs.inc.h
+ItaniumCXXABI.po: CommentCommandList.inc.h
 ItaniumCXXABI.po: DeclNodes.inc.h
 ItaniumCXXABI.po: DiagnosticCommonKinds.inc.h
 ItaniumCXXABI.po: Intrinsics.inc.h
 ItaniumCXXABI.po: StmtNodes.inc.h
 MicrosoftCXXABI.o: AttrList.inc.h
 MicrosoftCXXABI.o: Attrs.inc.h
+MicrosoftCXXABI.o: CommentCommandList.inc.h
 MicrosoftCXXABI.o: DeclNodes.inc.h
 MicrosoftCXXABI.o: DiagnosticCommonKinds.inc.h
 MicrosoftCXXABI.o: StmtNodes.inc.h
 MicrosoftCXXABI.po: AttrList.inc.h
 MicrosoftCXXABI.po: Attrs.inc.h
+MicrosoftCXXABI.po: CommentCommandList.inc.h
 MicrosoftCXXABI.po: DeclNodes.inc.h
 MicrosoftCXXABI.po: DiagnosticCommonKinds.inc.h
 MicrosoftCXXABI.po: StmtNodes.inc.h
 ModuleBuilder.o: AttrList.inc.h
 ModuleBuilder.o: Attrs.inc.h
+ModuleBuilder.o: CommentCommandList.inc.h
 ModuleBuilder.o: DeclNodes.inc.h
 ModuleBuilder.o: DiagnosticCommonKinds.inc.h
 ModuleBuilder.o: StmtNodes.inc.h
 ModuleBuilder.po: AttrList.inc.h
 ModuleBuilder.po: Attrs.inc.h
+ModuleBuilder.po: CommentCommandList.inc.h
 ModuleBuilder.po: DeclNodes.inc.h
 ModuleBuilder.po: DiagnosticCommonKinds.inc.h
 ModuleBuilder.po: StmtNodes.inc.h
 TargetInfo.o: AttrList.inc.h
 TargetInfo.o: Attrs.inc.h
+TargetInfo.o: CommentCommandList.inc.h
 TargetInfo.o: DeclNodes.inc.h
 TargetInfo.o: DiagnosticCommonKinds.inc.h
 TargetInfo.o: StmtNodes.inc.h
 TargetInfo.po: AttrList.inc.h
 TargetInfo.po: Attrs.inc.h
+TargetInfo.po: CommentCommandList.inc.h
 TargetInfo.po: DeclNodes.inc.h
 TargetInfo.po: DiagnosticCommonKinds.inc.h
 TargetInfo.po: StmtNodes.inc.h
diff --git a/lib/clang/libclangdriver/Makefile.depend b/lib/clang/libclangdriver/Makefile.depend
index ec0ab5d..1859c3b 100644
--- a/lib/clang/libclangdriver/Makefile.depend
+++ b/lib/clang/libclangdriver/Makefile.depend
@@ -8,6 +8,7 @@ DIRDEPS = \
 	include \
 	include/xlocale \
 	lib/msun \
+	usr.bin/clang/clang-tblgen.host \
 
 
 .include <dirdeps.mk>
@@ -55,7 +56,9 @@ Tools.po: DiagnosticCommonKinds.inc.h
 Tools.po: DiagnosticDriverKinds.inc.h
 Tools.po: Options.inc.h
 WindowsToolChain.o: DiagnosticCommonKinds.inc.h
+WindowsToolChain.o: DiagnosticDriverKinds.inc.h
 WindowsToolChain.o: Options.inc.h
 WindowsToolChain.po: DiagnosticCommonKinds.inc.h
+WindowsToolChain.po: DiagnosticDriverKinds.inc.h
 WindowsToolChain.po: Options.inc.h
 .endif
diff --git a/lib/clang/libclangedit/Makefile.depend b/lib/clang/libclangedit/Makefile.depend
index 9bacc88..2781622 100644
--- a/lib/clang/libclangedit/Makefile.depend
+++ b/lib/clang/libclangedit/Makefile.depend
@@ -8,6 +8,7 @@ DIRDEPS = \
 	include \
 	include/xlocale \
 	lib/msun \
+	usr.bin/clang/clang-tblgen.host \
 
 
 .include <dirdeps.mk>
@@ -16,13 +17,11 @@ DIRDEPS = \
 # local dependencies - needed for -jN in clean tree
 Commit.o: DiagnosticCommonKinds.inc.h
 Commit.po: DiagnosticCommonKinds.inc.h
-RewriteObjCFoundationAPI.o: AttrList.inc.h
-RewriteObjCFoundationAPI.o: Attrs.inc.h
+RewriteObjCFoundationAPI.o: CommentCommandList.inc.h
 RewriteObjCFoundationAPI.o: DeclNodes.inc.h
 RewriteObjCFoundationAPI.o: DiagnosticCommonKinds.inc.h
 RewriteObjCFoundationAPI.o: StmtNodes.inc.h
-RewriteObjCFoundationAPI.po: AttrList.inc.h
-RewriteObjCFoundationAPI.po: Attrs.inc.h
+RewriteObjCFoundationAPI.po: CommentCommandList.inc.h
 RewriteObjCFoundationAPI.po: DeclNodes.inc.h
 RewriteObjCFoundationAPI.po: DiagnosticCommonKinds.inc.h
 RewriteObjCFoundationAPI.po: StmtNodes.inc.h
diff --git a/lib/clang/libclangfrontend/Makefile.depend b/lib/clang/libclangfrontend/Makefile.depend
index ec1859e..7191baf 100644
--- a/lib/clang/libclangfrontend/Makefile.depend
+++ b/lib/clang/libclangfrontend/Makefile.depend
@@ -8,25 +8,25 @@ DIRDEPS = \
 	include \
 	include/xlocale \
 	lib/msun \
+	usr.bin/clang/clang-tblgen.host \
 
 
 .include <dirdeps.mk>
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
-ASTConsumers.o: AttrList.inc.h
-ASTConsumers.o: Attrs.inc.h
+ASTConsumers.o: CommentCommandList.inc.h
 ASTConsumers.o: DeclNodes.inc.h
 ASTConsumers.o: DiagnosticCommonKinds.inc.h
 ASTConsumers.o: StmtNodes.inc.h
-ASTConsumers.po: AttrList.inc.h
-ASTConsumers.po: Attrs.inc.h
+ASTConsumers.po: CommentCommandList.inc.h
 ASTConsumers.po: DeclNodes.inc.h
 ASTConsumers.po: DiagnosticCommonKinds.inc.h
 ASTConsumers.po: StmtNodes.inc.h
 ASTMerge.o: AttrList.inc.h
 ASTMerge.o: AttrParsedAttrList.inc.h
 ASTMerge.o: Attrs.inc.h
+ASTMerge.o: CommentCommandList.inc.h
 ASTMerge.o: DeclNodes.inc.h
 ASTMerge.o: DiagnosticASTKinds.inc.h
 ASTMerge.o: DiagnosticCommonKinds.inc.h
@@ -34,6 +34,7 @@ ASTMerge.o: StmtNodes.inc.h
 ASTMerge.po: AttrList.inc.h
 ASTMerge.po: AttrParsedAttrList.inc.h
 ASTMerge.po: Attrs.inc.h
+ASTMerge.po: CommentCommandList.inc.h
 ASTMerge.po: DeclNodes.inc.h
 ASTMerge.po: DiagnosticASTKinds.inc.h
 ASTMerge.po: DiagnosticCommonKinds.inc.h
@@ -41,6 +42,7 @@ ASTMerge.po: StmtNodes.inc.h
 ASTUnit.o: AttrList.inc.h
 ASTUnit.o: AttrParsedAttrList.inc.h
 ASTUnit.o: Attrs.inc.h
+ASTUnit.o: CommentCommandList.inc.h
 ASTUnit.o: DeclNodes.inc.h
 ASTUnit.o: DiagnosticCommonKinds.inc.h
 ASTUnit.o: DiagnosticFrontendKinds.inc.h
@@ -48,6 +50,7 @@ ASTUnit.o: StmtNodes.inc.h
 ASTUnit.po: AttrList.inc.h
 ASTUnit.po: AttrParsedAttrList.inc.h
 ASTUnit.po: Attrs.inc.h
+ASTUnit.po: CommentCommandList.inc.h
 ASTUnit.po: DeclNodes.inc.h
 ASTUnit.po: DiagnosticCommonKinds.inc.h
 ASTUnit.po: DiagnosticFrontendKinds.inc.h
@@ -59,18 +62,21 @@ ChainedDiagnosticConsumer.po: DiagnosticCommonKinds.inc.h
 ChainedIncludesSource.o: AttrList.inc.h
 ChainedIncludesSource.o: AttrParsedAttrList.inc.h
 ChainedIncludesSource.o: Attrs.inc.h
+ChainedIncludesSource.o: CommentCommandList.inc.h
 ChainedIncludesSource.o: DeclNodes.inc.h
 ChainedIncludesSource.o: DiagnosticCommonKinds.inc.h
 ChainedIncludesSource.o: StmtNodes.inc.h
 ChainedIncludesSource.po: AttrList.inc.h
 ChainedIncludesSource.po: AttrParsedAttrList.inc.h
 ChainedIncludesSource.po: Attrs.inc.h
+ChainedIncludesSource.po: CommentCommandList.inc.h
 ChainedIncludesSource.po: DeclNodes.inc.h
 ChainedIncludesSource.po: DiagnosticCommonKinds.inc.h
 ChainedIncludesSource.po: StmtNodes.inc.h
 CompilerInstance.o: AttrList.inc.h
 CompilerInstance.o: AttrParsedAttrList.inc.h
 CompilerInstance.o: Attrs.inc.h
+CompilerInstance.o: CommentCommandList.inc.h
 CompilerInstance.o: DeclNodes.inc.h
 CompilerInstance.o: DiagnosticCommonKinds.inc.h
 CompilerInstance.o: DiagnosticFrontendKinds.inc.h
@@ -78,18 +84,15 @@ CompilerInstance.o: StmtNodes.inc.h
 CompilerInstance.po: AttrList.inc.h
 CompilerInstance.po: AttrParsedAttrList.inc.h
 CompilerInstance.po: Attrs.inc.h
+CompilerInstance.po: CommentCommandList.inc.h
 CompilerInstance.po: DeclNodes.inc.h
 CompilerInstance.po: DiagnosticCommonKinds.inc.h
 CompilerInstance.po: DiagnosticFrontendKinds.inc.h
 CompilerInstance.po: StmtNodes.inc.h
-CompilerInvocation.o: AttrList.inc.h
-CompilerInvocation.o: Attrs.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: DeclNodes.inc.h
 CompilerInvocation.po: DiagnosticCommonKinds.inc.h
 CompilerInvocation.po: DiagnosticDriverKinds.inc.h
@@ -115,6 +118,7 @@ DiagnosticRenderer.po: DiagnosticCommonKinds.inc.h
 FrontendAction.o: AttrList.inc.h
 FrontendAction.o: AttrParsedAttrList.inc.h
 FrontendAction.o: Attrs.inc.h
+FrontendAction.o: CommentCommandList.inc.h
 FrontendAction.o: DeclNodes.inc.h
 FrontendAction.o: DiagnosticCommonKinds.inc.h
 FrontendAction.o: DiagnosticFrontendKinds.inc.h
@@ -122,6 +126,7 @@ FrontendAction.o: StmtNodes.inc.h
 FrontendAction.po: AttrList.inc.h
 FrontendAction.po: AttrParsedAttrList.inc.h
 FrontendAction.po: Attrs.inc.h
+FrontendAction.po: CommentCommandList.inc.h
 FrontendAction.po: DeclNodes.inc.h
 FrontendAction.po: DiagnosticCommonKinds.inc.h
 FrontendAction.po: DiagnosticFrontendKinds.inc.h
@@ -129,6 +134,7 @@ FrontendAction.po: StmtNodes.inc.h
 FrontendActions.o: AttrList.inc.h
 FrontendActions.o: AttrParsedAttrList.inc.h
 FrontendActions.o: Attrs.inc.h
+FrontendActions.o: CommentCommandList.inc.h
 FrontendActions.o: DeclNodes.inc.h
 FrontendActions.o: DiagnosticCommonKinds.inc.h
 FrontendActions.o: DiagnosticFrontendKinds.inc.h
@@ -136,6 +142,7 @@ FrontendActions.o: StmtNodes.inc.h
 FrontendActions.po: AttrList.inc.h
 FrontendActions.po: AttrParsedAttrList.inc.h
 FrontendActions.po: Attrs.inc.h
+FrontendActions.po: CommentCommandList.inc.h
 FrontendActions.po: DeclNodes.inc.h
 FrontendActions.po: DiagnosticCommonKinds.inc.h
 FrontendActions.po: DiagnosticFrontendKinds.inc.h
@@ -146,22 +153,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
-LayoutOverrideSource.o: Attrs.inc.h
 LayoutOverrideSource.o: DeclNodes.inc.h
 LayoutOverrideSource.o: DiagnosticCommonKinds.inc.h
-LayoutOverrideSource.po: AttrList.inc.h
-LayoutOverrideSource.po: Attrs.inc.h
 LayoutOverrideSource.po: DeclNodes.inc.h
 LayoutOverrideSource.po: DiagnosticCommonKinds.inc.h
 LogDiagnosticPrinter.o: DiagnosticCommonKinds.inc.h
diff --git a/lib/clang/libclangfrontendtool/Makefile.depend b/lib/clang/libclangfrontendtool/Makefile.depend
index 94f1694..e69aaa5 100644
--- a/lib/clang/libclangfrontendtool/Makefile.depend
+++ b/lib/clang/libclangfrontendtool/Makefile.depend
@@ -8,6 +8,7 @@ DIRDEPS = \
 	include \
 	include/xlocale \
 	lib/msun \
+	usr.bin/clang/clang-tblgen.host \
 
 
 .include <dirdeps.mk>
diff --git a/lib/clang/libclanglex/Makefile.depend b/lib/clang/libclanglex/Makefile.depend
index 5835901..7c8859d 100644
--- a/lib/clang/libclanglex/Makefile.depend
+++ b/lib/clang/libclanglex/Makefile.depend
@@ -9,6 +9,7 @@ DIRDEPS = \
 	include/xlocale \
 	lib/clang/include \
 	lib/msun \
+	usr.bin/clang/clang-tblgen.host \
 
 
 .include <dirdeps.mk>
@@ -39,6 +40,8 @@ PPCaching.o: DiagnosticCommonKinds.inc.h
 PPCaching.po: DiagnosticCommonKinds.inc.h
 PPCallbacks.o: DiagnosticCommonKinds.inc.h
 PPCallbacks.po: DiagnosticCommonKinds.inc.h
+PPConditionalDirectiveRecord.o: DiagnosticCommonKinds.inc.h
+PPConditionalDirectiveRecord.po: DiagnosticCommonKinds.inc.h
 PPDirectives.o: DiagnosticCommonKinds.inc.h
 PPDirectives.o: DiagnosticLexKinds.inc.h
 PPDirectives.po: DiagnosticCommonKinds.inc.h
diff --git a/lib/clang/libclangparse/Makefile.depend b/lib/clang/libclangparse/Makefile.depend
index ad1985d..0b7d67a 100644
--- a/lib/clang/libclangparse/Makefile.depend
+++ b/lib/clang/libclangparse/Makefile.depend
@@ -8,6 +8,7 @@ DIRDEPS = \
 	include \
 	include/xlocale \
 	lib/msun \
+	usr.bin/clang/clang-tblgen.host \
 
 
 .include <dirdeps.mk>
@@ -17,6 +18,7 @@ DIRDEPS = \
 ParseAST.o: AttrList.inc.h
 ParseAST.o: AttrParsedAttrList.inc.h
 ParseAST.o: Attrs.inc.h
+ParseAST.o: CommentCommandList.inc.h
 ParseAST.o: DeclNodes.inc.h
 ParseAST.o: DiagnosticCommonKinds.inc.h
 ParseAST.o: DiagnosticParseKinds.inc.h
@@ -24,6 +26,7 @@ ParseAST.o: StmtNodes.inc.h
 ParseAST.po: AttrList.inc.h
 ParseAST.po: AttrParsedAttrList.inc.h
 ParseAST.po: Attrs.inc.h
+ParseAST.po: CommentCommandList.inc.h
 ParseAST.po: DeclNodes.inc.h
 ParseAST.po: DiagnosticCommonKinds.inc.h
 ParseAST.po: DiagnosticParseKinds.inc.h
@@ -42,6 +45,7 @@ ParseCXXInlineMethods.po: DeclNodes.inc.h
 ParseCXXInlineMethods.po: DiagnosticCommonKinds.inc.h
 ParseCXXInlineMethods.po: DiagnosticParseKinds.inc.h
 ParseCXXInlineMethods.po: StmtNodes.inc.h
+ParseDecl.o: AttrExprArgs.inc.h
 ParseDecl.o: AttrLateParsed.inc.h
 ParseDecl.o: AttrList.inc.h
 ParseDecl.o: AttrParsedAttrList.inc.h
@@ -50,6 +54,7 @@ ParseDecl.o: DeclNodes.inc.h
 ParseDecl.o: DiagnosticCommonKinds.inc.h
 ParseDecl.o: DiagnosticParseKinds.inc.h
 ParseDecl.o: StmtNodes.inc.h
+ParseDecl.po: AttrExprArgs.inc.h
 ParseDecl.po: AttrLateParsed.inc.h
 ParseDecl.po: AttrList.inc.h
 ParseDecl.po: AttrParsedAttrList.inc.h
@@ -130,6 +135,20 @@ ParseObjc.po: DeclNodes.inc.h
 ParseObjc.po: DiagnosticCommonKinds.inc.h
 ParseObjc.po: DiagnosticParseKinds.inc.h
 ParseObjc.po: StmtNodes.inc.h
+ParseOpenMP.o: AttrList.inc.h
+ParseOpenMP.o: AttrParsedAttrList.inc.h
+ParseOpenMP.o: Attrs.inc.h
+ParseOpenMP.o: DeclNodes.inc.h
+ParseOpenMP.o: DiagnosticCommonKinds.inc.h
+ParseOpenMP.o: DiagnosticParseKinds.inc.h
+ParseOpenMP.o: StmtNodes.inc.h
+ParseOpenMP.po: AttrList.inc.h
+ParseOpenMP.po: AttrParsedAttrList.inc.h
+ParseOpenMP.po: Attrs.inc.h
+ParseOpenMP.po: DeclNodes.inc.h
+ParseOpenMP.po: DiagnosticCommonKinds.inc.h
+ParseOpenMP.po: DiagnosticParseKinds.inc.h
+ParseOpenMP.po: StmtNodes.inc.h
 ParsePragma.o: AttrList.inc.h
 ParsePragma.o: AttrParsedAttrList.inc.h
 ParsePragma.o: Attrs.inc.h
@@ -147,6 +166,7 @@ ParsePragma.po: StmtNodes.inc.h
 ParseStmt.o: AttrList.inc.h
 ParseStmt.o: AttrParsedAttrList.inc.h
 ParseStmt.o: Attrs.inc.h
+ParseStmt.o: CommentCommandList.inc.h
 ParseStmt.o: DeclNodes.inc.h
 ParseStmt.o: DiagnosticCommonKinds.inc.h
 ParseStmt.o: DiagnosticParseKinds.inc.h
@@ -154,6 +174,7 @@ ParseStmt.o: StmtNodes.inc.h
 ParseStmt.po: AttrList.inc.h
 ParseStmt.po: AttrParsedAttrList.inc.h
 ParseStmt.po: Attrs.inc.h
+ParseStmt.po: CommentCommandList.inc.h
 ParseStmt.po: DeclNodes.inc.h
 ParseStmt.po: DiagnosticCommonKinds.inc.h
 ParseStmt.po: DiagnosticParseKinds.inc.h
diff --git a/lib/clang/libclangsema/Makefile.depend b/lib/clang/libclangsema/Makefile.depend
index 8dc76e0..f06a41d 100644
--- a/lib/clang/libclangsema/Makefile.depend
+++ b/lib/clang/libclangsema/Makefile.depend
@@ -8,6 +8,7 @@ DIRDEPS = \
 	include \
 	include/xlocale \
 	lib/msun \
+	usr.bin/clang/clang-tblgen.host \
 
 
 .include <dirdeps.mk>
@@ -17,6 +18,7 @@ DIRDEPS = \
 AnalysisBasedWarnings.o: AttrList.inc.h
 AnalysisBasedWarnings.o: AttrParsedAttrList.inc.h
 AnalysisBasedWarnings.o: Attrs.inc.h
+AnalysisBasedWarnings.o: CommentCommandList.inc.h
 AnalysisBasedWarnings.o: DeclNodes.inc.h
 AnalysisBasedWarnings.o: DiagnosticCommonKinds.inc.h
 AnalysisBasedWarnings.o: DiagnosticSemaKinds.inc.h
@@ -24,21 +26,22 @@ AnalysisBasedWarnings.o: StmtNodes.inc.h
 AnalysisBasedWarnings.po: AttrList.inc.h
 AnalysisBasedWarnings.po: AttrParsedAttrList.inc.h
 AnalysisBasedWarnings.po: Attrs.inc.h
+AnalysisBasedWarnings.po: CommentCommandList.inc.h
 AnalysisBasedWarnings.po: DeclNodes.inc.h
 AnalysisBasedWarnings.po: DiagnosticCommonKinds.inc.h
 AnalysisBasedWarnings.po: DiagnosticSemaKinds.inc.h
 AnalysisBasedWarnings.po: StmtNodes.inc.h
-AttributeList.o: AttrList.inc.h
 AttributeList.o: AttrParsedAttrKinds.inc.h
 AttributeList.o: AttrParsedAttrList.inc.h
-AttributeList.o: Attrs.inc.h
+AttributeList.o: AttrSpellingListIndex.inc.h
+AttributeList.o: CommentCommandList.inc.h
 AttributeList.o: DeclNodes.inc.h
 AttributeList.o: DiagnosticCommonKinds.inc.h
 AttributeList.o: StmtNodes.inc.h
-AttributeList.po: AttrList.inc.h
 AttributeList.po: AttrParsedAttrKinds.inc.h
 AttributeList.po: AttrParsedAttrList.inc.h
-AttributeList.po: Attrs.inc.h
+AttributeList.po: AttrSpellingListIndex.inc.h
+AttributeList.po: CommentCommandList.inc.h
 AttributeList.po: DeclNodes.inc.h
 AttributeList.po: DiagnosticCommonKinds.inc.h
 AttributeList.po: StmtNodes.inc.h
@@ -57,6 +60,7 @@ CodeCompleteConsumer.po: StmtNodes.inc.h
 DeclSpec.o: AttrList.inc.h
 DeclSpec.o: AttrParsedAttrList.inc.h
 DeclSpec.o: Attrs.inc.h
+DeclSpec.o: CommentCommandList.inc.h
 DeclSpec.o: DeclNodes.inc.h
 DeclSpec.o: DiagnosticCommonKinds.inc.h
 DeclSpec.o: DiagnosticParseKinds.inc.h
@@ -65,6 +69,7 @@ DeclSpec.o: StmtNodes.inc.h
 DeclSpec.po: AttrList.inc.h
 DeclSpec.po: AttrParsedAttrList.inc.h
 DeclSpec.po: Attrs.inc.h
+DeclSpec.po: CommentCommandList.inc.h
 DeclSpec.po: DeclNodes.inc.h
 DeclSpec.po: DiagnosticCommonKinds.inc.h
 DeclSpec.po: DiagnosticParseKinds.inc.h
@@ -82,17 +87,14 @@ DelayedDiagnostic.po: Attrs.inc.h
 DelayedDiagnostic.po: DeclNodes.inc.h
 DelayedDiagnostic.po: DiagnosticCommonKinds.inc.h
 DelayedDiagnostic.po: StmtNodes.inc.h
-IdentifierResolver.o: AttrList.inc.h
-IdentifierResolver.o: Attrs.inc.h
 IdentifierResolver.o: DeclNodes.inc.h
 IdentifierResolver.o: DiagnosticCommonKinds.inc.h
-IdentifierResolver.po: AttrList.inc.h
-IdentifierResolver.po: Attrs.inc.h
 IdentifierResolver.po: DeclNodes.inc.h
 IdentifierResolver.po: DiagnosticCommonKinds.inc.h
 JumpDiagnostics.o: AttrList.inc.h
 JumpDiagnostics.o: AttrParsedAttrList.inc.h
 JumpDiagnostics.o: Attrs.inc.h
+JumpDiagnostics.o: CommentCommandList.inc.h
 JumpDiagnostics.o: DeclNodes.inc.h
 JumpDiagnostics.o: DiagnosticCommonKinds.inc.h
 JumpDiagnostics.o: DiagnosticSemaKinds.inc.h
@@ -100,6 +102,7 @@ JumpDiagnostics.o: StmtNodes.inc.h
 JumpDiagnostics.po: AttrList.inc.h
 JumpDiagnostics.po: AttrParsedAttrList.inc.h
 JumpDiagnostics.po: Attrs.inc.h
+JumpDiagnostics.po: CommentCommandList.inc.h
 JumpDiagnostics.po: DeclNodes.inc.h
 JumpDiagnostics.po: DiagnosticCommonKinds.inc.h
 JumpDiagnostics.po: DiagnosticSemaKinds.inc.h
@@ -118,19 +121,16 @@ 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
+Sema.o: CommentCommandList.inc.h
 Sema.o: DeclNodes.inc.h
 Sema.o: DiagnosticASTKinds.inc.h
 Sema.o: DiagnosticCommonKinds.inc.h
@@ -139,6 +139,7 @@ Sema.o: StmtNodes.inc.h
 Sema.po: AttrList.inc.h
 Sema.po: AttrParsedAttrList.inc.h
 Sema.po: Attrs.inc.h
+Sema.po: CommentCommandList.inc.h
 Sema.po: DeclNodes.inc.h
 Sema.po: DiagnosticASTKinds.inc.h
 Sema.po: DiagnosticCommonKinds.inc.h
@@ -147,6 +148,7 @@ Sema.po: StmtNodes.inc.h
 SemaAccess.o: AttrList.inc.h
 SemaAccess.o: AttrParsedAttrList.inc.h
 SemaAccess.o: Attrs.inc.h
+SemaAccess.o: CommentCommandList.inc.h
 SemaAccess.o: DeclNodes.inc.h
 SemaAccess.o: DiagnosticCommonKinds.inc.h
 SemaAccess.o: DiagnosticSemaKinds.inc.h
@@ -154,6 +156,7 @@ SemaAccess.o: StmtNodes.inc.h
 SemaAccess.po: AttrList.inc.h
 SemaAccess.po: AttrParsedAttrList.inc.h
 SemaAccess.po: Attrs.inc.h
+SemaAccess.po: CommentCommandList.inc.h
 SemaAccess.po: DeclNodes.inc.h
 SemaAccess.po: DiagnosticCommonKinds.inc.h
 SemaAccess.po: DiagnosticSemaKinds.inc.h
@@ -161,6 +164,7 @@ SemaAccess.po: StmtNodes.inc.h
 SemaAttr.o: AttrList.inc.h
 SemaAttr.o: AttrParsedAttrList.inc.h
 SemaAttr.o: Attrs.inc.h
+SemaAttr.o: CommentCommandList.inc.h
 SemaAttr.o: DeclNodes.inc.h
 SemaAttr.o: DiagnosticCommonKinds.inc.h
 SemaAttr.o: DiagnosticSemaKinds.inc.h
@@ -168,6 +172,7 @@ SemaAttr.o: StmtNodes.inc.h
 SemaAttr.po: AttrList.inc.h
 SemaAttr.po: AttrParsedAttrList.inc.h
 SemaAttr.po: Attrs.inc.h
+SemaAttr.po: CommentCommandList.inc.h
 SemaAttr.po: DeclNodes.inc.h
 SemaAttr.po: DiagnosticCommonKinds.inc.h
 SemaAttr.po: DiagnosticSemaKinds.inc.h
@@ -175,6 +180,7 @@ SemaAttr.po: StmtNodes.inc.h
 SemaCXXScopeSpec.o: AttrList.inc.h
 SemaCXXScopeSpec.o: AttrParsedAttrList.inc.h
 SemaCXXScopeSpec.o: Attrs.inc.h
+SemaCXXScopeSpec.o: CommentCommandList.inc.h
 SemaCXXScopeSpec.o: DeclNodes.inc.h
 SemaCXXScopeSpec.o: DiagnosticCommonKinds.inc.h
 SemaCXXScopeSpec.o: DiagnosticSemaKinds.inc.h
@@ -182,6 +188,7 @@ SemaCXXScopeSpec.o: StmtNodes.inc.h
 SemaCXXScopeSpec.po: AttrList.inc.h
 SemaCXXScopeSpec.po: AttrParsedAttrList.inc.h
 SemaCXXScopeSpec.po: Attrs.inc.h
+SemaCXXScopeSpec.po: CommentCommandList.inc.h
 SemaCXXScopeSpec.po: DeclNodes.inc.h
 SemaCXXScopeSpec.po: DiagnosticCommonKinds.inc.h
 SemaCXXScopeSpec.po: DiagnosticSemaKinds.inc.h
@@ -189,6 +196,7 @@ SemaCXXScopeSpec.po: StmtNodes.inc.h
 SemaCast.o: AttrList.inc.h
 SemaCast.o: AttrParsedAttrList.inc.h
 SemaCast.o: Attrs.inc.h
+SemaCast.o: CommentCommandList.inc.h
 SemaCast.o: DeclNodes.inc.h
 SemaCast.o: DiagnosticCommonKinds.inc.h
 SemaCast.o: DiagnosticSemaKinds.inc.h
@@ -196,6 +204,7 @@ SemaCast.o: StmtNodes.inc.h
 SemaCast.po: AttrList.inc.h
 SemaCast.po: AttrParsedAttrList.inc.h
 SemaCast.po: Attrs.inc.h
+SemaCast.po: CommentCommandList.inc.h
 SemaCast.po: DeclNodes.inc.h
 SemaCast.po: DiagnosticCommonKinds.inc.h
 SemaCast.po: DiagnosticSemaKinds.inc.h
@@ -203,6 +212,7 @@ SemaCast.po: StmtNodes.inc.h
 SemaChecking.o: AttrList.inc.h
 SemaChecking.o: AttrParsedAttrList.inc.h
 SemaChecking.o: Attrs.inc.h
+SemaChecking.o: CommentCommandList.inc.h
 SemaChecking.o: DeclNodes.inc.h
 SemaChecking.o: DiagnosticCommonKinds.inc.h
 SemaChecking.o: DiagnosticSemaKinds.inc.h
@@ -211,6 +221,7 @@ SemaChecking.o: arm_neon.inc.h
 SemaChecking.po: AttrList.inc.h
 SemaChecking.po: AttrParsedAttrList.inc.h
 SemaChecking.po: Attrs.inc.h
+SemaChecking.po: CommentCommandList.inc.h
 SemaChecking.po: DeclNodes.inc.h
 SemaChecking.po: DiagnosticCommonKinds.inc.h
 SemaChecking.po: DiagnosticSemaKinds.inc.h
@@ -219,6 +230,7 @@ SemaChecking.po: arm_neon.inc.h
 SemaCodeComplete.o: AttrList.inc.h
 SemaCodeComplete.o: AttrParsedAttrList.inc.h
 SemaCodeComplete.o: Attrs.inc.h
+SemaCodeComplete.o: CommentCommandList.inc.h
 SemaCodeComplete.o: DeclNodes.inc.h
 SemaCodeComplete.o: DiagnosticCommonKinds.inc.h
 SemaCodeComplete.o: DiagnosticSemaKinds.inc.h
@@ -226,6 +238,7 @@ SemaCodeComplete.o: StmtNodes.inc.h
 SemaCodeComplete.po: AttrList.inc.h
 SemaCodeComplete.po: AttrParsedAttrList.inc.h
 SemaCodeComplete.po: Attrs.inc.h
+SemaCodeComplete.po: CommentCommandList.inc.h
 SemaCodeComplete.po: DeclNodes.inc.h
 SemaCodeComplete.po: DiagnosticCommonKinds.inc.h
 SemaCodeComplete.po: DiagnosticSemaKinds.inc.h
@@ -233,6 +246,7 @@ SemaCodeComplete.po: StmtNodes.inc.h
 SemaDecl.o: AttrList.inc.h
 SemaDecl.o: AttrParsedAttrList.inc.h
 SemaDecl.o: Attrs.inc.h
+SemaDecl.o: CommentCommandList.inc.h
 SemaDecl.o: DeclNodes.inc.h
 SemaDecl.o: DiagnosticCommentKinds.inc.h
 SemaDecl.o: DiagnosticCommonKinds.inc.h
@@ -242,6 +256,7 @@ SemaDecl.o: StmtNodes.inc.h
 SemaDecl.po: AttrList.inc.h
 SemaDecl.po: AttrParsedAttrList.inc.h
 SemaDecl.po: Attrs.inc.h
+SemaDecl.po: CommentCommandList.inc.h
 SemaDecl.po: DeclNodes.inc.h
 SemaDecl.po: DiagnosticCommentKinds.inc.h
 SemaDecl.po: DiagnosticCommonKinds.inc.h
@@ -251,6 +266,7 @@ SemaDecl.po: StmtNodes.inc.h
 SemaDeclAttr.o: AttrList.inc.h
 SemaDeclAttr.o: AttrParsedAttrList.inc.h
 SemaDeclAttr.o: Attrs.inc.h
+SemaDeclAttr.o: CommentCommandList.inc.h
 SemaDeclAttr.o: DeclNodes.inc.h
 SemaDeclAttr.o: DiagnosticCommonKinds.inc.h
 SemaDeclAttr.o: DiagnosticSemaKinds.inc.h
@@ -258,6 +274,7 @@ SemaDeclAttr.o: StmtNodes.inc.h
 SemaDeclAttr.po: AttrList.inc.h
 SemaDeclAttr.po: AttrParsedAttrList.inc.h
 SemaDeclAttr.po: Attrs.inc.h
+SemaDeclAttr.po: CommentCommandList.inc.h
 SemaDeclAttr.po: DeclNodes.inc.h
 SemaDeclAttr.po: DiagnosticCommonKinds.inc.h
 SemaDeclAttr.po: DiagnosticSemaKinds.inc.h
@@ -265,6 +282,7 @@ SemaDeclAttr.po: StmtNodes.inc.h
 SemaDeclCXX.o: AttrList.inc.h
 SemaDeclCXX.o: AttrParsedAttrList.inc.h
 SemaDeclCXX.o: Attrs.inc.h
+SemaDeclCXX.o: CommentCommandList.inc.h
 SemaDeclCXX.o: DeclNodes.inc.h
 SemaDeclCXX.o: DiagnosticCommonKinds.inc.h
 SemaDeclCXX.o: DiagnosticSemaKinds.inc.h
@@ -272,6 +290,7 @@ SemaDeclCXX.o: StmtNodes.inc.h
 SemaDeclCXX.po: AttrList.inc.h
 SemaDeclCXX.po: AttrParsedAttrList.inc.h
 SemaDeclCXX.po: Attrs.inc.h
+SemaDeclCXX.po: CommentCommandList.inc.h
 SemaDeclCXX.po: DeclNodes.inc.h
 SemaDeclCXX.po: DiagnosticCommonKinds.inc.h
 SemaDeclCXX.po: DiagnosticSemaKinds.inc.h
@@ -279,6 +298,7 @@ SemaDeclCXX.po: StmtNodes.inc.h
 SemaDeclObjC.o: AttrList.inc.h
 SemaDeclObjC.o: AttrParsedAttrList.inc.h
 SemaDeclObjC.o: Attrs.inc.h
+SemaDeclObjC.o: CommentCommandList.inc.h
 SemaDeclObjC.o: DeclNodes.inc.h
 SemaDeclObjC.o: DiagnosticCommonKinds.inc.h
 SemaDeclObjC.o: DiagnosticSemaKinds.inc.h
@@ -286,6 +306,7 @@ SemaDeclObjC.o: StmtNodes.inc.h
 SemaDeclObjC.po: AttrList.inc.h
 SemaDeclObjC.po: AttrParsedAttrList.inc.h
 SemaDeclObjC.po: Attrs.inc.h
+SemaDeclObjC.po: CommentCommandList.inc.h
 SemaDeclObjC.po: DeclNodes.inc.h
 SemaDeclObjC.po: DiagnosticCommonKinds.inc.h
 SemaDeclObjC.po: DiagnosticSemaKinds.inc.h
@@ -293,6 +314,7 @@ SemaDeclObjC.po: StmtNodes.inc.h
 SemaExceptionSpec.o: AttrList.inc.h
 SemaExceptionSpec.o: AttrParsedAttrList.inc.h
 SemaExceptionSpec.o: Attrs.inc.h
+SemaExceptionSpec.o: CommentCommandList.inc.h
 SemaExceptionSpec.o: DeclNodes.inc.h
 SemaExceptionSpec.o: DiagnosticCommonKinds.inc.h
 SemaExceptionSpec.o: DiagnosticSemaKinds.inc.h
@@ -300,6 +322,7 @@ SemaExceptionSpec.o: StmtNodes.inc.h
 SemaExceptionSpec.po: AttrList.inc.h
 SemaExceptionSpec.po: AttrParsedAttrList.inc.h
 SemaExceptionSpec.po: Attrs.inc.h
+SemaExceptionSpec.po: CommentCommandList.inc.h
 SemaExceptionSpec.po: DeclNodes.inc.h
 SemaExceptionSpec.po: DiagnosticCommonKinds.inc.h
 SemaExceptionSpec.po: DiagnosticSemaKinds.inc.h
@@ -307,6 +330,7 @@ SemaExceptionSpec.po: StmtNodes.inc.h
 SemaExpr.o: AttrList.inc.h
 SemaExpr.o: AttrParsedAttrList.inc.h
 SemaExpr.o: Attrs.inc.h
+SemaExpr.o: CommentCommandList.inc.h
 SemaExpr.o: DeclNodes.inc.h
 SemaExpr.o: DiagnosticCommonKinds.inc.h
 SemaExpr.o: DiagnosticSemaKinds.inc.h
@@ -314,6 +338,7 @@ SemaExpr.o: StmtNodes.inc.h
 SemaExpr.po: AttrList.inc.h
 SemaExpr.po: AttrParsedAttrList.inc.h
 SemaExpr.po: Attrs.inc.h
+SemaExpr.po: CommentCommandList.inc.h
 SemaExpr.po: DeclNodes.inc.h
 SemaExpr.po: DiagnosticCommonKinds.inc.h
 SemaExpr.po: DiagnosticSemaKinds.inc.h
@@ -321,6 +346,7 @@ SemaExpr.po: StmtNodes.inc.h
 SemaExprCXX.o: AttrList.inc.h
 SemaExprCXX.o: AttrParsedAttrList.inc.h
 SemaExprCXX.o: Attrs.inc.h
+SemaExprCXX.o: CommentCommandList.inc.h
 SemaExprCXX.o: DeclNodes.inc.h
 SemaExprCXX.o: DiagnosticCommonKinds.inc.h
 SemaExprCXX.o: DiagnosticSemaKinds.inc.h
@@ -328,6 +354,7 @@ SemaExprCXX.o: StmtNodes.inc.h
 SemaExprCXX.po: AttrList.inc.h
 SemaExprCXX.po: AttrParsedAttrList.inc.h
 SemaExprCXX.po: Attrs.inc.h
+SemaExprCXX.po: CommentCommandList.inc.h
 SemaExprCXX.po: DeclNodes.inc.h
 SemaExprCXX.po: DiagnosticCommonKinds.inc.h
 SemaExprCXX.po: DiagnosticSemaKinds.inc.h
@@ -335,6 +362,7 @@ SemaExprCXX.po: StmtNodes.inc.h
 SemaExprMember.o: AttrList.inc.h
 SemaExprMember.o: AttrParsedAttrList.inc.h
 SemaExprMember.o: Attrs.inc.h
+SemaExprMember.o: CommentCommandList.inc.h
 SemaExprMember.o: DeclNodes.inc.h
 SemaExprMember.o: DiagnosticCommonKinds.inc.h
 SemaExprMember.o: DiagnosticSemaKinds.inc.h
@@ -342,6 +370,7 @@ SemaExprMember.o: StmtNodes.inc.h
 SemaExprMember.po: AttrList.inc.h
 SemaExprMember.po: AttrParsedAttrList.inc.h
 SemaExprMember.po: Attrs.inc.h
+SemaExprMember.po: CommentCommandList.inc.h
 SemaExprMember.po: DeclNodes.inc.h
 SemaExprMember.po: DiagnosticCommonKinds.inc.h
 SemaExprMember.po: DiagnosticSemaKinds.inc.h
@@ -349,6 +378,7 @@ SemaExprMember.po: StmtNodes.inc.h
 SemaExprObjC.o: AttrList.inc.h
 SemaExprObjC.o: AttrParsedAttrList.inc.h
 SemaExprObjC.o: Attrs.inc.h
+SemaExprObjC.o: CommentCommandList.inc.h
 SemaExprObjC.o: DeclNodes.inc.h
 SemaExprObjC.o: DiagnosticCommonKinds.inc.h
 SemaExprObjC.o: DiagnosticSemaKinds.inc.h
@@ -356,6 +386,7 @@ SemaExprObjC.o: StmtNodes.inc.h
 SemaExprObjC.po: AttrList.inc.h
 SemaExprObjC.po: AttrParsedAttrList.inc.h
 SemaExprObjC.po: Attrs.inc.h
+SemaExprObjC.po: CommentCommandList.inc.h
 SemaExprObjC.po: DeclNodes.inc.h
 SemaExprObjC.po: DiagnosticCommonKinds.inc.h
 SemaExprObjC.po: DiagnosticSemaKinds.inc.h
@@ -363,18 +394,21 @@ SemaExprObjC.po: StmtNodes.inc.h
 SemaFixItUtils.o: AttrList.inc.h
 SemaFixItUtils.o: AttrParsedAttrList.inc.h
 SemaFixItUtils.o: Attrs.inc.h
+SemaFixItUtils.o: CommentCommandList.inc.h
 SemaFixItUtils.o: DeclNodes.inc.h
 SemaFixItUtils.o: DiagnosticCommonKinds.inc.h
 SemaFixItUtils.o: StmtNodes.inc.h
 SemaFixItUtils.po: AttrList.inc.h
 SemaFixItUtils.po: AttrParsedAttrList.inc.h
 SemaFixItUtils.po: Attrs.inc.h
+SemaFixItUtils.po: CommentCommandList.inc.h
 SemaFixItUtils.po: DeclNodes.inc.h
 SemaFixItUtils.po: DiagnosticCommonKinds.inc.h
 SemaFixItUtils.po: StmtNodes.inc.h
 SemaInit.o: AttrList.inc.h
 SemaInit.o: AttrParsedAttrList.inc.h
 SemaInit.o: Attrs.inc.h
+SemaInit.o: CommentCommandList.inc.h
 SemaInit.o: DeclNodes.inc.h
 SemaInit.o: DiagnosticCommonKinds.inc.h
 SemaInit.o: DiagnosticSemaKinds.inc.h
@@ -382,6 +416,7 @@ SemaInit.o: StmtNodes.inc.h
 SemaInit.po: AttrList.inc.h
 SemaInit.po: AttrParsedAttrList.inc.h
 SemaInit.po: Attrs.inc.h
+SemaInit.po: CommentCommandList.inc.h
 SemaInit.po: DeclNodes.inc.h
 SemaInit.po: DiagnosticCommonKinds.inc.h
 SemaInit.po: DiagnosticSemaKinds.inc.h
@@ -389,6 +424,7 @@ SemaInit.po: StmtNodes.inc.h
 SemaLambda.o: AttrList.inc.h
 SemaLambda.o: AttrParsedAttrList.inc.h
 SemaLambda.o: Attrs.inc.h
+SemaLambda.o: CommentCommandList.inc.h
 SemaLambda.o: DeclNodes.inc.h
 SemaLambda.o: DiagnosticCommonKinds.inc.h
 SemaLambda.o: DiagnosticSemaKinds.inc.h
@@ -396,6 +432,7 @@ SemaLambda.o: StmtNodes.inc.h
 SemaLambda.po: AttrList.inc.h
 SemaLambda.po: AttrParsedAttrList.inc.h
 SemaLambda.po: Attrs.inc.h
+SemaLambda.po: CommentCommandList.inc.h
 SemaLambda.po: DeclNodes.inc.h
 SemaLambda.po: DiagnosticCommonKinds.inc.h
 SemaLambda.po: DiagnosticSemaKinds.inc.h
@@ -403,6 +440,7 @@ SemaLambda.po: StmtNodes.inc.h
 SemaLookup.o: AttrList.inc.h
 SemaLookup.o: AttrParsedAttrList.inc.h
 SemaLookup.o: Attrs.inc.h
+SemaLookup.o: CommentCommandList.inc.h
 SemaLookup.o: DeclNodes.inc.h
 SemaLookup.o: DiagnosticCommonKinds.inc.h
 SemaLookup.o: DiagnosticSemaKinds.inc.h
@@ -410,6 +448,7 @@ SemaLookup.o: StmtNodes.inc.h
 SemaLookup.po: AttrList.inc.h
 SemaLookup.po: AttrParsedAttrList.inc.h
 SemaLookup.po: Attrs.inc.h
+SemaLookup.po: CommentCommandList.inc.h
 SemaLookup.po: DeclNodes.inc.h
 SemaLookup.po: DiagnosticCommonKinds.inc.h
 SemaLookup.po: DiagnosticSemaKinds.inc.h
@@ -417,6 +456,7 @@ SemaLookup.po: StmtNodes.inc.h
 SemaObjCProperty.o: AttrList.inc.h
 SemaObjCProperty.o: AttrParsedAttrList.inc.h
 SemaObjCProperty.o: Attrs.inc.h
+SemaObjCProperty.o: CommentCommandList.inc.h
 SemaObjCProperty.o: DeclNodes.inc.h
 SemaObjCProperty.o: DiagnosticCommonKinds.inc.h
 SemaObjCProperty.o: DiagnosticSemaKinds.inc.h
@@ -424,13 +464,31 @@ SemaObjCProperty.o: StmtNodes.inc.h
 SemaObjCProperty.po: AttrList.inc.h
 SemaObjCProperty.po: AttrParsedAttrList.inc.h
 SemaObjCProperty.po: Attrs.inc.h
+SemaObjCProperty.po: CommentCommandList.inc.h
 SemaObjCProperty.po: DeclNodes.inc.h
 SemaObjCProperty.po: DiagnosticCommonKinds.inc.h
 SemaObjCProperty.po: DiagnosticSemaKinds.inc.h
 SemaObjCProperty.po: StmtNodes.inc.h
+SemaOpenMP.o: AttrList.inc.h
+SemaOpenMP.o: AttrParsedAttrList.inc.h
+SemaOpenMP.o: Attrs.inc.h
+SemaOpenMP.o: CommentCommandList.inc.h
+SemaOpenMP.o: DeclNodes.inc.h
+SemaOpenMP.o: DiagnosticCommonKinds.inc.h
+SemaOpenMP.o: DiagnosticSemaKinds.inc.h
+SemaOpenMP.o: StmtNodes.inc.h
+SemaOpenMP.po: AttrList.inc.h
+SemaOpenMP.po: AttrParsedAttrList.inc.h
+SemaOpenMP.po: Attrs.inc.h
+SemaOpenMP.po: CommentCommandList.inc.h
+SemaOpenMP.po: DeclNodes.inc.h
+SemaOpenMP.po: DiagnosticCommonKinds.inc.h
+SemaOpenMP.po: DiagnosticSemaKinds.inc.h
+SemaOpenMP.po: StmtNodes.inc.h
 SemaOverload.o: AttrList.inc.h
 SemaOverload.o: AttrParsedAttrList.inc.h
 SemaOverload.o: Attrs.inc.h
+SemaOverload.o: CommentCommandList.inc.h
 SemaOverload.o: DeclNodes.inc.h
 SemaOverload.o: DiagnosticCommonKinds.inc.h
 SemaOverload.o: DiagnosticSemaKinds.inc.h
@@ -438,6 +496,7 @@ SemaOverload.o: StmtNodes.inc.h
 SemaOverload.po: AttrList.inc.h
 SemaOverload.po: AttrParsedAttrList.inc.h
 SemaOverload.po: Attrs.inc.h
+SemaOverload.po: CommentCommandList.inc.h
 SemaOverload.po: DeclNodes.inc.h
 SemaOverload.po: DiagnosticCommonKinds.inc.h
 SemaOverload.po: DiagnosticSemaKinds.inc.h
@@ -445,6 +504,7 @@ SemaOverload.po: StmtNodes.inc.h
 SemaPseudoObject.o: AttrList.inc.h
 SemaPseudoObject.o: AttrParsedAttrList.inc.h
 SemaPseudoObject.o: Attrs.inc.h
+SemaPseudoObject.o: CommentCommandList.inc.h
 SemaPseudoObject.o: DeclNodes.inc.h
 SemaPseudoObject.o: DiagnosticCommonKinds.inc.h
 SemaPseudoObject.o: DiagnosticSemaKinds.inc.h
@@ -452,6 +512,7 @@ SemaPseudoObject.o: StmtNodes.inc.h
 SemaPseudoObject.po: AttrList.inc.h
 SemaPseudoObject.po: AttrParsedAttrList.inc.h
 SemaPseudoObject.po: Attrs.inc.h
+SemaPseudoObject.po: CommentCommandList.inc.h
 SemaPseudoObject.po: DeclNodes.inc.h
 SemaPseudoObject.po: DiagnosticCommonKinds.inc.h
 SemaPseudoObject.po: DiagnosticSemaKinds.inc.h
@@ -459,20 +520,25 @@ SemaPseudoObject.po: StmtNodes.inc.h
 SemaStmt.o: AttrList.inc.h
 SemaStmt.o: AttrParsedAttrList.inc.h
 SemaStmt.o: Attrs.inc.h
+SemaStmt.o: CommentCommandList.inc.h
 SemaStmt.o: DeclNodes.inc.h
+SemaStmt.o: DiagnosticASTKinds.inc.h
 SemaStmt.o: DiagnosticCommonKinds.inc.h
 SemaStmt.o: DiagnosticSemaKinds.inc.h
 SemaStmt.o: StmtNodes.inc.h
 SemaStmt.po: AttrList.inc.h
 SemaStmt.po: AttrParsedAttrList.inc.h
 SemaStmt.po: Attrs.inc.h
+SemaStmt.po: CommentCommandList.inc.h
 SemaStmt.po: DeclNodes.inc.h
+SemaStmt.po: DiagnosticASTKinds.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: CommentCommandList.inc.h
 SemaStmtAsm.o: DeclNodes.inc.h
 SemaStmtAsm.o: DiagnosticCommonKinds.inc.h
 SemaStmtAsm.o: DiagnosticSemaKinds.inc.h
@@ -480,6 +546,7 @@ SemaStmtAsm.o: StmtNodes.inc.h
 SemaStmtAsm.po: AttrList.inc.h
 SemaStmtAsm.po: AttrParsedAttrList.inc.h
 SemaStmtAsm.po: Attrs.inc.h
+SemaStmtAsm.po: CommentCommandList.inc.h
 SemaStmtAsm.po: DeclNodes.inc.h
 SemaStmtAsm.po: DiagnosticCommonKinds.inc.h
 SemaStmtAsm.po: DiagnosticSemaKinds.inc.h
@@ -487,6 +554,7 @@ SemaStmtAsm.po: StmtNodes.inc.h
 SemaStmtAttr.o: AttrList.inc.h
 SemaStmtAttr.o: AttrParsedAttrList.inc.h
 SemaStmtAttr.o: Attrs.inc.h
+SemaStmtAttr.o: CommentCommandList.inc.h
 SemaStmtAttr.o: DeclNodes.inc.h
 SemaStmtAttr.o: DiagnosticCommonKinds.inc.h
 SemaStmtAttr.o: DiagnosticSemaKinds.inc.h
@@ -494,6 +562,7 @@ SemaStmtAttr.o: StmtNodes.inc.h
 SemaStmtAttr.po: AttrList.inc.h
 SemaStmtAttr.po: AttrParsedAttrList.inc.h
 SemaStmtAttr.po: Attrs.inc.h
+SemaStmtAttr.po: CommentCommandList.inc.h
 SemaStmtAttr.po: DeclNodes.inc.h
 SemaStmtAttr.po: DiagnosticCommonKinds.inc.h
 SemaStmtAttr.po: DiagnosticSemaKinds.inc.h
@@ -501,6 +570,7 @@ SemaStmtAttr.po: StmtNodes.inc.h
 SemaTemplate.o: AttrList.inc.h
 SemaTemplate.o: AttrParsedAttrList.inc.h
 SemaTemplate.o: Attrs.inc.h
+SemaTemplate.o: CommentCommandList.inc.h
 SemaTemplate.o: DeclNodes.inc.h
 SemaTemplate.o: DiagnosticCommonKinds.inc.h
 SemaTemplate.o: DiagnosticSemaKinds.inc.h
@@ -508,6 +578,7 @@ SemaTemplate.o: StmtNodes.inc.h
 SemaTemplate.po: AttrList.inc.h
 SemaTemplate.po: AttrParsedAttrList.inc.h
 SemaTemplate.po: Attrs.inc.h
+SemaTemplate.po: CommentCommandList.inc.h
 SemaTemplate.po: DeclNodes.inc.h
 SemaTemplate.po: DiagnosticCommonKinds.inc.h
 SemaTemplate.po: DiagnosticSemaKinds.inc.h
@@ -515,6 +586,7 @@ SemaTemplate.po: StmtNodes.inc.h
 SemaTemplateDeduction.o: AttrList.inc.h
 SemaTemplateDeduction.o: AttrParsedAttrList.inc.h
 SemaTemplateDeduction.o: Attrs.inc.h
+SemaTemplateDeduction.o: CommentCommandList.inc.h
 SemaTemplateDeduction.o: DeclNodes.inc.h
 SemaTemplateDeduction.o: DiagnosticCommonKinds.inc.h
 SemaTemplateDeduction.o: DiagnosticSemaKinds.inc.h
@@ -522,6 +594,7 @@ SemaTemplateDeduction.o: StmtNodes.inc.h
 SemaTemplateDeduction.po: AttrList.inc.h
 SemaTemplateDeduction.po: AttrParsedAttrList.inc.h
 SemaTemplateDeduction.po: Attrs.inc.h
+SemaTemplateDeduction.po: CommentCommandList.inc.h
 SemaTemplateDeduction.po: DeclNodes.inc.h
 SemaTemplateDeduction.po: DiagnosticCommonKinds.inc.h
 SemaTemplateDeduction.po: DiagnosticSemaKinds.inc.h
@@ -529,6 +602,7 @@ SemaTemplateDeduction.po: StmtNodes.inc.h
 SemaTemplateInstantiate.o: AttrList.inc.h
 SemaTemplateInstantiate.o: AttrParsedAttrList.inc.h
 SemaTemplateInstantiate.o: Attrs.inc.h
+SemaTemplateInstantiate.o: CommentCommandList.inc.h
 SemaTemplateInstantiate.o: DeclNodes.inc.h
 SemaTemplateInstantiate.o: DiagnosticCommonKinds.inc.h
 SemaTemplateInstantiate.o: DiagnosticSemaKinds.inc.h
@@ -536,6 +610,7 @@ SemaTemplateInstantiate.o: StmtNodes.inc.h
 SemaTemplateInstantiate.po: AttrList.inc.h
 SemaTemplateInstantiate.po: AttrParsedAttrList.inc.h
 SemaTemplateInstantiate.po: Attrs.inc.h
+SemaTemplateInstantiate.po: CommentCommandList.inc.h
 SemaTemplateInstantiate.po: DeclNodes.inc.h
 SemaTemplateInstantiate.po: DiagnosticCommonKinds.inc.h
 SemaTemplateInstantiate.po: DiagnosticSemaKinds.inc.h
@@ -544,6 +619,7 @@ SemaTemplateInstantiateDecl.o: AttrList.inc.h
 SemaTemplateInstantiateDecl.o: AttrParsedAttrList.inc.h
 SemaTemplateInstantiateDecl.o: AttrTemplateInstantiate.inc.h
 SemaTemplateInstantiateDecl.o: Attrs.inc.h
+SemaTemplateInstantiateDecl.o: CommentCommandList.inc.h
 SemaTemplateInstantiateDecl.o: DeclNodes.inc.h
 SemaTemplateInstantiateDecl.o: DiagnosticCommonKinds.inc.h
 SemaTemplateInstantiateDecl.o: DiagnosticSemaKinds.inc.h
@@ -552,6 +628,7 @@ SemaTemplateInstantiateDecl.po: AttrList.inc.h
 SemaTemplateInstantiateDecl.po: AttrParsedAttrList.inc.h
 SemaTemplateInstantiateDecl.po: AttrTemplateInstantiate.inc.h
 SemaTemplateInstantiateDecl.po: Attrs.inc.h
+SemaTemplateInstantiateDecl.po: CommentCommandList.inc.h
 SemaTemplateInstantiateDecl.po: DeclNodes.inc.h
 SemaTemplateInstantiateDecl.po: DiagnosticCommonKinds.inc.h
 SemaTemplateInstantiateDecl.po: DiagnosticSemaKinds.inc.h
@@ -559,6 +636,7 @@ SemaTemplateInstantiateDecl.po: StmtNodes.inc.h
 SemaTemplateVariadic.o: AttrList.inc.h
 SemaTemplateVariadic.o: AttrParsedAttrList.inc.h
 SemaTemplateVariadic.o: Attrs.inc.h
+SemaTemplateVariadic.o: CommentCommandList.inc.h
 SemaTemplateVariadic.o: DeclNodes.inc.h
 SemaTemplateVariadic.o: DiagnosticCommonKinds.inc.h
 SemaTemplateVariadic.o: DiagnosticSemaKinds.inc.h
@@ -566,6 +644,7 @@ SemaTemplateVariadic.o: StmtNodes.inc.h
 SemaTemplateVariadic.po: AttrList.inc.h
 SemaTemplateVariadic.po: AttrParsedAttrList.inc.h
 SemaTemplateVariadic.po: Attrs.inc.h
+SemaTemplateVariadic.po: CommentCommandList.inc.h
 SemaTemplateVariadic.po: DeclNodes.inc.h
 SemaTemplateVariadic.po: DiagnosticCommonKinds.inc.h
 SemaTemplateVariadic.po: DiagnosticSemaKinds.inc.h
@@ -573,6 +652,7 @@ SemaTemplateVariadic.po: StmtNodes.inc.h
 SemaType.o: AttrList.inc.h
 SemaType.o: AttrParsedAttrList.inc.h
 SemaType.o: Attrs.inc.h
+SemaType.o: CommentCommandList.inc.h
 SemaType.o: DeclNodes.inc.h
 SemaType.o: DiagnosticCommonKinds.inc.h
 SemaType.o: DiagnosticParseKinds.inc.h
@@ -581,6 +661,7 @@ SemaType.o: StmtNodes.inc.h
 SemaType.po: AttrList.inc.h
 SemaType.po: AttrParsedAttrList.inc.h
 SemaType.po: Attrs.inc.h
+SemaType.po: CommentCommandList.inc.h
 SemaType.po: DeclNodes.inc.h
 SemaType.po: DiagnosticCommonKinds.inc.h
 SemaType.po: DiagnosticParseKinds.inc.h
@@ -589,6 +670,7 @@ SemaType.po: StmtNodes.inc.h
 TargetAttributesSema.o: AttrList.inc.h
 TargetAttributesSema.o: AttrParsedAttrList.inc.h
 TargetAttributesSema.o: Attrs.inc.h
+TargetAttributesSema.o: CommentCommandList.inc.h
 TargetAttributesSema.o: DeclNodes.inc.h
 TargetAttributesSema.o: DiagnosticCommonKinds.inc.h
 TargetAttributesSema.o: DiagnosticSemaKinds.inc.h
@@ -596,6 +678,7 @@ TargetAttributesSema.o: StmtNodes.inc.h
 TargetAttributesSema.po: AttrList.inc.h
 TargetAttributesSema.po: AttrParsedAttrList.inc.h
 TargetAttributesSema.po: Attrs.inc.h
+TargetAttributesSema.po: CommentCommandList.inc.h
 TargetAttributesSema.po: DeclNodes.inc.h
 TargetAttributesSema.po: DiagnosticCommonKinds.inc.h
 TargetAttributesSema.po: DiagnosticSemaKinds.inc.h
diff --git a/lib/clang/libclangserialization/Makefile.depend b/lib/clang/libclangserialization/Makefile.depend
index 7aee5f8..2269b1e 100644
--- a/lib/clang/libclangserialization/Makefile.depend
+++ b/lib/clang/libclangserialization/Makefile.depend
@@ -8,23 +8,25 @@ DIRDEPS = \
 	include \
 	include/xlocale \
 	lib/msun \
+	usr.bin/clang/clang-tblgen.host \
 
 
 .include <dirdeps.mk>
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
-ASTCommon.o: AttrList.inc.h
-ASTCommon.o: Attrs.inc.h
+ASTCommon.o: CommentCommandList.inc.h
 ASTCommon.o: DeclNodes.inc.h
 ASTCommon.o: DiagnosticCommonKinds.inc.h
-ASTCommon.po: AttrList.inc.h
-ASTCommon.po: Attrs.inc.h
+ASTCommon.o: StmtNodes.inc.h
+ASTCommon.po: CommentCommandList.inc.h
 ASTCommon.po: DeclNodes.inc.h
 ASTCommon.po: DiagnosticCommonKinds.inc.h
+ASTCommon.po: StmtNodes.inc.h
 ASTReader.o: AttrList.inc.h
 ASTReader.o: AttrParsedAttrList.inc.h
 ASTReader.o: Attrs.inc.h
+ASTReader.o: CommentCommandList.inc.h
 ASTReader.o: DeclNodes.inc.h
 ASTReader.o: DiagnosticCommonKinds.inc.h
 ASTReader.o: DiagnosticSerializationKinds.inc.h
@@ -32,6 +34,7 @@ ASTReader.o: StmtNodes.inc.h
 ASTReader.po: AttrList.inc.h
 ASTReader.po: AttrParsedAttrList.inc.h
 ASTReader.po: Attrs.inc.h
+ASTReader.po: CommentCommandList.inc.h
 ASTReader.po: DeclNodes.inc.h
 ASTReader.po: DiagnosticCommonKinds.inc.h
 ASTReader.po: DiagnosticSerializationKinds.inc.h
@@ -40,6 +43,7 @@ ASTReaderDecl.o: AttrList.inc.h
 ASTReaderDecl.o: AttrPCHRead.inc.h
 ASTReaderDecl.o: AttrParsedAttrList.inc.h
 ASTReaderDecl.o: Attrs.inc.h
+ASTReaderDecl.o: CommentCommandList.inc.h
 ASTReaderDecl.o: DeclNodes.inc.h
 ASTReaderDecl.o: DiagnosticCommonKinds.inc.h
 ASTReaderDecl.o: DiagnosticSemaKinds.inc.h
@@ -48,17 +52,16 @@ ASTReaderDecl.po: AttrList.inc.h
 ASTReaderDecl.po: AttrPCHRead.inc.h
 ASTReaderDecl.po: AttrParsedAttrList.inc.h
 ASTReaderDecl.po: Attrs.inc.h
+ASTReaderDecl.po: CommentCommandList.inc.h
 ASTReaderDecl.po: DeclNodes.inc.h
 ASTReaderDecl.po: DiagnosticCommonKinds.inc.h
 ASTReaderDecl.po: DiagnosticSemaKinds.inc.h
 ASTReaderDecl.po: StmtNodes.inc.h
-ASTReaderStmt.o: AttrList.inc.h
-ASTReaderStmt.o: Attrs.inc.h
+ASTReaderStmt.o: CommentCommandList.inc.h
 ASTReaderStmt.o: DeclNodes.inc.h
 ASTReaderStmt.o: DiagnosticCommonKinds.inc.h
 ASTReaderStmt.o: StmtNodes.inc.h
-ASTReaderStmt.po: AttrList.inc.h
-ASTReaderStmt.po: Attrs.inc.h
+ASTReaderStmt.po: CommentCommandList.inc.h
 ASTReaderStmt.po: DeclNodes.inc.h
 ASTReaderStmt.po: DiagnosticCommonKinds.inc.h
 ASTReaderStmt.po: StmtNodes.inc.h
@@ -66,6 +69,7 @@ ASTWriter.o: AttrList.inc.h
 ASTWriter.o: AttrPCHWrite.inc.h
 ASTWriter.o: AttrParsedAttrList.inc.h
 ASTWriter.o: Attrs.inc.h
+ASTWriter.o: CommentCommandList.inc.h
 ASTWriter.o: DeclNodes.inc.h
 ASTWriter.o: DiagnosticCommonKinds.inc.h
 ASTWriter.o: StmtNodes.inc.h
@@ -73,37 +77,36 @@ ASTWriter.po: AttrList.inc.h
 ASTWriter.po: AttrPCHWrite.inc.h
 ASTWriter.po: AttrParsedAttrList.inc.h
 ASTWriter.po: Attrs.inc.h
+ASTWriter.po: CommentCommandList.inc.h
 ASTWriter.po: DeclNodes.inc.h
 ASTWriter.po: DiagnosticCommonKinds.inc.h
 ASTWriter.po: StmtNodes.inc.h
-ASTWriterDecl.o: AttrList.inc.h
-ASTWriterDecl.o: Attrs.inc.h
+ASTWriterDecl.o: CommentCommandList.inc.h
 ASTWriterDecl.o: DeclNodes.inc.h
 ASTWriterDecl.o: DiagnosticCommonKinds.inc.h
 ASTWriterDecl.o: StmtNodes.inc.h
-ASTWriterDecl.po: AttrList.inc.h
-ASTWriterDecl.po: Attrs.inc.h
+ASTWriterDecl.po: CommentCommandList.inc.h
 ASTWriterDecl.po: DeclNodes.inc.h
 ASTWriterDecl.po: DiagnosticCommonKinds.inc.h
 ASTWriterDecl.po: StmtNodes.inc.h
-ASTWriterStmt.o: AttrList.inc.h
-ASTWriterStmt.o: Attrs.inc.h
+ASTWriterStmt.o: CommentCommandList.inc.h
 ASTWriterStmt.o: DeclNodes.inc.h
 ASTWriterStmt.o: DiagnosticCommonKinds.inc.h
 ASTWriterStmt.o: StmtNodes.inc.h
-ASTWriterStmt.po: AttrList.inc.h
-ASTWriterStmt.po: Attrs.inc.h
+ASTWriterStmt.po: CommentCommandList.inc.h
 ASTWriterStmt.po: DeclNodes.inc.h
 ASTWriterStmt.po: DiagnosticCommonKinds.inc.h
 ASTWriterStmt.po: StmtNodes.inc.h
-GeneratePCH.o: AttrList.inc.h
-GeneratePCH.o: Attrs.inc.h
+GeneratePCH.o: CommentCommandList.inc.h
 GeneratePCH.o: DeclNodes.inc.h
 GeneratePCH.o: DiagnosticCommonKinds.inc.h
-GeneratePCH.po: AttrList.inc.h
-GeneratePCH.po: Attrs.inc.h
+GeneratePCH.o: StmtNodes.inc.h
+GeneratePCH.po: CommentCommandList.inc.h
 GeneratePCH.po: DeclNodes.inc.h
 GeneratePCH.po: DiagnosticCommonKinds.inc.h
+GeneratePCH.po: StmtNodes.inc.h
+GlobalModuleIndex.o: DiagnosticCommonKinds.inc.h
+GlobalModuleIndex.po: DiagnosticCommonKinds.inc.h
 Module.o: DiagnosticCommonKinds.inc.h
 Module.po: DiagnosticCommonKinds.inc.h
 ModuleManager.o: DiagnosticCommonKinds.inc.h
diff --git a/lib/clang/libclangstaticanalyzercheckers/Makefile.depend b/lib/clang/libclangstaticanalyzercheckers/Makefile.depend
index a479b56..c9fe45f 100644
--- a/lib/clang/libclangstaticanalyzercheckers/Makefile.depend
+++ b/lib/clang/libclangstaticanalyzercheckers/Makefile.depend
@@ -8,789 +8,704 @@ DIRDEPS = \
 	include \
 	include/xlocale \
 	lib/msun \
+	usr.bin/clang/clang-tblgen.host \
 
 
 .include <dirdeps.mk>
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
-AnalyzerStatsChecker.o: AttrList.inc.h
-AnalyzerStatsChecker.o: Attrs.inc.h
 AnalyzerStatsChecker.o: Checkers.inc.h
+AnalyzerStatsChecker.o: CommentCommandList.inc.h
 AnalyzerStatsChecker.o: DeclNodes.inc.h
 AnalyzerStatsChecker.o: DiagnosticCommonKinds.inc.h
 AnalyzerStatsChecker.o: StmtNodes.inc.h
-AnalyzerStatsChecker.po: AttrList.inc.h
-AnalyzerStatsChecker.po: Attrs.inc.h
 AnalyzerStatsChecker.po: Checkers.inc.h
+AnalyzerStatsChecker.po: CommentCommandList.inc.h
 AnalyzerStatsChecker.po: DeclNodes.inc.h
 AnalyzerStatsChecker.po: DiagnosticCommonKinds.inc.h
 AnalyzerStatsChecker.po: StmtNodes.inc.h
-ArrayBoundChecker.o: AttrList.inc.h
-ArrayBoundChecker.o: Attrs.inc.h
 ArrayBoundChecker.o: Checkers.inc.h
+ArrayBoundChecker.o: CommentCommandList.inc.h
 ArrayBoundChecker.o: DeclNodes.inc.h
 ArrayBoundChecker.o: DiagnosticCommonKinds.inc.h
 ArrayBoundChecker.o: StmtNodes.inc.h
-ArrayBoundChecker.po: AttrList.inc.h
-ArrayBoundChecker.po: Attrs.inc.h
 ArrayBoundChecker.po: Checkers.inc.h
+ArrayBoundChecker.po: CommentCommandList.inc.h
 ArrayBoundChecker.po: DeclNodes.inc.h
 ArrayBoundChecker.po: DiagnosticCommonKinds.inc.h
 ArrayBoundChecker.po: StmtNodes.inc.h
-ArrayBoundCheckerV2.o: AttrList.inc.h
-ArrayBoundCheckerV2.o: Attrs.inc.h
 ArrayBoundCheckerV2.o: Checkers.inc.h
+ArrayBoundCheckerV2.o: CommentCommandList.inc.h
 ArrayBoundCheckerV2.o: DeclNodes.inc.h
 ArrayBoundCheckerV2.o: DiagnosticCommonKinds.inc.h
 ArrayBoundCheckerV2.o: StmtNodes.inc.h
-ArrayBoundCheckerV2.po: AttrList.inc.h
-ArrayBoundCheckerV2.po: Attrs.inc.h
 ArrayBoundCheckerV2.po: Checkers.inc.h
+ArrayBoundCheckerV2.po: CommentCommandList.inc.h
 ArrayBoundCheckerV2.po: DeclNodes.inc.h
 ArrayBoundCheckerV2.po: DiagnosticCommonKinds.inc.h
 ArrayBoundCheckerV2.po: StmtNodes.inc.h
-AttrNonNullChecker.o: AttrList.inc.h
-AttrNonNullChecker.o: Attrs.inc.h
-AttrNonNullChecker.o: Checkers.inc.h
-AttrNonNullChecker.o: DeclNodes.inc.h
-AttrNonNullChecker.o: DiagnosticCommonKinds.inc.h
-AttrNonNullChecker.o: StmtNodes.inc.h
-AttrNonNullChecker.po: AttrList.inc.h
-AttrNonNullChecker.po: Attrs.inc.h
-AttrNonNullChecker.po: Checkers.inc.h
-AttrNonNullChecker.po: DeclNodes.inc.h
-AttrNonNullChecker.po: DiagnosticCommonKinds.inc.h
-AttrNonNullChecker.po: StmtNodes.inc.h
-BasicObjCFoundationChecks.o: AttrList.inc.h
-BasicObjCFoundationChecks.o: Attrs.inc.h
 BasicObjCFoundationChecks.o: Checkers.inc.h
+BasicObjCFoundationChecks.o: CommentCommandList.inc.h
 BasicObjCFoundationChecks.o: DeclNodes.inc.h
 BasicObjCFoundationChecks.o: DiagnosticCommonKinds.inc.h
 BasicObjCFoundationChecks.o: StmtNodes.inc.h
-BasicObjCFoundationChecks.po: AttrList.inc.h
-BasicObjCFoundationChecks.po: Attrs.inc.h
 BasicObjCFoundationChecks.po: Checkers.inc.h
+BasicObjCFoundationChecks.po: CommentCommandList.inc.h
 BasicObjCFoundationChecks.po: DeclNodes.inc.h
 BasicObjCFoundationChecks.po: DiagnosticCommonKinds.inc.h
 BasicObjCFoundationChecks.po: StmtNodes.inc.h
-BoolAssignmentChecker.o: AttrList.inc.h
-BoolAssignmentChecker.o: Attrs.inc.h
 BoolAssignmentChecker.o: Checkers.inc.h
+BoolAssignmentChecker.o: CommentCommandList.inc.h
 BoolAssignmentChecker.o: DeclNodes.inc.h
 BoolAssignmentChecker.o: DiagnosticCommonKinds.inc.h
 BoolAssignmentChecker.o: StmtNodes.inc.h
-BoolAssignmentChecker.po: AttrList.inc.h
-BoolAssignmentChecker.po: Attrs.inc.h
 BoolAssignmentChecker.po: Checkers.inc.h
+BoolAssignmentChecker.po: CommentCommandList.inc.h
 BoolAssignmentChecker.po: DeclNodes.inc.h
 BoolAssignmentChecker.po: DiagnosticCommonKinds.inc.h
 BoolAssignmentChecker.po: StmtNodes.inc.h
-BuiltinFunctionChecker.o: AttrList.inc.h
-BuiltinFunctionChecker.o: Attrs.inc.h
 BuiltinFunctionChecker.o: Checkers.inc.h
+BuiltinFunctionChecker.o: CommentCommandList.inc.h
 BuiltinFunctionChecker.o: DeclNodes.inc.h
 BuiltinFunctionChecker.o: DiagnosticCommonKinds.inc.h
 BuiltinFunctionChecker.o: StmtNodes.inc.h
-BuiltinFunctionChecker.po: AttrList.inc.h
-BuiltinFunctionChecker.po: Attrs.inc.h
 BuiltinFunctionChecker.po: Checkers.inc.h
+BuiltinFunctionChecker.po: CommentCommandList.inc.h
 BuiltinFunctionChecker.po: DeclNodes.inc.h
 BuiltinFunctionChecker.po: DiagnosticCommonKinds.inc.h
 BuiltinFunctionChecker.po: StmtNodes.inc.h
-CStringChecker.o: AttrList.inc.h
-CStringChecker.o: Attrs.inc.h
 CStringChecker.o: Checkers.inc.h
+CStringChecker.o: CommentCommandList.inc.h
 CStringChecker.o: DeclNodes.inc.h
 CStringChecker.o: DiagnosticCommonKinds.inc.h
 CStringChecker.o: StmtNodes.inc.h
-CStringChecker.po: AttrList.inc.h
-CStringChecker.po: Attrs.inc.h
 CStringChecker.po: Checkers.inc.h
+CStringChecker.po: CommentCommandList.inc.h
 CStringChecker.po: DeclNodes.inc.h
 CStringChecker.po: DiagnosticCommonKinds.inc.h
 CStringChecker.po: StmtNodes.inc.h
-CStringSyntaxChecker.o: AttrList.inc.h
-CStringSyntaxChecker.o: Attrs.inc.h
 CStringSyntaxChecker.o: Checkers.inc.h
+CStringSyntaxChecker.o: CommentCommandList.inc.h
 CStringSyntaxChecker.o: DeclNodes.inc.h
 CStringSyntaxChecker.o: DiagnosticCommonKinds.inc.h
 CStringSyntaxChecker.o: StmtNodes.inc.h
-CStringSyntaxChecker.po: AttrList.inc.h
-CStringSyntaxChecker.po: Attrs.inc.h
 CStringSyntaxChecker.po: Checkers.inc.h
+CStringSyntaxChecker.po: CommentCommandList.inc.h
 CStringSyntaxChecker.po: DeclNodes.inc.h
 CStringSyntaxChecker.po: DiagnosticCommonKinds.inc.h
 CStringSyntaxChecker.po: StmtNodes.inc.h
-CallAndMessageChecker.o: AttrList.inc.h
-CallAndMessageChecker.o: Attrs.inc.h
 CallAndMessageChecker.o: Checkers.inc.h
+CallAndMessageChecker.o: CommentCommandList.inc.h
 CallAndMessageChecker.o: DeclNodes.inc.h
 CallAndMessageChecker.o: DiagnosticCommonKinds.inc.h
 CallAndMessageChecker.o: StmtNodes.inc.h
-CallAndMessageChecker.po: AttrList.inc.h
-CallAndMessageChecker.po: Attrs.inc.h
 CallAndMessageChecker.po: Checkers.inc.h
+CallAndMessageChecker.po: CommentCommandList.inc.h
 CallAndMessageChecker.po: DeclNodes.inc.h
 CallAndMessageChecker.po: DiagnosticCommonKinds.inc.h
 CallAndMessageChecker.po: StmtNodes.inc.h
-CastSizeChecker.o: AttrList.inc.h
-CastSizeChecker.o: Attrs.inc.h
 CastSizeChecker.o: Checkers.inc.h
+CastSizeChecker.o: CommentCommandList.inc.h
 CastSizeChecker.o: DeclNodes.inc.h
 CastSizeChecker.o: DiagnosticCommonKinds.inc.h
 CastSizeChecker.o: StmtNodes.inc.h
-CastSizeChecker.po: AttrList.inc.h
-CastSizeChecker.po: Attrs.inc.h
 CastSizeChecker.po: Checkers.inc.h
+CastSizeChecker.po: CommentCommandList.inc.h
 CastSizeChecker.po: DeclNodes.inc.h
 CastSizeChecker.po: DiagnosticCommonKinds.inc.h
 CastSizeChecker.po: StmtNodes.inc.h
-CastToStructChecker.o: AttrList.inc.h
-CastToStructChecker.o: Attrs.inc.h
 CastToStructChecker.o: Checkers.inc.h
+CastToStructChecker.o: CommentCommandList.inc.h
 CastToStructChecker.o: DeclNodes.inc.h
 CastToStructChecker.o: DiagnosticCommonKinds.inc.h
 CastToStructChecker.o: StmtNodes.inc.h
-CastToStructChecker.po: AttrList.inc.h
-CastToStructChecker.po: Attrs.inc.h
 CastToStructChecker.po: Checkers.inc.h
+CastToStructChecker.po: CommentCommandList.inc.h
 CastToStructChecker.po: DeclNodes.inc.h
 CastToStructChecker.po: DiagnosticCommonKinds.inc.h
 CastToStructChecker.po: StmtNodes.inc.h
 CheckObjCDealloc.o: AttrList.inc.h
 CheckObjCDealloc.o: Attrs.inc.h
 CheckObjCDealloc.o: Checkers.inc.h
+CheckObjCDealloc.o: CommentCommandList.inc.h
 CheckObjCDealloc.o: DeclNodes.inc.h
 CheckObjCDealloc.o: DiagnosticCommonKinds.inc.h
 CheckObjCDealloc.o: StmtNodes.inc.h
 CheckObjCDealloc.po: AttrList.inc.h
 CheckObjCDealloc.po: Attrs.inc.h
 CheckObjCDealloc.po: Checkers.inc.h
+CheckObjCDealloc.po: CommentCommandList.inc.h
 CheckObjCDealloc.po: DeclNodes.inc.h
 CheckObjCDealloc.po: DiagnosticCommonKinds.inc.h
 CheckObjCDealloc.po: StmtNodes.inc.h
-CheckObjCInstMethSignature.o: AttrList.inc.h
-CheckObjCInstMethSignature.o: Attrs.inc.h
 CheckObjCInstMethSignature.o: Checkers.inc.h
+CheckObjCInstMethSignature.o: CommentCommandList.inc.h
 CheckObjCInstMethSignature.o: DeclNodes.inc.h
 CheckObjCInstMethSignature.o: DiagnosticCommonKinds.inc.h
 CheckObjCInstMethSignature.o: StmtNodes.inc.h
-CheckObjCInstMethSignature.po: AttrList.inc.h
-CheckObjCInstMethSignature.po: Attrs.inc.h
 CheckObjCInstMethSignature.po: Checkers.inc.h
+CheckObjCInstMethSignature.po: CommentCommandList.inc.h
 CheckObjCInstMethSignature.po: DeclNodes.inc.h
 CheckObjCInstMethSignature.po: DiagnosticCommonKinds.inc.h
 CheckObjCInstMethSignature.po: StmtNodes.inc.h
-CheckSecuritySyntaxOnly.o: AttrList.inc.h
-CheckSecuritySyntaxOnly.o: Attrs.inc.h
 CheckSecuritySyntaxOnly.o: Checkers.inc.h
+CheckSecuritySyntaxOnly.o: CommentCommandList.inc.h
 CheckSecuritySyntaxOnly.o: DeclNodes.inc.h
 CheckSecuritySyntaxOnly.o: DiagnosticCommonKinds.inc.h
 CheckSecuritySyntaxOnly.o: StmtNodes.inc.h
-CheckSecuritySyntaxOnly.po: AttrList.inc.h
-CheckSecuritySyntaxOnly.po: Attrs.inc.h
 CheckSecuritySyntaxOnly.po: Checkers.inc.h
+CheckSecuritySyntaxOnly.po: CommentCommandList.inc.h
 CheckSecuritySyntaxOnly.po: DeclNodes.inc.h
 CheckSecuritySyntaxOnly.po: DiagnosticCommonKinds.inc.h
 CheckSecuritySyntaxOnly.po: StmtNodes.inc.h
-CheckSizeofPointer.o: AttrList.inc.h
-CheckSizeofPointer.o: Attrs.inc.h
 CheckSizeofPointer.o: Checkers.inc.h
+CheckSizeofPointer.o: CommentCommandList.inc.h
 CheckSizeofPointer.o: DeclNodes.inc.h
 CheckSizeofPointer.o: DiagnosticCommonKinds.inc.h
 CheckSizeofPointer.o: StmtNodes.inc.h
-CheckSizeofPointer.po: AttrList.inc.h
-CheckSizeofPointer.po: Attrs.inc.h
 CheckSizeofPointer.po: Checkers.inc.h
+CheckSizeofPointer.po: CommentCommandList.inc.h
 CheckSizeofPointer.po: DeclNodes.inc.h
 CheckSizeofPointer.po: DiagnosticCommonKinds.inc.h
 CheckSizeofPointer.po: StmtNodes.inc.h
-CheckerDocumentation.o: AttrList.inc.h
-CheckerDocumentation.o: Attrs.inc.h
 CheckerDocumentation.o: Checkers.inc.h
+CheckerDocumentation.o: CommentCommandList.inc.h
 CheckerDocumentation.o: DeclNodes.inc.h
 CheckerDocumentation.o: DiagnosticCommonKinds.inc.h
 CheckerDocumentation.o: StmtNodes.inc.h
-CheckerDocumentation.po: AttrList.inc.h
-CheckerDocumentation.po: Attrs.inc.h
 CheckerDocumentation.po: Checkers.inc.h
+CheckerDocumentation.po: CommentCommandList.inc.h
 CheckerDocumentation.po: DeclNodes.inc.h
 CheckerDocumentation.po: DiagnosticCommonKinds.inc.h
 CheckerDocumentation.po: StmtNodes.inc.h
-ChrootChecker.o: AttrList.inc.h
-ChrootChecker.o: Attrs.inc.h
 ChrootChecker.o: Checkers.inc.h
+ChrootChecker.o: CommentCommandList.inc.h
 ChrootChecker.o: DeclNodes.inc.h
 ChrootChecker.o: DiagnosticCommonKinds.inc.h
 ChrootChecker.o: StmtNodes.inc.h
-ChrootChecker.po: AttrList.inc.h
-ChrootChecker.po: Attrs.inc.h
 ChrootChecker.po: Checkers.inc.h
+ChrootChecker.po: CommentCommandList.inc.h
 ChrootChecker.po: DeclNodes.inc.h
 ChrootChecker.po: DiagnosticCommonKinds.inc.h
 ChrootChecker.po: StmtNodes.inc.h
-ClangCheckers.o: AttrList.inc.h
-ClangCheckers.o: Attrs.inc.h
 ClangCheckers.o: Checkers.inc.h
+ClangCheckers.o: CommentCommandList.inc.h
 ClangCheckers.o: DeclNodes.inc.h
 ClangCheckers.o: DiagnosticCommonKinds.inc.h
 ClangCheckers.o: StmtNodes.inc.h
-ClangCheckers.po: AttrList.inc.h
-ClangCheckers.po: Attrs.inc.h
 ClangCheckers.po: Checkers.inc.h
+ClangCheckers.po: CommentCommandList.inc.h
 ClangCheckers.po: DeclNodes.inc.h
 ClangCheckers.po: DiagnosticCommonKinds.inc.h
 ClangCheckers.po: StmtNodes.inc.h
 DeadStoresChecker.o: AttrList.inc.h
 DeadStoresChecker.o: Attrs.inc.h
 DeadStoresChecker.o: Checkers.inc.h
+DeadStoresChecker.o: CommentCommandList.inc.h
 DeadStoresChecker.o: DeclNodes.inc.h
 DeadStoresChecker.o: DiagnosticCommonKinds.inc.h
 DeadStoresChecker.o: StmtNodes.inc.h
 DeadStoresChecker.po: AttrList.inc.h
 DeadStoresChecker.po: Attrs.inc.h
 DeadStoresChecker.po: Checkers.inc.h
+DeadStoresChecker.po: CommentCommandList.inc.h
 DeadStoresChecker.po: DeclNodes.inc.h
 DeadStoresChecker.po: DiagnosticCommonKinds.inc.h
 DeadStoresChecker.po: StmtNodes.inc.h
-DebugCheckers.o: AttrList.inc.h
-DebugCheckers.o: Attrs.inc.h
 DebugCheckers.o: Checkers.inc.h
+DebugCheckers.o: CommentCommandList.inc.h
 DebugCheckers.o: DeclNodes.inc.h
 DebugCheckers.o: DiagnosticCommonKinds.inc.h
 DebugCheckers.o: StmtNodes.inc.h
-DebugCheckers.po: AttrList.inc.h
-DebugCheckers.po: Attrs.inc.h
 DebugCheckers.po: Checkers.inc.h
+DebugCheckers.po: CommentCommandList.inc.h
 DebugCheckers.po: DeclNodes.inc.h
 DebugCheckers.po: DiagnosticCommonKinds.inc.h
 DebugCheckers.po: StmtNodes.inc.h
-DereferenceChecker.o: AttrList.inc.h
-DereferenceChecker.o: Attrs.inc.h
 DereferenceChecker.o: Checkers.inc.h
+DereferenceChecker.o: CommentCommandList.inc.h
 DereferenceChecker.o: DeclNodes.inc.h
 DereferenceChecker.o: DiagnosticCommonKinds.inc.h
 DereferenceChecker.o: StmtNodes.inc.h
-DereferenceChecker.po: AttrList.inc.h
-DereferenceChecker.po: Attrs.inc.h
 DereferenceChecker.po: Checkers.inc.h
+DereferenceChecker.po: CommentCommandList.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: CommentCommandList.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: CommentCommandList.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
+DivZeroChecker.o: CommentCommandList.inc.h
 DivZeroChecker.o: DeclNodes.inc.h
 DivZeroChecker.o: DiagnosticCommonKinds.inc.h
 DivZeroChecker.o: StmtNodes.inc.h
-DivZeroChecker.po: AttrList.inc.h
-DivZeroChecker.po: Attrs.inc.h
 DivZeroChecker.po: Checkers.inc.h
+DivZeroChecker.po: CommentCommandList.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: CommentCommandList.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: CommentCommandList.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: CommentCommandList.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: CommentCommandList.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
+FixedAddressChecker.o: CommentCommandList.inc.h
 FixedAddressChecker.o: DeclNodes.inc.h
 FixedAddressChecker.o: DiagnosticCommonKinds.inc.h
 FixedAddressChecker.o: StmtNodes.inc.h
-FixedAddressChecker.po: AttrList.inc.h
-FixedAddressChecker.po: Attrs.inc.h
 FixedAddressChecker.po: Checkers.inc.h
+FixedAddressChecker.po: CommentCommandList.inc.h
 FixedAddressChecker.po: DeclNodes.inc.h
 FixedAddressChecker.po: DiagnosticCommonKinds.inc.h
 FixedAddressChecker.po: StmtNodes.inc.h
 GenericTaintChecker.o: AttrList.inc.h
 GenericTaintChecker.o: Attrs.inc.h
 GenericTaintChecker.o: Checkers.inc.h
+GenericTaintChecker.o: CommentCommandList.inc.h
 GenericTaintChecker.o: DeclNodes.inc.h
 GenericTaintChecker.o: DiagnosticCommonKinds.inc.h
 GenericTaintChecker.o: StmtNodes.inc.h
 GenericTaintChecker.po: AttrList.inc.h
 GenericTaintChecker.po: Attrs.inc.h
 GenericTaintChecker.po: Checkers.inc.h
+GenericTaintChecker.po: CommentCommandList.inc.h
 GenericTaintChecker.po: DeclNodes.inc.h
 GenericTaintChecker.po: DiagnosticCommonKinds.inc.h
 GenericTaintChecker.po: StmtNodes.inc.h
-IdempotentOperationChecker.o: AttrList.inc.h
-IdempotentOperationChecker.o: Attrs.inc.h
 IdempotentOperationChecker.o: Checkers.inc.h
+IdempotentOperationChecker.o: CommentCommandList.inc.h
 IdempotentOperationChecker.o: DeclNodes.inc.h
 IdempotentOperationChecker.o: DiagnosticCommonKinds.inc.h
 IdempotentOperationChecker.o: StmtNodes.inc.h
-IdempotentOperationChecker.po: AttrList.inc.h
-IdempotentOperationChecker.po: Attrs.inc.h
 IdempotentOperationChecker.po: Checkers.inc.h
+IdempotentOperationChecker.po: CommentCommandList.inc.h
 IdempotentOperationChecker.po: DeclNodes.inc.h
 IdempotentOperationChecker.po: DiagnosticCommonKinds.inc.h
 IdempotentOperationChecker.po: StmtNodes.inc.h
 IvarInvalidationChecker.o: AttrList.inc.h
 IvarInvalidationChecker.o: Attrs.inc.h
 IvarInvalidationChecker.o: Checkers.inc.h
+IvarInvalidationChecker.o: CommentCommandList.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: CommentCommandList.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
+LLVMConventionsChecker.o: CommentCommandList.inc.h
 LLVMConventionsChecker.o: DeclNodes.inc.h
 LLVMConventionsChecker.o: DiagnosticCommonKinds.inc.h
 LLVMConventionsChecker.o: StmtNodes.inc.h
-LLVMConventionsChecker.po: AttrList.inc.h
-LLVMConventionsChecker.po: Attrs.inc.h
 LLVMConventionsChecker.po: Checkers.inc.h
+LLVMConventionsChecker.po: CommentCommandList.inc.h
 LLVMConventionsChecker.po: DeclNodes.inc.h
 LLVMConventionsChecker.po: DiagnosticCommonKinds.inc.h
 LLVMConventionsChecker.po: StmtNodes.inc.h
-MacOSKeychainAPIChecker.o: AttrList.inc.h
-MacOSKeychainAPIChecker.o: Attrs.inc.h
 MacOSKeychainAPIChecker.o: Checkers.inc.h
+MacOSKeychainAPIChecker.o: CommentCommandList.inc.h
 MacOSKeychainAPIChecker.o: DeclNodes.inc.h
 MacOSKeychainAPIChecker.o: DiagnosticCommonKinds.inc.h
 MacOSKeychainAPIChecker.o: StmtNodes.inc.h
-MacOSKeychainAPIChecker.po: AttrList.inc.h
-MacOSKeychainAPIChecker.po: Attrs.inc.h
 MacOSKeychainAPIChecker.po: Checkers.inc.h
+MacOSKeychainAPIChecker.po: CommentCommandList.inc.h
 MacOSKeychainAPIChecker.po: DeclNodes.inc.h
 MacOSKeychainAPIChecker.po: DiagnosticCommonKinds.inc.h
 MacOSKeychainAPIChecker.po: StmtNodes.inc.h
-MacOSXAPIChecker.o: AttrList.inc.h
-MacOSXAPIChecker.o: Attrs.inc.h
 MacOSXAPIChecker.o: Checkers.inc.h
+MacOSXAPIChecker.o: CommentCommandList.inc.h
 MacOSXAPIChecker.o: DeclNodes.inc.h
 MacOSXAPIChecker.o: DiagnosticCommonKinds.inc.h
 MacOSXAPIChecker.o: StmtNodes.inc.h
-MacOSXAPIChecker.po: AttrList.inc.h
-MacOSXAPIChecker.po: Attrs.inc.h
 MacOSXAPIChecker.po: Checkers.inc.h
+MacOSXAPIChecker.po: CommentCommandList.inc.h
 MacOSXAPIChecker.po: DeclNodes.inc.h
 MacOSXAPIChecker.po: DiagnosticCommonKinds.inc.h
 MacOSXAPIChecker.po: StmtNodes.inc.h
 MallocChecker.o: AttrList.inc.h
 MallocChecker.o: Attrs.inc.h
 MallocChecker.o: Checkers.inc.h
+MallocChecker.o: CommentCommandList.inc.h
 MallocChecker.o: DeclNodes.inc.h
 MallocChecker.o: DiagnosticCommonKinds.inc.h
 MallocChecker.o: StmtNodes.inc.h
 MallocChecker.po: AttrList.inc.h
 MallocChecker.po: Attrs.inc.h
 MallocChecker.po: Checkers.inc.h
+MallocChecker.po: CommentCommandList.inc.h
 MallocChecker.po: DeclNodes.inc.h
 MallocChecker.po: DiagnosticCommonKinds.inc.h
 MallocChecker.po: StmtNodes.inc.h
-MallocOverflowSecurityChecker.o: AttrList.inc.h
-MallocOverflowSecurityChecker.o: Attrs.inc.h
 MallocOverflowSecurityChecker.o: Checkers.inc.h
+MallocOverflowSecurityChecker.o: CommentCommandList.inc.h
 MallocOverflowSecurityChecker.o: DeclNodes.inc.h
 MallocOverflowSecurityChecker.o: DiagnosticCommonKinds.inc.h
 MallocOverflowSecurityChecker.o: StmtNodes.inc.h
-MallocOverflowSecurityChecker.po: AttrList.inc.h
-MallocOverflowSecurityChecker.po: Attrs.inc.h
 MallocOverflowSecurityChecker.po: Checkers.inc.h
+MallocOverflowSecurityChecker.po: CommentCommandList.inc.h
 MallocOverflowSecurityChecker.po: DeclNodes.inc.h
 MallocOverflowSecurityChecker.po: DiagnosticCommonKinds.inc.h
 MallocOverflowSecurityChecker.po: StmtNodes.inc.h
-MallocSizeofChecker.o: AttrList.inc.h
-MallocSizeofChecker.o: Attrs.inc.h
 MallocSizeofChecker.o: Checkers.inc.h
+MallocSizeofChecker.o: CommentCommandList.inc.h
 MallocSizeofChecker.o: DeclNodes.inc.h
 MallocSizeofChecker.o: DiagnosticCommonKinds.inc.h
 MallocSizeofChecker.o: StmtNodes.inc.h
-MallocSizeofChecker.po: AttrList.inc.h
-MallocSizeofChecker.po: Attrs.inc.h
 MallocSizeofChecker.po: Checkers.inc.h
+MallocSizeofChecker.po: CommentCommandList.inc.h
 MallocSizeofChecker.po: DeclNodes.inc.h
 MallocSizeofChecker.po: DiagnosticCommonKinds.inc.h
 MallocSizeofChecker.po: StmtNodes.inc.h
-NSAutoreleasePoolChecker.o: AttrList.inc.h
-NSAutoreleasePoolChecker.o: Attrs.inc.h
 NSAutoreleasePoolChecker.o: Checkers.inc.h
+NSAutoreleasePoolChecker.o: CommentCommandList.inc.h
 NSAutoreleasePoolChecker.o: DeclNodes.inc.h
 NSAutoreleasePoolChecker.o: DiagnosticCommonKinds.inc.h
 NSAutoreleasePoolChecker.o: StmtNodes.inc.h
-NSAutoreleasePoolChecker.po: AttrList.inc.h
-NSAutoreleasePoolChecker.po: Attrs.inc.h
 NSAutoreleasePoolChecker.po: Checkers.inc.h
+NSAutoreleasePoolChecker.po: CommentCommandList.inc.h
 NSAutoreleasePoolChecker.po: DeclNodes.inc.h
 NSAutoreleasePoolChecker.po: DiagnosticCommonKinds.inc.h
 NSAutoreleasePoolChecker.po: StmtNodes.inc.h
-NSErrorChecker.o: AttrList.inc.h
-NSErrorChecker.o: Attrs.inc.h
 NSErrorChecker.o: Checkers.inc.h
+NSErrorChecker.o: CommentCommandList.inc.h
 NSErrorChecker.o: DeclNodes.inc.h
 NSErrorChecker.o: DiagnosticCommonKinds.inc.h
 NSErrorChecker.o: StmtNodes.inc.h
-NSErrorChecker.po: AttrList.inc.h
-NSErrorChecker.po: Attrs.inc.h
 NSErrorChecker.po: Checkers.inc.h
+NSErrorChecker.po: CommentCommandList.inc.h
 NSErrorChecker.po: DeclNodes.inc.h
 NSErrorChecker.po: DiagnosticCommonKinds.inc.h
 NSErrorChecker.po: StmtNodes.inc.h
 NoReturnFunctionChecker.o: AttrList.inc.h
 NoReturnFunctionChecker.o: Attrs.inc.h
 NoReturnFunctionChecker.o: Checkers.inc.h
+NoReturnFunctionChecker.o: CommentCommandList.inc.h
 NoReturnFunctionChecker.o: DeclNodes.inc.h
 NoReturnFunctionChecker.o: DiagnosticCommonKinds.inc.h
 NoReturnFunctionChecker.o: StmtNodes.inc.h
 NoReturnFunctionChecker.po: AttrList.inc.h
 NoReturnFunctionChecker.po: Attrs.inc.h
 NoReturnFunctionChecker.po: Checkers.inc.h
+NoReturnFunctionChecker.po: CommentCommandList.inc.h
 NoReturnFunctionChecker.po: DeclNodes.inc.h
 NoReturnFunctionChecker.po: DiagnosticCommonKinds.inc.h
 NoReturnFunctionChecker.po: StmtNodes.inc.h
-ObjCAtSyncChecker.o: AttrList.inc.h
-ObjCAtSyncChecker.o: Attrs.inc.h
+NonNullParamChecker.o: AttrList.inc.h
+NonNullParamChecker.o: Attrs.inc.h
+NonNullParamChecker.o: Checkers.inc.h
+NonNullParamChecker.o: CommentCommandList.inc.h
+NonNullParamChecker.o: DeclNodes.inc.h
+NonNullParamChecker.o: DiagnosticCommonKinds.inc.h
+NonNullParamChecker.o: StmtNodes.inc.h
+NonNullParamChecker.po: AttrList.inc.h
+NonNullParamChecker.po: Attrs.inc.h
+NonNullParamChecker.po: Checkers.inc.h
+NonNullParamChecker.po: CommentCommandList.inc.h
+NonNullParamChecker.po: DeclNodes.inc.h
+NonNullParamChecker.po: DiagnosticCommonKinds.inc.h
+NonNullParamChecker.po: StmtNodes.inc.h
 ObjCAtSyncChecker.o: Checkers.inc.h
+ObjCAtSyncChecker.o: CommentCommandList.inc.h
 ObjCAtSyncChecker.o: DeclNodes.inc.h
 ObjCAtSyncChecker.o: DiagnosticCommonKinds.inc.h
 ObjCAtSyncChecker.o: StmtNodes.inc.h
-ObjCAtSyncChecker.po: AttrList.inc.h
-ObjCAtSyncChecker.po: Attrs.inc.h
 ObjCAtSyncChecker.po: Checkers.inc.h
+ObjCAtSyncChecker.po: CommentCommandList.inc.h
 ObjCAtSyncChecker.po: DeclNodes.inc.h
 ObjCAtSyncChecker.po: DiagnosticCommonKinds.inc.h
 ObjCAtSyncChecker.po: StmtNodes.inc.h
-ObjCContainersASTChecker.o: AttrList.inc.h
-ObjCContainersASTChecker.o: Attrs.inc.h
 ObjCContainersASTChecker.o: Checkers.inc.h
+ObjCContainersASTChecker.o: CommentCommandList.inc.h
 ObjCContainersASTChecker.o: DeclNodes.inc.h
 ObjCContainersASTChecker.o: DiagnosticCommonKinds.inc.h
 ObjCContainersASTChecker.o: StmtNodes.inc.h
-ObjCContainersASTChecker.po: AttrList.inc.h
-ObjCContainersASTChecker.po: Attrs.inc.h
 ObjCContainersASTChecker.po: Checkers.inc.h
+ObjCContainersASTChecker.po: CommentCommandList.inc.h
 ObjCContainersASTChecker.po: DeclNodes.inc.h
 ObjCContainersASTChecker.po: DiagnosticCommonKinds.inc.h
 ObjCContainersASTChecker.po: StmtNodes.inc.h
-ObjCContainersChecker.o: AttrList.inc.h
-ObjCContainersChecker.o: Attrs.inc.h
 ObjCContainersChecker.o: Checkers.inc.h
+ObjCContainersChecker.o: CommentCommandList.inc.h
 ObjCContainersChecker.o: DeclNodes.inc.h
 ObjCContainersChecker.o: DiagnosticCommonKinds.inc.h
 ObjCContainersChecker.o: StmtNodes.inc.h
-ObjCContainersChecker.po: AttrList.inc.h
-ObjCContainersChecker.po: Attrs.inc.h
 ObjCContainersChecker.po: Checkers.inc.h
+ObjCContainersChecker.po: CommentCommandList.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: CommentCommandList.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: CommentCommandList.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
+ObjCSelfInitChecker.o: CommentCommandList.inc.h
 ObjCSelfInitChecker.o: DeclNodes.inc.h
 ObjCSelfInitChecker.o: DiagnosticCommonKinds.inc.h
 ObjCSelfInitChecker.o: StmtNodes.inc.h
-ObjCSelfInitChecker.po: AttrList.inc.h
-ObjCSelfInitChecker.po: Attrs.inc.h
 ObjCSelfInitChecker.po: Checkers.inc.h
+ObjCSelfInitChecker.po: CommentCommandList.inc.h
 ObjCSelfInitChecker.po: DeclNodes.inc.h
 ObjCSelfInitChecker.po: DiagnosticCommonKinds.inc.h
 ObjCSelfInitChecker.po: StmtNodes.inc.h
 ObjCUnusedIVarsChecker.o: AttrList.inc.h
 ObjCUnusedIVarsChecker.o: Attrs.inc.h
 ObjCUnusedIVarsChecker.o: Checkers.inc.h
+ObjCUnusedIVarsChecker.o: CommentCommandList.inc.h
 ObjCUnusedIVarsChecker.o: DeclNodes.inc.h
 ObjCUnusedIVarsChecker.o: DiagnosticCommonKinds.inc.h
 ObjCUnusedIVarsChecker.o: StmtNodes.inc.h
 ObjCUnusedIVarsChecker.po: AttrList.inc.h
 ObjCUnusedIVarsChecker.po: Attrs.inc.h
 ObjCUnusedIVarsChecker.po: Checkers.inc.h
+ObjCUnusedIVarsChecker.po: CommentCommandList.inc.h
 ObjCUnusedIVarsChecker.po: DeclNodes.inc.h
 ObjCUnusedIVarsChecker.po: DiagnosticCommonKinds.inc.h
 ObjCUnusedIVarsChecker.po: StmtNodes.inc.h
-PointerArithChecker.o: AttrList.inc.h
-PointerArithChecker.o: Attrs.inc.h
 PointerArithChecker.o: Checkers.inc.h
+PointerArithChecker.o: CommentCommandList.inc.h
 PointerArithChecker.o: DeclNodes.inc.h
 PointerArithChecker.o: DiagnosticCommonKinds.inc.h
 PointerArithChecker.o: StmtNodes.inc.h
-PointerArithChecker.po: AttrList.inc.h
-PointerArithChecker.po: Attrs.inc.h
 PointerArithChecker.po: Checkers.inc.h
+PointerArithChecker.po: CommentCommandList.inc.h
 PointerArithChecker.po: DeclNodes.inc.h
 PointerArithChecker.po: DiagnosticCommonKinds.inc.h
 PointerArithChecker.po: StmtNodes.inc.h
-PointerSubChecker.o: AttrList.inc.h
-PointerSubChecker.o: Attrs.inc.h
 PointerSubChecker.o: Checkers.inc.h
+PointerSubChecker.o: CommentCommandList.inc.h
 PointerSubChecker.o: DeclNodes.inc.h
 PointerSubChecker.o: DiagnosticCommonKinds.inc.h
 PointerSubChecker.o: StmtNodes.inc.h
-PointerSubChecker.po: AttrList.inc.h
-PointerSubChecker.po: Attrs.inc.h
 PointerSubChecker.po: Checkers.inc.h
+PointerSubChecker.po: CommentCommandList.inc.h
 PointerSubChecker.po: DeclNodes.inc.h
 PointerSubChecker.po: DiagnosticCommonKinds.inc.h
 PointerSubChecker.po: StmtNodes.inc.h
-PthreadLockChecker.o: AttrList.inc.h
-PthreadLockChecker.o: Attrs.inc.h
 PthreadLockChecker.o: Checkers.inc.h
+PthreadLockChecker.o: CommentCommandList.inc.h
 PthreadLockChecker.o: DeclNodes.inc.h
 PthreadLockChecker.o: DiagnosticCommonKinds.inc.h
 PthreadLockChecker.o: StmtNodes.inc.h
-PthreadLockChecker.po: AttrList.inc.h
-PthreadLockChecker.po: Attrs.inc.h
 PthreadLockChecker.po: Checkers.inc.h
+PthreadLockChecker.po: CommentCommandList.inc.h
 PthreadLockChecker.po: DeclNodes.inc.h
 PthreadLockChecker.po: DiagnosticCommonKinds.inc.h
 PthreadLockChecker.po: StmtNodes.inc.h
 RetainCountChecker.o: AttrList.inc.h
 RetainCountChecker.o: Attrs.inc.h
 RetainCountChecker.o: Checkers.inc.h
+RetainCountChecker.o: CommentCommandList.inc.h
 RetainCountChecker.o: DeclNodes.inc.h
 RetainCountChecker.o: DiagnosticCommonKinds.inc.h
 RetainCountChecker.o: StmtNodes.inc.h
 RetainCountChecker.po: AttrList.inc.h
 RetainCountChecker.po: Attrs.inc.h
 RetainCountChecker.po: Checkers.inc.h
+RetainCountChecker.po: CommentCommandList.inc.h
 RetainCountChecker.po: DeclNodes.inc.h
 RetainCountChecker.po: DiagnosticCommonKinds.inc.h
 RetainCountChecker.po: StmtNodes.inc.h
-ReturnPointerRangeChecker.o: AttrList.inc.h
-ReturnPointerRangeChecker.o: Attrs.inc.h
 ReturnPointerRangeChecker.o: Checkers.inc.h
+ReturnPointerRangeChecker.o: CommentCommandList.inc.h
 ReturnPointerRangeChecker.o: DeclNodes.inc.h
 ReturnPointerRangeChecker.o: DiagnosticCommonKinds.inc.h
 ReturnPointerRangeChecker.o: StmtNodes.inc.h
-ReturnPointerRangeChecker.po: AttrList.inc.h
-ReturnPointerRangeChecker.po: Attrs.inc.h
 ReturnPointerRangeChecker.po: Checkers.inc.h
+ReturnPointerRangeChecker.po: CommentCommandList.inc.h
 ReturnPointerRangeChecker.po: DeclNodes.inc.h
 ReturnPointerRangeChecker.po: DiagnosticCommonKinds.inc.h
 ReturnPointerRangeChecker.po: StmtNodes.inc.h
-ReturnUndefChecker.o: AttrList.inc.h
-ReturnUndefChecker.o: Attrs.inc.h
 ReturnUndefChecker.o: Checkers.inc.h
+ReturnUndefChecker.o: CommentCommandList.inc.h
 ReturnUndefChecker.o: DeclNodes.inc.h
 ReturnUndefChecker.o: DiagnosticCommonKinds.inc.h
 ReturnUndefChecker.o: StmtNodes.inc.h
-ReturnUndefChecker.po: AttrList.inc.h
-ReturnUndefChecker.po: Attrs.inc.h
 ReturnUndefChecker.po: Checkers.inc.h
+ReturnUndefChecker.po: CommentCommandList.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: CommentCommandList.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: CommentCommandList.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
+StackAddrEscapeChecker.o: CommentCommandList.inc.h
 StackAddrEscapeChecker.o: DeclNodes.inc.h
 StackAddrEscapeChecker.o: DiagnosticCommonKinds.inc.h
 StackAddrEscapeChecker.o: StmtNodes.inc.h
-StackAddrEscapeChecker.po: AttrList.inc.h
-StackAddrEscapeChecker.po: Attrs.inc.h
 StackAddrEscapeChecker.po: Checkers.inc.h
+StackAddrEscapeChecker.po: CommentCommandList.inc.h
 StackAddrEscapeChecker.po: DeclNodes.inc.h
 StackAddrEscapeChecker.po: DiagnosticCommonKinds.inc.h
 StackAddrEscapeChecker.po: StmtNodes.inc.h
-StreamChecker.o: AttrList.inc.h
-StreamChecker.o: Attrs.inc.h
 StreamChecker.o: Checkers.inc.h
+StreamChecker.o: CommentCommandList.inc.h
 StreamChecker.o: DeclNodes.inc.h
 StreamChecker.o: DiagnosticCommonKinds.inc.h
 StreamChecker.o: StmtNodes.inc.h
-StreamChecker.po: AttrList.inc.h
-StreamChecker.po: Attrs.inc.h
 StreamChecker.po: Checkers.inc.h
+StreamChecker.po: CommentCommandList.inc.h
 StreamChecker.po: DeclNodes.inc.h
 StreamChecker.po: DiagnosticCommonKinds.inc.h
 StreamChecker.po: StmtNodes.inc.h
-TaintTesterChecker.o: AttrList.inc.h
-TaintTesterChecker.o: Attrs.inc.h
 TaintTesterChecker.o: Checkers.inc.h
+TaintTesterChecker.o: CommentCommandList.inc.h
 TaintTesterChecker.o: DeclNodes.inc.h
 TaintTesterChecker.o: DiagnosticCommonKinds.inc.h
 TaintTesterChecker.o: StmtNodes.inc.h
-TaintTesterChecker.po: AttrList.inc.h
-TaintTesterChecker.po: Attrs.inc.h
 TaintTesterChecker.po: Checkers.inc.h
+TaintTesterChecker.po: CommentCommandList.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: CommentCommandList.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: CommentCommandList.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
+UndefBranchChecker.o: CommentCommandList.inc.h
 UndefBranchChecker.o: DeclNodes.inc.h
 UndefBranchChecker.o: DiagnosticCommonKinds.inc.h
 UndefBranchChecker.o: StmtNodes.inc.h
-UndefBranchChecker.po: AttrList.inc.h
-UndefBranchChecker.po: Attrs.inc.h
 UndefBranchChecker.po: Checkers.inc.h
+UndefBranchChecker.po: CommentCommandList.inc.h
 UndefBranchChecker.po: DeclNodes.inc.h
 UndefBranchChecker.po: DiagnosticCommonKinds.inc.h
 UndefBranchChecker.po: StmtNodes.inc.h
 UndefCapturedBlockVarChecker.o: AttrList.inc.h
 UndefCapturedBlockVarChecker.o: Attrs.inc.h
 UndefCapturedBlockVarChecker.o: Checkers.inc.h
+UndefCapturedBlockVarChecker.o: CommentCommandList.inc.h
 UndefCapturedBlockVarChecker.o: DeclNodes.inc.h
 UndefCapturedBlockVarChecker.o: DiagnosticCommonKinds.inc.h
 UndefCapturedBlockVarChecker.o: StmtNodes.inc.h
 UndefCapturedBlockVarChecker.po: AttrList.inc.h
 UndefCapturedBlockVarChecker.po: Attrs.inc.h
 UndefCapturedBlockVarChecker.po: Checkers.inc.h
+UndefCapturedBlockVarChecker.po: CommentCommandList.inc.h
 UndefCapturedBlockVarChecker.po: DeclNodes.inc.h
 UndefCapturedBlockVarChecker.po: DiagnosticCommonKinds.inc.h
 UndefCapturedBlockVarChecker.po: StmtNodes.inc.h
-UndefResultChecker.o: AttrList.inc.h
-UndefResultChecker.o: Attrs.inc.h
 UndefResultChecker.o: Checkers.inc.h
+UndefResultChecker.o: CommentCommandList.inc.h
 UndefResultChecker.o: DeclNodes.inc.h
 UndefResultChecker.o: DiagnosticCommonKinds.inc.h
 UndefResultChecker.o: StmtNodes.inc.h
-UndefResultChecker.po: AttrList.inc.h
-UndefResultChecker.po: Attrs.inc.h
 UndefResultChecker.po: Checkers.inc.h
+UndefResultChecker.po: CommentCommandList.inc.h
 UndefResultChecker.po: DeclNodes.inc.h
 UndefResultChecker.po: DiagnosticCommonKinds.inc.h
 UndefResultChecker.po: StmtNodes.inc.h
-UndefinedArraySubscriptChecker.o: AttrList.inc.h
-UndefinedArraySubscriptChecker.o: Attrs.inc.h
 UndefinedArraySubscriptChecker.o: Checkers.inc.h
+UndefinedArraySubscriptChecker.o: CommentCommandList.inc.h
 UndefinedArraySubscriptChecker.o: DeclNodes.inc.h
 UndefinedArraySubscriptChecker.o: DiagnosticCommonKinds.inc.h
 UndefinedArraySubscriptChecker.o: StmtNodes.inc.h
-UndefinedArraySubscriptChecker.po: AttrList.inc.h
-UndefinedArraySubscriptChecker.po: Attrs.inc.h
 UndefinedArraySubscriptChecker.po: Checkers.inc.h
+UndefinedArraySubscriptChecker.po: CommentCommandList.inc.h
 UndefinedArraySubscriptChecker.po: DeclNodes.inc.h
 UndefinedArraySubscriptChecker.po: DiagnosticCommonKinds.inc.h
 UndefinedArraySubscriptChecker.po: StmtNodes.inc.h
-UndefinedAssignmentChecker.o: AttrList.inc.h
-UndefinedAssignmentChecker.o: Attrs.inc.h
 UndefinedAssignmentChecker.o: Checkers.inc.h
+UndefinedAssignmentChecker.o: CommentCommandList.inc.h
 UndefinedAssignmentChecker.o: DeclNodes.inc.h
 UndefinedAssignmentChecker.o: DiagnosticCommonKinds.inc.h
 UndefinedAssignmentChecker.o: StmtNodes.inc.h
-UndefinedAssignmentChecker.po: AttrList.inc.h
-UndefinedAssignmentChecker.po: Attrs.inc.h
 UndefinedAssignmentChecker.po: Checkers.inc.h
+UndefinedAssignmentChecker.po: CommentCommandList.inc.h
 UndefinedAssignmentChecker.po: DeclNodes.inc.h
 UndefinedAssignmentChecker.po: DiagnosticCommonKinds.inc.h
 UndefinedAssignmentChecker.po: StmtNodes.inc.h
-UnixAPIChecker.o: AttrList.inc.h
-UnixAPIChecker.o: Attrs.inc.h
 UnixAPIChecker.o: Checkers.inc.h
+UnixAPIChecker.o: CommentCommandList.inc.h
 UnixAPIChecker.o: DeclNodes.inc.h
 UnixAPIChecker.o: DiagnosticCommonKinds.inc.h
 UnixAPIChecker.o: StmtNodes.inc.h
-UnixAPIChecker.po: AttrList.inc.h
-UnixAPIChecker.po: Attrs.inc.h
 UnixAPIChecker.po: Checkers.inc.h
+UnixAPIChecker.po: CommentCommandList.inc.h
 UnixAPIChecker.po: DeclNodes.inc.h
 UnixAPIChecker.po: DiagnosticCommonKinds.inc.h
 UnixAPIChecker.po: StmtNodes.inc.h
-UnreachableCodeChecker.o: AttrList.inc.h
-UnreachableCodeChecker.o: Attrs.inc.h
 UnreachableCodeChecker.o: Checkers.inc.h
+UnreachableCodeChecker.o: CommentCommandList.inc.h
 UnreachableCodeChecker.o: DeclNodes.inc.h
 UnreachableCodeChecker.o: DiagnosticCommonKinds.inc.h
 UnreachableCodeChecker.o: StmtNodes.inc.h
-UnreachableCodeChecker.po: AttrList.inc.h
-UnreachableCodeChecker.po: Attrs.inc.h
 UnreachableCodeChecker.po: Checkers.inc.h
+UnreachableCodeChecker.po: CommentCommandList.inc.h
 UnreachableCodeChecker.po: DeclNodes.inc.h
 UnreachableCodeChecker.po: DiagnosticCommonKinds.inc.h
 UnreachableCodeChecker.po: StmtNodes.inc.h
-VLASizeChecker.o: AttrList.inc.h
-VLASizeChecker.o: Attrs.inc.h
 VLASizeChecker.o: Checkers.inc.h
+VLASizeChecker.o: CommentCommandList.inc.h
 VLASizeChecker.o: DeclNodes.inc.h
 VLASizeChecker.o: DiagnosticCommonKinds.inc.h
 VLASizeChecker.o: StmtNodes.inc.h
-VLASizeChecker.po: AttrList.inc.h
-VLASizeChecker.po: Attrs.inc.h
 VLASizeChecker.po: Checkers.inc.h
+VLASizeChecker.po: CommentCommandList.inc.h
 VLASizeChecker.po: DeclNodes.inc.h
 VLASizeChecker.po: DiagnosticCommonKinds.inc.h
 VLASizeChecker.po: StmtNodes.inc.h
-VirtualCallChecker.o: AttrList.inc.h
-VirtualCallChecker.o: Attrs.inc.h
 VirtualCallChecker.o: Checkers.inc.h
+VirtualCallChecker.o: CommentCommandList.inc.h
 VirtualCallChecker.o: DeclNodes.inc.h
 VirtualCallChecker.o: DiagnosticCommonKinds.inc.h
 VirtualCallChecker.o: StmtNodes.inc.h
-VirtualCallChecker.po: AttrList.inc.h
-VirtualCallChecker.po: Attrs.inc.h
 VirtualCallChecker.po: Checkers.inc.h
+VirtualCallChecker.po: CommentCommandList.inc.h
 VirtualCallChecker.po: DeclNodes.inc.h
 VirtualCallChecker.po: DiagnosticCommonKinds.inc.h
 VirtualCallChecker.po: StmtNodes.inc.h
diff --git a/lib/clang/libclangstaticanalyzercore/Makefile.depend b/lib/clang/libclangstaticanalyzercore/Makefile.depend
index 1e4a32f..ced08b2 100644
--- a/lib/clang/libclangstaticanalyzercore/Makefile.depend
+++ b/lib/clang/libclangstaticanalyzercore/Makefile.depend
@@ -8,357 +8,284 @@ DIRDEPS = \
 	include \
 	include/xlocale \
 	lib/msun \
+	usr.bin/clang/clang-tblgen.host \
 
 
 .include <dirdeps.mk>
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
-AnalysisManager.o: AttrList.inc.h
-AnalysisManager.o: Attrs.inc.h
+AnalysisManager.o: CommentCommandList.inc.h
 AnalysisManager.o: DeclNodes.inc.h
 AnalysisManager.o: DiagnosticCommonKinds.inc.h
 AnalysisManager.o: StmtNodes.inc.h
-AnalysisManager.po: AttrList.inc.h
-AnalysisManager.po: Attrs.inc.h
+AnalysisManager.po: CommentCommandList.inc.h
 AnalysisManager.po: DeclNodes.inc.h
 AnalysisManager.po: DiagnosticCommonKinds.inc.h
 AnalysisManager.po: StmtNodes.inc.h
-BasicValueFactory.o: AttrList.inc.h
-BasicValueFactory.o: Attrs.inc.h
+BasicValueFactory.o: CommentCommandList.inc.h
 BasicValueFactory.o: DeclNodes.inc.h
 BasicValueFactory.o: DiagnosticCommonKinds.inc.h
 BasicValueFactory.o: StmtNodes.inc.h
-BasicValueFactory.po: AttrList.inc.h
-BasicValueFactory.po: Attrs.inc.h
+BasicValueFactory.po: CommentCommandList.inc.h
 BasicValueFactory.po: DeclNodes.inc.h
 BasicValueFactory.po: DiagnosticCommonKinds.inc.h
 BasicValueFactory.po: StmtNodes.inc.h
-BugReporter.o: AttrList.inc.h
-BugReporter.o: Attrs.inc.h
+BugReporter.o: CommentCommandList.inc.h
 BugReporter.o: DeclNodes.inc.h
 BugReporter.o: DiagnosticCommonKinds.inc.h
 BugReporter.o: StmtNodes.inc.h
-BugReporter.po: AttrList.inc.h
-BugReporter.po: Attrs.inc.h
+BugReporter.po: CommentCommandList.inc.h
 BugReporter.po: DeclNodes.inc.h
 BugReporter.po: DiagnosticCommonKinds.inc.h
 BugReporter.po: StmtNodes.inc.h
-BugReporterVisitors.o: AttrList.inc.h
-BugReporterVisitors.o: Attrs.inc.h
+BugReporterVisitors.o: CommentCommandList.inc.h
 BugReporterVisitors.o: DeclNodes.inc.h
 BugReporterVisitors.o: DiagnosticCommonKinds.inc.h
 BugReporterVisitors.o: StmtNodes.inc.h
-BugReporterVisitors.po: AttrList.inc.h
-BugReporterVisitors.po: Attrs.inc.h
+BugReporterVisitors.po: CommentCommandList.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: CommentCommandList.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: CommentCommandList.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: CommentCommandList.inc.h
 Checker.o: DeclNodes.inc.h
 Checker.o: DiagnosticCommonKinds.inc.h
 Checker.o: StmtNodes.inc.h
-Checker.po: AttrList.inc.h
-Checker.po: Attrs.inc.h
+Checker.po: CommentCommandList.inc.h
 Checker.po: DeclNodes.inc.h
 Checker.po: DiagnosticCommonKinds.inc.h
 Checker.po: StmtNodes.inc.h
-CheckerContext.o: AttrList.inc.h
-CheckerContext.o: Attrs.inc.h
+CheckerContext.o: CommentCommandList.inc.h
 CheckerContext.o: DeclNodes.inc.h
 CheckerContext.o: DiagnosticCommonKinds.inc.h
 CheckerContext.o: StmtNodes.inc.h
-CheckerContext.po: AttrList.inc.h
-CheckerContext.po: Attrs.inc.h
+CheckerContext.po: CommentCommandList.inc.h
 CheckerContext.po: DeclNodes.inc.h
 CheckerContext.po: DiagnosticCommonKinds.inc.h
 CheckerContext.po: StmtNodes.inc.h
-CheckerHelpers.o: AttrList.inc.h
-CheckerHelpers.o: Attrs.inc.h
 CheckerHelpers.o: DeclNodes.inc.h
 CheckerHelpers.o: DiagnosticCommonKinds.inc.h
 CheckerHelpers.o: StmtNodes.inc.h
-CheckerHelpers.po: AttrList.inc.h
-CheckerHelpers.po: Attrs.inc.h
 CheckerHelpers.po: DeclNodes.inc.h
 CheckerHelpers.po: DiagnosticCommonKinds.inc.h
 CheckerHelpers.po: StmtNodes.inc.h
-CheckerManager.o: AttrList.inc.h
-CheckerManager.o: Attrs.inc.h
+CheckerManager.o: CommentCommandList.inc.h
 CheckerManager.o: DeclNodes.inc.h
 CheckerManager.o: DiagnosticCommonKinds.inc.h
 CheckerManager.o: StmtNodes.inc.h
-CheckerManager.po: AttrList.inc.h
-CheckerManager.po: Attrs.inc.h
+CheckerManager.po: CommentCommandList.inc.h
 CheckerManager.po: DeclNodes.inc.h
 CheckerManager.po: DiagnosticCommonKinds.inc.h
 CheckerManager.po: StmtNodes.inc.h
-CheckerRegistry.o: AttrList.inc.h
-CheckerRegistry.o: Attrs.inc.h
+CheckerRegistry.o: CommentCommandList.inc.h
 CheckerRegistry.o: DeclNodes.inc.h
 CheckerRegistry.o: DiagnosticCommonKinds.inc.h
 CheckerRegistry.o: StmtNodes.inc.h
-CheckerRegistry.po: AttrList.inc.h
-CheckerRegistry.po: Attrs.inc.h
+CheckerRegistry.po: CommentCommandList.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: CommentCommandList.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: CommentCommandList.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: CommentCommandList.inc.h
 CoreEngine.o: DeclNodes.inc.h
 CoreEngine.o: DiagnosticCommonKinds.inc.h
 CoreEngine.o: StmtNodes.inc.h
-CoreEngine.po: AttrList.inc.h
-CoreEngine.po: Attrs.inc.h
+CoreEngine.po: CommentCommandList.inc.h
 CoreEngine.po: DeclNodes.inc.h
 CoreEngine.po: DiagnosticCommonKinds.inc.h
 CoreEngine.po: StmtNodes.inc.h
-Environment.o: AttrList.inc.h
-Environment.o: Attrs.inc.h
+Environment.o: CommentCommandList.inc.h
 Environment.o: DeclNodes.inc.h
 Environment.o: DiagnosticCommonKinds.inc.h
 Environment.o: StmtNodes.inc.h
-Environment.po: AttrList.inc.h
-Environment.po: Attrs.inc.h
+Environment.po: CommentCommandList.inc.h
 Environment.po: DeclNodes.inc.h
 Environment.po: DiagnosticCommonKinds.inc.h
 Environment.po: StmtNodes.inc.h
-ExplodedGraph.o: AttrList.inc.h
-ExplodedGraph.o: Attrs.inc.h
+ExplodedGraph.o: CommentCommandList.inc.h
 ExplodedGraph.o: DeclNodes.inc.h
 ExplodedGraph.o: DiagnosticCommonKinds.inc.h
 ExplodedGraph.o: StmtNodes.inc.h
-ExplodedGraph.po: AttrList.inc.h
-ExplodedGraph.po: Attrs.inc.h
+ExplodedGraph.po: CommentCommandList.inc.h
 ExplodedGraph.po: DeclNodes.inc.h
 ExplodedGraph.po: DiagnosticCommonKinds.inc.h
 ExplodedGraph.po: StmtNodes.inc.h
-ExprEngine.o: AttrList.inc.h
-ExprEngine.o: Attrs.inc.h
+ExprEngine.o: CommentCommandList.inc.h
 ExprEngine.o: DeclNodes.inc.h
 ExprEngine.o: DiagnosticCommonKinds.inc.h
 ExprEngine.o: StmtNodes.inc.h
-ExprEngine.po: AttrList.inc.h
-ExprEngine.po: Attrs.inc.h
+ExprEngine.po: CommentCommandList.inc.h
 ExprEngine.po: DeclNodes.inc.h
 ExprEngine.po: DiagnosticCommonKinds.inc.h
 ExprEngine.po: StmtNodes.inc.h
-ExprEngineC.o: AttrList.inc.h
-ExprEngineC.o: Attrs.inc.h
+ExprEngineC.o: CommentCommandList.inc.h
 ExprEngineC.o: DeclNodes.inc.h
 ExprEngineC.o: DiagnosticCommonKinds.inc.h
 ExprEngineC.o: StmtNodes.inc.h
-ExprEngineC.po: AttrList.inc.h
-ExprEngineC.po: Attrs.inc.h
+ExprEngineC.po: CommentCommandList.inc.h
 ExprEngineC.po: DeclNodes.inc.h
 ExprEngineC.po: DiagnosticCommonKinds.inc.h
 ExprEngineC.po: StmtNodes.inc.h
-ExprEngineCXX.o: AttrList.inc.h
-ExprEngineCXX.o: Attrs.inc.h
+ExprEngineCXX.o: CommentCommandList.inc.h
 ExprEngineCXX.o: DeclNodes.inc.h
 ExprEngineCXX.o: DiagnosticCommonKinds.inc.h
 ExprEngineCXX.o: StmtNodes.inc.h
-ExprEngineCXX.po: AttrList.inc.h
-ExprEngineCXX.po: Attrs.inc.h
+ExprEngineCXX.po: CommentCommandList.inc.h
 ExprEngineCXX.po: DeclNodes.inc.h
 ExprEngineCXX.po: DiagnosticCommonKinds.inc.h
 ExprEngineCXX.po: StmtNodes.inc.h
-ExprEngineCallAndReturn.o: AttrList.inc.h
-ExprEngineCallAndReturn.o: Attrs.inc.h
+ExprEngineCallAndReturn.o: CommentCommandList.inc.h
 ExprEngineCallAndReturn.o: DeclNodes.inc.h
 ExprEngineCallAndReturn.o: DiagnosticCommonKinds.inc.h
 ExprEngineCallAndReturn.o: StmtNodes.inc.h
-ExprEngineCallAndReturn.po: AttrList.inc.h
-ExprEngineCallAndReturn.po: Attrs.inc.h
+ExprEngineCallAndReturn.po: CommentCommandList.inc.h
 ExprEngineCallAndReturn.po: DeclNodes.inc.h
 ExprEngineCallAndReturn.po: DiagnosticCommonKinds.inc.h
 ExprEngineCallAndReturn.po: StmtNodes.inc.h
-ExprEngineObjC.o: AttrList.inc.h
-ExprEngineObjC.o: Attrs.inc.h
+ExprEngineObjC.o: CommentCommandList.inc.h
 ExprEngineObjC.o: DeclNodes.inc.h
 ExprEngineObjC.o: DiagnosticCommonKinds.inc.h
 ExprEngineObjC.o: StmtNodes.inc.h
-ExprEngineObjC.po: AttrList.inc.h
-ExprEngineObjC.po: Attrs.inc.h
+ExprEngineObjC.po: CommentCommandList.inc.h
 ExprEngineObjC.po: DeclNodes.inc.h
 ExprEngineObjC.po: DiagnosticCommonKinds.inc.h
 ExprEngineObjC.po: StmtNodes.inc.h
-FunctionSummary.o: AttrList.inc.h
-FunctionSummary.o: Attrs.inc.h
-FunctionSummary.o: DeclNodes.inc.h
-FunctionSummary.o: DiagnosticCommonKinds.inc.h
-FunctionSummary.po: AttrList.inc.h
-FunctionSummary.po: Attrs.inc.h
-FunctionSummary.po: DeclNodes.inc.h
-FunctionSummary.po: DiagnosticCommonKinds.inc.h
-HTMLDiagnostics.o: AttrList.inc.h
-HTMLDiagnostics.o: Attrs.inc.h
+HTMLDiagnostics.o: CommentCommandList.inc.h
 HTMLDiagnostics.o: DeclNodes.inc.h
 HTMLDiagnostics.o: DiagnosticCommonKinds.inc.h
 HTMLDiagnostics.o: StmtNodes.inc.h
-HTMLDiagnostics.po: AttrList.inc.h
-HTMLDiagnostics.po: Attrs.inc.h
+HTMLDiagnostics.po: CommentCommandList.inc.h
 HTMLDiagnostics.po: DeclNodes.inc.h
 HTMLDiagnostics.po: DiagnosticCommonKinds.inc.h
 HTMLDiagnostics.po: StmtNodes.inc.h
 MemRegion.o: AttrList.inc.h
 MemRegion.o: Attrs.inc.h
+MemRegion.o: CommentCommandList.inc.h
 MemRegion.o: DeclNodes.inc.h
 MemRegion.o: DiagnosticCommonKinds.inc.h
 MemRegion.o: StmtNodes.inc.h
 MemRegion.po: AttrList.inc.h
 MemRegion.po: Attrs.inc.h
+MemRegion.po: CommentCommandList.inc.h
 MemRegion.po: DeclNodes.inc.h
 MemRegion.po: DiagnosticCommonKinds.inc.h
 MemRegion.po: StmtNodes.inc.h
-PathDiagnostic.o: AttrList.inc.h
-PathDiagnostic.o: Attrs.inc.h
+PathDiagnostic.o: CommentCommandList.inc.h
 PathDiagnostic.o: DeclNodes.inc.h
 PathDiagnostic.o: DiagnosticCommonKinds.inc.h
 PathDiagnostic.o: StmtNodes.inc.h
-PathDiagnostic.po: AttrList.inc.h
-PathDiagnostic.po: Attrs.inc.h
+PathDiagnostic.po: CommentCommandList.inc.h
 PathDiagnostic.po: DeclNodes.inc.h
 PathDiagnostic.po: DiagnosticCommonKinds.inc.h
 PathDiagnostic.po: StmtNodes.inc.h
-PlistDiagnostics.o: AttrList.inc.h
-PlistDiagnostics.o: Attrs.inc.h
 PlistDiagnostics.o: DeclNodes.inc.h
 PlistDiagnostics.o: DiagnosticCommonKinds.inc.h
 PlistDiagnostics.o: StmtNodes.inc.h
-PlistDiagnostics.po: AttrList.inc.h
-PlistDiagnostics.po: Attrs.inc.h
 PlistDiagnostics.po: DeclNodes.inc.h
 PlistDiagnostics.po: DiagnosticCommonKinds.inc.h
 PlistDiagnostics.po: StmtNodes.inc.h
-ProgramState.o: AttrList.inc.h
-ProgramState.o: Attrs.inc.h
+ProgramState.o: CommentCommandList.inc.h
 ProgramState.o: DeclNodes.inc.h
 ProgramState.o: DiagnosticCommonKinds.inc.h
 ProgramState.o: StmtNodes.inc.h
-ProgramState.po: AttrList.inc.h
-ProgramState.po: Attrs.inc.h
+ProgramState.po: CommentCommandList.inc.h
 ProgramState.po: DeclNodes.inc.h
 ProgramState.po: DiagnosticCommonKinds.inc.h
 ProgramState.po: StmtNodes.inc.h
-RangeConstraintManager.o: AttrList.inc.h
-RangeConstraintManager.o: Attrs.inc.h
+RangeConstraintManager.o: CommentCommandList.inc.h
 RangeConstraintManager.o: DeclNodes.inc.h
 RangeConstraintManager.o: DiagnosticCommonKinds.inc.h
 RangeConstraintManager.o: StmtNodes.inc.h
-RangeConstraintManager.po: AttrList.inc.h
-RangeConstraintManager.po: Attrs.inc.h
+RangeConstraintManager.po: CommentCommandList.inc.h
 RangeConstraintManager.po: DeclNodes.inc.h
 RangeConstraintManager.po: DiagnosticCommonKinds.inc.h
 RangeConstraintManager.po: StmtNodes.inc.h
 RegionStore.o: AttrList.inc.h
 RegionStore.o: Attrs.inc.h
+RegionStore.o: CommentCommandList.inc.h
 RegionStore.o: DeclNodes.inc.h
 RegionStore.o: DiagnosticCommonKinds.inc.h
 RegionStore.o: StmtNodes.inc.h
 RegionStore.po: AttrList.inc.h
 RegionStore.po: Attrs.inc.h
+RegionStore.po: CommentCommandList.inc.h
 RegionStore.po: DeclNodes.inc.h
 RegionStore.po: DiagnosticCommonKinds.inc.h
 RegionStore.po: StmtNodes.inc.h
-SValBuilder.o: AttrList.inc.h
-SValBuilder.o: Attrs.inc.h
+SValBuilder.o: CommentCommandList.inc.h
 SValBuilder.o: DeclNodes.inc.h
 SValBuilder.o: DiagnosticCommonKinds.inc.h
 SValBuilder.o: StmtNodes.inc.h
-SValBuilder.po: AttrList.inc.h
-SValBuilder.po: Attrs.inc.h
+SValBuilder.po: CommentCommandList.inc.h
 SValBuilder.po: DeclNodes.inc.h
 SValBuilder.po: DiagnosticCommonKinds.inc.h
 SValBuilder.po: StmtNodes.inc.h
-SVals.o: AttrList.inc.h
-SVals.o: Attrs.inc.h
+SVals.o: CommentCommandList.inc.h
 SVals.o: DeclNodes.inc.h
 SVals.o: DiagnosticCommonKinds.inc.h
 SVals.o: StmtNodes.inc.h
-SVals.po: AttrList.inc.h
-SVals.po: Attrs.inc.h
+SVals.po: CommentCommandList.inc.h
 SVals.po: DeclNodes.inc.h
 SVals.po: DiagnosticCommonKinds.inc.h
 SVals.po: StmtNodes.inc.h
-SimpleConstraintManager.o: AttrList.inc.h
-SimpleConstraintManager.o: Attrs.inc.h
+SimpleConstraintManager.o: CommentCommandList.inc.h
 SimpleConstraintManager.o: DeclNodes.inc.h
 SimpleConstraintManager.o: DiagnosticCommonKinds.inc.h
 SimpleConstraintManager.o: StmtNodes.inc.h
-SimpleConstraintManager.po: AttrList.inc.h
-SimpleConstraintManager.po: Attrs.inc.h
+SimpleConstraintManager.po: CommentCommandList.inc.h
 SimpleConstraintManager.po: DeclNodes.inc.h
 SimpleConstraintManager.po: DiagnosticCommonKinds.inc.h
 SimpleConstraintManager.po: StmtNodes.inc.h
-SimpleSValBuilder.o: AttrList.inc.h
-SimpleSValBuilder.o: Attrs.inc.h
+SimpleSValBuilder.o: CommentCommandList.inc.h
 SimpleSValBuilder.o: DeclNodes.inc.h
 SimpleSValBuilder.o: DiagnosticCommonKinds.inc.h
 SimpleSValBuilder.o: StmtNodes.inc.h
-SimpleSValBuilder.po: AttrList.inc.h
-SimpleSValBuilder.po: Attrs.inc.h
+SimpleSValBuilder.po: CommentCommandList.inc.h
 SimpleSValBuilder.po: DeclNodes.inc.h
 SimpleSValBuilder.po: DiagnosticCommonKinds.inc.h
 SimpleSValBuilder.po: StmtNodes.inc.h
-Store.o: AttrList.inc.h
-Store.o: Attrs.inc.h
+Store.o: CommentCommandList.inc.h
 Store.o: DeclNodes.inc.h
 Store.o: DiagnosticCommonKinds.inc.h
 Store.o: StmtNodes.inc.h
-Store.po: AttrList.inc.h
-Store.po: Attrs.inc.h
+Store.po: CommentCommandList.inc.h
 Store.po: DeclNodes.inc.h
 Store.po: DiagnosticCommonKinds.inc.h
 Store.po: StmtNodes.inc.h
-SubEngine.o: AttrList.inc.h
-SubEngine.o: Attrs.inc.h
+SubEngine.o: CommentCommandList.inc.h
 SubEngine.o: DeclNodes.inc.h
 SubEngine.o: DiagnosticCommonKinds.inc.h
 SubEngine.o: StmtNodes.inc.h
-SubEngine.po: AttrList.inc.h
-SubEngine.po: Attrs.inc.h
+SubEngine.po: CommentCommandList.inc.h
 SubEngine.po: DeclNodes.inc.h
 SubEngine.po: DiagnosticCommonKinds.inc.h
 SubEngine.po: StmtNodes.inc.h
-SymbolManager.o: AttrList.inc.h
-SymbolManager.o: Attrs.inc.h
+SymbolManager.o: CommentCommandList.inc.h
 SymbolManager.o: DeclNodes.inc.h
 SymbolManager.o: DiagnosticCommonKinds.inc.h
 SymbolManager.o: StmtNodes.inc.h
-SymbolManager.po: AttrList.inc.h
-SymbolManager.po: Attrs.inc.h
+SymbolManager.po: CommentCommandList.inc.h
 SymbolManager.po: DeclNodes.inc.h
 SymbolManager.po: DiagnosticCommonKinds.inc.h
 SymbolManager.po: StmtNodes.inc.h
-TextPathDiagnostics.o: AttrList.inc.h
-TextPathDiagnostics.o: Attrs.inc.h
 TextPathDiagnostics.o: DeclNodes.inc.h
 TextPathDiagnostics.o: DiagnosticCommonKinds.inc.h
 TextPathDiagnostics.o: StmtNodes.inc.h
-TextPathDiagnostics.po: AttrList.inc.h
-TextPathDiagnostics.po: Attrs.inc.h
 TextPathDiagnostics.po: DeclNodes.inc.h
 TextPathDiagnostics.po: DiagnosticCommonKinds.inc.h
 TextPathDiagnostics.po: StmtNodes.inc.h
diff --git a/lib/clang/libclangstaticanalyzerfrontend/Makefile.depend b/lib/clang/libclangstaticanalyzerfrontend/Makefile.depend
index 47f5ad0..910b0c2 100644
--- a/lib/clang/libclangstaticanalyzerfrontend/Makefile.depend
+++ b/lib/clang/libclangstaticanalyzerfrontend/Makefile.depend
@@ -8,30 +8,27 @@ DIRDEPS = \
 	include \
 	include/xlocale \
 	lib/msun \
+	usr.bin/clang/clang-tblgen.host \
 
 
 .include <dirdeps.mk>
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
-AnalysisConsumer.o: AttrList.inc.h
-AnalysisConsumer.o: Attrs.inc.h
+AnalysisConsumer.o: CommentCommandList.inc.h
 AnalysisConsumer.o: DeclNodes.inc.h
 AnalysisConsumer.o: DiagnosticCommonKinds.inc.h
 AnalysisConsumer.o: StmtNodes.inc.h
-AnalysisConsumer.po: AttrList.inc.h
-AnalysisConsumer.po: Attrs.inc.h
+AnalysisConsumer.po: CommentCommandList.inc.h
 AnalysisConsumer.po: DeclNodes.inc.h
 AnalysisConsumer.po: DiagnosticCommonKinds.inc.h
 AnalysisConsumer.po: StmtNodes.inc.h
-CheckerRegistration.o: AttrList.inc.h
-CheckerRegistration.o: Attrs.inc.h
+CheckerRegistration.o: CommentCommandList.inc.h
 CheckerRegistration.o: DeclNodes.inc.h
 CheckerRegistration.o: DiagnosticCommonKinds.inc.h
 CheckerRegistration.o: DiagnosticFrontendKinds.inc.h
 CheckerRegistration.o: StmtNodes.inc.h
-CheckerRegistration.po: AttrList.inc.h
-CheckerRegistration.po: Attrs.inc.h
+CheckerRegistration.po: CommentCommandList.inc.h
 CheckerRegistration.po: DeclNodes.inc.h
 CheckerRegistration.po: DiagnosticCommonKinds.inc.h
 CheckerRegistration.po: DiagnosticFrontendKinds.inc.h
diff --git a/lib/clang/libllvmanalysis/Makefile.depend b/lib/clang/libllvmanalysis/Makefile.depend
index e8d0b1b..9aa32a9 100644
--- a/lib/clang/libllvmanalysis/Makefile.depend
+++ b/lib/clang/libllvmanalysis/Makefile.depend
@@ -8,6 +8,7 @@ DIRDEPS = \
 	include \
 	include/xlocale \
 	lib/msun \
+	usr.bin/clang/tblgen.host \
 
 
 .include <dirdeps.mk>
@@ -24,12 +25,12 @@ CodeMetrics.o: Intrinsics.inc.h
 CodeMetrics.po: Intrinsics.inc.h
 ConstantFolding.o: Intrinsics.inc.h
 ConstantFolding.po: Intrinsics.inc.h
-DbgInfoPrinter.o: Intrinsics.inc.h
-DbgInfoPrinter.po: Intrinsics.inc.h
-InlineCost.o: Intrinsics.inc.h
-InlineCost.po: Intrinsics.inc.h
+CostModel.o: Intrinsics.inc.h
+CostModel.po: Intrinsics.inc.h
 InstCount.o: Intrinsics.inc.h
 InstCount.po: Intrinsics.inc.h
+InstructionSimplify.o: Intrinsics.inc.h
+InstructionSimplify.po: Intrinsics.inc.h
 LazyValueInfo.o: Intrinsics.inc.h
 LazyValueInfo.po: Intrinsics.inc.h
 Lint.o: Intrinsics.inc.h
@@ -40,8 +41,12 @@ MemoryBuiltins.o: Intrinsics.inc.h
 MemoryBuiltins.po: Intrinsics.inc.h
 MemoryDependenceAnalysis.o: Intrinsics.inc.h
 MemoryDependenceAnalysis.po: Intrinsics.inc.h
+PtrUseVisitor.o: Intrinsics.inc.h
+PtrUseVisitor.po: Intrinsics.inc.h
 ScalarEvolutionExpander.o: Intrinsics.inc.h
 ScalarEvolutionExpander.po: Intrinsics.inc.h
+TargetTransformInfo.o: Intrinsics.inc.h
+TargetTransformInfo.po: Intrinsics.inc.h
 ValueTracking.o: Intrinsics.inc.h
 ValueTracking.po: Intrinsics.inc.h
 .endif
diff --git a/lib/clang/libllvmarmasmparser/Makefile.depend b/lib/clang/libllvmarmasmparser/Makefile.depend
index 971d851..2b046d8 100644
--- a/lib/clang/libllvmarmasmparser/Makefile.depend
+++ b/lib/clang/libllvmarmasmparser/Makefile.depend
@@ -8,18 +8,13 @@ DIRDEPS = \
 	include \
 	include/xlocale \
 	lib/msun \
+	usr.bin/clang/tblgen.host \
 
 
 .include <dirdeps.mk>
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
-ARMAsmLexer.o: ARMGenInstrInfo.inc.h
-ARMAsmLexer.o: ARMGenRegisterInfo.inc.h
-ARMAsmLexer.o: ARMGenSubtargetInfo.inc.h
-ARMAsmLexer.po: ARMGenInstrInfo.inc.h
-ARMAsmLexer.po: ARMGenRegisterInfo.inc.h
-ARMAsmLexer.po: ARMGenSubtargetInfo.inc.h
 ARMAsmParser.o: ARMGenAsmMatcher.inc.h
 ARMAsmParser.o: ARMGenInstrInfo.inc.h
 ARMAsmParser.o: ARMGenRegisterInfo.inc.h
diff --git a/lib/clang/libllvmarmcodegen/Makefile.depend b/lib/clang/libllvmarmcodegen/Makefile.depend
index cda3e60..42795f1 100644
--- a/lib/clang/libllvmarmcodegen/Makefile.depend
+++ b/lib/clang/libllvmarmcodegen/Makefile.depend
@@ -8,12 +8,19 @@ DIRDEPS = \
 	include \
 	include/xlocale \
 	lib/msun \
+	usr.bin/clang/tblgen.host \
 
 
 .include <dirdeps.mk>
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
+A15SDOptimizer.o: ARMGenInstrInfo.inc.h
+A15SDOptimizer.o: ARMGenRegisterInfo.inc.h
+A15SDOptimizer.o: ARMGenSubtargetInfo.inc.h
+A15SDOptimizer.po: ARMGenInstrInfo.inc.h
+A15SDOptimizer.po: ARMGenRegisterInfo.inc.h
+A15SDOptimizer.po: ARMGenSubtargetInfo.inc.h
 ARMAsmPrinter.o: ARMGenInstrInfo.inc.h
 ARMAsmPrinter.o: ARMGenMCPseudoLowering.inc.h
 ARMAsmPrinter.o: ARMGenRegisterInfo.inc.h
@@ -158,6 +165,14 @@ ARMTargetObjectFile.o: ARMGenSubtargetInfo.inc.h
 ARMTargetObjectFile.po: ARMGenInstrInfo.inc.h
 ARMTargetObjectFile.po: ARMGenRegisterInfo.inc.h
 ARMTargetObjectFile.po: ARMGenSubtargetInfo.inc.h
+ARMTargetTransformInfo.o: ARMGenInstrInfo.inc.h
+ARMTargetTransformInfo.o: ARMGenRegisterInfo.inc.h
+ARMTargetTransformInfo.o: ARMGenSubtargetInfo.inc.h
+ARMTargetTransformInfo.o: Intrinsics.inc.h
+ARMTargetTransformInfo.po: ARMGenInstrInfo.inc.h
+ARMTargetTransformInfo.po: ARMGenRegisterInfo.inc.h
+ARMTargetTransformInfo.po: ARMGenSubtargetInfo.inc.h
+ARMTargetTransformInfo.po: Intrinsics.inc.h
 MLxExpansionPass.o: ARMGenInstrInfo.inc.h
 MLxExpansionPass.o: ARMGenRegisterInfo.inc.h
 MLxExpansionPass.o: ARMGenSubtargetInfo.inc.h
diff --git a/lib/clang/libllvmarmdesc/Makefile.depend b/lib/clang/libllvmarmdesc/Makefile.depend
index d0482a0..725a374 100644
--- a/lib/clang/libllvmarmdesc/Makefile.depend
+++ b/lib/clang/libllvmarmdesc/Makefile.depend
@@ -8,6 +8,7 @@ DIRDEPS = \
 	include \
 	include/xlocale \
 	lib/msun \
+	usr.bin/clang/tblgen.host \
 
 
 .include <dirdeps.mk>
@@ -26,6 +27,12 @@ ARMELFObjectWriter.o: ARMGenSubtargetInfo.inc.h
 ARMELFObjectWriter.po: ARMGenInstrInfo.inc.h
 ARMELFObjectWriter.po: ARMGenRegisterInfo.inc.h
 ARMELFObjectWriter.po: ARMGenSubtargetInfo.inc.h
+ARMELFStreamer.o: ARMGenInstrInfo.inc.h
+ARMELFStreamer.o: ARMGenRegisterInfo.inc.h
+ARMELFStreamer.o: ARMGenSubtargetInfo.inc.h
+ARMELFStreamer.po: ARMGenInstrInfo.inc.h
+ARMELFStreamer.po: ARMGenRegisterInfo.inc.h
+ARMELFStreamer.po: ARMGenSubtargetInfo.inc.h
 ARMMCCodeEmitter.o: ARMGenInstrInfo.inc.h
 ARMMCCodeEmitter.o: ARMGenMCCodeEmitter.inc.h
 ARMMCCodeEmitter.o: ARMGenRegisterInfo.inc.h
diff --git a/lib/clang/libllvmarmdisassembler/Makefile.depend b/lib/clang/libllvmarmdisassembler/Makefile.depend
index 6fd3c24..72192cb 100644
--- a/lib/clang/libllvmarmdisassembler/Makefile.depend
+++ b/lib/clang/libllvmarmdisassembler/Makefile.depend
@@ -8,6 +8,7 @@ DIRDEPS = \
 	include \
 	include/xlocale \
 	lib/msun \
+	usr.bin/clang/tblgen.host \
 
 
 .include <dirdeps.mk>
@@ -15,12 +16,10 @@ DIRDEPS = \
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
 ARMDisassembler.o: ARMGenDisassemblerTables.inc.h
-ARMDisassembler.o: ARMGenEDInfo.inc.h
 ARMDisassembler.o: ARMGenInstrInfo.inc.h
 ARMDisassembler.o: ARMGenRegisterInfo.inc.h
 ARMDisassembler.o: ARMGenSubtargetInfo.inc.h
 ARMDisassembler.po: ARMGenDisassemblerTables.inc.h
-ARMDisassembler.po: ARMGenEDInfo.inc.h
 ARMDisassembler.po: ARMGenInstrInfo.inc.h
 ARMDisassembler.po: ARMGenRegisterInfo.inc.h
 ARMDisassembler.po: ARMGenSubtargetInfo.inc.h
diff --git a/lib/clang/libllvmarminfo/Makefile.depend b/lib/clang/libllvmarminfo/Makefile.depend
index 36e229b..7a0fbe1 100644
--- a/lib/clang/libllvmarminfo/Makefile.depend
+++ b/lib/clang/libllvmarminfo/Makefile.depend
@@ -8,6 +8,7 @@ DIRDEPS = \
 	include \
 	include/xlocale \
 	lib/msun \
+	usr.bin/clang/tblgen.host \
 
 
 .include <dirdeps.mk>
diff --git a/lib/clang/libllvmarminstprinter/Makefile.depend b/lib/clang/libllvmarminstprinter/Makefile.depend
index ec220f9..dfe2199 100644
--- a/lib/clang/libllvmarminstprinter/Makefile.depend
+++ b/lib/clang/libllvmarminstprinter/Makefile.depend
@@ -8,6 +8,7 @@ DIRDEPS = \
 	include \
 	include/xlocale \
 	lib/msun \
+	usr.bin/clang/tblgen.host \
 
 
 .include <dirdeps.mk>
diff --git a/lib/clang/libllvmasmprinter/Makefile.depend b/lib/clang/libllvmasmprinter/Makefile.depend
index 422d37c..de12791 100644
--- a/lib/clang/libllvmasmprinter/Makefile.depend
+++ b/lib/clang/libllvmasmprinter/Makefile.depend
@@ -8,10 +8,13 @@ DIRDEPS = \
 	include \
 	include/xlocale \
 	lib/msun \
+	usr.bin/clang/tblgen.host \
 
 
 .include <dirdeps.mk>
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
+ErlangGCPrinter.o: Intrinsics.inc.h
+ErlangGCPrinter.po: Intrinsics.inc.h
 .endif
diff --git a/lib/clang/libllvmbitreader/Makefile.depend b/lib/clang/libllvmbitreader/Makefile.depend
index b947096..0ca04aa 100644
--- a/lib/clang/libllvmbitreader/Makefile.depend
+++ b/lib/clang/libllvmbitreader/Makefile.depend
@@ -8,6 +8,7 @@ DIRDEPS = \
 	include \
 	include/xlocale \
 	lib/msun \
+	usr.bin/clang/tblgen.host \
 
 
 .include <dirdeps.mk>
diff --git a/lib/clang/libllvmcodegen/Makefile.depend b/lib/clang/libllvmcodegen/Makefile.depend
index 384bed5..a5078c5 100644
--- a/lib/clang/libllvmcodegen/Makefile.depend
+++ b/lib/clang/libllvmcodegen/Makefile.depend
@@ -8,6 +8,7 @@ DIRDEPS = \
 	include \
 	include/xlocale \
 	lib/msun \
+	usr.bin/clang/tblgen.host \
 
 
 .include <dirdeps.mk>
@@ -16,6 +17,8 @@ DIRDEPS = \
 # local dependencies - needed for -jN in clean tree
 Analysis.o: Intrinsics.inc.h
 Analysis.po: Intrinsics.inc.h
+BasicTargetTransformInfo.o: Intrinsics.inc.h
+BasicTargetTransformInfo.po: Intrinsics.inc.h
 DwarfEHPrepare.o: Intrinsics.inc.h
 DwarfEHPrepare.po: Intrinsics.inc.h
 GCStrategy.o: Intrinsics.inc.h
diff --git a/lib/clang/libllvmcore/Makefile.depend b/lib/clang/libllvmcore/Makefile.depend
index 489ec2b..94d82b9 100644
--- a/lib/clang/libllvmcore/Makefile.depend
+++ b/lib/clang/libllvmcore/Makefile.depend
@@ -8,6 +8,7 @@ DIRDEPS = \
 	include \
 	include/xlocale \
 	lib/msun \
+	usr.bin/clang/tblgen.host \
 
 
 .include <dirdeps.mk>
diff --git a/lib/clang/libllvmdebuginfo/Makefile.depend b/lib/clang/libllvmdebuginfo/Makefile.depend
index 6a3fc33..422d37c 100644
--- a/lib/clang/libllvmdebuginfo/Makefile.depend
+++ b/lib/clang/libllvmdebuginfo/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/libllvmexecutionengine/Makefile.depend b/lib/clang/libllvmexecutionengine/Makefile.depend
index 6a3fc33..422d37c 100644
--- a/lib/clang/libllvmexecutionengine/Makefile.depend
+++ b/lib/clang/libllvmexecutionengine/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/libllvminstcombine/Makefile.depend b/lib/clang/libllvminstcombine/Makefile.depend
index 0851afa..ce67684 100644
--- a/lib/clang/libllvminstcombine/Makefile.depend
+++ b/lib/clang/libllvminstcombine/Makefile.depend
@@ -8,6 +8,7 @@ DIRDEPS = \
 	include \
 	include/xlocale \
 	lib/msun \
+	usr.bin/clang/tblgen.host \
 
 
 .include <dirdeps.mk>
diff --git a/lib/clang/libllvminstrumentation/Makefile.depend b/lib/clang/libllvminstrumentation/Makefile.depend
index a730fc2..e64cf0b 100644
--- a/lib/clang/libllvminstrumentation/Makefile.depend
+++ b/lib/clang/libllvminstrumentation/Makefile.depend
@@ -8,6 +8,7 @@ DIRDEPS = \
 	include \
 	include/xlocale \
 	lib/msun \
+	usr.bin/clang/tblgen.host \
 
 
 .include <dirdeps.mk>
@@ -18,6 +19,8 @@ AddressSanitizer.o: Intrinsics.inc.h
 AddressSanitizer.po: Intrinsics.inc.h
 BoundsChecking.o: Intrinsics.inc.h
 BoundsChecking.po: Intrinsics.inc.h
+MemorySanitizer.o: Intrinsics.inc.h
+MemorySanitizer.po: Intrinsics.inc.h
 ThreadSanitizer.o: Intrinsics.inc.h
 ThreadSanitizer.po: Intrinsics.inc.h
 .endif
diff --git a/lib/clang/libllvminterpreter/Makefile.depend b/lib/clang/libllvminterpreter/Makefile.depend
index 0c45153..1c2bfeb 100644
--- a/lib/clang/libllvminterpreter/Makefile.depend
+++ b/lib/clang/libllvminterpreter/Makefile.depend
@@ -2,12 +2,13 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
+	gnu/lib/libstdc++ \
+	gnu/lib/libsupc++ \
 	include \
 	include/xlocale \
 	lib/msun \
+	usr.bin/clang/tblgen.host \
 
 
 .include <dirdeps.mk>
@@ -16,6 +17,8 @@ DIRDEPS = \
 # local dependencies - needed for -jN in clean tree
 Execution.o: Intrinsics.inc.h
 Execution.po: Intrinsics.inc.h
+ExternalFunctions.o: Intrinsics.inc.h
+ExternalFunctions.po: Intrinsics.inc.h
 Interpreter.o: Intrinsics.inc.h
 Interpreter.po: Intrinsics.inc.h
 .endif
diff --git a/lib/clang/libllvmipa/Makefile.depend b/lib/clang/libllvmipa/Makefile.depend
index 8c10ddd..2a8fb85 100644
--- a/lib/clang/libllvmipa/Makefile.depend
+++ b/lib/clang/libllvmipa/Makefile.depend
@@ -8,6 +8,7 @@ DIRDEPS = \
 	include \
 	include/xlocale \
 	lib/msun \
+	usr.bin/clang/tblgen.host \
 
 
 .include <dirdeps.mk>
@@ -20,4 +21,6 @@ CallGraphSCCPass.o: Intrinsics.inc.h
 CallGraphSCCPass.po: Intrinsics.inc.h
 GlobalsModRef.o: Intrinsics.inc.h
 GlobalsModRef.po: Intrinsics.inc.h
+InlineCost.o: Intrinsics.inc.h
+InlineCost.po: Intrinsics.inc.h
 .endif
diff --git a/lib/clang/libllvmipo/Makefile.depend b/lib/clang/libllvmipo/Makefile.depend
index 54309ee..0756668 100644
--- a/lib/clang/libllvmipo/Makefile.depend
+++ b/lib/clang/libllvmipo/Makefile.depend
@@ -8,6 +8,7 @@ DIRDEPS = \
 	include \
 	include/xlocale \
 	lib/msun \
+	usr.bin/clang/tblgen.host \
 
 
 .include <dirdeps.mk>
diff --git a/lib/clang/libllvmjit/Makefile.depend b/lib/clang/libllvmjit/Makefile.depend
index 6a3fc33..422d37c 100644
--- a/lib/clang/libllvmjit/Makefile.depend
+++ b/lib/clang/libllvmjit/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/libllvmmcdisassembler/Makefile.depend b/lib/clang/libllvmmcdisassembler/Makefile.depend
index 6a3fc33..422d37c 100644
--- a/lib/clang/libllvmmcdisassembler/Makefile.depend
+++ b/lib/clang/libllvmmcdisassembler/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/libllvmmcjit/Makefile.depend b/lib/clang/libllvmmcjit/Makefile.depend
index 6a3fc33..422d37c 100644
--- a/lib/clang/libllvmmcjit/Makefile.depend
+++ b/lib/clang/libllvmmcjit/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 89bde72..ef82df0 100644
--- a/lib/clang/libllvmmipsasmparser/Makefile.depend
+++ b/lib/clang/libllvmmipsasmparser/Makefile.depend
@@ -8,6 +8,7 @@ DIRDEPS = \
 	include \
 	include/xlocale \
 	lib/msun \
+	usr.bin/clang/tblgen.host \
 
 
 .include <dirdeps.mk>
diff --git a/lib/clang/libllvmmipscodegen/Makefile.depend b/lib/clang/libllvmmipscodegen/Makefile.depend
index f1a985d..25d3766 100644
--- a/lib/clang/libllvmmipscodegen/Makefile.depend
+++ b/lib/clang/libllvmmipscodegen/Makefile.depend
@@ -8,6 +8,7 @@ DIRDEPS = \
 	include \
 	include/xlocale \
 	lib/msun \
+	usr.bin/clang/tblgen.host \
 
 
 .include <dirdeps.mk>
@@ -20,6 +21,22 @@ Mips16FrameLowering.o: MipsGenSubtargetInfo.inc.h
 Mips16FrameLowering.po: MipsGenInstrInfo.inc.h
 Mips16FrameLowering.po: MipsGenRegisterInfo.inc.h
 Mips16FrameLowering.po: MipsGenSubtargetInfo.inc.h
+Mips16ISelDAGToDAG.o: Intrinsics.inc.h
+Mips16ISelDAGToDAG.o: MipsGenDAGISel.inc.h
+Mips16ISelDAGToDAG.o: MipsGenInstrInfo.inc.h
+Mips16ISelDAGToDAG.o: MipsGenRegisterInfo.inc.h
+Mips16ISelDAGToDAG.o: MipsGenSubtargetInfo.inc.h
+Mips16ISelDAGToDAG.po: Intrinsics.inc.h
+Mips16ISelDAGToDAG.po: MipsGenDAGISel.inc.h
+Mips16ISelDAGToDAG.po: MipsGenInstrInfo.inc.h
+Mips16ISelDAGToDAG.po: MipsGenRegisterInfo.inc.h
+Mips16ISelDAGToDAG.po: MipsGenSubtargetInfo.inc.h
+Mips16ISelLowering.o: MipsGenInstrInfo.inc.h
+Mips16ISelLowering.o: MipsGenRegisterInfo.inc.h
+Mips16ISelLowering.o: MipsGenSubtargetInfo.inc.h
+Mips16ISelLowering.po: MipsGenInstrInfo.inc.h
+Mips16ISelLowering.po: MipsGenRegisterInfo.inc.h
+Mips16ISelLowering.po: MipsGenSubtargetInfo.inc.h
 Mips16InstrInfo.o: MipsGenInstrInfo.inc.h
 Mips16InstrInfo.o: MipsGenRegisterInfo.inc.h
 Mips16InstrInfo.o: MipsGenSubtargetInfo.inc.h
@@ -54,6 +71,12 @@ MipsCodeEmitter.po: MipsGenCodeEmitter.inc.h
 MipsCodeEmitter.po: MipsGenInstrInfo.inc.h
 MipsCodeEmitter.po: MipsGenRegisterInfo.inc.h
 MipsCodeEmitter.po: MipsGenSubtargetInfo.inc.h
+MipsConstantIslandPass.o: MipsGenInstrInfo.inc.h
+MipsConstantIslandPass.o: MipsGenRegisterInfo.inc.h
+MipsConstantIslandPass.o: MipsGenSubtargetInfo.inc.h
+MipsConstantIslandPass.po: MipsGenInstrInfo.inc.h
+MipsConstantIslandPass.po: MipsGenRegisterInfo.inc.h
+MipsConstantIslandPass.po: MipsGenSubtargetInfo.inc.h
 MipsDelaySlotFiller.o: MipsGenInstrInfo.inc.h
 MipsDelaySlotFiller.o: MipsGenRegisterInfo.inc.h
 MipsDelaySlotFiller.o: MipsGenSubtargetInfo.inc.h
@@ -76,12 +99,10 @@ MipsISelDAGToDAG.po: MipsGenDAGISel.inc.h
 MipsISelDAGToDAG.po: MipsGenInstrInfo.inc.h
 MipsISelDAGToDAG.po: MipsGenRegisterInfo.inc.h
 MipsISelDAGToDAG.po: MipsGenSubtargetInfo.inc.h
-MipsISelLowering.o: Intrinsics.inc.h
 MipsISelLowering.o: MipsGenCallingConv.inc.h
 MipsISelLowering.o: MipsGenInstrInfo.inc.h
 MipsISelLowering.o: MipsGenRegisterInfo.inc.h
 MipsISelLowering.o: MipsGenSubtargetInfo.inc.h
-MipsISelLowering.po: Intrinsics.inc.h
 MipsISelLowering.po: MipsGenCallingConv.inc.h
 MipsISelLowering.po: MipsGenInstrInfo.inc.h
 MipsISelLowering.po: MipsGenRegisterInfo.inc.h
@@ -116,6 +137,20 @@ MipsMachineFunction.o: MipsGenSubtargetInfo.inc.h
 MipsMachineFunction.po: MipsGenInstrInfo.inc.h
 MipsMachineFunction.po: MipsGenRegisterInfo.inc.h
 MipsMachineFunction.po: MipsGenSubtargetInfo.inc.h
+MipsModuleISelDAGToDAG.o: MipsGenDAGISel.inc.h
+MipsModuleISelDAGToDAG.o: MipsGenInstrInfo.inc.h
+MipsModuleISelDAGToDAG.o: MipsGenRegisterInfo.inc.h
+MipsModuleISelDAGToDAG.o: MipsGenSubtargetInfo.inc.h
+MipsModuleISelDAGToDAG.po: MipsGenDAGISel.inc.h
+MipsModuleISelDAGToDAG.po: MipsGenInstrInfo.inc.h
+MipsModuleISelDAGToDAG.po: MipsGenRegisterInfo.inc.h
+MipsModuleISelDAGToDAG.po: MipsGenSubtargetInfo.inc.h
+MipsOs16.o: MipsGenInstrInfo.inc.h
+MipsOs16.o: MipsGenRegisterInfo.inc.h
+MipsOs16.o: MipsGenSubtargetInfo.inc.h
+MipsOs16.po: MipsGenInstrInfo.inc.h
+MipsOs16.po: MipsGenRegisterInfo.inc.h
+MipsOs16.po: MipsGenSubtargetInfo.inc.h
 MipsRegisterInfo.o: MipsGenInstrInfo.inc.h
 MipsRegisterInfo.o: MipsGenRegisterInfo.inc.h
 MipsRegisterInfo.o: MipsGenSubtargetInfo.inc.h
@@ -128,6 +163,24 @@ MipsSEFrameLowering.o: MipsGenSubtargetInfo.inc.h
 MipsSEFrameLowering.po: MipsGenInstrInfo.inc.h
 MipsSEFrameLowering.po: MipsGenRegisterInfo.inc.h
 MipsSEFrameLowering.po: MipsGenSubtargetInfo.inc.h
+MipsSEISelDAGToDAG.o: Intrinsics.inc.h
+MipsSEISelDAGToDAG.o: MipsGenDAGISel.inc.h
+MipsSEISelDAGToDAG.o: MipsGenInstrInfo.inc.h
+MipsSEISelDAGToDAG.o: MipsGenRegisterInfo.inc.h
+MipsSEISelDAGToDAG.o: MipsGenSubtargetInfo.inc.h
+MipsSEISelDAGToDAG.po: Intrinsics.inc.h
+MipsSEISelDAGToDAG.po: MipsGenDAGISel.inc.h
+MipsSEISelDAGToDAG.po: MipsGenInstrInfo.inc.h
+MipsSEISelDAGToDAG.po: MipsGenRegisterInfo.inc.h
+MipsSEISelDAGToDAG.po: MipsGenSubtargetInfo.inc.h
+MipsSEISelLowering.o: Intrinsics.inc.h
+MipsSEISelLowering.o: MipsGenInstrInfo.inc.h
+MipsSEISelLowering.o: MipsGenRegisterInfo.inc.h
+MipsSEISelLowering.o: MipsGenSubtargetInfo.inc.h
+MipsSEISelLowering.po: Intrinsics.inc.h
+MipsSEISelLowering.po: MipsGenInstrInfo.inc.h
+MipsSEISelLowering.po: MipsGenRegisterInfo.inc.h
+MipsSEISelLowering.po: MipsGenSubtargetInfo.inc.h
 MipsSEInstrInfo.o: MipsGenInstrInfo.inc.h
 MipsSEInstrInfo.o: MipsGenRegisterInfo.inc.h
 MipsSEInstrInfo.o: MipsGenSubtargetInfo.inc.h
@@ -152,9 +205,13 @@ MipsSubtarget.o: MipsGenSubtargetInfo.inc.h
 MipsSubtarget.po: MipsGenInstrInfo.inc.h
 MipsSubtarget.po: MipsGenRegisterInfo.inc.h
 MipsSubtarget.po: MipsGenSubtargetInfo.inc.h
+MipsTargetMachine.o: Intrinsics.inc.h
+MipsTargetMachine.o: MipsGenDAGISel.inc.h
 MipsTargetMachine.o: MipsGenInstrInfo.inc.h
 MipsTargetMachine.o: MipsGenRegisterInfo.inc.h
 MipsTargetMachine.o: MipsGenSubtargetInfo.inc.h
+MipsTargetMachine.po: Intrinsics.inc.h
+MipsTargetMachine.po: MipsGenDAGISel.inc.h
 MipsTargetMachine.po: MipsGenInstrInfo.inc.h
 MipsTargetMachine.po: MipsGenRegisterInfo.inc.h
 MipsTargetMachine.po: MipsGenSubtargetInfo.inc.h
diff --git a/lib/clang/libllvmmipsdesc/Makefile.depend b/lib/clang/libllvmmipsdesc/Makefile.depend
index 431b916..96c1046 100644
--- a/lib/clang/libllvmmipsdesc/Makefile.depend
+++ b/lib/clang/libllvmmipsdesc/Makefile.depend
@@ -8,6 +8,7 @@ DIRDEPS = \
 	include \
 	include/xlocale \
 	lib/msun \
+	usr.bin/clang/tblgen.host \
 
 
 .include <dirdeps.mk>
@@ -32,6 +33,8 @@ MipsELFObjectWriter.o: MipsGenSubtargetInfo.inc.h
 MipsELFObjectWriter.po: MipsGenInstrInfo.inc.h
 MipsELFObjectWriter.po: MipsGenRegisterInfo.inc.h
 MipsELFObjectWriter.po: MipsGenSubtargetInfo.inc.h
+MipsELFStreamer.o: MipsGenSubtargetInfo.inc.h
+MipsELFStreamer.po: MipsGenSubtargetInfo.inc.h
 MipsMCCodeEmitter.o: MipsGenInstrInfo.inc.h
 MipsMCCodeEmitter.o: MipsGenMCCodeEmitter.inc.h
 MipsMCCodeEmitter.o: MipsGenRegisterInfo.inc.h
@@ -46,4 +49,6 @@ MipsMCTargetDesc.o: MipsGenSubtargetInfo.inc.h
 MipsMCTargetDesc.po: MipsGenInstrInfo.inc.h
 MipsMCTargetDesc.po: MipsGenRegisterInfo.inc.h
 MipsMCTargetDesc.po: MipsGenSubtargetInfo.inc.h
+MipsReginfo.o: MipsGenSubtargetInfo.inc.h
+MipsReginfo.po: MipsGenSubtargetInfo.inc.h
 .endif
diff --git a/lib/clang/libllvmmipsinfo/Makefile.depend b/lib/clang/libllvmmipsinfo/Makefile.depend
index d137771..1c74f8f 100644
--- a/lib/clang/libllvmmipsinfo/Makefile.depend
+++ b/lib/clang/libllvmmipsinfo/Makefile.depend
@@ -8,6 +8,7 @@ DIRDEPS = \
 	include \
 	include/xlocale \
 	lib/msun \
+	usr.bin/clang/tblgen.host \
 
 
 .include <dirdeps.mk>
diff --git a/lib/clang/libllvmmipsinstprinter/Makefile.depend b/lib/clang/libllvmmipsinstprinter/Makefile.depend
index e30b14b..2ac9a38 100644
--- a/lib/clang/libllvmmipsinstprinter/Makefile.depend
+++ b/lib/clang/libllvmmipsinstprinter/Makefile.depend
@@ -8,6 +8,7 @@ DIRDEPS = \
 	include \
 	include/xlocale \
 	lib/msun \
+	usr.bin/clang/tblgen.host \
 
 
 .include <dirdeps.mk>
diff --git a/lib/clang/libllvmpowerpccodegen/Makefile.depend b/lib/clang/libllvmpowerpccodegen/Makefile.depend
index ae70ab6..3ef2858 100644
--- a/lib/clang/libllvmpowerpccodegen/Makefile.depend
+++ b/lib/clang/libllvmpowerpccodegen/Makefile.depend
@@ -8,6 +8,7 @@ DIRDEPS = \
 	include \
 	include/xlocale \
 	lib/msun \
+	usr.bin/clang/tblgen.host \
 
 
 .include <dirdeps.mk>
@@ -114,4 +115,12 @@ PPCTargetMachine.o: PPCGenSubtargetInfo.inc.h
 PPCTargetMachine.po: PPCGenInstrInfo.inc.h
 PPCTargetMachine.po: PPCGenRegisterInfo.inc.h
 PPCTargetMachine.po: PPCGenSubtargetInfo.inc.h
+PPCTargetTransformInfo.o: Intrinsics.inc.h
+PPCTargetTransformInfo.o: PPCGenInstrInfo.inc.h
+PPCTargetTransformInfo.o: PPCGenRegisterInfo.inc.h
+PPCTargetTransformInfo.o: PPCGenSubtargetInfo.inc.h
+PPCTargetTransformInfo.po: Intrinsics.inc.h
+PPCTargetTransformInfo.po: PPCGenInstrInfo.inc.h
+PPCTargetTransformInfo.po: PPCGenRegisterInfo.inc.h
+PPCTargetTransformInfo.po: PPCGenSubtargetInfo.inc.h
 .endif
diff --git a/lib/clang/libllvmpowerpcdesc/Makefile.depend b/lib/clang/libllvmpowerpcdesc/Makefile.depend
index e08c52e..ddc053c 100644
--- a/lib/clang/libllvmpowerpcdesc/Makefile.depend
+++ b/lib/clang/libllvmpowerpcdesc/Makefile.depend
@@ -8,6 +8,7 @@ DIRDEPS = \
 	include \
 	include/xlocale \
 	lib/msun \
+	usr.bin/clang/tblgen.host \
 
 
 .include <dirdeps.mk>
diff --git a/lib/clang/libllvmpowerpcinfo/Makefile.depend b/lib/clang/libllvmpowerpcinfo/Makefile.depend
index 000ccda..e952d74 100644
--- a/lib/clang/libllvmpowerpcinfo/Makefile.depend
+++ b/lib/clang/libllvmpowerpcinfo/Makefile.depend
@@ -8,6 +8,7 @@ DIRDEPS = \
 	include \
 	include/xlocale \
 	lib/msun \
+	usr.bin/clang/tblgen.host \
 
 
 .include <dirdeps.mk>
diff --git a/lib/clang/libllvmpowerpcinstprinter/Makefile.depend b/lib/clang/libllvmpowerpcinstprinter/Makefile.depend
index b684e25..057e08f 100644
--- a/lib/clang/libllvmpowerpcinstprinter/Makefile.depend
+++ b/lib/clang/libllvmpowerpcinstprinter/Makefile.depend
@@ -8,6 +8,7 @@ DIRDEPS = \
 	include \
 	include/xlocale \
 	lib/msun \
+	usr.bin/clang/tblgen.host \
 
 
 .include <dirdeps.mk>
diff --git a/lib/clang/libllvmruntimedyld/Makefile.depend b/lib/clang/libllvmruntimedyld/Makefile.depend
index 6a3fc33..422d37c 100644
--- a/lib/clang/libllvmruntimedyld/Makefile.depend
+++ b/lib/clang/libllvmruntimedyld/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 4eb3de8..9210240 100644
--- a/lib/clang/libllvmscalaropts/Makefile.depend
+++ b/lib/clang/libllvmscalaropts/Makefile.depend
@@ -8,6 +8,7 @@ DIRDEPS = \
 	include \
 	include/xlocale \
 	lib/msun \
+	usr.bin/clang/tblgen.host \
 
 
 .include <dirdeps.mk>
@@ -38,12 +39,12 @@ LoopStrengthReduce.o: Intrinsics.inc.h
 LoopStrengthReduce.po: Intrinsics.inc.h
 LoopUnrollPass.o: Intrinsics.inc.h
 LoopUnrollPass.po: Intrinsics.inc.h
+LoopUnswitch.o: Intrinsics.inc.h
+LoopUnswitch.po: Intrinsics.inc.h
 LowerAtomic.o: Intrinsics.inc.h
 LowerAtomic.po: Intrinsics.inc.h
 MemCpyOptimizer.o: Intrinsics.inc.h
 MemCpyOptimizer.po: Intrinsics.inc.h
-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
@@ -54,8 +55,6 @@ ScalarReplAggregates.o: Intrinsics.inc.h
 ScalarReplAggregates.po: Intrinsics.inc.h
 SimplifyCFGPass.o: Intrinsics.inc.h
 SimplifyCFGPass.po: Intrinsics.inc.h
-SimplifyLibCalls.o: Intrinsics.inc.h
-SimplifyLibCalls.po: Intrinsics.inc.h
 Sink.o: Intrinsics.inc.h
 Sink.po: Intrinsics.inc.h
 TailRecursionElimination.o: Intrinsics.inc.h
diff --git a/lib/clang/libllvmselectiondag/Makefile.depend b/lib/clang/libllvmselectiondag/Makefile.depend
index 6db6d7e..95ce77e 100644
--- a/lib/clang/libllvmselectiondag/Makefile.depend
+++ b/lib/clang/libllvmselectiondag/Makefile.depend
@@ -8,6 +8,7 @@ DIRDEPS = \
 	include \
 	include/xlocale \
 	lib/msun \
+	usr.bin/clang/tblgen.host \
 
 
 .include <dirdeps.mk>
diff --git a/lib/clang/libllvmtransformutils/Makefile.depend b/lib/clang/libllvmtransformutils/Makefile.depend
index f7d03f4..5ed0fba 100644
--- a/lib/clang/libllvmtransformutils/Makefile.depend
+++ b/lib/clang/libllvmtransformutils/Makefile.depend
@@ -8,6 +8,7 @@ DIRDEPS = \
 	include \
 	include/xlocale \
 	lib/msun \
+	usr.bin/clang/tblgen.host \
 
 
 .include <dirdeps.mk>
@@ -40,4 +41,6 @@ SSAUpdater.o: Intrinsics.inc.h
 SSAUpdater.po: Intrinsics.inc.h
 SimplifyCFG.o: Intrinsics.inc.h
 SimplifyCFG.po: Intrinsics.inc.h
+SimplifyLibCalls.o: Intrinsics.inc.h
+SimplifyLibCalls.po: Intrinsics.inc.h
 .endif
diff --git a/lib/clang/libllvmvectorize/Makefile.depend b/lib/clang/libllvmvectorize/Makefile.depend
index f44ea47..40d3560 100644
--- a/lib/clang/libllvmvectorize/Makefile.depend
+++ b/lib/clang/libllvmvectorize/Makefile.depend
@@ -8,6 +8,7 @@ DIRDEPS = \
 	include \
 	include/xlocale \
 	lib/msun \
+	usr.bin/clang/tblgen.host \
 
 
 .include <dirdeps.mk>
@@ -16,4 +17,10 @@ DIRDEPS = \
 # local dependencies - needed for -jN in clean tree
 BBVectorize.o: Intrinsics.inc.h
 BBVectorize.po: Intrinsics.inc.h
+LoopVectorize.o: Intrinsics.inc.h
+LoopVectorize.po: Intrinsics.inc.h
+SLPVectorizer.o: Intrinsics.inc.h
+SLPVectorizer.po: Intrinsics.inc.h
+VecUtils.o: Intrinsics.inc.h
+VecUtils.po: Intrinsics.inc.h
 .endif
diff --git a/lib/clang/libllvmx86asmparser/Makefile.depend b/lib/clang/libllvmx86asmparser/Makefile.depend
index e89abf7..b4ef923 100644
--- a/lib/clang/libllvmx86asmparser/Makefile.depend
+++ b/lib/clang/libllvmx86asmparser/Makefile.depend
@@ -8,20 +8,13 @@ DIRDEPS = \
 	include \
 	include/xlocale \
 	lib/msun \
+	usr.bin/clang/tblgen.host \
 
 
 .include <dirdeps.mk>
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
-X86AsmLexer.o: X86GenAsmMatcher.inc.h
-X86AsmLexer.o: X86GenInstrInfo.inc.h
-X86AsmLexer.o: X86GenRegisterInfo.inc.h
-X86AsmLexer.o: X86GenSubtargetInfo.inc.h
-X86AsmLexer.po: X86GenAsmMatcher.inc.h
-X86AsmLexer.po: X86GenInstrInfo.inc.h
-X86AsmLexer.po: X86GenRegisterInfo.inc.h
-X86AsmLexer.po: X86GenSubtargetInfo.inc.h
 X86AsmParser.o: X86GenAsmMatcher.inc.h
 X86AsmParser.o: X86GenInstrInfo.inc.h
 X86AsmParser.o: X86GenRegisterInfo.inc.h
diff --git a/lib/clang/libllvmx86codegen/Makefile.depend b/lib/clang/libllvmx86codegen/Makefile.depend
index 47eea8c..1eb524d 100644
--- a/lib/clang/libllvmx86codegen/Makefile.depend
+++ b/lib/clang/libllvmx86codegen/Makefile.depend
@@ -8,6 +8,7 @@ DIRDEPS = \
 	include \
 	include/xlocale \
 	lib/msun \
+	usr.bin/clang/tblgen.host \
 
 
 .include <dirdeps.mk>
@@ -38,6 +39,12 @@ X86FastISel.po: X86GenFastISel.inc.h
 X86FastISel.po: X86GenInstrInfo.inc.h
 X86FastISel.po: X86GenRegisterInfo.inc.h
 X86FastISel.po: X86GenSubtargetInfo.inc.h
+X86FixupLEAs.o: X86GenInstrInfo.inc.h
+X86FixupLEAs.o: X86GenRegisterInfo.inc.h
+X86FixupLEAs.o: X86GenSubtargetInfo.inc.h
+X86FixupLEAs.po: X86GenInstrInfo.inc.h
+X86FixupLEAs.po: X86GenRegisterInfo.inc.h
+X86FixupLEAs.po: X86GenSubtargetInfo.inc.h
 X86FloatingPoint.o: X86GenInstrInfo.inc.h
 X86FloatingPoint.o: X86GenRegisterInfo.inc.h
 X86FloatingPoint.o: X86GenSubtargetInfo.inc.h
@@ -88,6 +95,12 @@ X86MCInstLower.o: X86GenSubtargetInfo.inc.h
 X86MCInstLower.po: X86GenInstrInfo.inc.h
 X86MCInstLower.po: X86GenRegisterInfo.inc.h
 X86MCInstLower.po: X86GenSubtargetInfo.inc.h
+X86PadShortFunction.o: X86GenInstrInfo.inc.h
+X86PadShortFunction.o: X86GenRegisterInfo.inc.h
+X86PadShortFunction.o: X86GenSubtargetInfo.inc.h
+X86PadShortFunction.po: X86GenInstrInfo.inc.h
+X86PadShortFunction.po: X86GenRegisterInfo.inc.h
+X86PadShortFunction.po: X86GenSubtargetInfo.inc.h
 X86RegisterInfo.o: X86GenInstrInfo.inc.h
 X86RegisterInfo.o: X86GenRegisterInfo.inc.h
 X86RegisterInfo.o: X86GenSubtargetInfo.inc.h
@@ -112,12 +125,14 @@ X86TargetMachine.o: X86GenSubtargetInfo.inc.h
 X86TargetMachine.po: X86GenInstrInfo.inc.h
 X86TargetMachine.po: X86GenRegisterInfo.inc.h
 X86TargetMachine.po: X86GenSubtargetInfo.inc.h
-X86TargetObjectFile.o: X86GenInstrInfo.inc.h
-X86TargetObjectFile.o: X86GenRegisterInfo.inc.h
-X86TargetObjectFile.o: X86GenSubtargetInfo.inc.h
-X86TargetObjectFile.po: X86GenInstrInfo.inc.h
-X86TargetObjectFile.po: X86GenRegisterInfo.inc.h
-X86TargetObjectFile.po: X86GenSubtargetInfo.inc.h
+X86TargetTransformInfo.o: Intrinsics.inc.h
+X86TargetTransformInfo.o: X86GenInstrInfo.inc.h
+X86TargetTransformInfo.o: X86GenRegisterInfo.inc.h
+X86TargetTransformInfo.o: X86GenSubtargetInfo.inc.h
+X86TargetTransformInfo.po: Intrinsics.inc.h
+X86TargetTransformInfo.po: X86GenInstrInfo.inc.h
+X86TargetTransformInfo.po: X86GenRegisterInfo.inc.h
+X86TargetTransformInfo.po: X86GenSubtargetInfo.inc.h
 X86VZeroUpper.o: X86GenInstrInfo.inc.h
 X86VZeroUpper.o: X86GenRegisterInfo.inc.h
 X86VZeroUpper.o: X86GenSubtargetInfo.inc.h
diff --git a/lib/clang/libllvmx86desc/Makefile.depend b/lib/clang/libllvmx86desc/Makefile.depend
index a5e3e54..9e3ab73 100644
--- a/lib/clang/libllvmx86desc/Makefile.depend
+++ b/lib/clang/libllvmx86desc/Makefile.depend
@@ -8,6 +8,7 @@ DIRDEPS = \
 	include \
 	include/xlocale \
 	lib/msun \
+	usr.bin/clang/tblgen.host \
 
 
 .include <dirdeps.mk>
diff --git a/lib/clang/libllvmx86disassembler/Makefile.depend b/lib/clang/libllvmx86disassembler/Makefile.depend
index 802a851..0e569ca 100644
--- a/lib/clang/libllvmx86disassembler/Makefile.depend
+++ b/lib/clang/libllvmx86disassembler/Makefile.depend
@@ -8,16 +8,15 @@ DIRDEPS = \
 	include \
 	include/xlocale \
 	lib/msun \
+	usr.bin/clang/tblgen.host \
 
 
 .include <dirdeps.mk>
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
-X86Disassembler.o: X86GenEDInfo.inc.h
 X86Disassembler.o: X86GenInstrInfo.inc.h
 X86Disassembler.o: X86GenRegisterInfo.inc.h
-X86Disassembler.po: X86GenEDInfo.inc.h
 X86Disassembler.po: X86GenInstrInfo.inc.h
 X86Disassembler.po: X86GenRegisterInfo.inc.h
 .endif
diff --git a/lib/clang/libllvmx86info/Makefile.depend b/lib/clang/libllvmx86info/Makefile.depend
index 1540a5f..212ccc1 100644
--- a/lib/clang/libllvmx86info/Makefile.depend
+++ b/lib/clang/libllvmx86info/Makefile.depend
@@ -8,6 +8,7 @@ DIRDEPS = \
 	include \
 	include/xlocale \
 	lib/msun \
+	usr.bin/clang/tblgen.host \
 
 
 .include <dirdeps.mk>
diff --git a/lib/clang/libllvmx86instprinter/Makefile.depend b/lib/clang/libllvmx86instprinter/Makefile.depend
index ab56eb6..062c782 100644
--- a/lib/clang/libllvmx86instprinter/Makefile.depend
+++ b/lib/clang/libllvmx86instprinter/Makefile.depend
@@ -8,6 +8,7 @@ DIRDEPS = \
 	include \
 	include/xlocale \
 	lib/msun \
+	usr.bin/clang/tblgen.host \
 
 
 .include <dirdeps.mk>
diff --git a/lib/libprocstat/Makefile.depend b/lib/libprocstat/Makefile.depend
index 4a629c0..3444d93 100644
--- a/lib/libprocstat/Makefile.depend
+++ b/lib/libprocstat/Makefile.depend
@@ -9,6 +9,7 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
+	lib/libelf \
 	lib/libkvm \
 	lib/libprocstat/zfs \
 	lib/libutil \
diff --git a/libexec/telnetd/Makefile.depend b/libexec/telnetd/Makefile.depend
index 764aaef..b4f3ca5 100644
--- a/libexec/telnetd/Makefile.depend
+++ b/libexec/telnetd/Makefile.depend
@@ -8,9 +8,12 @@ DIRDEPS = \
 	include/arpa \
 	include/xlocale \
 	kerberos5/lib/libasn1 \
+	kerberos5/lib/libheimbase \
+	kerberos5/lib/libheimipcc \
 	kerberos5/lib/libhx509 \
 	kerberos5/lib/libkrb5 \
 	kerberos5/lib/libroken \
+	kerberos5/lib/libwind \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcom_err \
@@ -19,6 +22,7 @@ DIRDEPS = \
 	lib/libmp \
 	lib/libpam/libpam \
 	lib/libtelnet \
+	lib/libthr \
 	lib/libutil \
 	lib/ncurses/ncurses \
 	lib/ncurses/ncursesw \
diff --git a/libexec/ulog-helper/Makefile.depend b/libexec/ulog-helper/Makefile.depend
index 0ff3623..b1f47e3 100644
--- a/libexec/ulog-helper/Makefile.depend
+++ b/libexec/ulog-helper/Makefile.depend
@@ -9,6 +9,7 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
+	lib/libmd \
 	lib/libulog \
 
 
diff --git a/pkgs/pseudo/clang/Makefile.depend b/pkgs/pseudo/clang/Makefile.depend
index 128712a..bd0c8db 100644
--- a/pkgs/pseudo/clang/Makefile.depend
+++ b/pkgs/pseudo/clang/Makefile.depend
@@ -16,7 +16,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 \
@@ -24,43 +25,52 @@ DIRDEPS = \
 	lib/clang/libclangstaticanalyzerfrontend \
 	lib/clang/libllvmanalysis \
 	lib/clang/libllvmarchive \
+	lib/clang/libllvmarmasmparser \
+	lib/clang/libllvmarmcodegen \
+	lib/clang/libllvmarmdesc \
+	lib/clang/libllvmarmdisassembler \
+	lib/clang/libllvmarminfo \
+	lib/clang/libllvmarminstprinter \
 	lib/clang/libllvmasmparser \
 	lib/clang/libllvmasmprinter \
 	lib/clang/libllvmbitreader \
 	lib/clang/libllvmbitwriter \
 	lib/clang/libllvmcodegen \
 	lib/clang/libllvmcore \
+	lib/clang/libllvmdebuginfo \
+	lib/clang/libllvmexecutionengine \
 	lib/clang/libllvminstcombine \
 	lib/clang/libllvminstrumentation \
+	lib/clang/libllvminterpreter \
 	lib/clang/libllvmipa \
 	lib/clang/libllvmipo \
+	lib/clang/libllvmirreader \
+	lib/clang/libllvmjit \
 	lib/clang/libllvmlinker \
 	lib/clang/libllvmmc \
+	lib/clang/libllvmmcdisassembler \
+	lib/clang/libllvmmcjit \
 	lib/clang/libllvmmcparser \
-	lib/clang/libllvmobject \
-	lib/clang/libllvmscalaropts \
-	lib/clang/libllvmselectiondag \
-	lib/clang/libllvmsupport \
-	lib/clang/libllvmtablegen \
-	lib/clang/libllvmtarget \
-	lib/clang/libllvmtransformutils \
-	lib/clang/libllvmvectorize \
-	lib/clang/libllvmarmasmparser \
-	lib/clang/libllvmarmcodegen \
-	lib/clang/libllvmarmdesc \
-	lib/clang/libllvmarmdisassembler \
-	lib/clang/libllvmarminfo \
-	lib/clang/libllvmarminstprinter \
 	lib/clang/libllvmmipsasmparser \
 	lib/clang/libllvmmipscodegen \
 	lib/clang/libllvmmipsdesc \
 	lib/clang/libllvmmipsdisassembler \
 	lib/clang/libllvmmipsinfo \
 	lib/clang/libllvmmipsinstprinter \
+	lib/clang/libllvmobjcarcopts \
+	lib/clang/libllvmobject \
 	lib/clang/libllvmpowerpccodegen \
 	lib/clang/libllvmpowerpcdesc \
 	lib/clang/libllvmpowerpcinfo \
 	lib/clang/libllvmpowerpcinstprinter \
+	lib/clang/libllvmruntimedyld \
+	lib/clang/libllvmscalaropts \
+	lib/clang/libllvmselectiondag \
+	lib/clang/libllvmsupport \
+	lib/clang/libllvmtablegen \
+	lib/clang/libllvmtarget \
+	lib/clang/libllvmtransformutils \
+	lib/clang/libllvmvectorize \
 	lib/clang/libllvmx86asmparser \
 	lib/clang/libllvmx86codegen \
 	lib/clang/libllvmx86desc \
diff --git a/sbin/atm/atmconfig/Makefile.depend b/sbin/atm/atmconfig/Makefile.depend
index 4db19e8..99d3028 100644
--- a/sbin/atm/atmconfig/Makefile.depend
+++ b/sbin/atm/atmconfig/Makefile.depend
@@ -12,6 +12,7 @@ DIRDEPS = \
 	lib/libc \
 	lib/libcompiler_rt \
 	lib/libnetgraph \
+	secure/lib/libcrypto \
 
 
 .include <dirdeps.mk>
diff --git a/sbin/ccdconfig/Makefile.depend b/sbin/ccdconfig/Makefile.depend
index ecf6302..099436d 100644
--- a/sbin/ccdconfig/Makefile.depend
+++ b/sbin/ccdconfig/Makefile.depend
@@ -9,7 +9,9 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
+	lib/libexpat \
 	lib/libgeom \
+	lib/libsbuf \
 
 
 .include <dirdeps.mk>
diff --git a/sbin/gbde/Makefile.depend b/sbin/gbde/Makefile.depend
index 491be48..e4727db 100644
--- a/sbin/gbde/Makefile.depend
+++ b/sbin/gbde/Makefile.depend
@@ -9,8 +9,10 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
+	lib/libexpat \
 	lib/libgeom \
 	lib/libmd \
+	lib/libsbuf \
 	lib/libutil \
 
 
diff --git a/sbin/gvinum/Makefile.depend b/sbin/gvinum/Makefile.depend
index 7a3df72..af362c6 100644
--- a/sbin/gvinum/Makefile.depend
+++ b/sbin/gvinum/Makefile.depend
@@ -12,8 +12,10 @@ DIRDEPS = \
 	lib/libdevstat \
 	lib/libedit \
 	lib/libedit/edit/readline \
+	lib/libexpat \
 	lib/libgeom \
 	lib/libkvm \
+	lib/libsbuf \
 	lib/ncurses/ncurses \
 
 
diff --git a/sbin/hastctl/Makefile.depend b/sbin/hastctl/Makefile.depend
index a7f85ef..f12a2e4 100644
--- a/sbin/hastctl/Makefile.depend
+++ b/sbin/hastctl/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
 	lib/libcompiler_rt \
 	lib/libutil \
 	secure/lib/libcrypto \
-	usr.bin/lex/lib \
 
 
 .include <dirdeps.mk>
diff --git a/sbin/hastd/Makefile.depend b/sbin/hastd/Makefile.depend
index cfbc40b..70e64c8 100644
--- a/sbin/hastd/Makefile.depend
+++ b/sbin/hastd/Makefile.depend
@@ -16,7 +16,6 @@ DIRDEPS = \
 	lib/libthr \
 	lib/libutil \
 	secure/lib/libcrypto \
-	usr.bin/lex/lib \
 
 
 .include <dirdeps.mk>
diff --git a/sbin/iscontrol/Makefile.depend b/sbin/iscontrol/Makefile.depend
index b4c8c6f..f517717 100644
--- a/sbin/iscontrol/Makefile.depend
+++ b/sbin/iscontrol/Makefile.depend
@@ -12,6 +12,7 @@ DIRDEPS = \
 	lib/libcam \
 	lib/libcompiler_rt \
 	lib/libmd \
+	lib/libsbuf \
 
 
 .include <dirdeps.mk>
diff --git a/secure/lib/libssh/Makefile.depend b/secure/lib/libssh/Makefile.depend
index 494483b..7d3729c 100644
--- a/secure/lib/libssh/Makefile.depend
+++ b/secure/lib/libssh/Makefile.depend
@@ -17,11 +17,13 @@ DIRDEPS = \
 	lib/libcompiler_rt \
 	lib/libcrypt \
 	lib/libgssapi \
+	lib/libldns \
 	lib/libmd \
 	lib/libpam/libpam \
 	lib/libutil \
 	lib/libz \
 	secure/lib/libcrypto \
+	secure/lib/libssl \
 
 
 .include <dirdeps.mk>
diff --git a/secure/libexec/sftp-server/Makefile.depend b/secure/libexec/sftp-server/Makefile.depend
index e31fa30..9ec443c 100644
--- a/secure/libexec/sftp-server/Makefile.depend
+++ b/secure/libexec/sftp-server/Makefile.depend
@@ -7,11 +7,23 @@ DIRDEPS = \
 	include \
 	include/arpa \
 	include/xlocale \
+	kerberos5/lib/libasn1 \
+	kerberos5/lib/libheimbase \
+	kerberos5/lib/libheimipcc \
+	kerberos5/lib/libhx509 \
+	kerberos5/lib/libkrb5 \
+	kerberos5/lib/libroken \
+	kerberos5/lib/libwind \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libcom_err \
 	lib/libcompiler_rt \
 	lib/libcrypt \
+	lib/libgssapi \
+	lib/libldns \
+	lib/libmd \
 	lib/libpam/libpam \
+	lib/libthr \
 	lib/libutil \
 	lib/libz \
 	secure/lib/libcrypto \
diff --git a/secure/libexec/ssh-keysign/Makefile.depend b/secure/libexec/ssh-keysign/Makefile.depend
index e31fa30..9ec443c 100644
--- a/secure/libexec/ssh-keysign/Makefile.depend
+++ b/secure/libexec/ssh-keysign/Makefile.depend
@@ -7,11 +7,23 @@ DIRDEPS = \
 	include \
 	include/arpa \
 	include/xlocale \
+	kerberos5/lib/libasn1 \
+	kerberos5/lib/libheimbase \
+	kerberos5/lib/libheimipcc \
+	kerberos5/lib/libhx509 \
+	kerberos5/lib/libkrb5 \
+	kerberos5/lib/libroken \
+	kerberos5/lib/libwind \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libcom_err \
 	lib/libcompiler_rt \
 	lib/libcrypt \
+	lib/libgssapi \
+	lib/libldns \
+	lib/libmd \
 	lib/libpam/libpam \
+	lib/libthr \
 	lib/libutil \
 	lib/libz \
 	secure/lib/libcrypto \
diff --git a/secure/libexec/ssh-pkcs11-helper/Makefile.depend b/secure/libexec/ssh-pkcs11-helper/Makefile.depend
index e31fa30..9ec443c 100644
--- a/secure/libexec/ssh-pkcs11-helper/Makefile.depend
+++ b/secure/libexec/ssh-pkcs11-helper/Makefile.depend
@@ -7,11 +7,23 @@ DIRDEPS = \
 	include \
 	include/arpa \
 	include/xlocale \
+	kerberos5/lib/libasn1 \
+	kerberos5/lib/libheimbase \
+	kerberos5/lib/libheimipcc \
+	kerberos5/lib/libhx509 \
+	kerberos5/lib/libkrb5 \
+	kerberos5/lib/libroken \
+	kerberos5/lib/libwind \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libcom_err \
 	lib/libcompiler_rt \
 	lib/libcrypt \
+	lib/libgssapi \
+	lib/libldns \
+	lib/libmd \
 	lib/libpam/libpam \
+	lib/libthr \
 	lib/libutil \
 	lib/libz \
 	secure/lib/libcrypto \
diff --git a/secure/usr.bin/scp/Makefile.depend b/secure/usr.bin/scp/Makefile.depend
index e31fa30..9ec443c 100644
--- a/secure/usr.bin/scp/Makefile.depend
+++ b/secure/usr.bin/scp/Makefile.depend
@@ -7,11 +7,23 @@ DIRDEPS = \
 	include \
 	include/arpa \
 	include/xlocale \
+	kerberos5/lib/libasn1 \
+	kerberos5/lib/libheimbase \
+	kerberos5/lib/libheimipcc \
+	kerberos5/lib/libhx509 \
+	kerberos5/lib/libkrb5 \
+	kerberos5/lib/libroken \
+	kerberos5/lib/libwind \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libcom_err \
 	lib/libcompiler_rt \
 	lib/libcrypt \
+	lib/libgssapi \
+	lib/libldns \
+	lib/libmd \
 	lib/libpam/libpam \
+	lib/libthr \
 	lib/libutil \
 	lib/libz \
 	secure/lib/libcrypto \
diff --git a/secure/usr.bin/sftp/Makefile.depend b/secure/usr.bin/sftp/Makefile.depend
index 48894d8..1f554f0 100644
--- a/secure/usr.bin/sftp/Makefile.depend
+++ b/secure/usr.bin/sftp/Makefile.depend
@@ -7,12 +7,24 @@ DIRDEPS = \
 	include \
 	include/arpa \
 	include/xlocale \
+	kerberos5/lib/libasn1 \
+	kerberos5/lib/libheimbase \
+	kerberos5/lib/libheimipcc \
+	kerberos5/lib/libhx509 \
+	kerberos5/lib/libkrb5 \
+	kerberos5/lib/libroken \
+	kerberos5/lib/libwind \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libcom_err \
 	lib/libcompiler_rt \
 	lib/libcrypt \
 	lib/libedit \
+	lib/libgssapi \
+	lib/libldns \
+	lib/libmd \
 	lib/libpam/libpam \
+	lib/libthr \
 	lib/libutil \
 	lib/libz \
 	lib/ncurses/ncurses \
diff --git a/secure/usr.bin/ssh-add/Makefile.depend b/secure/usr.bin/ssh-add/Makefile.depend
index e31fa30..9ec443c 100644
--- a/secure/usr.bin/ssh-add/Makefile.depend
+++ b/secure/usr.bin/ssh-add/Makefile.depend
@@ -7,11 +7,23 @@ DIRDEPS = \
 	include \
 	include/arpa \
 	include/xlocale \
+	kerberos5/lib/libasn1 \
+	kerberos5/lib/libheimbase \
+	kerberos5/lib/libheimipcc \
+	kerberos5/lib/libhx509 \
+	kerberos5/lib/libkrb5 \
+	kerberos5/lib/libroken \
+	kerberos5/lib/libwind \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libcom_err \
 	lib/libcompiler_rt \
 	lib/libcrypt \
+	lib/libgssapi \
+	lib/libldns \
+	lib/libmd \
 	lib/libpam/libpam \
+	lib/libthr \
 	lib/libutil \
 	lib/libz \
 	secure/lib/libcrypto \
diff --git a/secure/usr.bin/ssh-agent/Makefile.depend b/secure/usr.bin/ssh-agent/Makefile.depend
index e31fa30..9ec443c 100644
--- a/secure/usr.bin/ssh-agent/Makefile.depend
+++ b/secure/usr.bin/ssh-agent/Makefile.depend
@@ -7,11 +7,23 @@ DIRDEPS = \
 	include \
 	include/arpa \
 	include/xlocale \
+	kerberos5/lib/libasn1 \
+	kerberos5/lib/libheimbase \
+	kerberos5/lib/libheimipcc \
+	kerberos5/lib/libhx509 \
+	kerberos5/lib/libkrb5 \
+	kerberos5/lib/libroken \
+	kerberos5/lib/libwind \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libcom_err \
 	lib/libcompiler_rt \
 	lib/libcrypt \
+	lib/libgssapi \
+	lib/libldns \
+	lib/libmd \
 	lib/libpam/libpam \
+	lib/libthr \
 	lib/libutil \
 	lib/libz \
 	secure/lib/libcrypto \
diff --git a/secure/usr.bin/ssh-keygen/Makefile.depend b/secure/usr.bin/ssh-keygen/Makefile.depend
index e31fa30..9ec443c 100644
--- a/secure/usr.bin/ssh-keygen/Makefile.depend
+++ b/secure/usr.bin/ssh-keygen/Makefile.depend
@@ -7,11 +7,23 @@ DIRDEPS = \
 	include \
 	include/arpa \
 	include/xlocale \
+	kerberos5/lib/libasn1 \
+	kerberos5/lib/libheimbase \
+	kerberos5/lib/libheimipcc \
+	kerberos5/lib/libhx509 \
+	kerberos5/lib/libkrb5 \
+	kerberos5/lib/libroken \
+	kerberos5/lib/libwind \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libcom_err \
 	lib/libcompiler_rt \
 	lib/libcrypt \
+	lib/libgssapi \
+	lib/libldns \
+	lib/libmd \
 	lib/libpam/libpam \
+	lib/libthr \
 	lib/libutil \
 	lib/libz \
 	secure/lib/libcrypto \
diff --git a/secure/usr.bin/ssh-keyscan/Makefile.depend b/secure/usr.bin/ssh-keyscan/Makefile.depend
index e31fa30..9ec443c 100644
--- a/secure/usr.bin/ssh-keyscan/Makefile.depend
+++ b/secure/usr.bin/ssh-keyscan/Makefile.depend
@@ -7,11 +7,23 @@ DIRDEPS = \
 	include \
 	include/arpa \
 	include/xlocale \
+	kerberos5/lib/libasn1 \
+	kerberos5/lib/libheimbase \
+	kerberos5/lib/libheimipcc \
+	kerberos5/lib/libhx509 \
+	kerberos5/lib/libkrb5 \
+	kerberos5/lib/libroken \
+	kerberos5/lib/libwind \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libcom_err \
 	lib/libcompiler_rt \
 	lib/libcrypt \
+	lib/libgssapi \
+	lib/libldns \
+	lib/libmd \
 	lib/libpam/libpam \
+	lib/libthr \
 	lib/libutil \
 	lib/libz \
 	secure/lib/libcrypto \
diff --git a/secure/usr.bin/ssh/Makefile.depend b/secure/usr.bin/ssh/Makefile.depend
index 97edbeb..7ea112bc 100644
--- a/secure/usr.bin/ssh/Makefile.depend
+++ b/secure/usr.bin/ssh/Makefile.depend
@@ -9,13 +9,22 @@ DIRDEPS = \
 	include/gssapi \
 	include/xlocale \
 	kerberos5/lib/libasn1 \
+	kerberos5/lib/libheimbase \
+	kerberos5/lib/libheimipcc \
+	kerberos5/lib/libhx509 \
 	kerberos5/lib/libkrb5 \
+	kerberos5/lib/libroken \
+	kerberos5/lib/libwind \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libcom_err \
 	lib/libcompiler_rt \
 	lib/libcrypt \
 	lib/libgssapi \
+	lib/libldns \
+	lib/libmd \
 	lib/libpam/libpam \
+	lib/libthr \
 	lib/libutil \
 	lib/libz \
 	secure/lib/libcrypto \
diff --git a/secure/usr.sbin/sshd/Makefile.depend b/secure/usr.sbin/sshd/Makefile.depend
index f6a2ce1..140ceec 100644
--- a/secure/usr.sbin/sshd/Makefile.depend
+++ b/secure/usr.sbin/sshd/Makefile.depend
@@ -10,14 +10,23 @@ DIRDEPS = \
 	include/xlocale \
 	kerberos5/lib/libasn1 \
 	kerberos5/lib/libgssapi_krb5 \
+	kerberos5/lib/libheimbase \
+	kerberos5/lib/libheimipcc \
+	kerberos5/lib/libhx509 \
 	kerberos5/lib/libkrb5 \
+	kerberos5/lib/libroken \
+	kerberos5/lib/libwind \
 	lib/${CSU_DIR} \
 	lib/libbsm \
 	lib/libc \
+	lib/libcom_err \
 	lib/libcompiler_rt \
 	lib/libcrypt \
 	lib/libgssapi \
+	lib/libldns \
+	lib/libmd \
 	lib/libpam/libpam \
+	lib/libthr \
 	lib/libutil \
 	lib/libwrap \
 	lib/libz \
diff --git a/share/atf/Makefile.depend b/share/atf/Makefile.depend
new file mode 100644
index 0000000..57b7e10
--- /dev/null
+++ b/share/atf/Makefile.depend
@@ -0,0 +1,12 @@
+# Autogenerated - do NOT edit!
+
+DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
+
+DIRDEPS = \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/share/dict/Makefile.depend b/share/dict/Makefile.depend
index 29fda55..57b7e10 100644
--- a/share/dict/Makefile.depend
+++ b/share/dict/Makefile.depend
@@ -2,8 +2,6 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
 
 
diff --git a/share/doc/IPv6/Makefile.depend b/share/doc/IPv6/Makefile.depend
index 29fda55..57b7e10 100644
--- a/share/doc/IPv6/Makefile.depend
+++ b/share/doc/IPv6/Makefile.depend
@@ -2,8 +2,6 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
 
 
diff --git a/share/doc/atf/Makefile.depend b/share/doc/atf/Makefile.depend
new file mode 100644
index 0000000..57b7e10
--- /dev/null
+++ b/share/doc/atf/Makefile.depend
@@ -0,0 +1,12 @@
+# Autogenerated - do NOT edit!
+
+DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
+
+DIRDEPS = \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/share/doc/legal/intel_ipw/Makefile.depend b/share/doc/legal/intel_ipw/Makefile.depend
index 29fda55..57b7e10 100644
--- a/share/doc/legal/intel_ipw/Makefile.depend
+++ b/share/doc/legal/intel_ipw/Makefile.depend
@@ -2,8 +2,6 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
 
 
diff --git a/share/doc/legal/intel_iwi/Makefile.depend b/share/doc/legal/intel_iwi/Makefile.depend
index 29fda55..57b7e10 100644
--- a/share/doc/legal/intel_iwi/Makefile.depend
+++ b/share/doc/legal/intel_iwi/Makefile.depend
@@ -2,8 +2,6 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
 
 
diff --git a/share/doc/legal/intel_iwn/Makefile.depend b/share/doc/legal/intel_iwn/Makefile.depend
index 29fda55..57b7e10 100644
--- a/share/doc/legal/intel_iwn/Makefile.depend
+++ b/share/doc/legal/intel_iwn/Makefile.depend
@@ -2,8 +2,6 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
 
 
diff --git a/share/doc/legal/intel_wpi/Makefile.depend b/share/doc/legal/intel_wpi/Makefile.depend
index 29fda55..57b7e10 100644
--- a/share/doc/legal/intel_wpi/Makefile.depend
+++ b/share/doc/legal/intel_wpi/Makefile.depend
@@ -2,8 +2,6 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
 
 
diff --git a/share/doc/llvm/clang/Makefile.depend b/share/doc/llvm/clang/Makefile.depend
index 29fda55..57b7e10 100644
--- a/share/doc/llvm/clang/Makefile.depend
+++ b/share/doc/llvm/clang/Makefile.depend
@@ -2,8 +2,6 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
 
 
diff --git a/share/dtrace/toolkit/Makefile.depend b/share/dtrace/toolkit/Makefile.depend
new file mode 100644
index 0000000..57b7e10
--- /dev/null
+++ b/share/dtrace/toolkit/Makefile.depend
@@ -0,0 +1,12 @@
+# Autogenerated - do NOT edit!
+
+DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
+
+DIRDEPS = \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/share/examples/atf/Makefile.depend b/share/examples/atf/Makefile.depend
new file mode 100644
index 0000000..57b7e10
--- /dev/null
+++ b/share/examples/atf/Makefile.depend
@@ -0,0 +1,12 @@
+# Autogenerated - do NOT edit!
+
+DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
+
+DIRDEPS = \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/share/examples/pf/Makefile.depend b/share/examples/pf/Makefile.depend
new file mode 100644
index 0000000..57b7e10
--- /dev/null
+++ b/share/examples/pf/Makefile.depend
@@ -0,0 +1,12 @@
+# Autogenerated - do NOT edit!
+
+DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
+
+DIRDEPS = \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/share/skel/Makefile.depend b/share/skel/Makefile.depend
index 29fda55..57b7e10 100644
--- a/share/skel/Makefile.depend
+++ b/share/skel/Makefile.depend
@@ -2,8 +2,6 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
 
 
diff --git a/share/snmp/mibs/Makefile.depend b/share/snmp/mibs/Makefile.depend
index 29fda55..57b7e10 100644
--- a/share/snmp/mibs/Makefile.depend
+++ b/share/snmp/mibs/Makefile.depend
@@ -2,8 +2,6 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
 
 
diff --git a/share/syscons/fonts/Makefile.depend b/share/syscons/fonts/Makefile.depend
index 29fda55..57b7e10 100644
--- a/share/syscons/fonts/Makefile.depend
+++ b/share/syscons/fonts/Makefile.depend
@@ -2,8 +2,6 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
 
 
diff --git a/share/syscons/keymaps/Makefile.depend b/share/syscons/keymaps/Makefile.depend
index 29fda55..57b7e10 100644
--- a/share/syscons/keymaps/Makefile.depend
+++ b/share/syscons/keymaps/Makefile.depend
@@ -2,8 +2,6 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
 
 
diff --git a/share/xml/atf/Makefile.depend b/share/xml/atf/Makefile.depend
new file mode 100644
index 0000000..57b7e10
--- /dev/null
+++ b/share/xml/atf/Makefile.depend
@@ -0,0 +1,12 @@
+# Autogenerated - do NOT edit!
+
+DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
+
+DIRDEPS = \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/share/xsl/atf/Makefile.depend b/share/xsl/atf/Makefile.depend
new file mode 100644
index 0000000..57b7e10
--- /dev/null
+++ b/share/xsl/atf/Makefile.depend
@@ -0,0 +1,12 @@
+# Autogenerated - do NOT edit!
+
+DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
+
+DIRDEPS = \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/usr.bin/alias/Makefile.depend b/usr.bin/alias/Makefile.depend
new file mode 100644
index 0000000..57b7e10
--- /dev/null
+++ b/usr.bin/alias/Makefile.depend
@@ -0,0 +1,12 @@
+# Autogenerated - do NOT edit!
+
+DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
+
+DIRDEPS = \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/usr.bin/clang/clang/Makefile.depend b/usr.bin/clang/clang/Makefile.depend
index f7b95b0..6b3c19a 100644
--- a/usr.bin/clang/clang/Makefile.depend
+++ b/usr.bin/clang/clang/Makefile.depend
@@ -27,7 +27,6 @@ DIRDEPS = \
 	lib/clang/libclangstaticanalyzercore \
 	lib/clang/libclangstaticanalyzerfrontend \
 	lib/clang/libllvmanalysis \
-	lib/clang/libllvmarchive \
 	lib/clang/libllvmarmasmparser \
 	lib/clang/libllvmarmcodegen \
 	lib/clang/libllvmarmdesc \
@@ -44,6 +43,7 @@ DIRDEPS = \
 	lib/clang/libllvminstrumentation \
 	lib/clang/libllvmipa \
 	lib/clang/libllvmipo \
+	lib/clang/libllvmirreader \
 	lib/clang/libllvmlinker \
 	lib/clang/libllvmmc \
 	lib/clang/libllvmmcparser \
@@ -53,6 +53,7 @@ DIRDEPS = \
 	lib/clang/libllvmmipsdisassembler \
 	lib/clang/libllvmmipsinfo \
 	lib/clang/libllvmmipsinstprinter \
+	lib/clang/libllvmobjcarcopts \
 	lib/clang/libllvmobject \
 	lib/clang/libllvmpowerpccodegen \
 	lib/clang/libllvmpowerpcdesc \
@@ -74,6 +75,7 @@ DIRDEPS = \
 	lib/libc \
 	lib/libcompiler_rt \
 	lib/msun \
+	usr.bin/clang/clang-tblgen.host \
 
 
 .include <dirdeps.mk>
@@ -99,7 +101,9 @@ cc1as_main.po: DiagnosticDriverKinds.inc.h
 cc1as_main.po: DiagnosticFrontendKinds.inc.h
 cc1as_main.po: Options.inc.h
 driver.o: DiagnosticCommonKinds.inc.h
+driver.o: DiagnosticDriverKinds.inc.h
 driver.o: Options.inc.h
 driver.po: DiagnosticCommonKinds.inc.h
+driver.po: DiagnosticDriverKinds.inc.h
 driver.po: Options.inc.h
 .endif
diff --git a/usr.bin/compile_et/Makefile.depend b/usr.bin/compile_et/Makefile.depend
index d0a5c7c..dc76041 100644
--- a/usr.bin/compile_et/Makefile.depend
+++ b/usr.bin/compile_et/Makefile.depend
@@ -12,6 +12,7 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
+	lib/libcrypt \
 
 
 .include <dirdeps.mk>
diff --git a/usr.bin/fetch/Makefile.depend b/usr.bin/fetch/Makefile.depend
index 29fb457..7226549 100644
--- a/usr.bin/fetch/Makefile.depend
+++ b/usr.bin/fetch/Makefile.depend
@@ -3,9 +3,15 @@
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
 DIRDEPS = \
+	gnu/lib/libgcc \
 	include \
 	include/xlocale \
+	lib/${CSU_DIR} \
+	lib/libc \
+	lib/libcompiler_rt \
 	lib/libfetch \
+	secure/lib/libcrypto \
+	secure/lib/libssl \
 
 
 .include <dirdeps.mk>
diff --git a/usr.bin/fstat/Makefile.depend b/usr.bin/fstat/Makefile.depend
index 4e70e8c..488c003 100644
--- a/usr.bin/fstat/Makefile.depend
+++ b/usr.bin/fstat/Makefile.depend
@@ -9,6 +9,7 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
+	lib/libelf \
 	lib/libkvm \
 	lib/libprocstat \
 	lib/libutil \
diff --git a/usr.bin/gcore/Makefile.depend b/usr.bin/gcore/Makefile.depend
index afbe025..01589a3 100644
--- a/usr.bin/gcore/Makefile.depend
+++ b/usr.bin/gcore/Makefile.depend
@@ -9,6 +9,7 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
+	lib/libsbuf \
 	lib/libutil \
 
 
diff --git a/usr.bin/nslookup/Makefile.depend b/usr.bin/nslookup/Makefile.depend
index 3740d82..82922d8 100644
--- a/usr.bin/nslookup/Makefile.depend
+++ b/usr.bin/nslookup/Makefile.depend
@@ -4,6 +4,7 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
 DIRDEPS = \
 	gnu/lib/libgcc \
+	gnu/lib/libreadline/readline \
 	include \
 	include/arpa \
 	include/xlocale \
@@ -16,7 +17,9 @@ DIRDEPS = \
 	lib/bind/lwres \
 	lib/libc \
 	lib/libcompiler_rt \
+	lib/libedit \
 	lib/libthr \
+	lib/ncurses/ncurses \
 	secure/lib/libcrypto \
 
 
diff --git a/usr.bin/nsupdate/Makefile.depend b/usr.bin/nsupdate/Makefile.depend
index 3740d82..82922d8 100644
--- a/usr.bin/nsupdate/Makefile.depend
+++ b/usr.bin/nsupdate/Makefile.depend
@@ -4,6 +4,7 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
 DIRDEPS = \
 	gnu/lib/libgcc \
+	gnu/lib/libreadline/readline \
 	include \
 	include/arpa \
 	include/xlocale \
@@ -16,7 +17,9 @@ DIRDEPS = \
 	lib/bind/lwres \
 	lib/libc \
 	lib/libcompiler_rt \
+	lib/libedit \
 	lib/libthr \
+	lib/ncurses/ncurses \
 	secure/lib/libcrypto \
 
 
diff --git a/usr.bin/procstat/Makefile.depend b/usr.bin/procstat/Makefile.depend
index 4b8ec13..a6a3edc 100644
--- a/usr.bin/procstat/Makefile.depend
+++ b/usr.bin/procstat/Makefile.depend
@@ -10,6 +10,7 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
+	lib/libelf \
 	lib/libkvm \
 	lib/libprocstat \
 	lib/libutil \
diff --git a/usr.bin/telnet/Makefile.depend b/usr.bin/telnet/Makefile.depend
index a36800d..067677e 100644
--- a/usr.bin/telnet/Makefile.depend
+++ b/usr.bin/telnet/Makefile.depend
@@ -8,9 +8,12 @@ DIRDEPS = \
 	include/arpa \
 	include/xlocale \
 	kerberos5/lib/libasn1 \
+	kerberos5/lib/libheimbase \
+	kerberos5/lib/libheimipcc \
 	kerberos5/lib/libhx509 \
 	kerberos5/lib/libkrb5 \
 	kerberos5/lib/libroken \
+	kerberos5/lib/libwind \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcom_err \
@@ -20,6 +23,7 @@ DIRDEPS = \
 	lib/libmp \
 	lib/libpam/libpam \
 	lib/libtelnet \
+	lib/libthr \
 	lib/ncurses/ncurses \
 	lib/ncurses/ncursesw \
 	secure/lib/libcrypto \
diff --git a/usr.bin/unzip/Makefile.depend b/usr.bin/unzip/Makefile.depend
index 06dac81..91c0c58 100644
--- a/usr.bin/unzip/Makefile.depend
+++ b/usr.bin/unzip/Makefile.depend
@@ -8,9 +8,13 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libarchive \
+	lib/libbz2 \
 	lib/libc \
 	lib/libcompiler_rt \
+	lib/libexpat \
+	lib/liblzma \
 	lib/libz \
+	secure/lib/libcrypto \
 
 
 .include <dirdeps.mk>
diff --git a/usr.bin/vi/Makefile.depend b/usr.bin/vi/Makefile.depend
index dd43fad..9d7543f 100644
--- a/usr.bin/vi/Makefile.depend
+++ b/usr.bin/vi/Makefile.depend
@@ -5,11 +5,12 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 DIRDEPS = \
 	gnu/lib/libgcc \
 	include \
+	include/arpa \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
-	lib/ncurses/ncurses \
+	lib/libutil \
 	lib/ncurses/ncursesw \
 
 
diff --git a/usr.sbin/bluetooth/ath3kfw/Makefile.depend b/usr.sbin/bluetooth/ath3kfw/Makefile.depend
index 0deec23..e7ad4fa 100644
--- a/usr.sbin/bluetooth/ath3kfw/Makefile.depend
+++ b/usr.sbin/bluetooth/ath3kfw/Makefile.depend
@@ -9,6 +9,7 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
+	lib/libthr \
 	lib/libusb \
 
 
diff --git a/usr.sbin/bsdinstall/distextract/Makefile.depend b/usr.sbin/bsdinstall/distextract/Makefile.depend
index 7d3e85e..bf6f768 100644
--- a/usr.sbin/bsdinstall/distextract/Makefile.depend
+++ b/usr.sbin/bsdinstall/distextract/Makefile.depend
@@ -9,10 +9,15 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libarchive \
+	lib/libbz2 \
 	lib/libc \
 	lib/libcompiler_rt \
+	lib/libexpat \
+	lib/liblzma \
+	lib/libz \
 	lib/msun \
 	lib/ncurses/ncursesw \
+	secure/lib/libcrypto \
 
 
 .include <dirdeps.mk>
diff --git a/usr.sbin/bsdinstall/distfetch/Makefile.depend b/usr.sbin/bsdinstall/distfetch/Makefile.depend
index 8d38d74..9bf11e3 100644
--- a/usr.sbin/bsdinstall/distfetch/Makefile.depend
+++ b/usr.sbin/bsdinstall/distfetch/Makefile.depend
@@ -13,6 +13,8 @@ DIRDEPS = \
 	lib/libfetch \
 	lib/msun \
 	lib/ncurses/ncursesw \
+	secure/lib/libcrypto \
+	secure/lib/libssl \
 
 
 .include <dirdeps.mk>
diff --git a/usr.sbin/bsdinstall/partedit/Makefile.depend b/usr.sbin/bsdinstall/partedit/Makefile.depend
index 6fb2e12..c82f3b2 100644
--- a/usr.sbin/bsdinstall/partedit/Makefile.depend
+++ b/usr.sbin/bsdinstall/partedit/Makefile.depend
@@ -10,7 +10,9 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
+	lib/libexpat \
 	lib/libgeom \
+	lib/libsbuf \
 	lib/libutil \
 	lib/msun \
 	lib/ncurses/ncursesw \
diff --git a/usr.sbin/bsnmpd/bsnmpd/Makefile.depend b/usr.sbin/bsnmpd/bsnmpd/Makefile.depend
index 4756a45..aa5ee3c 100644
--- a/usr.sbin/bsnmpd/bsnmpd/Makefile.depend
+++ b/usr.sbin/bsnmpd/bsnmpd/Makefile.depend
@@ -13,6 +13,7 @@ DIRDEPS = \
 	lib/libc \
 	lib/libcompiler_rt \
 	lib/libwrap \
+	secure/lib/libcrypto \
 
 
 .include <dirdeps.mk>
diff --git a/usr.sbin/gssd/Makefile.depend b/usr.sbin/gssd/Makefile.depend
index 6771558..c298b13 100644
--- a/usr.sbin/gssd/Makefile.depend
+++ b/usr.sbin/gssd/Makefile.depend
@@ -9,15 +9,19 @@ DIRDEPS = \
 	include/rpc \
 	include/xlocale \
 	kerberos5/lib/libasn1 \
+	kerberos5/lib/libheimbase \
+	kerberos5/lib/libheimipcc \
 	kerberos5/lib/libhx509 \
 	kerberos5/lib/libkrb5 \
 	kerberos5/lib/libroken \
+	kerberos5/lib/libwind \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcom_err \
 	lib/libcompiler_rt \
 	lib/libcrypt \
 	lib/libgssapi \
+	lib/libthr \
 	secure/lib/libcrypto \
 
 
diff --git a/usr.sbin/makefs/Makefile.depend b/usr.sbin/makefs/Makefile.depend
index 8a69c21..e549f55 100644
--- a/usr.sbin/makefs/Makefile.depend
+++ b/usr.sbin/makefs/Makefile.depend
@@ -9,7 +9,9 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
+	lib/libnetbsd \
 	lib/libsbuf \
+	lib/libutil \
 
 
 .include <dirdeps.mk>
diff --git a/usr.sbin/ntp/ntpd/Makefile.depend b/usr.sbin/ntp/ntpd/Makefile.depend
index 3c9274a..4bff1e2 100644
--- a/usr.sbin/ntp/ntpd/Makefile.depend
+++ b/usr.sbin/ntp/ntpd/Makefile.depend
@@ -12,6 +12,7 @@ DIRDEPS = \
 	lib/libcompiler_rt \
 	lib/libmd \
 	lib/librt \
+	lib/libthr \
 	lib/msun \
 	secure/lib/libcrypto \
 	usr.sbin/ntp/libntp \
diff --git a/usr.sbin/ntp/ntpdate/Makefile.depend b/usr.sbin/ntp/ntpdate/Makefile.depend
index da518fb..868ca7a 100644
--- a/usr.sbin/ntp/ntpdate/Makefile.depend
+++ b/usr.sbin/ntp/ntpdate/Makefile.depend
@@ -12,6 +12,7 @@ DIRDEPS = \
 	lib/libcompiler_rt \
 	lib/libmd \
 	lib/librt \
+	lib/libthr \
 	lib/msun \
 	secure/lib/libcrypto \
 	usr.sbin/ntp/libntp \
diff --git a/usr.sbin/pc-sysinstall/backend-partmanager/Makefile.depend b/usr.sbin/pc-sysinstall/backend-partmanager/Makefile.depend
index 29fda55..57b7e10 100644
--- a/usr.sbin/pc-sysinstall/backend-partmanager/Makefile.depend
+++ b/usr.sbin/pc-sysinstall/backend-partmanager/Makefile.depend
@@ -2,8 +2,6 @@
 
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
-DEP_MACHINE := ${.PARSEFILE:E}
-
 DIRDEPS = \
 
 
diff --git a/usr.sbin/pc-sysinstall/doc/Makefile.depend b/usr.sbin/pc-sysinstall/doc/Makefile.depend
new file mode 100644
index 0000000..57b7e10
--- /dev/null
+++ b/usr.sbin/pc-sysinstall/doc/Makefile.depend
@@ -0,0 +1,12 @@
+# Autogenerated - do NOT edit!
+
+DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
+
+DIRDEPS = \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/usr.sbin/pkg/Makefile.depend b/usr.sbin/pkg/Makefile.depend
index 309336a..d25c193 100644
--- a/usr.sbin/pkg/Makefile.depend
+++ b/usr.sbin/pkg/Makefile.depend
@@ -9,12 +9,18 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libarchive \
+	lib/libbz2 \
 	lib/libc \
 	lib/libcompiler_rt \
 	lib/libelf \
+	lib/libexpat \
 	lib/libfetch \
+	lib/liblzma \
 	lib/libsbuf \
 	lib/libyaml \
+	lib/libz \
+	secure/lib/libcrypto \
+	secure/lib/libssl \
 
 
 .include <dirdeps.mk>
diff --git a/usr.sbin/usbconfig/Makefile.depend b/usr.sbin/usbconfig/Makefile.depend
index 0deec23..e7ad4fa 100644
--- a/usr.sbin/usbconfig/Makefile.depend
+++ b/usr.sbin/usbconfig/Makefile.depend
@@ -9,6 +9,7 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
+	lib/libthr \
 	lib/libusb \
 
 
diff --git a/usr.sbin/wpa/wpa_cli/Makefile.depend b/usr.sbin/wpa/wpa_cli/Makefile.depend
index b9f4c01..0ca3031 100644
--- a/usr.sbin/wpa/wpa_cli/Makefile.depend
+++ b/usr.sbin/wpa/wpa_cli/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
 	lib/libc \
 	lib/libcompiler_rt \
 	lib/libedit \
-	lib/libedit/edit/readline \
 	lib/ncurses/ncurses \