Merge ^/head r284188 through r284643.

6 files changed, 326 insertions, 2 deletions

diff --git a/usr.bin/clang/clang-tblgen/Makefile.depend b/usr.bin/clang/clang-tblgen/Makefile.depend
new file mode 100644
index 0000000..0e9e94c
--- /dev/null
+++ b/usr.bin/clang/clang-tblgen/Makefile.depend
@@ -0,0 +1,23 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	gnu/lib/csu \
+	gnu/lib/libgcc \
+	include \
+	include/xlocale \
+	lib/${CSU_DIR} \
+	lib/clang/libllvmsupport \
+	lib/clang/libllvmtablegen \
+	lib/libc \
+	lib/libc++ \
+	lib/libcompiler_rt \
+	lib/msun \
+	lib/ncurses/ncursesw \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/usr.bin/clang/clang.prog.mk b/usr.bin/clang/clang.prog.mk
index 538c55a..14f7609 100644
--- a/usr.bin/clang/clang.prog.mk
+++ b/usr.bin/clang/clang.prog.mk
@@ -14,4 +14,9 @@ LDADD+=	-lncursesw
 
 BINDIR?= /usr/bin
 
+
+.if ${MK_SHARED_TOOLCHAIN} == "no"
+NO_SHARED= yes
+.endif
+
 .include <bsd.prog.mk>
