aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorSimon J. Gerraty <sjg@FreeBSD.org>2014-05-16 14:09:51 +0000
committerSimon J. Gerraty <sjg@FreeBSD.org>2014-05-16 14:09:51 +0000
commitfae50821ae22099d0406090228bc4c5b6af693ad (patch)
tree017fbe630c7f277a4aa9398d351a6e623ff1fcaa /lib
parentf7fb4188cea44b6ad059a202396671aee5cbfd22 (diff)
downloadsrc-fae50821ae22099d0406090228bc4c5b6af693ad.tar.gz
src-fae50821ae22099d0406090228bc4c5b6af693ad.zip
Updated dependencies
Notes
Notes: svn path=/projects/bmake/; revision=266219
Diffstat (limited to 'lib')
-rw-r--r--lib/atf/libatf-c++/Makefile.depend10
-rw-r--r--lib/atf/libatf-c/Makefile.depend2
-rw-r--r--lib/clang/libclanganalysis/Makefile.depend15
-rw-r--r--lib/clang/libclangarcmigrate/Makefile.depend11
-rw-r--r--lib/clang/libclangast/Makefile.depend43
-rw-r--r--lib/clang/libclangbasic/Makefile.depend4
-rw-r--r--lib/clang/libclangcodegen/Makefile.depend31
-rw-r--r--lib/clang/libclangdriver/Makefile.depend18
-rw-r--r--lib/clang/libclangedit/Makefile.depend3
-rw-r--r--lib/clang/libclangfrontend/Makefile.depend26
-rw-r--r--lib/clang/libclangfrontendtool/Makefile.depend4
-rw-r--r--lib/clang/libclanglex/Makefile.depend4
-rw-r--r--lib/clang/libclangparse/Makefile.depend9
-rw-r--r--lib/clang/libclangrewritecore/Makefile.depend3
-rw-r--r--lib/clang/libclangrewritefrontend/Makefile.depend3
-rw-r--r--lib/clang/libclangsema/Makefile.depend13
-rw-r--r--lib/clang/libclangserialization/Makefile.depend7
-rw-r--r--lib/clang/libclangstaticanalyzercheckers/Makefile.depend13
-rw-r--r--lib/clang/libclangstaticanalyzercore/Makefile.depend9
-rw-r--r--lib/clang/libclangstaticanalyzerfrontend/Makefile.depend3
-rw-r--r--lib/clang/libllvmanalysis/Makefile.depend3
-rw-r--r--lib/clang/libllvmarmasmparser/Makefile.depend3
-rw-r--r--lib/clang/libllvmarmcodegen/Makefile.depend3
-rw-r--r--lib/clang/libllvmarmdesc/Makefile.depend9
-rw-r--r--lib/clang/libllvmarmdisassembler/Makefile.depend3
-rw-r--r--lib/clang/libllvmarminfo/Makefile.depend3
-rw-r--r--lib/clang/libllvmarminstprinter/Makefile.depend3
-rw-r--r--lib/clang/libllvmasmparser/Makefile.depend4
-rw-r--r--lib/clang/libllvmasmprinter/Makefile.depend3
-rw-r--r--lib/clang/libllvmbitreader/Makefile.depend3
-rw-r--r--lib/clang/libllvmbitwriter/Makefile.depend4
-rw-r--r--lib/clang/libllvmcodegen/Makefile.depend3
-rw-r--r--lib/clang/libllvmcore/Makefile.depend3
-rw-r--r--lib/clang/libllvmdebuginfo/Makefile.depend4
-rw-r--r--lib/clang/libllvmexecutionengine/Makefile.depend3
-rw-r--r--lib/clang/libllvminstcombine/Makefile.depend3
-rw-r--r--lib/clang/libllvminstrumentation/Makefile.depend7
-rw-r--r--lib/clang/libllvminterpreter/Makefile.depend3
-rw-r--r--lib/clang/libllvmipa/Makefile.depend3
-rw-r--r--lib/clang/libllvmipo/Makefile.depend3
-rw-r--r--lib/clang/libllvmirreader/Makefile.depend4
-rw-r--r--lib/clang/libllvmjit/Makefile.depend3
-rw-r--r--lib/clang/libllvmlinker/Makefile.depend4
-rw-r--r--lib/clang/libllvmmc/Makefile.depend3
-rw-r--r--lib/clang/libllvmmcdisassembler/Makefile.depend4
-rw-r--r--lib/clang/libllvmmcjit/Makefile.depend3
-rw-r--r--lib/clang/libllvmmcparser/Makefile.depend4
-rw-r--r--lib/clang/libllvmmipsasmparser/Makefile.depend3
-rw-r--r--lib/clang/libllvmmipscodegen/Makefile.depend9
-rw-r--r--lib/clang/libllvmmipsdesc/Makefile.depend11
-rw-r--r--lib/clang/libllvmmipsdisassembler/Makefile.depend3
-rw-r--r--lib/clang/libllvmmipsinfo/Makefile.depend3
-rw-r--r--lib/clang/libllvmmipsinstprinter/Makefile.depend3
-rw-r--r--lib/clang/libllvmobjcarcopts/Makefile.depend3
-rw-r--r--lib/clang/libllvmobject/Makefile.depend4
-rw-r--r--lib/clang/libllvmpowerpccodegen/Makefile.depend17
-rw-r--r--lib/clang/libllvmpowerpcdesc/Makefile.depend9
-rw-r--r--lib/clang/libllvmpowerpcinfo/Makefile.depend3
-rw-r--r--lib/clang/libllvmpowerpcinstprinter/Makefile.depend3
-rw-r--r--lib/clang/libllvmruntimedyld/Makefile.depend4
-rw-r--r--lib/clang/libllvmscalaropts/Makefile.depend9
-rw-r--r--lib/clang/libllvmselectiondag/Makefile.depend3
-rw-r--r--lib/clang/libllvmsupport/Makefile.depend3
-rw-r--r--lib/clang/libllvmtablegen/Makefile.depend3
-rw-r--r--lib/clang/libllvmtarget/Makefile.depend4
-rw-r--r--lib/clang/libllvmtransformutils/Makefile.depend5
-rw-r--r--lib/clang/libllvmvectorize/Makefile.depend5
-rw-r--r--lib/clang/libllvmx86asmparser/Makefile.depend3
-rw-r--r--lib/clang/libllvmx86codegen/Makefile.depend3
-rw-r--r--lib/clang/libllvmx86desc/Makefile.depend15
-rw-r--r--lib/clang/libllvmx86disassembler/Makefile.depend3
-rw-r--r--lib/clang/libllvmx86info/Makefile.depend3
-rw-r--r--lib/clang/libllvmx86instprinter/Makefile.depend3
-rw-r--r--lib/clang/libllvmx86utils/Makefile.depend4
-rw-r--r--lib/libalias/libalias/Makefile.depend2
-rw-r--r--lib/libalias/modules/cuseeme/Makefile.depend1
-rw-r--r--lib/libalias/modules/dummy/Makefile.depend1
-rw-r--r--lib/libalias/modules/ftp/Makefile.depend1
-rw-r--r--lib/libalias/modules/irc/Makefile.depend1
-rw-r--r--lib/libalias/modules/nbt/Makefile.depend1
-rw-r--r--lib/libalias/modules/pptp/Makefile.depend1
-rw-r--r--lib/libalias/modules/skinny/Makefile.depend1
-rw-r--r--lib/libalias/modules/smedia/Makefile.depend1
-rw-r--r--lib/libarchive/Makefile.depend2
-rw-r--r--lib/libauditd/Makefile.depend2
-rw-r--r--lib/libbegemot/Makefile.depend2
-rw-r--r--lib/libblocksruntime/Makefile.depend2
-rw-r--r--lib/libbluetooth/Makefile.depend2
-rw-r--r--lib/libbsm/Makefile.depend2
-rw-r--r--lib/libbsnmp/libbsnmp/Makefile.depend2
-rw-r--r--lib/libbz2/Makefile.depend2
-rw-r--r--lib/libc++/Makefile.depend1
-rw-r--r--lib/libcalendar/Makefile.depend2
-rw-r--r--lib/libcam/Makefile.depend2
-rw-r--r--lib/libcapsicum/Makefile.depend2
-rw-r--r--lib/libcom_err/Makefile.depend2
-rw-r--r--lib/libcrypt/Makefile.depend2
-rw-r--r--lib/libcxxrt/Makefile.depend2
-rw-r--r--lib/libdevinfo/Makefile.depend2
-rw-r--r--lib/libdevstat/Makefile.depend2
-rw-r--r--lib/libdwarf/Makefile.depend2
-rw-r--r--lib/libedit/Makefile.depend2
-rw-r--r--lib/libelf/Makefile.depend2
-rw-r--r--lib/libexecinfo/Makefile.depend2
-rw-r--r--lib/libexpat/Makefile.depend2
-rw-r--r--lib/libfetch/Makefile.depend2
-rw-r--r--lib/libgeom/Makefile.depend2
-rw-r--r--lib/libgpib/Makefile.depend2
-rw-r--r--lib/libgssapi/Makefile.depend2
-rw-r--r--lib/libiconv_modules/BIG5/Makefile.depend6
-rw-r--r--lib/libiconv_modules/DECHanyu/Makefile.depend6
-rw-r--r--lib/libiconv_modules/EUC/Makefile.depend6
-rw-r--r--lib/libiconv_modules/EUCTW/Makefile.depend6
-rw-r--r--lib/libiconv_modules/GBK2K/Makefile.depend6
-rw-r--r--lib/libiconv_modules/HZ/Makefile.depend6
-rw-r--r--lib/libiconv_modules/ISO2022/Makefile.depend6
-rw-r--r--lib/libiconv_modules/JOHAB/Makefile.depend6
-rw-r--r--lib/libiconv_modules/MSKanji/Makefile.depend6
-rw-r--r--lib/libiconv_modules/UES/Makefile.depend6
-rw-r--r--lib/libiconv_modules/UTF1632/Makefile.depend6
-rw-r--r--lib/libiconv_modules/UTF7/Makefile.depend6
-rw-r--r--lib/libiconv_modules/UTF8/Makefile.depend6
-rw-r--r--lib/libiconv_modules/VIQR/Makefile.depend6
-rw-r--r--lib/libiconv_modules/ZW/Makefile.depend6
-rw-r--r--lib/libiconv_modules/iconv_none/Makefile.depend6
-rw-r--r--lib/libiconv_modules/iconv_std/Makefile.depend6
-rw-r--r--lib/libiconv_modules/mapper_646/Makefile.depend6
-rw-r--r--lib/libiconv_modules/mapper_none/Makefile.depend6
-rw-r--r--lib/libiconv_modules/mapper_parallel/Makefile.depend6
-rw-r--r--lib/libiconv_modules/mapper_serial/Makefile.depend6
-rw-r--r--lib/libiconv_modules/mapper_std/Makefile.depend6
-rw-r--r--lib/libiconv_modules/mapper_zone/Makefile.depend6
-rw-r--r--lib/libipsec/Makefile.depend2
-rw-r--r--lib/libjail/Makefile.depend2
-rw-r--r--lib/libkiconv/Makefile.depend2
-rw-r--r--lib/libkvm/Makefile.depend2
-rw-r--r--lib/libldns/Makefile.depend2
-rw-r--r--lib/liblzma/Makefile.depend2
-rw-r--r--lib/libmagic/Makefile.depend2
-rw-r--r--lib/libmd/Makefile.depend2
-rw-r--r--lib/libmemstat/Makefile.depend2
-rw-r--r--lib/libmilter/Makefile.depend2
-rw-r--r--lib/libmp/Makefile.depend2
-rw-r--r--lib/libnetgraph/Makefile.depend2
-rw-r--r--lib/libngatm/Makefile.depend2
-rw-r--r--lib/libnv/Makefile.depend2
-rw-r--r--lib/libopie/Makefile.depend2
-rw-r--r--lib/libpam/libpam/Makefile.depend2
-rw-r--r--lib/libpam/modules/pam_chroot/Makefile.depend2
-rw-r--r--lib/libpam/modules/pam_deny/Makefile.depend2
-rw-r--r--lib/libpam/modules/pam_echo/Makefile.depend2
-rw-r--r--lib/libpam/modules/pam_exec/Makefile.depend2
-rw-r--r--lib/libpam/modules/pam_ftpusers/Makefile.depend2
-rw-r--r--lib/libpam/modules/pam_group/Makefile.depend2
-rw-r--r--lib/libpam/modules/pam_guest/Makefile.depend2
-rw-r--r--lib/libpam/modules/pam_krb5/Makefile.depend2
-rw-r--r--lib/libpam/modules/pam_ksu/Makefile.depend2
-rw-r--r--lib/libpam/modules/pam_lastlog/Makefile.depend2
-rw-r--r--lib/libpam/modules/pam_login_access/Makefile.depend2
-rw-r--r--lib/libpam/modules/pam_nologin/Makefile.depend2
-rw-r--r--lib/libpam/modules/pam_opie/Makefile.depend2
-rw-r--r--lib/libpam/modules/pam_opieaccess/Makefile.depend2
-rw-r--r--lib/libpam/modules/pam_passwdqc/Makefile.depend2
-rw-r--r--lib/libpam/modules/pam_permit/Makefile.depend2
-rw-r--r--lib/libpam/modules/pam_radius/Makefile.depend2
-rw-r--r--lib/libpam/modules/pam_rhosts/Makefile.depend2
-rw-r--r--lib/libpam/modules/pam_rootok/Makefile.depend2
-rw-r--r--lib/libpam/modules/pam_securetty/Makefile.depend2
-rw-r--r--lib/libpam/modules/pam_self/Makefile.depend2
-rw-r--r--lib/libpam/modules/pam_ssh/Makefile.depend2
-rw-r--r--lib/libpam/modules/pam_tacplus/Makefile.depend2
-rw-r--r--lib/libpam/modules/pam_unix/Makefile.depend2
-rw-r--r--lib/libpcap/Makefile.depend2
-rw-r--r--lib/libpmc/Makefile.depend2
-rw-r--r--lib/libproc/Makefile.depend2
-rw-r--r--lib/libprocstat/Makefile.depend2
-rw-r--r--lib/libprocstat/zfs/Makefile.depend1
-rw-r--r--lib/libradius/Makefile.depend2
-rw-r--r--lib/librpcsec_gss/Makefile.depend2
-rw-r--r--lib/librpcsvc/Makefile.depend2
-rw-r--r--lib/librt/Makefile.depend2
-rw-r--r--lib/librtld_db/Makefile.depend2
-rw-r--r--lib/libsbuf/Makefile.depend2
-rw-r--r--lib/libsdp/Makefile.depend2
-rw-r--r--lib/libsmb/Makefile.depend2
-rw-r--r--lib/libstand/Makefile.depend1
-rw-r--r--lib/libstdbuf/Makefile.depend2
-rw-r--r--lib/libstdthreads/Makefile.depend2
-rw-r--r--lib/libtacplus/Makefile.depend2
-rw-r--r--lib/libthr/Makefile.depend2
-rw-r--r--lib/libthread_db/Makefile.depend2
-rw-r--r--lib/libufs/Makefile.depend2
-rw-r--r--lib/libugidfw/Makefile.depend2
-rw-r--r--lib/libulog/Makefile.depend2
-rw-r--r--lib/libunbound/Makefile.depend2
-rw-r--r--lib/libusb/Makefile.depend2
-rw-r--r--lib/libusbhid/Makefile.depend2
-rw-r--r--lib/libutil/Makefile.depend2
-rw-r--r--lib/libvgl/Makefile.depend2
-rw-r--r--lib/libvmmapi/Makefile.depend2
-rw-r--r--lib/libwrap/Makefile.depend2
-rw-r--r--lib/libypclnt/Makefile.depend2
-rw-r--r--lib/libz/Makefile.depend2
-rw-r--r--lib/msun/Makefile.depend2
-rw-r--r--lib/ncurses/form/Makefile.depend2
-rw-r--r--lib/ncurses/formw/Makefile.depend2
-rw-r--r--lib/ncurses/menu/Makefile.depend2
-rw-r--r--lib/ncurses/menuw/Makefile.depend2
-rw-r--r--lib/ncurses/ncurses/Makefile.depend2
-rw-r--r--lib/ncurses/ncursesw/Makefile.depend2
-rw-r--r--lib/ncurses/panel/Makefile.depend2
-rw-r--r--lib/ncurses/panelw/Makefile.depend2
212 files changed, 508 insertions, 319 deletions
diff --git a/lib/atf/libatf-c++/Makefile.depend b/lib/atf/libatf-c++/Makefile.depend
index 6f092c911531..c93850e2886e 100644
--- a/lib/atf/libatf-c++/Makefile.depend
+++ b/lib/atf/libatf-c++/Makefile.depend
@@ -3,17 +3,11 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/csu \
- gnu/lib/libgcc \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
- lib/${CSU_DIR} \
lib/atf/libatf-c \
- lib/libc \
- lib/libc_nonshared \
- lib/libcompiler_rt \
+ lib/libc++ \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/atf/libatf-c/Makefile.depend b/lib/atf/libatf-c/Makefile.depend
index 6caf55f2706e..467741f6d1a9 100644
--- a/lib/atf/libatf-c/Makefile.depend
+++ b/lib/atf/libatf-c/Makefile.depend
@@ -9,8 +9,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/clang/libclanganalysis/Makefile.depend b/lib/clang/libclanganalysis/Makefile.depend
index c50852eb86f5..3e73ed20437f 100644
--- a/lib/clang/libclanganalysis/Makefile.depend
+++ b/lib/clang/libclanganalysis/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/clang-tblgen.host \
@@ -59,6 +58,18 @@ CocoaConventions.o: DeclNodes.inc.h
CocoaConventions.o: DiagnosticCommonKinds.inc.h
CocoaConventions.po: DeclNodes.inc.h
CocoaConventions.po: DiagnosticCommonKinds.inc.h
+Consumed.o: AttrList.inc.h
+Consumed.o: Attrs.inc.h
+Consumed.o: CommentCommandList.inc.h
+Consumed.o: DeclNodes.inc.h
+Consumed.o: DiagnosticCommonKinds.inc.h
+Consumed.o: StmtNodes.inc.h
+Consumed.po: AttrList.inc.h
+Consumed.po: Attrs.inc.h
+Consumed.po: CommentCommandList.inc.h
+Consumed.po: DeclNodes.inc.h
+Consumed.po: DiagnosticCommonKinds.inc.h
+Consumed.po: StmtNodes.inc.h
Dominators.o: DeclNodes.inc.h
Dominators.o: DiagnosticCommonKinds.inc.h
Dominators.o: StmtNodes.inc.h
diff --git a/lib/clang/libclangarcmigrate/Makefile.depend b/lib/clang/libclangarcmigrate/Makefile.depend
index 5ce1899a364a..91f16dcf6e63 100644
--- a/lib/clang/libclangarcmigrate/Makefile.depend
+++ b/lib/clang/libclangarcmigrate/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/clang-tblgen.host \
@@ -15,18 +14,14 @@ DIRDEPS = \
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-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
ARCMT.o: DiagnosticSemaKinds.inc.h
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
@@ -37,10 +32,14 @@ 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
diff --git a/lib/clang/libclangast/Makefile.depend b/lib/clang/libclangast/Makefile.depend
index 44813d64bf45..eccc381966dd 100644
--- a/lib/clang/libclangast/Makefile.depend
+++ b/lib/clang/libclangast/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/clang-tblgen.host \
@@ -77,6 +76,14 @@ ASTImporter.po: DeclNodes.inc.h
ASTImporter.po: DiagnosticASTKinds.inc.h
ASTImporter.po: DiagnosticCommonKinds.inc.h
ASTImporter.po: StmtNodes.inc.h
+ASTTypeTraits.o: CommentCommandList.inc.h
+ASTTypeTraits.o: DeclNodes.inc.h
+ASTTypeTraits.o: DiagnosticCommonKinds.inc.h
+ASTTypeTraits.o: StmtNodes.inc.h
+ASTTypeTraits.po: CommentCommandList.inc.h
+ASTTypeTraits.po: DeclNodes.inc.h
+ASTTypeTraits.po: DiagnosticCommonKinds.inc.h
+ASTTypeTraits.po: StmtNodes.inc.h
AttrImpl.o: AttrImpl.inc.h
AttrImpl.o: AttrList.inc.h
AttrImpl.o: Attrs.inc.h
@@ -251,18 +258,6 @@ 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
@@ -339,22 +334,26 @@ ItaniumMangle.po: CommentCommandList.inc.h
ItaniumMangle.po: DeclNodes.inc.h
ItaniumMangle.po: DiagnosticCommonKinds.inc.h
ItaniumMangle.po: StmtNodes.inc.h
-LambdaMangleContext.o: CommentCommandList.inc.h
-LambdaMangleContext.o: DeclNodes.inc.h
-LambdaMangleContext.o: DiagnosticCommonKinds.inc.h
-LambdaMangleContext.o: StmtNodes.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
+MangleNumberingContext.o: CommentCommandList.inc.h
+MangleNumberingContext.o: DeclNodes.inc.h
+MangleNumberingContext.o: DiagnosticCommonKinds.inc.h
+MangleNumberingContext.o: StmtNodes.inc.h
+MangleNumberingContext.po: CommentCommandList.inc.h
+MangleNumberingContext.po: DeclNodes.inc.h
+MangleNumberingContext.po: DiagnosticCommonKinds.inc.h
+MangleNumberingContext.po: StmtNodes.inc.h
MicrosoftCXXABI.o: AttrList.inc.h
MicrosoftCXXABI.o: Attrs.inc.h
MicrosoftCXXABI.o: CommentCommandList.inc.h
diff --git a/lib/clang/libclangbasic/Makefile.depend b/lib/clang/libclangbasic/Makefile.depend
index 30ba0f01f0d8..6d3d657869a5 100644
--- a/lib/clang/libclangbasic/Makefile.depend
+++ b/lib/clang/libclangbasic/Makefile.depend
@@ -3,11 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
- lib/clang/include \
+ lib/libc++ \
lib/msun \
usr.bin/clang/clang-tblgen.host \
diff --git a/lib/clang/libclangcodegen/Makefile.depend b/lib/clang/libclangcodegen/Makefile.depend
index 68834643e118..611aebbd68d8 100644
--- a/lib/clang/libclangcodegen/Makefile.depend
+++ b/lib/clang/libclangcodegen/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/clang-tblgen.host \
usr.bin/clang/tblgen.host \
@@ -377,6 +376,7 @@ CGStmt.o: Attrs.inc.h
CGStmt.o: CommentCommandList.inc.h
CGStmt.o: DeclNodes.inc.h
CGStmt.o: DiagnosticCommonKinds.inc.h
+CGStmt.o: DiagnosticSemaKinds.inc.h
CGStmt.o: Intrinsics.inc.h
CGStmt.o: StmtNodes.inc.h
CGStmt.po: AttrList.inc.h
@@ -384,6 +384,7 @@ CGStmt.po: Attrs.inc.h
CGStmt.po: CommentCommandList.inc.h
CGStmt.po: DeclNodes.inc.h
CGStmt.po: DiagnosticCommonKinds.inc.h
+CGStmt.po: DiagnosticSemaKinds.inc.h
CGStmt.po: Intrinsics.inc.h
CGStmt.po: StmtNodes.inc.h
CGVTT.o: AttrList.inc.h
@@ -410,6 +411,18 @@ CGVTables.po: CommentCommandList.inc.h
CGVTables.po: DeclNodes.inc.h
CGVTables.po: DiagnosticCommonKinds.inc.h
CGVTables.po: StmtNodes.inc.h
+CodeGenABITypes.o: AttrList.inc.h
+CodeGenABITypes.o: Attrs.inc.h
+CodeGenABITypes.o: CommentCommandList.inc.h
+CodeGenABITypes.o: DeclNodes.inc.h
+CodeGenABITypes.o: DiagnosticCommonKinds.inc.h
+CodeGenABITypes.o: StmtNodes.inc.h
+CodeGenABITypes.po: AttrList.inc.h
+CodeGenABITypes.po: Attrs.inc.h
+CodeGenABITypes.po: CommentCommandList.inc.h
+CodeGenABITypes.po: DeclNodes.inc.h
+CodeGenABITypes.po: DiagnosticCommonKinds.inc.h
+CodeGenABITypes.po: StmtNodes.inc.h
CodeGenAction.o: CommentCommandList.inc.h
CodeGenAction.o: DeclNodes.inc.h
CodeGenAction.o: DiagnosticCommonKinds.inc.h
@@ -439,6 +452,7 @@ CodeGenModule.o: Attrs.inc.h
CodeGenModule.o: CommentCommandList.inc.h
CodeGenModule.o: DeclNodes.inc.h
CodeGenModule.o: DiagnosticCommonKinds.inc.h
+CodeGenModule.o: DiagnosticSemaKinds.inc.h
CodeGenModule.o: Intrinsics.inc.h
CodeGenModule.o: StmtNodes.inc.h
CodeGenModule.po: AttrList.inc.h
@@ -446,6 +460,7 @@ CodeGenModule.po: Attrs.inc.h
CodeGenModule.po: CommentCommandList.inc.h
CodeGenModule.po: DeclNodes.inc.h
CodeGenModule.po: DiagnosticCommonKinds.inc.h
+CodeGenModule.po: DiagnosticSemaKinds.inc.h
CodeGenModule.po: Intrinsics.inc.h
CodeGenModule.po: StmtNodes.inc.h
CodeGenTBAA.o: AttrList.inc.h
@@ -498,6 +513,18 @@ MicrosoftCXXABI.po: CommentCommandList.inc.h
MicrosoftCXXABI.po: DeclNodes.inc.h
MicrosoftCXXABI.po: DiagnosticCommonKinds.inc.h
MicrosoftCXXABI.po: StmtNodes.inc.h
+MicrosoftVBTables.o: AttrList.inc.h
+MicrosoftVBTables.o: Attrs.inc.h
+MicrosoftVBTables.o: CommentCommandList.inc.h
+MicrosoftVBTables.o: DeclNodes.inc.h
+MicrosoftVBTables.o: DiagnosticCommonKinds.inc.h
+MicrosoftVBTables.o: StmtNodes.inc.h
+MicrosoftVBTables.po: AttrList.inc.h
+MicrosoftVBTables.po: Attrs.inc.h
+MicrosoftVBTables.po: CommentCommandList.inc.h
+MicrosoftVBTables.po: DeclNodes.inc.h
+MicrosoftVBTables.po: DiagnosticCommonKinds.inc.h
+MicrosoftVBTables.po: StmtNodes.inc.h
ModuleBuilder.o: AttrList.inc.h
ModuleBuilder.o: Attrs.inc.h
ModuleBuilder.o: CommentCommandList.inc.h
diff --git a/lib/clang/libclangdriver/Makefile.depend b/lib/clang/libclangdriver/Makefile.depend
index 1859c3ba4e8c..6c6cde521e99 100644
--- a/lib/clang/libclangdriver/Makefile.depend
+++ b/lib/clang/libclangdriver/Makefile.depend
@@ -3,22 +3,18 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/clang-tblgen.host \
+ usr.bin/clang/tblgen.host \
.include <dirdeps.mk>
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
-ArgList.o: DiagnosticCommonKinds.inc.h
-ArgList.o: DiagnosticDriverKinds.inc.h
-ArgList.po: DiagnosticCommonKinds.inc.h
-ArgList.po: DiagnosticDriverKinds.inc.h
CC1AsOptions.o: CC1AsOptions.inc.h
CC1AsOptions.po: CC1AsOptions.inc.h
Compilation.o: DiagnosticCommonKinds.inc.h
@@ -35,8 +31,12 @@ Driver.po: DiagnosticDriverKinds.inc.h
Driver.po: Options.inc.h
DriverOptions.o: Options.inc.h
DriverOptions.po: Options.inc.h
-OptTable.o: Options.inc.h
-OptTable.po: Options.inc.h
+SanitizerArgs.o: DiagnosticCommonKinds.inc.h
+SanitizerArgs.o: DiagnosticDriverKinds.inc.h
+SanitizerArgs.o: Options.inc.h
+SanitizerArgs.po: DiagnosticCommonKinds.inc.h
+SanitizerArgs.po: DiagnosticDriverKinds.inc.h
+SanitizerArgs.po: Options.inc.h
ToolChain.o: DiagnosticCommonKinds.inc.h
ToolChain.o: DiagnosticDriverKinds.inc.h
ToolChain.o: Options.inc.h
@@ -51,9 +51,11 @@ ToolChains.po: DiagnosticDriverKinds.inc.h
ToolChains.po: Options.inc.h
Tools.o: DiagnosticCommonKinds.inc.h
Tools.o: DiagnosticDriverKinds.inc.h
+Tools.o: DiagnosticSemaKinds.inc.h
Tools.o: Options.inc.h
Tools.po: DiagnosticCommonKinds.inc.h
Tools.po: DiagnosticDriverKinds.inc.h
+Tools.po: DiagnosticSemaKinds.inc.h
Tools.po: Options.inc.h
WindowsToolChain.o: DiagnosticCommonKinds.inc.h
WindowsToolChain.o: DiagnosticDriverKinds.inc.h
diff --git a/lib/clang/libclangedit/Makefile.depend b/lib/clang/libclangedit/Makefile.depend
index 2781622df92d..05b479b95959 100644
--- a/lib/clang/libclangedit/Makefile.depend
+++ b/lib/clang/libclangedit/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/clang-tblgen.host \
diff --git a/lib/clang/libclangfrontend/Makefile.depend b/lib/clang/libclangfrontend/Makefile.depend
index 7191baf2c803..870ea103360b 100644
--- a/lib/clang/libclangfrontend/Makefile.depend
+++ b/lib/clang/libclangfrontend/Makefile.depend
@@ -3,12 +3,12 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/clang-tblgen.host \
+ usr.bin/clang/tblgen.host \
.include <dirdeps.mk>
@@ -23,17 +23,11 @@ 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
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
@@ -59,16 +53,12 @@ CacheTokens.o: DiagnosticCommonKinds.inc.h
CacheTokens.po: DiagnosticCommonKinds.inc.h
ChainedDiagnosticConsumer.o: DiagnosticCommonKinds.inc.h
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
@@ -89,14 +79,18 @@ CompilerInstance.po: DeclNodes.inc.h
CompilerInstance.po: DiagnosticCommonKinds.inc.h
CompilerInstance.po: DiagnosticFrontendKinds.inc.h
CompilerInstance.po: StmtNodes.inc.h
+CompilerInvocation.o: AttrParsedAttrList.inc.h
CompilerInvocation.o: DeclNodes.inc.h
CompilerInvocation.o: DiagnosticCommonKinds.inc.h
CompilerInvocation.o: DiagnosticDriverKinds.inc.h
CompilerInvocation.o: Options.inc.h
+CompilerInvocation.o: StmtNodes.inc.h
+CompilerInvocation.po: AttrParsedAttrList.inc.h
CompilerInvocation.po: DeclNodes.inc.h
CompilerInvocation.po: DiagnosticCommonKinds.inc.h
CompilerInvocation.po: DiagnosticDriverKinds.inc.h
CompilerInvocation.po: Options.inc.h
+CompilerInvocation.po: StmtNodes.inc.h
CreateInvocationFromCommandLine.o: DiagnosticCommonKinds.inc.h
CreateInvocationFromCommandLine.o: DiagnosticFrontendKinds.inc.h
CreateInvocationFromCommandLine.o: Options.inc.h
@@ -115,17 +109,13 @@ DependencyGraph.po: DiagnosticCommonKinds.inc.h
DependencyGraph.po: DiagnosticFrontendKinds.inc.h
DiagnosticRenderer.o: DiagnosticCommonKinds.inc.h
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
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
@@ -153,12 +143,16 @@ HeaderIncludeGen.po: DiagnosticCommonKinds.inc.h
HeaderIncludeGen.po: DiagnosticFrontendKinds.inc.h
InitHeaderSearch.o: DiagnosticCommonKinds.inc.h
InitHeaderSearch.po: DiagnosticCommonKinds.inc.h
+InitPreprocessor.o: AttrParsedAttrList.inc.h
InitPreprocessor.o: DeclNodes.inc.h
InitPreprocessor.o: DiagnosticCommonKinds.inc.h
InitPreprocessor.o: DiagnosticFrontendKinds.inc.h
+InitPreprocessor.o: StmtNodes.inc.h
+InitPreprocessor.po: AttrParsedAttrList.inc.h
InitPreprocessor.po: DeclNodes.inc.h
InitPreprocessor.po: DiagnosticCommonKinds.inc.h
InitPreprocessor.po: DiagnosticFrontendKinds.inc.h
+InitPreprocessor.po: StmtNodes.inc.h
LayoutOverrideSource.o: DeclNodes.inc.h
LayoutOverrideSource.o: DiagnosticCommonKinds.inc.h
LayoutOverrideSource.po: DeclNodes.inc.h
diff --git a/lib/clang/libclangfrontendtool/Makefile.depend b/lib/clang/libclangfrontendtool/Makefile.depend
index e69aaa538230..b3f9b2b610af 100644
--- a/lib/clang/libclangfrontendtool/Makefile.depend
+++ b/lib/clang/libclangfrontendtool/Makefile.depend
@@ -3,12 +3,12 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/clang-tblgen.host \
+ usr.bin/clang/tblgen.host \
.include <dirdeps.mk>
diff --git a/lib/clang/libclanglex/Makefile.depend b/lib/clang/libclanglex/Makefile.depend
index 7c8859dc6824..362b138d509d 100644
--- a/lib/clang/libclanglex/Makefile.depend
+++ b/lib/clang/libclanglex/Makefile.depend
@@ -3,11 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
- lib/clang/include \
+ lib/libc++ \
lib/msun \
usr.bin/clang/clang-tblgen.host \
diff --git a/lib/clang/libclangparse/Makefile.depend b/lib/clang/libclangparse/Makefile.depend
index 0b7d67a6c038..263adfc50223 100644
--- a/lib/clang/libclangparse/Makefile.depend
+++ b/lib/clang/libclangparse/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/clang-tblgen.host \
@@ -45,19 +44,21 @@ 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: AttrIdentifierArg.inc.h
ParseDecl.o: AttrLateParsed.inc.h
ParseDecl.o: AttrList.inc.h
ParseDecl.o: AttrParsedAttrList.inc.h
+ParseDecl.o: AttrTypeArg.inc.h
ParseDecl.o: Attrs.inc.h
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: AttrIdentifierArg.inc.h
ParseDecl.po: AttrLateParsed.inc.h
ParseDecl.po: AttrList.inc.h
ParseDecl.po: AttrParsedAttrList.inc.h
+ParseDecl.po: AttrTypeArg.inc.h
ParseDecl.po: Attrs.inc.h
ParseDecl.po: DeclNodes.inc.h
ParseDecl.po: DiagnosticCommonKinds.inc.h
diff --git a/lib/clang/libclangrewritecore/Makefile.depend b/lib/clang/libclangrewritecore/Makefile.depend
index a15fa635d8b4..a211b19844a9 100644
--- a/lib/clang/libclangrewritecore/Makefile.depend
+++ b/lib/clang/libclangrewritecore/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/clang-tblgen.host \
diff --git a/lib/clang/libclangrewritefrontend/Makefile.depend b/lib/clang/libclangrewritefrontend/Makefile.depend
index fd47556d5116..8fbe823dfb30 100644
--- a/lib/clang/libclangrewritefrontend/Makefile.depend
+++ b/lib/clang/libclangrewritefrontend/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/clang-tblgen.host \
diff --git a/lib/clang/libclangsema/Makefile.depend b/lib/clang/libclangsema/Makefile.depend
index f06a41dba0bc..8e45ce4d048b 100644
--- a/lib/clang/libclangsema/Makefile.depend
+++ b/lib/clang/libclangsema/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/clang-tblgen.host \
@@ -31,6 +30,7 @@ AnalysisBasedWarnings.po: DeclNodes.inc.h
AnalysisBasedWarnings.po: DiagnosticCommonKinds.inc.h
AnalysisBasedWarnings.po: DiagnosticSemaKinds.inc.h
AnalysisBasedWarnings.po: StmtNodes.inc.h
+AttributeList.o: AttrParsedAttrImpl.inc.h
AttributeList.o: AttrParsedAttrKinds.inc.h
AttributeList.o: AttrParsedAttrList.inc.h
AttributeList.o: AttrSpellingListIndex.inc.h
@@ -38,6 +38,7 @@ AttributeList.o: CommentCommandList.inc.h
AttributeList.o: DeclNodes.inc.h
AttributeList.o: DiagnosticCommonKinds.inc.h
AttributeList.o: StmtNodes.inc.h
+AttributeList.po: AttrParsedAttrImpl.inc.h
AttributeList.po: AttrParsedAttrKinds.inc.h
AttributeList.po: AttrParsedAttrList.inc.h
AttributeList.po: AttrSpellingListIndex.inc.h
@@ -683,4 +684,12 @@ TargetAttributesSema.po: DeclNodes.inc.h
TargetAttributesSema.po: DiagnosticCommonKinds.inc.h
TargetAttributesSema.po: DiagnosticSemaKinds.inc.h
TargetAttributesSema.po: StmtNodes.inc.h
+TypeLocBuilder.o: CommentCommandList.inc.h
+TypeLocBuilder.o: DeclNodes.inc.h
+TypeLocBuilder.o: DiagnosticCommonKinds.inc.h
+TypeLocBuilder.o: StmtNodes.inc.h
+TypeLocBuilder.po: CommentCommandList.inc.h
+TypeLocBuilder.po: DeclNodes.inc.h
+TypeLocBuilder.po: DiagnosticCommonKinds.inc.h
+TypeLocBuilder.po: StmtNodes.inc.h
.endif
diff --git a/lib/clang/libclangserialization/Makefile.depend b/lib/clang/libclangserialization/Makefile.depend
index 2269b1e1f3c1..7d04136aa606 100644
--- a/lib/clang/libclangserialization/Makefile.depend
+++ b/lib/clang/libclangserialization/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/clang-tblgen.host \
@@ -57,10 +56,12 @@ ASTReaderDecl.po: DeclNodes.inc.h
ASTReaderDecl.po: DiagnosticCommonKinds.inc.h
ASTReaderDecl.po: DiagnosticSemaKinds.inc.h
ASTReaderDecl.po: StmtNodes.inc.h
+ASTReaderStmt.o: AttrParsedAttrList.inc.h
ASTReaderStmt.o: CommentCommandList.inc.h
ASTReaderStmt.o: DeclNodes.inc.h
ASTReaderStmt.o: DiagnosticCommonKinds.inc.h
ASTReaderStmt.o: StmtNodes.inc.h
+ASTReaderStmt.po: AttrParsedAttrList.inc.h
ASTReaderStmt.po: CommentCommandList.inc.h
ASTReaderStmt.po: DeclNodes.inc.h
ASTReaderStmt.po: DiagnosticCommonKinds.inc.h
@@ -81,10 +82,12 @@ ASTWriter.po: CommentCommandList.inc.h
ASTWriter.po: DeclNodes.inc.h
ASTWriter.po: DiagnosticCommonKinds.inc.h
ASTWriter.po: StmtNodes.inc.h
+ASTWriterDecl.o: AttrParsedAttrList.inc.h
ASTWriterDecl.o: CommentCommandList.inc.h
ASTWriterDecl.o: DeclNodes.inc.h
ASTWriterDecl.o: DiagnosticCommonKinds.inc.h
ASTWriterDecl.o: StmtNodes.inc.h
+ASTWriterDecl.po: AttrParsedAttrList.inc.h
ASTWriterDecl.po: CommentCommandList.inc.h
ASTWriterDecl.po: DeclNodes.inc.h
ASTWriterDecl.po: DiagnosticCommonKinds.inc.h
diff --git a/lib/clang/libclangstaticanalyzercheckers/Makefile.depend b/lib/clang/libclangstaticanalyzercheckers/Makefile.depend
index c9fe45fc6f1e..68d1e50d7e55 100644
--- a/lib/clang/libclangstaticanalyzercheckers/Makefile.depend
+++ b/lib/clang/libclangstaticanalyzercheckers/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/clang-tblgen.host \
@@ -311,6 +310,16 @@ IdempotentOperationChecker.po: CommentCommandList.inc.h
IdempotentOperationChecker.po: DeclNodes.inc.h
IdempotentOperationChecker.po: DiagnosticCommonKinds.inc.h
IdempotentOperationChecker.po: StmtNodes.inc.h
+IdenticalExprChecker.o: Checkers.inc.h
+IdenticalExprChecker.o: CommentCommandList.inc.h
+IdenticalExprChecker.o: DeclNodes.inc.h
+IdenticalExprChecker.o: DiagnosticCommonKinds.inc.h
+IdenticalExprChecker.o: StmtNodes.inc.h
+IdenticalExprChecker.po: Checkers.inc.h
+IdenticalExprChecker.po: CommentCommandList.inc.h
+IdenticalExprChecker.po: DeclNodes.inc.h
+IdenticalExprChecker.po: DiagnosticCommonKinds.inc.h
+IdenticalExprChecker.po: StmtNodes.inc.h
IvarInvalidationChecker.o: AttrList.inc.h
IvarInvalidationChecker.o: Attrs.inc.h
IvarInvalidationChecker.o: Checkers.inc.h
diff --git a/lib/clang/libclangstaticanalyzercore/Makefile.depend b/lib/clang/libclangstaticanalyzercore/Makefile.depend
index ced08b278d8e..41d7e388c307 100644
--- a/lib/clang/libclangstaticanalyzercore/Makefile.depend
+++ b/lib/clang/libclangstaticanalyzercore/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/clang-tblgen.host \
@@ -283,10 +282,4 @@ SymbolManager.po: CommentCommandList.inc.h
SymbolManager.po: DeclNodes.inc.h
SymbolManager.po: DiagnosticCommonKinds.inc.h
SymbolManager.po: StmtNodes.inc.h
-TextPathDiagnostics.o: DeclNodes.inc.h
-TextPathDiagnostics.o: DiagnosticCommonKinds.inc.h
-TextPathDiagnostics.o: StmtNodes.inc.h
-TextPathDiagnostics.po: DeclNodes.inc.h
-TextPathDiagnostics.po: DiagnosticCommonKinds.inc.h
-TextPathDiagnostics.po: StmtNodes.inc.h
.endif
diff --git a/lib/clang/libclangstaticanalyzerfrontend/Makefile.depend b/lib/clang/libclangstaticanalyzerfrontend/Makefile.depend
index 910b0c2f2ee8..7a70a3738b1e 100644
--- a/lib/clang/libclangstaticanalyzerfrontend/Makefile.depend
+++ b/lib/clang/libclangstaticanalyzerfrontend/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/clang-tblgen.host \
diff --git a/lib/clang/libllvmanalysis/Makefile.depend b/lib/clang/libllvmanalysis/Makefile.depend
index 9aa32a96a0b6..ab902c251a4e 100644
--- a/lib/clang/libllvmanalysis/Makefile.depend
+++ b/lib/clang/libllvmanalysis/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
diff --git a/lib/clang/libllvmarmasmparser/Makefile.depend b/lib/clang/libllvmarmasmparser/Makefile.depend
index 2b046d8a2331..3b15beeaae80 100644
--- a/lib/clang/libllvmarmasmparser/Makefile.depend
+++ b/lib/clang/libllvmarmasmparser/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
diff --git a/lib/clang/libllvmarmcodegen/Makefile.depend b/lib/clang/libllvmarmcodegen/Makefile.depend
index 42795f18d8b2..5a85191fb047 100644
--- a/lib/clang/libllvmarmcodegen/Makefile.depend
+++ b/lib/clang/libllvmarmcodegen/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
diff --git a/lib/clang/libllvmarmdesc/Makefile.depend b/lib/clang/libllvmarmdesc/Makefile.depend
index 725a374fa20c..a3c276069236 100644
--- a/lib/clang/libllvmarmdesc/Makefile.depend
+++ b/lib/clang/libllvmarmdesc/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
@@ -47,6 +46,12 @@ ARMMCTargetDesc.o: ARMGenSubtargetInfo.inc.h
ARMMCTargetDesc.po: ARMGenInstrInfo.inc.h
ARMMCTargetDesc.po: ARMGenRegisterInfo.inc.h
ARMMCTargetDesc.po: ARMGenSubtargetInfo.inc.h
+ARMMachORelocationInfo.o: ARMGenInstrInfo.inc.h
+ARMMachORelocationInfo.o: ARMGenRegisterInfo.inc.h
+ARMMachORelocationInfo.o: ARMGenSubtargetInfo.inc.h
+ARMMachORelocationInfo.po: ARMGenInstrInfo.inc.h
+ARMMachORelocationInfo.po: ARMGenRegisterInfo.inc.h
+ARMMachORelocationInfo.po: ARMGenSubtargetInfo.inc.h
ARMMachObjectWriter.o: ARMGenInstrInfo.inc.h
ARMMachObjectWriter.o: ARMGenRegisterInfo.inc.h
ARMMachObjectWriter.o: ARMGenSubtargetInfo.inc.h
diff --git a/lib/clang/libllvmarmdisassembler/Makefile.depend b/lib/clang/libllvmarmdisassembler/Makefile.depend
index 72192cb421ce..38ea1cb0d490 100644
--- a/lib/clang/libllvmarmdisassembler/Makefile.depend
+++ b/lib/clang/libllvmarmdisassembler/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
diff --git a/lib/clang/libllvmarminfo/Makefile.depend b/lib/clang/libllvmarminfo/Makefile.depend
index 7a0fbe1e3419..794d0ae4d58b 100644
--- a/lib/clang/libllvmarminfo/Makefile.depend
+++ b/lib/clang/libllvmarminfo/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
diff --git a/lib/clang/libllvmarminstprinter/Makefile.depend b/lib/clang/libllvmarminstprinter/Makefile.depend
index dfe2199b31ca..87d7ea956eed 100644
--- a/lib/clang/libllvmarminstprinter/Makefile.depend
+++ b/lib/clang/libllvmarminstprinter/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
diff --git a/lib/clang/libllvmasmparser/Makefile.depend b/lib/clang/libllvmasmparser/Makefile.depend
index 422d37c93228..d4069a675840 100644
--- a/lib/clang/libllvmasmparser/Makefile.depend
+++ b/lib/clang/libllvmasmparser/Makefile.depend
@@ -3,10 +3,10 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/clang/include \
+ lib/libc++ \
lib/msun \
diff --git a/lib/clang/libllvmasmprinter/Makefile.depend b/lib/clang/libllvmasmprinter/Makefile.depend
index de12791bb810..33dfbf9a5eb0 100644
--- a/lib/clang/libllvmasmprinter/Makefile.depend
+++ b/lib/clang/libllvmasmprinter/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
diff --git a/lib/clang/libllvmbitreader/Makefile.depend b/lib/clang/libllvmbitreader/Makefile.depend
index 0ca04aace01a..edbadfd147fa 100644
--- a/lib/clang/libllvmbitreader/Makefile.depend
+++ b/lib/clang/libllvmbitreader/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
diff --git a/lib/clang/libllvmbitwriter/Makefile.depend b/lib/clang/libllvmbitwriter/Makefile.depend
index 422d37c93228..d4069a675840 100644
--- a/lib/clang/libllvmbitwriter/Makefile.depend
+++ b/lib/clang/libllvmbitwriter/Makefile.depend
@@ -3,10 +3,10 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/clang/include \
+ lib/libc++ \
lib/msun \
diff --git a/lib/clang/libllvmcodegen/Makefile.depend b/lib/clang/libllvmcodegen/Makefile.depend
index a5078c5e831c..0dda0fddea1b 100644
--- a/lib/clang/libllvmcodegen/Makefile.depend
+++ b/lib/clang/libllvmcodegen/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
diff --git a/lib/clang/libllvmcore/Makefile.depend b/lib/clang/libllvmcore/Makefile.depend
index 94d82b9ac309..0b232ec27459 100644
--- a/lib/clang/libllvmcore/Makefile.depend
+++ b/lib/clang/libllvmcore/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
diff --git a/lib/clang/libllvmdebuginfo/Makefile.depend b/lib/clang/libllvmdebuginfo/Makefile.depend
index 422d37c93228..d4069a675840 100644
--- a/lib/clang/libllvmdebuginfo/Makefile.depend
+++ b/lib/clang/libllvmdebuginfo/Makefile.depend
@@ -3,10 +3,10 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/clang/include \
+ lib/libc++ \
lib/msun \
diff --git a/lib/clang/libllvmexecutionengine/Makefile.depend b/lib/clang/libllvmexecutionengine/Makefile.depend
index 422d37c93228..4d8f064b840b 100644
--- a/lib/clang/libllvmexecutionengine/Makefile.depend
+++ b/lib/clang/libllvmexecutionengine/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
diff --git a/lib/clang/libllvminstcombine/Makefile.depend b/lib/clang/libllvminstcombine/Makefile.depend
index ce67684d75d8..2910d05e8dea 100644
--- a/lib/clang/libllvminstcombine/Makefile.depend
+++ b/lib/clang/libllvminstcombine/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
diff --git a/lib/clang/libllvminstrumentation/Makefile.depend b/lib/clang/libllvminstrumentation/Makefile.depend
index e64cf0b52a2d..8e825e09c7e2 100644
--- a/lib/clang/libllvminstrumentation/Makefile.depend
+++ b/lib/clang/libllvminstrumentation/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
@@ -19,6 +18,10 @@ AddressSanitizer.o: Intrinsics.inc.h
AddressSanitizer.po: Intrinsics.inc.h
BoundsChecking.o: Intrinsics.inc.h
BoundsChecking.po: Intrinsics.inc.h
+DataFlowSanitizer.o: Intrinsics.inc.h
+DataFlowSanitizer.po: Intrinsics.inc.h
+DebugIR.o: Intrinsics.inc.h
+DebugIR.po: Intrinsics.inc.h
MemorySanitizer.o: Intrinsics.inc.h
MemorySanitizer.po: Intrinsics.inc.h
ThreadSanitizer.o: Intrinsics.inc.h
diff --git a/lib/clang/libllvminterpreter/Makefile.depend b/lib/clang/libllvminterpreter/Makefile.depend
index 1c2bfebe806c..6f6ff7784e74 100644
--- a/lib/clang/libllvminterpreter/Makefile.depend
+++ b/lib/clang/libllvminterpreter/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
diff --git a/lib/clang/libllvmipa/Makefile.depend b/lib/clang/libllvmipa/Makefile.depend
index 2a8fb8532579..916056a7beec 100644
--- a/lib/clang/libllvmipa/Makefile.depend
+++ b/lib/clang/libllvmipa/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
diff --git a/lib/clang/libllvmipo/Makefile.depend b/lib/clang/libllvmipo/Makefile.depend
index 07566681bfe3..151c976f9979 100644
--- a/lib/clang/libllvmipo/Makefile.depend
+++ b/lib/clang/libllvmipo/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
diff --git a/lib/clang/libllvmirreader/Makefile.depend b/lib/clang/libllvmirreader/Makefile.depend
index 422d37c93228..d4069a675840 100644
--- a/lib/clang/libllvmirreader/Makefile.depend
+++ b/lib/clang/libllvmirreader/Makefile.depend
@@ -3,10 +3,10 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/clang/include \
+ lib/libc++ \
lib/msun \
diff --git a/lib/clang/libllvmjit/Makefile.depend b/lib/clang/libllvmjit/Makefile.depend
index 422d37c93228..4d8f064b840b 100644
--- a/lib/clang/libllvmjit/Makefile.depend
+++ b/lib/clang/libllvmjit/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
diff --git a/lib/clang/libllvmlinker/Makefile.depend b/lib/clang/libllvmlinker/Makefile.depend
index 422d37c93228..d4069a675840 100644
--- a/lib/clang/libllvmlinker/Makefile.depend
+++ b/lib/clang/libllvmlinker/Makefile.depend
@@ -3,10 +3,10 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/clang/include \
+ lib/libc++ \
lib/msun \
diff --git a/lib/clang/libllvmmc/Makefile.depend b/lib/clang/libllvmmc/Makefile.depend
index 422d37c93228..4d8f064b840b 100644
--- a/lib/clang/libllvmmc/Makefile.depend
+++ b/lib/clang/libllvmmc/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
diff --git a/lib/clang/libllvmmcdisassembler/Makefile.depend b/lib/clang/libllvmmcdisassembler/Makefile.depend
index 422d37c93228..d4069a675840 100644
--- a/lib/clang/libllvmmcdisassembler/Makefile.depend
+++ b/lib/clang/libllvmmcdisassembler/Makefile.depend
@@ -3,10 +3,10 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/clang/include \
+ lib/libc++ \
lib/msun \
diff --git a/lib/clang/libllvmmcjit/Makefile.depend b/lib/clang/libllvmmcjit/Makefile.depend
index 422d37c93228..4d8f064b840b 100644
--- a/lib/clang/libllvmmcjit/Makefile.depend
+++ b/lib/clang/libllvmmcjit/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
diff --git a/lib/clang/libllvmmcparser/Makefile.depend b/lib/clang/libllvmmcparser/Makefile.depend
index 422d37c93228..d4069a675840 100644
--- a/lib/clang/libllvmmcparser/Makefile.depend
+++ b/lib/clang/libllvmmcparser/Makefile.depend
@@ -3,10 +3,10 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/clang/include \
+ lib/libc++ \
lib/msun \
diff --git a/lib/clang/libllvmmipsasmparser/Makefile.depend b/lib/clang/libllvmmipsasmparser/Makefile.depend
index ef82df0bcb84..bbb5c8a3e639 100644
--- a/lib/clang/libllvmmipsasmparser/Makefile.depend
+++ b/lib/clang/libllvmmipsasmparser/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
diff --git a/lib/clang/libllvmmipscodegen/Makefile.depend b/lib/clang/libllvmmipscodegen/Makefile.depend
index 25d3766bd9af..dd0e8917c122 100644
--- a/lib/clang/libllvmmipscodegen/Makefile.depend
+++ b/lib/clang/libllvmmipscodegen/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
@@ -21,6 +20,12 @@ Mips16FrameLowering.o: MipsGenSubtargetInfo.inc.h
Mips16FrameLowering.po: MipsGenInstrInfo.inc.h
Mips16FrameLowering.po: MipsGenRegisterInfo.inc.h
Mips16FrameLowering.po: MipsGenSubtargetInfo.inc.h
+Mips16HardFloat.o: MipsGenInstrInfo.inc.h
+Mips16HardFloat.o: MipsGenRegisterInfo.inc.h
+Mips16HardFloat.o: MipsGenSubtargetInfo.inc.h
+Mips16HardFloat.po: MipsGenInstrInfo.inc.h
+Mips16HardFloat.po: MipsGenRegisterInfo.inc.h
+Mips16HardFloat.po: MipsGenSubtargetInfo.inc.h
Mips16ISelDAGToDAG.o: Intrinsics.inc.h
Mips16ISelDAGToDAG.o: MipsGenDAGISel.inc.h
Mips16ISelDAGToDAG.o: MipsGenInstrInfo.inc.h
diff --git a/lib/clang/libllvmmipsdesc/Makefile.depend b/lib/clang/libllvmmipsdesc/Makefile.depend
index 96c1046c07fc..c0c495914f42 100644
--- a/lib/clang/libllvmmipsdesc/Makefile.depend
+++ b/lib/clang/libllvmmipsdesc/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
@@ -21,20 +20,12 @@ MipsAsmBackend.o: MipsGenSubtargetInfo.inc.h
MipsAsmBackend.po: MipsGenInstrInfo.inc.h
MipsAsmBackend.po: MipsGenRegisterInfo.inc.h
MipsAsmBackend.po: MipsGenSubtargetInfo.inc.h
-MipsDirectObjLower.o: MipsGenInstrInfo.inc.h
-MipsDirectObjLower.o: MipsGenRegisterInfo.inc.h
-MipsDirectObjLower.o: MipsGenSubtargetInfo.inc.h
-MipsDirectObjLower.po: MipsGenInstrInfo.inc.h
-MipsDirectObjLower.po: MipsGenRegisterInfo.inc.h
-MipsDirectObjLower.po: MipsGenSubtargetInfo.inc.h
MipsELFObjectWriter.o: MipsGenInstrInfo.inc.h
MipsELFObjectWriter.o: MipsGenRegisterInfo.inc.h
MipsELFObjectWriter.o: MipsGenSubtargetInfo.inc.h
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
diff --git a/lib/clang/libllvmmipsdisassembler/Makefile.depend b/lib/clang/libllvmmipsdisassembler/Makefile.depend
index 062877f6c133..878dd8593cf6 100644
--- a/lib/clang/libllvmmipsdisassembler/Makefile.depend
+++ b/lib/clang/libllvmmipsdisassembler/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
diff --git a/lib/clang/libllvmmipsinfo/Makefile.depend b/lib/clang/libllvmmipsinfo/Makefile.depend
index 1c74f8ffb6b6..452184f8ae4d 100644
--- a/lib/clang/libllvmmipsinfo/Makefile.depend
+++ b/lib/clang/libllvmmipsinfo/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
diff --git a/lib/clang/libllvmmipsinstprinter/Makefile.depend b/lib/clang/libllvmmipsinstprinter/Makefile.depend
index 2ac9a3876a1f..99744bab583c 100644
--- a/lib/clang/libllvmmipsinstprinter/Makefile.depend
+++ b/lib/clang/libllvmmipsinstprinter/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
diff --git a/lib/clang/libllvmobjcarcopts/Makefile.depend b/lib/clang/libllvmobjcarcopts/Makefile.depend
index faea27b7f43f..4ebd17e012a6 100644
--- a/lib/clang/libllvmobjcarcopts/Makefile.depend
+++ b/lib/clang/libllvmobjcarcopts/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
diff --git a/lib/clang/libllvmobject/Makefile.depend b/lib/clang/libllvmobject/Makefile.depend
index 422d37c93228..d4069a675840 100644
--- a/lib/clang/libllvmobject/Makefile.depend
+++ b/lib/clang/libllvmobject/Makefile.depend
@@ -3,10 +3,10 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/clang/include \
+ lib/libc++ \
lib/msun \
diff --git a/lib/clang/libllvmpowerpccodegen/Makefile.depend b/lib/clang/libllvmpowerpccodegen/Makefile.depend
index 3ef28585d282..2808f9ae4a4b 100644
--- a/lib/clang/libllvmpowerpccodegen/Makefile.depend
+++ b/lib/clang/libllvmpowerpccodegen/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
@@ -27,9 +26,11 @@ PPCBranchSelector.o: PPCGenSubtargetInfo.inc.h
PPCBranchSelector.po: PPCGenInstrInfo.inc.h
PPCBranchSelector.po: PPCGenRegisterInfo.inc.h
PPCBranchSelector.po: PPCGenSubtargetInfo.inc.h
+PPCCTRLoops.o: Intrinsics.inc.h
PPCCTRLoops.o: PPCGenInstrInfo.inc.h
PPCCTRLoops.o: PPCGenRegisterInfo.inc.h
PPCCTRLoops.o: PPCGenSubtargetInfo.inc.h
+PPCCTRLoops.po: Intrinsics.inc.h
PPCCTRLoops.po: PPCGenInstrInfo.inc.h
PPCCTRLoops.po: PPCGenRegisterInfo.inc.h
PPCCTRLoops.po: PPCGenSubtargetInfo.inc.h
@@ -41,6 +42,18 @@ PPCCodeEmitter.po: PPCGenCodeEmitter.inc.h
PPCCodeEmitter.po: PPCGenInstrInfo.inc.h
PPCCodeEmitter.po: PPCGenRegisterInfo.inc.h
PPCCodeEmitter.po: PPCGenSubtargetInfo.inc.h
+PPCFastISel.o: Intrinsics.inc.h
+PPCFastISel.o: PPCGenCallingConv.inc.h
+PPCFastISel.o: PPCGenFastISel.inc.h
+PPCFastISel.o: PPCGenInstrInfo.inc.h
+PPCFastISel.o: PPCGenRegisterInfo.inc.h
+PPCFastISel.o: PPCGenSubtargetInfo.inc.h
+PPCFastISel.po: Intrinsics.inc.h
+PPCFastISel.po: PPCGenCallingConv.inc.h
+PPCFastISel.po: PPCGenFastISel.inc.h
+PPCFastISel.po: PPCGenInstrInfo.inc.h
+PPCFastISel.po: PPCGenRegisterInfo.inc.h
+PPCFastISel.po: PPCGenSubtargetInfo.inc.h
PPCFrameLowering.o: PPCGenInstrInfo.inc.h
PPCFrameLowering.o: PPCGenRegisterInfo.inc.h
PPCFrameLowering.o: PPCGenSubtargetInfo.inc.h
diff --git a/lib/clang/libllvmpowerpcdesc/Makefile.depend b/lib/clang/libllvmpowerpcdesc/Makefile.depend
index ddc053c119af..d6220e7321a8 100644
--- a/lib/clang/libllvmpowerpcdesc/Makefile.depend
+++ b/lib/clang/libllvmpowerpcdesc/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
@@ -41,4 +40,10 @@ PPCMCTargetDesc.o: PPCGenSubtargetInfo.inc.h
PPCMCTargetDesc.po: PPCGenInstrInfo.inc.h
PPCMCTargetDesc.po: PPCGenRegisterInfo.inc.h
PPCMCTargetDesc.po: PPCGenSubtargetInfo.inc.h
+PPCMachObjectWriter.o: PPCGenInstrInfo.inc.h
+PPCMachObjectWriter.o: PPCGenRegisterInfo.inc.h
+PPCMachObjectWriter.o: PPCGenSubtargetInfo.inc.h
+PPCMachObjectWriter.po: PPCGenInstrInfo.inc.h
+PPCMachObjectWriter.po: PPCGenRegisterInfo.inc.h
+PPCMachObjectWriter.po: PPCGenSubtargetInfo.inc.h
.endif
diff --git a/lib/clang/libllvmpowerpcinfo/Makefile.depend b/lib/clang/libllvmpowerpcinfo/Makefile.depend
index e952d74e5ede..022060a5f096 100644
--- a/lib/clang/libllvmpowerpcinfo/Makefile.depend
+++ b/lib/clang/libllvmpowerpcinfo/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
diff --git a/lib/clang/libllvmpowerpcinstprinter/Makefile.depend b/lib/clang/libllvmpowerpcinstprinter/Makefile.depend
index 057e08f6b214..676a53c94bdc 100644
--- a/lib/clang/libllvmpowerpcinstprinter/Makefile.depend
+++ b/lib/clang/libllvmpowerpcinstprinter/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
diff --git a/lib/clang/libllvmruntimedyld/Makefile.depend b/lib/clang/libllvmruntimedyld/Makefile.depend
index 422d37c93228..d4069a675840 100644
--- a/lib/clang/libllvmruntimedyld/Makefile.depend
+++ b/lib/clang/libllvmruntimedyld/Makefile.depend
@@ -3,10 +3,10 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/clang/include \
+ lib/libc++ \
lib/msun \
diff --git a/lib/clang/libllvmscalaropts/Makefile.depend b/lib/clang/libllvmscalaropts/Makefile.depend
index 921024027b00..1c880cd3d3fd 100644
--- a/lib/clang/libllvmscalaropts/Makefile.depend
+++ b/lib/clang/libllvmscalaropts/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
@@ -33,6 +32,8 @@ LICM.o: Intrinsics.inc.h
LICM.po: Intrinsics.inc.h
LoopIdiomRecognize.o: Intrinsics.inc.h
LoopIdiomRecognize.po: Intrinsics.inc.h
+LoopRerollPass.o: Intrinsics.inc.h
+LoopRerollPass.po: Intrinsics.inc.h
LoopRotation.o: Intrinsics.inc.h
LoopRotation.po: Intrinsics.inc.h
LoopStrengthReduce.o: Intrinsics.inc.h
@@ -45,6 +46,8 @@ LowerAtomic.o: Intrinsics.inc.h
LowerAtomic.po: Intrinsics.inc.h
MemCpyOptimizer.o: Intrinsics.inc.h
MemCpyOptimizer.po: Intrinsics.inc.h
+PartiallyInlineLibCalls.o: Intrinsics.inc.h
+PartiallyInlineLibCalls.po: Intrinsics.inc.h
Reassociate.o: Intrinsics.inc.h
Reassociate.po: Intrinsics.inc.h
SCCP.o: Intrinsics.inc.h
@@ -57,6 +60,8 @@ SimplifyCFGPass.o: Intrinsics.inc.h
SimplifyCFGPass.po: Intrinsics.inc.h
Sink.o: Intrinsics.inc.h
Sink.po: Intrinsics.inc.h
+StructurizeCFG.o: Intrinsics.inc.h
+StructurizeCFG.po: Intrinsics.inc.h
TailRecursionElimination.o: Intrinsics.inc.h
TailRecursionElimination.po: Intrinsics.inc.h
.endif
diff --git a/lib/clang/libllvmselectiondag/Makefile.depend b/lib/clang/libllvmselectiondag/Makefile.depend
index 95ce77ee7c9b..737ede18613e 100644
--- a/lib/clang/libllvmselectiondag/Makefile.depend
+++ b/lib/clang/libllvmselectiondag/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
diff --git a/lib/clang/libllvmsupport/Makefile.depend b/lib/clang/libllvmsupport/Makefile.depend
index 422d37c93228..4d8f064b840b 100644
--- a/lib/clang/libllvmsupport/Makefile.depend
+++ b/lib/clang/libllvmsupport/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
diff --git a/lib/clang/libllvmtablegen/Makefile.depend b/lib/clang/libllvmtablegen/Makefile.depend
index 422d37c93228..4d8f064b840b 100644
--- a/lib/clang/libllvmtablegen/Makefile.depend
+++ b/lib/clang/libllvmtablegen/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
diff --git a/lib/clang/libllvmtarget/Makefile.depend b/lib/clang/libllvmtarget/Makefile.depend
index 422d37c93228..d4069a675840 100644
--- a/lib/clang/libllvmtarget/Makefile.depend
+++ b/lib/clang/libllvmtarget/Makefile.depend
@@ -3,10 +3,10 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/clang/include \
+ lib/libc++ \
lib/msun \
diff --git a/lib/clang/libllvmtransformutils/Makefile.depend b/lib/clang/libllvmtransformutils/Makefile.depend
index 5ed0fbadb4c0..2aad904d8c6a 100644
--- a/lib/clang/libllvmtransformutils/Makefile.depend
+++ b/lib/clang/libllvmtransformutils/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
@@ -23,6 +22,8 @@ CloneFunction.o: Intrinsics.inc.h
CloneFunction.po: Intrinsics.inc.h
CodeExtractor.o: Intrinsics.inc.h
CodeExtractor.po: Intrinsics.inc.h
+GlobalStatus.o: Intrinsics.inc.h
+GlobalStatus.po: Intrinsics.inc.h
InlineFunction.o: Intrinsics.inc.h
InlineFunction.po: Intrinsics.inc.h
IntegerDivision.o: Intrinsics.inc.h
diff --git a/lib/clang/libllvmvectorize/Makefile.depend b/lib/clang/libllvmvectorize/Makefile.depend
index 40d35601976f..171d928360a5 100644
--- a/lib/clang/libllvmvectorize/Makefile.depend
+++ b/lib/clang/libllvmvectorize/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
@@ -21,6 +20,4 @@ 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 b4ef923f230b..200e80ddc0c4 100644
--- a/lib/clang/libllvmx86asmparser/Makefile.depend
+++ b/lib/clang/libllvmx86asmparser/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
diff --git a/lib/clang/libllvmx86codegen/Makefile.depend b/lib/clang/libllvmx86codegen/Makefile.depend
index 1eb524d37c33..530394855029 100644
--- a/lib/clang/libllvmx86codegen/Makefile.depend
+++ b/lib/clang/libllvmx86codegen/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
diff --git a/lib/clang/libllvmx86desc/Makefile.depend b/lib/clang/libllvmx86desc/Makefile.depend
index 9e3ab7303e68..503475705ddc 100644
--- a/lib/clang/libllvmx86desc/Makefile.depend
+++ b/lib/clang/libllvmx86desc/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
@@ -27,6 +26,12 @@ X86ELFObjectWriter.o: X86GenSubtargetInfo.inc.h
X86ELFObjectWriter.po: X86GenInstrInfo.inc.h
X86ELFObjectWriter.po: X86GenRegisterInfo.inc.h
X86ELFObjectWriter.po: X86GenSubtargetInfo.inc.h
+X86ELFRelocationInfo.o: X86GenInstrInfo.inc.h
+X86ELFRelocationInfo.o: X86GenRegisterInfo.inc.h
+X86ELFRelocationInfo.o: X86GenSubtargetInfo.inc.h
+X86ELFRelocationInfo.po: X86GenInstrInfo.inc.h
+X86ELFRelocationInfo.po: X86GenRegisterInfo.inc.h
+X86ELFRelocationInfo.po: X86GenSubtargetInfo.inc.h
X86MCCodeEmitter.o: X86GenInstrInfo.inc.h
X86MCCodeEmitter.o: X86GenRegisterInfo.inc.h
X86MCCodeEmitter.o: X86GenSubtargetInfo.inc.h
@@ -39,6 +44,12 @@ X86MCTargetDesc.o: X86GenSubtargetInfo.inc.h
X86MCTargetDesc.po: X86GenInstrInfo.inc.h
X86MCTargetDesc.po: X86GenRegisterInfo.inc.h
X86MCTargetDesc.po: X86GenSubtargetInfo.inc.h
+X86MachORelocationInfo.o: X86GenInstrInfo.inc.h
+X86MachORelocationInfo.o: X86GenRegisterInfo.inc.h
+X86MachORelocationInfo.o: X86GenSubtargetInfo.inc.h
+X86MachORelocationInfo.po: X86GenInstrInfo.inc.h
+X86MachORelocationInfo.po: X86GenRegisterInfo.inc.h
+X86MachORelocationInfo.po: X86GenSubtargetInfo.inc.h
X86MachObjectWriter.o: X86GenInstrInfo.inc.h
X86MachObjectWriter.o: X86GenRegisterInfo.inc.h
X86MachObjectWriter.o: X86GenSubtargetInfo.inc.h
diff --git a/lib/clang/libllvmx86disassembler/Makefile.depend b/lib/clang/libllvmx86disassembler/Makefile.depend
index 0e569caab18a..fa7a65b0d137 100644
--- a/lib/clang/libllvmx86disassembler/Makefile.depend
+++ b/lib/clang/libllvmx86disassembler/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
diff --git a/lib/clang/libllvmx86info/Makefile.depend b/lib/clang/libllvmx86info/Makefile.depend
index 212ccc1cdf92..1ea75cbc9180 100644
--- a/lib/clang/libllvmx86info/Makefile.depend
+++ b/lib/clang/libllvmx86info/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
diff --git a/lib/clang/libllvmx86instprinter/Makefile.depend b/lib/clang/libllvmx86instprinter/Makefile.depend
index 062c7822b7da..86a651a27d43 100644
--- a/lib/clang/libllvmx86instprinter/Makefile.depend
+++ b/lib/clang/libllvmx86instprinter/Makefile.depend
@@ -3,10 +3,9 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/libc++ \
lib/msun \
usr.bin/clang/tblgen.host \
diff --git a/lib/clang/libllvmx86utils/Makefile.depend b/lib/clang/libllvmx86utils/Makefile.depend
index 422d37c93228..d4069a675840 100644
--- a/lib/clang/libllvmx86utils/Makefile.depend
+++ b/lib/clang/libllvmx86utils/Makefile.depend
@@ -3,10 +3,10 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
- gnu/lib/libstdc++ \
- gnu/lib/libsupc++ \
include \
include/xlocale \
+ lib/clang/include \
+ lib/libc++ \
lib/msun \
diff --git a/lib/libalias/libalias/Makefile.depend b/lib/libalias/libalias/Makefile.depend
index 5269280d143c..807c0a46764c 100644
--- a/lib/libalias/libalias/Makefile.depend
+++ b/lib/libalias/libalias/Makefile.depend
@@ -10,8 +10,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libalias/modules/cuseeme/Makefile.depend b/lib/libalias/modules/cuseeme/Makefile.depend
index 6caf55f2706e..96aa2a21a959 100644
--- a/lib/libalias/modules/cuseeme/Makefile.depend
+++ b/lib/libalias/modules/cuseeme/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/libalias/modules/dummy/Makefile.depend b/lib/libalias/modules/dummy/Makefile.depend
index 6caf55f2706e..96aa2a21a959 100644
--- a/lib/libalias/modules/dummy/Makefile.depend
+++ b/lib/libalias/modules/dummy/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/libalias/modules/ftp/Makefile.depend b/lib/libalias/modules/ftp/Makefile.depend
index 6caf55f2706e..96aa2a21a959 100644
--- a/lib/libalias/modules/ftp/Makefile.depend
+++ b/lib/libalias/modules/ftp/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/libalias/modules/irc/Makefile.depend b/lib/libalias/modules/irc/Makefile.depend
index 6caf55f2706e..96aa2a21a959 100644
--- a/lib/libalias/modules/irc/Makefile.depend
+++ b/lib/libalias/modules/irc/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/libalias/modules/nbt/Makefile.depend b/lib/libalias/modules/nbt/Makefile.depend
index 6caf55f2706e..96aa2a21a959 100644
--- a/lib/libalias/modules/nbt/Makefile.depend
+++ b/lib/libalias/modules/nbt/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/libalias/modules/pptp/Makefile.depend b/lib/libalias/modules/pptp/Makefile.depend
index 6caf55f2706e..96aa2a21a959 100644
--- a/lib/libalias/modules/pptp/Makefile.depend
+++ b/lib/libalias/modules/pptp/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/libalias/modules/skinny/Makefile.depend b/lib/libalias/modules/skinny/Makefile.depend
index 6caf55f2706e..96aa2a21a959 100644
--- a/lib/libalias/modules/skinny/Makefile.depend
+++ b/lib/libalias/modules/skinny/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/libalias/modules/smedia/Makefile.depend b/lib/libalias/modules/smedia/Makefile.depend
index 6caf55f2706e..96aa2a21a959 100644
--- a/lib/libalias/modules/smedia/Makefile.depend
+++ b/lib/libalias/modules/smedia/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
diff --git a/lib/libarchive/Makefile.depend b/lib/libarchive/Makefile.depend
index aec02f3165be..f87de01ae5f6 100644
--- a/lib/libarchive/Makefile.depend
+++ b/lib/libarchive/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
@@ -14,6 +15,7 @@ DIRDEPS = \
lib/liblzma \
lib/libz \
secure/lib/libcrypto \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libauditd/Makefile.depend b/lib/libauditd/Makefile.depend
index 6caf55f2706e..467741f6d1a9 100644
--- a/lib/libauditd/Makefile.depend
+++ b/lib/libauditd/Makefile.depend
@@ -9,8 +9,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libbegemot/Makefile.depend b/lib/libbegemot/Makefile.depend
index 6caf55f2706e..467741f6d1a9 100644
--- a/lib/libbegemot/Makefile.depend
+++ b/lib/libbegemot/Makefile.depend
@@ -9,8 +9,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libblocksruntime/Makefile.depend b/lib/libblocksruntime/Makefile.depend
index 6caf55f2706e..467741f6d1a9 100644
--- a/lib/libblocksruntime/Makefile.depend
+++ b/lib/libblocksruntime/Makefile.depend
@@ -9,8 +9,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libbluetooth/Makefile.depend b/lib/libbluetooth/Makefile.depend
index 6caf55f2706e..467741f6d1a9 100644
--- a/lib/libbluetooth/Makefile.depend
+++ b/lib/libbluetooth/Makefile.depend
@@ -9,8 +9,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libbsm/Makefile.depend b/lib/libbsm/Makefile.depend
index 5269280d143c..807c0a46764c 100644
--- a/lib/libbsm/Makefile.depend
+++ b/lib/libbsm/Makefile.depend
@@ -10,8 +10,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libbsnmp/libbsnmp/Makefile.depend b/lib/libbsnmp/libbsnmp/Makefile.depend
index 761a02420758..4de5cd32a6b8 100644
--- a/lib/libbsnmp/libbsnmp/Makefile.depend
+++ b/lib/libbsnmp/libbsnmp/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
@@ -10,6 +11,7 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
secure/lib/libcrypto \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libbz2/Makefile.depend b/lib/libbz2/Makefile.depend
index 6caf55f2706e..467741f6d1a9 100644
--- a/lib/libbz2/Makefile.depend
+++ b/lib/libbz2/Makefile.depend
@@ -9,8 +9,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libc++/Makefile.depend b/lib/libc++/Makefile.depend
index bc14f56bdfff..e391c404ef63 100644
--- a/lib/libc++/Makefile.depend
+++ b/lib/libc++/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libcxxrt \
lib/msun \
diff --git a/lib/libcalendar/Makefile.depend b/lib/libcalendar/Makefile.depend
index e9a1dda6ca51..7cedd5f867c7 100644
--- a/lib/libcalendar/Makefile.depend
+++ b/lib/libcalendar/Makefile.depend
@@ -8,8 +8,8 @@ DIRDEPS = \
include \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libcam/Makefile.depend b/lib/libcam/Makefile.depend
index a1157119ad51..f976a9c926dd 100644
--- a/lib/libcam/Makefile.depend
+++ b/lib/libcam/Makefile.depend
@@ -9,9 +9,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libsbuf \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libcapsicum/Makefile.depend b/lib/libcapsicum/Makefile.depend
index 67b4ef08e1f9..ab84fcc1c757 100644
--- a/lib/libcapsicum/Makefile.depend
+++ b/lib/libcapsicum/Makefile.depend
@@ -9,9 +9,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libnv \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libcom_err/Makefile.depend b/lib/libcom_err/Makefile.depend
index 6caf55f2706e..467741f6d1a9 100644
--- a/lib/libcom_err/Makefile.depend
+++ b/lib/libcom_err/Makefile.depend
@@ -9,8 +9,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libcrypt/Makefile.depend b/lib/libcrypt/Makefile.depend
index 5269280d143c..807c0a46764c 100644
--- a/lib/libcrypt/Makefile.depend
+++ b/lib/libcrypt/Makefile.depend
@@ -10,8 +10,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libcxxrt/Makefile.depend b/lib/libcxxrt/Makefile.depend
index 6caf55f2706e..467741f6d1a9 100644
--- a/lib/libcxxrt/Makefile.depend
+++ b/lib/libcxxrt/Makefile.depend
@@ -9,8 +9,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libdevinfo/Makefile.depend b/lib/libdevinfo/Makefile.depend
index 6caf55f2706e..467741f6d1a9 100644
--- a/lib/libdevinfo/Makefile.depend
+++ b/lib/libdevinfo/Makefile.depend
@@ -9,8 +9,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libdevstat/Makefile.depend b/lib/libdevstat/Makefile.depend
index b7d414c85aeb..46488c998a57 100644
--- a/lib/libdevstat/Makefile.depend
+++ b/lib/libdevstat/Makefile.depend
@@ -9,9 +9,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libkvm \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libdwarf/Makefile.depend b/lib/libdwarf/Makefile.depend
index 1b2ce3e41ae6..07e629e24137 100644
--- a/lib/libdwarf/Makefile.depend
+++ b/lib/libdwarf/Makefile.depend
@@ -9,9 +9,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libelf \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libedit/Makefile.depend b/lib/libedit/Makefile.depend
index af92ff9ef9e3..1d7ae9448400 100644
--- a/lib/libedit/Makefile.depend
+++ b/lib/libedit/Makefile.depend
@@ -9,10 +9,10 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/ncurses/ncurses \
lib/ncurses/ncursesw \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libelf/Makefile.depend b/lib/libelf/Makefile.depend
index 7c6b7073c2ee..b2c79ae13999 100644
--- a/lib/libelf/Makefile.depend
+++ b/lib/libelf/Makefile.depend
@@ -9,8 +9,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libexecinfo/Makefile.depend b/lib/libexecinfo/Makefile.depend
index 659d7cca1ad8..f8f5a363f748 100644
--- a/lib/libexecinfo/Makefile.depend
+++ b/lib/libexecinfo/Makefile.depend
@@ -9,9 +9,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libelf \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libexpat/Makefile.depend b/lib/libexpat/Makefile.depend
index 6caf55f2706e..467741f6d1a9 100644
--- a/lib/libexpat/Makefile.depend
+++ b/lib/libexpat/Makefile.depend
@@ -9,8 +9,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libfetch/Makefile.depend b/lib/libfetch/Makefile.depend
index 02237e854efd..3fcefec42ea7 100644
--- a/lib/libfetch/Makefile.depend
+++ b/lib/libfetch/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
@@ -11,6 +12,7 @@ DIRDEPS = \
lib/libcompiler_rt \
secure/lib/libcrypto \
secure/lib/libssl \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libgeom/Makefile.depend b/lib/libgeom/Makefile.depend
index a66d580db4dc..acc7f3579c8e 100644
--- a/lib/libgeom/Makefile.depend
+++ b/lib/libgeom/Makefile.depend
@@ -9,10 +9,10 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libexpat \
lib/libsbuf \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libgpib/Makefile.depend b/lib/libgpib/Makefile.depend
index e9a1dda6ca51..7cedd5f867c7 100644
--- a/lib/libgpib/Makefile.depend
+++ b/lib/libgpib/Makefile.depend
@@ -8,8 +8,8 @@ DIRDEPS = \
include \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libgssapi/Makefile.depend b/lib/libgssapi/Makefile.depend
index 841cdfd90dab..4a1f10886ac4 100644
--- a/lib/libgssapi/Makefile.depend
+++ b/lib/libgssapi/Makefile.depend
@@ -10,8 +10,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/BIG5/Makefile.depend b/lib/libiconv_modules/BIG5/Makefile.depend
index 639d45d8b9b0..467741f6d1a9 100644
--- a/lib/libiconv_modules/BIG5/Makefile.depend
+++ b/lib/libiconv_modules/BIG5/Makefile.depend
@@ -3,8 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
+ gnu/lib/libgcc \
include \
include/xlocale \
+ lib/${CSU_DIR} \
+ lib/libc \
+ lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/DECHanyu/Makefile.depend b/lib/libiconv_modules/DECHanyu/Makefile.depend
index 639d45d8b9b0..467741f6d1a9 100644
--- a/lib/libiconv_modules/DECHanyu/Makefile.depend
+++ b/lib/libiconv_modules/DECHanyu/Makefile.depend
@@ -3,8 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
+ gnu/lib/libgcc \
include \
include/xlocale \
+ lib/${CSU_DIR} \
+ lib/libc \
+ lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/EUC/Makefile.depend b/lib/libiconv_modules/EUC/Makefile.depend
index 639d45d8b9b0..467741f6d1a9 100644
--- a/lib/libiconv_modules/EUC/Makefile.depend
+++ b/lib/libiconv_modules/EUC/Makefile.depend
@@ -3,8 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
+ gnu/lib/libgcc \
include \
include/xlocale \
+ lib/${CSU_DIR} \
+ lib/libc \
+ lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/EUCTW/Makefile.depend b/lib/libiconv_modules/EUCTW/Makefile.depend
index 639d45d8b9b0..467741f6d1a9 100644
--- a/lib/libiconv_modules/EUCTW/Makefile.depend
+++ b/lib/libiconv_modules/EUCTW/Makefile.depend
@@ -3,8 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
+ gnu/lib/libgcc \
include \
include/xlocale \
+ lib/${CSU_DIR} \
+ lib/libc \
+ lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/GBK2K/Makefile.depend b/lib/libiconv_modules/GBK2K/Makefile.depend
index 639d45d8b9b0..467741f6d1a9 100644
--- a/lib/libiconv_modules/GBK2K/Makefile.depend
+++ b/lib/libiconv_modules/GBK2K/Makefile.depend
@@ -3,8 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
+ gnu/lib/libgcc \
include \
include/xlocale \
+ lib/${CSU_DIR} \
+ lib/libc \
+ lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/HZ/Makefile.depend b/lib/libiconv_modules/HZ/Makefile.depend
index 639d45d8b9b0..467741f6d1a9 100644
--- a/lib/libiconv_modules/HZ/Makefile.depend
+++ b/lib/libiconv_modules/HZ/Makefile.depend
@@ -3,8 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
+ gnu/lib/libgcc \
include \
include/xlocale \
+ lib/${CSU_DIR} \
+ lib/libc \
+ lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/ISO2022/Makefile.depend b/lib/libiconv_modules/ISO2022/Makefile.depend
index 639d45d8b9b0..467741f6d1a9 100644
--- a/lib/libiconv_modules/ISO2022/Makefile.depend
+++ b/lib/libiconv_modules/ISO2022/Makefile.depend
@@ -3,8 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
+ gnu/lib/libgcc \
include \
include/xlocale \
+ lib/${CSU_DIR} \
+ lib/libc \
+ lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/JOHAB/Makefile.depend b/lib/libiconv_modules/JOHAB/Makefile.depend
index 639d45d8b9b0..467741f6d1a9 100644
--- a/lib/libiconv_modules/JOHAB/Makefile.depend
+++ b/lib/libiconv_modules/JOHAB/Makefile.depend
@@ -3,8 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
+ gnu/lib/libgcc \
include \
include/xlocale \
+ lib/${CSU_DIR} \
+ lib/libc \
+ lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/MSKanji/Makefile.depend b/lib/libiconv_modules/MSKanji/Makefile.depend
index 639d45d8b9b0..467741f6d1a9 100644
--- a/lib/libiconv_modules/MSKanji/Makefile.depend
+++ b/lib/libiconv_modules/MSKanji/Makefile.depend
@@ -3,8 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
+ gnu/lib/libgcc \
include \
include/xlocale \
+ lib/${CSU_DIR} \
+ lib/libc \
+ lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/UES/Makefile.depend b/lib/libiconv_modules/UES/Makefile.depend
index 639d45d8b9b0..467741f6d1a9 100644
--- a/lib/libiconv_modules/UES/Makefile.depend
+++ b/lib/libiconv_modules/UES/Makefile.depend
@@ -3,8 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
+ gnu/lib/libgcc \
include \
include/xlocale \
+ lib/${CSU_DIR} \
+ lib/libc \
+ lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/UTF1632/Makefile.depend b/lib/libiconv_modules/UTF1632/Makefile.depend
index 639d45d8b9b0..467741f6d1a9 100644
--- a/lib/libiconv_modules/UTF1632/Makefile.depend
+++ b/lib/libiconv_modules/UTF1632/Makefile.depend
@@ -3,8 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
+ gnu/lib/libgcc \
include \
include/xlocale \
+ lib/${CSU_DIR} \
+ lib/libc \
+ lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/UTF7/Makefile.depend b/lib/libiconv_modules/UTF7/Makefile.depend
index 639d45d8b9b0..467741f6d1a9 100644
--- a/lib/libiconv_modules/UTF7/Makefile.depend
+++ b/lib/libiconv_modules/UTF7/Makefile.depend
@@ -3,8 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
+ gnu/lib/libgcc \
include \
include/xlocale \
+ lib/${CSU_DIR} \
+ lib/libc \
+ lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/UTF8/Makefile.depend b/lib/libiconv_modules/UTF8/Makefile.depend
index 639d45d8b9b0..467741f6d1a9 100644
--- a/lib/libiconv_modules/UTF8/Makefile.depend
+++ b/lib/libiconv_modules/UTF8/Makefile.depend
@@ -3,8 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
+ gnu/lib/libgcc \
include \
include/xlocale \
+ lib/${CSU_DIR} \
+ lib/libc \
+ lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/VIQR/Makefile.depend b/lib/libiconv_modules/VIQR/Makefile.depend
index 639d45d8b9b0..467741f6d1a9 100644
--- a/lib/libiconv_modules/VIQR/Makefile.depend
+++ b/lib/libiconv_modules/VIQR/Makefile.depend
@@ -3,8 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
+ gnu/lib/libgcc \
include \
include/xlocale \
+ lib/${CSU_DIR} \
+ lib/libc \
+ lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/ZW/Makefile.depend b/lib/libiconv_modules/ZW/Makefile.depend
index 639d45d8b9b0..467741f6d1a9 100644
--- a/lib/libiconv_modules/ZW/Makefile.depend
+++ b/lib/libiconv_modules/ZW/Makefile.depend
@@ -3,8 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
+ gnu/lib/libgcc \
include \
include/xlocale \
+ lib/${CSU_DIR} \
+ lib/libc \
+ lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/iconv_none/Makefile.depend b/lib/libiconv_modules/iconv_none/Makefile.depend
index 639d45d8b9b0..467741f6d1a9 100644
--- a/lib/libiconv_modules/iconv_none/Makefile.depend
+++ b/lib/libiconv_modules/iconv_none/Makefile.depend
@@ -3,8 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
+ gnu/lib/libgcc \
include \
include/xlocale \
+ lib/${CSU_DIR} \
+ lib/libc \
+ lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/iconv_std/Makefile.depend b/lib/libiconv_modules/iconv_std/Makefile.depend
index 639d45d8b9b0..467741f6d1a9 100644
--- a/lib/libiconv_modules/iconv_std/Makefile.depend
+++ b/lib/libiconv_modules/iconv_std/Makefile.depend
@@ -3,8 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
+ gnu/lib/libgcc \
include \
include/xlocale \
+ lib/${CSU_DIR} \
+ lib/libc \
+ lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/mapper_646/Makefile.depend b/lib/libiconv_modules/mapper_646/Makefile.depend
index 639d45d8b9b0..467741f6d1a9 100644
--- a/lib/libiconv_modules/mapper_646/Makefile.depend
+++ b/lib/libiconv_modules/mapper_646/Makefile.depend
@@ -3,8 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
+ gnu/lib/libgcc \
include \
include/xlocale \
+ lib/${CSU_DIR} \
+ lib/libc \
+ lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/mapper_none/Makefile.depend b/lib/libiconv_modules/mapper_none/Makefile.depend
index 639d45d8b9b0..467741f6d1a9 100644
--- a/lib/libiconv_modules/mapper_none/Makefile.depend
+++ b/lib/libiconv_modules/mapper_none/Makefile.depend
@@ -3,8 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
+ gnu/lib/libgcc \
include \
include/xlocale \
+ lib/${CSU_DIR} \
+ lib/libc \
+ lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/mapper_parallel/Makefile.depend b/lib/libiconv_modules/mapper_parallel/Makefile.depend
index 639d45d8b9b0..467741f6d1a9 100644
--- a/lib/libiconv_modules/mapper_parallel/Makefile.depend
+++ b/lib/libiconv_modules/mapper_parallel/Makefile.depend
@@ -3,8 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
+ gnu/lib/libgcc \
include \
include/xlocale \
+ lib/${CSU_DIR} \
+ lib/libc \
+ lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/mapper_serial/Makefile.depend b/lib/libiconv_modules/mapper_serial/Makefile.depend
index 639d45d8b9b0..467741f6d1a9 100644
--- a/lib/libiconv_modules/mapper_serial/Makefile.depend
+++ b/lib/libiconv_modules/mapper_serial/Makefile.depend
@@ -3,8 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
+ gnu/lib/libgcc \
include \
include/xlocale \
+ lib/${CSU_DIR} \
+ lib/libc \
+ lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/mapper_std/Makefile.depend b/lib/libiconv_modules/mapper_std/Makefile.depend
index 639d45d8b9b0..467741f6d1a9 100644
--- a/lib/libiconv_modules/mapper_std/Makefile.depend
+++ b/lib/libiconv_modules/mapper_std/Makefile.depend
@@ -3,8 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
+ gnu/lib/libgcc \
include \
include/xlocale \
+ lib/${CSU_DIR} \
+ lib/libc \
+ lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libiconv_modules/mapper_zone/Makefile.depend b/lib/libiconv_modules/mapper_zone/Makefile.depend
index 639d45d8b9b0..467741f6d1a9 100644
--- a/lib/libiconv_modules/mapper_zone/Makefile.depend
+++ b/lib/libiconv_modules/mapper_zone/Makefile.depend
@@ -3,8 +3,14 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
+ gnu/lib/libgcc \
include \
include/xlocale \
+ lib/${CSU_DIR} \
+ lib/libc \
+ lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libipsec/Makefile.depend b/lib/libipsec/Makefile.depend
index 89518b5ff290..f48095aeb79d 100644
--- a/lib/libipsec/Makefile.depend
+++ b/lib/libipsec/Makefile.depend
@@ -10,8 +10,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libjail/Makefile.depend b/lib/libjail/Makefile.depend
index 5269280d143c..807c0a46764c 100644
--- a/lib/libjail/Makefile.depend
+++ b/lib/libjail/Makefile.depend
@@ -10,8 +10,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libkiconv/Makefile.depend b/lib/libkiconv/Makefile.depend
index 6caf55f2706e..467741f6d1a9 100644
--- a/lib/libkiconv/Makefile.depend
+++ b/lib/libkiconv/Makefile.depend
@@ -9,8 +9,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libkvm/Makefile.depend b/lib/libkvm/Makefile.depend
index 6caf55f2706e..467741f6d1a9 100644
--- a/lib/libkvm/Makefile.depend
+++ b/lib/libkvm/Makefile.depend
@@ -9,8 +9,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libldns/Makefile.depend b/lib/libldns/Makefile.depend
index 4ea74e5d0c67..3bf324e728f6 100644
--- a/lib/libldns/Makefile.depend
+++ b/lib/libldns/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
@@ -12,6 +13,7 @@ DIRDEPS = \
lib/libcompiler_rt \
secure/lib/libcrypto \
secure/lib/libssl \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/liblzma/Makefile.depend b/lib/liblzma/Makefile.depend
index 6caf55f2706e..467741f6d1a9 100644
--- a/lib/liblzma/Makefile.depend
+++ b/lib/liblzma/Makefile.depend
@@ -9,8 +9,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libmagic/Makefile.depend b/lib/libmagic/Makefile.depend
index 8d258dfd965e..934940fb76de 100644
--- a/lib/libmagic/Makefile.depend
+++ b/lib/libmagic/Makefile.depend
@@ -9,9 +9,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libz \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libmd/Makefile.depend b/lib/libmd/Makefile.depend
index 9561917e0293..17ea6ebfae17 100644
--- a/lib/libmd/Makefile.depend
+++ b/lib/libmd/Makefile.depend
@@ -9,8 +9,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libmemstat/Makefile.depend b/lib/libmemstat/Makefile.depend
index b7d414c85aeb..46488c998a57 100644
--- a/lib/libmemstat/Makefile.depend
+++ b/lib/libmemstat/Makefile.depend
@@ -9,9 +9,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libkvm \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libmilter/Makefile.depend b/lib/libmilter/Makefile.depend
index 92baf08bda74..e092bec52b91 100644
--- a/lib/libmilter/Makefile.depend
+++ b/lib/libmilter/Makefile.depend
@@ -10,9 +10,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libutil \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libmp/Makefile.depend b/lib/libmp/Makefile.depend
index 761a02420758..4de5cd32a6b8 100644
--- a/lib/libmp/Makefile.depend
+++ b/lib/libmp/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
@@ -10,6 +11,7 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
secure/lib/libcrypto \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libnetgraph/Makefile.depend b/lib/libnetgraph/Makefile.depend
index 6caf55f2706e..467741f6d1a9 100644
--- a/lib/libnetgraph/Makefile.depend
+++ b/lib/libnetgraph/Makefile.depend
@@ -9,8 +9,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libngatm/Makefile.depend b/lib/libngatm/Makefile.depend
index 5269280d143c..807c0a46764c 100644
--- a/lib/libngatm/Makefile.depend
+++ b/lib/libngatm/Makefile.depend
@@ -10,8 +10,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libnv/Makefile.depend b/lib/libnv/Makefile.depend
index 6caf55f2706e..467741f6d1a9 100644
--- a/lib/libnv/Makefile.depend
+++ b/lib/libnv/Makefile.depend
@@ -9,8 +9,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libopie/Makefile.depend b/lib/libopie/Makefile.depend
index c1f494f87eff..9c2e45312c9f 100644
--- a/lib/libopie/Makefile.depend
+++ b/lib/libopie/Makefile.depend
@@ -10,9 +10,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libmd \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libpam/libpam/Makefile.depend b/lib/libpam/libpam/Makefile.depend
index 6caf55f2706e..467741f6d1a9 100644
--- a/lib/libpam/libpam/Makefile.depend
+++ b/lib/libpam/libpam/Makefile.depend
@@ -9,8 +9,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libpam/modules/pam_chroot/Makefile.depend b/lib/libpam/modules/pam_chroot/Makefile.depend
index f44d17dcca74..9d521d074595 100644
--- a/lib/libpam/modules/pam_chroot/Makefile.depend
+++ b/lib/libpam/modules/pam_chroot/Makefile.depend
@@ -9,9 +9,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libpam/libpam \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libpam/modules/pam_deny/Makefile.depend b/lib/libpam/modules/pam_deny/Makefile.depend
index afe8c8b3c68f..223b0d0cb95d 100644
--- a/lib/libpam/modules/pam_deny/Makefile.depend
+++ b/lib/libpam/modules/pam_deny/Makefile.depend
@@ -8,9 +8,9 @@ DIRDEPS = \
include \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libpam/libpam \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libpam/modules/pam_echo/Makefile.depend b/lib/libpam/modules/pam_echo/Makefile.depend
index f44d17dcca74..9d521d074595 100644
--- a/lib/libpam/modules/pam_echo/Makefile.depend
+++ b/lib/libpam/modules/pam_echo/Makefile.depend
@@ -9,9 +9,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libpam/libpam \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libpam/modules/pam_exec/Makefile.depend b/lib/libpam/modules/pam_exec/Makefile.depend
index f44d17dcca74..9d521d074595 100644
--- a/lib/libpam/modules/pam_exec/Makefile.depend
+++ b/lib/libpam/modules/pam_exec/Makefile.depend
@@ -9,9 +9,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libpam/libpam \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libpam/modules/pam_ftpusers/Makefile.depend b/lib/libpam/modules/pam_ftpusers/Makefile.depend
index f44d17dcca74..9d521d074595 100644
--- a/lib/libpam/modules/pam_ftpusers/Makefile.depend
+++ b/lib/libpam/modules/pam_ftpusers/Makefile.depend
@@ -9,9 +9,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libpam/libpam \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libpam/modules/pam_group/Makefile.depend b/lib/libpam/modules/pam_group/Makefile.depend
index f44d17dcca74..9d521d074595 100644
--- a/lib/libpam/modules/pam_group/Makefile.depend
+++ b/lib/libpam/modules/pam_group/Makefile.depend
@@ -9,9 +9,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libpam/libpam \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libpam/modules/pam_guest/Makefile.depend b/lib/libpam/modules/pam_guest/Makefile.depend
index f44d17dcca74..9d521d074595 100644
--- a/lib/libpam/modules/pam_guest/Makefile.depend
+++ b/lib/libpam/modules/pam_guest/Makefile.depend
@@ -9,9 +9,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libpam/libpam \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libpam/modules/pam_krb5/Makefile.depend b/lib/libpam/modules/pam_krb5/Makefile.depend
index 43e39273fcd1..f6e886edbc48 100644
--- a/lib/libpam/modules/pam_krb5/Makefile.depend
+++ b/lib/libpam/modules/pam_krb5/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
@@ -17,6 +18,7 @@ DIRDEPS = \
lib/libcrypt \
lib/libpam/libpam \
secure/lib/libcrypto \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libpam/modules/pam_ksu/Makefile.depend b/lib/libpam/modules/pam_ksu/Makefile.depend
index 43e39273fcd1..f6e886edbc48 100644
--- a/lib/libpam/modules/pam_ksu/Makefile.depend
+++ b/lib/libpam/modules/pam_ksu/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
@@ -17,6 +18,7 @@ DIRDEPS = \
lib/libcrypt \
lib/libpam/libpam \
secure/lib/libcrypto \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libpam/modules/pam_lastlog/Makefile.depend b/lib/libpam/modules/pam_lastlog/Makefile.depend
index f44d17dcca74..9d521d074595 100644
--- a/lib/libpam/modules/pam_lastlog/Makefile.depend
+++ b/lib/libpam/modules/pam_lastlog/Makefile.depend
@@ -9,9 +9,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libpam/libpam \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libpam/modules/pam_login_access/Makefile.depend b/lib/libpam/modules/pam_login_access/Makefile.depend
index f44d17dcca74..9d521d074595 100644
--- a/lib/libpam/modules/pam_login_access/Makefile.depend
+++ b/lib/libpam/modules/pam_login_access/Makefile.depend
@@ -9,9 +9,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libpam/libpam \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libpam/modules/pam_nologin/Makefile.depend b/lib/libpam/modules/pam_nologin/Makefile.depend
index 3d8c2f306ad0..0e5a16774bbd 100644
--- a/lib/libpam/modules/pam_nologin/Makefile.depend
+++ b/lib/libpam/modules/pam_nologin/Makefile.depend
@@ -9,10 +9,10 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libpam/libpam \
lib/libutil \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libpam/modules/pam_opie/Makefile.depend b/lib/libpam/modules/pam_opie/Makefile.depend
index 91d27924dfb5..1e75b4a902b0 100644
--- a/lib/libpam/modules/pam_opie/Makefile.depend
+++ b/lib/libpam/modules/pam_opie/Makefile.depend
@@ -9,10 +9,10 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libopie \
lib/libpam/libpam \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libpam/modules/pam_opieaccess/Makefile.depend b/lib/libpam/modules/pam_opieaccess/Makefile.depend
index 94ab2e8f6fbf..7316349cd5b6 100644
--- a/lib/libpam/modules/pam_opieaccess/Makefile.depend
+++ b/lib/libpam/modules/pam_opieaccess/Makefile.depend
@@ -8,10 +8,10 @@ DIRDEPS = \
include \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libopie \
lib/libpam/libpam \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libpam/modules/pam_passwdqc/Makefile.depend b/lib/libpam/modules/pam_passwdqc/Makefile.depend
index 89eac3ede0d5..7cce822158bc 100644
--- a/lib/libpam/modules/pam_passwdqc/Makefile.depend
+++ b/lib/libpam/modules/pam_passwdqc/Makefile.depend
@@ -9,10 +9,10 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libcrypt \
lib/libpam/libpam \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libpam/modules/pam_permit/Makefile.depend b/lib/libpam/modules/pam_permit/Makefile.depend
index afe8c8b3c68f..223b0d0cb95d 100644
--- a/lib/libpam/modules/pam_permit/Makefile.depend
+++ b/lib/libpam/modules/pam_permit/Makefile.depend
@@ -8,9 +8,9 @@ DIRDEPS = \
include \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libpam/libpam \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libpam/modules/pam_radius/Makefile.depend b/lib/libpam/modules/pam_radius/Makefile.depend
index 6a72e9b8e25d..8daba2c77397 100644
--- a/lib/libpam/modules/pam_radius/Makefile.depend
+++ b/lib/libpam/modules/pam_radius/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
@@ -11,6 +12,7 @@ DIRDEPS = \
lib/libcompiler_rt \
lib/libpam/libpam \
lib/libradius \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libpam/modules/pam_rhosts/Makefile.depend b/lib/libpam/modules/pam_rhosts/Makefile.depend
index f44d17dcca74..9d521d074595 100644
--- a/lib/libpam/modules/pam_rhosts/Makefile.depend
+++ b/lib/libpam/modules/pam_rhosts/Makefile.depend
@@ -9,9 +9,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libpam/libpam \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libpam/modules/pam_rootok/Makefile.depend b/lib/libpam/modules/pam_rootok/Makefile.depend
index afe8c8b3c68f..223b0d0cb95d 100644
--- a/lib/libpam/modules/pam_rootok/Makefile.depend
+++ b/lib/libpam/modules/pam_rootok/Makefile.depend
@@ -8,9 +8,9 @@ DIRDEPS = \
include \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libpam/libpam \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libpam/modules/pam_securetty/Makefile.depend b/lib/libpam/modules/pam_securetty/Makefile.depend
index f44d17dcca74..9d521d074595 100644
--- a/lib/libpam/modules/pam_securetty/Makefile.depend
+++ b/lib/libpam/modules/pam_securetty/Makefile.depend
@@ -9,9 +9,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libpam/libpam \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libpam/modules/pam_self/Makefile.depend b/lib/libpam/modules/pam_self/Makefile.depend
index afe8c8b3c68f..223b0d0cb95d 100644
--- a/lib/libpam/modules/pam_self/Makefile.depend
+++ b/lib/libpam/modules/pam_self/Makefile.depend
@@ -8,9 +8,9 @@ DIRDEPS = \
include \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libpam/libpam \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libpam/modules/pam_ssh/Makefile.depend b/lib/libpam/modules/pam_ssh/Makefile.depend
index 425795df2d57..e46aac47883c 100644
--- a/lib/libpam/modules/pam_ssh/Makefile.depend
+++ b/lib/libpam/modules/pam_ssh/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
@@ -15,6 +16,7 @@ DIRDEPS = \
lib/libutil \
secure/lib/libcrypto \
secure/lib/libssh \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libpam/modules/pam_tacplus/Makefile.depend b/lib/libpam/modules/pam_tacplus/Makefile.depend
index bc4b7343419e..c3edc9b21fdc 100644
--- a/lib/libpam/modules/pam_tacplus/Makefile.depend
+++ b/lib/libpam/modules/pam_tacplus/Makefile.depend
@@ -9,10 +9,10 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libpam/libpam \
lib/libtacplus \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libpam/modules/pam_unix/Makefile.depend b/lib/libpam/modules/pam_unix/Makefile.depend
index 13a84801d0c2..47a9e7e0623c 100644
--- a/lib/libpam/modules/pam_unix/Makefile.depend
+++ b/lib/libpam/modules/pam_unix/Makefile.depend
@@ -10,12 +10,12 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libcrypt \
lib/libpam/libpam \
lib/libutil \
lib/libypclnt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libpcap/Makefile.depend b/lib/libpcap/Makefile.depend
index 2b635d7fa37e..c3f153ba3ae8 100644
--- a/lib/libpcap/Makefile.depend
+++ b/lib/libpcap/Makefile.depend
@@ -10,8 +10,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libpmc/Makefile.depend b/lib/libpmc/Makefile.depend
index 6caf55f2706e..467741f6d1a9 100644
--- a/lib/libpmc/Makefile.depend
+++ b/lib/libpmc/Makefile.depend
@@ -9,8 +9,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libproc/Makefile.depend b/lib/libproc/Makefile.depend
index 363d9a0730b3..46c4714e5ad6 100644
--- a/lib/libproc/Makefile.depend
+++ b/lib/libproc/Makefile.depend
@@ -9,11 +9,11 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libcxxrt \
lib/libelf \
lib/libutil \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libprocstat/Makefile.depend b/lib/libprocstat/Makefile.depend
index 7e162f7cd899..bf92deb89550 100644
--- a/lib/libprocstat/Makefile.depend
+++ b/lib/libprocstat/Makefile.depend
@@ -9,12 +9,12 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libelf \
lib/libkvm \
lib/libprocstat/zfs \
lib/libutil \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libprocstat/zfs/Makefile.depend b/lib/libprocstat/zfs/Makefile.depend
index b142a6736e9e..2b448e39c8b1 100644
--- a/lib/libprocstat/zfs/Makefile.depend
+++ b/lib/libprocstat/zfs/Makefile.depend
@@ -5,6 +5,7 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
include \
include/xlocale \
+ lib/clang/include \
lib/libkvm \
lib/msun \
diff --git a/lib/libradius/Makefile.depend b/lib/libradius/Makefile.depend
index 2c3cff5e1329..6047b890a604 100644
--- a/lib/libradius/Makefile.depend
+++ b/lib/libradius/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
@@ -11,6 +12,7 @@ DIRDEPS = \
lib/libc \
lib/libcompiler_rt \
secure/lib/libcrypto \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/librpcsec_gss/Makefile.depend b/lib/librpcsec_gss/Makefile.depend
index 4651ca83b919..89fa5dfd28c1 100644
--- a/lib/librpcsec_gss/Makefile.depend
+++ b/lib/librpcsec_gss/Makefile.depend
@@ -9,9 +9,9 @@ DIRDEPS = \
include/rpc \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libgssapi \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/librpcsvc/Makefile.depend b/lib/librpcsvc/Makefile.depend
index 7b1e7f4f7015..0c8f02a303d1 100644
--- a/lib/librpcsvc/Makefile.depend
+++ b/lib/librpcsvc/Makefile.depend
@@ -11,8 +11,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/librt/Makefile.depend b/lib/librt/Makefile.depend
index e1ba49601114..37acbe0cd621 100644
--- a/lib/librt/Makefile.depend
+++ b/lib/librt/Makefile.depend
@@ -9,9 +9,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libthr \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/librtld_db/Makefile.depend b/lib/librtld_db/Makefile.depend
index 6b94eaeeb5af..8a7801e2e170 100644
--- a/lib/librtld_db/Makefile.depend
+++ b/lib/librtld_db/Makefile.depend
@@ -9,11 +9,11 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libelf \
lib/libproc \
lib/libutil \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libsbuf/Makefile.depend b/lib/libsbuf/Makefile.depend
index 6caf55f2706e..467741f6d1a9 100644
--- a/lib/libsbuf/Makefile.depend
+++ b/lib/libsbuf/Makefile.depend
@@ -9,8 +9,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libsdp/Makefile.depend b/lib/libsdp/Makefile.depend
index beb640354e0e..7a7a3e35ab8d 100644
--- a/lib/libsdp/Makefile.depend
+++ b/lib/libsdp/Makefile.depend
@@ -11,8 +11,8 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libbluetooth \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libsmb/Makefile.depend b/lib/libsmb/Makefile.depend
index b1a67cd37ad9..b370707fb403 100644
--- a/lib/libsmb/Makefile.depend
+++ b/lib/libsmb/Makefile.depend
@@ -10,9 +10,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libkiconv \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libstand/Makefile.depend b/lib/libstand/Makefile.depend
index 34236cbeda95..647f6f8b2c3f 100644
--- a/lib/libstand/Makefile.depend
+++ b/lib/libstand/Makefile.depend
@@ -6,6 +6,7 @@ DIRDEPS = \
include \
include/arpa \
include/xlocale \
+ lib/clang/include \
lib/libbz2 \
diff --git a/lib/libstdbuf/Makefile.depend b/lib/libstdbuf/Makefile.depend
index 6caf55f2706e..467741f6d1a9 100644
--- a/lib/libstdbuf/Makefile.depend
+++ b/lib/libstdbuf/Makefile.depend
@@ -9,8 +9,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libstdthreads/Makefile.depend b/lib/libstdthreads/Makefile.depend
index e1ba49601114..37acbe0cd621 100644
--- a/lib/libstdthreads/Makefile.depend
+++ b/lib/libstdthreads/Makefile.depend
@@ -9,9 +9,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libthr \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libtacplus/Makefile.depend b/lib/libtacplus/Makefile.depend
index c1f494f87eff..9c2e45312c9f 100644
--- a/lib/libtacplus/Makefile.depend
+++ b/lib/libtacplus/Makefile.depend
@@ -10,9 +10,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libmd \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libthr/Makefile.depend b/lib/libthr/Makefile.depend
index e9a1dda6ca51..7cedd5f867c7 100644
--- a/lib/libthr/Makefile.depend
+++ b/lib/libthr/Makefile.depend
@@ -8,8 +8,8 @@ DIRDEPS = \
include \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libthread_db/Makefile.depend b/lib/libthread_db/Makefile.depend
index 6caf55f2706e..467741f6d1a9 100644
--- a/lib/libthread_db/Makefile.depend
+++ b/lib/libthread_db/Makefile.depend
@@ -9,8 +9,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libufs/Makefile.depend b/lib/libufs/Makefile.depend
index 6caf55f2706e..467741f6d1a9 100644
--- a/lib/libufs/Makefile.depend
+++ b/lib/libufs/Makefile.depend
@@ -9,8 +9,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libugidfw/Makefile.depend b/lib/libugidfw/Makefile.depend
index 6caf55f2706e..467741f6d1a9 100644
--- a/lib/libugidfw/Makefile.depend
+++ b/lib/libugidfw/Makefile.depend
@@ -9,8 +9,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libulog/Makefile.depend b/lib/libulog/Makefile.depend
index f3adefe05801..0d8c29b0674e 100644
--- a/lib/libulog/Makefile.depend
+++ b/lib/libulog/Makefile.depend
@@ -9,9 +9,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libmd \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libunbound/Makefile.depend b/lib/libunbound/Makefile.depend
index 2cfec353103a..44c5fdc3413a 100644
--- a/lib/libunbound/Makefile.depend
+++ b/lib/libunbound/Makefile.depend
@@ -3,6 +3,7 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
DIRDEPS = \
+ gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
@@ -13,6 +14,7 @@ DIRDEPS = \
lib/libthr \
secure/lib/libcrypto \
secure/lib/libssl \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libusb/Makefile.depend b/lib/libusb/Makefile.depend
index e1ba49601114..37acbe0cd621 100644
--- a/lib/libusb/Makefile.depend
+++ b/lib/libusb/Makefile.depend
@@ -9,9 +9,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libthr \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libusbhid/Makefile.depend b/lib/libusbhid/Makefile.depend
index 6caf55f2706e..467741f6d1a9 100644
--- a/lib/libusbhid/Makefile.depend
+++ b/lib/libusbhid/Makefile.depend
@@ -9,8 +9,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libutil/Makefile.depend b/lib/libutil/Makefile.depend
index 5269280d143c..807c0a46764c 100644
--- a/lib/libutil/Makefile.depend
+++ b/lib/libutil/Makefile.depend
@@ -10,8 +10,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libvgl/Makefile.depend b/lib/libvgl/Makefile.depend
index 6caf55f2706e..467741f6d1a9 100644
--- a/lib/libvgl/Makefile.depend
+++ b/lib/libvgl/Makefile.depend
@@ -9,8 +9,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libvmmapi/Makefile.depend b/lib/libvmmapi/Makefile.depend
index 40b445f04779..074ac81cfb42 100644
--- a/lib/libvmmapi/Makefile.depend
+++ b/lib/libvmmapi/Makefile.depend
@@ -9,9 +9,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/libutil \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libwrap/Makefile.depend b/lib/libwrap/Makefile.depend
index 5269280d143c..807c0a46764c 100644
--- a/lib/libwrap/Makefile.depend
+++ b/lib/libwrap/Makefile.depend
@@ -10,8 +10,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libypclnt/Makefile.depend b/lib/libypclnt/Makefile.depend
index 619ca757937c..7d7c7444e9b2 100644
--- a/lib/libypclnt/Makefile.depend
+++ b/lib/libypclnt/Makefile.depend
@@ -11,8 +11,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/libz/Makefile.depend b/lib/libz/Makefile.depend
index 6caf55f2706e..467741f6d1a9 100644
--- a/lib/libz/Makefile.depend
+++ b/lib/libz/Makefile.depend
@@ -9,8 +9,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/msun/Makefile.depend b/lib/msun/Makefile.depend
index 6caf55f2706e..467741f6d1a9 100644
--- a/lib/msun/Makefile.depend
+++ b/lib/msun/Makefile.depend
@@ -9,8 +9,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/ncurses/form/Makefile.depend b/lib/ncurses/form/Makefile.depend
index 936372895325..c3295ff8e981 100644
--- a/lib/ncurses/form/Makefile.depend
+++ b/lib/ncurses/form/Makefile.depend
@@ -9,10 +9,10 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/ncurses/ncurses \
lib/ncurses/ncursesw \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/ncurses/formw/Makefile.depend b/lib/ncurses/formw/Makefile.depend
index e942aba98876..d56ffbbe742d 100644
--- a/lib/ncurses/formw/Makefile.depend
+++ b/lib/ncurses/formw/Makefile.depend
@@ -9,9 +9,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/ncurses/ncursesw \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/ncurses/menu/Makefile.depend b/lib/ncurses/menu/Makefile.depend
index 3ca328f016d0..5c8368f7d874 100644
--- a/lib/ncurses/menu/Makefile.depend
+++ b/lib/ncurses/menu/Makefile.depend
@@ -9,10 +9,10 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/ncurses/ncurses \
lib/ncurses/ncursesw \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/ncurses/menuw/Makefile.depend b/lib/ncurses/menuw/Makefile.depend
index 981ac37cd263..49f188286e37 100644
--- a/lib/ncurses/menuw/Makefile.depend
+++ b/lib/ncurses/menuw/Makefile.depend
@@ -9,9 +9,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/ncurses/ncursesw \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/ncurses/ncurses/Makefile.depend b/lib/ncurses/ncurses/Makefile.depend
index 6274ac87202f..871dd718ac1f 100644
--- a/lib/ncurses/ncurses/Makefile.depend
+++ b/lib/ncurses/ncurses/Makefile.depend
@@ -9,9 +9,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/ncurses/ncursesw \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/ncurses/ncursesw/Makefile.depend b/lib/ncurses/ncursesw/Makefile.depend
index b26f3c2fe5c7..445c456bc4f7 100644
--- a/lib/ncurses/ncursesw/Makefile.depend
+++ b/lib/ncurses/ncursesw/Makefile.depend
@@ -9,8 +9,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/ncurses/panel/Makefile.depend b/lib/ncurses/panel/Makefile.depend
index e5c91fb693ef..2359930f70f6 100644
--- a/lib/ncurses/panel/Makefile.depend
+++ b/lib/ncurses/panel/Makefile.depend
@@ -9,10 +9,10 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/ncurses/ncurses \
lib/ncurses/ncursesw \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>
diff --git a/lib/ncurses/panelw/Makefile.depend b/lib/ncurses/panelw/Makefile.depend
index c5a301e94c81..2ec647289e61 100644
--- a/lib/ncurses/panelw/Makefile.depend
+++ b/lib/ncurses/panelw/Makefile.depend
@@ -9,9 +9,9 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
- lib/libc_nonshared \
lib/libcompiler_rt \
lib/ncurses/ncursesw \
+ usr.bin/xinstall.host \
.include <dirdeps.mk>