diff --git a/usr.bin/clang/clang/Makefile.depend b/usr.bin/clang/clang/Makefile.depend
new file mode 100644
index 0000000..9d31380
--- /dev/null
+++ b/usr.bin/clang/clang/Makefile.depend
@@ -0,0 +1,128 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	gnu/lib/csu \
+	gnu/lib/libgcc \
+	include \
+	include/xlocale \
+	lib/${CSU_DIR} \
+	lib/clang/libclanganalysis \
+	lib/clang/libclangarcmigrate \
+	lib/clang/libclangast \
+	lib/clang/libclangbasic \
+	lib/clang/libclangcodegen \
+	lib/clang/libclangdriver \
+	lib/clang/libclangedit \
+	lib/clang/libclangfrontend \
+	lib/clang/libclangfrontendtool \
+	lib/clang/libclanglex \
+	lib/clang/libclangparse \
+	lib/clang/libclangrewrite \
+	lib/clang/libclangrewritefrontend \
+	lib/clang/libclangsema \
+	lib/clang/libclangserialization \
+	lib/clang/libclangstaticanalyzercheckers \
+	lib/clang/libclangstaticanalyzercore \
+	lib/clang/libclangstaticanalyzerfrontend \
+	lib/clang/libllvmaarch64asmparser \
+	lib/clang/libllvmaarch64codegen \
+	lib/clang/libllvmaarch64desc \
+	lib/clang/libllvmaarch64disassembler \
+	lib/clang/libllvmaarch64info \
+	lib/clang/libllvmaarch64instprinter \
+	lib/clang/libllvmaarch64utils \
+	lib/clang/libllvmanalysis \
+	lib/clang/libllvmarmasmparser \
+	lib/clang/libllvmarmcodegen \
+	lib/clang/libllvmarmdesc \
+	lib/clang/libllvmarmdisassembler \
+	lib/clang/libllvmarminfo \
+	lib/clang/libllvmarminstprinter \
+	lib/clang/libllvmasmparser \
+	lib/clang/libllvmasmprinter \
+	lib/clang/libllvmbitreader \
+	lib/clang/libllvmbitwriter \
+	lib/clang/libllvmcodegen \
+	lib/clang/libllvmcore \
+	lib/clang/libllvminstcombine \
+	lib/clang/libllvminstrumentation \
+	lib/clang/libllvmipa \
+	lib/clang/libllvmipo \
+	lib/clang/libllvmirreader \
+	lib/clang/libllvmlinker \
+	lib/clang/libllvmmc \
+	lib/clang/libllvmmcdisassembler \
+	lib/clang/libllvmmcparser \
+	lib/clang/libllvmmipsasmparser \
+	lib/clang/libllvmmipscodegen \
+	lib/clang/libllvmmipsdesc \
+	lib/clang/libllvmmipsdisassembler \
+	lib/clang/libllvmmipsinfo \
+	lib/clang/libllvmmipsinstprinter \
+	lib/clang/libllvmobjcarcopts \
+	lib/clang/libllvmobject \
+	lib/clang/libllvmoption \
+	lib/clang/libllvmpowerpcasmparser \
+	lib/clang/libllvmpowerpccodegen \
+	lib/clang/libllvmpowerpcdesc \
+	lib/clang/libllvmpowerpcdisassembler \
+	lib/clang/libllvmpowerpcinfo \
+	lib/clang/libllvmpowerpcinstprinter \
+	lib/clang/libllvmprofiledata \
+	lib/clang/libllvmscalaropts \
+	lib/clang/libllvmselectiondag \
+	lib/clang/libllvmsparcasmparser \
+	lib/clang/libllvmsparccodegen \
+	lib/clang/libllvmsparcdesc \
+	lib/clang/libllvmsparcdisassembler \
+	lib/clang/libllvmsparcinfo \
+	lib/clang/libllvmsparcinstprinter \
+	lib/clang/libllvmsupport \
+	lib/clang/libllvmtarget \
+	lib/clang/libllvmtransformutils \
+	lib/clang/libllvmvectorize \
+	lib/clang/libllvmx86asmparser \
+	lib/clang/libllvmx86codegen \
+	lib/clang/libllvmx86desc \
+	lib/clang/libllvmx86disassembler \
+	lib/clang/libllvmx86info \
+	lib/clang/libllvmx86instprinter \
+	lib/clang/libllvmx86utils \
+	lib/libc \
+	lib/libc++ \
+	lib/libcompiler_rt \
+	lib/libz \
+	lib/msun \
+	lib/ncurses/ncursesw \
+	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
+cc1_main.o: DiagnosticCommonKinds.inc.h
+cc1_main.o: DiagnosticDriverKinds.inc.h
+cc1_main.o: DiagnosticFrontendKinds.inc.h
+cc1_main.o: Options.inc.h
+cc1_main.po: DiagnosticCommonKinds.inc.h
+cc1_main.po: DiagnosticDriverKinds.inc.h
+cc1_main.po: DiagnosticFrontendKinds.inc.h
+cc1_main.po: Options.inc.h
+cc1as_main.o: DiagnosticCommonKinds.inc.h
+cc1as_main.o: DiagnosticDriverKinds.inc.h
+cc1as_main.o: DiagnosticFrontendKinds.inc.h
+cc1as_main.o: Options.inc.h
+cc1as_main.po: DiagnosticCommonKinds.inc.h
+cc1as_main.po: DiagnosticDriverKinds.inc.h
+cc1as_main.po: DiagnosticFrontendKinds.inc.h
+cc1as_main.po: Options.inc.h
+driver.o: DiagnosticCommonKinds.inc.h
+driver.o: DiagnosticDriverKinds.inc.h
+driver.o: Options.inc.h
+driver.po: DiagnosticCommonKinds.inc.h
+driver.po: DiagnosticDriverKinds.inc.h
+driver.po: Options.inc.h
+.endif
diff --git a/usr.bin/clang/lldb/Makefile b/usr.bin/clang/lldb/Makefile
index 5102835..127df91 100644
--- a/usr.bin/clang/lldb/Makefile
+++ b/usr.bin/clang/lldb/Makefile
@@ -16,8 +16,7 @@ SRCS=	Driver.cpp \
 lldb.1:
 	ln -fs ${LLDB_SRCS}/docs/lldb.1 ${.TARGET}
 
-DPADD=	${LIBEDIT} ${LIBNCURSESW} ${LIBEXECINFO} ${LIBPANEL} ${LIBZ}
-LDADD=	-ledit -lncursesw -lexecinfo -lpanel -lz
+LIBADD=	edit panel ncursesw execinfo z
 
 LLDB_LIBS=\
 	lldb \
diff --git a/usr.bin/clang/lldb/Makefile.depend b/usr.bin/clang/lldb/Makefile.depend
new file mode 100644
index 0000000..17b44d8
--- /dev/null
+++ b/usr.bin/clang/lldb/Makefile.depend
@@ -0,0 +1,146 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	gnu/lib/csu \
+	gnu/lib/libgcc \
+	include \
+	include/xlocale \
+	lib/${CSU_DIR} \
+	lib/clang/libclanganalysis \
+	lib/clang/libclangast \
+	lib/clang/libclangbasic \
+	lib/clang/libclangcodegen \
+	lib/clang/libclangdriver \
+	lib/clang/libclangedit \
+	lib/clang/libclangfrontend \
+	lib/clang/libclanglex \
+	lib/clang/libclangparse \
+	lib/clang/libclangsema \
+	lib/clang/libclangserialization \
+	lib/clang/liblldb \
+	lib/clang/liblldbAPI \
+	lib/clang/liblldbBreakpoint \
+	lib/clang/liblldbCommands \
+	lib/clang/liblldbCore \
+	lib/clang/liblldbDataFormatters \
+	lib/clang/liblldbExpression \
+	lib/clang/liblldbHostCommon \
+	lib/clang/liblldbHostFreeBSD \
+	lib/clang/liblldbHostPOSIX \
+	lib/clang/liblldbInterpreter \
+	lib/clang/liblldbPluginABISysV_ppc \
+	lib/clang/liblldbPluginABISysV_ppc64 \
+	lib/clang/liblldbPluginABISysV_x86_64 \
+	lib/clang/liblldbPluginCXXItaniumABI \
+	lib/clang/liblldbPluginDisassemblerLLVM \
+	lib/clang/liblldbPluginDynamicLoaderPosixDYLD \
+	lib/clang/liblldbPluginDynamicLoaderStatic \
+	lib/clang/liblldbPluginInstructionARM \
+	lib/clang/liblldbPluginInstructionARM64 \
+	lib/clang/liblldbPluginInstrumentationRuntimeAddressSanitizer \
+	lib/clang/liblldbPluginJITLoaderGDB \
+	lib/clang/liblldbPluginMemoryHistoryASan \
+	lib/clang/liblldbPluginObjectContainerBSDArchive \
+	lib/clang/liblldbPluginObjectFileELF \
+	lib/clang/liblldbPluginObjectFileJIT \
+	lib/clang/liblldbPluginPlatformFreeBSD \
+	lib/clang/liblldbPluginPlatformGDB \
+	lib/clang/liblldbPluginProcessElfCore \
+	lib/clang/liblldbPluginProcessFreeBSD \
+	lib/clang/liblldbPluginProcessGDBRemote \
+	lib/clang/liblldbPluginProcessPOSIX \
+	lib/clang/liblldbPluginProcessUtility \
+	lib/clang/liblldbPluginSymbolFileDWARF \
+	lib/clang/liblldbPluginSymbolFileSymtab \
+	lib/clang/liblldbPluginSymbolVendorELF \
+	lib/clang/liblldbPluginUnwindAssemblyInstEmulation \
+	lib/clang/liblldbPluginUnwindAssemblyX86 \
+	lib/clang/liblldbSymbol \
+	lib/clang/liblldbTarget \
+	lib/clang/liblldbUtility \
+	lib/clang/libllvmaarch64asmparser \
+	lib/clang/libllvmaarch64codegen \
+	lib/clang/libllvmaarch64desc \
+	lib/clang/libllvmaarch64disassembler \
+	lib/clang/libllvmaarch64info \
+	lib/clang/libllvmaarch64instprinter \
+	lib/clang/libllvmaarch64utils \
+	lib/clang/libllvmanalysis \
+	lib/clang/libllvmarmasmparser \
+	lib/clang/libllvmarmcodegen \
+	lib/clang/libllvmarmdesc \
+	lib/clang/libllvmarmdisassembler \
+	lib/clang/libllvmarminfo \
+	lib/clang/libllvmarminstprinter \
+	lib/clang/libllvmasmparser \
+	lib/clang/libllvmasmprinter \
+	lib/clang/libllvmbitreader \
+	lib/clang/libllvmbitwriter \
+	lib/clang/libllvmcodegen \
+	lib/clang/libllvmcore \
+	lib/clang/libllvmexecutionengine \
+	lib/clang/libllvminstcombine \
+	lib/clang/libllvminstrumentation \
+	lib/clang/libllvmipa \
+	lib/clang/libllvmipo \
+	lib/clang/libllvmirreader \
+	lib/clang/libllvmlinker \
+	lib/clang/libllvmmc \
+	lib/clang/libllvmmcdisassembler \
+	lib/clang/libllvmmcjit \
+	lib/clang/libllvmmcparser \
+	lib/clang/libllvmmipsasmparser \
+	lib/clang/libllvmmipscodegen \
+	lib/clang/libllvmmipsdesc \
+	lib/clang/libllvmmipsdisassembler \
+	lib/clang/libllvmmipsinfo \
+	lib/clang/libllvmmipsinstprinter \
+	lib/clang/libllvmobjcarcopts \
+	lib/clang/libllvmobject \
+	lib/clang/libllvmoption \
+	lib/clang/libllvmpowerpcasmparser \
+	lib/clang/libllvmpowerpccodegen \
+	lib/clang/libllvmpowerpcdesc \
+	lib/clang/libllvmpowerpcdisassembler \
+	lib/clang/libllvmpowerpcinfo \
+	lib/clang/libllvmpowerpcinstprinter \
+	lib/clang/libllvmprofiledata \
+	lib/clang/libllvmruntimedyld \
+	lib/clang/libllvmscalaropts \
+	lib/clang/libllvmselectiondag \
+	lib/clang/libllvmsparcasmparser \
+	lib/clang/libllvmsparccodegen \
+	lib/clang/libllvmsparcdesc \
+	lib/clang/libllvmsparcdisassembler \
+	lib/clang/libllvmsparcinfo \
+	lib/clang/libllvmsparcinstprinter \
+	lib/clang/libllvmsupport \
+	lib/clang/libllvmtarget \
+	lib/clang/libllvmtransformutils \
+	lib/clang/libllvmvectorize \
+	lib/clang/libllvmx86asmparser \
+	lib/clang/libllvmx86codegen \
+	lib/clang/libllvmx86desc \
+	lib/clang/libllvmx86disassembler \
+	lib/clang/libllvmx86info \
+	lib/clang/libllvmx86instprinter \
+	lib/clang/libllvmx86utils \
+	lib/libc \
+	lib/libc++ \
+	lib/libcompiler_rt \
+	lib/libedit \
+	lib/libelf \
+	lib/libexecinfo \
+	lib/libthr \
+	lib/libz \
+	lib/msun \
+	lib/ncurses/ncursesw \
+	lib/ncurses/panel \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/usr.bin/clang/tblgen/Makefile.depend b/usr.bin/clang/tblgen/Makefile.depend
new file mode 100644
index 0000000..0e9e94c
--- /dev/null
+++ b/usr.bin/clang/tblgen/Makefile.depend
@@ -0,0 +1,23 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	gnu/lib/csu \
+	gnu/lib/libgcc \
+	include \
+	include/xlocale \
+	lib/${CSU_DIR} \
+	lib/clang/libllvmsupport \
+	lib/clang/libllvmtablegen \
+	lib/libc \
+	lib/libc++ \
+	lib/libcompiler_rt \
+	lib/msun \
+	lib/ncurses/ncursesw \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif