Completely revamp the way llvm, clang and lldb are built.

* Bootstrap llvm-tblgen and clang-tblgen with a minimal llvm static
  library, that has no other dependencies.
* Roll up all separate llvm libraries into one big static libllvm.
* Similar for all separate clang and lldb static libraries.
* For all these libraries, generate their .inc files only once.
* Link all llvm tools (including extra) against the big libllvm.
* Link clang and clang-format against the big libllvm and libclang.
* Link lldb against the big libllvm, libclang and liblldb.

N.B.: This is work in progress, some details may still be missing.

It also heavily depends on bsd.*.mk's support for SRCS and DPSRCS with
relative pathnames, which apparently does not always work as expected.
For building llvm, clang and lldb though, it seems to work just fine.

The main idea behind this restructuring is maintainability and build
peformance.  The previous large number of very small libraries, each
with their own generated files and dependencies was slow to traverse
and hard to understand.

Possible future improvements:
* Only build certain targets, e.g. for most regular users having just
  one target will be fine.  This will shave off some build time.
* Building the big llvm, clang and lldb libraries as shared (private)
  libraries.
* Adding other components from the LLVM project, such as lld.

489 files changed, 3064 insertions, 10568 deletions

diff --git a/Makefile.inc1 b/Makefile.inc1
index d87a6dbdb963..a08b41a47a9e 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1652,13 +1652,12 @@ _gensnmptree=	usr.sbin/bsnmpd/gensnmptree
 # the bootstrap compiler, or as the part of the normal build.
 .if ${MK_CLANG_BOOTSTRAP} != "no" || ${MK_CLANG} != "no"
 _clang_tblgen= \
-	lib/clang/libllvmsupport \
-	lib/clang/libllvmtablegen \
+	lib/clang/libllvmminimal \
 	usr.bin/clang/llvm-tblgen \
 	usr.bin/clang/clang-tblgen
 
-${_bt}-usr.bin/clang/clang-tblgen: ${_bt}-lib/clang/libllvmtablegen ${_bt}-lib/clang/libllvmsupport
-${_bt}-usr.bin/clang/llvm-tblgen: ${_bt}-lib/clang/libllvmtablegen ${_bt}-lib/clang/libllvmsupport
+${_bt}-usr.bin/clang/clang-tblgen: ${_bt}-lib/clang/libllvmminimal
+${_bt}-usr.bin/clang/llvm-tblgen: ${_bt}-lib/clang/libllvmminimal
 .endif
 
 # Default to building the GPL DTC, but build the BSDL one if users explicitly
diff --git a/lib/clang/Makefile b/lib/clang/Makefile
index 71d72c125162..bc09ea62dc67 100644
--- a/lib/clang/Makefile
+++ b/lib/clang/Makefile
@@ -2,192 +2,12 @@
 
 .include <src.opts.mk>
 
-.if !make(install)
-.if ${MK_CLANG_FULL} != "no"
-_libclangstaticanalyzer= \
-	libclangstaticanalyzercheckers \
-	libclangstaticanalyzercore \
-	libclangstaticanalyzerfrontend
-_libclangarcmigrate= \
-	libclangarcmigrate
-.endif # MK_CLANG_FULL
-
-SUBDIR=	libclanganalysis \
-	${_libclangarcmigrate} \
-	libclangast \
-	libclangastmatchers \
-	libclangbasic \
-	libclangcodegen \
-	libclangdriver \
-	libclangdynamicastmatchers \
-	libclangedit \
-	libclangfrontend \
-	libclangfrontendtool \
-	libclangindex \
-	libclanglex \
-	libclangparse \
-	libclangrewrite \
-	libclangrewritefrontend \
-	libclangsema \
-	libclangserialization \
-	${_libclangstaticanalyzer} \
-	libclangtooling \
-	\
-	libllvmanalysis \
-	libllvmasmparser \
-	libllvmasmprinter \
-	libllvmbitreader \
-	libllvmbitwriter \
-	libllvmcodegen \
-	libllvmcore \
-	libllvmcoverage \
-	libllvmdebuginfocodeview \
-	libllvmglobalisel \
-	libllvminstcombine \
-	libllvminstrumentation \
-	libllvmipo \
-	libllvmirreader \
-	libllvmlineeditor \
-	libllvmlinker \
-	libllvmmc \
-	libllvmmcdisassembler \
-	libllvmmcparser \
-	libllvmobjcarcopts \
-	libllvmobject \
-	libllvmobjectyaml \
-	libllvmoption \
-	libllvmprofiledata \
-	libllvmscalaropts \
-	libllvmselectiondag \
-	libllvmsupport \
-	libllvmtablegen \
-	libllvmtarget \
-	libllvmtransformutils \
-	libllvmvectorize \
-	\
-	libllvmaarch64asmparser \
-	libllvmaarch64asmprinter \
-	libllvmaarch64codegen \
-	libllvmaarch64desc \
-	libllvmaarch64disassembler \
-	libllvmaarch64info \
-	libllvmaarch64utils \
-	libllvmarmasmparser \
-	libllvmarmasmprinter \
-	libllvmarmcodegen \
-	libllvmarmdesc \
-	libllvmarmdisassembler \
-	libllvmarminfo \
-	libllvmmipsasmparser \
-	libllvmmipsasmprinter \
-	libllvmmipscodegen \
-	libllvmmipsdesc \
-	libllvmmipsinfo \
-	libllvmpowerpcasmparser \
-	libllvmpowerpcasmprinter \
-	libllvmpowerpccodegen \
-	libllvmpowerpcdesc \
-	libllvmpowerpcdisassembler \
-	libllvmpowerpcinfo \
-	libllvmsparcasmparser \
-	libllvmsparcasmprinter \
-	libllvmsparccodegen \
-	libllvmsparcdesc \
-	libllvmsparcinfo \
-	libllvmx86asmparser \
-	libllvmx86asmprinter \
-	libllvmx86codegen \
-	libllvmx86desc \
-	libllvmx86info \
-	libllvmx86utils
-
-.if ${MK_CLANG_EXTRAS} != "no"
-SUBDIR+=libclangformat \
-	libclangtoolingcore \
-	libllvmdebuginfodwarf \
-	libllvmdebuginfopdb \
-	libllvmlibdriver \
-	libllvmlto \
-	libllvmmirparser \
-	libllvmorcjit \
-	libllvmpasses \
-	libllvmsymbolize
-.endif # MK_CLANG_EXTRAS
-	
-.if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLDB} != "no"
-SUBDIR+=libllvmexecutionengine \
-	libllvminterpreter \
-	libllvmmcjit \
-	libllvmmipsdisassembler \
-	libllvmruntimedyld \
-	libllvmsparcdisassembler \
-	libllvmx86disassembler
-.endif # MK_CLANG_EXTRAS | LLDB
-
+# These have to be built in order.
+SUBDIR=		libllvm
+SUBDIR+=	libclang
 .if ${MK_LLDB} != "no"
-SUBDIR+=liblldb \
-	\
-	liblldbAPI \
-	liblldbBreakpoint \
-	liblldbCommands \
-	liblldbCore \
-	liblldbDataFormatters \
-	liblldbExpression \
-	liblldbHostCommon \
-	liblldbHostFreeBSD \
-	liblldbHostPOSIX \
-	liblldbInitialization \
-	liblldbInterpreter \
-	liblldbSymbol \
-	liblldbTarget \
-	liblldbUtility \
-	\
-	liblldbPluginABISysV_arm \
-	liblldbPluginABISysV_arm64 \
-	liblldbPluginABISysV_i386 \
-	liblldbPluginABISysV_mips \
-	liblldbPluginABISysV_mips64 \
-	liblldbPluginABISysV_ppc \
-	liblldbPluginABISysV_ppc64 \
-	liblldbPluginABISysV_x86_64 \
-	liblldbPluginCPlusPlusLanguage \
-	liblldbPluginCXXItaniumABI \
-	liblldbPluginDisassemblerLLVM \
-	liblldbPluginDynamicLoaderStatic \
-	liblldbPluginDynamicLoaderPosixDYLD \
-	liblldbPluginExpressionParserClang \
-	liblldbPluginExpressionParserGo \
-	liblldbPluginInstructionARM \
-	liblldbPluginInstructionARM64 \
-	liblldbPluginInstructionMIPS \
-	liblldbPluginInstructionMIPS64 \
-	liblldbPluginInstrumentationRuntimeAddressSanitizer \
-	liblldbPluginJITLoaderGDB \
-	liblldbPluginMemoryHistoryASan \
-	liblldbPluginObjCLanguage \
-	liblldbPluginObjectContainerBSDArchive \
-	liblldbPluginObjectFileELF \
-	liblldbPluginObjectFileJIT \
-	liblldbPluginPlatformFreeBSD \
-	liblldbPluginPlatformGDB \
-	liblldbPluginProcessElfCore \
-	liblldbPluginProcessFreeBSD \
-	liblldbPluginProcessGDBRemote \
-	liblldbPluginProcessPOSIX \
-	liblldbPluginProcessUtility \
-	liblldbPluginScriptInterpreterNone \
-	liblldbPluginSymbolFileDWARF \
-	liblldbPluginSymbolFilePDB \
-	liblldbPluginSymbolFileSymtab \
-	liblldbPluginSymbolVendorELF \
-	liblldbPluginUnwindAssemblyInstEmulation \
-	liblldbPluginUnwindAssemblyX86
-.endif # MK_LLDB
-
-.endif # !make(install)
-
-SUBDIR+= include
-
-SUBDIR_PARALLEL=
+SUBDIR+=	liblldb
+.endif
+SUBDIR+=	headers
 
 .include <bsd.subdir.mk>
diff --git a/lib/clang/clang.build.mk b/lib/clang/clang.build.mk
index 89eec4f0a4fb..7452edd7714d 100644
--- a/lib/clang/clang.build.mk
+++ b/lib/clang/clang.build.mk
@@ -2,258 +2,23 @@
 
 .include <src.opts.mk>
 
-CLANG_SRCS=	${LLVM_SRCS}/tools/clang
-
-CFLAGS+=	-I${LLVM_SRCS}/include -I${CLANG_SRCS}/include \
-		-I${LLVM_SRCS}/${SRCDIR} ${INCDIR:C/^/-I${LLVM_SRCS}\//} -I. \
-		-I${LLVM_SRCS}/../../lib/clang/include \
-		-DLLVM_ON_UNIX -DLLVM_ON_FREEBSD \
-		-D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS #-DNDEBUG
-
-.if ${MK_CLANG_FULL} != "no"
-CFLAGS+=	-DCLANG_ENABLE_ARCMT \
-		-DCLANG_ENABLE_STATIC_ANALYZER
-.endif # MK_CLANG_FULL
-
-# LLVM is not strict aliasing safe as of 12/31/2011
-CFLAGS+=	-fno-strict-aliasing
-
-TARGET_ARCH?=	${MACHINE_ARCH}
-BUILD_ARCH?=	${MACHINE_ARCH}
-
-# Armv6 uses hard float abi, unless the CPUTYPE has soft in it.
-# arm (for armv4 and armv5 CPUs) always uses the soft float ABI.
-# For all other targets, we stick with 'unknown'.
-.if ${TARGET_ARCH:Marmv6*} && (!defined(CPUTYPE) || ${CPUTYPE:M*soft*} == "")
-TARGET_ABI=	gnueabihf
-.elif ${TARGET_ARCH:Marm*}
-TARGET_ABI=	gnueabi
-.else
-TARGET_ABI=	unknown
+.ifndef LLVM_SRCS
+.error Please define LLVM_SRCS before including this file
 .endif
 
-TARGET_TRIPLE?=	${TARGET_ARCH:C/amd64/x86_64/:C/arm64/aarch64/}-${TARGET_ABI}-freebsd12.0
-BUILD_TRIPLE?=	${BUILD_ARCH:C/amd64/x86_64/:C/arm64/aarch64/}-unknown-freebsd12.0
-CFLAGS+=	-DLLVM_DEFAULT_TARGET_TRIPLE=\"${TARGET_TRIPLE}\" \
-		-DLLVM_HOST_TRIPLE=\"${BUILD_TRIPLE}\" \
-		-DDEFAULT_SYSROOT=\"${TOOLS_PREFIX}\"
-CXXFLAGS+=	-std=c++11 -fno-exceptions -fno-rtti
-CXXFLAGS.clang+= -stdlib=libc++
-
-.PATH:	${LLVM_SRCS}/${SRCDIR}
-
-LLVM_TBLGEN?=	llvm-tblgen
-CLANG_TBLGEN?=	clang-tblgen
-
-Attributes.inc.h: ${LLVM_SRCS}/include/llvm/IR/Attributes.td
-	${LLVM_TBLGEN} -gen-attrs \
-	    -I ${LLVM_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
-	    ${LLVM_SRCS}/include/llvm/IR/Attributes.td
-
-AttributesCompatFunc.inc.h: ${LLVM_SRCS}/lib/IR/AttributesCompatFunc.td
-	${LLVM_TBLGEN} -gen-attrs \
-	    -I ${LLVM_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
-	    ${LLVM_SRCS}/lib/IR/AttributesCompatFunc.td
-
-Intrinsics.inc.h: ${LLVM_SRCS}/include/llvm/IR/Intrinsics.td
-	${LLVM_TBLGEN} -gen-intrinsic \
-	    -I ${LLVM_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
-	    ${LLVM_SRCS}/include/llvm/IR/Intrinsics.td
-
-.for arch in \
-	AArch64/AArch64 ARM/ARM Mips/Mips PowerPC/PPC Sparc/Sparc X86/X86
-. for hdr in \
-	AsmMatcher/-gen-asm-matcher \
-	AsmWriter1/-gen-asm-writer,-asmwriternum=1 \
-	AsmWriter/-gen-asm-writer \
-	CallingConv/-gen-callingconv \
-	CodeEmitter/-gen-emitter \
-	DAGISel/-gen-dag-isel \
-	DisassemblerTables/-gen-disassembler \
-	FastISel/-gen-fast-isel \
-	InstrInfo/-gen-instr-info \
-	MCCodeEmitter/-gen-emitter \
-	MCPseudoLowering/-gen-pseudo-lowering \
-	RegisterInfo/-gen-register-info \
-	SubtargetInfo/-gen-subtarget \
-	SystemOperands/-gen-searchable-tables
-${arch:T}Gen${hdr:H:C/$/.inc.h/}: ${LLVM_SRCS}/lib/Target/${arch:H}/${arch:T}.td
-	${LLVM_TBLGEN} ${hdr:T:C/,/ /g} \
-	    -I ${LLVM_SRCS}/include -I ${LLVM_SRCS}/lib/Target/${arch:H} \
-	    -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
-	    ${LLVM_SRCS}/lib/Target/${arch:H}/${arch:T}.td
-. endfor
-.endfor
-
-Attrs.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
-	${CLANG_TBLGEN} -gen-clang-attr-classes \
-	    -I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
-	    ${CLANG_SRCS}/include/clang/Basic/Attr.td
-
-AttrDump.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
-	${CLANG_TBLGEN} -gen-clang-attr-dump \
-	    -I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
-	    ${CLANG_SRCS}/include/clang/Basic/Attr.td
-
-AttrHasAttributeImpl.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
-	${CLANG_TBLGEN} -gen-clang-attr-has-attribute-impl \
-	    -I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
-	    ${CLANG_SRCS}/include/clang/Basic/Attr.td
-
-AttrImpl.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
-	${CLANG_TBLGEN} -gen-clang-attr-impl \
-	    -I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
-	    ${CLANG_SRCS}/include/clang/Basic/Attr.td
-
-AttrList.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
-	${CLANG_TBLGEN} -gen-clang-attr-list \
-	    -I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
-	    ${CLANG_SRCS}/include/clang/Basic/Attr.td
-
-AttrParsedAttrImpl.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
-	${CLANG_TBLGEN} -gen-clang-attr-parsed-attr-impl \
-	    -I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
-	    ${CLANG_SRCS}/include/clang/Basic/Attr.td
-
-AttrParsedAttrKinds.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
-	${CLANG_TBLGEN} -gen-clang-attr-parsed-attr-kinds \
-	    -I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
-	    ${CLANG_SRCS}/include/clang/Basic/Attr.td
-
-AttrParsedAttrList.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
-	${CLANG_TBLGEN} -gen-clang-attr-parsed-attr-list \
-	    -I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
-	    ${CLANG_SRCS}/include/clang/Basic/Attr.td
-
-AttrParserStringSwitches.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
-	${CLANG_TBLGEN} -gen-clang-attr-parser-string-switches \
-	    -I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
-	    ${CLANG_SRCS}/include/clang/Basic/Attr.td
-
-AttrPCHRead.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
-	${CLANG_TBLGEN} -gen-clang-attr-pch-read \
-	    -I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
-	    ${CLANG_SRCS}/include/clang/Basic/Attr.td
-
-AttrPCHWrite.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
-	${CLANG_TBLGEN} -gen-clang-attr-pch-write \
-	    -I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
-	    ${CLANG_SRCS}/include/clang/Basic/Attr.td
-
-AttrSpellingListIndex.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
-	${CLANG_TBLGEN} -gen-clang-attr-spelling-index \
-	    -I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
-	    ${CLANG_SRCS}/include/clang/Basic/Attr.td
-
-AttrTemplateInstantiate.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
-	${CLANG_TBLGEN} -gen-clang-attr-template-instantiate \
-	    -I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
-	    ${CLANG_SRCS}/include/clang/Basic/Attr.td
-
-AttrVisitor.inc.h: ${CLANG_SRCS}/include/clang/Basic/Attr.td
-	${CLANG_TBLGEN} -gen-clang-attr-ast-visitor \
-	    -I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
-	    ${CLANG_SRCS}/include/clang/Basic/Attr.td
-
-CommentCommandInfo.inc.h: ${CLANG_SRCS}/include/clang/AST/CommentCommands.td
-	${CLANG_TBLGEN} -gen-clang-comment-command-info \
-	    -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
-	    ${CLANG_SRCS}/include/clang/AST/CommentCommands.td
-
-CommentCommandList.inc.h: ${CLANG_SRCS}/include/clang/AST/CommentCommands.td
-	${CLANG_TBLGEN} -gen-clang-comment-command-list \
-	    -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
-	    ${CLANG_SRCS}/include/clang/AST/CommentCommands.td
-
-CommentHTMLNamedCharacterReferences.inc.h: \
-	${CLANG_SRCS}/include/clang/AST/CommentHTMLNamedCharacterReferences.td
-	${CLANG_TBLGEN} -gen-clang-comment-html-named-character-references \
-	    -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
-	    ${CLANG_SRCS}/include/clang/AST/CommentHTMLNamedCharacterReferences.td
-
-CommentHTMLTags.inc.h: ${CLANG_SRCS}/include/clang/AST/CommentHTMLTags.td
-	${CLANG_TBLGEN} -gen-clang-comment-html-tags \
-	    -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
-	    ${CLANG_SRCS}/include/clang/AST/CommentHTMLTags.td
-
-CommentHTMLTagsProperties.inc.h: \
-	${CLANG_SRCS}/include/clang/AST/CommentHTMLTags.td
-	${CLANG_TBLGEN} -gen-clang-comment-html-tags-properties \
-	    -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
-	    ${CLANG_SRCS}/include/clang/AST/CommentHTMLTags.td
-
-CommentNodes.inc.h: ${CLANG_SRCS}/include/clang/Basic/CommentNodes.td
-	${CLANG_TBLGEN} -gen-clang-comment-nodes \
-	    -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
-	    ${CLANG_SRCS}/include/clang/Basic/CommentNodes.td
-
-DeclNodes.inc.h: ${CLANG_SRCS}/include/clang/Basic/DeclNodes.td
-	${CLANG_TBLGEN} -gen-clang-decl-nodes \
-	    -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
-	    ${CLANG_SRCS}/include/clang/Basic/DeclNodes.td
-
-StmtNodes.inc.h: ${CLANG_SRCS}/include/clang/Basic/StmtNodes.td
-	${CLANG_TBLGEN} -gen-clang-stmt-nodes \
-	    -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
-	    ${CLANG_SRCS}/include/clang/Basic/StmtNodes.td
-
-arm_neon.h: ${CLANG_SRCS}/include/clang/Basic/arm_neon.td
-	${CLANG_TBLGEN} -gen-arm-neon \
-	    -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
-	    ${CLANG_SRCS}/include/clang/Basic/arm_neon.td
-
-arm_neon.inc.h: ${CLANG_SRCS}/include/clang/Basic/arm_neon.td
-	${CLANG_TBLGEN} -gen-arm-neon-sema \
-	    -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
-	    ${CLANG_SRCS}/include/clang/Basic/arm_neon.td
-
-DiagnosticGroups.inc.h: ${CLANG_SRCS}/include/clang/Basic/Diagnostic.td
-	${CLANG_TBLGEN} -gen-clang-diag-groups \
-	    -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/\.h$/.d/} \
-	    -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/Diagnostic.td
-
-DiagnosticIndexName.inc.h: ${CLANG_SRCS}/include/clang/Basic/Diagnostic.td
-	${CLANG_TBLGEN} -gen-clang-diags-index-name \
-	    -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/\.h$/.d/} \
-	    -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/Diagnostic.td
-
-.for hdr in AST Analysis Comment Common Driver Frontend Lex Parse Sema Serialization
-Diagnostic${hdr}Kinds.inc.h: ${CLANG_SRCS}/include/clang/Basic/Diagnostic.td
-	${CLANG_TBLGEN} -gen-clang-diags-defs -clang-component=${hdr} \
-	    -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/\.h$/.d/} \
-	    -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/Diagnostic.td
-.endfor
+.ifndef CLANG_SRCS
+.error Please define CLANG_SRCS before including this file
+.endif
 
-# XXX: Atrocious hack, need to clean this up later
-.if ${LIB:U} == llvmlibdriver
-Options.inc.h: ${LLVM_SRCS}/lib/LibDriver/Options.td
-	${LLVM_TBLGEN} -gen-opt-parser-defs \
-	    -I ${LLVM_SRCS}/include \
-	    -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
-	    ${LLVM_SRCS}/lib/LibDriver/Options.td
-.elif ${LIB:U} == clangdriver || ${LIB:U} == clangfrontend || \
-    ${LIB:U} == clangfrontendtool || ${PROG_CXX:U} == clang
-Options.inc.h: ${CLANG_SRCS}/include/clang/Driver/Options.td
-	${LLVM_TBLGEN} -gen-opt-parser-defs \
-	    -I ${LLVM_SRCS}/include -I ${CLANG_SRCS}/include/clang/Driver \
-	    -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
-	    ${CLANG_SRCS}/include/clang/Driver/Options.td
+.ifndef SRCDIR
+.error Please define SRCDIR before including this file
 .endif
 
-Checkers.inc.h: ${CLANG_SRCS}/include/clang/StaticAnalyzer/Checkers/Checkers.td
-	${CLANG_TBLGEN} -gen-clang-sa-checkers \
-	    -I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
-	    ${CLANG_SRCS}/include/clang/StaticAnalyzer/Checkers/Checkers.td
+CFLAGS+=	-I${CLANG_SRCS}/include
 
-.for dep in ${TGHDRS:C/$/.inc.d/}
-. if ${MAKE_VERSION} < 20160220
-.  if !make(depend)
-.   sinclude "${dep}"
-.  endif
-. else
-.   dinclude "${dep}"
-. endif
-.endfor
+.if ${MK_CLANG_FULL} != "no"
+CFLAGS+=	-DCLANG_ENABLE_ARCMT
+CFLAGS+=	-DCLANG_ENABLE_STATIC_ANALYZER
+.endif
 
-SRCS+=		${TGHDRS:C/$/.inc.h/}
-CLEANFILES+=	${TGHDRS:C/$/.inc.h/} ${TGHDRS:C/$/.inc.d/}
+.include "llvm.build.mk"
diff --git a/lib/clang/clang.lib.mk b/lib/clang/clang.lib.mk
deleted file mode 100644
index ab3551e2d4f7..000000000000
--- a/lib/clang/clang.lib.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# $FreeBSD$
-
-LLVM_SRCS= ${.CURDIR}/../../../contrib/llvm
-
-.include "clang.build.mk"
-
-INTERNALLIB=
-
-.if ${MACHINE_CPUARCH} == "arm"
-STATIC_CXXFLAGS+= -mlong-calls
-.endif
-
-.include <bsd.lib.mk>
diff --git a/lib/clang/headers/Makefile b/lib/clang/headers/Makefile
new file mode 100644
index 000000000000..100a27793487
--- /dev/null
+++ b/lib/clang/headers/Makefile
@@ -0,0 +1,91 @@
+# $FreeBSD$
+
+.include "../clang.pre.mk"
+
+.PATH:		${CLANG_SRCS}/lib/Headers
+
+INCSDIR=	${LIBDIR}/clang/3.9.0/include
+
+GENINCS+=	arm_neon.h
+
+INCS+=		__clang_cuda_cmath.h
+INCS+=		__clang_cuda_intrinsics.h
+INCS+=		__clang_cuda_math_forward_declares.h
+INCS+=		__clang_cuda_runtime_wrapper.h
+INCS+=		__stddef_max_align_t.h
+INCS+=		__wmmintrin_aes.h
+INCS+=		__wmmintrin_pclmul.h
+INCS+=		adxintrin.h
+INCS+=		altivec.h
+INCS+=		ammintrin.h
+INCS+=		arm_acle.h
+INCS+=		avx2intrin.h
+INCS+=		avx512bwintrin.h
+INCS+=		avx512cdintrin.h
+INCS+=		avx512dqintrin.h
+INCS+=		avx512erintrin.h
+INCS+=		avx512fintrin.h
+INCS+=		avx512ifmaintrin.h
+INCS+=		avx512ifmavlintrin.h
+INCS+=		avx512pfintrin.h
+INCS+=		avx512vbmiintrin.h
+INCS+=		avx512vbmivlintrin.h
+INCS+=		avx512vlbwintrin.h
+INCS+=		avx512vlcdintrin.h
+INCS+=		avx512vldqintrin.h
+INCS+=		avx512vlintrin.h
+INCS+=		avxintrin.h
+INCS+=		bmi2intrin.h
+INCS+=		bmiintrin.h
+INCS+=		clflushoptintrin.h
+INCS+=		cpuid.h
+INCS+=		cuda_builtin_vars.h
+INCS+=		emmintrin.h
+INCS+=		f16cintrin.h
+INCS+=		fma4intrin.h
+INCS+=		fmaintrin.h
+INCS+=		fxsrintrin.h
+INCS+=		htmintrin.h
+INCS+=		htmxlintrin.h
+INCS+=		ia32intrin.h
+INCS+=		immintrin.h
+INCS+=		lzcntintrin.h
+INCS+=		mm3dnow.h
+INCS+=		mm_malloc.h
+INCS+=		mmintrin.h
+INCS+=		module.modulemap
+INCS+=		mwaitxintrin.h
+INCS+=		nmmintrin.h
+INCS+=		opencl-c.h
+INCS+=		pkuintrin.h
+INCS+=		pmmintrin.h
+INCS+=		popcntintrin.h
+INCS+=		prfchwintrin.h
+INCS+=		rdseedintrin.h
+INCS+=		rtmintrin.h
+INCS+=		s390intrin.h
+INCS+=		shaintrin.h
+INCS+=		smmintrin.h
+INCS+=		tbmintrin.h
+INCS+=		tmmintrin.h
+INCS+=		vadefs.h
+INCS+=		vecintrin.h
+INCS+=		wmmintrin.h
+INCS+=		x86intrin.h
+INCS+=		xmmintrin.h
+INCS+=		xopintrin.h
+INCS+=		xsavecintrin.h
+INCS+=		xsaveintrin.h
+INCS+=		xsaveoptintrin.h
+INCS+=		xsavesintrin.h
+INCS+=		xtestintrin.h
+INCS+=		${GENINCS}
+
+arm_neon.h: ${CLANG_SRCS}/include/clang/Basic/arm_neon.td
+	${CLANG_TBLGEN} -gen-arm-neon \
+	    -d ${.TARGET:C/$/.d/} -o ${.TARGET} \
+	    ${CLANG_SRCS}/include/clang/Basic/arm_neon.td
+
+CLEANFILES=	${GENINCS} ${GENINCS:C/$/.d/}
+
+.include <bsd.prog.mk>
diff --git a/lib/clang/include/AArch64GenAsmMatcher.inc b/lib/clang/include/AArch64GenAsmMatcher.inc
deleted file mode 100644
index 0b1e0a9b8ffa..000000000000
--- a/lib/clang/include/AArch64GenAsmMatcher.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "AArch64GenAsmMatcher.inc.h"
diff --git a/lib/clang/include/AArch64GenAsmWriter.inc b/lib/clang/include/AArch64GenAsmWriter.inc
deleted file mode 100644
index 20b130b203bb..000000000000
--- a/lib/clang/include/AArch64GenAsmWriter.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "AArch64GenAsmWriter.inc.h"
diff --git a/lib/clang/include/AArch64GenAsmWriter1.inc b/lib/clang/include/AArch64GenAsmWriter1.inc
deleted file mode 100644
index caf7812fed38..000000000000
--- a/lib/clang/include/AArch64GenAsmWriter1.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "AArch64GenAsmWriter1.inc.h"
diff --git a/lib/clang/include/AArch64GenCallingConv.inc b/lib/clang/include/AArch64GenCallingConv.inc
deleted file mode 100644
index 75bfa38224f8..000000000000
--- a/lib/clang/include/AArch64GenCallingConv.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "AArch64GenCallingConv.inc.h"
diff --git a/lib/clang/include/AArch64GenDAGISel.inc b/lib/clang/include/AArch64GenDAGISel.inc
deleted file mode 100644
index 39bb08455767..000000000000
--- a/lib/clang/include/AArch64GenDAGISel.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "AArch64GenDAGISel.inc.h"
diff --git a/lib/clang/include/AArch64GenDisassemblerTables.inc b/lib/clang/include/AArch64GenDisassemblerTables.inc
deleted file mode 100644
index 3b2633601979..000000000000
--- a/lib/clang/include/AArch64GenDisassemblerTables.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "AArch64GenDisassemblerTables.inc.h"
diff --git a/lib/clang/include/AArch64GenFastISel.inc b/lib/clang/include/AArch64GenFastISel.inc
deleted file mode 100644
index ebc2ad2d14b8..000000000000
--- a/lib/clang/include/AArch64GenFastISel.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "AArch64GenFastISel.inc.h"
diff --git a/lib/clang/include/AArch64GenInstrInfo.inc b/lib/clang/include/AArch64GenInstrInfo.inc
deleted file mode 100644
index 12e60a92ab24..000000000000
--- a/lib/clang/include/AArch64GenInstrInfo.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "AArch64GenInstrInfo.inc.h"
diff --git a/lib/clang/include/AArch64GenMCCodeEmitter.inc b/lib/clang/include/AArch64GenMCCodeEmitter.inc
deleted file mode 100644
index e3515f5cda49..000000000000
--- a/lib/clang/include/AArch64GenMCCodeEmitter.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "AArch64GenMCCodeEmitter.inc.h"
diff --git a/lib/clang/include/AArch64GenMCPseudoLowering.inc b/lib/clang/include/AArch64GenMCPseudoLowering.inc
deleted file mode 100644
index 93f3f3a20a2b..000000000000
--- a/lib/clang/include/AArch64GenMCPseudoLowering.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "AArch64GenMCPseudoLowering.inc.h"
diff --git a/lib/clang/include/AArch64GenRegisterInfo.inc b/lib/clang/include/AArch64GenRegisterInfo.inc
deleted file mode 100644
index a6a9647a14cf..000000000000
--- a/lib/clang/include/AArch64GenRegisterInfo.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "AArch64GenRegisterInfo.inc.h"
diff --git a/lib/clang/include/AArch64GenSubtargetInfo.inc b/lib/clang/include/AArch64GenSubtargetInfo.inc
deleted file mode 100644
index 8674332a2012..000000000000
--- a/lib/clang/include/AArch64GenSubtargetInfo.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "AArch64GenSubtargetInfo.inc.h"
diff --git a/lib/clang/include/AArch64GenSystemOperands.inc b/lib/clang/include/AArch64GenSystemOperands.inc
deleted file mode 100644
index a43602f34f55..000000000000
--- a/lib/clang/include/AArch64GenSystemOperands.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "AArch64GenSystemOperands.inc.h"
diff --git a/lib/clang/include/ARMGenAsmMatcher.inc b/lib/clang/include/ARMGenAsmMatcher.inc
deleted file mode 100644
index e48285d1ea13..000000000000
--- a/lib/clang/include/ARMGenAsmMatcher.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "ARMGenAsmMatcher.inc.h"
diff --git a/lib/clang/include/ARMGenAsmWriter.inc b/lib/clang/include/ARMGenAsmWriter.inc
deleted file mode 100644
index 896beddacb7f..000000000000
--- a/lib/clang/include/ARMGenAsmWriter.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "ARMGenAsmWriter.inc.h"
diff --git a/lib/clang/include/ARMGenCallingConv.inc b/lib/clang/include/ARMGenCallingConv.inc
deleted file mode 100644
index f7d850a21522..000000000000
--- a/lib/clang/include/ARMGenCallingConv.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "ARMGenCallingConv.inc.h"
diff --git a/lib/clang/include/ARMGenCodeEmitter.inc b/lib/clang/include/ARMGenCodeEmitter.inc
deleted file mode 100644
index 083a6c33f2e4..000000000000
--- a/lib/clang/include/ARMGenCodeEmitter.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "ARMGenCodeEmitter.inc.h"
diff --git a/lib/clang/include/ARMGenDAGISel.inc b/lib/clang/include/ARMGenDAGISel.inc
deleted file mode 100644
index 6ad15b1d88be..000000000000
--- a/lib/clang/include/ARMGenDAGISel.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "ARMGenDAGISel.inc.h"
diff --git a/lib/clang/include/ARMGenDisassemblerTables.inc b/lib/clang/include/ARMGenDisassemblerTables.inc
deleted file mode 100644
index 7ea91ee1149d..000000000000
--- a/lib/clang/include/ARMGenDisassemblerTables.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "ARMGenDisassemblerTables.inc.h"
diff --git a/lib/clang/include/ARMGenFastISel.inc b/lib/clang/include/ARMGenFastISel.inc
deleted file mode 100644
index 261ed9a6d523..000000000000
--- a/lib/clang/include/ARMGenFastISel.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "ARMGenFastISel.inc.h"
diff --git a/lib/clang/include/ARMGenInstrInfo.inc b/lib/clang/include/ARMGenInstrInfo.inc
deleted file mode 100644
index 29c26edca0ec..000000000000
--- a/lib/clang/include/ARMGenInstrInfo.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "ARMGenInstrInfo.inc.h"
diff --git a/lib/clang/include/ARMGenMCCodeEmitter.inc b/lib/clang/include/ARMGenMCCodeEmitter.inc
deleted file mode 100644
index 82933f01c588..000000000000
--- a/lib/clang/include/ARMGenMCCodeEmitter.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "ARMGenMCCodeEmitter.inc.h"
diff --git a/lib/clang/include/ARMGenMCPseudoLowering.inc b/lib/clang/include/ARMGenMCPseudoLowering.inc
deleted file mode 100644
index aa3b617f32cf..000000000000
--- a/lib/clang/include/ARMGenMCPseudoLowering.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "ARMGenMCPseudoLowering.inc.h"
diff --git a/lib/clang/include/ARMGenRegisterInfo.inc b/lib/clang/include/ARMGenRegisterInfo.inc
deleted file mode 100644
index aa40e1829381..000000000000
--- a/lib/clang/include/ARMGenRegisterInfo.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "ARMGenRegisterInfo.inc.h"
diff --git a/lib/clang/include/ARMGenSubtargetInfo.inc b/lib/clang/include/ARMGenSubtargetInfo.inc
deleted file mode 100644
index 6579d9fea1f1..000000000000
--- a/lib/clang/include/ARMGenSubtargetInfo.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "ARMGenSubtargetInfo.inc.h"
diff --git a/lib/clang/include/AttributesCompatFunc.inc b/lib/clang/include/AttributesCompatFunc.inc
deleted file mode 100644
index 7f4e777481c7..000000000000
--- a/lib/clang/include/AttributesCompatFunc.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "AttributesCompatFunc.inc.h"
diff --git a/lib/clang/include/Makefile b/lib/clang/include/Makefile
deleted file mode 100644
index 179293155b3b..000000000000
--- a/lib/clang/include/Makefile
+++ /dev/null
@@ -1,88 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LLVM_SRCS= ${.CURDIR}/../../../contrib/llvm
-
-.include "../clang.build.mk"
-
-.PATH: ${LLVM_SRCS}/tools/clang/lib/Headers
-
-INCSDIR=${LIBDIR}/clang/3.9.0/include
-
-INCS=	__clang_cuda_cmath.h \
-	__clang_cuda_intrinsics.h \
-	__clang_cuda_math_forward_declares.h \
-	__clang_cuda_runtime_wrapper.h \
-	__stddef_max_align_t.h \
-	__wmmintrin_aes.h \
-	__wmmintrin_pclmul.h \
-	adxintrin.h \
-	altivec.h \
-	ammintrin.h \
-	arm_acle.h \
-	avx2intrin.h \
-	avx512bwintrin.h \
-	avx512cdintrin.h \
-	avx512dqintrin.h \
-	avx512erintrin.h \
-	avx512fintrin.h \
-	avx512ifmaintrin.h \
-	avx512ifmavlintrin.h \
-	avx512pfintrin.h \
-	avx512vbmiintrin.h \
-	avx512vbmivlintrin.h \
-	avx512vlbwintrin.h \
-	avx512vlcdintrin.h \
-	avx512vldqintrin.h \
-	avx512vlintrin.h \
-	avxintrin.h \
-	bmi2intrin.h \
-	bmiintrin.h \
-	clflushoptintrin.h \
-	cpuid.h \
-	cuda_builtin_vars.h \
-	emmintrin.h \
-	f16cintrin.h \
-	fma4intrin.h \
-	fmaintrin.h \
-	fxsrintrin.h \
-	htmintrin.h \
-	htmxlintrin.h \
-	ia32intrin.h \
-	immintrin.h \
-	lzcntintrin.h \
-	mm3dnow.h \
-	mm_malloc.h \
-	mmintrin.h \
-	module.modulemap \
-	mwaitxintrin.h \
-	nmmintrin.h \
-	opencl-c.h \
-	pkuintrin.h \
-	pmmintrin.h \
-	popcntintrin.h \
-	prfchwintrin.h \
-	rdseedintrin.h \
-	rtmintrin.h \
-	s390intrin.h \
-	shaintrin.h \
-	smmintrin.h \
-	tbmintrin.h \
-	tmmintrin.h \
-	vadefs.h \
-	vecintrin.h \
-	wmmintrin.h \
-	x86intrin.h \
-	xmmintrin.h \
-	xopintrin.h \
-	xsavecintrin.h \
-	xsaveintrin.h \
-	xsaveoptintrin.h \
-	xsavesintrin.h \
-	xtestintrin.h \
-	${GENINCS}
-GENINCS= arm_neon.h
-CLEANFILES= ${GENINCS} ${GENINCS:C/\.h$/.d/}
-
-.include <bsd.prog.mk>
diff --git a/lib/clang/include/Makefile.depend b/lib/clang/include/Makefile.depend
deleted file mode 100644
index 47d4983b0033..000000000000
--- a/lib/clang/include/Makefile.depend
+++ /dev/null
@@ -1,12 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	usr.bin/clang/clang-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/include/MipsGenAsmMatcher.inc b/lib/clang/include/MipsGenAsmMatcher.inc
deleted file mode 100644
index b9e2fd13e430..000000000000
--- a/lib/clang/include/MipsGenAsmMatcher.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "MipsGenAsmMatcher.inc.h"
diff --git a/lib/clang/include/MipsGenAsmWriter.inc b/lib/clang/include/MipsGenAsmWriter.inc
deleted file mode 100644
index 1f512f133edb..000000000000
--- a/lib/clang/include/MipsGenAsmWriter.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "MipsGenAsmWriter.inc.h"
diff --git a/lib/clang/include/MipsGenCallingConv.inc b/lib/clang/include/MipsGenCallingConv.inc
deleted file mode 100644
index 6f6fee64c238..000000000000
--- a/lib/clang/include/MipsGenCallingConv.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "MipsGenCallingConv.inc.h"
diff --git a/lib/clang/include/MipsGenCodeEmitter.inc b/lib/clang/include/MipsGenCodeEmitter.inc
deleted file mode 100644
index 1e2223d962ef..000000000000
--- a/lib/clang/include/MipsGenCodeEmitter.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "MipsGenCodeEmitter.inc.h"
diff --git a/lib/clang/include/MipsGenDAGISel.inc b/lib/clang/include/MipsGenDAGISel.inc
deleted file mode 100644
index cb63943f72aa..000000000000
--- a/lib/clang/include/MipsGenDAGISel.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "MipsGenDAGISel.inc.h"
diff --git a/lib/clang/include/MipsGenDisassemblerTables.inc b/lib/clang/include/MipsGenDisassemblerTables.inc
deleted file mode 100644
index 1308e3321c91..000000000000
--- a/lib/clang/include/MipsGenDisassemblerTables.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "MipsGenDisassemblerTables.inc.h"
diff --git a/lib/clang/include/MipsGenFastISel.inc b/lib/clang/include/MipsGenFastISel.inc
deleted file mode 100644
index a2aaacf8a1aa..000000000000
--- a/lib/clang/include/MipsGenFastISel.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "MipsGenFastISel.inc.h"
diff --git a/lib/clang/include/MipsGenInstrInfo.inc b/lib/clang/include/MipsGenInstrInfo.inc
deleted file mode 100644
index ec570759e148..000000000000
--- a/lib/clang/include/MipsGenInstrInfo.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "MipsGenInstrInfo.inc.h"
diff --git a/lib/clang/include/MipsGenMCCodeEmitter.inc b/lib/clang/include/MipsGenMCCodeEmitter.inc
deleted file mode 100644
index 82cd41835e69..000000000000
--- a/lib/clang/include/MipsGenMCCodeEmitter.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "MipsGenMCCodeEmitter.inc.h"
diff --git a/lib/clang/include/MipsGenMCPseudoLowering.inc b/lib/clang/include/MipsGenMCPseudoLowering.inc
deleted file mode 100644
index 4e4cbbe8d285..000000000000
--- a/lib/clang/include/MipsGenMCPseudoLowering.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "MipsGenMCPseudoLowering.inc.h"
diff --git a/lib/clang/include/MipsGenRegisterInfo.inc b/lib/clang/include/MipsGenRegisterInfo.inc
deleted file mode 100644
index 95a7b7052b30..000000000000
--- a/lib/clang/include/MipsGenRegisterInfo.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "MipsGenRegisterInfo.inc.h"
diff --git a/lib/clang/include/MipsGenSubtargetInfo.inc b/lib/clang/include/MipsGenSubtargetInfo.inc
deleted file mode 100644
index 2c069f48572b..000000000000
--- a/lib/clang/include/MipsGenSubtargetInfo.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "MipsGenSubtargetInfo.inc.h"
diff --git a/lib/clang/include/PPCGenAsmMatcher.inc b/lib/clang/include/PPCGenAsmMatcher.inc
deleted file mode 100644
index 0538126d2773..000000000000
--- a/lib/clang/include/PPCGenAsmMatcher.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "PPCGenAsmMatcher.inc.h"
diff --git a/lib/clang/include/PPCGenAsmWriter.inc b/lib/clang/include/PPCGenAsmWriter.inc
deleted file mode 100644
index e31e77795255..000000000000
--- a/lib/clang/include/PPCGenAsmWriter.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "PPCGenAsmWriter.inc.h"
diff --git a/lib/clang/include/PPCGenCallingConv.inc b/lib/clang/include/PPCGenCallingConv.inc
deleted file mode 100644
index 6f2864052f95..000000000000
--- a/lib/clang/include/PPCGenCallingConv.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "PPCGenCallingConv.inc.h"
diff --git a/lib/clang/include/PPCGenCodeEmitter.inc b/lib/clang/include/PPCGenCodeEmitter.inc
deleted file mode 100644
index 525c853a4dec..000000000000
--- a/lib/clang/include/PPCGenCodeEmitter.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "PPCGenCodeEmitter.inc.h"
diff --git a/lib/clang/include/PPCGenDAGISel.inc b/lib/clang/include/PPCGenDAGISel.inc
deleted file mode 100644
index b783e1144381..000000000000
--- a/lib/clang/include/PPCGenDAGISel.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "PPCGenDAGISel.inc.h"
diff --git a/lib/clang/include/PPCGenDisassemblerTables.inc b/lib/clang/include/PPCGenDisassemblerTables.inc
deleted file mode 100644
index c581dbee1c7c..000000000000
--- a/lib/clang/include/PPCGenDisassemblerTables.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "PPCGenDisassemblerTables.inc.h"
diff --git a/lib/clang/include/PPCGenFastISel.inc b/lib/clang/include/PPCGenFastISel.inc
deleted file mode 100644
index fec1988571ae..000000000000
--- a/lib/clang/include/PPCGenFastISel.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "PPCGenFastISel.inc.h"
diff --git a/lib/clang/include/PPCGenInstrInfo.inc b/lib/clang/include/PPCGenInstrInfo.inc
deleted file mode 100644
index 80a11d58c95b..000000000000
--- a/lib/clang/include/PPCGenInstrInfo.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "PPCGenInstrInfo.inc.h"
diff --git a/lib/clang/include/PPCGenMCCodeEmitter.inc b/lib/clang/include/PPCGenMCCodeEmitter.inc
deleted file mode 100644
index 7bd37ce85f72..000000000000
--- a/lib/clang/include/PPCGenMCCodeEmitter.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "PPCGenMCCodeEmitter.inc.h"
diff --git a/lib/clang/include/PPCGenRegisterInfo.inc b/lib/clang/include/PPCGenRegisterInfo.inc
deleted file mode 100644
index 9e26cb14e11e..000000000000
--- a/lib/clang/include/PPCGenRegisterInfo.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "PPCGenRegisterInfo.inc.h"
diff --git a/lib/clang/include/PPCGenSubtargetInfo.inc b/lib/clang/include/PPCGenSubtargetInfo.inc
deleted file mode 100644
index a3486306e261..000000000000
--- a/lib/clang/include/PPCGenSubtargetInfo.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "PPCGenSubtargetInfo.inc.h"
diff --git a/lib/clang/include/SparcGenAsmMatcher.inc b/lib/clang/include/SparcGenAsmMatcher.inc
deleted file mode 100644
index 3522c591563d..000000000000
--- a/lib/clang/include/SparcGenAsmMatcher.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "SparcGenAsmMatcher.inc.h"
diff --git a/lib/clang/include/SparcGenAsmWriter.inc b/lib/clang/include/SparcGenAsmWriter.inc
deleted file mode 100644
index c5ae5dca39c9..000000000000
--- a/lib/clang/include/SparcGenAsmWriter.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "SparcGenAsmWriter.inc.h"
diff --git a/lib/clang/include/SparcGenCallingConv.inc b/lib/clang/include/SparcGenCallingConv.inc
deleted file mode 100644
index dde4d8f1fc47..000000000000
--- a/lib/clang/include/SparcGenCallingConv.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "SparcGenCallingConv.inc.h"
diff --git a/lib/clang/include/SparcGenCodeEmitter.inc b/lib/clang/include/SparcGenCodeEmitter.inc
deleted file mode 100644
index 0cd2fee44ebc..000000000000
--- a/lib/clang/include/SparcGenCodeEmitter.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "SparcGenCodeEmitter.inc.h"
diff --git a/lib/clang/include/SparcGenDAGISel.inc b/lib/clang/include/SparcGenDAGISel.inc
deleted file mode 100644
index d85ed6cf5567..000000000000
--- a/lib/clang/include/SparcGenDAGISel.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "SparcGenDAGISel.inc.h"
diff --git a/lib/clang/include/SparcGenDisassemblerTables.inc b/lib/clang/include/SparcGenDisassemblerTables.inc
deleted file mode 100644
index 0749ef28fcb4..000000000000
--- a/lib/clang/include/SparcGenDisassemblerTables.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "SparcGenDisassemblerTables.inc.h"
diff --git a/lib/clang/include/SparcGenInstrInfo.inc b/lib/clang/include/SparcGenInstrInfo.inc
deleted file mode 100644
index 81c8e0b39d14..000000000000
--- a/lib/clang/include/SparcGenInstrInfo.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "SparcGenInstrInfo.inc.h"
diff --git a/lib/clang/include/SparcGenMCCodeEmitter.inc b/lib/clang/include/SparcGenMCCodeEmitter.inc
deleted file mode 100644
index 1e6d6ef2aefa..000000000000
--- a/lib/clang/include/SparcGenMCCodeEmitter.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "SparcGenMCCodeEmitter.inc.h"
diff --git a/lib/clang/include/SparcGenRegisterInfo.inc b/lib/clang/include/SparcGenRegisterInfo.inc
deleted file mode 100644
index 0c3a91c0052c..000000000000
--- a/lib/clang/include/SparcGenRegisterInfo.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "SparcGenRegisterInfo.inc.h"
diff --git a/lib/clang/include/SparcGenSubtargetInfo.inc b/lib/clang/include/SparcGenSubtargetInfo.inc
deleted file mode 100644
index ac63a7256ab4..000000000000
--- a/lib/clang/include/SparcGenSubtargetInfo.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "SparcGenSubtargetInfo.inc.h"
diff --git a/lib/clang/include/X86GenAsmMatcher.inc b/lib/clang/include/X86GenAsmMatcher.inc
deleted file mode 100644
index 6ed8afd46f18..000000000000
--- a/lib/clang/include/X86GenAsmMatcher.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "X86GenAsmMatcher.inc.h"
diff --git a/lib/clang/include/X86GenAsmWriter.inc b/lib/clang/include/X86GenAsmWriter.inc
deleted file mode 100644
index 4879a0c9a1be..000000000000
--- a/lib/clang/include/X86GenAsmWriter.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "X86GenAsmWriter.inc.h"
diff --git a/lib/clang/include/X86GenAsmWriter1.inc b/lib/clang/include/X86GenAsmWriter1.inc
deleted file mode 100644
index 03f88b8bdcb4..000000000000
--- a/lib/clang/include/X86GenAsmWriter1.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "X86GenAsmWriter1.inc.h"
diff --git a/lib/clang/include/X86GenCallingConv.inc b/lib/clang/include/X86GenCallingConv.inc
deleted file mode 100644
index dce5266c39f3..000000000000
--- a/lib/clang/include/X86GenCallingConv.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "X86GenCallingConv.inc.h"
diff --git a/lib/clang/include/X86GenDAGISel.inc b/lib/clang/include/X86GenDAGISel.inc
deleted file mode 100644
index 5a5ab941b50c..000000000000
--- a/lib/clang/include/X86GenDAGISel.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "X86GenDAGISel.inc.h"
diff --git a/lib/clang/include/X86GenDisassemblerTables.inc b/lib/clang/include/X86GenDisassemblerTables.inc
deleted file mode 100644
index 82218ef460a9..000000000000
--- a/lib/clang/include/X86GenDisassemblerTables.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "X86GenDisassemblerTables.inc.h"
diff --git a/lib/clang/include/X86GenFastISel.inc b/lib/clang/include/X86GenFastISel.inc
deleted file mode 100644
index 4074cf6800b7..000000000000
--- a/lib/clang/include/X86GenFastISel.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "X86GenFastISel.inc.h"
diff --git a/lib/clang/include/X86GenInstrInfo.inc b/lib/clang/include/X86GenInstrInfo.inc
deleted file mode 100644
index 6222825419f0..000000000000
--- a/lib/clang/include/X86GenInstrInfo.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "X86GenInstrInfo.inc.h"
diff --git a/lib/clang/include/X86GenRegisterInfo.inc b/lib/clang/include/X86GenRegisterInfo.inc
deleted file mode 100644
index 6d78e4135db2..000000000000
--- a/lib/clang/include/X86GenRegisterInfo.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "X86GenRegisterInfo.inc.h"
diff --git a/lib/clang/include/X86GenSubtargetInfo.inc b/lib/clang/include/X86GenSubtargetInfo.inc
deleted file mode 100644
index a64b3a481fda..000000000000
--- a/lib/clang/include/X86GenSubtargetInfo.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "X86GenSubtargetInfo.inc.h"
diff --git a/lib/clang/include/clang/AST/AttrDump.inc b/lib/clang/include/clang/AST/AttrDump.inc
deleted file mode 100644
index ca3c42ff6ba5..000000000000
--- a/lib/clang/include/clang/AST/AttrDump.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "AttrDump.inc.h"
diff --git a/lib/clang/include/clang/AST/AttrImpl.inc b/lib/clang/include/clang/AST/AttrImpl.inc
deleted file mode 100644
index b3efb1b88d75..000000000000
--- a/lib/clang/include/clang/AST/AttrImpl.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "AttrImpl.inc.h"
diff --git a/lib/clang/include/clang/AST/AttrVisitor.inc b/lib/clang/include/clang/AST/AttrVisitor.inc
deleted file mode 100644
index 8f8bdb0ec2ca..000000000000
--- a/lib/clang/include/clang/AST/AttrVisitor.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "AttrVisitor.inc.h"
diff --git a/lib/clang/include/clang/AST/Attrs.inc b/lib/clang/include/clang/AST/Attrs.inc
deleted file mode 100644
index 0eee10239b5b..000000000000
--- a/lib/clang/include/clang/AST/Attrs.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "Attrs.inc.h"
diff --git a/lib/clang/include/clang/AST/CommentCommandInfo.inc b/lib/clang/include/clang/AST/CommentCommandInfo.inc
deleted file mode 100644
index cd171900fc6d..000000000000
--- a/lib/clang/include/clang/AST/CommentCommandInfo.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "CommentCommandInfo.inc.h"
diff --git a/lib/clang/include/clang/AST/CommentCommandList.inc b/lib/clang/include/clang/AST/CommentCommandList.inc
deleted file mode 100644
index bc369059a832..000000000000
--- a/lib/clang/include/clang/AST/CommentCommandList.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "CommentCommandList.inc.h"
diff --git a/lib/clang/include/clang/AST/CommentHTMLNamedCharacterReferences.inc b/lib/clang/include/clang/AST/CommentHTMLNamedCharacterReferences.inc
deleted file mode 100644
index b4f11ca6d86b..000000000000
--- a/lib/clang/include/clang/AST/CommentHTMLNamedCharacterReferences.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "CommentHTMLNamedCharacterReferences.inc.h"
diff --git a/lib/clang/include/clang/AST/CommentHTMLTags.inc b/lib/clang/include/clang/AST/CommentHTMLTags.inc
deleted file mode 100644
index 0932f3249928..000000000000
--- a/lib/clang/include/clang/AST/CommentHTMLTags.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "CommentHTMLTags.inc.h"
diff --git a/lib/clang/include/clang/AST/CommentHTMLTagsProperties.inc b/lib/clang/include/clang/AST/CommentHTMLTagsProperties.inc
deleted file mode 100644
index 77af956f8193..000000000000
--- a/lib/clang/include/clang/AST/CommentHTMLTagsProperties.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "CommentHTMLTagsProperties.inc.h"
diff --git a/lib/clang/include/clang/AST/CommentNodes.inc b/lib/clang/include/clang/AST/CommentNodes.inc
deleted file mode 100644
index 1da614786fb8..000000000000
--- a/lib/clang/include/clang/AST/CommentNodes.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "CommentNodes.inc.h"
diff --git a/lib/clang/include/clang/AST/DeclNodes.inc b/lib/clang/include/clang/AST/DeclNodes.inc
deleted file mode 100644
index d5b9a90ac0b6..000000000000
--- a/lib/clang/include/clang/AST/DeclNodes.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "DeclNodes.inc.h"
diff --git a/lib/clang/include/clang/AST/StmtNodes.inc b/lib/clang/include/clang/AST/StmtNodes.inc
deleted file mode 100644
index cd35d7ad4859..000000000000
--- a/lib/clang/include/clang/AST/StmtNodes.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "StmtNodes.inc.h"
diff --git a/lib/clang/include/clang/Basic/AttrHasAttributeImpl.inc b/lib/clang/include/clang/Basic/AttrHasAttributeImpl.inc
deleted file mode 100644
index 0e996d2d29eb..000000000000
--- a/lib/clang/include/clang/Basic/AttrHasAttributeImpl.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "AttrHasAttributeImpl.inc.h"
diff --git a/lib/clang/include/clang/Basic/AttrList.inc b/lib/clang/include/clang/Basic/AttrList.inc
deleted file mode 100644
index 319eb5a68746..000000000000
--- a/lib/clang/include/clang/Basic/AttrList.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "AttrList.inc.h"
diff --git a/lib/clang/include/clang/Basic/DiagnosticASTKinds.inc b/lib/clang/include/clang/Basic/DiagnosticASTKinds.inc
deleted file mode 100644
index bc558c5921ca..000000000000
--- a/lib/clang/include/clang/Basic/DiagnosticASTKinds.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "DiagnosticASTKinds.inc.h"
diff --git a/lib/clang/include/clang/Basic/DiagnosticAnalysisKinds.inc b/lib/clang/include/clang/Basic/DiagnosticAnalysisKinds.inc
deleted file mode 100644
index 5472209b2151..000000000000
--- a/lib/clang/include/clang/Basic/DiagnosticAnalysisKinds.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "DiagnosticAnalysisKinds.inc.h"
diff --git a/lib/clang/include/clang/Basic/DiagnosticCommentKinds.inc b/lib/clang/include/clang/Basic/DiagnosticCommentKinds.inc
deleted file mode 100644
index 518c3b7ee29a..000000000000
--- a/lib/clang/include/clang/Basic/DiagnosticCommentKinds.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "DiagnosticCommentKinds.inc.h"
diff --git a/lib/clang/include/clang/Basic/DiagnosticCommonKinds.inc b/lib/clang/include/clang/Basic/DiagnosticCommonKinds.inc
deleted file mode 100644
index b2ac7a38e852..000000000000
--- a/lib/clang/include/clang/Basic/DiagnosticCommonKinds.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "DiagnosticCommonKinds.inc.h"
diff --git a/lib/clang/include/clang/Basic/DiagnosticDriverKinds.inc b/lib/clang/include/clang/Basic/DiagnosticDriverKinds.inc
deleted file mode 100644
index b719c10fe37f..000000000000
--- a/lib/clang/include/clang/Basic/DiagnosticDriverKinds.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "DiagnosticDriverKinds.inc.h"
diff --git a/lib/clang/include/clang/Basic/DiagnosticFrontendKinds.inc b/lib/clang/include/clang/Basic/DiagnosticFrontendKinds.inc
deleted file mode 100644
index 85dde9907244..000000000000
--- a/lib/clang/include/clang/Basic/DiagnosticFrontendKinds.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "DiagnosticFrontendKinds.inc.h"
diff --git a/lib/clang/include/clang/Basic/DiagnosticGroups.inc b/lib/clang/include/clang/Basic/DiagnosticGroups.inc
deleted file mode 100644
index 1c5fa1aeb812..000000000000
--- a/lib/clang/include/clang/Basic/DiagnosticGroups.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "DiagnosticGroups.inc.h"
diff --git a/lib/clang/include/clang/Basic/DiagnosticIndexName.inc b/lib/clang/include/clang/Basic/DiagnosticIndexName.inc
deleted file mode 100644
index 1baf975fcf30..000000000000
--- a/lib/clang/include/clang/Basic/DiagnosticIndexName.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "DiagnosticIndexName.inc.h"
diff --git a/lib/clang/include/clang/Basic/DiagnosticLexKinds.inc b/lib/clang/include/clang/Basic/DiagnosticLexKinds.inc
deleted file mode 100644
index 8a0e527f5e2e..000000000000
--- a/lib/clang/include/clang/Basic/DiagnosticLexKinds.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "DiagnosticLexKinds.inc.h"
diff --git a/lib/clang/include/clang/Basic/DiagnosticParseKinds.inc b/lib/clang/include/clang/Basic/DiagnosticParseKinds.inc
deleted file mode 100644
index 5a4948eab652..000000000000
--- a/lib/clang/include/clang/Basic/DiagnosticParseKinds.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "DiagnosticParseKinds.inc.h"
diff --git a/lib/clang/include/clang/Basic/DiagnosticSemaKinds.inc b/lib/clang/include/clang/Basic/DiagnosticSemaKinds.inc
deleted file mode 100644
index d08c7f100abb..000000000000
--- a/lib/clang/include/clang/Basic/DiagnosticSemaKinds.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "DiagnosticSemaKinds.inc.h"
diff --git a/lib/clang/include/clang/Basic/DiagnosticSerializationKinds.inc b/lib/clang/include/clang/Basic/DiagnosticSerializationKinds.inc
deleted file mode 100644
index f0d84f1ed3aa..000000000000
--- a/lib/clang/include/clang/Basic/DiagnosticSerializationKinds.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "DiagnosticSerializationKinds.inc.h"
diff --git a/lib/clang/include/clang/Basic/arm_neon.inc b/lib/clang/include/clang/Basic/arm_neon.inc
deleted file mode 100644
index 7b4c875e641f..000000000000
--- a/lib/clang/include/clang/Basic/arm_neon.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "arm_neon.inc.h"
diff --git a/lib/clang/include/clang/Driver/Options.inc b/lib/clang/include/clang/Driver/Options.inc
deleted file mode 100644
index 37422c14f3a4..000000000000
--- a/lib/clang/include/clang/Driver/Options.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "Options.inc.h"
diff --git a/lib/clang/include/clang/Parse/AttrParserStringSwitches.inc b/lib/clang/include/clang/Parse/AttrParserStringSwitches.inc
deleted file mode 100644
index ef8642c1af11..000000000000
--- a/lib/clang/include/clang/Parse/AttrParserStringSwitches.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "AttrParserStringSwitches.inc.h"
diff --git a/lib/clang/include/clang/Sema/AttrParsedAttrImpl.inc b/lib/clang/include/clang/Sema/AttrParsedAttrImpl.inc
deleted file mode 100644
index 9577856dae15..000000000000
--- a/lib/clang/include/clang/Sema/AttrParsedAttrImpl.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "AttrParsedAttrImpl.inc.h"
diff --git a/lib/clang/include/clang/Sema/AttrParsedAttrKinds.inc b/lib/clang/include/clang/Sema/AttrParsedAttrKinds.inc
deleted file mode 100644
index 77d009288a5d..000000000000
--- a/lib/clang/include/clang/Sema/AttrParsedAttrKinds.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "AttrParsedAttrKinds.inc.h"
diff --git a/lib/clang/include/clang/Sema/AttrParsedAttrList.inc b/lib/clang/include/clang/Sema/AttrParsedAttrList.inc
deleted file mode 100644
index b5aeac3af3e5..000000000000
--- a/lib/clang/include/clang/Sema/AttrParsedAttrList.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "AttrParsedAttrList.inc.h"
diff --git a/lib/clang/include/clang/Sema/AttrSpellingListIndex.inc b/lib/clang/include/clang/Sema/AttrSpellingListIndex.inc
deleted file mode 100644
index 229273cb5440..000000000000
--- a/lib/clang/include/clang/Sema/AttrSpellingListIndex.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "AttrSpellingListIndex.inc.h"
diff --git a/lib/clang/include/clang/Sema/AttrTemplateInstantiate.inc b/lib/clang/include/clang/Sema/AttrTemplateInstantiate.inc
deleted file mode 100644
index 88c3c1128625..000000000000
--- a/lib/clang/include/clang/Sema/AttrTemplateInstantiate.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "AttrTemplateInstantiate.inc.h"
diff --git a/lib/clang/include/clang/Serialization/AttrPCHRead.inc b/lib/clang/include/clang/Serialization/AttrPCHRead.inc
deleted file mode 100644
index 8fd4ad3ade7b..000000000000
--- a/lib/clang/include/clang/Serialization/AttrPCHRead.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "AttrPCHRead.inc.h"
diff --git a/lib/clang/include/clang/Serialization/AttrPCHWrite.inc b/lib/clang/include/clang/Serialization/AttrPCHWrite.inc
deleted file mode 100644
index 0fb802c07905..000000000000
--- a/lib/clang/include/clang/Serialization/AttrPCHWrite.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "AttrPCHWrite.inc.h"
diff --git a/lib/clang/include/clang/StaticAnalyzer/Checkers/Checkers.inc b/lib/clang/include/clang/StaticAnalyzer/Checkers/Checkers.inc
deleted file mode 100644
index d5b8138489a1..000000000000
--- a/lib/clang/include/clang/StaticAnalyzer/Checkers/Checkers.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "Checkers.inc.h"
diff --git a/lib/clang/include/llvm/IR/Attributes.inc b/lib/clang/include/llvm/IR/Attributes.inc
deleted file mode 100644
index dfe888ecf595..000000000000
--- a/lib/clang/include/llvm/IR/Attributes.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "Attributes.inc.h"
diff --git a/lib/clang/include/llvm/IR/Intrinsics.gen b/lib/clang/include/llvm/IR/Intrinsics.gen
deleted file mode 100644
index a3dbd63f1068..000000000000
--- a/lib/clang/include/llvm/IR/Intrinsics.gen
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "Intrinsics.inc.h"
diff --git a/lib/clang/libclang/Makefile b/lib/clang/libclang/Makefile
new file mode 100644
index 000000000000..5db2063e5c67
--- /dev/null
+++ b/lib/clang/libclang/Makefile
@@ -0,0 +1,725 @@
+# $FreeBSD$
+
+.include <src.opts.mk>
+.include "../clang.pre.mk"
+
+LIB=		clang
+
+CFLAGS+=	-I${.OBJDIR}
+CFLAGS+=	-I${.OBJDIR}/../../../lib/clang/libllvm
+
+# Ensure FREEBSD_CC_VERSION is defined for Basic/Targets.cpp
+CFLAGS.Targets.cpp+= -include ../freebsd_cc_version.h
+
+# Work around GCC bug 67888
+.if ${COMPILER_TYPE} == "gcc"
+CXXFLAGS.Module.cpp+= -fpermissive
+.endif
+
+SRCDIR=		tools/clang/lib
+
+SRCS_FUL+=	ARCMigrate/ARCMT.cpp
+SRCS_FUL+=	ARCMigrate/ARCMTActions.cpp
+SRCS_FUL+=	ARCMigrate/FileRemapper.cpp
+SRCS_FUL+=	ARCMigrate/ObjCMT.cpp
+SRCS_FUL+=	ARCMigrate/PlistReporter.cpp
+SRCS_FUL+=	ARCMigrate/TransAPIUses.cpp
+SRCS_FUL+=	ARCMigrate/TransARCAssign.cpp
+SRCS_FUL+=	ARCMigrate/TransAutoreleasePool.cpp
+SRCS_FUL+=	ARCMigrate/TransBlockObjCVariable.cpp
+SRCS_FUL+=	ARCMigrate/TransEmptyStatementsAndDealloc.cpp
+SRCS_FUL+=	ARCMigrate/TransGCAttrs.cpp
+SRCS_FUL+=	ARCMigrate/TransGCCalls.cpp
+SRCS_FUL+=	ARCMigrate/TransProperties.cpp
+SRCS_FUL+=	ARCMigrate/TransProtectedScope.cpp
+SRCS_FUL+=	ARCMigrate/TransRetainReleaseDealloc.cpp
+SRCS_FUL+=	ARCMigrate/TransUnbridgedCasts.cpp
+SRCS_FUL+=	ARCMigrate/TransUnusedInitDelegate.cpp
+SRCS_FUL+=	ARCMigrate/TransZeroOutPropsInDealloc.cpp
+SRCS_FUL+=	ARCMigrate/TransformActions.cpp
+SRCS_FUL+=	ARCMigrate/Transforms.cpp
+SRCS_MIN+=	AST/APValue.cpp
+SRCS_MIN+=	AST/ASTConsumer.cpp
+SRCS_MIN+=	AST/ASTContext.cpp
+SRCS_MIN+=	AST/ASTDiagnostic.cpp
+SRCS_MIN+=	AST/ASTDumper.cpp
+SRCS_MIN+=	AST/ASTImporter.cpp
+SRCS_MIN+=	AST/ASTTypeTraits.cpp
+SRCS_MIN+=	AST/AttrImpl.cpp
+SRCS_MIN+=	AST/CXXInheritance.cpp
+SRCS_MIN+=	AST/Comment.cpp
+SRCS_MIN+=	AST/CommentBriefParser.cpp
+SRCS_MIN+=	AST/CommentCommandTraits.cpp
+SRCS_MIN+=	AST/CommentLexer.cpp
+SRCS_MIN+=	AST/CommentParser.cpp
+SRCS_MIN+=	AST/CommentSema.cpp
+SRCS_MIN+=	AST/Decl.cpp
+SRCS_MIN+=	AST/DeclBase.cpp
+SRCS_MIN+=	AST/DeclCXX.cpp
+SRCS_MIN+=	AST/DeclFriend.cpp
+SRCS_MIN+=	AST/DeclGroup.cpp
+SRCS_MIN+=	AST/DeclObjC.cpp
+SRCS_MIN+=	AST/DeclOpenMP.cpp
+SRCS_MIN+=	AST/DeclPrinter.cpp
+SRCS_MIN+=	AST/DeclTemplate.cpp
+SRCS_MIN+=	AST/DeclarationName.cpp
+SRCS_MIN+=	AST/Expr.cpp
+SRCS_MIN+=	AST/ExprCXX.cpp
+SRCS_MIN+=	AST/ExprClassification.cpp
+SRCS_MIN+=	AST/ExprConstant.cpp
+SRCS_MIN+=	AST/ExprObjC.cpp
+SRCS_MIN+=	AST/ExternalASTSource.cpp
+SRCS_MIN+=	AST/InheritViz.cpp
+SRCS_MIN+=	AST/ItaniumCXXABI.cpp
+SRCS_MIN+=	AST/ItaniumMangle.cpp
+SRCS_MIN+=	AST/Mangle.cpp
+SRCS_MIN+=	AST/MicrosoftCXXABI.cpp
+SRCS_MIN+=	AST/MicrosoftMangle.cpp
+SRCS_MIN+=	AST/NSAPI.cpp
+SRCS_MIN+=	AST/NestedNameSpecifier.cpp
+SRCS_MIN+=	AST/OpenMPClause.cpp
+SRCS_MIN+=	AST/ParentMap.cpp
+SRCS_MIN+=	AST/RawCommentList.cpp
+SRCS_MIN+=	AST/RecordLayout.cpp
+SRCS_MIN+=	AST/RecordLayoutBuilder.cpp
+SRCS_MIN+=	AST/SelectorLocationsKind.cpp
+SRCS_MIN+=	AST/Stmt.cpp
+SRCS_MIN+=	AST/StmtCXX.cpp
+SRCS_MIN+=	AST/StmtIterator.cpp
+SRCS_MIN+=	AST/StmtObjC.cpp
+SRCS_MIN+=	AST/StmtOpenMP.cpp
+SRCS_MIN+=	AST/StmtPrinter.cpp
+SRCS_MIN+=	AST/StmtProfile.cpp
+SRCS_MIN+=	AST/StmtViz.cpp
+SRCS_MIN+=	AST/TemplateBase.cpp
+SRCS_MIN+=	AST/TemplateName.cpp
+SRCS_MIN+=	AST/Type.cpp
+SRCS_MIN+=	AST/TypeLoc.cpp
+SRCS_MIN+=	AST/TypePrinter.cpp
+SRCS_MIN+=	AST/VTTBuilder.cpp
+SRCS_MIN+=	AST/VTableBuilder.cpp
+SRCS_MIN+=	ASTMatchers/ASTMatchFinder.cpp
+SRCS_MIN+=	ASTMatchers/ASTMatchersInternal.cpp
+SRCS_MIN+=	ASTMatchers/Dynamic/Diagnostics.cpp
+SRCS_MIN+=	ASTMatchers/Dynamic/Registry.cpp
+SRCS_MIN+=	Analysis/AnalysisDeclContext.cpp
+SRCS_MIN+=	Analysis/BodyFarm.cpp
+SRCS_MIN+=	Analysis/CFG.cpp
+SRCS_MIN+=	Analysis/CFGReachabilityAnalysis.cpp
+SRCS_MIN+=	Analysis/CFGStmtMap.cpp
+SRCS_FUL+=	Analysis/CallGraph.cpp
+SRCS_MIN+=	Analysis/CocoaConventions.cpp
+SRCS_FUL+=	Analysis/CodeInjector.cpp
+SRCS_MIN+=	Analysis/Consumed.cpp
+SRCS_FUL+=	Analysis/Dominators.cpp
+SRCS_MIN+=	Analysis/FormatString.cpp
+SRCS_MIN+=	Analysis/LiveVariables.cpp
+SRCS_MIN+=	Analysis/ObjCNoReturn.cpp
+SRCS_MIN+=	Analysis/PostOrderCFGView.cpp
+SRCS_MIN+=	Analysis/PrintfFormatString.cpp
+SRCS_FUL+=	Analysis/ProgramPoint.cpp
+SRCS_MIN+=	Analysis/PseudoConstantAnalysis.cpp
+SRCS_MIN+=	Analysis/ReachableCode.cpp
+SRCS_MIN+=	Analysis/ScanfFormatString.cpp
+SRCS_MIN+=	Analysis/ThreadSafety.cpp
+SRCS_MIN+=	Analysis/ThreadSafetyCommon.cpp
+SRCS_MIN+=	Analysis/ThreadSafetyTIL.cpp
+SRCS_MIN+=	Analysis/UninitializedValues.cpp
+SRCS_MIN+=	Basic/Attributes.cpp
+SRCS_MIN+=	Basic/Builtins.cpp
+SRCS_MIN+=	Basic/CharInfo.cpp
+SRCS_MIN+=	Basic/Cuda.cpp
+SRCS_MIN+=	Basic/Diagnostic.cpp
+SRCS_MIN+=	Basic/DiagnosticIDs.cpp
+SRCS_MIN+=	Basic/DiagnosticOptions.cpp
+SRCS_MIN+=	Basic/FileManager.cpp
+SRCS_MIN+=	Basic/FileSystemStatCache.cpp
+SRCS_MIN+=	Basic/IdentifierTable.cpp
+SRCS_MIN+=	Basic/LangOptions.cpp
+SRCS_MIN+=	Basic/Module.cpp
+SRCS_MIN+=	Basic/ObjCRuntime.cpp
+SRCS_MIN+=	Basic/OpenMPKinds.cpp
+SRCS_MIN+=	Basic/OperatorPrecedence.cpp
+SRCS_MIN+=	Basic/SanitizerBlacklist.cpp
+SRCS_MIN+=	Basic/Sanitizers.cpp
+SRCS_MIN+=	Basic/SourceLocation.cpp
+SRCS_MIN+=	Basic/SourceManager.cpp
+SRCS_MIN+=	Basic/TargetInfo.cpp
+SRCS_MIN+=	Basic/Targets.cpp
+SRCS_MIN+=	Basic/TokenKinds.cpp
+SRCS_MIN+=	Basic/Version.cpp
+SRCS_MIN+=	Basic/VersionTuple.cpp
+SRCS_MIN+=	Basic/VirtualFileSystem.cpp
+SRCS_MIN+=	Basic/Warnings.cpp
+SRCS_MIN+=	CodeGen/BackendUtil.cpp
+SRCS_MIN+=	CodeGen/CGAtomic.cpp
+SRCS_MIN+=	CodeGen/CGBlocks.cpp
+SRCS_MIN+=	CodeGen/CGBuiltin.cpp
+SRCS_MIN+=	CodeGen/CGCUDABuiltin.cpp
+SRCS_MIN+=	CodeGen/CGCUDANV.cpp
+SRCS_MIN+=	CodeGen/CGCUDARuntime.cpp
+SRCS_MIN+=	CodeGen/CGCXX.cpp
+SRCS_MIN+=	CodeGen/CGCXXABI.cpp
+SRCS_MIN+=	CodeGen/CGCall.cpp
+SRCS_MIN+=	CodeGen/CGClass.cpp
+SRCS_MIN+=	CodeGen/CGCleanup.cpp
+SRCS_MIN+=	CodeGen/CGDebugInfo.cpp
+SRCS_MIN+=	CodeGen/CGDecl.cpp
+SRCS_MIN+=	CodeGen/CGDeclCXX.cpp
+SRCS_MIN+=	CodeGen/CGException.cpp
+SRCS_MIN+=	CodeGen/CGExpr.cpp
+SRCS_MIN+=	CodeGen/CGExprAgg.cpp
+SRCS_MIN+=	CodeGen/CGExprCXX.cpp
+SRCS_MIN+=	CodeGen/CGExprComplex.cpp
+SRCS_MIN+=	CodeGen/CGExprConstant.cpp
+SRCS_MIN+=	CodeGen/CGExprScalar.cpp
+SRCS_MIN+=	CodeGen/CGLoopInfo.cpp
+SRCS_MIN+=	CodeGen/CGObjC.cpp
+SRCS_MIN+=	CodeGen/CGObjCGNU.cpp
+SRCS_MIN+=	CodeGen/CGObjCMac.cpp
+SRCS_MIN+=	CodeGen/CGObjCRuntime.cpp
+SRCS_MIN+=	CodeGen/CGOpenCLRuntime.cpp
+SRCS_MIN+=	CodeGen/CGOpenMPRuntime.cpp
+SRCS_MIN+=	CodeGen/CGOpenMPRuntimeNVPTX.cpp
+SRCS_MIN+=	CodeGen/CGRecordLayoutBuilder.cpp
+SRCS_MIN+=	CodeGen/CGStmt.cpp
+SRCS_MIN+=	CodeGen/CGStmtOpenMP.cpp
+SRCS_MIN+=	CodeGen/CGVTT.cpp
+SRCS_MIN+=	CodeGen/CGVTables.cpp
+SRCS_MIN+=	CodeGen/CodeGenAction.cpp
+SRCS_MIN+=	CodeGen/CodeGenFunction.cpp
+SRCS_MIN+=	CodeGen/CodeGenModule.cpp
+SRCS_MIN+=	CodeGen/CodeGenPGO.cpp
+SRCS_MIN+=	CodeGen/CodeGenTBAA.cpp
+SRCS_MIN+=	CodeGen/CodeGenTypes.cpp
+SRCS_MIN+=	CodeGen/CoverageMappingGen.cpp
+SRCS_MIN+=	CodeGen/ItaniumCXXABI.cpp
+SRCS_MIN+=	CodeGen/MicrosoftCXXABI.cpp
+SRCS_MIN+=	CodeGen/ModuleBuilder.cpp
+SRCS_MIN+=	CodeGen/ObjectFilePCHContainerOperations.cpp
+SRCS_MIN+=	CodeGen/SanitizerMetadata.cpp
+SRCS_MIN+=	CodeGen/SwiftCallingConv.cpp
+SRCS_MIN+=	CodeGen/TargetInfo.cpp
+SRCS_MIN+=	Driver/Action.cpp
+SRCS_MIN+=	Driver/Compilation.cpp
+SRCS_MIN+=	Driver/CrossWindowsToolChain.cpp
+SRCS_MIN+=	Driver/Driver.cpp
+SRCS_MIN+=	Driver/DriverOptions.cpp
+SRCS_MIN+=	Driver/Job.cpp
+SRCS_MIN+=	Driver/MSVCToolChain.cpp
+SRCS_MIN+=	Driver/MinGWToolChain.cpp
+SRCS_MIN+=	Driver/Multilib.cpp
+SRCS_MIN+=	Driver/Phases.cpp
+SRCS_MIN+=	Driver/SanitizerArgs.cpp
+SRCS_MIN+=	Driver/Tool.cpp
+SRCS_MIN+=	Driver/ToolChain.cpp
+SRCS_MIN+=	Driver/ToolChains.cpp
+SRCS_MIN+=	Driver/Tools.cpp
+SRCS_MIN+=	Driver/Types.cpp
+SRCS_MIN+=	Edit/Commit.cpp
+SRCS_MIN+=	Edit/EditedSource.cpp
+SRCS_MIN+=	Edit/RewriteObjCFoundationAPI.cpp
+SRCS_EXT+=	Format/AffectedRangeManager.cpp
+SRCS_EXT+=	Format/BreakableToken.cpp
+SRCS_EXT+=	Format/ContinuationIndenter.cpp
+SRCS_EXT+=	Format/Format.cpp
+SRCS_EXT+=	Format/FormatToken.cpp
+SRCS_EXT+=	Format/FormatTokenLexer.cpp
+SRCS_EXT+=	Format/SortJavaScriptImports.cpp
+SRCS_EXT+=	Format/TokenAnalyzer.cpp
+SRCS_EXT+=	Format/TokenAnnotator.cpp
+SRCS_EXT+=	Format/UnwrappedLineFormatter.cpp
+SRCS_EXT+=	Format/UnwrappedLineParser.cpp
+SRCS_EXT+=	Format/WhitespaceManager.cpp
+SRCS_MIN+=	Frontend/ASTConsumers.cpp
+SRCS_MIN+=	Frontend/ASTMerge.cpp
+SRCS_MIN+=	Frontend/ASTUnit.cpp
+SRCS_MIN+=	Frontend/CacheTokens.cpp
+SRCS_MIN+=	Frontend/ChainedDiagnosticConsumer.cpp
+SRCS_MIN+=	Frontend/ChainedIncludesSource.cpp
+SRCS_MIN+=	Frontend/CodeGenOptions.cpp
+SRCS_MIN+=	Frontend/CompilerInstance.cpp
+SRCS_MIN+=	Frontend/CompilerInvocation.cpp
+SRCS_MIN+=	Frontend/CreateInvocationFromCommandLine.cpp
+SRCS_MIN+=	Frontend/DependencyFile.cpp
+SRCS_MIN+=	Frontend/DependencyGraph.cpp
+SRCS_MIN+=	Frontend/DiagnosticRenderer.cpp
+SRCS_MIN+=	Frontend/FrontendAction.cpp
+SRCS_MIN+=	Frontend/FrontendActions.cpp
+SRCS_MIN+=	Frontend/FrontendOptions.cpp
+SRCS_MIN+=	Frontend/HeaderIncludeGen.cpp
+SRCS_MIN+=	Frontend/InitHeaderSearch.cpp
+SRCS_MIN+=	Frontend/InitPreprocessor.cpp
+SRCS_MIN+=	Frontend/LangStandards.cpp
+SRCS_MIN+=	Frontend/LayoutOverrideSource.cpp
+SRCS_MIN+=	Frontend/LogDiagnosticPrinter.cpp
+SRCS_MIN+=	Frontend/ModuleDependencyCollector.cpp
+SRCS_MIN+=	Frontend/MultiplexConsumer.cpp
+SRCS_MIN+=	Frontend/PCHContainerOperations.cpp
+SRCS_MIN+=	Frontend/PrintPreprocessedOutput.cpp
+SRCS_MIN+=	Frontend/Rewrite/FixItRewriter.cpp
+SRCS_MIN+=	Frontend/Rewrite/FrontendActions.cpp
+SRCS_MIN+=	Frontend/Rewrite/HTMLPrint.cpp
+SRCS_MIN+=	Frontend/Rewrite/InclusionRewriter.cpp
+SRCS_MIN+=	Frontend/Rewrite/RewriteMacros.cpp
+SRCS_MIN+=	Frontend/Rewrite/RewriteTest.cpp
+SRCS_MIN+=	Frontend/SerializedDiagnosticPrinter.cpp
+SRCS_MIN+=	Frontend/SerializedDiagnosticReader.cpp
+SRCS_MIN+=	Frontend/TestModuleFileExtension.cpp
+SRCS_MIN+=	Frontend/TextDiagnostic.cpp
+SRCS_MIN+=	Frontend/TextDiagnosticBuffer.cpp
+SRCS_MIN+=	Frontend/TextDiagnosticPrinter.cpp
+SRCS_MIN+=	Frontend/VerifyDiagnosticConsumer.cpp
+SRCS_MIN+=	FrontendTool/ExecuteCompilerInvocation.cpp
+SRCS_MIN+=	Index/CodegenNameGenerator.cpp
+SRCS_MIN+=	Index/CommentToXML.cpp
+SRCS_MIN+=	Index/IndexBody.cpp
+SRCS_MIN+=	Index/IndexDecl.cpp
+SRCS_MIN+=	Index/IndexSymbol.cpp
+SRCS_MIN+=	Index/IndexTypeSourceInfo.cpp
+SRCS_MIN+=	Index/IndexingAction.cpp
+SRCS_MIN+=	Index/IndexingContext.cpp
+SRCS_MIN+=	Index/USRGeneration.cpp
+SRCS_MIN+=	Lex/HeaderMap.cpp
+SRCS_MIN+=	Lex/HeaderSearch.cpp
+SRCS_MIN+=	Lex/Lexer.cpp
+SRCS_MIN+=	Lex/LiteralSupport.cpp
+SRCS_MIN+=	Lex/MacroArgs.cpp
+SRCS_MIN+=	Lex/MacroInfo.cpp
+SRCS_MIN+=	Lex/ModuleMap.cpp
+SRCS_MIN+=	Lex/PPCaching.cpp
+SRCS_MIN+=	Lex/PPCallbacks.cpp
+SRCS_MIN+=	Lex/PPConditionalDirectiveRecord.cpp
+SRCS_MIN+=	Lex/PPDirectives.cpp
+SRCS_MIN+=	Lex/PPExpressions.cpp
+SRCS_MIN+=	Lex/PPLexerChange.cpp
+SRCS_MIN+=	Lex/PPMacroExpansion.cpp
+SRCS_MIN+=	Lex/PTHLexer.cpp
+SRCS_MIN+=	Lex/Pragma.cpp
+SRCS_MIN+=	Lex/PreprocessingRecord.cpp
+SRCS_MIN+=	Lex/Preprocessor.cpp
+SRCS_MIN+=	Lex/PreprocessorLexer.cpp
+SRCS_MIN+=	Lex/ScratchBuffer.cpp
+SRCS_MIN+=	Lex/TokenConcatenation.cpp
+SRCS_MIN+=	Lex/TokenLexer.cpp
+SRCS_MIN+=	Parse/ParseAST.cpp
+SRCS_MIN+=	Parse/ParseCXXInlineMethods.cpp
+SRCS_MIN+=	Parse/ParseDecl.cpp
+SRCS_MIN+=	Parse/ParseDeclCXX.cpp
+SRCS_MIN+=	Parse/ParseExpr.cpp
+SRCS_MIN+=	Parse/ParseExprCXX.cpp
+SRCS_MIN+=	Parse/ParseInit.cpp
+SRCS_MIN+=	Parse/ParseObjc.cpp
+SRCS_MIN+=	Parse/ParseOpenMP.cpp
+SRCS_MIN+=	Parse/ParsePragma.cpp
+SRCS_MIN+=	Parse/ParseStmt.cpp
+SRCS_MIN+=	Parse/ParseStmtAsm.cpp
+SRCS_MIN+=	Parse/ParseTemplate.cpp
+SRCS_MIN+=	Parse/ParseTentative.cpp
+SRCS_MIN+=	Parse/Parser.cpp
+SRCS_MIN+=	Rewrite/DeltaTree.cpp
+SRCS_MIN+=	Rewrite/HTMLRewrite.cpp
+SRCS_MIN+=	Rewrite/RewriteRope.cpp
+SRCS_MIN+=	Rewrite/Rewriter.cpp
+SRCS_MIN+=	Rewrite/TokenRewriter.cpp
+SRCS_MIN+=	Sema/AnalysisBasedWarnings.cpp
+SRCS_MIN+=	Sema/AttributeList.cpp
+SRCS_MIN+=	Sema/CodeCompleteConsumer.cpp
+SRCS_MIN+=	Sema/DeclSpec.cpp
+SRCS_MIN+=	Sema/DelayedDiagnostic.cpp
+SRCS_MIN+=	Sema/IdentifierResolver.cpp
+SRCS_MIN+=	Sema/JumpDiagnostics.cpp
+SRCS_MIN+=	Sema/MultiplexExternalSemaSource.cpp
+SRCS_MIN+=	Sema/Scope.cpp
+SRCS_MIN+=	Sema/ScopeInfo.cpp
+SRCS_MIN+=	Sema/Sema.cpp
+SRCS_MIN+=	Sema/SemaAccess.cpp
+SRCS_MIN+=	Sema/SemaAttr.cpp
+SRCS_MIN+=	Sema/SemaCUDA.cpp
+SRCS_MIN+=	Sema/SemaCXXScopeSpec.cpp
+SRCS_MIN+=	Sema/SemaCast.cpp
+SRCS_MIN+=	Sema/SemaChecking.cpp
+SRCS_MIN+=	Sema/SemaCodeComplete.cpp
+SRCS_MIN+=	Sema/SemaConsumer.cpp
+SRCS_MIN+=	Sema/SemaCoroutine.cpp
+SRCS_MIN+=	Sema/SemaDecl.cpp
+SRCS_MIN+=	Sema/SemaDeclAttr.cpp
+SRCS_MIN+=	Sema/SemaDeclCXX.cpp
+SRCS_MIN+=	Sema/SemaDeclObjC.cpp
+SRCS_MIN+=	Sema/SemaExceptionSpec.cpp
+SRCS_MIN+=	Sema/SemaExpr.cpp
+SRCS_MIN+=	Sema/SemaExprCXX.cpp
+SRCS_MIN+=	Sema/SemaExprMember.cpp
+SRCS_MIN+=	Sema/SemaExprObjC.cpp
+SRCS_MIN+=	Sema/SemaFixItUtils.cpp
+SRCS_MIN+=	Sema/SemaInit.cpp
+SRCS_MIN+=	Sema/SemaLambda.cpp
+SRCS_MIN+=	Sema/SemaLookup.cpp
+SRCS_MIN+=	Sema/SemaObjCProperty.cpp
+SRCS_MIN+=	Sema/SemaOpenMP.cpp
+SRCS_MIN+=	Sema/SemaOverload.cpp
+SRCS_MIN+=	Sema/SemaPseudoObject.cpp
+SRCS_MIN+=	Sema/SemaStmt.cpp
+SRCS_MIN+=	Sema/SemaStmtAsm.cpp
+SRCS_MIN+=	Sema/SemaStmtAttr.cpp
+SRCS_MIN+=	Sema/SemaTemplate.cpp
+SRCS_MIN+=	Sema/SemaTemplateDeduction.cpp
+SRCS_MIN+=	Sema/SemaTemplateInstantiate.cpp
+SRCS_MIN+=	Sema/SemaTemplateInstantiateDecl.cpp
+SRCS_MIN+=	Sema/SemaTemplateVariadic.cpp
+SRCS_MIN+=	Sema/SemaType.cpp
+SRCS_MIN+=	Sema/TypeLocBuilder.cpp
+SRCS_MIN+=	Serialization/ASTCommon.cpp
+SRCS_MIN+=	Serialization/ASTReader.cpp
+SRCS_MIN+=	Serialization/ASTReaderDecl.cpp
+SRCS_MIN+=	Serialization/ASTReaderStmt.cpp
+SRCS_MIN+=	Serialization/ASTWriter.cpp
+SRCS_MIN+=	Serialization/ASTWriterDecl.cpp
+SRCS_MIN+=	Serialization/ASTWriterStmt.cpp
+SRCS_MIN+=	Serialization/GeneratePCH.cpp
+SRCS_MIN+=	Serialization/GlobalModuleIndex.cpp
+SRCS_MIN+=	Serialization/Module.cpp
+SRCS_MIN+=	Serialization/ModuleFileExtension.cpp
+SRCS_MIN+=	Serialization/ModuleManager.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/AllocationDiagnostics.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/AnalyzerStatsChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/ArrayBoundChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/ArrayBoundCheckerV2.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/BasicObjCFoundationChecks.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/BoolAssignmentChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/BuiltinFunctionChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/CStringChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/CStringSyntaxChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/CallAndMessageChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/CastSizeChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/CastToStructChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/CheckObjCDealloc.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/CheckObjCInstMethSignature.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/CheckSecuritySyntaxOnly.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/CheckSizeofPointer.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/ChrootChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/ClangCheckers.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/DeadStoresChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/DebugCheckers.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/DereferenceChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/DirectIvarAssignment.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/DivZeroChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/DynamicTypeChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/DynamicTypePropagation.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/ExprInspectionChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/FixedAddressChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/GenericTaintChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/IdenticalExprChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/IvarInvalidationChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/LLVMConventionsChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/LocalizationChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/MPI-Checker/MPIBugReporter.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/MPI-Checker/MPIChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/MPI-Checker/MPIFunctionClassifier.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/MacOSKeychainAPIChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/MacOSXAPIChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/MallocChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/MallocOverflowSecurityChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/MallocSizeofChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/NSAutoreleasePoolChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/NSErrorChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/NoReturnFunctionChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/NonNullParamChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/NullabilityChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/ObjCAtSyncChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/ObjCContainersASTChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/ObjCContainersChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/ObjCMissingSuperCallChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/ObjCSelfInitChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/ObjCSuperDeallocChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/ObjCUnusedIVarsChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/PaddingChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/PointerArithChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/PointerSubChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/PthreadLockChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/RetainCountChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/ReturnPointerRangeChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/ReturnUndefChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/SimpleStreamChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/StackAddrEscapeChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/StreamChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/TaintTesterChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/TestAfterDivZeroChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/TraversalChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/UndefBranchChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/UndefCapturedBlockVarChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/UndefResultChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/UndefinedArraySubscriptChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/UndefinedAssignmentChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/UnixAPIChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/UnreachableCodeChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/VLASizeChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/VforkChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Checkers/VirtualCallChecker.cpp
+SRCS_FUL+=	StaticAnalyzer/Core/APSIntType.cpp
+SRCS_FUL+=	StaticAnalyzer/Core/AnalysisManager.cpp
+SRCS_FUL+=	StaticAnalyzer/Core/AnalyzerOptions.cpp
+SRCS_FUL+=	StaticAnalyzer/Core/BasicValueFactory.cpp
+SRCS_FUL+=	StaticAnalyzer/Core/BlockCounter.cpp
+SRCS_FUL+=	StaticAnalyzer/Core/BugReporter.cpp
+SRCS_FUL+=	StaticAnalyzer/Core/BugReporterVisitors.cpp
+SRCS_FUL+=	StaticAnalyzer/Core/CallEvent.cpp
+SRCS_FUL+=	StaticAnalyzer/Core/Checker.cpp
+SRCS_FUL+=	StaticAnalyzer/Core/CheckerContext.cpp
+SRCS_FUL+=	StaticAnalyzer/Core/CheckerHelpers.cpp
+SRCS_FUL+=	StaticAnalyzer/Core/CheckerManager.cpp
+SRCS_FUL+=	StaticAnalyzer/Core/CheckerRegistry.cpp
+SRCS_FUL+=	StaticAnalyzer/Core/CommonBugCategories.cpp
+SRCS_FUL+=	StaticAnalyzer/Core/ConstraintManager.cpp
+SRCS_FUL+=	StaticAnalyzer/Core/CoreEngine.cpp
+SRCS_FUL+=	StaticAnalyzer/Core/DynamicTypeMap.cpp
+SRCS_FUL+=	StaticAnalyzer/Core/Environment.cpp
+SRCS_FUL+=	StaticAnalyzer/Core/ExplodedGraph.cpp
+SRCS_FUL+=	StaticAnalyzer/Core/ExprEngine.cpp
+SRCS_FUL+=	StaticAnalyzer/Core/ExprEngineC.cpp
+SRCS_FUL+=	StaticAnalyzer/Core/ExprEngineCXX.cpp
+SRCS_FUL+=	StaticAnalyzer/Core/ExprEngineCallAndReturn.cpp
+SRCS_FUL+=	StaticAnalyzer/Core/ExprEngineObjC.cpp
+SRCS_FUL+=	StaticAnalyzer/Core/FunctionSummary.cpp
+SRCS_FUL+=	StaticAnalyzer/Core/HTMLDiagnostics.cpp
+SRCS_FUL+=	StaticAnalyzer/Core/IssueHash.cpp
+SRCS_FUL+=	StaticAnalyzer/Core/LoopWidening.cpp
+SRCS_FUL+=	StaticAnalyzer/Core/MemRegion.cpp
+SRCS_FUL+=	StaticAnalyzer/Core/PathDiagnostic.cpp
+SRCS_FUL+=	StaticAnalyzer/Core/PlistDiagnostics.cpp
+SRCS_FUL+=	StaticAnalyzer/Core/ProgramState.cpp
+SRCS_FUL+=	StaticAnalyzer/Core/RangeConstraintManager.cpp
+SRCS_FUL+=	StaticAnalyzer/Core/RegionStore.cpp
+SRCS_FUL+=	StaticAnalyzer/Core/SValBuilder.cpp
+SRCS_FUL+=	StaticAnalyzer/Core/SVals.cpp
+SRCS_FUL+=	StaticAnalyzer/Core/SimpleConstraintManager.cpp
+SRCS_FUL+=	StaticAnalyzer/Core/SimpleSValBuilder.cpp
+SRCS_FUL+=	StaticAnalyzer/Core/Store.cpp
+SRCS_FUL+=	StaticAnalyzer/Core/SubEngine.cpp
+SRCS_FUL+=	StaticAnalyzer/Core/SymbolManager.cpp
+SRCS_FUL+=	StaticAnalyzer/Frontend/AnalysisConsumer.cpp
+SRCS_FUL+=	StaticAnalyzer/Frontend/CheckerRegistration.cpp
+SRCS_FUL+=	StaticAnalyzer/Frontend/FrontendActions.cpp
+SRCS_FUL+=	StaticAnalyzer/Frontend/ModelConsumer.cpp
+SRCS_FUL+=	StaticAnalyzer/Frontend/ModelInjector.cpp
+SRCS_MIN+=	Tooling/ArgumentsAdjusters.cpp
+SRCS_MIN+=	Tooling/CommonOptionsParser.cpp
+SRCS_MIN+=	Tooling/CompilationDatabase.cpp
+SRCS_EXT+=	Tooling/Core/QualTypeNames.cpp
+SRCS_EXT+=	Tooling/Core/Replacement.cpp
+SRCS_MIN+=	Tooling/FileMatchTrie.cpp
+SRCS_MIN+=	Tooling/JSONCompilationDatabase.cpp
+SRCS_MIN+=	Tooling/Refactoring.cpp
+SRCS_MIN+=	Tooling/RefactoringCallbacks.cpp
+SRCS_MIN+=	Tooling/Tooling.cpp
+
+SRCS_ALL+=	${SRCS_MIN}
+.if ${MK_CLANG_EXTRAS} != "no"
+SRCS_ALL+=	${SRCS_EXT}
+.endif
+.if ${MK_CLANG_FULL} != "no"
+SRCS_ALL+=	${SRCS_FUL}
+.endif
+SRCS+=		${SRCS_ALL:O}
+
+clang/AST/AttrDump.inc: ${CLANG_SRCS}/include/clang/Basic/Attr.td
+	${CLANG_TBLGEN} -gen-clang-attr-dump \
+	    -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \
+	    ${CLANG_SRCS}/include/clang/Basic/Attr.td
+TGHDRS+=	clang/AST/AttrDump.inc
+
+clang/AST/AttrImpl.inc: ${CLANG_SRCS}/include/clang/Basic/Attr.td
+	${CLANG_TBLGEN} -gen-clang-attr-impl \
+	    -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \
+	    ${CLANG_SRCS}/include/clang/Basic/Attr.td
+TGHDRS+=	clang/AST/AttrImpl.inc
+
+clang/AST/AttrVisitor.inc: ${CLANG_SRCS}/include/clang/Basic/Attr.td
+	${CLANG_TBLGEN} -gen-clang-attr-ast-visitor \
+	    -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \
+	    ${CLANG_SRCS}/include/clang/Basic/Attr.td
+TGHDRS+=	clang/AST/AttrVisitor.inc
+
+clang/AST/Attrs.inc: ${CLANG_SRCS}/include/clang/Basic/Attr.td
+	${CLANG_TBLGEN} -gen-clang-attr-classes \
+	    -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \
+	    ${CLANG_SRCS}/include/clang/Basic/Attr.td
+TGHDRS+=	clang/AST/Attrs.inc
+
+clang/AST/CommentCommandInfo.inc: \
+	${CLANG_SRCS}/include/clang/AST/CommentCommands.td
+	${CLANG_TBLGEN} -gen-clang-comment-command-info \
+	    -d ${.TARGET:C/$/.d/} -o ${.TARGET} \
+	    ${CLANG_SRCS}/include/clang/AST/CommentCommands.td
+TGHDRS+=	clang/AST/CommentCommandInfo.inc
+
+clang/AST/CommentCommandList.inc: \
+	${CLANG_SRCS}/include/clang/AST/CommentCommands.td
+	${CLANG_TBLGEN} -gen-clang-comment-command-list \
+	    -d ${.TARGET:C/$/.d/} -o ${.TARGET} \
+	    ${CLANG_SRCS}/include/clang/AST/CommentCommands.td
+TGHDRS+=	clang/AST/CommentCommandList.inc
+
+clang/AST/CommentHTMLNamedCharacterReferences.inc: \
+	${CLANG_SRCS}/include/clang/AST/CommentHTMLNamedCharacterReferences.td
+	${CLANG_TBLGEN} -gen-clang-comment-html-named-character-references \
+	    -d ${.TARGET:C/$/.d/} -o ${.TARGET} \
+	    ${CLANG_SRCS}/include/clang/AST/CommentHTMLNamedCharacterReferences.td
+TGHDRS+=	clang/AST/CommentHTMLNamedCharacterReferences.inc
+
+clang/AST/CommentHTMLTags.inc: \
+	${CLANG_SRCS}/include/clang/AST/CommentHTMLTags.td
+	${CLANG_TBLGEN} -gen-clang-comment-html-tags \
+	    -d ${.TARGET:C/$/.d/} -o ${.TARGET} \
+	    ${CLANG_SRCS}/include/clang/AST/CommentHTMLTags.td
+TGHDRS+=	clang/AST/CommentHTMLTags.inc
+
+clang/AST/CommentHTMLTagsProperties.inc: \
+	${CLANG_SRCS}/include/clang/AST/CommentHTMLTags.td
+	${CLANG_TBLGEN} -gen-clang-comment-html-tags-properties \
+	    -d ${.TARGET:C/$/.d/} -o ${.TARGET} \
+	    ${CLANG_SRCS}/include/clang/AST/CommentHTMLTags.td
+TGHDRS+=	clang/AST/CommentHTMLTagsProperties.inc
+
+clang/AST/CommentNodes.inc: ${CLANG_SRCS}/include/clang/Basic/CommentNodes.td
+	${CLANG_TBLGEN} -gen-clang-comment-nodes \
+	    -d ${.TARGET:C/$/.d/} -o ${.TARGET} \
+	    ${CLANG_SRCS}/include/clang/Basic/CommentNodes.td
+TGHDRS+=	clang/AST/CommentNodes.inc
+
+clang/AST/DeclNodes.inc: ${CLANG_SRCS}/include/clang/Basic/DeclNodes.td
+	${CLANG_TBLGEN} -gen-clang-decl-nodes \
+	    -d ${.TARGET:C/$/.d/} -o ${.TARGET} \
+	    ${CLANG_SRCS}/include/clang/Basic/DeclNodes.td
+TGHDRS+=	clang/AST/DeclNodes.inc
+
+clang/AST/StmtNodes.inc: ${CLANG_SRCS}/include/clang/Basic/StmtNodes.td
+	${CLANG_TBLGEN} -gen-clang-stmt-nodes \
+	    -d ${.TARGET:C/$/.d/} -o ${.TARGET} \
+	    ${CLANG_SRCS}/include/clang/Basic/StmtNodes.td
+TGHDRS+=	clang/AST/StmtNodes.inc
+
+clang/Basic/AttrHasAttributeImpl.inc: ${CLANG_SRCS}/include/clang/Basic/Attr.td
+	${CLANG_TBLGEN} -gen-clang-attr-has-attribute-impl \
+	    -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \
+	    ${CLANG_SRCS}/include/clang/Basic/Attr.td
+TGHDRS+=	clang/Basic/AttrHasAttributeImpl.inc
+
+clang/Basic/AttrList.inc: ${CLANG_SRCS}/include/clang/Basic/Attr.td
+	${CLANG_TBLGEN} -gen-clang-attr-list \
+	    -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \
+	    ${CLANG_SRCS}/include/clang/Basic/Attr.td
+TGHDRS+=	clang/Basic/AttrList.inc
+
+.for hdr in \
+	AST Analysis Comment Common Driver Frontend Lex Parse Sema Serialization
+clang/Basic/Diagnostic${hdr}Kinds.inc: \
+	${CLANG_SRCS}/include/clang/Basic/Diagnostic.td
+	${CLANG_TBLGEN} -gen-clang-diags-defs -clang-component=${hdr} \
+	    -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \
+	    -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/Diagnostic.td
+TGHDRS+=	clang/Basic/Diagnostic${hdr}Kinds.inc
+.endfor
+
+clang/Basic/DiagnosticGroups.inc: \
+	${CLANG_SRCS}/include/clang/Basic/Diagnostic.td
+	${CLANG_TBLGEN} -gen-clang-diag-groups \
+	    -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \
+	    -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/Diagnostic.td
+TGHDRS+=	clang/Basic/DiagnosticGroups.inc
+
+clang/Basic/DiagnosticIndexName.inc: \
+	${CLANG_SRCS}/include/clang/Basic/Diagnostic.td
+	${CLANG_TBLGEN} -gen-clang-diags-index-name \
+	    -I ${CLANG_SRCS}/include/clang/Basic -d ${.TARGET:C/$/.d/} \
+	    -o ${.TARGET} ${CLANG_SRCS}/include/clang/Basic/Diagnostic.td
+TGHDRS+=	clang/Basic/DiagnosticIndexName.inc
+
+clang/Basic/arm_neon.inc: ${CLANG_SRCS}/include/clang/Basic/arm_neon.td
+	${CLANG_TBLGEN} -gen-arm-neon-sema \
+	    -d ${.TARGET:C/$/.d/} -o ${.TARGET} \
+	    ${CLANG_SRCS}/include/clang/Basic/arm_neon.td
+TGHDRS+=	clang/Basic/arm_neon.inc
+
+clang/Driver/Options.inc: ${CLANG_SRCS}/include/clang/Driver/Options.td
+	${LLVM_TBLGEN} -gen-opt-parser-defs \
+	    -I ${LLVM_SRCS}/include -I ${CLANG_SRCS}/include/clang/Driver \
+	    -d ${.TARGET:C/$/.d/} -o ${.TARGET} \
+	    ${CLANG_SRCS}/include/clang/Driver/Options.td
+TGHDRS+=	clang/Driver/Options.inc
+
+clang/Parse/AttrParserStringSwitches.inc: \
+	${CLANG_SRCS}/include/clang/Basic/Attr.td
+	${CLANG_TBLGEN} -gen-clang-attr-parser-string-switches \
+	    -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \
+	    ${CLANG_SRCS}/include/clang/Basic/Attr.td
+TGHDRS+=	clang/Parse/AttrParserStringSwitches.inc
+
+clang/Sema/AttrParsedAttrImpl.inc: ${CLANG_SRCS}/include/clang/Basic/Attr.td
+	${CLANG_TBLGEN} -gen-clang-attr-parsed-attr-impl \
+	    -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \
+	    ${CLANG_SRCS}/include/clang/Basic/Attr.td
+TGHDRS+=	clang/Sema/AttrParsedAttrImpl.inc
+
+clang/Sema/AttrParsedAttrKinds.inc: ${CLANG_SRCS}/include/clang/Basic/Attr.td
+	${CLANG_TBLGEN} -gen-clang-attr-parsed-attr-kinds \
+	    -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \
+	    ${CLANG_SRCS}/include/clang/Basic/Attr.td
+TGHDRS+=	clang/Sema/AttrParsedAttrKinds.inc
+
+clang/Sema/AttrParsedAttrList.inc: ${CLANG_SRCS}/include/clang/Basic/Attr.td
+	${CLANG_TBLGEN} -gen-clang-attr-parsed-attr-list \
+	    -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \
+	    ${CLANG_SRCS}/include/clang/Basic/Attr.td
+TGHDRS+=	clang/Sema/AttrParsedAttrList.inc
+
+clang/Sema/AttrSpellingListIndex.inc: ${CLANG_SRCS}/include/clang/Basic/Attr.td
+	${CLANG_TBLGEN} -gen-clang-attr-spelling-index \
+	    -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \
+	    ${CLANG_SRCS}/include/clang/Basic/Attr.td
+TGHDRS+=	clang/Sema/AttrSpellingListIndex.inc
+
+clang/Sema/AttrTemplateInstantiate.inc: \
+	${CLANG_SRCS}/include/clang/Basic/Attr.td
+	${CLANG_TBLGEN} -gen-clang-attr-template-instantiate \
+	    -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \
+	    ${CLANG_SRCS}/include/clang/Basic/Attr.td
+TGHDRS+=	clang/Sema/AttrTemplateInstantiate.inc
+
+clang/Serialization/AttrPCHRead.inc: ${CLANG_SRCS}/include/clang/Basic/Attr.td
+	${CLANG_TBLGEN} -gen-clang-attr-pch-read \
+	    -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \
+	    ${CLANG_SRCS}/include/clang/Basic/Attr.td
+TGHDRS+=	clang/Serialization/AttrPCHRead.inc
+
+clang/Serialization/AttrPCHWrite.inc: ${CLANG_SRCS}/include/clang/Basic/Attr.td
+	${CLANG_TBLGEN} -gen-clang-attr-pch-write \
+	    -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \
+	    ${CLANG_SRCS}/include/clang/Basic/Attr.td
+TGHDRS+=	clang/Serialization/AttrPCHWrite.inc
+
+clang/StaticAnalyzer/Checkers/Checkers.inc: \
+	${CLANG_SRCS}/include/clang/StaticAnalyzer/Checkers/Checkers.td
+	${CLANG_TBLGEN} -gen-clang-sa-checkers \
+	    -I ${CLANG_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \
+	    ${CLANG_SRCS}/include/clang/StaticAnalyzer/Checkers/Checkers.td
+TGHDRS+=	clang/StaticAnalyzer/Checkers/Checkers.inc
+
+.for dep in ${TGHDRS:C/$/.d/}
+. if ${MAKE_VERSION} < 20160220
+.  if !make(depend)
+.   sinclude "${dep}"
+.  endif
+. else
+.   dinclude "${dep}"
+. endif
+.endfor
+
+DPSRCS+=	${TGHDRS}
+CLEANFILES+=	${TGHDRS} ${TGHDRS:C/$/.d/}
+
+.include "../clang.build.mk"
+
+INTERNALLIB=
+
+.include <bsd.lib.mk>
diff --git a/lib/clang/libclanganalysis/Makefile b/lib/clang/libclanganalysis/Makefile
deleted file mode 100644
index 2967440e9a8b..000000000000
--- a/lib/clang/libclanganalysis/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-# $FreeBSD$
-
-.include <src.opts.mk>
-
-LIB=	clanganalysis
-
-SRCDIR=	tools/clang/lib/Analysis
-SRCS=	AnalysisDeclContext.cpp \
-	BodyFarm.cpp \
-	CFG.cpp \
-	CFGReachabilityAnalysis.cpp \
-	CFGStmtMap.cpp \
-	CocoaConventions.cpp \
-	Consumed.cpp \
-	FormatString.cpp \
-	LiveVariables.cpp \
-	ObjCNoReturn.cpp \
-	PostOrderCFGView.cpp \
-	PrintfFormatString.cpp \
-	PseudoConstantAnalysis.cpp \
-	ReachableCode.cpp \
-	ScanfFormatString.cpp \
-	ThreadSafety.cpp \
-	ThreadSafetyCommon.cpp \
-	ThreadSafetyTIL.cpp \
-	UninitializedValues.cpp
-
-.if ${MK_CLANG_FULL} != "no"
-SRCS+=	CallGraph.cpp \
-	CodeInjector.cpp \
-	Dominators.cpp \
-	ProgramPoint.cpp
-.endif
-
-.if ${MK_CLANG_EXTRAS} != "no"
-SRCS+=	ThreadSafetyLogical.cpp
-.endif
-
-TGHDRS=	AttrList \
-	AttrVisitor \
-	Attrs \
-	CommentCommandList \
-	CommentNodes \
-	DeclNodes \
-	DiagnosticAnalysisKinds \
-	DiagnosticCommonKinds \
-	StmtNodes
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libclanganalysis/Makefile.depend b/lib/clang/libclanganalysis/Makefile.depend
deleted file mode 100644
index 264ede1c30ce..000000000000
--- a/lib/clang/libclanganalysis/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libclangarcmigrate/Makefile b/lib/clang/libclangarcmigrate/Makefile
deleted file mode 100644
index a6b06c4a418e..000000000000
--- a/lib/clang/libclangarcmigrate/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	clangarcmigrate
-
-SRCDIR=	tools/clang/lib/ARCMigrate
-SRCS=	ARCMT.cpp \
-	ARCMTActions.cpp \
-	FileRemapper.cpp \
-	ObjCMT.cpp \
-	PlistReporter.cpp \
-	TransAPIUses.cpp \
-	TransARCAssign.cpp \
-	TransAutoreleasePool.cpp \
-	TransBlockObjCVariable.cpp \
-	TransEmptyStatementsAndDealloc.cpp \
-	TransGCAttrs.cpp \
-	TransGCCalls.cpp \
-	TransProperties.cpp \
-	TransProtectedScope.cpp \
-	TransRetainReleaseDealloc.cpp \
-	TransUnbridgedCasts.cpp \
-	TransUnusedInitDelegate.cpp \
-	TransZeroOutPropsInDealloc.cpp \
-	TransformActions.cpp \
-	Transforms.cpp
-
-TGHDRS=	AttrList \
-	AttrParsedAttrList \
-	AttrVisitor \
-	Attrs \
-	CommentCommandList \
-	CommentNodes \
-	DeclNodes \
-	DiagnosticCommonKinds \
-	DiagnosticGroups \
-	DiagnosticSemaKinds \
-	StmtNodes
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libclangarcmigrate/Makefile.depend b/lib/clang/libclangarcmigrate/Makefile.depend
deleted file mode 100644
index 264ede1c30ce..000000000000
--- a/lib/clang/libclangarcmigrate/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libclangast/Makefile b/lib/clang/libclangast/Makefile
deleted file mode 100644
index d77857bc7e64..000000000000
--- a/lib/clang/libclangast/Makefile
+++ /dev/null
@@ -1,88 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	clangast
-
-SRCDIR=	tools/clang/lib/AST
-SRCS=	APValue.cpp \
-	ASTConsumer.cpp \
-	ASTContext.cpp \
-	ASTDiagnostic.cpp \
-	ASTDumper.cpp \
-	ASTImporter.cpp \
-	ASTTypeTraits.cpp \
-	AttrImpl.cpp \
-	CXXInheritance.cpp \
-	Comment.cpp \
-	CommentBriefParser.cpp \
-	CommentCommandTraits.cpp \
-	CommentLexer.cpp \
-	CommentParser.cpp \
-	CommentSema.cpp \
-	Decl.cpp \
-	DeclBase.cpp \
-	DeclCXX.cpp \
-	DeclFriend.cpp \
-	DeclGroup.cpp \
-	DeclObjC.cpp \
-	DeclOpenMP.cpp \
-	DeclPrinter.cpp \
-	DeclTemplate.cpp \
-	DeclarationName.cpp \
-	Expr.cpp \
-	ExprCXX.cpp \
-	ExprClassification.cpp \
-	ExprConstant.cpp \
-	ExprObjC.cpp \
-	ExternalASTSource.cpp \
-	InheritViz.cpp \
-	ItaniumCXXABI.cpp \
-	ItaniumMangle.cpp \
-	Mangle.cpp \
-	MicrosoftCXXABI.cpp \
-	MicrosoftMangle.cpp \
-	NSAPI.cpp \
-	NestedNameSpecifier.cpp \
-	OpenMPClause.cpp \
-	ParentMap.cpp \
-	RawCommentList.cpp \
-	RecordLayout.cpp \
-	RecordLayoutBuilder.cpp \
-	SelectorLocationsKind.cpp \
-	Stmt.cpp \
-	StmtCXX.cpp \
-	StmtIterator.cpp \
-	StmtObjC.cpp \
-	StmtOpenMP.cpp \
-	StmtPrinter.cpp \
-	StmtProfile.cpp \
-	StmtViz.cpp \
-	TemplateBase.cpp \
-	TemplateName.cpp \
-	Type.cpp \
-	TypeLoc.cpp \
-	TypePrinter.cpp \
-	VTTBuilder.cpp \
-	VTableBuilder.cpp
-
-TGHDRS=	AttrDump \
-	AttrImpl \
-	AttrList \
-	AttrVisitor \
-	Attrs \
-	CommentCommandInfo \
-	CommentCommandList \
-	CommentHTMLNamedCharacterReferences \
-	CommentHTMLTags \
-	CommentHTMLTagsProperties \
-	CommentNodes \
-	DeclNodes \
-	DiagnosticASTKinds \
-	DiagnosticCommentKinds \
-	DiagnosticCommonKinds \
-	DiagnosticFrontendKinds \
-	DiagnosticSemaKinds \
-	StmtNodes
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libclangast/Makefile.depend b/lib/clang/libclangast/Makefile.depend
deleted file mode 100644
index 264ede1c30ce..000000000000
--- a/lib/clang/libclangast/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libclangastmatchers/Makefile b/lib/clang/libclangastmatchers/Makefile
deleted file mode 100644
index 5c2bff5bee5e..000000000000
--- a/lib/clang/libclangastmatchers/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	clangastmatchers
-
-SRCDIR=	tools/clang/lib/ASTMatchers
-SRCS=	ASTMatchFinder.cpp \
-	ASTMatchersInternal.cpp
-
-TGHDRS=	AttrList \
-	Attrs \
-	AttrVisitor \
-	CommentCommandList \
-	DeclNodes \
-	DiagnosticCommonKinds \
-	StmtNodes
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libclangbasic/Makefile b/lib/clang/libclangbasic/Makefile
deleted file mode 100644
index c6b1d77cd8b3..000000000000
--- a/lib/clang/libclangbasic/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	clangbasic
-
-SRCDIR=	tools/clang/lib/Basic
-SRCS=	Attributes.cpp \
-	Builtins.cpp \
-	CharInfo.cpp \
-	Cuda.cpp \
-	Diagnostic.cpp \
-	DiagnosticIDs.cpp \
-	DiagnosticOptions.cpp \
-	FileManager.cpp \
-	FileSystemStatCache.cpp \
-	IdentifierTable.cpp \
-	LangOptions.cpp \
-	Module.cpp \
-	ObjCRuntime.cpp \
-	OpenMPKinds.cpp \
-	OperatorPrecedence.cpp \
-	SanitizerBlacklist.cpp \
-	Sanitizers.cpp \
-	SourceLocation.cpp \
-	SourceManager.cpp \
-	TargetInfo.cpp \
-	Targets.cpp \
-	TokenKinds.cpp \
-	Version.cpp \
-	VersionTuple.cpp \
-	VirtualFileSystem.cpp \
-	Warnings.cpp
-
-TGHDRS=	AttrHasAttributeImpl \
-	DiagnosticAnalysisKinds \
-	DiagnosticASTKinds \
-	DiagnosticCommentKinds \
-	DiagnosticCommonKinds \
-	DiagnosticDriverKinds \
-	DiagnosticFrontendKinds \
-	DiagnosticGroups \
-	DiagnosticIndexName \
-	DiagnosticLexKinds \
-	DiagnosticParseKinds \
-	DiagnosticSemaKinds \
-	DiagnosticSerializationKinds \
-	arm_neon
-
-.include "../clang.lib.mk"
-
-# XX: work around GCC bug 67888
-CFLAGS.gcc += -fpermissive
-
-# Ensure FREEBSD_CC_VERSION is defined for Targets.cpp
-CFLAGS.Targets.cpp+= -include ../freebsd_cc_version.h
diff --git a/lib/clang/libclangbasic/Makefile.depend b/lib/clang/libclangbasic/Makefile.depend
deleted file mode 100644
index 264ede1c30ce..000000000000
--- a/lib/clang/libclangbasic/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libclangcodegen/Makefile b/lib/clang/libclangcodegen/Makefile
deleted file mode 100644
index 1525ccc1eab0..000000000000
--- a/lib/clang/libclangcodegen/Makefile
+++ /dev/null
@@ -1,77 +0,0 @@
-# $FreeBSD$
-
-.include <src.opts.mk>
-
-LIB=	clangcodegen
-
-SRCDIR=	tools/clang/lib/CodeGen
-SRCS=	BackendUtil.cpp \
-	CGAtomic.cpp \
-	CGBlocks.cpp \
-	CGBuiltin.cpp \
-	CGCUDABuiltin.cpp \
-	CGCUDANV.cpp \
-	CGCUDARuntime.cpp \
-	CGCXX.cpp \
-	CGCXXABI.cpp \
-	CGCall.cpp \
-	CGClass.cpp \
-	CGCleanup.cpp \
-	CGDebugInfo.cpp \
-	CGDecl.cpp \
-	CGDeclCXX.cpp \
-	CGException.cpp \
-	CGExpr.cpp \
-	CGExprAgg.cpp \
-	CGExprCXX.cpp \
-	CGExprComplex.cpp \
-	CGExprConstant.cpp \
-	CGExprScalar.cpp \
-	CGLoopInfo.cpp \
-	CGObjC.cpp \
-	CGObjCGNU.cpp \
-	CGObjCMac.cpp \
-	CGObjCRuntime.cpp \
-	CGOpenCLRuntime.cpp \
-	CGOpenMPRuntime.cpp \
-	CGOpenMPRuntimeNVPTX.cpp \
-	CGRecordLayoutBuilder.cpp \
-	CGStmt.cpp \
-	CGStmtOpenMP.cpp \
-	CGVTT.cpp \
-	CGVTables.cpp \
-	CodeGenAction.cpp \
-	CodeGenFunction.cpp \
-	CodeGenModule.cpp \
-	CodeGenPGO.cpp \
-	CodeGenTBAA.cpp \
-	CodeGenTypes.cpp \
-	CoverageMappingGen.cpp \
-	ItaniumCXXABI.cpp \
-	MicrosoftCXXABI.cpp \
-	ModuleBuilder.cpp \
-	ObjectFilePCHContainerOperations.cpp \
-	SanitizerMetadata.cpp \
-	SwiftCallingConv.cpp \
-	TargetInfo.cpp
-
-.if ${MK_CLANG_EXTRAS} != "no"
-SRCS+=	CodeGenABITypes.cpp
-.endif
-
-TGHDRS=	AttrList \
-	AttrParsedAttrList \
-	AttrVisitor \
-	Attributes \
-	Attrs \
-	CommentCommandList \
-	CommentNodes \
-	DeclNodes \
-	DiagnosticCommonKinds \
-	DiagnosticFrontendKinds \
-	DiagnosticSemaKinds \
-	Intrinsics \
-	StmtNodes \
-	arm_neon
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libclangcodegen/Makefile.depend b/lib/clang/libclangcodegen/Makefile.depend
deleted file mode 100644
index 7bd22d4fd361..000000000000
--- a/lib/clang/libclangcodegen/Makefile.depend
+++ /dev/null
@@ -1,17 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libclangdriver/Makefile b/lib/clang/libclangdriver/Makefile
deleted file mode 100644
index bc62b4097a5a..000000000000
--- a/lib/clang/libclangdriver/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	clangdriver
-
-SRCDIR=	tools/clang/lib/Driver
-SRCS=	Action.cpp \
-	Compilation.cpp \
-	CrossWindowsToolChain.cpp \
-	Driver.cpp \
-	DriverOptions.cpp \
-	Job.cpp \
-	MSVCToolChain.cpp \
-	MinGWToolChain.cpp \
-	Multilib.cpp \
-	Phases.cpp \
-	SanitizerArgs.cpp \
-	Tool.cpp \
-	ToolChain.cpp \
-	ToolChains.cpp \
-	Tools.cpp \
-	Types.cpp
-
-TGHDRS=	DiagnosticCommonKinds \
-	DiagnosticDriverKinds \
-	DiagnosticSemaKinds \
-	Options
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libclangdriver/Makefile.depend b/lib/clang/libclangdriver/Makefile.depend
deleted file mode 100644
index 7bd22d4fd361..000000000000
--- a/lib/clang/libclangdriver/Makefile.depend
+++ /dev/null
@@ -1,17 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libclangdynamicastmatchers/Makefile b/lib/clang/libclangdynamicastmatchers/Makefile
deleted file mode 100644
index fedd1149b2fa..000000000000
--- a/lib/clang/libclangdynamicastmatchers/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $FreeBSD$
-
-.include <src.opts.mk>
-
-LIB=	clangdynamicastmatchers
-
-SRCDIR=	tools/clang/lib/ASTMatchers/Dynamic
-SRCS=	Diagnostics.cpp \
-	Registry.cpp
-
-.if ${MK_CLANG_EXTRAS} != "no"
-SRCS+=	Parser.cpp \
-	VariantValue.cpp
-.endif
-
-TGHDRS=	AttrList \
-	Attrs \
-	CommentCommandList \
-	DeclNodes \
-	DiagnosticCommonKinds \
-	StmtNodes
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libclangedit/Makefile b/lib/clang/libclangedit/Makefile
deleted file mode 100644
index f403b00822ed..000000000000
--- a/lib/clang/libclangedit/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	clangedit
-
-SRCDIR=	tools/clang/lib/Edit
-SRCS=	Commit.cpp \
-	EditedSource.cpp \
-	RewriteObjCFoundationAPI.cpp
-
-TGHDRS=	AttrList \
-	Attrs \
-	CommentCommandList \
-	CommentNodes \
-	DeclNodes \
-	StmtNodes \
-	DiagnosticCommonKinds
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libclangedit/Makefile.depend b/lib/clang/libclangedit/Makefile.depend
deleted file mode 100644
index 264ede1c30ce..000000000000
--- a/lib/clang/libclangedit/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libclangformat/Makefile b/lib/clang/libclangformat/Makefile
deleted file mode 100644
index eeb11a2fd601..000000000000
--- a/lib/clang/libclangformat/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	clangformat
-
-SRCDIR=	tools/clang/lib/Format
-SRCS=	AffectedRangeManager.cpp \
-	BreakableToken.cpp \
-	ContinuationIndenter.cpp \
-	Format.cpp \
-	FormatToken.cpp \
-	FormatTokenLexer.cpp \
-	SortJavaScriptImports.cpp \
-	TokenAnalyzer.cpp \
-	TokenAnnotator.cpp \
-	UnwrappedLineFormatter.cpp \
-	UnwrappedLineParser.cpp \
-	WhitespaceManager.cpp
-
-TGHDRS=	DiagnosticCommonKinds
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libclangformat/Makefile.depend b/lib/clang/libclangformat/Makefile.depend
deleted file mode 100644
index 3e7f3f5e7165..000000000000
--- a/lib/clang/libclangformat/Makefile.depend
+++ /dev/null
@@ -1,15 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libclangfrontend/Makefile b/lib/clang/libclangfrontend/Makefile
deleted file mode 100644
index 0a71441d4ce5..000000000000
--- a/lib/clang/libclangfrontend/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	clangfrontend
-
-SRCDIR=	tools/clang/lib/Frontend
-SRCS=	ASTConsumers.cpp \
-	ASTMerge.cpp \
-	ASTUnit.cpp \
-	CacheTokens.cpp \
-	ChainedDiagnosticConsumer.cpp \
-	ChainedIncludesSource.cpp \
-	CodeGenOptions.cpp \
-	CompilerInstance.cpp \
-	CompilerInvocation.cpp \
-	CreateInvocationFromCommandLine.cpp \
-	DependencyFile.cpp \
-	DependencyGraph.cpp \
-	DiagnosticRenderer.cpp \
-	FrontendAction.cpp \
-	FrontendActions.cpp \
-	FrontendOptions.cpp \
-	HeaderIncludeGen.cpp \
-	InitHeaderSearch.cpp \
-	InitPreprocessor.cpp \
-	LangStandards.cpp \
-	LayoutOverrideSource.cpp \
-	LogDiagnosticPrinter.cpp \
-	ModuleDependencyCollector.cpp \
-	MultiplexConsumer.cpp \
-	PCHContainerOperations.cpp \
-	PrintPreprocessedOutput.cpp \
-	SerializedDiagnosticPrinter.cpp \
-	SerializedDiagnosticReader.cpp \
-	TestModuleFileExtension.cpp \
-	TextDiagnostic.cpp \
-	TextDiagnosticBuffer.cpp \
-	TextDiagnosticPrinter.cpp \
-	VerifyDiagnosticConsumer.cpp
-
-TGHDRS=	AttrList \
-	AttrParsedAttrList \
-	AttrVisitor \
-	Attributes \
-	Attrs \
-	CommentCommandList \
-	CommentNodes \
-	DeclNodes \
-	DiagnosticASTKinds \
-	DiagnosticCommonKinds \
-	DiagnosticDriverKinds \
-	DiagnosticFrontendKinds \
-	DiagnosticLexKinds \
-	DiagnosticSemaKinds \
-	Options \
-	StmtNodes
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libclangfrontend/Makefile.depend b/lib/clang/libclangfrontend/Makefile.depend
deleted file mode 100644
index 7bd22d4fd361..000000000000
--- a/lib/clang/libclangfrontend/Makefile.depend
+++ /dev/null
@@ -1,17 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libclangfrontendtool/Makefile b/lib/clang/libclangfrontendtool/Makefile
deleted file mode 100644
index 0d71d55e3d74..000000000000
--- a/lib/clang/libclangfrontendtool/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	clangfrontendtool
-
-SRCDIR=	tools/clang/lib/FrontendTool
-SRCS=	ExecuteCompilerInvocation.cpp
-
-TGHDRS=	CommentCommandList \
-	DeclNodes \
-	DiagnosticCommonKinds \
-	DiagnosticFrontendKinds \
-	Options \
-	StmtNodes
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libclangfrontendtool/Makefile.depend b/lib/clang/libclangfrontendtool/Makefile.depend
deleted file mode 100644
index 7bd22d4fd361..000000000000
--- a/lib/clang/libclangfrontendtool/Makefile.depend
+++ /dev/null
@@ -1,17 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libclangindex/Makefile b/lib/clang/libclangindex/Makefile
deleted file mode 100644
index 8f364ba2e074..000000000000
--- a/lib/clang/libclangindex/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	clangindex
-
-SRCDIR=	tools/clang/lib/Index
-SRCS=	CodegenNameGenerator.cpp \
-	CommentToXML.cpp \
-	IndexBody.cpp \
-	IndexDecl.cpp \
-	IndexSymbol.cpp \
-	IndexTypeSourceInfo.cpp \
-	IndexingAction.cpp \
-	IndexingContext.cpp \
-	USRGeneration.cpp
-
-TGHDRS=	AttrList \
-	AttrVisitor \
-	Attrs \
-	CommentCommandList \
-	CommentNodes \
-	DeclNodes \
-	DiagnosticCommonKinds \
-	StmtNodes
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libclanglex/Makefile b/lib/clang/libclanglex/Makefile
deleted file mode 100644
index 90b1fcaa6f97..000000000000
--- a/lib/clang/libclanglex/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	clanglex
-
-SRCDIR=	tools/clang/lib/Lex
-SRCS=	HeaderMap.cpp \
-	HeaderSearch.cpp \
-	Lexer.cpp \
-	LiteralSupport.cpp \
-	MacroArgs.cpp \
-	MacroInfo.cpp \
-	ModuleMap.cpp \
-	PPCaching.cpp \
-	PPCallbacks.cpp \
-	PPConditionalDirectiveRecord.cpp \
-	PPDirectives.cpp \
-	PPExpressions.cpp \
-	PPLexerChange.cpp \
-	PPMacroExpansion.cpp \
-	PTHLexer.cpp \
-	Pragma.cpp \
-	PreprocessingRecord.cpp \
-	Preprocessor.cpp \
-	PreprocessorLexer.cpp \
-	ScratchBuffer.cpp \
-	TokenConcatenation.cpp \
-	TokenLexer.cpp
-
-TGHDRS=	AttrSpellingListIndex \
-	DiagnosticCommonKinds \
-	DiagnosticLexKinds
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libclanglex/Makefile.depend b/lib/clang/libclanglex/Makefile.depend
deleted file mode 100644
index 264ede1c30ce..000000000000
--- a/lib/clang/libclanglex/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libclangparse/Makefile b/lib/clang/libclangparse/Makefile
deleted file mode 100644
index e690d66cd6cb..000000000000
--- a/lib/clang/libclangparse/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	clangparse
-
-SRCDIR=	tools/clang/lib/Parse
-SRCS=	ParseAST.cpp \
-	ParseCXXInlineMethods.cpp \
-	ParseDecl.cpp \
-	ParseDeclCXX.cpp \
-	ParseExpr.cpp \
-	ParseExprCXX.cpp \
-	ParseInit.cpp \
-	ParseObjc.cpp \
-	ParseOpenMP.cpp \
-	ParsePragma.cpp \
-	ParseStmt.cpp \
-	ParseStmtAsm.cpp \
-	ParseTemplate.cpp \
-	ParseTentative.cpp \
-	Parser.cpp
-
-TGHDRS=	AttrList \
-	AttrParsedAttrList \
-	AttrParserStringSwitches \
-	Attrs \
-	CommentCommandList \
-	CommentNodes \
-	DeclNodes \
-	DiagnosticCommonKinds \
-	DiagnosticParseKinds \
-	DiagnosticSemaKinds \
-	StmtNodes
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libclangparse/Makefile.depend b/lib/clang/libclangparse/Makefile.depend
deleted file mode 100644
index 264ede1c30ce..000000000000
--- a/lib/clang/libclangparse/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libclangrewrite/Makefile b/lib/clang/libclangrewrite/Makefile
deleted file mode 100644
index ec770c3fee37..000000000000
--- a/lib/clang/libclangrewrite/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	clangrewrite
-
-SRCDIR=	tools/clang/lib/Rewrite
-SRCS=	DeltaTree.cpp \
-	HTMLRewrite.cpp \
-	RewriteRope.cpp \
-	Rewriter.cpp \
-	TokenRewriter.cpp
-
-TGHDRS=	AttrList \
-	Attrs \
-	DeclNodes \
-	DiagnosticCommonKinds \
-	StmtNodes
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libclangrewrite/Makefile.depend b/lib/clang/libclangrewrite/Makefile.depend
deleted file mode 100644
index 264ede1c30ce..000000000000
--- a/lib/clang/libclangrewrite/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libclangrewritefrontend/Makefile b/lib/clang/libclangrewritefrontend/Makefile
deleted file mode 100644
index bf8685885f29..000000000000
--- a/lib/clang/libclangrewritefrontend/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# $FreeBSD$
-
-.include <src.opts.mk>
-
-LIB=	clangrewritefrontend
-
-SRCDIR=	tools/clang/lib/Frontend/Rewrite
-SRCS=	FixItRewriter.cpp \
-	FrontendActions.cpp \
-	HTMLPrint.cpp \
-	InclusionRewriter.cpp \
-	RewriteMacros.cpp \
-	RewriteTest.cpp
-
-.if ${MK_CLANG_EXTRAS} != "no"
-SRCS+=	RewriteModernObjC.cpp \
-	RewriteObjC.cpp
-.endif
-
-TGHDRS=	AttrList \
-	AttrParsedAttrList \
-	Attrs \
-	CommentCommandList \
-	DeclNodes \
-	DiagnosticCommonKinds \
-	DiagnosticFrontendKinds \
-	StmtNodes
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libclangrewritefrontend/Makefile.depend b/lib/clang/libclangrewritefrontend/Makefile.depend
deleted file mode 100644
index 264ede1c30ce..000000000000
--- a/lib/clang/libclangrewritefrontend/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libclangsema/Makefile b/lib/clang/libclangsema/Makefile
deleted file mode 100644
index 0ab91e447a25..000000000000
--- a/lib/clang/libclangsema/Makefile
+++ /dev/null
@@ -1,75 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	clangsema
-
-SRCDIR=	tools/clang/lib/Sema
-SRCS=	AnalysisBasedWarnings.cpp \
-	AttributeList.cpp \
-	CodeCompleteConsumer.cpp \
-	DeclSpec.cpp \
-	DelayedDiagnostic.cpp \
-	IdentifierResolver.cpp \
-	JumpDiagnostics.cpp \
-	MultiplexExternalSemaSource.cpp \
-	Scope.cpp \
-	ScopeInfo.cpp \
-	Sema.cpp \
-	SemaAccess.cpp \
-	SemaAttr.cpp \
-	SemaCUDA.cpp \
-	SemaCXXScopeSpec.cpp \
-	SemaCast.cpp \
-	SemaChecking.cpp \
-	SemaCodeComplete.cpp \
-	SemaConsumer.cpp \
-	SemaCoroutine.cpp \
-	SemaDecl.cpp \
-	SemaDeclAttr.cpp \
-	SemaDeclCXX.cpp \
-	SemaDeclObjC.cpp \
-	SemaExceptionSpec.cpp \
-	SemaExpr.cpp \
-	SemaExprCXX.cpp \
-	SemaExprMember.cpp \
-	SemaExprObjC.cpp \
-	SemaFixItUtils.cpp \
-	SemaInit.cpp \
-	SemaLambda.cpp \
-	SemaLookup.cpp \
-	SemaObjCProperty.cpp \
-	SemaOpenMP.cpp \
-	SemaOverload.cpp \
-	SemaPseudoObject.cpp \
-	SemaStmt.cpp \
-	SemaStmtAsm.cpp \
-	SemaStmtAttr.cpp \
-	SemaTemplate.cpp \
-	SemaTemplateDeduction.cpp \
-	SemaTemplateInstantiate.cpp \
-	SemaTemplateInstantiateDecl.cpp \
-	SemaTemplateVariadic.cpp \
-	SemaType.cpp \
-	TypeLocBuilder.cpp
-
-TGHDRS=	AttrList \
-	AttrParsedAttrImpl \
-	AttrParsedAttrKinds \
-	AttrParsedAttrList \
-	AttrSpellingListIndex \
-	AttrTemplateInstantiate \
-	AttrVisitor \
-	Attrs \
-	CommentCommandList \
-	CommentNodes \
-	DeclNodes \
-	DiagnosticASTKinds \
-	DiagnosticCommentKinds \
-	DiagnosticCommonKinds \
-	DiagnosticParseKinds \
-	DiagnosticSemaKinds \
-	StmtNodes \
-	arm_neon
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libclangsema/Makefile.depend b/lib/clang/libclangsema/Makefile.depend
deleted file mode 100644
index 264ede1c30ce..000000000000
--- a/lib/clang/libclangsema/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libclangserialization/Makefile b/lib/clang/libclangserialization/Makefile
deleted file mode 100644
index bd9b2d830f72..000000000000
--- a/lib/clang/libclangserialization/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	clangserialization
-
-SRCDIR=	tools/clang/lib/Serialization
-SRCS=	ASTCommon.cpp \
-	ASTReader.cpp \
-	ASTReaderDecl.cpp \
-	ASTReaderStmt.cpp \
-	ASTWriter.cpp \
-	ASTWriterDecl.cpp \
-	ASTWriterStmt.cpp \
-	GeneratePCH.cpp \
-	GlobalModuleIndex.cpp \
-	Module.cpp \
-	ModuleFileExtension.cpp \
-	ModuleManager.cpp
-
-TGHDRS=	AttrList \
-	AttrPCHRead \
-	AttrPCHWrite \
-	AttrParsedAttrList \
-	Attrs \
-	CommentCommandList \
-	CommentNodes \
-	DeclNodes \
-	DiagnosticCommonKinds \
-	DiagnosticFrontendKinds \
-	DiagnosticSemaKinds \
-	DiagnosticSerializationKinds \
-	StmtNodes
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libclangserialization/Makefile.depend b/lib/clang/libclangserialization/Makefile.depend
deleted file mode 100644
index 264ede1c30ce..000000000000
--- a/lib/clang/libclangserialization/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libclangstaticanalyzercheckers/Makefile b/lib/clang/libclangstaticanalyzercheckers/Makefile
deleted file mode 100644
index ef69bff07b5b..000000000000
--- a/lib/clang/libclangstaticanalyzercheckers/Makefile
+++ /dev/null
@@ -1,98 +0,0 @@
-# $FreeBSD$
-
-.include <src.opts.mk>
-
-LIB=	clangstaticanalyzercheckers
-
-SRCDIR=	tools/clang/lib/StaticAnalyzer/Checkers
-SRCS=	AllocationDiagnostics.cpp \
-	AnalyzerStatsChecker.cpp \
-	ArrayBoundChecker.cpp \
-	ArrayBoundCheckerV2.cpp \
-	BasicObjCFoundationChecks.cpp \
-	BoolAssignmentChecker.cpp \
-	BuiltinFunctionChecker.cpp \
-	CStringChecker.cpp \
-	CStringSyntaxChecker.cpp \
-	CallAndMessageChecker.cpp \
-	CastSizeChecker.cpp \
-	CastToStructChecker.cpp \
-	CheckObjCDealloc.cpp \
-	CheckObjCInstMethSignature.cpp \
-	CheckSecuritySyntaxOnly.cpp \
-	CheckSizeofPointer.cpp \
-	ChrootChecker.cpp \
-	ClangCheckers.cpp \
-	DeadStoresChecker.cpp \
-	DebugCheckers.cpp \
-	DereferenceChecker.cpp \
-	DirectIvarAssignment.cpp \
-	DivZeroChecker.cpp \
-	DynamicTypeChecker.cpp \
-	DynamicTypePropagation.cpp \
-	ExprInspectionChecker.cpp \
-	FixedAddressChecker.cpp \
-	GenericTaintChecker.cpp \
-	IdenticalExprChecker.cpp \
-	IvarInvalidationChecker.cpp \
-	LLVMConventionsChecker.cpp \
-	LocalizationChecker.cpp \
-	MPI-Checker/MPIBugReporter.cpp \
-	MPI-Checker/MPIChecker.cpp \
-	MPI-Checker/MPIFunctionClassifier.cpp \
-	MacOSKeychainAPIChecker.cpp \
-	MacOSXAPIChecker.cpp \
-	MallocChecker.cpp \
-	MallocOverflowSecurityChecker.cpp \
-	MallocSizeofChecker.cpp \
-	NSAutoreleasePoolChecker.cpp \
-	NSErrorChecker.cpp \
-	NoReturnFunctionChecker.cpp \
-	NonNullParamChecker.cpp \
-	NullabilityChecker.cpp \
-	ObjCAtSyncChecker.cpp \
-	ObjCContainersASTChecker.cpp \
-	ObjCContainersChecker.cpp \
-	ObjCMissingSuperCallChecker.cpp \
-	ObjCSelfInitChecker.cpp \
-	ObjCSuperDeallocChecker.cpp \
-	ObjCUnusedIVarsChecker.cpp \
-	PaddingChecker.cpp \
-	PointerArithChecker.cpp \
-	PointerSubChecker.cpp \
-	PthreadLockChecker.cpp \
-	RetainCountChecker.cpp \
-	ReturnPointerRangeChecker.cpp \
-	ReturnUndefChecker.cpp \
-	SimpleStreamChecker.cpp \
-	StackAddrEscapeChecker.cpp \
-	StreamChecker.cpp \
-	TaintTesterChecker.cpp \
-	TestAfterDivZeroChecker.cpp \
-	TraversalChecker.cpp \
-	UndefBranchChecker.cpp \
-	UndefCapturedBlockVarChecker.cpp \
-	UndefResultChecker.cpp \
-	UndefinedArraySubscriptChecker.cpp \
-	UndefinedAssignmentChecker.cpp \
-	UnixAPIChecker.cpp \
-	UnreachableCodeChecker.cpp \
-	VLASizeChecker.cpp \
-	VforkChecker.cpp \
-	VirtualCallChecker.cpp
-
-.if ${MK_CLANG_EXTRAS} != "no"
-SRCS+=	CheckerDocumentation.cpp
-.endif
-
-TGHDRS=	AttrList \
-	AttrVisitor \
-	Attrs \
-	Checkers \
-	CommentCommandList \
-	CommentNodes \
-	DeclNodes \
-	DiagnosticCommonKinds \
-	StmtNodes
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libclangstaticanalyzercheckers/Makefile.depend b/lib/clang/libclangstaticanalyzercheckers/Makefile.depend
deleted file mode 100644
index 264ede1c30ce..000000000000
--- a/lib/clang/libclangstaticanalyzercheckers/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libclangstaticanalyzercore/Makefile b/lib/clang/libclangstaticanalyzercore/Makefile
deleted file mode 100644
index bfee77aef2bf..000000000000
--- a/lib/clang/libclangstaticanalyzercore/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	clangstaticanalyzercore
-
-SRCDIR=	tools/clang/lib/StaticAnalyzer/Core
-SRCS=	APSIntType.cpp \
-	AnalysisManager.cpp \
-	AnalyzerOptions.cpp \
-	BasicValueFactory.cpp \
-	BlockCounter.cpp \
-	BugReporter.cpp \
-	BugReporterVisitors.cpp \
-	CallEvent.cpp \
-	Checker.cpp \
-	CheckerContext.cpp \
-	CheckerHelpers.cpp \
-	CheckerManager.cpp \
-	CheckerRegistry.cpp \
-	CommonBugCategories.cpp \
-	ConstraintManager.cpp \
-	CoreEngine.cpp \
-	DynamicTypeMap.cpp \
-	Environment.cpp \
-	ExplodedGraph.cpp \
-	ExprEngine.cpp \
-	ExprEngineC.cpp \
-	ExprEngineCXX.cpp \
-	ExprEngineCallAndReturn.cpp \
-	ExprEngineObjC.cpp \
-	FunctionSummary.cpp \
-	HTMLDiagnostics.cpp \
-	IssueHash.cpp \
-	LoopWidening.cpp \
-	MemRegion.cpp \
-	PathDiagnostic.cpp \
-	PlistDiagnostics.cpp \
-	ProgramState.cpp \
-	RangeConstraintManager.cpp \
-	RegionStore.cpp \
-	SValBuilder.cpp \
-	SVals.cpp \
-	SimpleConstraintManager.cpp \
-	SimpleSValBuilder.cpp \
-	Store.cpp \
-	SubEngine.cpp \
-	SymbolManager.cpp
-
-TGHDRS=	AttrList \
-	Attrs \
-	CommentCommandList \
-	CommentNodes \
-	DeclNodes \
-	DiagnosticCommonKinds \
-	DiagnosticFrontendKinds \
-	StmtNodes
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libclangstaticanalyzercore/Makefile.depend b/lib/clang/libclangstaticanalyzercore/Makefile.depend
deleted file mode 100644
index 264ede1c30ce..000000000000
--- a/lib/clang/libclangstaticanalyzercore/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libclangstaticanalyzerfrontend/Makefile b/lib/clang/libclangstaticanalyzerfrontend/Makefile
deleted file mode 100644
index 5e074d920368..000000000000
--- a/lib/clang/libclangstaticanalyzerfrontend/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	clangstaticanalyzerfrontend
-
-SRCDIR=	tools/clang/lib/StaticAnalyzer/Frontend
-SRCS=	AnalysisConsumer.cpp \
-	CheckerRegistration.cpp \
-	FrontendActions.cpp \
-	ModelConsumer.cpp \
-	ModelInjector.cpp
-
-TGHDRS=	AttrList \
-	AttrParsedAttrList \
-	AttrVisitor \
-	Attrs \
-	Checkers \
-	CommentCommandList \
-	CommentNodes \
-	DeclNodes \
-	DiagnosticCommonKinds \
-	DiagnosticFrontendKinds \
-	StmtNodes
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libclangstaticanalyzerfrontend/Makefile.depend b/lib/clang/libclangstaticanalyzerfrontend/Makefile.depend
deleted file mode 100644
index 264ede1c30ce..000000000000
--- a/lib/clang/libclangstaticanalyzerfrontend/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libclangtooling/Makefile b/lib/clang/libclangtooling/Makefile
deleted file mode 100644
index ce4f7ebbe6fb..000000000000
--- a/lib/clang/libclangtooling/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $FreeBSD$
-
-.include <src.opts.mk>
-
-LIB=	clangtooling
-
-SRCDIR=	tools/clang/lib/Tooling
-SRCS=	ArgumentsAdjusters.cpp \
-	CommonOptionsParser.cpp \
-	CompilationDatabase.cpp \
-	FileMatchTrie.cpp \
-	JSONCompilationDatabase.cpp \
-	Refactoring.cpp \
-	RefactoringCallbacks.cpp \
-	Tooling.cpp
-
-.if ${MK_CLANG_EXTRAS} != "no"
-SRCS+=	FixIt.cpp
-.endif
-
-TGHDRS=	AttrList \
-	Attrs \
-	CommentCommandList \
-	DeclNodes \
-	DiagnosticCommonKinds \
-	DiagnosticDriverKinds \
-	DiagnosticFrontendKinds \
-	StmtNodes
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libclangtoolingcore/Makefile b/lib/clang/libclangtoolingcore/Makefile
deleted file mode 100644
index b8f9f96c965d..000000000000
--- a/lib/clang/libclangtoolingcore/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	clangtoolingcore
-
-SRCDIR=	tools/clang/lib/Tooling/Core
-CFLAGS+= -I${LLVM_SRCS}/tools
-SRCS=	Lookup.cpp \
-	QualTypeNames.cpp \
-	Replacement.cpp
-
-TGHDRS=	AttrList \
-	Attrs \
-	CommentCommandList \
-	DeclNodes \
-	DiagnosticCommonKinds \
-	StmtNodes
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libclangtoolingcore/Makefile.depend b/lib/clang/libclangtoolingcore/Makefile.depend
deleted file mode 100644
index 3e7f3f5e7165..000000000000
--- a/lib/clang/libclangtoolingcore/Makefile.depend
+++ /dev/null
@@ -1,15 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/liblldb/Makefile b/lib/clang/liblldb/Makefile
index dc1726a992d6..6fda218a033e 100644
--- a/lib/clang/liblldb/Makefile
+++ b/lib/clang/liblldb/Makefile
@@ -1,20 +1,596 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+LLVM_SRCS=	${.CURDIR}/../../../contrib/llvm
+CLANG_SRCS=	${LLVM_SRCS}/tools/clang
+LLDB_SRCS=	${LLVM_SRCS}/tools/lldb
 
-LIB=	lldb
+LIB=		lldb
+SRCDIR=		tools/lldb/source
 
-CFLAGS+=-I${.CURDIR}/../../../contrib/llvm/tools/lldb/source/Plugins/Process/POSIX
+CFLAGS+=	-I${LLDB_SRCS}/include
+CFLAGS+=	-I${LLDB_SRCS}/source
+CFLAGS+=	-I${LLDB_SRCS}/source/Plugins/Process/FreeBSD
+CFLAGS+=	-I${LLDB_SRCS}/source/Plugins/Process/POSIX
+CFLAGS+=	-I${LLDB_SRCS}/source/Plugins/Process/Utility
+CFLAGS+=	-I${.OBJDIR}/../../../lib/clang/libllvm
+CFLAGS+=	-I${.OBJDIR}/../../../lib/clang/libclang
+CFLAGS+=	-DLLDB_DISABLE_PYTHON
 
-SRCDIR=	tools/lldb/source
-SRCS=	lldb.cpp
+SRCS+=		API/SBAddress.cpp
+SRCS+=		API/SBAttachInfo.cpp
+SRCS+=		API/SBBlock.cpp
+SRCS+=		API/SBBreakpoint.cpp
+SRCS+=		API/SBBreakpointLocation.cpp
+SRCS+=		API/SBBroadcaster.cpp
+SRCS+=		API/SBCommandInterpreter.cpp
+SRCS+=		API/SBCommandReturnObject.cpp
+SRCS+=		API/SBCompileUnit.cpp
+SRCS+=		API/SBData.cpp
+SRCS+=		API/SBDebugger.cpp
+SRCS+=		API/SBDeclaration.cpp
+SRCS+=		API/SBError.cpp
+SRCS+=		API/SBEvent.cpp
+SRCS+=		API/SBExecutionContext.cpp
+SRCS+=		API/SBExpressionOptions.cpp
+SRCS+=		API/SBFileSpec.cpp
+SRCS+=		API/SBFileSpecList.cpp
+SRCS+=		API/SBFrame.cpp
+SRCS+=		API/SBFunction.cpp
+SRCS+=		API/SBHostOS.cpp
+SRCS+=		API/SBInstruction.cpp
+SRCS+=		API/SBInstructionList.cpp
+SRCS+=		API/SBLanguageRuntime.cpp
+SRCS+=		API/SBLaunchInfo.cpp
+SRCS+=		API/SBLineEntry.cpp
+SRCS+=		API/SBListener.cpp
+SRCS+=		API/SBMemoryRegionInfo.cpp
+SRCS+=		API/SBMemoryRegionInfoList.cpp
+SRCS+=		API/SBModule.cpp
+SRCS+=		API/SBModuleSpec.cpp
+SRCS+=		API/SBPlatform.cpp
+SRCS+=		API/SBProcess.cpp
+SRCS+=		API/SBQueue.cpp
+SRCS+=		API/SBQueueItem.cpp
+SRCS+=		API/SBSection.cpp
+SRCS+=		API/SBSourceManager.cpp
+SRCS+=		API/SBStream.cpp
+SRCS+=		API/SBStringList.cpp
+SRCS+=		API/SBSymbol.cpp
+SRCS+=		API/SBSymbolContext.cpp
+SRCS+=		API/SBSymbolContextList.cpp
+SRCS+=		API/SBTarget.cpp
+SRCS+=		API/SBThread.cpp
+SRCS+=		API/SBThreadCollection.cpp
+SRCS+=		API/SBThreadPlan.cpp
+SRCS+=		API/SBType.cpp
+SRCS+=		API/SBTypeCategory.cpp
+SRCS+=		API/SBTypeEnumMember.cpp
+SRCS+=		API/SBTypeFilter.cpp
+SRCS+=		API/SBTypeFormat.cpp
+SRCS+=		API/SBTypeNameSpecifier.cpp
+SRCS+=		API/SBTypeSummary.cpp
+SRCS+=		API/SBUnixSignals.cpp
+SRCS+=		API/SBValue.cpp
+SRCS+=		API/SBValueList.cpp
+SRCS+=		API/SBVariablesOptions.cpp
+SRCS+=		API/SBWatchpoint.cpp
+SRCS+=		API/SystemInitializerFull.cpp
+SRCS+=		Breakpoint/Breakpoint.cpp
+SRCS+=		Breakpoint/BreakpointID.cpp
+SRCS+=		Breakpoint/BreakpointIDList.cpp
+SRCS+=		Breakpoint/BreakpointList.cpp
+SRCS+=		Breakpoint/BreakpointLocation.cpp
+SRCS+=		Breakpoint/BreakpointLocationCollection.cpp
+SRCS+=		Breakpoint/BreakpointLocationList.cpp
+SRCS+=		Breakpoint/BreakpointOptions.cpp
+SRCS+=		Breakpoint/BreakpointResolver.cpp
+SRCS+=		Breakpoint/BreakpointResolverAddress.cpp
+SRCS+=		Breakpoint/BreakpointResolverFileLine.cpp
+SRCS+=		Breakpoint/BreakpointResolverFileRegex.cpp
+SRCS+=		Breakpoint/BreakpointResolverName.cpp
+SRCS+=		Breakpoint/BreakpointSite.cpp
+SRCS+=		Breakpoint/BreakpointSiteList.cpp
+SRCS+=		Breakpoint/Stoppoint.cpp
+SRCS+=		Breakpoint/StoppointCallbackContext.cpp
+SRCS+=		Breakpoint/StoppointLocation.cpp
+SRCS+=		Breakpoint/Watchpoint.cpp
+SRCS+=		Breakpoint/WatchpointList.cpp
+SRCS+=		Breakpoint/WatchpointOptions.cpp
+SRCS+=		Commands/CommandCompletions.cpp
+SRCS+=		Commands/CommandObjectApropos.cpp
+SRCS+=		Commands/CommandObjectArgs.cpp
+SRCS+=		Commands/CommandObjectBreakpoint.cpp
+SRCS+=		Commands/CommandObjectBreakpointCommand.cpp
+SRCS+=		Commands/CommandObjectBugreport.cpp
+SRCS+=		Commands/CommandObjectCommands.cpp
+SRCS+=		Commands/CommandObjectDisassemble.cpp
+SRCS+=		Commands/CommandObjectExpression.cpp
+SRCS+=		Commands/CommandObjectFrame.cpp
+SRCS+=		Commands/CommandObjectGUI.cpp
+SRCS+=		Commands/CommandObjectHelp.cpp
+SRCS+=		Commands/CommandObjectLanguage.cpp
+SRCS+=		Commands/CommandObjectLog.cpp
+SRCS+=		Commands/CommandObjectMemory.cpp
+SRCS+=		Commands/CommandObjectMultiword.cpp
+SRCS+=		Commands/CommandObjectPlatform.cpp
+SRCS+=		Commands/CommandObjectPlugin.cpp
+SRCS+=		Commands/CommandObjectProcess.cpp
+SRCS+=		Commands/CommandObjectQuit.cpp
+SRCS+=		Commands/CommandObjectRegister.cpp
+SRCS+=		Commands/CommandObjectSettings.cpp
+SRCS+=		Commands/CommandObjectSource.cpp
+SRCS+=		Commands/CommandObjectSyntax.cpp
+SRCS+=		Commands/CommandObjectTarget.cpp
+SRCS+=		Commands/CommandObjectThread.cpp
+SRCS+=		Commands/CommandObjectType.cpp
+SRCS+=		Commands/CommandObjectVersion.cpp
+SRCS+=		Commands/CommandObjectWatchpoint.cpp
+SRCS+=		Commands/CommandObjectWatchpointCommand.cpp
+SRCS+=		Core/Address.cpp
+SRCS+=		Core/AddressRange.cpp
+SRCS+=		Core/AddressResolver.cpp
+SRCS+=		Core/AddressResolverFileLine.cpp
+SRCS+=		Core/AddressResolverName.cpp
+SRCS+=		Core/ArchSpec.cpp
+SRCS+=		Core/Baton.cpp
+SRCS+=		Core/Broadcaster.cpp
+SRCS+=		Core/Communication.cpp
+SRCS+=		Core/Connection.cpp
+SRCS+=		Core/ConnectionSharedMemory.cpp
+SRCS+=		Core/ConstString.cpp
+SRCS+=		Core/CxaDemangle.cpp
+SRCS+=		Core/DataBufferHeap.cpp
+SRCS+=		Core/DataBufferMemoryMap.cpp
+SRCS+=		Core/DataEncoder.cpp
+SRCS+=		Core/DataExtractor.cpp
+SRCS+=		Core/Debugger.cpp
+SRCS+=		Core/Disassembler.cpp
+SRCS+=		Core/DynamicLoader.cpp
+SRCS+=		Core/EmulateInstruction.cpp
+SRCS+=		Core/Error.cpp
+SRCS+=		Core/Event.cpp
+SRCS+=		Core/FastDemangle.cpp
+SRCS+=		Core/FileLineResolver.cpp
+SRCS+=		Core/FileSpecList.cpp
+SRCS+=		Core/FormatEntity.cpp
+SRCS+=		Core/IOHandler.cpp
+SRCS+=		Core/Listener.cpp
+SRCS+=		Core/Log.cpp
+SRCS+=		Core/Logging.cpp
+SRCS+=		Core/Mangled.cpp
+SRCS+=		Core/Module.cpp
+SRCS+=		Core/ModuleChild.cpp
+SRCS+=		Core/ModuleList.cpp
+SRCS+=		Core/Opcode.cpp
+SRCS+=		Core/PluginManager.cpp
+SRCS+=		Core/RegisterValue.cpp
+SRCS+=		Core/RegularExpression.cpp
+SRCS+=		Core/Scalar.cpp
+SRCS+=		Core/SearchFilter.cpp
+SRCS+=		Core/Section.cpp
+SRCS+=		Core/SourceManager.cpp
+SRCS+=		Core/State.cpp
+SRCS+=		Core/Stream.cpp
+SRCS+=		Core/StreamAsynchronousIO.cpp
+SRCS+=		Core/StreamCallback.cpp
+SRCS+=		Core/StreamFile.cpp
+SRCS+=		Core/StreamGDBRemote.cpp
+SRCS+=		Core/StreamString.cpp
+SRCS+=		Core/StringList.cpp
+SRCS+=		Core/StructuredData.cpp
+SRCS+=		Core/Timer.cpp
+SRCS+=		Core/UUID.cpp
+SRCS+=		Core/UserID.cpp
+SRCS+=		Core/UserSettingsController.cpp
+SRCS+=		Core/VMRange.cpp
+SRCS+=		Core/Value.cpp
+SRCS+=		Core/ValueObject.cpp
+SRCS+=		Core/ValueObjectCast.cpp
+SRCS+=		Core/ValueObjectChild.cpp
+SRCS+=		Core/ValueObjectConstResult.cpp
+SRCS+=		Core/ValueObjectConstResultCast.cpp
+SRCS+=		Core/ValueObjectConstResultChild.cpp
+SRCS+=		Core/ValueObjectConstResultImpl.cpp
+SRCS+=		Core/ValueObjectDynamicValue.cpp
+SRCS+=		Core/ValueObjectList.cpp
+SRCS+=		Core/ValueObjectMemory.cpp
+SRCS+=		Core/ValueObjectRegister.cpp
+SRCS+=		Core/ValueObjectSyntheticFilter.cpp
+SRCS+=		Core/ValueObjectVariable.cpp
+SRCS+=		DataFormatters/CXXFunctionPointer.cpp
+SRCS+=		DataFormatters/DataVisualization.cpp
+SRCS+=		DataFormatters/DumpValueObjectOptions.cpp
+SRCS+=		DataFormatters/FormatCache.cpp
+SRCS+=		DataFormatters/FormatClasses.cpp
+SRCS+=		DataFormatters/FormatManager.cpp
+SRCS+=		DataFormatters/FormattersHelpers.cpp
+SRCS+=		DataFormatters/LanguageCategory.cpp
+SRCS+=		DataFormatters/StringPrinter.cpp
+SRCS+=		DataFormatters/TypeCategory.cpp
+SRCS+=		DataFormatters/TypeCategoryMap.cpp
+SRCS+=		DataFormatters/TypeFormat.cpp
+SRCS+=		DataFormatters/TypeSummary.cpp
+SRCS+=		DataFormatters/TypeSynthetic.cpp
+SRCS+=		DataFormatters/ValueObjectPrinter.cpp
+SRCS+=		DataFormatters/VectorType.cpp
+SRCS+=		Expression/DWARFExpression.cpp
+SRCS+=		Expression/DiagnosticManager.cpp
+SRCS+=		Expression/Expression.cpp
+SRCS+=		Expression/ExpressionSourceCode.cpp
+SRCS+=		Expression/ExpressionVariable.cpp
+SRCS+=		Expression/FunctionCaller.cpp
+SRCS+=		Expression/IRDynamicChecks.cpp
+SRCS+=		Expression/IRExecutionUnit.cpp
+SRCS+=		Expression/IRInterpreter.cpp
+SRCS+=		Expression/IRMemoryMap.cpp
+SRCS+=		Expression/LLVMUserExpression.cpp
+SRCS+=		Expression/Materializer.cpp
+SRCS+=		Expression/REPL.cpp
+SRCS+=		Expression/UserExpression.cpp
+SRCS+=		Expression/UtilityFunction.cpp
+SRCS+=		Host/common/Condition.cpp
+SRCS+=		Host/common/Editline.cpp
+SRCS+=		Host/common/File.cpp
+SRCS+=		Host/common/FileCache.cpp
+SRCS+=		Host/common/FileSpec.cpp
+SRCS+=		Host/common/FileSystem.cpp
+SRCS+=		Host/common/Host.cpp
+SRCS+=		Host/common/HostInfoBase.cpp
+SRCS+=		Host/common/HostNativeThreadBase.cpp
+SRCS+=		Host/common/HostProcess.cpp
+SRCS+=		Host/common/HostThread.cpp
+SRCS+=		Host/common/IOObject.cpp
+SRCS+=		Host/common/LockFileBase.cpp
+SRCS+=		Host/common/MonitoringProcessLauncher.cpp
+SRCS+=		Host/common/Mutex.cpp
+SRCS+=		Host/common/NativeBreakpointList.cpp
+SRCS+=		Host/common/NativeWatchpointList.cpp
+SRCS+=		Host/common/OptionParser.cpp
+SRCS+=		Host/common/PipeBase.cpp
+SRCS+=		Host/common/ProcessRunLock.cpp
+SRCS+=		Host/common/Socket.cpp
+SRCS+=		Host/common/SocketAddress.cpp
+SRCS+=		Host/common/StringConvert.cpp
+SRCS+=		Host/common/Symbols.cpp
+SRCS+=		Host/common/TCPSocket.cpp
+SRCS+=		Host/common/Terminal.cpp
+SRCS+=		Host/common/ThisThread.cpp
+SRCS+=		Host/common/ThreadLauncher.cpp
+SRCS+=		Host/common/TimeValue.cpp
+SRCS+=		Host/common/UDPSocket.cpp
+SRCS+=		Host/common/XML.cpp
+SRCS+=		Host/freebsd/Host.cpp
+SRCS+=		Host/freebsd/HostInfoFreeBSD.cpp
+SRCS+=		Host/freebsd/HostThreadFreeBSD.cpp
+SRCS+=		Host/freebsd/ThisThread.cpp
+SRCS+=		Host/posix/ConnectionFileDescriptorPosix.cpp
+SRCS+=		Host/posix/DomainSocket.cpp
+SRCS+=		Host/posix/FileSystem.cpp
+SRCS+=		Host/posix/HostInfoPosix.cpp
+SRCS+=		Host/posix/HostProcessPosix.cpp
+SRCS+=		Host/posix/HostThreadPosix.cpp
+SRCS+=		Host/posix/LockFilePosix.cpp
+SRCS+=		Host/posix/MainLoopPosix.cpp
+SRCS+=		Host/posix/PipePosix.cpp
+SRCS+=		Host/posix/ProcessLauncherPosix.cpp
+SRCS+=		Initialization/SystemInitializer.cpp
+SRCS+=		Initialization/SystemInitializerCommon.cpp
+SRCS+=		Initialization/SystemLifetimeManager.cpp
+SRCS+=		Interpreter/Args.cpp
+SRCS+=		Interpreter/CommandAlias.cpp
+SRCS+=		Interpreter/CommandHistory.cpp
+SRCS+=		Interpreter/CommandInterpreter.cpp
+SRCS+=		Interpreter/CommandObject.cpp
+SRCS+=		Interpreter/CommandObjectRegexCommand.cpp
+SRCS+=		Interpreter/CommandObjectScript.cpp
+SRCS+=		Interpreter/CommandOptionValidators.cpp
+SRCS+=		Interpreter/CommandReturnObject.cpp
+SRCS+=		Interpreter/OptionGroupArchitecture.cpp
+SRCS+=		Interpreter/OptionGroupBoolean.cpp
+SRCS+=		Interpreter/OptionGroupFile.cpp
+SRCS+=		Interpreter/OptionGroupFormat.cpp
+SRCS+=		Interpreter/OptionGroupOutputFile.cpp
+SRCS+=		Interpreter/OptionGroupPlatform.cpp
+SRCS+=		Interpreter/OptionGroupString.cpp
+SRCS+=		Interpreter/OptionGroupUInt64.cpp
+SRCS+=		Interpreter/OptionGroupUUID.cpp
+SRCS+=		Interpreter/OptionGroupValueObjectDisplay.cpp
+SRCS+=		Interpreter/OptionGroupVariable.cpp
+SRCS+=		Interpreter/OptionGroupWatchpoint.cpp
+SRCS+=		Interpreter/OptionValue.cpp
+SRCS+=		Interpreter/OptionValueArch.cpp
+SRCS+=		Interpreter/OptionValueArgs.cpp
+SRCS+=		Interpreter/OptionValueArray.cpp
+SRCS+=		Interpreter/OptionValueBoolean.cpp
+SRCS+=		Interpreter/OptionValueChar.cpp
+SRCS+=		Interpreter/OptionValueDictionary.cpp
+SRCS+=		Interpreter/OptionValueEnumeration.cpp
+SRCS+=		Interpreter/OptionValueFileSpec.cpp
+SRCS+=		Interpreter/OptionValueFileSpecLIst.cpp
+SRCS+=		Interpreter/OptionValueFormat.cpp
+SRCS+=		Interpreter/OptionValueFormatEntity.cpp
+SRCS+=		Interpreter/OptionValueLanguage.cpp
+SRCS+=		Interpreter/OptionValuePathMappings.cpp
+SRCS+=		Interpreter/OptionValueProperties.cpp
+SRCS+=		Interpreter/OptionValueRegex.cpp
+SRCS+=		Interpreter/OptionValueSInt64.cpp
+SRCS+=		Interpreter/OptionValueString.cpp
+SRCS+=		Interpreter/OptionValueUInt64.cpp
+SRCS+=		Interpreter/OptionValueUUID.cpp
+SRCS+=		Interpreter/Options.cpp
+SRCS+=		Interpreter/Property.cpp
+SRCS+=		Interpreter/ScriptInterpreter.cpp
+SRCS+=		Plugins/ABI/SysV-arm/ABISysV_arm.cpp
+SRCS+=		Plugins/ABI/SysV-arm64/ABISysV_arm64.cpp
+SRCS+=		Plugins/ABI/SysV-i386/ABISysV_i386.cpp
+SRCS+=		Plugins/ABI/SysV-mips/ABISysV_mips.cpp
+SRCS+=		Plugins/ABI/SysV-mips64/ABISysV_mips64.cpp
+SRCS+=		Plugins/ABI/SysV-ppc/ABISysV_ppc.cpp
+SRCS+=		Plugins/ABI/SysV-ppc64/ABISysV_ppc64.cpp
+SRCS+=		Plugins/ABI/SysV-x86_64/ABISysV_x86_64.cpp
+SRCS+=		Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp
+SRCS+=		Plugins/DynamicLoader/POSIX-DYLD/AuxVector.cpp
+SRCS+=		Plugins/DynamicLoader/POSIX-DYLD/DYLDRendezvous.cpp
+SRCS+=		Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp
+SRCS+=		Plugins/DynamicLoader/Static/DynamicLoaderStatic.cpp
+SRCS+=		Plugins/ExpressionParser/Clang/ASTDumper.cpp
+SRCS+=		Plugins/ExpressionParser/Clang/ASTResultSynthesizer.cpp
+SRCS+=		Plugins/ExpressionParser/Clang/ASTStructExtractor.cpp
+SRCS+=		Plugins/ExpressionParser/Clang/ClangASTSource.cpp
+SRCS+=		Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp
+SRCS+=		Plugins/ExpressionParser/Clang/ClangExpressionParser.cpp
+SRCS+=		Plugins/ExpressionParser/Clang/ClangExpressionVariable.cpp
+SRCS+=		Plugins/ExpressionParser/Clang/ClangFunctionCaller.cpp
+SRCS+=		Plugins/ExpressionParser/Clang/ClangModulesDeclVendor.cpp
+SRCS+=		Plugins/ExpressionParser/Clang/ClangPersistentVariables.cpp
+SRCS+=		Plugins/ExpressionParser/Clang/ClangUserExpression.cpp
+SRCS+=		Plugins/ExpressionParser/Clang/ClangUtilityFunction.cpp
+SRCS+=		Plugins/ExpressionParser/Clang/IRForTarget.cpp
+SRCS+=		Plugins/ExpressionParser/Go/GoLexer.cpp
+SRCS+=		Plugins/ExpressionParser/Go/GoParser.cpp
+SRCS+=		Plugins/ExpressionParser/Go/GoUserExpression.cpp
+SRCS+=		Plugins/Instruction/ARM/EmulateInstructionARM.cpp
+SRCS+=		Plugins/Instruction/ARM/EmulationStateARM.cpp
+SRCS+=		Plugins/Instruction/ARM64/EmulateInstructionARM64.cpp
+SRCS+=		Plugins/Instruction/MIPS/EmulateInstructionMIPS.cpp
+SRCS+=		Plugins/Instruction/MIPS64/EmulateInstructionMIPS64.cpp
+SRCS+=		Plugins/InstrumentationRuntime/AddressSanitizer/AddressSanitizerRuntime.cpp
+SRCS+=		Plugins/JITLoader/GDB/JITLoaderGDB.cpp
+SRCS+=		Plugins/Language/CPlusPlus/BlockPointer.cpp
+SRCS+=		Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp
+SRCS+=		Plugins/Language/CPlusPlus/LibCxx.cpp
+SRCS+=		Plugins/Language/CPlusPlus/LibCxxAtomic.cpp
+SRCS+=		Plugins/Language/CPlusPlus/LibCxxInitializerList.cpp
+SRCS+=		Plugins/Language/CPlusPlus/LibCxxList.cpp
+SRCS+=		Plugins/Language/CPlusPlus/LibCxxMap.cpp
+SRCS+=		Plugins/Language/CPlusPlus/LibCxxUnorderedMap.cpp
+SRCS+=		Plugins/Language/CPlusPlus/LibCxxVector.cpp
+SRCS+=		Plugins/Language/CPlusPlus/LibStdcpp.cpp
+SRCS+=		Plugins/Language/ObjC/CF.cpp
+SRCS+=		Plugins/Language/ObjC/Cocoa.cpp
+SRCS+=		Plugins/Language/ObjC/NSArray.cpp
+SRCS+=		Plugins/Language/ObjC/NSDictionary.cpp
+SRCS+=		Plugins/Language/ObjC/NSError.cpp
+SRCS+=		Plugins/Language/ObjC/NSException.cpp
+SRCS+=		Plugins/Language/ObjC/NSIndexPath.cpp
+SRCS+=		Plugins/Language/ObjC/NSSet.cpp
+SRCS+=		Plugins/Language/ObjC/NSString.cpp
+SRCS+=		Plugins/Language/ObjC/ObjCLanguage.cpp
+SRCS+=		Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp
+SRCS+=		Plugins/MemoryHistory/asan/MemoryHistoryASan.cpp
+SRCS+=		Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp
+SRCS+=		Plugins/ObjectFile/ELF/ELFHeader.cpp
+SRCS+=		Plugins/ObjectFile/ELF/ObjectFileELF.cpp
+SRCS+=		Plugins/ObjectFile/JIT/ObjectFileJIT.cpp
+SRCS+=		Plugins/Platform/FreeBSD/PlatformFreeBSD.cpp
+SRCS+=		Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp
+SRCS+=		Plugins/Process/FreeBSD/FreeBSDThread.cpp
+SRCS+=		Plugins/Process/FreeBSD/POSIXStopInfo.cpp
+SRCS+=		Plugins/Process/FreeBSD/ProcessFreeBSD.cpp
+SRCS+=		Plugins/Process/FreeBSD/ProcessMonitor.cpp
+SRCS+=		Plugins/Process/FreeBSD/RegisterContextPOSIXProcessMonitor_arm.cpp
+SRCS+=		Plugins/Process/FreeBSD/RegisterContextPOSIXProcessMonitor_arm64.cpp
+SRCS+=		Plugins/Process/FreeBSD/RegisterContextPOSIXProcessMonitor_mips64.cpp
+SRCS+=		Plugins/Process/FreeBSD/RegisterContextPOSIXProcessMonitor_powerpc.cpp
+SRCS+=		Plugins/Process/FreeBSD/RegisterContextPOSIXProcessMonitor_x86.cpp
+SRCS+=		Plugins/Process/POSIX/CrashReason.cpp
+SRCS+=		Plugins/Process/POSIX/ProcessMessage.cpp
+SRCS+=		Plugins/Process/POSIX/ProcessPOSIXLog.cpp
+SRCS+=		Plugins/Process/Utility/DynamicRegisterInfo.cpp
+SRCS+=		Plugins/Process/Utility/FreeBSDSignals.cpp
+SRCS+=		Plugins/Process/Utility/GDBRemoteSignals.cpp
+SRCS+=		Plugins/Process/Utility/HistoryThread.cpp
+SRCS+=		Plugins/Process/Utility/HistoryUnwind.cpp
+SRCS+=		Plugins/Process/Utility/InferiorCallPOSIX.cpp
+SRCS+=		Plugins/Process/Utility/LinuxSignals.cpp
+SRCS+=		Plugins/Process/Utility/MipsLinuxSignals.cpp
+SRCS+=		Plugins/Process/Utility/NetBSDSignals.cpp
+SRCS+=		Plugins/Process/Utility/RegisterContextDarwin_i386.cpp
+SRCS+=		Plugins/Process/Utility/RegisterContextDarwin_x86_64.cpp
+SRCS+=		Plugins/Process/Utility/RegisterContextDummy.cpp
+SRCS+=		Plugins/Process/Utility/RegisterContextFreeBSD_arm.cpp
+SRCS+=		Plugins/Process/Utility/RegisterContextFreeBSD_arm64.cpp
+SRCS+=		Plugins/Process/Utility/RegisterContextFreeBSD_i386.cpp
+SRCS+=		Plugins/Process/Utility/RegisterContextFreeBSD_mips64.cpp
+SRCS+=		Plugins/Process/Utility/RegisterContextFreeBSD_powerpc.cpp
+SRCS+=		Plugins/Process/Utility/RegisterContextFreeBSD_x86_64.cpp
+SRCS+=		Plugins/Process/Utility/RegisterContextHistory.cpp
+SRCS+=		Plugins/Process/Utility/RegisterContextLLDB.cpp
+SRCS+=		Plugins/Process/Utility/RegisterContextLinux_arm.cpp
+SRCS+=		Plugins/Process/Utility/RegisterContextLinux_arm64.cpp
+SRCS+=		Plugins/Process/Utility/RegisterContextLinux_i386.cpp
+SRCS+=		Plugins/Process/Utility/RegisterContextLinux_mips.cpp
+SRCS+=		Plugins/Process/Utility/RegisterContextLinux_x86_64.cpp
+SRCS+=		Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.cpp
+SRCS+=		Plugins/Process/Utility/RegisterContextMemory.cpp
+SRCS+=		Plugins/Process/Utility/RegisterContextPOSIX_arm.cpp
+SRCS+=		Plugins/Process/Utility/RegisterContextPOSIX_arm64.cpp
+SRCS+=		Plugins/Process/Utility/RegisterContextPOSIX_mips64.cpp
+SRCS+=		Plugins/Process/Utility/RegisterContextPOSIX_powerpc.cpp
+SRCS+=		Plugins/Process/Utility/RegisterContextPOSIX_x86.cpp
+SRCS+=		Plugins/Process/Utility/RegisterContextThreadMemory.cpp
+SRCS+=		Plugins/Process/Utility/StopInfoMachException.cpp
+SRCS+=		Plugins/Process/Utility/ThreadMemory.cpp
+SRCS+=		Plugins/Process/Utility/UnwindLLDB.cpp
+SRCS+=		Plugins/Process/Utility/UnwindMacOSXFrameBackchain.cpp
+SRCS+=		Plugins/Process/elf-core/ProcessElfCore.cpp
+SRCS+=		Plugins/Process/elf-core/RegisterContextPOSIXCore_arm.cpp
+SRCS+=		Plugins/Process/elf-core/RegisterContextPOSIXCore_arm64.cpp
+SRCS+=		Plugins/Process/elf-core/RegisterContextPOSIXCore_mips64.cpp
+SRCS+=		Plugins/Process/elf-core/RegisterContextPOSIXCore_powerpc.cpp
+SRCS+=		Plugins/Process/elf-core/RegisterContextPOSIXCore_x86_64.cpp
+SRCS+=		Plugins/Process/elf-core/ThreadElfCore.cpp
+SRCS+=		Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
+SRCS+=		Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp
+SRCS+=		Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.cpp
+SRCS+=		Plugins/Process/gdb-remote/GDBRemoteCommunicationServerCommon.cpp
+SRCS+=		Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp
+SRCS+=		Plugins/Process/gdb-remote/GDBRemoteCommunicationServerPlatform.cpp
+SRCS+=		Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp
+SRCS+=		Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
+SRCS+=		Plugins/Process/gdb-remote/ProcessGDBRemoteLog.cpp
+SRCS+=		Plugins/Process/gdb-remote/ThreadGDBRemote.cpp
+SRCS+=		Plugins/ScriptInterpreter/None/ScriptInterpreterNone.cpp
+SRCS+=		Plugins/SymbolFile/DWARF/DIERef.cpp
+SRCS+=		Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp
+SRCS+=		Plugins/SymbolFile/DWARF/DWARFASTParserGo.cpp
+SRCS+=		Plugins/SymbolFile/DWARF/DWARFAbbreviationDeclaration.cpp
+SRCS+=		Plugins/SymbolFile/DWARF/DWARFAttribute.cpp
+SRCS+=		Plugins/SymbolFile/DWARF/DWARFCompileUnit.cpp
+SRCS+=		Plugins/SymbolFile/DWARF/DWARFDIE.cpp
+SRCS+=		Plugins/SymbolFile/DWARF/DWARFDIECollection.cpp
+SRCS+=		Plugins/SymbolFile/DWARF/DWARFDataExtractor.cpp
+SRCS+=		Plugins/SymbolFile/DWARF/DWARFDebugAbbrev.cpp
+SRCS+=		Plugins/SymbolFile/DWARF/DWARFDebugArangeSet.cpp
+SRCS+=		Plugins/SymbolFile/DWARF/DWARFDebugAranges.cpp
+SRCS+=		Plugins/SymbolFile/DWARF/DWARFDebugInfo.cpp
+SRCS+=		Plugins/SymbolFile/DWARF/DWARFDebugInfoEntry.cpp
+SRCS+=		Plugins/SymbolFile/DWARF/DWARFDebugLine.cpp
+SRCS+=		Plugins/SymbolFile/DWARF/DWARFDebugMacro.cpp
+SRCS+=		Plugins/SymbolFile/DWARF/DWARFDebugPubnamesSet.cpp
+SRCS+=		Plugins/SymbolFile/DWARF/DWARFDebugRanges.cpp
+SRCS+=		Plugins/SymbolFile/DWARF/DWARFDeclContext.cpp
+SRCS+=		Plugins/SymbolFile/DWARF/DWARFDefines.cpp
+SRCS+=		Plugins/SymbolFile/DWARF/DWARFFormValue.cpp
+SRCS+=		Plugins/SymbolFile/DWARF/HashedNameToDIE.cpp
+SRCS+=		Plugins/SymbolFile/DWARF/LogChannelDWARF.cpp
+SRCS+=		Plugins/SymbolFile/DWARF/NameToDIE.cpp
+SRCS+=		Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
+SRCS+=		Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp
+SRCS+=		Plugins/SymbolFile/DWARF/SymbolFileDWARFDwo.cpp
+SRCS+=		Plugins/SymbolFile/DWARF/UniqueDWARFASTType.cpp
+SRCS+=		Plugins/SymbolFile/Symtab/SymbolFileSymtab.cpp
+SRCS+=		Plugins/SymbolVendor/ELF/SymbolVendorELF.cpp
+SRCS+=		Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.cpp
+SRCS+=		Plugins/UnwindAssembly/x86/UnwindAssembly-x86.cpp
+SRCS+=		Symbol/ArmUnwindInfo.cpp
+SRCS+=		Symbol/Block.cpp
+SRCS+=		Symbol/ClangASTContext.cpp
+SRCS+=		Symbol/ClangASTImporter.cpp
+SRCS+=		Symbol/ClangExternalASTSourceCallbacks.cpp
+SRCS+=		Symbol/ClangExternalASTSourceCommon.cpp
+SRCS+=		Symbol/ClangUtil.cpp
+SRCS+=		Symbol/CompactUnwindInfo.cpp
+SRCS+=		Symbol/CompileUnit.cpp
+SRCS+=		Symbol/CompilerDecl.cpp
+SRCS+=		Symbol/CompilerDeclContext.cpp
+SRCS+=		Symbol/CompilerType.cpp
+SRCS+=		Symbol/DWARFCallFrameInfo.cpp
+SRCS+=		Symbol/DebugMacros.cpp
+SRCS+=		Symbol/Declaration.cpp
+SRCS+=		Symbol/FuncUnwinders.cpp
+SRCS+=		Symbol/Function.cpp
+SRCS+=		Symbol/GoASTContext.cpp
+SRCS+=		Symbol/LineEntry.cpp
+SRCS+=		Symbol/LineTable.cpp
+SRCS+=		Symbol/ObjectFile.cpp
+SRCS+=		Symbol/Symbol.cpp
+SRCS+=		Symbol/SymbolContext.cpp
+SRCS+=		Symbol/SymbolFile.cpp
+SRCS+=		Symbol/SymbolVendor.cpp
+SRCS+=		Symbol/Symtab.cpp
+SRCS+=		Symbol/Type.cpp
+SRCS+=		Symbol/TypeList.cpp
+SRCS+=		Symbol/TypeMap.cpp
+SRCS+=		Symbol/TypeSystem.cpp
+SRCS+=		Symbol/UnwindPlan.cpp
+SRCS+=		Symbol/UnwindTable.cpp
+SRCS+=		Symbol/Variable.cpp
+SRCS+=		Symbol/VariableList.cpp
+SRCS+=		Target/ABI.cpp
+SRCS+=		Target/CPPLanguageRuntime.cpp
+SRCS+=		Target/ExecutionContext.cpp
+SRCS+=		Target/FileAction.cpp
+SRCS+=		Target/InstrumentationRuntime.cpp
+SRCS+=		Target/InstrumentationRuntimeStopInfo.cpp
+SRCS+=		Target/JITLoader.cpp
+SRCS+=		Target/JITLoaderList.cpp
+SRCS+=		Target/Language.cpp
+SRCS+=		Target/LanguageRuntime.cpp
+SRCS+=		Target/Memory.cpp
+SRCS+=		Target/MemoryHistory.cpp
+SRCS+=		Target/ObjCLanguageRuntime.cpp
+SRCS+=		Target/OperatingSystem.cpp
+SRCS+=		Target/PathMappingList.cpp
+SRCS+=		Target/Platform.cpp
+SRCS+=		Target/Process.cpp
+SRCS+=		Target/ProcessInfo.cpp
+SRCS+=		Target/ProcessLaunchInfo.cpp
+SRCS+=		Target/Queue.cpp
+SRCS+=		Target/QueueItem.cpp
+SRCS+=		Target/QueueList.cpp
+SRCS+=		Target/RegisterContext.cpp
+SRCS+=		Target/SectionLoadHistory.cpp
+SRCS+=		Target/SectionLoadList.cpp
+SRCS+=		Target/StackFrame.cpp
+SRCS+=		Target/StackFrameList.cpp
+SRCS+=		Target/StackID.cpp
+SRCS+=		Target/StopInfo.cpp
+SRCS+=		Target/SystemRuntime.cpp
+SRCS+=		Target/Target.cpp
+SRCS+=		Target/TargetList.cpp
+SRCS+=		Target/Thread.cpp
+SRCS+=		Target/ThreadCollection.cpp
+SRCS+=		Target/ThreadList.cpp
+SRCS+=		Target/ThreadPlan.cpp
+SRCS+=		Target/ThreadPlanBase.cpp
+SRCS+=		Target/ThreadPlanCallFunction.cpp
+SRCS+=		Target/ThreadPlanCallFunctionUsingABI.cpp
+SRCS+=		Target/ThreadPlanCallUserExpression.cpp
+SRCS+=		Target/ThreadPlanPython.cpp
+SRCS+=		Target/ThreadPlanRunToAddress.cpp
+SRCS+=		Target/ThreadPlanShouldStopHere.cpp
+SRCS+=		Target/ThreadPlanStepInRange.cpp
+SRCS+=		Target/ThreadPlanStepInstruction.cpp
+SRCS+=		Target/ThreadPlanStepOut.cpp
+SRCS+=		Target/ThreadPlanStepOverBreakpoint.cpp
+SRCS+=		Target/ThreadPlanStepOverRange.cpp
+SRCS+=		Target/ThreadPlanStepRange.cpp
+SRCS+=		Target/ThreadPlanStepThrough.cpp
+SRCS+=		Target/ThreadPlanStepUntil.cpp
+SRCS+=		Target/ThreadPlanTracer.cpp
+SRCS+=		Target/ThreadSpec.cpp
+SRCS+=		Target/UnixSignals.cpp
+SRCS+=		Target/UnwindAssembly.cpp
+SRCS+=		Utility/ARM64_DWARF_Registers.cpp
+SRCS+=		Utility/ARM_DWARF_Registers.cpp
+SRCS+=		Utility/ConvertEnum.cpp
+SRCS+=		Utility/JSON.cpp
+SRCS+=		Utility/LLDBAssert.cpp
+SRCS+=		Utility/ModuleCache.cpp
+SRCS+=		Utility/NameMatches.cpp
+SRCS+=		Utility/PseudoTerminal.cpp
+SRCS+=		Utility/RegisterNumber.cpp
+SRCS+=		Utility/SharingPtr.cpp
+SRCS+=		Utility/StringExtractor.cpp
+SRCS+=		Utility/StringExtractorGDBRemote.cpp
+SRCS+=		Utility/StringLexer.cpp
+SRCS+=		Utility/TaskPool.cpp
+SRCS+=		Utility/UriParser.cpp
+SRCS+=		lldb.cpp
 
+.include "../clang.build.mk"
 
-TGHDRS=	AttrList \
-	Attrs \
-	DiagnosticCommonKinds \
-	DeclNodes \
-	StmtNodes \
-	CommentCommandList
+INTERNALLIB=
 
-.include "../lldb.lib.mk"
+.include <bsd.lib.mk>
diff --git a/lib/clang/liblldb/Makefile.depend b/lib/clang/liblldb/Makefile.depend
deleted file mode 100644
index 260fd9c2488f..000000000000
--- a/lib/clang/liblldb/Makefile.depend
+++ /dev/null
@@ -1,15 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	usr.bin/clang/clang-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/liblldbAPI/Makefile b/lib/clang/liblldbAPI/Makefile
deleted file mode 100644
index 354b01ef33f8..000000000000
--- a/lib/clang/liblldbAPI/Makefile
+++ /dev/null
@@ -1,77 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	lldbAPI
-
-SRCDIR=	tools/lldb/source/API
-SRCS=	SBAddress.cpp \
-	SBAttachInfo.cpp \
-	SBBlock.cpp \
-	SBBreakpoint.cpp \
-	SBBreakpointLocation.cpp \
-	SBBroadcaster.cpp \
-	SBCommandInterpreter.cpp \
-	SBCommandReturnObject.cpp \
-	SBCommunication.cpp \
-	SBCompileUnit.cpp \
-	SBData.cpp \
-	SBDebugger.cpp \
-	SBDeclaration.cpp \
-	SBError.cpp \
-	SBEvent.cpp \
-	SBExecutionContext.cpp \
-	SBExpressionOptions.cpp \
-	SBFileSpec.cpp \
-	SBFileSpecList.cpp \
-	SBFrame.cpp \
-	SBFunction.cpp \
-	SBHostOS.cpp \
-	SBInstruction.cpp \
-	SBInstructionList.cpp \
-	SBLanguageRuntime.cpp \
-	SBLaunchInfo.cpp \
-	SBLineEntry.cpp \
-	SBListener.cpp \
-	SBMemoryRegionInfo.cpp \
-	SBMemoryRegionInfoList.cpp \
-	SBModule.cpp \
-	SBModuleSpec.cpp \
-	SBPlatform.cpp \
-	SBProcess.cpp \
-	SBQueue.cpp \
-	SBQueueItem.cpp \
-	SBSection.cpp \
-	SBSourceManager.cpp \
-	SBStream.cpp \
-	SBStringList.cpp \
-	SBSymbol.cpp \
-	SBSymbolContext.cpp \
-	SBSymbolContextList.cpp \
-	SBTarget.cpp \
-	SBThread.cpp \
-	SBThreadCollection.cpp \
-	SBThreadPlan.cpp \
-	SBType.cpp \
-	SBTypeCategory.cpp \
-	SBTypeEnumMember.cpp \
-	SBTypeFilter.cpp \
-	SBTypeFormat.cpp \
-	SBTypeNameSpecifier.cpp \
-	SBTypeSummary.cpp \
-	SBTypeSynthetic.cpp \
-	SBUnixSignals.cpp \
-	SBValue.cpp \
-	SBValueList.cpp \
-	SBVariablesOptions.cpp \
-	SBWatchpoint.cpp \
-	SystemInitializerFull.cpp
-
-TGHDRS=	AttrList \
-	Attrs \
-	DiagnosticCommonKinds \
-	DeclNodes \
-	StmtNodes \
-	CommentCommandList
-
-.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbAPI/Makefile.depend b/lib/clang/liblldbAPI/Makefile.depend
deleted file mode 100644
index 264ede1c30ce..000000000000
--- a/lib/clang/liblldbAPI/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/liblldbBreakpoint/Makefile b/lib/clang/liblldbBreakpoint/Makefile
deleted file mode 100644
index b6885d83484e..000000000000
--- a/lib/clang/liblldbBreakpoint/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	lldbBreakpoint
-
-SRCDIR=	tools/lldb/source/Breakpoint
-SRCS=	Breakpoint.cpp \
-	BreakpointID.cpp \
-	BreakpointIDList.cpp \
-	BreakpointList.cpp \
-	BreakpointLocation.cpp \
-	BreakpointLocationCollection.cpp \
-	BreakpointLocationList.cpp \
-	BreakpointOptions.cpp \
-	BreakpointResolver.cpp \
-	BreakpointResolverAddress.cpp \
-	BreakpointResolverFileLine.cpp \
-	BreakpointResolverFileRegex.cpp \
-	BreakpointResolverName.cpp \
-	BreakpointSite.cpp \
-	BreakpointSiteList.cpp \
-	Stoppoint.cpp \
-	StoppointCallbackContext.cpp \
-	StoppointLocation.cpp \
-	Watchpoint.cpp \
-	WatchpointList.cpp \
-	WatchpointOptions.cpp
-
-TGHDRS=	AttrList \
-	Attrs \
-	DiagnosticCommonKinds \
-	DeclNodes \
-	StmtNodes \
-	CommentCommandList
-
-.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbBreakpoint/Makefile.depend b/lib/clang/liblldbBreakpoint/Makefile.depend
deleted file mode 100644
index 264ede1c30ce..000000000000
--- a/lib/clang/liblldbBreakpoint/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/liblldbCommands/Makefile b/lib/clang/liblldbCommands/Makefile
deleted file mode 100644
index d554be914b3b..000000000000
--- a/lib/clang/liblldbCommands/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	lldbCommands
-
-SRCDIR=	tools/lldb/source/Commands
-SRCS=	CommandCompletions.cpp \
-	CommandObjectApropos.cpp \
-	CommandObjectArgs.cpp \
-	CommandObjectBreakpoint.cpp \
-	CommandObjectBreakpointCommand.cpp \
-	CommandObjectBugreport.cpp \
-	CommandObjectCommands.cpp \
-	CommandObjectDisassemble.cpp \
-	CommandObjectExpression.cpp \
-	CommandObjectFrame.cpp \
-	CommandObjectGUI.cpp \
-	CommandObjectHelp.cpp \
-	CommandObjectLanguage.cpp \
-	CommandObjectLog.cpp \
-	CommandObjectMemory.cpp \
-	CommandObjectMultiword.cpp \
-	CommandObjectPlatform.cpp \
-	CommandObjectPlugin.cpp \
-	CommandObjectProcess.cpp \
-	CommandObjectQuit.cpp \
-	CommandObjectRegister.cpp \
-	CommandObjectSettings.cpp \
-	CommandObjectSource.cpp \
-	CommandObjectSyntax.cpp \
-	CommandObjectTarget.cpp \
-	CommandObjectThread.cpp \
-	CommandObjectType.cpp \
-	CommandObjectVersion.cpp \
-	CommandObjectWatchpoint.cpp \
-	CommandObjectWatchpointCommand.cpp
-
-TGHDRS=	AttrList \
-	Attrs \
-	DiagnosticCommonKinds \
-	DeclNodes \
-	StmtNodes \
-	CommentCommandList
-
-.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbCommands/Makefile.depend b/lib/clang/liblldbCommands/Makefile.depend
deleted file mode 100644
index 264ede1c30ce..000000000000
--- a/lib/clang/liblldbCommands/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/liblldbCore/Makefile b/lib/clang/liblldbCore/Makefile
deleted file mode 100644
index 3b83a0434644..000000000000
--- a/lib/clang/liblldbCore/Makefile
+++ /dev/null
@@ -1,89 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	lldbCore
-
-SRCDIR=	tools/lldb/source/Core
-SRCS=	Address.cpp \
-	AddressRange.cpp \
-	AddressResolver.cpp \
-	AddressResolverFileLine.cpp \
-	AddressResolverName.cpp \
-	ArchSpec.cpp \
-	Baton.cpp \
-	Broadcaster.cpp \
-	Communication.cpp \
-	Connection.cpp \
-	ConnectionMachPort.cpp \
-	ConnectionSharedMemory.cpp \
-	ConstString.cpp \
-	CxaDemangle.cpp \
-	DataBufferHeap.cpp \
-	DataBufferMemoryMap.cpp \
-	DataEncoder.cpp \
-	DataExtractor.cpp \
-	Debugger.cpp \
-	Disassembler.cpp \
-	DynamicLoader.cpp \
-	EmulateInstruction.cpp \
-	Error.cpp \
-	Event.cpp \
-	FastDemangle.cpp \
-	FileLineResolver.cpp \
-	FileSpecList.cpp \
-	FormatEntity.cpp \
-	History.cpp \
-	IOHandler.cpp \
-	Listener.cpp \
-	Log.cpp \
-	Logging.cpp \
-	Mangled.cpp \
-	Module.cpp \
-	ModuleChild.cpp \
-	ModuleList.cpp \
-	Opcode.cpp \
-	PluginManager.cpp \
-	RegisterValue.cpp \
-	RegularExpression.cpp \
-	Scalar.cpp \
-	SearchFilter.cpp \
-	Section.cpp \
-	SourceManager.cpp \
-	State.cpp \
-	Stream.cpp \
-	StreamAsynchronousIO.cpp \
-	StreamCallback.cpp \
-	StreamFile.cpp \
-	StreamGDBRemote.cpp \
-	StreamString.cpp \
-	StringList.cpp \
-	StructuredData.cpp \
-	Timer.cpp \
-	UUID.cpp \
-	UserID.cpp \
-	UserSettingsController.cpp \
-	VMRange.cpp \
-	Value.cpp \
-	ValueObject.cpp \
-	ValueObjectCast.cpp \
-	ValueObjectChild.cpp \
-	ValueObjectConstResult.cpp \
-	ValueObjectConstResultCast.cpp \
-	ValueObjectConstResultChild.cpp \
-	ValueObjectConstResultImpl.cpp \
-	ValueObjectDynamicValue.cpp \
-	ValueObjectList.cpp \
-	ValueObjectMemory.cpp \
-	ValueObjectRegister.cpp \
-	ValueObjectSyntheticFilter.cpp \
-	ValueObjectVariable.cpp
-
-TGHDRS=	AttrList \
-	Attrs \
-	DiagnosticCommonKinds \
-	DeclNodes \
-	StmtNodes \
-	CommentCommandList
-
-.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbCore/Makefile.depend b/lib/clang/liblldbCore/Makefile.depend
deleted file mode 100644
index fdb79dae061d..000000000000
--- a/lib/clang/liblldbCore/Makefile.depend
+++ /dev/null
@@ -1,19 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/libedit \
-	lib/msun \
-	lib/ncurses/ncursesw \
-	lib/ncurses/panelw \
-	usr.bin/clang/clang-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/liblldbDataFormatters/Makefile b/lib/clang/liblldbDataFormatters/Makefile
deleted file mode 100644
index f3b4168f9db2..000000000000
--- a/lib/clang/liblldbDataFormatters/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	lldbDataFormatters
-
-SRCDIR=	tools/lldb/source/DataFormatters
-SRCS=	CXXFunctionPointer.cpp \
-	DataVisualization.cpp \
-	DumpValueObjectOptions.cpp \
-	FormatCache.cpp \
-	FormatClasses.cpp \
-	FormatManager.cpp \
-	FormattersHelpers.cpp \
-	LanguageCategory.cpp \
-	StringPrinter.cpp \
-	TypeCategory.cpp \
-	TypeCategoryMap.cpp \
-	TypeFormat.cpp \
-	TypeSummary.cpp \
-	TypeSynthetic.cpp \
-	TypeValidator.cpp \
-	ValueObjectPrinter.cpp \
-	VectorType.cpp
-
-TGHDRS=	AttrList \
-	Attrs \
-	DiagnosticCommonKinds \
-	DeclNodes \
-	StmtNodes \
-	CommentCommandList
-
-.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbDataFormatters/Makefile.depend b/lib/clang/liblldbDataFormatters/Makefile.depend
deleted file mode 100644
index 264ede1c30ce..000000000000
--- a/lib/clang/liblldbDataFormatters/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/liblldbExpression/Makefile b/lib/clang/liblldbExpression/Makefile
deleted file mode 100644
index cf105c4a7d12..000000000000
--- a/lib/clang/liblldbExpression/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	lldbExpression
-
-SRCDIR=	tools/lldb/source/Expression
-SRCS=	DWARFExpression.cpp \
-	DiagnosticManager.cpp \
-	Expression.cpp \
-	ExpressionSourceCode.cpp \
-	ExpressionVariable.cpp \
-	FunctionCaller.cpp \
-	IRDynamicChecks.cpp \
-	IRExecutionUnit.cpp \
-	IRInterpreter.cpp \
-	IRMemoryMap.cpp \
-	LLVMUserExpression.cpp \
-	Materializer.cpp \
-	REPL.cpp \
-	UserExpression.cpp \
-	UtilityFunction.cpp
-
-TGHDRS=	Attributes \
-	DiagnosticCommonKinds \
-	DeclNodes \
-	StmtNodes \
-	CommentCommandList \
-	AttrList \
-	Attrs \
-	AttrParsedAttrList \
-	DiagnosticFrontendKinds \
-	DiagnosticSemaKinds \
-	Intrinsics
-
-.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbExpression/Makefile.depend b/lib/clang/liblldbExpression/Makefile.depend
deleted file mode 100644
index 7bd22d4fd361..000000000000
--- a/lib/clang/liblldbExpression/Makefile.depend
+++ /dev/null
@@ -1,17 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/liblldbHostCommon/Makefile b/lib/clang/liblldbHostCommon/Makefile
deleted file mode 100644
index 8393310ec409..000000000000
--- a/lib/clang/liblldbHostCommon/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	lldbHostCommon
-
-SRCDIR=	tools/lldb/source/Host/common
-SRCS=	Condition.cpp \
-	Editline.cpp \
-	File.cpp \
-	FileCache.cpp \
-	FileSpec.cpp \
-	FileSystem.cpp \
-	GetOptInc.cpp \
-	Host.cpp \
-	HostInfoBase.cpp \
-	HostNativeThreadBase.cpp \
-	HostProcess.cpp \
-	HostThread.cpp \
-	IOObject.cpp \
-	LockFileBase.cpp \
-	MonitoringProcessLauncher.cpp \
-	Mutex.cpp \
-	NativeBreakpoint.cpp \
-	NativeBreakpointList.cpp \
-	NativeProcessProtocol.cpp \
-	NativeRegisterContext.cpp \
-	NativeRegisterContextRegisterInfo.cpp \
-	NativeThreadProtocol.cpp \
-	NativeWatchpointList.cpp \
-	OptionParser.cpp \
-	PipeBase.cpp \
-	ProcessRunLock.cpp \
-	Socket.cpp \
-	SocketAddress.cpp \
-	SoftwareBreakpoint.cpp \
-	StringConvert.cpp \
-	Symbols.cpp \
-	TCPSocket.cpp \
-	Terminal.cpp \
-	ThisThread.cpp \
-	ThreadLauncher.cpp \
-	TimeValue.cpp \
-	UDPSocket.cpp \
-	XML.cpp
-
-TGHDRS=	AttrList \
-	Attrs \
-	DiagnosticCommonKinds \
-	DeclNodes \
-	StmtNodes \
-	CommentCommandList
-
-.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbHostCommon/Makefile.depend b/lib/clang/liblldbHostCommon/Makefile.depend
deleted file mode 100644
index 62a1e0a201e0..000000000000
--- a/lib/clang/liblldbHostCommon/Makefile.depend
+++ /dev/null
@@ -1,18 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/arpa \
-	include/xlocale \
-	lib/libc++ \
-	lib/libedit \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/liblldbHostFreeBSD/Makefile b/lib/clang/liblldbHostFreeBSD/Makefile
deleted file mode 100644
index 6ebc9b48d2d0..000000000000
--- a/lib/clang/liblldbHostFreeBSD/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	lldbHostFreeBSD
-
-SRCDIR=	tools/lldb/source/Host/freebsd
-SRCS=	Host.cpp \
-	HostInfoFreeBSD.cpp \
-	HostThreadFreeBSD.cpp \
-	ThisThread.cpp
-
-TGHDRS=	DiagnosticCommonKinds \
-	DeclNodes \
-	StmtNodes \
-	CommentCommandList
-
-.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbHostFreeBSD/Makefile.depend b/lib/clang/liblldbHostFreeBSD/Makefile.depend
deleted file mode 100644
index 1b6ca897ee8d..000000000000
--- a/lib/clang/liblldbHostFreeBSD/Makefile.depend
+++ /dev/null
@@ -1,17 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/libexecinfo \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/liblldbHostPOSIX/Makefile b/lib/clang/liblldbHostPOSIX/Makefile
deleted file mode 100644
index e83ed7099c28..000000000000
--- a/lib/clang/liblldbHostPOSIX/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	lldbHostPOSIX
-
-SRCDIR=	tools/lldb/source/Host/posix
-SRCS=	ConnectionFileDescriptorPosix.cpp \
-	DomainSocket.cpp \
-	FileSystem.cpp \
-	HostInfoPosix.cpp \
-	HostProcessPosix.cpp \
-	HostThreadPosix.cpp \
-	LockFilePosix.cpp \
-	MainLoopPosix.cpp \
-	PipePosix.cpp \
-	ProcessLauncherPosix.cpp
-
-.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbHostPOSIX/Makefile.depend b/lib/clang/liblldbHostPOSIX/Makefile.depend
deleted file mode 100644
index 3e7f3f5e7165..000000000000
--- a/lib/clang/liblldbHostPOSIX/Makefile.depend
+++ /dev/null
@@ -1,15 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/liblldbInitialization/Makefile b/lib/clang/liblldbInitialization/Makefile
deleted file mode 100644
index 15f7af9b4c51..000000000000
--- a/lib/clang/liblldbInitialization/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	lldbInitialization
-
-SRCDIR=	tools/lldb/source/Initialization
-SRCS=	SystemInitializer.cpp \
-	SystemInitializerCommon.cpp \
-	SystemLifetimeManager.cpp
-	
-TGHDRS=	CommentCommandList \
-	DeclNodes \
-	DiagnosticCommonKinds \
-	StmtNodes
-
-.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbInitialization/Makefile.depend b/lib/clang/liblldbInitialization/Makefile.depend
deleted file mode 100644
index 264ede1c30ce..000000000000
--- a/lib/clang/liblldbInitialization/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/liblldbInterpreter/Makefile b/lib/clang/liblldbInterpreter/Makefile
deleted file mode 100644
index d0a71784a26b..000000000000
--- a/lib/clang/liblldbInterpreter/Makefile
+++ /dev/null
@@ -1,60 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	lldbInterpreter
-
-SRCDIR=	tools/lldb/source/Interpreter
-SRCS=	Args.cpp \
-	CommandAlias.cpp \
-	CommandHistory.cpp \
-	CommandInterpreter.cpp \
-	CommandObject.cpp \
-	CommandObjectRegexCommand.cpp \
-	CommandObjectScript.cpp \
-	CommandOptionValidators.cpp \
-	CommandReturnObject.cpp \
-	OptionGroupArchitecture.cpp \
-	OptionGroupBoolean.cpp \
-	OptionGroupFile.cpp \
-	OptionGroupFormat.cpp \
-	OptionGroupOutputFile.cpp \
-	OptionGroupPlatform.cpp \
-	OptionGroupString.cpp \
-	OptionGroupUInt64.cpp \
-	OptionGroupUUID.cpp \
-	OptionGroupValueObjectDisplay.cpp \
-	OptionGroupVariable.cpp \
-	OptionGroupWatchpoint.cpp \
-	OptionValue.cpp \
-	OptionValueArch.cpp \
-	OptionValueArgs.cpp \
-	OptionValueArray.cpp \
-	OptionValueBoolean.cpp \
-	OptionValueChar.cpp \
-	OptionValueDictionary.cpp \
-	OptionValueEnumeration.cpp \
-	OptionValueFileSpec.cpp \
-	OptionValueFileSpecLIst.cpp \
-	OptionValueFormat.cpp \
-	OptionValueFormatEntity.cpp \
-	OptionValueLanguage.cpp \
-	OptionValuePathMappings.cpp \
-	OptionValueProperties.cpp \
-	OptionValueRegex.cpp \
-	OptionValueSInt64.cpp \
-	OptionValueString.cpp \
-	OptionValueUInt64.cpp \
-	OptionValueUUID.cpp \
-	Options.cpp \
-	Property.cpp \
-	ScriptInterpreter.cpp
-
-TGHDRS=	AttrList \
-	Attrs \
-	DiagnosticCommonKinds \
-	DeclNodes \
-	StmtNodes \
-	CommentCommandList
-
-.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbInterpreter/Makefile.depend b/lib/clang/liblldbInterpreter/Makefile.depend
deleted file mode 100644
index 709e5110227b..000000000000
--- a/lib/clang/liblldbInterpreter/Makefile.depend
+++ /dev/null
@@ -1,17 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/libedit \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/liblldbPluginABISysV_arm/Makefile b/lib/clang/liblldbPluginABISysV_arm/Makefile
deleted file mode 100644
index 9e59f5bf2b3f..000000000000
--- a/lib/clang/liblldbPluginABISysV_arm/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	lldbPluginABISysV_arm
-
-SRCDIR=	tools/lldb/source/Plugins/ABI/SysV-arm
-SRCS=	ABISysV_arm.cpp
-
-TGHDRS=	DiagnosticCommonKinds \
-	DeclNodes \
-	StmtNodes \
-	CommentCommandList
-
-.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbPluginABISysV_arm/Makefile.depend b/lib/clang/liblldbPluginABISysV_arm/Makefile.depend
deleted file mode 100644
index 264ede1c30ce..000000000000
--- a/lib/clang/liblldbPluginABISysV_arm/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/liblldbPluginABISysV_arm64/Makefile b/lib/clang/liblldbPluginABISysV_arm64/Makefile
deleted file mode 100644
index c5dbee699873..000000000000
--- a/lib/clang/liblldbPluginABISysV_arm64/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	lldbPluginABISysV_arm64
-
-SRCDIR=	tools/lldb/source/Plugins/ABI/SysV-arm64
-SRCS=	ABISysV_arm64.cpp
-
-TGHDRS=	DiagnosticCommonKinds \
-	DeclNodes \
-	StmtNodes \
-	CommentCommandList
-
-.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbPluginABISysV_arm64/Makefile.depend b/lib/clang/liblldbPluginABISysV_arm64/Makefile.depend
deleted file mode 100644
index 264ede1c30ce..000000000000
--- a/lib/clang/liblldbPluginABISysV_arm64/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/liblldbPluginABISysV_i386/Makefile b/lib/clang/liblldbPluginABISysV_i386/Makefile
deleted file mode 100644
index ecc26a1b5f27..000000000000
--- a/lib/clang/liblldbPluginABISysV_i386/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	lldbPluginABISysV_i386
-
-SRCDIR=	tools/lldb/source/Plugins/ABI/SysV-i386
-SRCS=	ABISysV_i386.cpp
-
-TGHDRS=	DiagnosticCommonKinds \
-	DeclNodes \
-	StmtNodes \
-	CommentCommandList
-
-.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbPluginABISysV_i386/Makefile.depend b/lib/clang/liblldbPluginABISysV_i386/Makefile.depend
deleted file mode 100644
index 264ede1c30ce..000000000000
--- a/lib/clang/liblldbPluginABISysV_i386/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/liblldbPluginABISysV_mips/Makefile b/lib/clang/liblldbPluginABISysV_mips/Makefile
deleted file mode 100644
index f80d87d9d065..000000000000
--- a/lib/clang/liblldbPluginABISysV_mips/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	lldbPluginABISysV_mips
-
-SRCDIR=	tools/lldb/source/Plugins/ABI/SysV-mips
-SRCS=	ABISysV_mips.cpp
-
-TGHDRS=	DiagnosticCommonKinds \
-	DeclNodes \
-	StmtNodes \
-	CommentCommandList
-
-.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbPluginABISysV_mips/Makefile.depend b/lib/clang/liblldbPluginABISysV_mips/Makefile.depend
deleted file mode 100644
index 264ede1c30ce..000000000000
--- a/lib/clang/liblldbPluginABISysV_mips/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/liblldbPluginABISysV_mips64/Makefile b/lib/clang/liblldbPluginABISysV_mips64/Makefile
deleted file mode 100644
index 293435f67f5c..000000000000
--- a/lib/clang/liblldbPluginABISysV_mips64/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	lldbPluginABISysV_mips64
-
-SRCDIR=	tools/lldb/source/Plugins/ABI/SysV-mips64
-SRCS=	ABISysV_mips64.cpp
-
-TGHDRS=	DiagnosticCommonKinds \
-	DeclNodes \
-	StmtNodes \
-	CommentCommandList
-
-.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbPluginABISysV_mips64/Makefile.depend b/lib/clang/liblldbPluginABISysV_mips64/Makefile.depend
deleted file mode 100644
index 264ede1c30ce..000000000000
--- a/lib/clang/liblldbPluginABISysV_mips64/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/liblldbPluginABISysV_ppc/Makefile b/lib/clang/liblldbPluginABISysV_ppc/Makefile
deleted file mode 100644
index 4cbbc0213bba..000000000000
--- a/lib/clang/liblldbPluginABISysV_ppc/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	lldbPluginABISysV_ppc
-
-SRCDIR=	tools/lldb/source/Plugins/ABI/SysV-ppc
-SRCS=	ABISysV_ppc.cpp
-
-TGHDRS=	DiagnosticCommonKinds \
-	DeclNodes \
-	StmtNodes \
-	CommentCommandList
-
-.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbPluginABISysV_ppc/Makefile.depend b/lib/clang/liblldbPluginABISysV_ppc/Makefile.depend
deleted file mode 100644
index 264ede1c30ce..000000000000
--- a/lib/clang/liblldbPluginABISysV_ppc/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/liblldbPluginABISysV_ppc64/Makefile b/lib/clang/liblldbPluginABISysV_ppc64/Makefile
deleted file mode 100644
index fe72ab55937e..000000000000
--- a/lib/clang/liblldbPluginABISysV_ppc64/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	lldbPluginABISysV_ppc64
-
-SRCDIR=	tools/lldb/source/Plugins/ABI/SysV-ppc64
-SRCS=	ABISysV_ppc64.cpp
-
-TGHDRS=	DiagnosticCommonKinds \
-	DeclNodes \
-	StmtNodes \
-	CommentCommandList
-
-.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbPluginABISysV_ppc64/Makefile.depend b/lib/clang/liblldbPluginABISysV_ppc64/Makefile.depend
deleted file mode 100644
index 264ede1c30ce..000000000000
--- a/lib/clang/liblldbPluginABISysV_ppc64/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/liblldbPluginABISysV_x86_64/Makefile b/lib/clang/liblldbPluginABISysV_x86_64/Makefile
deleted file mode 100644
index 730b10776c43..000000000000
--- a/lib/clang/liblldbPluginABISysV_x86_64/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	lldbPluginABISysV_x86_64
-
-SRCDIR=	tools/lldb/source/Plugins/ABI/SysV-x86_64
-SRCS=	ABISysV_x86_64.cpp
-
-TGHDRS=	DiagnosticCommonKinds \
-	DeclNodes \
-	StmtNodes \
-	CommentCommandList
-
-.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbPluginABISysV_x86_64/Makefile.depend b/lib/clang/liblldbPluginABISysV_x86_64/Makefile.depend
deleted file mode 100644
index 264ede1c30ce..000000000000
--- a/lib/clang/liblldbPluginABISysV_x86_64/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/liblldbPluginCPlusPlusLanguage/Makefile b/lib/clang/liblldbPluginCPlusPlusLanguage/Makefile
deleted file mode 100644
index 817578c8e43f..000000000000
--- a/lib/clang/liblldbPluginCPlusPlusLanguage/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	lldbPluginCPlusPlusLanguage
-
-SRCDIR=	tools/lldb/source/Plugins/Language/CPlusPlus
-SRCS=	BlockPointer.cpp \
-	CPlusPlusLanguage.cpp \
-	CxxStringTypes.cpp \
-	LibCxx.cpp \
-	LibCxxAtomic.cpp \
-	LibCxxInitializerList.cpp \
-	LibCxxList.cpp \
-	LibCxxMap.cpp \
-	LibCxxUnorderedMap.cpp \
-	LibCxxVector.cpp \
-	LibStdcpp.cpp
-
-TGHDRS=	AttrList \
-	Attrs \
-	CommentCommandList \
-	DeclNodes \
-	DiagnosticCommonKinds \
-	StmtNodes
-
-.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbPluginCPlusPlusLanguage/Makefile.depend b/lib/clang/liblldbPluginCPlusPlusLanguage/Makefile.depend
deleted file mode 100644
index 264ede1c30ce..000000000000
--- a/lib/clang/liblldbPluginCPlusPlusLanguage/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/liblldbPluginCXXItaniumABI/Makefile b/lib/clang/liblldbPluginCXXItaniumABI/Makefile
deleted file mode 100644
index 35376f236a35..000000000000
--- a/lib/clang/liblldbPluginCXXItaniumABI/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	lldbPluginCXXItaniumABI
-
-SRCDIR=	tools/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI
-SRCS=	ItaniumABILanguageRuntime.cpp
-
-TGHDRS=	DiagnosticCommonKinds \
-	DeclNodes \
-	StmtNodes \
-	CommentCommandList
-
-.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbPluginCXXItaniumABI/Makefile.depend b/lib/clang/liblldbPluginCXXItaniumABI/Makefile.depend
deleted file mode 100644
index 264ede1c30ce..000000000000
--- a/lib/clang/liblldbPluginCXXItaniumABI/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/liblldbPluginDisassemblerLLVM/Makefile b/lib/clang/liblldbPluginDisassemblerLLVM/Makefile
deleted file mode 100644
index 0b00ac57c215..000000000000
--- a/lib/clang/liblldbPluginDisassemblerLLVM/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	lldbPluginDisassemblerLLVM
-
-SRCDIR=	tools/lldb/source/Plugins/Disassembler/llvm
-SRCS=	DisassemblerLLVMC.cpp
-
-TGHDRS=	DiagnosticCommonKinds \
-	DeclNodes \
-	StmtNodes \
-	CommentCommandList
-
-.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbPluginDisassemblerLLVM/Makefile.depend b/lib/clang/liblldbPluginDisassemblerLLVM/Makefile.depend
deleted file mode 100644
index 264ede1c30ce..000000000000
--- a/lib/clang/liblldbPluginDisassemblerLLVM/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/liblldbPluginDynamicLoaderPosixDYLD/Makefile b/lib/clang/liblldbPluginDynamicLoaderPosixDYLD/Makefile
deleted file mode 100644
index 718607d787ff..000000000000
--- a/lib/clang/liblldbPluginDynamicLoaderPosixDYLD/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	lldbPluginDynamicLoaderPosixDYLD
-
-SRCDIR=	tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD
-SRCS=	AuxVector.cpp \
-	DYLDRendezvous.cpp \
-	DynamicLoaderPOSIXDYLD.cpp
-
-TGHDRS=	DiagnosticCommonKinds \
-	DeclNodes \
-	StmtNodes \
-	CommentCommandList
-
-.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbPluginDynamicLoaderPosixDYLD/Makefile.depend b/lib/clang/liblldbPluginDynamicLoaderPosixDYLD/Makefile.depend
deleted file mode 100644
index 264ede1c30ce..000000000000
--- a/lib/clang/liblldbPluginDynamicLoaderPosixDYLD/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/liblldbPluginDynamicLoaderStatic/Makefile b/lib/clang/liblldbPluginDynamicLoaderStatic/Makefile
deleted file mode 100644
index 9ebe62befa27..000000000000
--- a/lib/clang/liblldbPluginDynamicLoaderStatic/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	lldbPluginDynamicLoaderStatic
-
-SRCDIR=	tools/lldb/source/Plugins/DynamicLoader/Static
-SRCS=	DynamicLoaderStatic.cpp
-
-TGHDRS=	DiagnosticCommonKinds \
-	DeclNodes \
-	StmtNodes \
-	CommentCommandList
-
-.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbPluginDynamicLoaderStatic/Makefile.depend b/lib/clang/liblldbPluginDynamicLoaderStatic/Makefile.depend
deleted file mode 100644
index 264ede1c30ce..000000000000
--- a/lib/clang/liblldbPluginDynamicLoaderStatic/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/liblldbPluginExpressionParserClang/Makefile b/lib/clang/liblldbPluginExpressionParserClang/Makefile
deleted file mode 100644
index b3958cf7cc1e..000000000000
--- a/lib/clang/liblldbPluginExpressionParserClang/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	lldbPluginExpressionParserClang
-
-SRCDIR=	tools/lldb/source/Plugins/ExpressionParser/Clang
-SRCS=	ASTDumper.cpp \
-	ASTResultSynthesizer.cpp \
-	ASTStructExtractor.cpp \
-	ClangASTSource.cpp \
-	ClangExpressionDeclMap.cpp \
-	ClangExpressionParser.cpp \
-	ClangExpressionVariable.cpp \
-	ClangFunctionCaller.cpp \
-	ClangModulesDeclVendor.cpp \
-	ClangPersistentVariables.cpp \
-	ClangUserExpression.cpp \
-	ClangUtilityFunction.cpp \
-	IRForTarget.cpp
-
-TGHDRS=	Attributes \
-	AttrList \
-	AttrParsedAttrList \
-	Attrs \
-	CommentCommandList \
-	DeclNodes \
-	DiagnosticASTKinds \
-	DiagnosticCommonKinds \
-	DiagnosticFrontendKinds \
-	DiagnosticSemaKinds \
-	Intrinsics \
-	StmtNodes
-
-.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbPluginExpressionParserClang/Makefile.depend b/lib/clang/liblldbPluginExpressionParserClang/Makefile.depend
deleted file mode 100644
index 7bd22d4fd361..000000000000
--- a/lib/clang/liblldbPluginExpressionParserClang/Makefile.depend
+++ /dev/null
@@ -1,17 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/liblldbPluginExpressionParserGo/Makefile b/lib/clang/liblldbPluginExpressionParserGo/Makefile
deleted file mode 100644
index 79612f932b66..000000000000
--- a/lib/clang/liblldbPluginExpressionParserGo/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	lldbPluginExpressionParserGo
-
-SRCDIR=	tools/lldb/source/Plugins/ExpressionParser/Go
-SRCS=	GoLexer.cpp \
-	GoParser.cpp \
-	GoUserExpression.cpp
-
-.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbPluginExpressionParserGo/Makefile.depend b/lib/clang/liblldbPluginExpressionParserGo/Makefile.depend
deleted file mode 100644
index 3e7f3f5e7165..000000000000
--- a/lib/clang/liblldbPluginExpressionParserGo/Makefile.depend
+++ /dev/null
@@ -1,15 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/liblldbPluginInstructionARM/Makefile b/lib/clang/liblldbPluginInstructionARM/Makefile
deleted file mode 100644
index a9afb77856c0..000000000000
--- a/lib/clang/liblldbPluginInstructionARM/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	lldbPluginInstructionARM
-
-SRCDIR=	tools/lldb/source/Plugins/Instruction/ARM
-SRCS=	EmulateInstructionARM.cpp \
-	EmulationStateARM.cpp
-
-TGHDRS=	DiagnosticCommonKinds \
-	DeclNodes \
-	StmtNodes \
-	CommentCommandList
-
-.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbPluginInstructionARM/Makefile.depend b/lib/clang/liblldbPluginInstructionARM/Makefile.depend
deleted file mode 100644
index 264ede1c30ce..000000000000
--- a/lib/clang/liblldbPluginInstructionARM/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/liblldbPluginInstructionARM64/Makefile b/lib/clang/liblldbPluginInstructionARM64/Makefile
deleted file mode 100644
index 92d976e3dca4..000000000000
--- a/lib/clang/liblldbPluginInstructionARM64/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	lldbPluginInstructionARM64
-
-SRCDIR=	tools/lldb/source/Plugins/Instruction/ARM64
-SRCS=	EmulateInstructionARM64.cpp
-
-.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbPluginInstructionARM64/Makefile.depend b/lib/clang/liblldbPluginInstructionARM64/Makefile.depend
deleted file mode 100644
index 3e7f3f5e7165..000000000000
--- a/lib/clang/liblldbPluginInstructionARM64/Makefile.depend
+++ /dev/null
@@ -1,15 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/liblldbPluginInstructionMIPS/Makefile b/lib/clang/liblldbPluginInstructionMIPS/Makefile
deleted file mode 100644
index 5fdbcd153029..000000000000
--- a/lib/clang/liblldbPluginInstructionMIPS/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	lldbPluginInstructionMIPS
-
-SRCDIR=	tools/lldb/source/Plugins/Instruction/MIPS
-SRCS=	EmulateInstructionMIPS.cpp
-
-TGHDRS=	DiagnosticCommonKinds \
-	DeclNodes \
-	StmtNodes \
-	CommentCommandList
-
-.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbPluginInstructionMIPS/Makefile.depend b/lib/clang/liblldbPluginInstructionMIPS/Makefile.depend
deleted file mode 100644
index 264ede1c30ce..000000000000
--- a/lib/clang/liblldbPluginInstructionMIPS/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/liblldbPluginInstructionMIPS64/Makefile b/lib/clang/liblldbPluginInstructionMIPS64/Makefile
deleted file mode 100644
index 3779562d4d86..000000000000
--- a/lib/clang/liblldbPluginInstructionMIPS64/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	lldbPluginInstructionMIPS64
-
-SRCDIR=	tools/lldb/source/Plugins/Instruction/MIPS64
-SRCS=	EmulateInstructionMIPS64.cpp
-
-TGHDRS=	DiagnosticCommonKinds \
-	DeclNodes \
-	StmtNodes \
-	CommentCommandList
-
-.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbPluginInstructionMIPS64/Makefile.depend b/lib/clang/liblldbPluginInstructionMIPS64/Makefile.depend
deleted file mode 100644
index 264ede1c30ce..000000000000
--- a/lib/clang/liblldbPluginInstructionMIPS64/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/liblldbPluginInstrumentationRuntimeAddressSanitizer/Makefile b/lib/clang/liblldbPluginInstrumentationRuntimeAddressSanitizer/Makefile
deleted file mode 100644
index bb02244c7d01..000000000000
--- a/lib/clang/liblldbPluginInstrumentationRuntimeAddressSanitizer/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	lldbPluginInstrumentationRuntimeAddressSanitizer
-
-SRCDIR=	tools/lldb/source/Plugins/InstrumentationRuntime/AddressSanitizer
-SRCS=	AddressSanitizerRuntime.cpp
-
-TGHDRS=	AttrList \
-	Attrs \
-	DiagnosticCommonKinds \
-	DeclNodes \
-	StmtNodes \
-	CommentCommandList
-
-.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbPluginInstrumentationRuntimeAddressSanitizer/Makefile.depend b/lib/clang/liblldbPluginInstrumentationRuntimeAddressSanitizer/Makefile.depend
deleted file mode 100644
index 264ede1c30ce..000000000000
--- a/lib/clang/liblldbPluginInstrumentationRuntimeAddressSanitizer/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/liblldbPluginJITLoaderGDB/Makefile b/lib/clang/liblldbPluginJITLoaderGDB/Makefile
deleted file mode 100644
index 80e84dfbb270..000000000000
--- a/lib/clang/liblldbPluginJITLoaderGDB/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	lldbPluginJITLoaderGDB
-
-SRCDIR=	tools/lldb/source/Plugins/JITLoader/GDB
-SRCS=	JITLoaderGDB.cpp
-
-TGHDRS=	DiagnosticCommonKinds \
-	DeclNodes \
-	StmtNodes \
-	CommentCommandList
-
-.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbPluginJITLoaderGDB/Makefile.depend b/lib/clang/liblldbPluginJITLoaderGDB/Makefile.depend
deleted file mode 100644
index 264ede1c30ce..000000000000
--- a/lib/clang/liblldbPluginJITLoaderGDB/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/liblldbPluginMemoryHistoryASan/Makefile b/lib/clang/liblldbPluginMemoryHistoryASan/Makefile
deleted file mode 100644
index ac57d6a6a95e..000000000000
--- a/lib/clang/liblldbPluginMemoryHistoryASan/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	lldbPluginMemoryHistoryASan
-
-SRCDIR=	tools/lldb/source/Plugins/MemoryHistory/asan
-SRCS=	MemoryHistoryASan.cpp
-
-TGHDRS=	DiagnosticCommonKinds \
-	DeclNodes \
-	StmtNodes \
-	CommentCommandList
-
-.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbPluginMemoryHistoryASan/Makefile.depend b/lib/clang/liblldbPluginMemoryHistoryASan/Makefile.depend
deleted file mode 100644
index 264ede1c30ce..000000000000
--- a/lib/clang/liblldbPluginMemoryHistoryASan/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/liblldbPluginObjCLanguage/Makefile b/lib/clang/liblldbPluginObjCLanguage/Makefile
deleted file mode 100644
index 40b3cdebe637..000000000000
--- a/lib/clang/liblldbPluginObjCLanguage/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	lldbPluginObjCLanguage
-
-SRCDIR=	tools/lldb/source/Plugins/Language/ObjC/
-SRCS=	CF.cpp \
-	Cocoa.cpp \
-	CoreMedia.cpp \
-	NSArray.cpp \
-	NSDictionary.cpp \
-	NSError.cpp \
-	NSException.cpp \
-	NSIndexPath.cpp \
-	NSSet.cpp \
-	NSString.cpp \
-	ObjCLanguage.cpp
-
-TGHDRS=	AttrList \
-	Attrs \
-	CommentCommandList \
-	DeclNodes \
-	DiagnosticCommonKinds \
-	StmtNodes
-
-.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbPluginObjCLanguage/Makefile.depend b/lib/clang/liblldbPluginObjCLanguage/Makefile.depend
deleted file mode 100644
index 264ede1c30ce..000000000000
--- a/lib/clang/liblldbPluginObjCLanguage/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/liblldbPluginObjectContainerBSDArchive/Makefile b/lib/clang/liblldbPluginObjectContainerBSDArchive/Makefile
deleted file mode 100644
index 1d335826aa7c..000000000000
--- a/lib/clang/liblldbPluginObjectContainerBSDArchive/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	lldbPluginObjectContainerBSDArchive
-
-SRCDIR=	tools/lldb/source/Plugins/ObjectContainer/BSD-Archive
-SRCS=	ObjectContainerBSDArchive.cpp
-
-TGHDRS=	DiagnosticCommonKinds \
-	DeclNodes \
-	StmtNodes \
-	CommentCommandList
-
-.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbPluginObjectContainerBSDArchive/Makefile.depend b/lib/clang/liblldbPluginObjectContainerBSDArchive/Makefile.depend
deleted file mode 100644
index 264ede1c30ce..000000000000
--- a/lib/clang/liblldbPluginObjectContainerBSDArchive/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/liblldbPluginObjectFileELF/Makefile b/lib/clang/liblldbPluginObjectFileELF/Makefile
deleted file mode 100644
index 7bd3dfa7ced3..000000000000
--- a/lib/clang/liblldbPluginObjectFileELF/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	lldbPluginObjectFileELF
-
-SRCDIR=	tools/lldb/source/Plugins/ObjectFile/ELF
-SRCS=	ELFHeader.cpp \
-	ObjectFileELF.cpp
-
-TGHDRS=	DiagnosticCommonKinds \
-	DeclNodes \
-	StmtNodes \
-	CommentCommandList
-
-.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbPluginObjectFileELF/Makefile.depend b/lib/clang/liblldbPluginObjectFileELF/Makefile.depend
deleted file mode 100644
index 264ede1c30ce..000000000000
--- a/lib/clang/liblldbPluginObjectFileELF/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/liblldbPluginObjectFileJIT/Makefile b/lib/clang/liblldbPluginObjectFileJIT/Makefile
deleted file mode 100644
index 264035017afa..000000000000
--- a/lib/clang/liblldbPluginObjectFileJIT/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	lldbPluginObjectFileJIT
-
-SRCDIR=	tools/lldb/source/Plugins/ObjectFile/JIT
-SRCS=	ObjectFileJIT.cpp
-
-TGHDRS=	AttrList \
-	Attrs \
-	DiagnosticCommonKinds \
-	DeclNodes \
-	StmtNodes \
-	CommentCommandList
-
-.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbPluginObjectFileJIT/Makefile.depend b/lib/clang/liblldbPluginObjectFileJIT/Makefile.depend
deleted file mode 100644
index 264ede1c30ce..000000000000
--- a/lib/clang/liblldbPluginObjectFileJIT/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/liblldbPluginPlatformFreeBSD/Makefile b/lib/clang/liblldbPluginPlatformFreeBSD/Makefile
deleted file mode 100644
index c2eee8abf40c..000000000000
--- a/lib/clang/liblldbPluginPlatformFreeBSD/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	lldbPluginPlatformFreeBSD
-
-SRCDIR=	tools/lldb/source/Plugins/Platform/FreeBSD
-SRCS=	PlatformFreeBSD.cpp
-
-TGHDRS=	AttrList \
-	Attrs \
-	DiagnosticCommonKinds \
-	DeclNodes \
-	StmtNodes \
-	CommentCommandList
-
-.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbPluginPlatformFreeBSD/Makefile.depend b/lib/clang/liblldbPluginPlatformFreeBSD/Makefile.depend
deleted file mode 100644
index 264ede1c30ce..000000000000
--- a/lib/clang/liblldbPluginPlatformFreeBSD/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/liblldbPluginPlatformGDB/Makefile b/lib/clang/liblldbPluginPlatformGDB/Makefile
deleted file mode 100644
index 714a311bac54..000000000000
--- a/lib/clang/liblldbPluginPlatformGDB/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	lldbPluginPlatformGDB
-
-SRCDIR=	tools/lldb/source/Plugins/Platform/gdb-server
-SRCS=	PlatformRemoteGDBServer.cpp
-
-TGHDRS=	AttrList \
-	Attrs \
-	DiagnosticCommonKinds \
-	DeclNodes \
-	StmtNodes \
-	CommentCommandList
-
-.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbPluginPlatformGDB/Makefile.depend b/lib/clang/liblldbPluginPlatformGDB/Makefile.depend
deleted file mode 100644
index 264ede1c30ce..000000000000
--- a/lib/clang/liblldbPluginPlatformGDB/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/liblldbPluginProcessElfCore/Makefile b/lib/clang/liblldbPluginProcessElfCore/Makefile
deleted file mode 100644
index e77053403aa1..000000000000
--- a/lib/clang/liblldbPluginProcessElfCore/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	lldbPluginProcessElfCore
-
-CFLAGS+=-I${.CURDIR}/../../../contrib/llvm/tools/lldb/source/Plugins/Process/POSIX
-CFLAGS+=-I${.CURDIR}/../../../contrib/llvm/tools/lldb/source/Plugins/Process/Utility
-
-SRCDIR=	tools/lldb/source/Plugins/Process/elf-core
-SRCS=	ProcessElfCore.cpp \
-	RegisterContextPOSIXCore_arm.cpp \
-	RegisterContextPOSIXCore_arm64.cpp \
-	RegisterContextPOSIXCore_mips64.cpp \
-	RegisterContextPOSIXCore_powerpc.cpp \
-	RegisterContextPOSIXCore_x86_64.cpp \
-	ThreadElfCore.cpp
-	
-TGHDRS=	DiagnosticCommonKinds \
-	DeclNodes \
-	StmtNodes \
-	CommentCommandList
-
-.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbPluginProcessElfCore/Makefile.depend b/lib/clang/liblldbPluginProcessElfCore/Makefile.depend
deleted file mode 100644
index 264ede1c30ce..000000000000
--- a/lib/clang/liblldbPluginProcessElfCore/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/liblldbPluginProcessFreeBSD/Makefile b/lib/clang/liblldbPluginProcessFreeBSD/Makefile
deleted file mode 100644
index 037d97639d17..000000000000
--- a/lib/clang/liblldbPluginProcessFreeBSD/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	lldbPluginProcessFreeBSD
-
-# include_directories(.)
-CFLAGS+=-I${.CURDIR}/../../../contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD
-CFLAGS+=-I${.CURDIR}/../../../contrib/llvm/tools/lldb/source/Plugins/Process/POSIX
-CFLAGS+=-I${.CURDIR}/../../../contrib/llvm/tools/lldb/source/Plugins/Process/Utility
-
-SRCDIR=	tools/lldb/source/Plugins/Process/FreeBSD
-SRCS=	FreeBSDThread.cpp \
-	POSIXStopInfo.cpp \
-	ProcessFreeBSD.cpp \
-	ProcessMonitor.cpp \
-	RegisterContextPOSIXProcessMonitor_arm.cpp \
-	RegisterContextPOSIXProcessMonitor_arm64.cpp \
-	RegisterContextPOSIXProcessMonitor_mips64.cpp \
-	RegisterContextPOSIXProcessMonitor_powerpc.cpp \
-	RegisterContextPOSIXProcessMonitor_x86.cpp
-
-TGHDRS=	DiagnosticCommonKinds \
-	DeclNodes \
-	StmtNodes \
-	CommentCommandList
-
-.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbPluginProcessFreeBSD/Makefile.depend b/lib/clang/liblldbPluginProcessFreeBSD/Makefile.depend
deleted file mode 100644
index 264ede1c30ce..000000000000
--- a/lib/clang/liblldbPluginProcessFreeBSD/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/liblldbPluginProcessGDBRemote/Makefile b/lib/clang/liblldbPluginProcessGDBRemote/Makefile
deleted file mode 100644
index ec59e3c4ee45..000000000000
--- a/lib/clang/liblldbPluginProcessGDBRemote/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	lldbPluginProcessGDBRemote
-
-SRCDIR=	tools/lldb/source/Plugins/Process/gdb-remote
-SRCS=	GDBRemoteCommunication.cpp \
-	GDBRemoteCommunicationClient.cpp \
-	GDBRemoteCommunicationServer.cpp \
-	GDBRemoteCommunicationServerCommon.cpp \
-	GDBRemoteCommunicationServerLLGS.cpp \
-	GDBRemoteCommunicationServerPlatform.cpp \
-	GDBRemoteRegisterContext.cpp \
-	ProcessGDBRemote.cpp \
-	ProcessGDBRemoteLog.cpp \
-	ThreadGDBRemote.cpp
-
-TGHDRS=	AttrList \
-	Attrs \
-	DiagnosticCommonKinds \
-	DeclNodes \
-	StmtNodes \
-	CommentCommandList
-
-.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbPluginProcessGDBRemote/Makefile.depend b/lib/clang/liblldbPluginProcessGDBRemote/Makefile.depend
deleted file mode 100644
index 264ede1c30ce..000000000000
--- a/lib/clang/liblldbPluginProcessGDBRemote/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/liblldbPluginProcessPOSIX/Makefile b/lib/clang/liblldbPluginProcessPOSIX/Makefile
deleted file mode 100644
index 8c73930c60a5..000000000000
--- a/lib/clang/liblldbPluginProcessPOSIX/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	lldbPluginProcessPOSIX
-
-# include_directories(.)
-CFLAGS+=-I${.CURDIR}/../../../contrib/llvm/tools/lldb/source/Plugins/Process/POSIX
-CFLAGS+=-I${.CURDIR}/../../../contrib/llvm/tools/lldb/source/Plugins/Process/Utility
-CFLAGS+=-I${.CURDIR}/../../../contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD
-
-SRCDIR=	tools/lldb/source/Plugins/Process/POSIX
-SRCS=	CrashReason.cpp \
-	ProcessMessage.cpp \
-	ProcessPOSIXLog.cpp
-
-TGHDRS=	AttrList \
-	Attrs \
-	DiagnosticCommonKinds \
-	DeclNodes \
-	StmtNodes \
-	CommentCommandList
-
-.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbPluginProcessPOSIX/Makefile.depend b/lib/clang/liblldbPluginProcessPOSIX/Makefile.depend
deleted file mode 100644
index 264ede1c30ce..000000000000
--- a/lib/clang/liblldbPluginProcessPOSIX/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/liblldbPluginProcessUtility/Makefile b/lib/clang/liblldbPluginProcessUtility/Makefile
deleted file mode 100644
index 8e7af94bd760..000000000000
--- a/lib/clang/liblldbPluginProcessUtility/Makefile
+++ /dev/null
@@ -1,58 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	lldbPluginProcessUtility
-
-SRCDIR=	tools/lldb/source/Plugins/Process/Utility
-SRCS=	DynamicRegisterInfo.cpp \
-	FreeBSDSignals.cpp \
-	GDBRemoteSignals.cpp \
-	HistoryThread.cpp \
-	HistoryUnwind.cpp \
-	InferiorCallPOSIX.cpp \
-	LinuxSignals.cpp \
-	MipsLinuxSignals.cpp \
-	NetBSDSignals.cpp \
-	RegisterContextDarwin_arm.cpp \
-	RegisterContextDarwin_arm64.cpp \
-	RegisterContextDarwin_i386.cpp \
-	RegisterContextDarwin_x86_64.cpp \
-	RegisterContextDummy.cpp \
-	RegisterContextFreeBSD_arm.cpp \
-	RegisterContextFreeBSD_arm64.cpp \
-	RegisterContextFreeBSD_i386.cpp \
-	RegisterContextFreeBSD_mips64.cpp \
-	RegisterContextFreeBSD_powerpc.cpp \
-	RegisterContextFreeBSD_x86_64.cpp \
-	RegisterContextHistory.cpp \
-	RegisterContextLLDB.cpp \
-	RegisterContextLinux_arm.cpp \
-	RegisterContextLinux_arm64.cpp \
-	RegisterContextLinux_i386.cpp \
-	RegisterContextLinux_mips.cpp \
-	RegisterContextLinux_x86_64.cpp \
-	RegisterContextMacOSXFrameBackchain.cpp \
-	RegisterContextMach_arm.cpp \
-	RegisterContextMach_i386.cpp \
-	RegisterContextMach_x86_64.cpp \
-	RegisterContextMemory.cpp \
-	RegisterContextPOSIX_arm.cpp \
-	RegisterContextPOSIX_arm64.cpp \
-	RegisterContextPOSIX_mips64.cpp \
-	RegisterContextPOSIX_powerpc.cpp \
-	RegisterContextPOSIX_x86.cpp \
-	RegisterContextThreadMemory.cpp \
-	StopInfoMachException.cpp \
-	ThreadMemory.cpp \
-	UnwindLLDB.cpp \
-	UnwindMacOSXFrameBackchain.cpp
-
-TGHDRS=	AttrList \
-	Attrs \
-	DiagnosticCommonKinds \
-	DeclNodes \
-	StmtNodes \
-	CommentCommandList
-
-.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbPluginProcessUtility/Makefile.depend b/lib/clang/liblldbPluginProcessUtility/Makefile.depend
deleted file mode 100644
index 264ede1c30ce..000000000000
--- a/lib/clang/liblldbPluginProcessUtility/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/liblldbPluginScriptInterpreterNone/Makefile b/lib/clang/liblldbPluginScriptInterpreterNone/Makefile
deleted file mode 100644
index d837539b443c..000000000000
--- a/lib/clang/liblldbPluginScriptInterpreterNone/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	lldbPluginScriptInterpreterNone
-
-SRCDIR=	tools/lldb/source/Plugins/ScriptInterpreter/None
-SRCS=	ScriptInterpreterNone.cpp
-
-.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbPluginScriptInterpreterNone/Makefile.depend b/lib/clang/liblldbPluginScriptInterpreterNone/Makefile.depend
deleted file mode 100644
index 3e7f3f5e7165..000000000000
--- a/lib/clang/liblldbPluginScriptInterpreterNone/Makefile.depend
+++ /dev/null
@@ -1,15 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/liblldbPluginSymbolFileDWARF/Makefile b/lib/clang/liblldbPluginSymbolFileDWARF/Makefile
deleted file mode 100644
index 8a73597d84e1..000000000000
--- a/lib/clang/liblldbPluginSymbolFileDWARF/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	lldbPluginSymbolFileDWARF
-
-SRCDIR=	tools/lldb/source/Plugins/SymbolFile/DWARF
-SRCS=	DIERef.cpp \
-	DWARFASTParserClang.cpp \
-	DWARFASTParserGo.cpp \
-	DWARFAbbreviationDeclaration.cpp \
-	DWARFAttribute.cpp \
-	DWARFCompileUnit.cpp \
-	DWARFDIE.cpp \
-	DWARFDIECollection.cpp \
-	DWARFDataExtractor.cpp \
-	DWARFDebugAbbrev.cpp \
-	DWARFDebugArangeSet.cpp \
-	DWARFDebugAranges.cpp \
-	DWARFDebugInfo.cpp \
-	DWARFDebugInfoEntry.cpp \
-	DWARFDebugLine.cpp \
-	DWARFDebugMacinfo.cpp \
-	DWARFDebugMacinfoEntry.cpp \
-	DWARFDebugMacro.cpp \
-	DWARFDebugPubnames.cpp \
-	DWARFDebugPubnamesSet.cpp \
-	DWARFDebugRanges.cpp \
-	DWARFDeclContext.cpp \
-	DWARFDefines.cpp \
-	DWARFFormValue.cpp \
-	HashedNameToDIE.cpp \
-	LogChannelDWARF.cpp \
-	NameToDIE.cpp \
-	SymbolFileDWARF.cpp \
-	SymbolFileDWARFDebugMap.cpp \
-	SymbolFileDWARFDwo.cpp \
-	UniqueDWARFASTType.cpp
-
-TGHDRS=	AttrList \
-	Attrs \
-	DiagnosticCommonKinds \
-	DeclNodes \
-	StmtNodes \
-	CommentCommandList \
-	AttrParsedAttrList \
-	DiagnosticFrontendKinds \
-	Intrinsics
-
-.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbPluginSymbolFileDWARF/Makefile.depend b/lib/clang/liblldbPluginSymbolFileDWARF/Makefile.depend
deleted file mode 100644
index 7bd22d4fd361..000000000000
--- a/lib/clang/liblldbPluginSymbolFileDWARF/Makefile.depend
+++ /dev/null
@@ -1,17 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/liblldbPluginSymbolFilePDB/Makefile b/lib/clang/liblldbPluginSymbolFilePDB/Makefile
deleted file mode 100644
index 6b952a96dec8..000000000000
--- a/lib/clang/liblldbPluginSymbolFilePDB/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	lldbPluginSymbolFilePDB
-
-SRCDIR=	tools/lldb/source/Plugins/SymbolFile/PDB
-SRCS=	PDBASTParser.cpp \
-	SymbolFilePDB.cpp
-
-TGHDRS=	AttrList \
-	Attrs \
-	CommentCommandList \
-	DeclNodes \
-	DiagnosticCommonKinds \
-	StmtNodes
-
-.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbPluginSymbolFileSymtab/Makefile b/lib/clang/liblldbPluginSymbolFileSymtab/Makefile
deleted file mode 100644
index 29e880344133..000000000000
--- a/lib/clang/liblldbPluginSymbolFileSymtab/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	lldbPluginSymbolFileSymtab
-
-SRCDIR=	tools/lldb/source/Plugins/SymbolFile/Symtab
-SRCS=	SymbolFileSymtab.cpp
-
-TGHDRS=	DiagnosticCommonKinds \
-	DeclNodes \
-	StmtNodes \
-	CommentCommandList
-
-.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbPluginSymbolFileSymtab/Makefile.depend b/lib/clang/liblldbPluginSymbolFileSymtab/Makefile.depend
deleted file mode 100644
index 264ede1c30ce..000000000000
--- a/lib/clang/liblldbPluginSymbolFileSymtab/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/liblldbPluginSymbolVendorELF/Makefile b/lib/clang/liblldbPluginSymbolVendorELF/Makefile
deleted file mode 100644
index 3b3a92896ebe..000000000000
--- a/lib/clang/liblldbPluginSymbolVendorELF/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	lldbPluginSymbolVendorELF
-
-SRCDIR=	tools/lldb/source/Plugins/SymbolVendor/ELF
-SRCS=	SymbolVendorELF.cpp
-
-TGHDRS=	DiagnosticCommonKinds \
-	DeclNodes \
-	StmtNodes \
-	CommentCommandList
-
-.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbPluginSymbolVendorELF/Makefile.depend b/lib/clang/liblldbPluginSymbolVendorELF/Makefile.depend
deleted file mode 100644
index 264ede1c30ce..000000000000
--- a/lib/clang/liblldbPluginSymbolVendorELF/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/liblldbPluginUnwindAssemblyInstEmulation/Makefile b/lib/clang/liblldbPluginUnwindAssemblyInstEmulation/Makefile
deleted file mode 100644
index b650411f1c22..000000000000
--- a/lib/clang/liblldbPluginUnwindAssemblyInstEmulation/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	lldbPluginUnwindAssemblyInstEmulation
-
-SRCDIR=	tools/lldb/source/Plugins/UnwindAssembly/InstEmulation
-SRCS=	UnwindAssemblyInstEmulation.cpp
-
-TGHDRS=	DiagnosticCommonKinds \
-	DeclNodes \
-	StmtNodes \
-	CommentCommandList
-
-.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbPluginUnwindAssemblyInstEmulation/Makefile.depend b/lib/clang/liblldbPluginUnwindAssemblyInstEmulation/Makefile.depend
deleted file mode 100644
index 264ede1c30ce..000000000000
--- a/lib/clang/liblldbPluginUnwindAssemblyInstEmulation/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/liblldbPluginUnwindAssemblyX86/Makefile b/lib/clang/liblldbPluginUnwindAssemblyX86/Makefile
deleted file mode 100644
index 1e75536757b4..000000000000
--- a/lib/clang/liblldbPluginUnwindAssemblyX86/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	lldbPluginUnwindAssemblyX86
-
-SRCDIR=	tools/lldb/source/Plugins/UnwindAssembly/x86
-SRCS=	UnwindAssembly-x86.cpp
-
-TGHDRS=	DiagnosticCommonKinds \
-	DeclNodes \
-	StmtNodes \
-	CommentCommandList
-
-.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbPluginUnwindAssemblyX86/Makefile.depend b/lib/clang/liblldbPluginUnwindAssemblyX86/Makefile.depend
deleted file mode 100644
index 264ede1c30ce..000000000000
--- a/lib/clang/liblldbPluginUnwindAssemblyX86/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/liblldbSymbol/Makefile b/lib/clang/liblldbSymbol/Makefile
deleted file mode 100644
index 05f74c519b5f..000000000000
--- a/lib/clang/liblldbSymbol/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	lldbSymbol
-
-SRCDIR=	tools/lldb/source/Symbol
-SRCS=	ArmUnwindInfo.cpp \
-	Block.cpp \
-	ClangASTContext.cpp \
-	ClangASTImporter.cpp \
-	ClangExternalASTSourceCallbacks.cpp \
-	ClangExternalASTSourceCommon.cpp \
-	ClangUtil.cpp \
-	CompactUnwindInfo.cpp \
-	CompileUnit.cpp \
-	CompilerDecl.cpp \
-	CompilerDeclContext.cpp \
-	CompilerType.cpp \
-	DWARFCallFrameInfo.cpp \
-	DebugMacros.cpp \
-	Declaration.cpp \
-	FuncUnwinders.cpp \
-	Function.cpp \
-	GoASTContext.cpp \
-	LineEntry.cpp \
-	LineTable.cpp \
-	ObjectFile.cpp \
-	Symbol.cpp \
-	SymbolContext.cpp \
-	SymbolFile.cpp \
-	SymbolVendor.cpp \
-	Symtab.cpp \
-	Type.cpp \
-	TypeList.cpp \
-	TypeMap.cpp \
-	TypeSystem.cpp \
-	UnwindPlan.cpp \
-	UnwindTable.cpp \
-	Variable.cpp \
-	VariableList.cpp \
-	VerifyDecl.cpp
-
-TGHDRS=	DiagnosticCommonKinds \
-	DeclNodes \
-	StmtNodes \
-	CommentCommandList \
-	AttrList \
-	Attrs
-
-.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbSymbol/Makefile.depend b/lib/clang/liblldbSymbol/Makefile.depend
deleted file mode 100644
index 264ede1c30ce..000000000000
--- a/lib/clang/liblldbSymbol/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/liblldbTarget/Makefile b/lib/clang/liblldbTarget/Makefile
deleted file mode 100644
index 9bad46ede63c..000000000000
--- a/lib/clang/liblldbTarget/Makefile
+++ /dev/null
@@ -1,73 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	lldbTarget
-
-CFLAGS+=-I${.CURDIR}/../../../contrib/llvm/tools/lldb/source/Plugins/Process/Utility
-
-SRCDIR=	tools/lldb/source/Target
-SRCS=	ABI.cpp \
-	CPPLanguageRuntime.cpp \
-	ExecutionContext.cpp \
-	FileAction.cpp \
-	InstrumentationRuntime.cpp \
-	InstrumentationRuntimeStopInfo.cpp \
-	JITLoader.cpp \
-	JITLoaderList.cpp \
-	Language.cpp \
-	LanguageRuntime.cpp \
-	Memory.cpp \
-	MemoryHistory.cpp \
-	ObjCLanguageRuntime.cpp \
-	OperatingSystem.cpp \
-	PathMappingList.cpp \
-	Platform.cpp \
-	Process.cpp \
-	ProcessInfo.cpp \
-	ProcessLaunchInfo.cpp \
-	Queue.cpp \
-	QueueItem.cpp \
-	QueueList.cpp \
-	RegisterContext.cpp \
-	SectionLoadHistory.cpp \
-	SectionLoadList.cpp \
-	StackFrame.cpp \
-	StackFrameList.cpp \
-	StackID.cpp \
-	StopInfo.cpp \
-	SystemRuntime.cpp \
-	Target.cpp \
-	TargetList.cpp \
-	Thread.cpp \
-	ThreadCollection.cpp \
-	ThreadList.cpp \
-	ThreadPlan.cpp \
-	ThreadPlanBase.cpp \
-	ThreadPlanCallFunction.cpp \
-	ThreadPlanCallFunctionUsingABI.cpp \
-	ThreadPlanCallUserExpression.cpp \
-	ThreadPlanPython.cpp \
-	ThreadPlanRunToAddress.cpp \
-	ThreadPlanShouldStopHere.cpp \
-	ThreadPlanStepInRange.cpp \
-	ThreadPlanStepInstruction.cpp \
-	ThreadPlanStepOut.cpp \
-	ThreadPlanStepOverBreakpoint.cpp \
-	ThreadPlanStepOverRange.cpp \
-	ThreadPlanStepRange.cpp \
-	ThreadPlanStepThrough.cpp \
-	ThreadPlanStepUntil.cpp \
-	ThreadPlanTracer.cpp \
-	ThreadSpec.cpp \
-	UnixSignals.cpp \
-	UnwindAssembly.cpp
-
-TGHDRS=	AttrList \
-	Attrs \
-	DiagnosticCommonKinds \
-	DeclNodes \
-	StmtNodes \
-	CommentCommandList
-
-.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbTarget/Makefile.depend b/lib/clang/liblldbTarget/Makefile.depend
deleted file mode 100644
index 264ede1c30ce..000000000000
--- a/lib/clang/liblldbTarget/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/clang-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/liblldbUtility/Makefile b/lib/clang/liblldbUtility/Makefile
deleted file mode 100644
index 6e2345c48119..000000000000
--- a/lib/clang/liblldbUtility/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	lldbUtility
-
-SRCDIR=	tools/lldb/source/Utility
-SRCS=	ARM64_DWARF_Registers.cpp \
-	ARM_DWARF_Registers.cpp \
-	ConvertEnum.cpp \
-	JSON.cpp \
-	KQueue.cpp \
-	LLDBAssert.cpp \
-	ModuleCache.cpp \
-	NameMatches.cpp \
-	PseudoTerminal.cpp \
-	Range.cpp \
-	RegisterNumber.cpp \
-	SharingPtr.cpp \
-	StringExtractor.cpp \
-	StringExtractorGDBRemote.cpp \
-	StringLexer.cpp \
-	TaskPool.cpp \
-	TimeSpecTimeout.cpp \
-	UriParser.cpp
-
-.include "../lldb.lib.mk"
diff --git a/lib/clang/liblldbUtility/Makefile.depend b/lib/clang/liblldbUtility/Makefile.depend
deleted file mode 100644
index 3e7f3f5e7165..000000000000
--- a/lib/clang/liblldbUtility/Makefile.depend
+++ /dev/null
@@ -1,15 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvm/Makefile b/lib/clang/libllvm/Makefile
new file mode 100644
index 000000000000..e91a591ea373
--- /dev/null
+++ b/lib/clang/libllvm/Makefile
@@ -0,0 +1,1244 @@
+# $FreeBSD$
+
+.include <src.opts.mk>
+.include "../llvm.pre.mk"
+
+LIB=		llvm
+INTERNALLIB=
+
+CFLAGS+=	-I${.OBJDIR}
+.for arch in AArch64 ARM Mips PowerPC Sparc X86
+CFLAGS+=	-I${LLVM_SRCS}/lib/Target/${arch}
+.endfor
+
+SRCDIR=		lib
+
+SRCS_MIN+=	Analysis/AliasAnalysis.cpp
+SRCS_MIN+=	Analysis/AliasAnalysisEvaluator.cpp
+SRCS_MIN+=	Analysis/AliasAnalysisSummary.cpp
+SRCS_MIN+=	Analysis/AliasSetTracker.cpp
+SRCS_EXT+=	Analysis/Analysis.cpp
+SRCS_MIN+=	Analysis/AssumptionCache.cpp
+SRCS_MIN+=	Analysis/BasicAliasAnalysis.cpp
+SRCS_MIN+=	Analysis/BlockFrequencyInfo.cpp
+SRCS_MIN+=	Analysis/BlockFrequencyInfoImpl.cpp
+SRCS_MIN+=	Analysis/BranchProbabilityInfo.cpp
+SRCS_MIN+=	Analysis/CFG.cpp
+SRCS_MIN+=	Analysis/CFGPrinter.cpp
+SRCS_MIN+=	Analysis/CFLAndersAliasAnalysis.cpp
+SRCS_MIN+=	Analysis/CFLSteensAliasAnalysis.cpp
+SRCS_MIN+=	Analysis/CGSCCPassManager.cpp
+SRCS_MIN+=	Analysis/CallGraph.cpp
+SRCS_MIN+=	Analysis/CallGraphSCCPass.cpp
+SRCS_MIN+=	Analysis/CallPrinter.cpp
+SRCS_MIN+=	Analysis/CaptureTracking.cpp
+SRCS_MIN+=	Analysis/CodeMetrics.cpp
+SRCS_MIN+=	Analysis/ConstantFolding.cpp
+SRCS_MIN+=	Analysis/CostModel.cpp
+SRCS_MIN+=	Analysis/Delinearization.cpp
+SRCS_MIN+=	Analysis/DemandedBits.cpp
+SRCS_MIN+=	Analysis/DependenceAnalysis.cpp
+SRCS_MIN+=	Analysis/DivergenceAnalysis.cpp
+SRCS_MIN+=	Analysis/DomPrinter.cpp
+SRCS_MIN+=	Analysis/DominanceFrontier.cpp
+SRCS_MIN+=	Analysis/EHPersonalities.cpp
+SRCS_MIN+=	Analysis/GlobalsModRef.cpp
+SRCS_MIN+=	Analysis/IVUsers.cpp
+SRCS_MIN+=	Analysis/IndirectCallPromotionAnalysis.cpp
+SRCS_MIN+=	Analysis/InlineCost.cpp
+SRCS_MIN+=	Analysis/InstCount.cpp
+SRCS_MIN+=	Analysis/InstructionSimplify.cpp
+SRCS_MIN+=	Analysis/Interval.cpp
+SRCS_MIN+=	Analysis/IntervalPartition.cpp
+SRCS_MIN+=	Analysis/IteratedDominanceFrontier.cpp
+SRCS_MIN+=	Analysis/LazyBlockFrequencyInfo.cpp
+SRCS_MIN+=	Analysis/LazyCallGraph.cpp
+SRCS_MIN+=	Analysis/LazyValueInfo.cpp
+SRCS_MIN+=	Analysis/Lint.cpp
+SRCS_MIN+=	Analysis/Loads.cpp
+SRCS_MIN+=	Analysis/LoopAccessAnalysis.cpp
+SRCS_MIN+=	Analysis/LoopInfo.cpp
+SRCS_MIN+=	Analysis/LoopPass.cpp
+SRCS_MIN+=	Analysis/LoopPassManager.cpp
+SRCS_MIN+=	Analysis/LoopUnrollAnalyzer.cpp
+SRCS_MIN+=	Analysis/MemDepPrinter.cpp
+SRCS_MIN+=	Analysis/MemDerefPrinter.cpp
+SRCS_MIN+=	Analysis/MemoryBuiltins.cpp
+SRCS_MIN+=	Analysis/MemoryDependenceAnalysis.cpp
+SRCS_MIN+=	Analysis/MemoryLocation.cpp
+SRCS_MIN+=	Analysis/ModuleDebugInfoPrinter.cpp
+SRCS_MIN+=	Analysis/ModuleSummaryAnalysis.cpp
+SRCS_MIN+=	Analysis/ObjCARCAliasAnalysis.cpp
+SRCS_MIN+=	Analysis/ObjCARCAnalysisUtils.cpp
+SRCS_MIN+=	Analysis/ObjCARCInstKind.cpp
+SRCS_MIN+=	Analysis/OptimizationDiagnosticInfo.cpp
+SRCS_MIN+=	Analysis/OrderedBasicBlock.cpp
+SRCS_MIN+=	Analysis/PHITransAddr.cpp
+SRCS_MIN+=	Analysis/PostDominators.cpp
+SRCS_MIN+=	Analysis/ProfileSummaryInfo.cpp
+SRCS_MIN+=	Analysis/PtrUseVisitor.cpp
+SRCS_MIN+=	Analysis/RegionInfo.cpp
+SRCS_MIN+=	Analysis/RegionPass.cpp
+SRCS_MIN+=	Analysis/RegionPrinter.cpp
+SRCS_MIN+=	Analysis/ScalarEvolution.cpp
+SRCS_MIN+=	Analysis/ScalarEvolutionAliasAnalysis.cpp
+SRCS_MIN+=	Analysis/ScalarEvolutionExpander.cpp
+SRCS_MIN+=	Analysis/ScalarEvolutionNormalization.cpp
+SRCS_MIN+=	Analysis/ScopedNoAliasAA.cpp
+SRCS_MIN+=	Analysis/SparsePropagation.cpp
+SRCS_MIN+=	Analysis/TargetLibraryInfo.cpp
+SRCS_MIN+=	Analysis/TargetTransformInfo.cpp
+#SRCS_EXT+=	Analysis/Trace.cpp
+SRCS_MIN+=	Analysis/TypeBasedAliasAnalysis.cpp
+SRCS_MIN+=	Analysis/TypeMetadataUtils.cpp
+SRCS_MIN+=	Analysis/ValueTracking.cpp
+SRCS_MIN+=	Analysis/VectorUtils.cpp
+SRCS_MIN+=	AsmParser/LLLexer.cpp
+SRCS_MIN+=	AsmParser/LLParser.cpp
+SRCS_MIN+=	AsmParser/Parser.cpp
+#SRCS_EXT+=	Bitcode/Reader/BitReader.cpp
+SRCS_MIN+=	Bitcode/Reader/BitcodeReader.cpp
+SRCS_MIN+=	Bitcode/Reader/BitstreamReader.cpp
+#SRCS_EXT+=	Bitcode/Writer/BitWriter.cpp
+SRCS_MIN+=	Bitcode/Writer/BitcodeWriter.cpp
+SRCS_MIN+=	Bitcode/Writer/BitcodeWriterPass.cpp
+SRCS_MIN+=	Bitcode/Writer/ValueEnumerator.cpp
+SRCS_MIN+=	CodeGen/AggressiveAntiDepBreaker.cpp
+SRCS_MIN+=	CodeGen/AllocationOrder.cpp
+SRCS_MIN+=	CodeGen/Analysis.cpp
+SRCS_MIN+=	CodeGen/AsmPrinter/ARMException.cpp
+SRCS_MIN+=	CodeGen/AsmPrinter/AddressPool.cpp
+SRCS_MIN+=	CodeGen/AsmPrinter/AsmPrinter.cpp
+SRCS_MIN+=	CodeGen/AsmPrinter/AsmPrinterDwarf.cpp
+SRCS_MIN+=	CodeGen/AsmPrinter/AsmPrinterInlineAsm.cpp
+SRCS_MIN+=	CodeGen/AsmPrinter/CodeViewDebug.cpp
+SRCS_MIN+=	CodeGen/AsmPrinter/DIE.cpp
+SRCS_MIN+=	CodeGen/AsmPrinter/DIEHash.cpp
+SRCS_MIN+=	CodeGen/AsmPrinter/DbgValueHistoryCalculator.cpp
+SRCS_MIN+=	CodeGen/AsmPrinter/DebugHandlerBase.cpp
+SRCS_MIN+=	CodeGen/AsmPrinter/DebugLocStream.cpp
+SRCS_MIN+=	CodeGen/AsmPrinter/DwarfAccelTable.cpp
+SRCS_MIN+=	CodeGen/AsmPrinter/DwarfCFIException.cpp
+SRCS_MIN+=	CodeGen/AsmPrinter/DwarfCompileUnit.cpp
+SRCS_MIN+=	CodeGen/AsmPrinter/DwarfDebug.cpp
+SRCS_MIN+=	CodeGen/AsmPrinter/DwarfExpression.cpp
+SRCS_MIN+=	CodeGen/AsmPrinter/DwarfFile.cpp
+SRCS_MIN+=	CodeGen/AsmPrinter/DwarfStringPool.cpp
+SRCS_MIN+=	CodeGen/AsmPrinter/DwarfUnit.cpp
+SRCS_MIN+=	CodeGen/AsmPrinter/EHStreamer.cpp
+SRCS_MIN+=	CodeGen/AsmPrinter/ErlangGCPrinter.cpp
+SRCS_MIN+=	CodeGen/AsmPrinter/OcamlGCPrinter.cpp
+SRCS_MIN+=	CodeGen/AsmPrinter/WinException.cpp
+SRCS_MIN+=	CodeGen/AtomicExpandPass.cpp
+SRCS_MIN+=	CodeGen/BasicTargetTransformInfo.cpp
+SRCS_MIN+=	CodeGen/BranchFolding.cpp
+SRCS_MIN+=	CodeGen/BuiltinGCs.cpp
+SRCS_MIN+=	CodeGen/CalcSpillWeights.cpp
+SRCS_MIN+=	CodeGen/CallingConvLower.cpp
+SRCS_MIN+=	CodeGen/CodeGen.cpp
+SRCS_MIN+=	CodeGen/CodeGenPrepare.cpp
+SRCS_MIN+=	CodeGen/CriticalAntiDepBreaker.cpp
+SRCS_MIN+=	CodeGen/DFAPacketizer.cpp
+SRCS_MIN+=	CodeGen/DeadMachineInstructionElim.cpp
+SRCS_MIN+=	CodeGen/DetectDeadLanes.cpp
+SRCS_MIN+=	CodeGen/DwarfEHPrepare.cpp
+SRCS_MIN+=	CodeGen/EarlyIfConversion.cpp
+SRCS_MIN+=	CodeGen/EdgeBundles.cpp
+SRCS_MIN+=	CodeGen/ExecutionDepsFix.cpp
+SRCS_MIN+=	CodeGen/ExpandISelPseudos.cpp
+SRCS_MIN+=	CodeGen/ExpandPostRAPseudos.cpp
+SRCS_MIN+=	CodeGen/FaultMaps.cpp
+SRCS_MIN+=	CodeGen/FuncletLayout.cpp
+SRCS_MIN+=	CodeGen/GCMetadata.cpp
+SRCS_EXT+=	CodeGen/GCMetadataPrinter.cpp
+SRCS_MIN+=	CodeGen/GCRootLowering.cpp
+SRCS_EXT+=	CodeGen/GCStrategy.cpp
+SRCS_MIN+=	CodeGen/GlobalISel/GlobalISel.cpp
+SRCS_MIN+=	CodeGen/GlobalMerge.cpp
+SRCS_MIN+=	CodeGen/IfConversion.cpp
+SRCS_MIN+=	CodeGen/ImplicitNullChecks.cpp
+SRCS_MIN+=	CodeGen/InlineSpiller.cpp
+SRCS_MIN+=	CodeGen/InterferenceCache.cpp
+SRCS_MIN+=	CodeGen/InterleavedAccessPass.cpp
+SRCS_MIN+=	CodeGen/IntrinsicLowering.cpp
+SRCS_MIN+=	CodeGen/LLVMTargetMachine.cpp
+SRCS_MIN+=	CodeGen/LatencyPriorityQueue.cpp
+SRCS_MIN+=	CodeGen/LexicalScopes.cpp
+SRCS_MIN+=	CodeGen/LiveDebugValues.cpp
+SRCS_MIN+=	CodeGen/LiveDebugVariables.cpp
+SRCS_MIN+=	CodeGen/LiveInterval.cpp
+SRCS_MIN+=	CodeGen/LiveIntervalAnalysis.cpp
+SRCS_MIN+=	CodeGen/LiveIntervalUnion.cpp
+SRCS_MIN+=	CodeGen/LivePhysRegs.cpp
+SRCS_MIN+=	CodeGen/LiveRangeCalc.cpp
+SRCS_MIN+=	CodeGen/LiveRangeEdit.cpp
+SRCS_MIN+=	CodeGen/LiveRegMatrix.cpp
+SRCS_MIN+=	CodeGen/LiveStackAnalysis.cpp
+SRCS_MIN+=	CodeGen/LiveVariables.cpp
+SRCS_MIN+=	CodeGen/LocalStackSlotAllocation.cpp
+SRCS_MIN+=	CodeGen/LowerEmuTLS.cpp
+SRCS_EXT+=	CodeGen/MIRParser/MILexer.cpp
+SRCS_EXT+=	CodeGen/MIRParser/MIParser.cpp
+SRCS_EXT+=	CodeGen/MIRParser/MIRParser.cpp
+SRCS_MIN+=	CodeGen/MIRPrinter.cpp
+SRCS_MIN+=	CodeGen/MIRPrintingPass.cpp
+SRCS_MIN+=	CodeGen/MachineBasicBlock.cpp
+SRCS_MIN+=	CodeGen/MachineBlockFrequencyInfo.cpp
+SRCS_MIN+=	CodeGen/MachineBlockPlacement.cpp
+SRCS_MIN+=	CodeGen/MachineBranchProbabilityInfo.cpp
+SRCS_MIN+=	CodeGen/MachineCSE.cpp
+SRCS_MIN+=	CodeGen/MachineCombiner.cpp
+SRCS_MIN+=	CodeGen/MachineCopyPropagation.cpp
+SRCS_MIN+=	CodeGen/MachineDominanceFrontier.cpp
+SRCS_MIN+=	CodeGen/MachineDominators.cpp
+SRCS_MIN+=	CodeGen/MachineFunction.cpp
+SRCS_MIN+=	CodeGen/MachineFunctionAnalysis.cpp
+SRCS_MIN+=	CodeGen/MachineFunctionPass.cpp
+SRCS_MIN+=	CodeGen/MachineFunctionPrinterPass.cpp
+SRCS_MIN+=	CodeGen/MachineInstr.cpp
+SRCS_MIN+=	CodeGen/MachineInstrBundle.cpp
+SRCS_MIN+=	CodeGen/MachineLICM.cpp
+SRCS_MIN+=	CodeGen/MachineLoopInfo.cpp
+SRCS_MIN+=	CodeGen/MachineModuleInfo.cpp
+SRCS_MIN+=	CodeGen/MachineModuleInfoImpls.cpp
+SRCS_MIN+=	CodeGen/MachinePassRegistry.cpp
+SRCS_MIN+=	CodeGen/MachinePostDominators.cpp
+SRCS_MIN+=	CodeGen/MachineRegionInfo.cpp
+SRCS_MIN+=	CodeGen/MachineRegisterInfo.cpp
+SRCS_MIN+=	CodeGen/MachineSSAUpdater.cpp
+SRCS_MIN+=	CodeGen/MachineScheduler.cpp
+SRCS_MIN+=	CodeGen/MachineSink.cpp
+SRCS_MIN+=	CodeGen/MachineTraceMetrics.cpp
+SRCS_MIN+=	CodeGen/MachineVerifier.cpp
+SRCS_MIN+=	CodeGen/OptimizePHIs.cpp
+SRCS_MIN+=	CodeGen/PHIElimination.cpp
+SRCS_MIN+=	CodeGen/PHIEliminationUtils.cpp
+SRCS_MIN+=	CodeGen/ParallelCG.cpp
+SRCS_MIN+=	CodeGen/PatchableFunction.cpp
+SRCS_MIN+=	CodeGen/PeepholeOptimizer.cpp
+SRCS_MIN+=	CodeGen/PostRAHazardRecognizer.cpp
+SRCS_MIN+=	CodeGen/PostRASchedulerList.cpp
+SRCS_MIN+=	CodeGen/PreISelIntrinsicLowering.cpp
+SRCS_MIN+=	CodeGen/ProcessImplicitDefs.cpp
+SRCS_MIN+=	CodeGen/PrologEpilogInserter.cpp
+SRCS_MIN+=	CodeGen/PseudoSourceValue.cpp
+SRCS_MIN+=	CodeGen/RegAllocBase.cpp
+SRCS_MIN+=	CodeGen/RegAllocBasic.cpp
+SRCS_MIN+=	CodeGen/RegAllocFast.cpp
+SRCS_MIN+=	CodeGen/RegAllocGreedy.cpp
+SRCS_MIN+=	CodeGen/RegAllocPBQP.cpp
+SRCS_MIN+=	CodeGen/RegUsageInfoCollector.cpp
+SRCS_MIN+=	CodeGen/RegUsageInfoPropagate.cpp
+SRCS_MIN+=	CodeGen/RegisterClassInfo.cpp
+SRCS_MIN+=	CodeGen/RegisterCoalescer.cpp
+SRCS_MIN+=	CodeGen/RegisterPressure.cpp
+SRCS_MIN+=	CodeGen/RegisterScavenging.cpp
+SRCS_MIN+=	CodeGen/RegisterUsageInfo.cpp
+SRCS_MIN+=	CodeGen/RenameIndependentSubregs.cpp
+SRCS_MIN+=	CodeGen/SafeStack.cpp
+SRCS_MIN+=	CodeGen/SafeStackColoring.cpp
+SRCS_MIN+=	CodeGen/SafeStackLayout.cpp
+SRCS_MIN+=	CodeGen/ScheduleDAG.cpp
+SRCS_MIN+=	CodeGen/ScheduleDAGInstrs.cpp
+SRCS_MIN+=	CodeGen/ScheduleDAGPrinter.cpp
+SRCS_MIN+=	CodeGen/ScoreboardHazardRecognizer.cpp
+SRCS_MIN+=	CodeGen/SelectionDAG/DAGCombiner.cpp
+SRCS_MIN+=	CodeGen/SelectionDAG/FastISel.cpp
+SRCS_MIN+=	CodeGen/SelectionDAG/FunctionLoweringInfo.cpp
+SRCS_MIN+=	CodeGen/SelectionDAG/InstrEmitter.cpp
+SRCS_MIN+=	CodeGen/SelectionDAG/LegalizeDAG.cpp
+SRCS_MIN+=	CodeGen/SelectionDAG/LegalizeFloatTypes.cpp
+SRCS_MIN+=	CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp
+SRCS_MIN+=	CodeGen/SelectionDAG/LegalizeTypes.cpp
+SRCS_MIN+=	CodeGen/SelectionDAG/LegalizeTypesGeneric.cpp
+SRCS_MIN+=	CodeGen/SelectionDAG/LegalizeVectorOps.cpp
+SRCS_MIN+=	CodeGen/SelectionDAG/LegalizeVectorTypes.cpp
+SRCS_MIN+=	CodeGen/SelectionDAG/ResourcePriorityQueue.cpp
+SRCS_MIN+=	CodeGen/SelectionDAG/ScheduleDAGFast.cpp
+SRCS_MIN+=	CodeGen/SelectionDAG/ScheduleDAGRRList.cpp
+SRCS_MIN+=	CodeGen/SelectionDAG/ScheduleDAGSDNodes.cpp
+SRCS_MIN+=	CodeGen/SelectionDAG/ScheduleDAGVLIW.cpp
+SRCS_MIN+=	CodeGen/SelectionDAG/SelectionDAG.cpp
+SRCS_MIN+=	CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
+SRCS_MIN+=	CodeGen/SelectionDAG/SelectionDAGDumper.cpp
+SRCS_MIN+=	CodeGen/SelectionDAG/SelectionDAGISel.cpp
+SRCS_MIN+=	CodeGen/SelectionDAG/SelectionDAGPrinter.cpp
+SRCS_MIN+=	CodeGen/SelectionDAG/SelectionDAGTargetInfo.cpp
+SRCS_MIN+=	CodeGen/SelectionDAG/StatepointLowering.cpp
+SRCS_MIN+=	CodeGen/SelectionDAG/TargetLowering.cpp
+SRCS_MIN+=	CodeGen/ShadowStackGCLowering.cpp
+SRCS_MIN+=	CodeGen/ShrinkWrap.cpp
+SRCS_MIN+=	CodeGen/SjLjEHPrepare.cpp
+SRCS_MIN+=	CodeGen/SlotIndexes.cpp
+SRCS_MIN+=	CodeGen/SpillPlacement.cpp
+SRCS_MIN+=	CodeGen/SplitKit.cpp
+SRCS_MIN+=	CodeGen/StackColoring.cpp
+SRCS_MIN+=	CodeGen/StackMapLivenessAnalysis.cpp
+SRCS_MIN+=	CodeGen/StackMaps.cpp
+SRCS_MIN+=	CodeGen/StackProtector.cpp
+SRCS_MIN+=	CodeGen/StackSlotColoring.cpp
+SRCS_MIN+=	CodeGen/TailDuplication.cpp
+SRCS_MIN+=	CodeGen/TailDuplicator.cpp
+SRCS_MIN+=	CodeGen/TargetFrameLoweringImpl.cpp
+SRCS_MIN+=	CodeGen/TargetInstrInfo.cpp
+SRCS_MIN+=	CodeGen/TargetLoweringBase.cpp
+SRCS_MIN+=	CodeGen/TargetLoweringObjectFileImpl.cpp
+SRCS_MIN+=	CodeGen/TargetOptionsImpl.cpp
+SRCS_MIN+=	CodeGen/TargetPassConfig.cpp
+SRCS_MIN+=	CodeGen/TargetRegisterInfo.cpp
+SRCS_MIN+=	CodeGen/TargetSchedule.cpp
+SRCS_MIN+=	CodeGen/TwoAddressInstructionPass.cpp
+SRCS_MIN+=	CodeGen/UnreachableBlockElim.cpp
+SRCS_MIN+=	CodeGen/VirtRegMap.cpp
+SRCS_MIN+=	CodeGen/WinEHPrepare.cpp
+SRCS_MIN+=	CodeGen/XRayInstrumentation.cpp
+SRCS_MIN+=	DebugInfo/CodeView/ByteStream.cpp
+SRCS_MIN+=	DebugInfo/CodeView/CVTypeVisitor.cpp
+SRCS_MIN+=	DebugInfo/CodeView/CodeViewError.cpp
+SRCS_EXT+=	DebugInfo/CodeView/EnumTables.cpp
+SRCS_MIN+=	DebugInfo/CodeView/FieldListRecordBuilder.cpp
+SRCS_MIN+=	DebugInfo/CodeView/Line.cpp
+SRCS_MIN+=	DebugInfo/CodeView/ListRecordBuilder.cpp
+SRCS_MIN+=	DebugInfo/CodeView/MemoryTypeTableBuilder.cpp
+#SRCS_EXT+=	DebugInfo/CodeView/MethodListRecordBuilder.cpp
+SRCS_MIN+=	DebugInfo/CodeView/ModuleSubstream.cpp
+SRCS_MIN+=	DebugInfo/CodeView/ModuleSubstreamVisitor.cpp
+SRCS_MIN+=	DebugInfo/CodeView/RecordSerialization.cpp
+SRCS_MIN+=	DebugInfo/CodeView/StreamReader.cpp
+SRCS_MIN+=	DebugInfo/CodeView/StreamWriter.cpp
+SRCS_MIN+=	DebugInfo/CodeView/SymbolDumper.cpp
+SRCS_MIN+=	DebugInfo/CodeView/TypeDumper.cpp
+SRCS_MIN+=	DebugInfo/CodeView/TypeRecord.cpp
+SRCS_MIN+=	DebugInfo/CodeView/TypeRecordBuilder.cpp
+SRCS_MIN+=	DebugInfo/CodeView/TypeStreamMerger.cpp
+SRCS_MIN+=	DebugInfo/CodeView/TypeTableBuilder.cpp
+SRCS_EXT+=	DebugInfo/DWARF/DWARFAbbreviationDeclaration.cpp
+SRCS_EXT+=	DebugInfo/DWARF/DWARFAcceleratorTable.cpp
+SRCS_EXT+=	DebugInfo/DWARF/DWARFCompileUnit.cpp
+SRCS_EXT+=	DebugInfo/DWARF/DWARFContext.cpp
+SRCS_EXT+=	DebugInfo/DWARF/DWARFDebugAbbrev.cpp
+SRCS_EXT+=	DebugInfo/DWARF/DWARFDebugArangeSet.cpp
+SRCS_EXT+=	DebugInfo/DWARF/DWARFDebugAranges.cpp
+SRCS_EXT+=	DebugInfo/DWARF/DWARFDebugFrame.cpp
+SRCS_EXT+=	DebugInfo/DWARF/DWARFDebugInfoEntry.cpp
+SRCS_EXT+=	DebugInfo/DWARF/DWARFDebugLine.cpp
+SRCS_EXT+=	DebugInfo/DWARF/DWARFDebugLoc.cpp
+SRCS_EXT+=	DebugInfo/DWARF/DWARFDebugMacro.cpp
+SRCS_EXT+=	DebugInfo/DWARF/DWARFDebugRangeList.cpp
+SRCS_EXT+=	DebugInfo/DWARF/DWARFFormValue.cpp
+SRCS_EXT+=	DebugInfo/DWARF/DWARFTypeUnit.cpp
+SRCS_EXT+=	DebugInfo/DWARF/DWARFUnit.cpp
+SRCS_EXT+=	DebugInfo/DWARF/DWARFUnitIndex.cpp
+SRCS_EXT+=	DebugInfo/DWARF/SyntaxHighlighting.cpp
+SRCS_EXT+=	DebugInfo/PDB/GenericError.cpp
+#SRCS_EXT+=	DebugInfo/PDB/IPDBSourceFile.cpp
+SRCS_EXT+=	DebugInfo/PDB/PDB.cpp
+SRCS_EXT+=	DebugInfo/PDB/PDBContext.cpp
+SRCS_EXT+=	DebugInfo/PDB/PDBExtras.cpp
+SRCS_EXT+=	DebugInfo/PDB/PDBInterfaceAnchors.cpp
+SRCS_EXT+=	DebugInfo/PDB/PDBSymDumper.cpp
+SRCS_EXT+=	DebugInfo/PDB/PDBSymbol.cpp
+SRCS_EXT+=	DebugInfo/PDB/PDBSymbolAnnotation.cpp
+SRCS_EXT+=	DebugInfo/PDB/PDBSymbolBlock.cpp
+SRCS_EXT+=	DebugInfo/PDB/PDBSymbolCompiland.cpp
+SRCS_EXT+=	DebugInfo/PDB/PDBSymbolCompilandDetails.cpp
+SRCS_EXT+=	DebugInfo/PDB/PDBSymbolCompilandEnv.cpp
+SRCS_EXT+=	DebugInfo/PDB/PDBSymbolCustom.cpp
+SRCS_EXT+=	DebugInfo/PDB/PDBSymbolData.cpp
+SRCS_EXT+=	DebugInfo/PDB/PDBSymbolExe.cpp
+SRCS_EXT+=	DebugInfo/PDB/PDBSymbolFunc.cpp
+SRCS_EXT+=	DebugInfo/PDB/PDBSymbolFuncDebugEnd.cpp
+SRCS_EXT+=	DebugInfo/PDB/PDBSymbolFuncDebugStart.cpp
+SRCS_EXT+=	DebugInfo/PDB/PDBSymbolLabel.cpp
+SRCS_EXT+=	DebugInfo/PDB/PDBSymbolPublicSymbol.cpp
+SRCS_EXT+=	DebugInfo/PDB/PDBSymbolThunk.cpp
+SRCS_EXT+=	DebugInfo/PDB/PDBSymbolTypeArray.cpp
+SRCS_EXT+=	DebugInfo/PDB/PDBSymbolTypeBaseClass.cpp
+SRCS_EXT+=	DebugInfo/PDB/PDBSymbolTypeBuiltin.cpp
+SRCS_EXT+=	DebugInfo/PDB/PDBSymbolTypeCustom.cpp
+SRCS_EXT+=	DebugInfo/PDB/PDBSymbolTypeDimension.cpp
+SRCS_EXT+=	DebugInfo/PDB/PDBSymbolTypeEnum.cpp
+SRCS_EXT+=	DebugInfo/PDB/PDBSymbolTypeFriend.cpp
+SRCS_EXT+=	DebugInfo/PDB/PDBSymbolTypeFunctionArg.cpp
+SRCS_EXT+=	DebugInfo/PDB/PDBSymbolTypeFunctionSig.cpp
+SRCS_EXT+=	DebugInfo/PDB/PDBSymbolTypeManaged.cpp
+SRCS_EXT+=	DebugInfo/PDB/PDBSymbolTypePointer.cpp
+SRCS_EXT+=	DebugInfo/PDB/PDBSymbolTypeTypedef.cpp
+SRCS_EXT+=	DebugInfo/PDB/PDBSymbolTypeUDT.cpp
+SRCS_EXT+=	DebugInfo/PDB/PDBSymbolTypeVTable.cpp
+SRCS_EXT+=	DebugInfo/PDB/PDBSymbolTypeVTableShape.cpp
+SRCS_EXT+=	DebugInfo/PDB/PDBSymbolUnknown.cpp
+SRCS_EXT+=	DebugInfo/PDB/PDBSymbolUsingNamespace.cpp
+SRCS_EXT+=	DebugInfo/PDB/Raw/DbiStream.cpp
+SRCS_EXT+=	DebugInfo/PDB/Raw/DbiStreamBuilder.cpp
+SRCS_EXT+=	DebugInfo/PDB/Raw/EnumTables.cpp
+SRCS_EXT+=	DebugInfo/PDB/Raw/Hash.cpp
+SRCS_EXT+=	DebugInfo/PDB/Raw/IndexedStreamData.cpp
+SRCS_EXT+=	DebugInfo/PDB/Raw/InfoStream.cpp
+SRCS_EXT+=	DebugInfo/PDB/Raw/InfoStreamBuilder.cpp
+SRCS_EXT+=	DebugInfo/PDB/Raw/MappedBlockStream.cpp
+SRCS_EXT+=	DebugInfo/PDB/Raw/ModInfo.cpp
+SRCS_EXT+=	DebugInfo/PDB/Raw/ModStream.cpp
+SRCS_EXT+=	DebugInfo/PDB/Raw/MsfBuilder.cpp
+SRCS_EXT+=	DebugInfo/PDB/Raw/MsfCommon.cpp
+SRCS_EXT+=	DebugInfo/PDB/Raw/NameHashTable.cpp
+SRCS_EXT+=	DebugInfo/PDB/Raw/NameMap.cpp
+SRCS_EXT+=	DebugInfo/PDB/Raw/NameMapBuilder.cpp
+SRCS_EXT+=	DebugInfo/PDB/Raw/PDBFile.cpp
+SRCS_EXT+=	DebugInfo/PDB/Raw/PDBFileBuilder.cpp
+SRCS_EXT+=	DebugInfo/PDB/Raw/PublicsStream.cpp
+SRCS_EXT+=	DebugInfo/PDB/Raw/RawError.cpp
+SRCS_EXT+=	DebugInfo/PDB/Raw/RawSession.cpp
+SRCS_EXT+=	DebugInfo/PDB/Raw/SymbolStream.cpp
+SRCS_EXT+=	DebugInfo/PDB/Raw/TpiStream.cpp
+SRCS_EXT+=	DebugInfo/Symbolize/DIPrinter.cpp
+SRCS_EXT+=	DebugInfo/Symbolize/SymbolizableObjectFile.cpp
+SRCS_EXT+=	DebugInfo/Symbolize/Symbolize.cpp
+SRCS_XDB+=	ExecutionEngine/ExecutionEngine.cpp
+SRCS_XDB+=	ExecutionEngine/ExecutionEngineBindings.cpp
+SRCS_XDB+=	ExecutionEngine/GDBRegistrationListener.cpp
+SRCS_XDB+=	ExecutionEngine/Interpreter/Execution.cpp
+SRCS_XDB+=	ExecutionEngine/Interpreter/ExternalFunctions.cpp
+SRCS_XDB+=	ExecutionEngine/Interpreter/Interpreter.cpp
+SRCS_XDB+=	ExecutionEngine/MCJIT/MCJIT.cpp
+SRCS_EXT+=	ExecutionEngine/Orc/ExecutionUtils.cpp
+SRCS_EXT+=	ExecutionEngine/Orc/IndirectionUtils.cpp
+SRCS_EXT+=	ExecutionEngine/Orc/NullResolver.cpp
+SRCS_EXT+=	ExecutionEngine/Orc/OrcABISupport.cpp
+SRCS_EXT+=	ExecutionEngine/Orc/OrcCBindings.cpp
+SRCS_EXT+=	ExecutionEngine/Orc/OrcError.cpp
+SRCS_EXT+=	ExecutionEngine/Orc/OrcMCJITReplacement.cpp
+#SRCS_EXT+=	ExecutionEngine/Orc/OrcRemoteTargetRPCAPI.cpp
+SRCS_XDB+=	ExecutionEngine/RuntimeDyld/RTDyldMemoryManager.cpp
+SRCS_XDB+=	ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp
+SRCS_XDB+=	ExecutionEngine/RuntimeDyld/RuntimeDyldCOFF.cpp
+SRCS_XDB+=	ExecutionEngine/RuntimeDyld/RuntimeDyldChecker.cpp
+SRCS_XDB+=	ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp
+SRCS_XDB+=	ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.cpp
+SRCS_XDB+=	ExecutionEngine/SectionMemoryManager.cpp
+SRCS_XDB+=	ExecutionEngine/TargetSelect.cpp
+SRCS_MIN+=	IR/AsmWriter.cpp
+SRCS_MIN+=	IR/Attributes.cpp
+SRCS_MIN+=	IR/AutoUpgrade.cpp
+SRCS_MIN+=	IR/BasicBlock.cpp
+SRCS_MIN+=	IR/Comdat.cpp
+SRCS_MIN+=	IR/ConstantFold.cpp
+SRCS_MIN+=	IR/ConstantRange.cpp
+SRCS_MIN+=	IR/Constants.cpp
+SRCS_MIN+=	IR/Core.cpp
+SRCS_MIN+=	IR/DIBuilder.cpp
+SRCS_MIN+=	IR/DataLayout.cpp
+SRCS_MIN+=	IR/DebugInfo.cpp
+SRCS_MIN+=	IR/DebugInfoMetadata.cpp
+SRCS_MIN+=	IR/DebugLoc.cpp
+SRCS_MIN+=	IR/DiagnosticInfo.cpp
+SRCS_MIN+=	IR/DiagnosticPrinter.cpp
+SRCS_MIN+=	IR/Dominators.cpp
+SRCS_MIN+=	IR/Function.cpp
+SRCS_MIN+=	IR/GCOV.cpp
+SRCS_MIN+=	IR/GVMaterializer.cpp
+SRCS_MIN+=	IR/Globals.cpp
+SRCS_MIN+=	IR/IRBuilder.cpp
+SRCS_MIN+=	IR/IRPrintingPasses.cpp
+SRCS_MIN+=	IR/InlineAsm.cpp
+SRCS_MIN+=	IR/Instruction.cpp
+SRCS_MIN+=	IR/Instructions.cpp
+SRCS_MIN+=	IR/IntrinsicInst.cpp
+SRCS_MIN+=	IR/LLVMContext.cpp
+SRCS_MIN+=	IR/LLVMContextImpl.cpp
+SRCS_MIN+=	IR/LegacyPassManager.cpp
+SRCS_MIN+=	IR/MDBuilder.cpp
+SRCS_MIN+=	IR/Mangler.cpp
+SRCS_MIN+=	IR/Metadata.cpp
+SRCS_MIN+=	IR/Module.cpp
+SRCS_MIN+=	IR/ModuleSummaryIndex.cpp
+SRCS_MIN+=	IR/Operator.cpp
+SRCS_MIN+=	IR/OptBisect.cpp
+SRCS_MIN+=	IR/Pass.cpp
+SRCS_MIN+=	IR/PassManager.cpp
+SRCS_MIN+=	IR/PassRegistry.cpp
+SRCS_MIN+=	IR/ProfileSummary.cpp
+SRCS_MIN+=	IR/Statepoint.cpp
+SRCS_MIN+=	IR/Type.cpp
+SRCS_MIN+=	IR/TypeFinder.cpp
+SRCS_MIN+=	IR/Use.cpp
+SRCS_MIN+=	IR/User.cpp
+SRCS_MIN+=	IR/Value.cpp
+SRCS_MIN+=	IR/ValueSymbolTable.cpp
+SRCS_MIN+=	IR/ValueTypes.cpp
+SRCS_MIN+=	IR/Verifier.cpp
+SRCS_MIN+=	IRReader/IRReader.cpp
+SRCS_EXT+=	LTO/LTO.cpp
+SRCS_EXT+=	LTO/LTOCodeGenerator.cpp
+SRCS_EXT+=	LTO/LTOModule.cpp
+SRCS_EXT+=	LTO/ThinLTOCodeGenerator.cpp
+SRCS_EXT+=	LTO/UpdateCompilerUsed.cpp
+SRCS_EXT+=	LibDriver/LibDriver.cpp
+SRCS_MIN+=	LineEditor/LineEditor.cpp
+SRCS_MIN+=	Linker/IRMover.cpp
+SRCS_MIN+=	Linker/LinkModules.cpp
+SRCS_MIN+=	MC/ConstantPools.cpp
+SRCS_MIN+=	MC/ELFObjectWriter.cpp
+SRCS_MIN+=	MC/MCAsmBackend.cpp
+SRCS_MIN+=	MC/MCAsmInfo.cpp
+SRCS_MIN+=	MC/MCAsmInfoCOFF.cpp
+SRCS_MIN+=	MC/MCAsmInfoDarwin.cpp
+SRCS_MIN+=	MC/MCAsmInfoELF.cpp
+SRCS_MIN+=	MC/MCAsmStreamer.cpp
+SRCS_MIN+=	MC/MCAssembler.cpp
+SRCS_MIN+=	MC/MCCodeEmitter.cpp
+SRCS_MIN+=	MC/MCCodeView.cpp
+SRCS_MIN+=	MC/MCContext.cpp
+SRCS_XDB+=	MC/MCDisassembler/Disassembler.cpp
+SRCS_XDB+=	MC/MCDisassembler/MCDisassembler.cpp
+SRCS_XDB+=	MC/MCDisassembler/MCExternalSymbolizer.cpp
+SRCS_MIN+=	MC/MCDisassembler/MCRelocationInfo.cpp
+SRCS_XDB+=	MC/MCDisassembler/MCSymbolizer.cpp
+SRCS_MIN+=	MC/MCDwarf.cpp
+SRCS_MIN+=	MC/MCELFObjectTargetWriter.cpp
+SRCS_MIN+=	MC/MCELFStreamer.cpp
+SRCS_MIN+=	MC/MCExpr.cpp
+SRCS_MIN+=	MC/MCFragment.cpp
+SRCS_MIN+=	MC/MCInst.cpp
+SRCS_MIN+=	MC/MCInstPrinter.cpp
+SRCS_MIN+=	MC/MCInstrAnalysis.cpp
+SRCS_MIN+=	MC/MCInstrDesc.cpp
+#SRCS_EXT+=	MC/MCLabel.cpp
+SRCS_MIN+=	MC/MCLinkerOptimizationHint.cpp
+SRCS_MIN+=	MC/MCMachOStreamer.cpp
+SRCS_MIN+=	MC/MCMachObjectTargetWriter.cpp
+SRCS_MIN+=	MC/MCNullStreamer.cpp
+SRCS_MIN+=	MC/MCObjectFileInfo.cpp
+SRCS_MIN+=	MC/MCObjectStreamer.cpp
+SRCS_MIN+=	MC/MCObjectWriter.cpp
+SRCS_MIN+=	MC/MCParser/AsmLexer.cpp
+SRCS_MIN+=	MC/MCParser/AsmParser.cpp
+SRCS_MIN+=	MC/MCParser/COFFAsmParser.cpp
+SRCS_MIN+=	MC/MCParser/DarwinAsmParser.cpp
+SRCS_MIN+=	MC/MCParser/ELFAsmParser.cpp
+SRCS_MIN+=	MC/MCParser/MCAsmLexer.cpp
+SRCS_MIN+=	MC/MCParser/MCAsmParser.cpp
+SRCS_MIN+=	MC/MCParser/MCAsmParserExtension.cpp
+SRCS_MIN+=	MC/MCParser/MCTargetAsmParser.cpp
+SRCS_MIN+=	MC/MCRegisterInfo.cpp
+SRCS_MIN+=	MC/MCSchedule.cpp
+SRCS_MIN+=	MC/MCSection.cpp
+SRCS_MIN+=	MC/MCSectionCOFF.cpp
+SRCS_MIN+=	MC/MCSectionELF.cpp
+SRCS_MIN+=	MC/MCSectionMachO.cpp
+SRCS_MIN+=	MC/MCStreamer.cpp
+SRCS_MIN+=	MC/MCSubtargetInfo.cpp
+SRCS_MIN+=	MC/MCSymbol.cpp
+SRCS_MIN+=	MC/MCSymbolELF.cpp
+SRCS_MIN+=	MC/MCTargetOptions.cpp
+SRCS_MIN+=	MC/MCValue.cpp
+SRCS_MIN+=	MC/MCWin64EH.cpp
+SRCS_MIN+=	MC/MCWinEH.cpp
+SRCS_MIN+=	MC/MachObjectWriter.cpp
+SRCS_MIN+=	MC/StringTableBuilder.cpp
+SRCS_MIN+=	MC/SubtargetFeature.cpp
+SRCS_MIN+=	MC/WinCOFFObjectWriter.cpp
+SRCS_MIN+=	MC/WinCOFFStreamer.cpp
+SRCS_MIN+=	Object/Archive.cpp
+SRCS_MIN+=	Object/ArchiveWriter.cpp
+SRCS_MIN+=	Object/Binary.cpp
+SRCS_MIN+=	Object/COFFObjectFile.cpp
+SRCS_MIN+=	Object/ELF.cpp
+SRCS_MIN+=	Object/ELFObjectFile.cpp
+SRCS_MIN+=	Object/Error.cpp
+SRCS_MIN+=	Object/IRObjectFile.cpp
+SRCS_MIN+=	Object/MachOObjectFile.cpp
+SRCS_MIN+=	Object/MachOUniversal.cpp
+SRCS_MIN+=	Object/ModuleSummaryIndexObjectFile.cpp
+SRCS_EXT+=	Object/Object.cpp
+SRCS_MIN+=	Object/ObjectFile.cpp
+SRCS_MIN+=	Object/RecordStreamer.cpp
+SRCS_EXT+=	Object/SymbolSize.cpp
+SRCS_MIN+=	Object/SymbolicFile.cpp
+SRCS_MIN+=	ObjectYAML/COFFYAML.cpp
+SRCS_MIN+=	ObjectYAML/ELFYAML.cpp
+SRCS_MIN+=	ObjectYAML/MachOYAML.cpp
+#SRCS_EXT+=	ObjectYAML/ObjectYAML.cpp
+#SRCS_EXT+=	ObjectYAML/YAML.cpp
+SRCS_MIN+=	Option/Arg.cpp
+SRCS_MIN+=	Option/ArgList.cpp
+SRCS_MIN+=	Option/OptTable.cpp
+SRCS_MIN+=	Option/Option.cpp
+SRCS_EXT+=	Passes/PassBuilder.cpp
+SRCS_MIN+=	ProfileData/Coverage/CoverageMapping.cpp
+SRCS_MIN+=	ProfileData/Coverage/CoverageMappingReader.cpp
+SRCS_MIN+=	ProfileData/Coverage/CoverageMappingWriter.cpp
+SRCS_MIN+=	ProfileData/InstrProf.cpp
+SRCS_MIN+=	ProfileData/InstrProfReader.cpp
+SRCS_MIN+=	ProfileData/InstrProfWriter.cpp
+SRCS_MIN+=	ProfileData/ProfileSummaryBuilder.cpp
+SRCS_MIN+=	ProfileData/SampleProf.cpp
+SRCS_MIN+=	ProfileData/SampleProfReader.cpp
+SRCS_EXT+=	ProfileData/SampleProfWriter.cpp
+SRCS_MIN+=	Support/APFloat.cpp
+SRCS_MIN+=	Support/APInt.cpp
+SRCS_MIN+=	Support/APSInt.cpp
+SRCS_MIN+=	Support/ARMBuildAttrs.cpp
+#SRCS_EXT+=	Support/ARMWinEH.cpp
+SRCS_MIN+=	Support/Allocator.cpp
+SRCS_MIN+=	Support/Atomic.cpp
+SRCS_MIN+=	Support/BlockFrequency.cpp
+SRCS_MIN+=	Support/BranchProbability.cpp
+SRCS_EXT+=	Support/COM.cpp
+SRCS_MIN+=	Support/CachePruning.cpp
+SRCS_MIN+=	Support/CommandLine.cpp
+SRCS_MIN+=	Support/Compression.cpp
+SRCS_MIN+=	Support/ConvertUTF.c
+SRCS_MIN+=	Support/ConvertUTFWrapper.cpp
+SRCS_MIN+=	Support/CrashRecoveryContext.cpp
+SRCS_MIN+=	Support/DAGDeltaAlgorithm.cpp
+SRCS_MIN+=	Support/DataExtractor.cpp
+SRCS_EXT+=	Support/DataStream.cpp
+SRCS_MIN+=	Support/Debug.cpp
+SRCS_MIN+=	Support/DeltaAlgorithm.cpp
+SRCS_MIN+=	Support/Dwarf.cpp
+SRCS_MIN+=	Support/DynamicLibrary.cpp
+SRCS_MIN+=	Support/Errno.cpp
+SRCS_MIN+=	Support/Error.cpp
+SRCS_MIN+=	Support/ErrorHandling.cpp
+SRCS_EXT+=	Support/FileOutputBuffer.cpp
+SRCS_EXT+=	Support/FileUtilities.cpp
+SRCS_MIN+=	Support/FoldingSet.cpp
+SRCS_MIN+=	Support/FormattedStream.cpp
+SRCS_MIN+=	Support/GraphWriter.cpp
+SRCS_MIN+=	Support/Hashing.cpp
+SRCS_MIN+=	Support/Host.cpp
+SRCS_MIN+=	Support/IntEqClasses.cpp
+SRCS_MIN+=	Support/IntervalMap.cpp
+SRCS_FUL+=	Support/IntrusiveRefCntPtr.cpp
+SRCS_MIN+=	Support/JamCRC.cpp
+SRCS_MIN+=	Support/LEB128.cpp
+SRCS_MIN+=	Support/LineIterator.cpp
+SRCS_MIN+=	Support/Locale.cpp
+SRCS_MIN+=	Support/LockFileManager.cpp
+SRCS_MIN+=	Support/MD5.cpp
+SRCS_MIN+=	Support/ManagedStatic.cpp
+SRCS_MIN+=	Support/MathExtras.cpp
+SRCS_XDB+=	Support/Memory.cpp
+SRCS_MIN+=	Support/MemoryBuffer.cpp
+SRCS_MIN+=	Support/MemoryObject.cpp
+SRCS_MIN+=	Support/Mutex.cpp
+SRCS_MIN+=	Support/Options.cpp
+SRCS_MIN+=	Support/Path.cpp
+SRCS_MIN+=	Support/PluginLoader.cpp
+SRCS_MIN+=	Support/PrettyStackTrace.cpp
+SRCS_MIN+=	Support/Process.cpp
+SRCS_MIN+=	Support/Program.cpp
+SRCS_MIN+=	Support/RWMutex.cpp
+SRCS_MIN+=	Support/RandomNumberGenerator.cpp
+SRCS_MIN+=	Support/Regex.cpp
+SRCS_MIN+=	Support/SHA1.cpp
+SRCS_MIN+=	Support/ScaledNumber.cpp
+SRCS_MIN+=	Support/ScopedPrinter.cpp
+SRCS_MIN+=	Support/SearchForAddressOfSpecialSymbol.cpp
+SRCS_MIN+=	Support/Signals.cpp
+SRCS_MIN+=	Support/SmallPtrSet.cpp
+SRCS_MIN+=	Support/SmallVector.cpp
+SRCS_MIN+=	Support/SourceMgr.cpp
+SRCS_MIN+=	Support/SpecialCaseList.cpp
+SRCS_MIN+=	Support/Statistic.cpp
+SRCS_MIN+=	Support/StreamingMemoryObject.cpp
+SRCS_MIN+=	Support/StringExtras.cpp
+SRCS_MIN+=	Support/StringMap.cpp
+SRCS_MIN+=	Support/StringRef.cpp
+SRCS_MIN+=	Support/StringSaver.cpp
+SRCS_EXT+=	Support/SystemUtils.cpp
+SRCS_MIN+=	Support/TargetParser.cpp
+SRCS_MIN+=	Support/TargetRegistry.cpp
+SRCS_MIN+=	Support/ThreadLocal.cpp
+SRCS_EXT+=	Support/ThreadPool.cpp
+SRCS_MIN+=	Support/Threading.cpp
+SRCS_MIN+=	Support/TimeValue.cpp
+SRCS_MIN+=	Support/Timer.cpp
+SRCS_MIN+=	Support/ToolOutputFile.cpp
+SRCS_MIN+=	Support/Triple.cpp
+SRCS_MIN+=	Support/Twine.cpp
+SRCS_MIN+=	Support/Unicode.cpp
+SRCS_MIN+=	Support/Valgrind.cpp
+#SRCS_EXT+=	Support/Watchdog.cpp
+SRCS_MIN+=	Support/YAMLParser.cpp
+SRCS_MIN+=	Support/YAMLTraits.cpp
+SRCS_MIN+=	Support/circular_raw_ostream.cpp
+SRCS_MIN+=	Support/raw_os_ostream.cpp
+SRCS_MIN+=	Support/raw_ostream.cpp
+SRCS_MIN+=	Support/regcomp.c
+SRCS_MIN+=	Support/regerror.c
+SRCS_MIN+=	Support/regexec.c
+SRCS_MIN+=	Support/regfree.c
+SRCS_MIN+=	Support/regstrlcpy.c
+SRCS_MIN+=	TableGen/Error.cpp
+SRCS_MIN+=	TableGen/Main.cpp
+SRCS_MIN+=	TableGen/Record.cpp
+SRCS_MIN+=	TableGen/SetTheory.cpp
+SRCS_MIN+=	TableGen/StringMatcher.cpp
+SRCS_MIN+=	TableGen/TGLexer.cpp
+SRCS_MIN+=	TableGen/TGParser.cpp
+SRCS_MIN+=	TableGen/TableGenBackend.cpp
+SRCS_MIN+=	Target/AArch64/AArch64A53Fix835769.cpp
+SRCS_MIN+=	Target/AArch64/AArch64A57FPLoadBalancing.cpp
+SRCS_MIN+=	Target/AArch64/AArch64AddressTypePromotion.cpp
+SRCS_MIN+=	Target/AArch64/AArch64AdvSIMDScalarPass.cpp
+SRCS_MIN+=	Target/AArch64/AArch64AsmPrinter.cpp
+SRCS_MIN+=	Target/AArch64/AArch64BranchRelaxation.cpp
+SRCS_MIN+=	Target/AArch64/AArch64CleanupLocalDynamicTLSPass.cpp
+SRCS_MIN+=	Target/AArch64/AArch64CollectLOH.cpp
+SRCS_MIN+=	Target/AArch64/AArch64ConditionOptimizer.cpp
+SRCS_MIN+=	Target/AArch64/AArch64ConditionalCompares.cpp
+SRCS_MIN+=	Target/AArch64/AArch64DeadRegisterDefinitionsPass.cpp
+SRCS_MIN+=	Target/AArch64/AArch64ExpandPseudoInsts.cpp
+SRCS_MIN+=	Target/AArch64/AArch64FastISel.cpp
+SRCS_MIN+=	Target/AArch64/AArch64FrameLowering.cpp
+SRCS_MIN+=	Target/AArch64/AArch64ISelDAGToDAG.cpp
+SRCS_MIN+=	Target/AArch64/AArch64ISelLowering.cpp
+SRCS_MIN+=	Target/AArch64/AArch64InstrInfo.cpp
+SRCS_MIN+=	Target/AArch64/AArch64LoadStoreOptimizer.cpp
+SRCS_MIN+=	Target/AArch64/AArch64MCInstLower.cpp
+SRCS_MIN+=	Target/AArch64/AArch64PBQPRegAlloc.cpp
+SRCS_MIN+=	Target/AArch64/AArch64PromoteConstant.cpp
+SRCS_MIN+=	Target/AArch64/AArch64RedundantCopyElimination.cpp
+SRCS_MIN+=	Target/AArch64/AArch64RegisterInfo.cpp
+SRCS_MIN+=	Target/AArch64/AArch64SelectionDAGInfo.cpp
+SRCS_MIN+=	Target/AArch64/AArch64StorePairSuppress.cpp
+SRCS_MIN+=	Target/AArch64/AArch64Subtarget.cpp
+SRCS_MIN+=	Target/AArch64/AArch64TargetMachine.cpp
+SRCS_MIN+=	Target/AArch64/AArch64TargetObjectFile.cpp
+SRCS_MIN+=	Target/AArch64/AArch64TargetTransformInfo.cpp
+SRCS_MIN+=	Target/AArch64/AsmParser/AArch64AsmParser.cpp
+SRCS_XDB+=	Target/AArch64/Disassembler/AArch64Disassembler.cpp
+SRCS_MIN+=	Target/AArch64/Disassembler/AArch64ExternalSymbolizer.cpp
+SRCS_MIN+=	Target/AArch64/InstPrinter/AArch64InstPrinter.cpp
+SRCS_MIN+=	Target/AArch64/MCTargetDesc/AArch64AsmBackend.cpp
+SRCS_MIN+=	Target/AArch64/MCTargetDesc/AArch64ELFObjectWriter.cpp
+SRCS_MIN+=	Target/AArch64/MCTargetDesc/AArch64ELFStreamer.cpp
+SRCS_MIN+=	Target/AArch64/MCTargetDesc/AArch64MCAsmInfo.cpp
+SRCS_MIN+=	Target/AArch64/MCTargetDesc/AArch64MCCodeEmitter.cpp
+SRCS_MIN+=	Target/AArch64/MCTargetDesc/AArch64MCExpr.cpp
+SRCS_MIN+=	Target/AArch64/MCTargetDesc/AArch64MCTargetDesc.cpp
+SRCS_MIN+=	Target/AArch64/MCTargetDesc/AArch64MachObjectWriter.cpp
+SRCS_MIN+=	Target/AArch64/MCTargetDesc/AArch64TargetStreamer.cpp
+SRCS_MIN+=	Target/AArch64/TargetInfo/AArch64TargetInfo.cpp
+SRCS_MIN+=	Target/AArch64/Utils/AArch64BaseInfo.cpp
+SRCS_MIN+=	Target/ARM/A15SDOptimizer.cpp
+SRCS_MIN+=	Target/ARM/ARMAsmPrinter.cpp
+SRCS_MIN+=	Target/ARM/ARMBaseInstrInfo.cpp
+SRCS_MIN+=	Target/ARM/ARMBaseRegisterInfo.cpp
+SRCS_MIN+=	Target/ARM/ARMConstantIslandPass.cpp
+SRCS_MIN+=	Target/ARM/ARMConstantPoolValue.cpp
+SRCS_MIN+=	Target/ARM/ARMExpandPseudoInsts.cpp
+SRCS_MIN+=	Target/ARM/ARMFastISel.cpp
+SRCS_MIN+=	Target/ARM/ARMFrameLowering.cpp
+SRCS_MIN+=	Target/ARM/ARMHazardRecognizer.cpp
+SRCS_MIN+=	Target/ARM/ARMISelDAGToDAG.cpp
+SRCS_MIN+=	Target/ARM/ARMISelLowering.cpp
+SRCS_MIN+=	Target/ARM/ARMInstrInfo.cpp
+SRCS_MIN+=	Target/ARM/ARMLoadStoreOptimizer.cpp
+SRCS_MIN+=	Target/ARM/ARMMCInstLower.cpp
+SRCS_MIN+=	Target/ARM/ARMMachineFunctionInfo.cpp
+SRCS_MIN+=	Target/ARM/ARMOptimizeBarriersPass.cpp
+SRCS_MIN+=	Target/ARM/ARMRegisterInfo.cpp
+SRCS_MIN+=	Target/ARM/ARMSelectionDAGInfo.cpp
+SRCS_MIN+=	Target/ARM/ARMSubtarget.cpp
+SRCS_MIN+=	Target/ARM/ARMTargetMachine.cpp
+SRCS_MIN+=	Target/ARM/ARMTargetObjectFile.cpp
+SRCS_MIN+=	Target/ARM/ARMTargetTransformInfo.cpp
+SRCS_MIN+=	Target/ARM/AsmParser/ARMAsmParser.cpp
+SRCS_MIN+=	Target/ARM/Disassembler/ARMDisassembler.cpp
+SRCS_MIN+=	Target/ARM/InstPrinter/ARMInstPrinter.cpp
+SRCS_MIN+=	Target/ARM/MCTargetDesc/ARMAsmBackend.cpp
+SRCS_MIN+=	Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp
+SRCS_MIN+=	Target/ARM/MCTargetDesc/ARMELFStreamer.cpp
+SRCS_MIN+=	Target/ARM/MCTargetDesc/ARMMCAsmInfo.cpp
+SRCS_MIN+=	Target/ARM/MCTargetDesc/ARMMCCodeEmitter.cpp
+SRCS_MIN+=	Target/ARM/MCTargetDesc/ARMMCExpr.cpp
+SRCS_MIN+=	Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp
+SRCS_MIN+=	Target/ARM/MCTargetDesc/ARMMachORelocationInfo.cpp
+SRCS_MIN+=	Target/ARM/MCTargetDesc/ARMMachObjectWriter.cpp
+SRCS_MIN+=	Target/ARM/MCTargetDesc/ARMTargetStreamer.cpp
+SRCS_MIN+=	Target/ARM/MCTargetDesc/ARMUnwindOpAsm.cpp
+SRCS_MIN+=	Target/ARM/MCTargetDesc/ARMWinCOFFObjectWriter.cpp
+SRCS_MIN+=	Target/ARM/MCTargetDesc/ARMWinCOFFStreamer.cpp
+SRCS_MIN+=	Target/ARM/MLxExpansionPass.cpp
+SRCS_MIN+=	Target/ARM/TargetInfo/ARMTargetInfo.cpp
+SRCS_MIN+=	Target/ARM/Thumb1FrameLowering.cpp
+SRCS_MIN+=	Target/ARM/Thumb1InstrInfo.cpp
+SRCS_MIN+=	Target/ARM/Thumb2ITBlockPass.cpp
+SRCS_MIN+=	Target/ARM/Thumb2InstrInfo.cpp
+SRCS_MIN+=	Target/ARM/Thumb2SizeReduction.cpp
+SRCS_MIN+=	Target/ARM/ThumbRegisterInfo.cpp
+SRCS_MIN+=	Target/Mips/AsmParser/MipsAsmParser.cpp
+SRCS_XDB+=	Target/Mips/Disassembler/MipsDisassembler.cpp
+SRCS_MIN+=	Target/Mips/InstPrinter/MipsInstPrinter.cpp
+SRCS_MIN+=	Target/Mips/MCTargetDesc/MipsABIFlagsSection.cpp
+SRCS_MIN+=	Target/Mips/MCTargetDesc/MipsABIInfo.cpp
+SRCS_MIN+=	Target/Mips/MCTargetDesc/MipsAsmBackend.cpp
+SRCS_MIN+=	Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp
+SRCS_MIN+=	Target/Mips/MCTargetDesc/MipsELFStreamer.cpp
+SRCS_MIN+=	Target/Mips/MCTargetDesc/MipsMCAsmInfo.cpp
+SRCS_MIN+=	Target/Mips/MCTargetDesc/MipsMCCodeEmitter.cpp
+SRCS_MIN+=	Target/Mips/MCTargetDesc/MipsMCExpr.cpp
+SRCS_MIN+=	Target/Mips/MCTargetDesc/MipsMCTargetDesc.cpp
+SRCS_MIN+=	Target/Mips/MCTargetDesc/MipsNaClELFStreamer.cpp
+SRCS_MIN+=	Target/Mips/MCTargetDesc/MipsOptionRecord.cpp
+SRCS_MIN+=	Target/Mips/MCTargetDesc/MipsTargetStreamer.cpp
+SRCS_MIN+=	Target/Mips/Mips16FrameLowering.cpp
+SRCS_MIN+=	Target/Mips/Mips16HardFloat.cpp
+SRCS_MIN+=	Target/Mips/Mips16HardFloatInfo.cpp
+SRCS_MIN+=	Target/Mips/Mips16ISelDAGToDAG.cpp
+SRCS_MIN+=	Target/Mips/Mips16ISelLowering.cpp
+SRCS_MIN+=	Target/Mips/Mips16InstrInfo.cpp
+SRCS_MIN+=	Target/Mips/Mips16RegisterInfo.cpp
+SRCS_MIN+=	Target/Mips/MipsAnalyzeImmediate.cpp
+SRCS_MIN+=	Target/Mips/MipsAsmPrinter.cpp
+SRCS_MIN+=	Target/Mips/MipsCCState.cpp
+SRCS_MIN+=	Target/Mips/MipsConstantIslandPass.cpp
+SRCS_MIN+=	Target/Mips/MipsDelaySlotFiller.cpp
+SRCS_MIN+=	Target/Mips/MipsFastISel.cpp
+SRCS_MIN+=	Target/Mips/MipsFrameLowering.cpp
+SRCS_MIN+=	Target/Mips/MipsHazardSchedule.cpp
+SRCS_MIN+=	Target/Mips/MipsISelDAGToDAG.cpp
+SRCS_MIN+=	Target/Mips/MipsISelLowering.cpp
+SRCS_MIN+=	Target/Mips/MipsInstrInfo.cpp
+SRCS_MIN+=	Target/Mips/MipsLongBranch.cpp
+SRCS_MIN+=	Target/Mips/MipsMCInstLower.cpp
+SRCS_MIN+=	Target/Mips/MipsMachineFunction.cpp
+SRCS_MIN+=	Target/Mips/MipsModuleISelDAGToDAG.cpp
+SRCS_MIN+=	Target/Mips/MipsOptimizePICCall.cpp
+SRCS_MIN+=	Target/Mips/MipsOs16.cpp
+SRCS_MIN+=	Target/Mips/MipsRegisterInfo.cpp
+SRCS_MIN+=	Target/Mips/MipsSEFrameLowering.cpp
+SRCS_MIN+=	Target/Mips/MipsSEISelDAGToDAG.cpp
+SRCS_MIN+=	Target/Mips/MipsSEISelLowering.cpp
+SRCS_MIN+=	Target/Mips/MipsSEInstrInfo.cpp
+SRCS_MIN+=	Target/Mips/MipsSERegisterInfo.cpp
+SRCS_MIN+=	Target/Mips/MipsSubtarget.cpp
+SRCS_MIN+=	Target/Mips/MipsTargetMachine.cpp
+SRCS_MIN+=	Target/Mips/MipsTargetObjectFile.cpp
+SRCS_MIN+=	Target/Mips/TargetInfo/MipsTargetInfo.cpp
+SRCS_MIN+=	Target/PowerPC/AsmParser/PPCAsmParser.cpp
+SRCS_MIN+=	Target/PowerPC/Disassembler/PPCDisassembler.cpp
+SRCS_MIN+=	Target/PowerPC/InstPrinter/PPCInstPrinter.cpp
+SRCS_MIN+=	Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp
+SRCS_MIN+=	Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp
+SRCS_MIN+=	Target/PowerPC/MCTargetDesc/PPCMCAsmInfo.cpp
+SRCS_MIN+=	Target/PowerPC/MCTargetDesc/PPCMCCodeEmitter.cpp
+SRCS_MIN+=	Target/PowerPC/MCTargetDesc/PPCMCExpr.cpp
+SRCS_MIN+=	Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.cpp
+SRCS_MIN+=	Target/PowerPC/MCTargetDesc/PPCMachObjectWriter.cpp
+SRCS_MIN+=	Target/PowerPC/MCTargetDesc/PPCPredicates.cpp
+SRCS_MIN+=	Target/PowerPC/PPCAsmPrinter.cpp
+SRCS_MIN+=	Target/PowerPC/PPCBoolRetToInt.cpp
+SRCS_MIN+=	Target/PowerPC/PPCBranchSelector.cpp
+SRCS_MIN+=	Target/PowerPC/PPCCCState.cpp
+SRCS_MIN+=	Target/PowerPC/PPCCTRLoops.cpp
+SRCS_MIN+=	Target/PowerPC/PPCEarlyReturn.cpp
+SRCS_MIN+=	Target/PowerPC/PPCFastISel.cpp
+SRCS_MIN+=	Target/PowerPC/PPCFrameLowering.cpp
+SRCS_MIN+=	Target/PowerPC/PPCHazardRecognizers.cpp
+SRCS_MIN+=	Target/PowerPC/PPCISelDAGToDAG.cpp
+SRCS_MIN+=	Target/PowerPC/PPCISelLowering.cpp
+SRCS_MIN+=	Target/PowerPC/PPCInstrInfo.cpp
+SRCS_MIN+=	Target/PowerPC/PPCLoopPreIncPrep.cpp
+SRCS_MIN+=	Target/PowerPC/PPCMCInstLower.cpp
+SRCS_MIN+=	Target/PowerPC/PPCMIPeephole.cpp
+SRCS_MIN+=	Target/PowerPC/PPCMachineFunctionInfo.cpp
+SRCS_MIN+=	Target/PowerPC/PPCQPXLoadSplat.cpp
+SRCS_MIN+=	Target/PowerPC/PPCRegisterInfo.cpp
+SRCS_MIN+=	Target/PowerPC/PPCSubtarget.cpp
+SRCS_MIN+=	Target/PowerPC/PPCTLSDynamicCall.cpp
+SRCS_MIN+=	Target/PowerPC/PPCTOCRegDeps.cpp
+SRCS_MIN+=	Target/PowerPC/PPCTargetMachine.cpp
+SRCS_MIN+=	Target/PowerPC/PPCTargetObjectFile.cpp
+SRCS_MIN+=	Target/PowerPC/PPCTargetTransformInfo.cpp
+SRCS_MIN+=	Target/PowerPC/PPCVSXCopy.cpp
+SRCS_MIN+=	Target/PowerPC/PPCVSXFMAMutate.cpp
+SRCS_MIN+=	Target/PowerPC/PPCVSXSwapRemoval.cpp
+SRCS_MIN+=	Target/PowerPC/TargetInfo/PowerPCTargetInfo.cpp
+SRCS_MIN+=	Target/Sparc/AsmParser/SparcAsmParser.cpp
+SRCS_MIN+=	Target/Sparc/DelaySlotFiller.cpp
+SRCS_XDB+=	Target/Sparc/Disassembler/SparcDisassembler.cpp
+SRCS_MIN+=	Target/Sparc/InstPrinter/SparcInstPrinter.cpp
+SRCS_MIN+=	Target/Sparc/LeonPasses.cpp
+SRCS_MIN+=	Target/Sparc/MCTargetDesc/SparcAsmBackend.cpp
+SRCS_MIN+=	Target/Sparc/MCTargetDesc/SparcELFObjectWriter.cpp
+SRCS_MIN+=	Target/Sparc/MCTargetDesc/SparcMCAsmInfo.cpp
+SRCS_MIN+=	Target/Sparc/MCTargetDesc/SparcMCCodeEmitter.cpp
+SRCS_MIN+=	Target/Sparc/MCTargetDesc/SparcMCExpr.cpp
+SRCS_MIN+=	Target/Sparc/MCTargetDesc/SparcMCTargetDesc.cpp
+SRCS_MIN+=	Target/Sparc/MCTargetDesc/SparcTargetStreamer.cpp
+SRCS_MIN+=	Target/Sparc/SparcAsmPrinter.cpp
+SRCS_MIN+=	Target/Sparc/SparcFrameLowering.cpp
+SRCS_MIN+=	Target/Sparc/SparcISelDAGToDAG.cpp
+SRCS_MIN+=	Target/Sparc/SparcISelLowering.cpp
+SRCS_MIN+=	Target/Sparc/SparcInstrInfo.cpp
+SRCS_MIN+=	Target/Sparc/SparcMCInstLower.cpp
+SRCS_MIN+=	Target/Sparc/SparcMachineFunctionInfo.cpp
+SRCS_MIN+=	Target/Sparc/SparcRegisterInfo.cpp
+SRCS_MIN+=	Target/Sparc/SparcSubtarget.cpp
+SRCS_MIN+=	Target/Sparc/SparcTargetMachine.cpp
+SRCS_MIN+=	Target/Sparc/SparcTargetObjectFile.cpp
+SRCS_MIN+=	Target/Sparc/TargetInfo/SparcTargetInfo.cpp
+SRCS_MIN+=	Target/Target.cpp
+#SRCS_EXT+=	Target/TargetIntrinsicInfo.cpp
+SRCS_MIN+=	Target/TargetLoweringObjectFile.cpp
+SRCS_MIN+=	Target/TargetMachine.cpp
+SRCS_MIN+=	Target/TargetMachineC.cpp
+SRCS_MIN+=	Target/TargetRecip.cpp
+SRCS_MIN+=	Target/TargetSubtargetInfo.cpp
+SRCS_MIN+=	Target/X86/AsmParser/X86AsmInstrumentation.cpp
+SRCS_MIN+=	Target/X86/AsmParser/X86AsmParser.cpp
+SRCS_XDB+=	Target/X86/Disassembler/X86Disassembler.cpp
+SRCS_XDB+=	Target/X86/Disassembler/X86DisassemblerDecoder.cpp
+SRCS_MIN+=	Target/X86/InstPrinter/X86ATTInstPrinter.cpp
+SRCS_MIN+=	Target/X86/InstPrinter/X86InstComments.cpp
+SRCS_MIN+=	Target/X86/InstPrinter/X86IntelInstPrinter.cpp
+SRCS_MIN+=	Target/X86/MCTargetDesc/X86AsmBackend.cpp
+SRCS_MIN+=	Target/X86/MCTargetDesc/X86ELFObjectWriter.cpp
+SRCS_MIN+=	Target/X86/MCTargetDesc/X86MCAsmInfo.cpp
+SRCS_MIN+=	Target/X86/MCTargetDesc/X86MCCodeEmitter.cpp
+SRCS_MIN+=	Target/X86/MCTargetDesc/X86MCTargetDesc.cpp
+SRCS_MIN+=	Target/X86/MCTargetDesc/X86MachObjectWriter.cpp
+SRCS_MIN+=	Target/X86/MCTargetDesc/X86WinCOFFObjectWriter.cpp
+SRCS_MIN+=	Target/X86/MCTargetDesc/X86WinCOFFStreamer.cpp
+SRCS_MIN+=	Target/X86/TargetInfo/X86TargetInfo.cpp
+SRCS_MIN+=	Target/X86/Utils/X86ShuffleDecode.cpp
+SRCS_MIN+=	Target/X86/X86AsmPrinter.cpp
+SRCS_MIN+=	Target/X86/X86CallFrameOptimization.cpp
+SRCS_MIN+=	Target/X86/X86ExpandPseudo.cpp
+SRCS_MIN+=	Target/X86/X86FastISel.cpp
+SRCS_MIN+=	Target/X86/X86FixupBWInsts.cpp
+SRCS_MIN+=	Target/X86/X86FixupLEAs.cpp
+SRCS_MIN+=	Target/X86/X86FixupSetCC.cpp
+SRCS_MIN+=	Target/X86/X86FloatingPoint.cpp
+SRCS_MIN+=	Target/X86/X86FrameLowering.cpp
+SRCS_MIN+=	Target/X86/X86ISelDAGToDAG.cpp
+SRCS_MIN+=	Target/X86/X86ISelLowering.cpp
+SRCS_MIN+=	Target/X86/X86InstrInfo.cpp
+SRCS_MIN+=	Target/X86/X86MCInstLower.cpp
+SRCS_MIN+=	Target/X86/X86MachineFunctionInfo.cpp
+SRCS_MIN+=	Target/X86/X86OptimizeLEAs.cpp
+SRCS_MIN+=	Target/X86/X86PadShortFunction.cpp
+SRCS_MIN+=	Target/X86/X86RegisterInfo.cpp
+SRCS_MIN+=	Target/X86/X86SelectionDAGInfo.cpp
+SRCS_MIN+=	Target/X86/X86ShuffleDecodeConstantPool.cpp
+SRCS_MIN+=	Target/X86/X86Subtarget.cpp
+SRCS_MIN+=	Target/X86/X86TargetMachine.cpp
+SRCS_MIN+=	Target/X86/X86TargetObjectFile.cpp
+SRCS_MIN+=	Target/X86/X86TargetTransformInfo.cpp
+SRCS_MIN+=	Target/X86/X86VZeroUpper.cpp
+SRCS_MIN+=	Target/X86/X86WinAllocaExpander.cpp
+SRCS_MIN+=	Target/X86/X86WinEHState.cpp
+SRCS_MIN+=	Transforms/IPO/ArgumentPromotion.cpp
+SRCS_MIN+=	Transforms/IPO/BarrierNoopPass.cpp
+SRCS_MIN+=	Transforms/IPO/ConstantMerge.cpp
+SRCS_MIN+=	Transforms/IPO/CrossDSOCFI.cpp
+SRCS_MIN+=	Transforms/IPO/DeadArgumentElimination.cpp
+SRCS_MIN+=	Transforms/IPO/ElimAvailExtern.cpp
+SRCS_MIN+=	Transforms/IPO/ExtractGV.cpp
+SRCS_MIN+=	Transforms/IPO/ForceFunctionAttrs.cpp
+SRCS_MIN+=	Transforms/IPO/FunctionAttrs.cpp
+SRCS_MIN+=	Transforms/IPO/FunctionImport.cpp
+SRCS_MIN+=	Transforms/IPO/GlobalDCE.cpp
+SRCS_MIN+=	Transforms/IPO/GlobalOpt.cpp
+SRCS_MIN+=	Transforms/IPO/IPConstantPropagation.cpp
+SRCS_EXT+=	Transforms/IPO/IPO.cpp
+SRCS_MIN+=	Transforms/IPO/InferFunctionAttrs.cpp
+SRCS_MIN+=	Transforms/IPO/InlineAlways.cpp
+SRCS_MIN+=	Transforms/IPO/InlineSimple.cpp
+SRCS_MIN+=	Transforms/IPO/Inliner.cpp
+SRCS_MIN+=	Transforms/IPO/Internalize.cpp
+SRCS_MIN+=	Transforms/IPO/LoopExtractor.cpp
+SRCS_MIN+=	Transforms/IPO/LowerTypeTests.cpp
+SRCS_MIN+=	Transforms/IPO/MergeFunctions.cpp
+SRCS_MIN+=	Transforms/IPO/PartialInlining.cpp
+SRCS_MIN+=	Transforms/IPO/PassManagerBuilder.cpp
+SRCS_MIN+=	Transforms/IPO/PruneEH.cpp
+SRCS_MIN+=	Transforms/IPO/SampleProfile.cpp
+SRCS_MIN+=	Transforms/IPO/StripDeadPrototypes.cpp
+SRCS_MIN+=	Transforms/IPO/StripSymbols.cpp
+SRCS_MIN+=	Transforms/IPO/WholeProgramDevirt.cpp
+SRCS_MIN+=	Transforms/InstCombine/InstCombineAddSub.cpp
+SRCS_MIN+=	Transforms/InstCombine/InstCombineAndOrXor.cpp
+SRCS_MIN+=	Transforms/InstCombine/InstCombineCalls.cpp
+SRCS_MIN+=	Transforms/InstCombine/InstCombineCasts.cpp
+SRCS_MIN+=	Transforms/InstCombine/InstCombineCompares.cpp
+SRCS_MIN+=	Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp
+SRCS_MIN+=	Transforms/InstCombine/InstCombineMulDivRem.cpp
+SRCS_MIN+=	Transforms/InstCombine/InstCombinePHI.cpp
+SRCS_MIN+=	Transforms/InstCombine/InstCombineSelect.cpp
+SRCS_MIN+=	Transforms/InstCombine/InstCombineShifts.cpp
+SRCS_MIN+=	Transforms/InstCombine/InstCombineSimplifyDemanded.cpp
+SRCS_MIN+=	Transforms/InstCombine/InstCombineVectorOps.cpp
+SRCS_MIN+=	Transforms/InstCombine/InstructionCombining.cpp
+SRCS_MIN+=	Transforms/Instrumentation/AddressSanitizer.cpp
+SRCS_MIN+=	Transforms/Instrumentation/BoundsChecking.cpp
+SRCS_MIN+=	Transforms/Instrumentation/DataFlowSanitizer.cpp
+SRCS_MIN+=	Transforms/Instrumentation/EfficiencySanitizer.cpp
+SRCS_MIN+=	Transforms/Instrumentation/GCOVProfiling.cpp
+SRCS_MIN+=	Transforms/Instrumentation/IndirectCallPromotion.cpp
+SRCS_MIN+=	Transforms/Instrumentation/InstrProfiling.cpp
+SRCS_MIN+=	Transforms/Instrumentation/Instrumentation.cpp
+SRCS_MIN+=	Transforms/Instrumentation/MemorySanitizer.cpp
+SRCS_MIN+=	Transforms/Instrumentation/PGOInstrumentation.cpp
+SRCS_MIN+=	Transforms/Instrumentation/SanitizerCoverage.cpp
+SRCS_MIN+=	Transforms/Instrumentation/ThreadSanitizer.cpp
+SRCS_MIN+=	Transforms/ObjCARC/DependencyAnalysis.cpp
+SRCS_EXT+=	Transforms/ObjCARC/ObjCARC.cpp
+SRCS_MIN+=	Transforms/ObjCARC/ObjCARCAPElim.cpp
+SRCS_MIN+=	Transforms/ObjCARC/ObjCARCContract.cpp
+SRCS_MIN+=	Transforms/ObjCARC/ObjCARCExpand.cpp
+SRCS_MIN+=	Transforms/ObjCARC/ObjCARCOpts.cpp
+SRCS_MIN+=	Transforms/ObjCARC/ProvenanceAnalysis.cpp
+SRCS_MIN+=	Transforms/ObjCARC/ProvenanceAnalysisEvaluator.cpp
+SRCS_MIN+=	Transforms/ObjCARC/PtrState.cpp
+SRCS_MIN+=	Transforms/Scalar/ADCE.cpp
+SRCS_MIN+=	Transforms/Scalar/AlignmentFromAssumptions.cpp
+SRCS_MIN+=	Transforms/Scalar/BDCE.cpp
+SRCS_MIN+=	Transforms/Scalar/ConstantHoisting.cpp
+SRCS_MIN+=	Transforms/Scalar/ConstantProp.cpp
+SRCS_MIN+=	Transforms/Scalar/CorrelatedValuePropagation.cpp
+SRCS_MIN+=	Transforms/Scalar/DCE.cpp
+SRCS_MIN+=	Transforms/Scalar/DeadStoreElimination.cpp
+SRCS_MIN+=	Transforms/Scalar/EarlyCSE.cpp
+SRCS_MIN+=	Transforms/Scalar/FlattenCFGPass.cpp
+SRCS_MIN+=	Transforms/Scalar/Float2Int.cpp
+SRCS_MIN+=	Transforms/Scalar/GVN.cpp
+SRCS_MIN+=	Transforms/Scalar/GVNHoist.cpp
+SRCS_MIN+=	Transforms/Scalar/GuardWidening.cpp
+SRCS_MIN+=	Transforms/Scalar/IndVarSimplify.cpp
+SRCS_MIN+=	Transforms/Scalar/InductiveRangeCheckElimination.cpp
+SRCS_MIN+=	Transforms/Scalar/JumpThreading.cpp
+SRCS_MIN+=	Transforms/Scalar/LICM.cpp
+SRCS_MIN+=	Transforms/Scalar/LoadCombine.cpp
+SRCS_MIN+=	Transforms/Scalar/LoopDataPrefetch.cpp
+SRCS_MIN+=	Transforms/Scalar/LoopDeletion.cpp
+SRCS_MIN+=	Transforms/Scalar/LoopDistribute.cpp
+SRCS_MIN+=	Transforms/Scalar/LoopIdiomRecognize.cpp
+SRCS_EXT+=	Transforms/Scalar/LoopInstSimplify.cpp
+SRCS_MIN+=	Transforms/Scalar/LoopInterchange.cpp
+SRCS_MIN+=	Transforms/Scalar/LoopLoadElimination.cpp
+SRCS_MIN+=	Transforms/Scalar/LoopRerollPass.cpp
+SRCS_MIN+=	Transforms/Scalar/LoopRotation.cpp
+SRCS_MIN+=	Transforms/Scalar/LoopSimplifyCFG.cpp
+SRCS_MIN+=	Transforms/Scalar/LoopStrengthReduce.cpp
+SRCS_MIN+=	Transforms/Scalar/LoopUnrollPass.cpp
+SRCS_MIN+=	Transforms/Scalar/LoopUnswitch.cpp
+SRCS_MIN+=	Transforms/Scalar/LoopVersioningLICM.cpp
+SRCS_MIN+=	Transforms/Scalar/LowerAtomic.cpp
+SRCS_MIN+=	Transforms/Scalar/LowerExpectIntrinsic.cpp
+SRCS_MIN+=	Transforms/Scalar/LowerGuardIntrinsic.cpp
+SRCS_MIN+=	Transforms/Scalar/MemCpyOptimizer.cpp
+SRCS_MIN+=	Transforms/Scalar/MergedLoadStoreMotion.cpp
+SRCS_MIN+=	Transforms/Scalar/NaryReassociate.cpp
+SRCS_MIN+=	Transforms/Scalar/PartiallyInlineLibCalls.cpp
+SRCS_MIN+=	Transforms/Scalar/PlaceSafepoints.cpp
+SRCS_MIN+=	Transforms/Scalar/Reassociate.cpp
+SRCS_MIN+=	Transforms/Scalar/Reg2Mem.cpp
+SRCS_MIN+=	Transforms/Scalar/RewriteStatepointsForGC.cpp
+SRCS_MIN+=	Transforms/Scalar/SCCP.cpp
+SRCS_MIN+=	Transforms/Scalar/SROA.cpp
+SRCS_EXT+=	Transforms/Scalar/Scalar.cpp
+SRCS_MIN+=	Transforms/Scalar/Scalarizer.cpp
+SRCS_MIN+=	Transforms/Scalar/SeparateConstOffsetFromGEP.cpp
+SRCS_MIN+=	Transforms/Scalar/SimplifyCFGPass.cpp
+SRCS_MIN+=	Transforms/Scalar/Sink.cpp
+SRCS_MIN+=	Transforms/Scalar/SpeculativeExecution.cpp
+SRCS_MIN+=	Transforms/Scalar/StraightLineStrengthReduce.cpp
+SRCS_MIN+=	Transforms/Scalar/StructurizeCFG.cpp
+SRCS_MIN+=	Transforms/Scalar/TailRecursionElimination.cpp
+SRCS_MIN+=	Transforms/Utils/ASanStackFrameLayout.cpp
+SRCS_MIN+=	Transforms/Utils/AddDiscriminators.cpp
+SRCS_MIN+=	Transforms/Utils/BasicBlockUtils.cpp
+SRCS_MIN+=	Transforms/Utils/BreakCriticalEdges.cpp
+SRCS_MIN+=	Transforms/Utils/BuildLibCalls.cpp
+SRCS_MIN+=	Transforms/Utils/BypassSlowDivision.cpp
+SRCS_MIN+=	Transforms/Utils/CloneFunction.cpp
+SRCS_MIN+=	Transforms/Utils/CloneModule.cpp
+SRCS_MIN+=	Transforms/Utils/CmpInstAnalysis.cpp
+SRCS_MIN+=	Transforms/Utils/CodeExtractor.cpp
+SRCS_MIN+=	Transforms/Utils/CtorUtils.cpp
+SRCS_MIN+=	Transforms/Utils/DemoteRegToStack.cpp
+SRCS_MIN+=	Transforms/Utils/Evaluator.cpp
+SRCS_MIN+=	Transforms/Utils/FlattenCFG.cpp
+SRCS_MIN+=	Transforms/Utils/FunctionImportUtils.cpp
+SRCS_MIN+=	Transforms/Utils/GlobalStatus.cpp
+SRCS_MIN+=	Transforms/Utils/InlineFunction.cpp
+SRCS_MIN+=	Transforms/Utils/InstructionNamer.cpp
+SRCS_MIN+=	Transforms/Utils/IntegerDivision.cpp
+SRCS_MIN+=	Transforms/Utils/LCSSA.cpp
+SRCS_MIN+=	Transforms/Utils/Local.cpp
+SRCS_MIN+=	Transforms/Utils/LoopSimplify.cpp
+SRCS_MIN+=	Transforms/Utils/LoopUnroll.cpp
+SRCS_MIN+=	Transforms/Utils/LoopUnrollRuntime.cpp
+SRCS_MIN+=	Transforms/Utils/LoopUtils.cpp
+SRCS_MIN+=	Transforms/Utils/LoopVersioning.cpp
+SRCS_MIN+=	Transforms/Utils/LowerInvoke.cpp
+SRCS_MIN+=	Transforms/Utils/LowerSwitch.cpp
+SRCS_MIN+=	Transforms/Utils/Mem2Reg.cpp
+SRCS_MIN+=	Transforms/Utils/MemorySSA.cpp
+SRCS_MIN+=	Transforms/Utils/MetaRenamer.cpp
+SRCS_MIN+=	Transforms/Utils/ModuleUtils.cpp
+SRCS_MIN+=	Transforms/Utils/NameAnonFunctions.cpp
+SRCS_MIN+=	Transforms/Utils/PromoteMemoryToRegister.cpp
+SRCS_MIN+=	Transforms/Utils/SSAUpdater.cpp
+SRCS_MIN+=	Transforms/Utils/SanitizerStats.cpp
+SRCS_MIN+=	Transforms/Utils/SimplifyCFG.cpp
+SRCS_MIN+=	Transforms/Utils/SimplifyIndVar.cpp
+SRCS_MIN+=	Transforms/Utils/SimplifyInstructions.cpp
+SRCS_MIN+=	Transforms/Utils/SimplifyLibCalls.cpp
+SRCS_MIN+=	Transforms/Utils/SplitModule.cpp
+SRCS_MIN+=	Transforms/Utils/SymbolRewriter.cpp
+SRCS_MIN+=	Transforms/Utils/UnifyFunctionExitNodes.cpp
+SRCS_EXT+=	Transforms/Utils/Utils.cpp
+SRCS_MIN+=	Transforms/Utils/ValueMapper.cpp
+SRCS_MIN+=	Transforms/Vectorize/BBVectorize.cpp
+SRCS_MIN+=	Transforms/Vectorize/LoadStoreVectorizer.cpp
+SRCS_MIN+=	Transforms/Vectorize/LoopVectorize.cpp
+SRCS_MIN+=	Transforms/Vectorize/SLPVectorizer.cpp
+SRCS_EXT+=	Transforms/Vectorize/Vectorize.cpp
+
+SRCS_ALL+=	${SRCS_MIN}
+.if ${MK_CLANG_EXTRAS} != "no"
+SRCS_ALL+=	${SRCS_EXT}
+.endif
+.if ${MK_CLANG_FULL} != "no"
+SRCS_ALL+=	${SRCS_FUL}
+.endif
+.if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLDB} != "no"
+SRCS_ALL+=	${SRCS_XDB}
+.endif
+SRCS+=		${SRCS_ALL:O}
+
+llvm/IR/Attributes.inc: ${LLVM_SRCS}/include/llvm/IR/Attributes.td
+	${LLVM_TBLGEN} -gen-attrs \
+	    -I ${LLVM_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \
+	    ${LLVM_SRCS}/include/llvm/IR/Attributes.td
+TGHDRS+=	llvm/IR/Attributes.inc
+
+llvm/IR/Intrinsics.gen: ${LLVM_SRCS}/include/llvm/IR/Intrinsics.td
+	${LLVM_TBLGEN} -gen-intrinsic \
+	    -I ${LLVM_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \
+	    ${LLVM_SRCS}/include/llvm/IR/Intrinsics.td
+TGHDRS+=	llvm/IR/Intrinsics.gen
+
+AttributesCompatFunc.inc: ${LLVM_SRCS}/lib/IR/AttributesCompatFunc.td
+	${LLVM_TBLGEN} -gen-attrs \
+	    -I ${LLVM_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \
+	    ${LLVM_SRCS}/lib/IR/AttributesCompatFunc.td
+TGHDRS+=	AttributesCompatFunc.inc
+
+Options.inc: ${LLVM_SRCS}/lib/LibDriver/Options.td
+	${LLVM_TBLGEN} -gen-opt-parser-defs \
+	    -I ${LLVM_SRCS}/include -d ${.TARGET:C/$/.d/} -o ${.TARGET} \
+	    ${LLVM_SRCS}/lib/LibDriver/Options.td
+TGHDRS+=	Options.inc
+
+# Note: some rules are superfluous, not every combination is valid.
+.for arch in \
+	AArch64/AArch64 ARM/ARM Mips/Mips PowerPC/PPC Sparc/Sparc X86/X86
+. for hdr in \
+	AsmMatcher/-gen-asm-matcher \
+	AsmWriter1/-gen-asm-writer,-asmwriternum=1 \
+	AsmWriter/-gen-asm-writer \
+	CallingConv/-gen-callingconv \
+	CodeEmitter/-gen-emitter \
+	DAGISel/-gen-dag-isel \
+	DisassemblerTables/-gen-disassembler \
+	FastISel/-gen-fast-isel \
+	InstrInfo/-gen-instr-info \
+	MCCodeEmitter/-gen-emitter \
+	MCPseudoLowering/-gen-pseudo-lowering \
+	RegisterInfo/-gen-register-info \
+	SubtargetInfo/-gen-subtarget \
+	SystemOperands/-gen-searchable-tables
+${arch:T}Gen${hdr:H}.inc: ${LLVM_SRCS}/lib/Target/${arch:H}/${arch:T}.td
+	${LLVM_TBLGEN} ${hdr:T:C/,/ /g} \
+	    -I ${LLVM_SRCS}/include -I ${LLVM_SRCS}/lib/Target/${arch:H} \
+	    -d ${.TARGET:C/$/.d/} -o ${.TARGET} \
+	    ${LLVM_SRCS}/lib/Target/${arch:H}/${arch:T}.td
+. endfor
+.endfor
+TGHDRS+=	AArch64GenAsmMatcher.inc
+TGHDRS+=	AArch64GenAsmWriter.inc
+TGHDRS+=	AArch64GenAsmWriter1.inc
+TGHDRS+=	AArch64GenCallingConv.inc
+TGHDRS+=	AArch64GenDAGISel.inc
+TGHDRS+=	AArch64GenDisassemblerTables.inc
+TGHDRS+=	AArch64GenFastISel.inc
+TGHDRS+=	AArch64GenInstrInfo.inc
+TGHDRS+=	AArch64GenMCCodeEmitter.inc
+TGHDRS+=	AArch64GenMCPseudoLowering.inc
+TGHDRS+=	AArch64GenRegisterInfo.inc
+TGHDRS+=	AArch64GenSubtargetInfo.inc
+TGHDRS+=	AArch64GenSystemOperands.inc
+TGHDRS+=	ARMGenAsmMatcher.inc
+TGHDRS+=	ARMGenAsmWriter.inc
+TGHDRS+=	ARMGenCallingConv.inc
+TGHDRS+=	ARMGenDAGISel.inc
+TGHDRS+=	ARMGenDisassemblerTables.inc
+TGHDRS+=	ARMGenFastISel.inc
+TGHDRS+=	ARMGenInstrInfo.inc
+TGHDRS+=	ARMGenMCCodeEmitter.inc
+TGHDRS+=	ARMGenMCPseudoLowering.inc
+TGHDRS+=	ARMGenRegisterInfo.inc
+TGHDRS+=	ARMGenSubtargetInfo.inc
+TGHDRS+=	MipsGenAsmMatcher.inc
+TGHDRS+=	MipsGenAsmWriter.inc
+TGHDRS+=	MipsGenCallingConv.inc
+TGHDRS+=	MipsGenDAGISel.inc
+TGHDRS+=	MipsGenDisassemblerTables.inc
+TGHDRS+=	MipsGenFastISel.inc
+TGHDRS+=	MipsGenInstrInfo.inc
+TGHDRS+=	MipsGenMCCodeEmitter.inc
+TGHDRS+=	MipsGenMCPseudoLowering.inc
+TGHDRS+=	MipsGenRegisterInfo.inc
+TGHDRS+=	MipsGenSubtargetInfo.inc
+TGHDRS+=	PPCGenAsmMatcher.inc
+TGHDRS+=	PPCGenAsmWriter.inc
+TGHDRS+=	PPCGenCallingConv.inc
+TGHDRS+=	PPCGenDAGISel.inc
+TGHDRS+=	PPCGenDisassemblerTables.inc
+TGHDRS+=	PPCGenFastISel.inc
+TGHDRS+=	PPCGenInstrInfo.inc
+TGHDRS+=	PPCGenMCCodeEmitter.inc
+TGHDRS+=	PPCGenRegisterInfo.inc
+TGHDRS+=	PPCGenSubtargetInfo.inc
+TGHDRS+=	SparcGenAsmMatcher.inc
+TGHDRS+=	SparcGenAsmWriter.inc
+TGHDRS+=	SparcGenCallingConv.inc
+TGHDRS+=	SparcGenDAGISel.inc
+TGHDRS+=	SparcGenDisassemblerTables.inc
+TGHDRS+=	SparcGenInstrInfo.inc
+TGHDRS+=	SparcGenMCCodeEmitter.inc
+TGHDRS+=	SparcGenRegisterInfo.inc
+TGHDRS+=	SparcGenSubtargetInfo.inc
+TGHDRS+=	X86GenAsmMatcher.inc
+TGHDRS+=	X86GenAsmWriter.inc
+TGHDRS+=	X86GenAsmWriter1.inc
+TGHDRS+=	X86GenCallingConv.inc
+TGHDRS+=	X86GenDAGISel.inc
+TGHDRS+=	X86GenDisassemblerTables.inc
+TGHDRS+=	X86GenFastISel.inc
+TGHDRS+=	X86GenInstrInfo.inc
+TGHDRS+=	X86GenRegisterInfo.inc
+TGHDRS+=	X86GenSubtargetInfo.inc
+
+.for dep in ${TGHDRS:C/$/.d/}
+. if ${MAKE_VERSION} < 20160220
+.  if !make(depend)
+.   sinclude "${dep}"
+.  endif
+. else
+.   dinclude "${dep}"
+. endif
+.endfor
+
+DPSRCS+=	${TGHDRS}
+CLEANFILES+=	${TGHDRS} ${TGHDRS:C/$/.d/}
+
+.include "../llvm.build.mk"
+.include <bsd.lib.mk>
diff --git a/lib/clang/libllvmaarch64asmparser/Makefile b/lib/clang/libllvmaarch64asmparser/Makefile
deleted file mode 100644
index dfb60c8a2728..000000000000
--- a/lib/clang/libllvmaarch64asmparser/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	llvmaarch64asmparser
-
-SRCDIR=	lib/Target/AArch64/AsmParser
-INCDIR=	lib/Target/AArch64
-SRCS=	AArch64AsmParser.cpp
-
-TGHDRS=	AArch64GenAsmMatcher \
-	AArch64GenInstrInfo \
-	AArch64GenRegisterInfo \
-	AArch64GenSubtargetInfo \
-	AArch64GenSystemOperands
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmaarch64asmparser/Makefile.depend b/lib/clang/libllvmaarch64asmparser/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvmaarch64asmparser/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmaarch64asmprinter/Makefile b/lib/clang/libllvmaarch64asmprinter/Makefile
deleted file mode 100644
index d26b0440f16d..000000000000
--- a/lib/clang/libllvmaarch64asmprinter/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	llvmaarch64asmprinter
-
-SRCDIR=	lib/Target/AArch64/InstPrinter
-INCDIR=	lib/Target/AArch64
-SRCS=	AArch64InstPrinter.cpp
-
-TGHDRS=	AArch64GenAsmWriter \
-	AArch64GenAsmWriter1 \
-	AArch64GenInstrInfo \
-	AArch64GenRegisterInfo \
-	AArch64GenSubtargetInfo \
-	AArch64GenSystemOperands
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmaarch64asmprinter/Makefile.depend b/lib/clang/libllvmaarch64asmprinter/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvmaarch64asmprinter/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmaarch64codegen/Makefile b/lib/clang/libllvmaarch64codegen/Makefile
deleted file mode 100644
index 163cb7d396af..000000000000
--- a/lib/clang/libllvmaarch64codegen/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	llvmaarch64codegen
-
-SRCDIR=	lib/Target/AArch64
-SRCS=	AArch64A53Fix835769.cpp \
-	AArch64A57FPLoadBalancing.cpp \
-	AArch64AddressTypePromotion.cpp \
-	AArch64AdvSIMDScalarPass.cpp \
-	AArch64AsmPrinter.cpp \
-	AArch64BranchRelaxation.cpp \
-	AArch64CleanupLocalDynamicTLSPass.cpp \
-	AArch64CollectLOH.cpp \
-	AArch64ConditionOptimizer.cpp \
-	AArch64ConditionalCompares.cpp \
-	AArch64DeadRegisterDefinitionsPass.cpp \
-	AArch64ExpandPseudoInsts.cpp \
-	AArch64FastISel.cpp \
-	AArch64FrameLowering.cpp \
-	AArch64ISelDAGToDAG.cpp \
-	AArch64ISelLowering.cpp \
-	AArch64InstrInfo.cpp \
-	AArch64LoadStoreOptimizer.cpp \
-	AArch64MCInstLower.cpp \
-	AArch64PBQPRegAlloc.cpp \
-	AArch64PromoteConstant.cpp \
-	AArch64RedundantCopyElimination.cpp \
-	AArch64RegisterInfo.cpp \
-	AArch64SelectionDAGInfo.cpp \
-	AArch64StorePairSuppress.cpp \
-	AArch64Subtarget.cpp \
-	AArch64TargetMachine.cpp \
-	AArch64TargetObjectFile.cpp \
-	AArch64TargetTransformInfo.cpp
-
-TGHDRS=	AArch64GenCallingConv \
-	AArch64GenDAGISel \
-	AArch64GenFastISel \
-	AArch64GenInstrInfo \
-	AArch64GenMCPseudoLowering \
-	AArch64GenRegisterInfo \
-	AArch64GenSubtargetInfo \
-	AArch64GenSystemOperands \
-	Attributes \
-	Intrinsics
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmaarch64codegen/Makefile.depend b/lib/clang/libllvmaarch64codegen/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvmaarch64codegen/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmaarch64desc/Makefile b/lib/clang/libllvmaarch64desc/Makefile
deleted file mode 100644
index c4e0d78dfa53..000000000000
--- a/lib/clang/libllvmaarch64desc/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	llvmaarch64desc
-
-SRCDIR=	lib/Target/AArch64/MCTargetDesc
-SRCS=	AArch64AsmBackend.cpp \
-	AArch64ELFObjectWriter.cpp \
-	AArch64ELFStreamer.cpp \
-	AArch64MCAsmInfo.cpp \
-	AArch64MCCodeEmitter.cpp \
-	AArch64MCExpr.cpp \
-	AArch64MCTargetDesc.cpp \
-	AArch64MachObjectWriter.cpp \
-	AArch64TargetStreamer.cpp
-CFLAGS+= -I${LLVM_SRCS}/${SRCDIR}/..
-
-TGHDRS=	AArch64GenInstrInfo \
-	AArch64GenMCCodeEmitter \
-	AArch64GenRegisterInfo \
-	AArch64GenSubtargetInfo \
-	AArch64GenSystemOperands \
-	Attributes
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmaarch64desc/Makefile.depend b/lib/clang/libllvmaarch64desc/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvmaarch64desc/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmaarch64disassembler/Makefile b/lib/clang/libllvmaarch64disassembler/Makefile
deleted file mode 100644
index 813e96a381bb..000000000000
--- a/lib/clang/libllvmaarch64disassembler/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $FreeBSD$
-
-.include <src.opts.mk>
-
-LIB=	llvmaarch64disassembler
-
-SRCDIR=	lib/Target/AArch64/Disassembler
-INCDIR=	lib/Target/AArch64
-SRCS=	AArch64ExternalSymbolizer.cpp
-
-.if ${MK_CLANG_EXTRAS} != "no"
-SRCS+=	AArch64Disassembler.cpp
-.endif
-
-TGHDRS=	Attributes \
-	Intrinsics \
-	AArch64GenDisassemblerTables \
-	AArch64GenInstrInfo \
-	AArch64GenRegisterInfo \
-	AArch64GenSubtargetInfo \
-	AArch64GenSystemOperands
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmaarch64disassembler/Makefile.depend b/lib/clang/libllvmaarch64disassembler/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvmaarch64disassembler/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmaarch64info/Makefile b/lib/clang/libllvmaarch64info/Makefile
deleted file mode 100644
index c62a6e15316b..000000000000
--- a/lib/clang/libllvmaarch64info/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	llvmaarch64info
-
-SRCDIR=	lib/Target/AArch64/TargetInfo
-INCDIR=	lib/Target/AArch64
-SRCS=	AArch64TargetInfo.cpp
-
-TGHDRS=	AArch64GenInstrInfo \
-	AArch64GenRegisterInfo \
-	AArch64GenSubtargetInfo
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmaarch64info/Makefile.depend b/lib/clang/libllvmaarch64info/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvmaarch64info/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmaarch64utils/Makefile b/lib/clang/libllvmaarch64utils/Makefile
deleted file mode 100644
index e12e62799631..000000000000
--- a/lib/clang/libllvmaarch64utils/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	llvmaarch64utils
-
-SRCDIR=	lib/Target/AArch64/Utils
-INCDIR=	lib/Target/AArch64
-SRCS=	AArch64BaseInfo.cpp
-
-TGHDRS=	AArch64GenInstrInfo \
-	AArch64GenRegisterInfo \
-	AArch64GenSubtargetInfo \
-	AArch64GenSystemOperands
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmaarch64utils/Makefile.depend b/lib/clang/libllvmaarch64utils/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvmaarch64utils/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmanalysis/Makefile b/lib/clang/libllvmanalysis/Makefile
deleted file mode 100644
index 70d9d6662fc3..000000000000
--- a/lib/clang/libllvmanalysis/Makefile
+++ /dev/null
@@ -1,95 +0,0 @@
-# $FreeBSD$
-
-.include <src.opts.mk>
-
-LIB=	llvmanalysis
-
-SRCDIR=	lib/Analysis
-SRCS=	AliasAnalysis.cpp \
-	AliasAnalysisEvaluator.cpp \
-	AliasAnalysisSummary.cpp \
-	AliasSetTracker.cpp \
-	AssumptionCache.cpp \
-	BasicAliasAnalysis.cpp \
-	BlockFrequencyInfo.cpp \
-	BlockFrequencyInfoImpl.cpp \
-	BranchProbabilityInfo.cpp \
-	CFG.cpp \
-	CFGPrinter.cpp \
-	CFLAndersAliasAnalysis.cpp \
-	CFLSteensAliasAnalysis.cpp \
-	CallGraph.cpp \
-	CallGraphSCCPass.cpp \
-	CallPrinter.cpp \
-	CaptureTracking.cpp \
-	CodeMetrics.cpp \
-	ConstantFolding.cpp \
-	CostModel.cpp \
-	Delinearization.cpp \
-	DemandedBits.cpp \
-	DependenceAnalysis.cpp \
-	DivergenceAnalysis.cpp \
-	DomPrinter.cpp \
-	DominanceFrontier.cpp \
-	EHPersonalities.cpp \
-	CGSCCPassManager.cpp \
-	GlobalsModRef.cpp \
-	IVUsers.cpp \
-	IndirectCallPromotionAnalysis.cpp \
-	InlineCost.cpp \
-	InstCount.cpp \
-	InstructionSimplify.cpp \
-	Interval.cpp \
-	IntervalPartition.cpp \
-	IteratedDominanceFrontier.cpp \
-	LazyBlockFrequencyInfo.cpp \
-	LazyCallGraph.cpp \
-	LazyValueInfo.cpp \
-	Lint.cpp \
-	Loads.cpp \
-	LoopAccessAnalysis.cpp \
-	LoopInfo.cpp \
-	LoopPass.cpp \
-	LoopPassManager.cpp \
-	LoopUnrollAnalyzer.cpp \
-	MemDepPrinter.cpp \
-	MemDerefPrinter.cpp \
-	MemoryBuiltins.cpp \
-	MemoryDependenceAnalysis.cpp \
-	MemoryLocation.cpp \
-	ModuleDebugInfoPrinter.cpp \
-	ModuleSummaryAnalysis.cpp \
-	ObjCARCAliasAnalysis.cpp \
-	ObjCARCAnalysisUtils.cpp \
-	ObjCARCInstKind.cpp \
-	OptimizationDiagnosticInfo.cpp \
-	OrderedBasicBlock.cpp \
-	PHITransAddr.cpp \
-	PostDominators.cpp \
-	ProfileSummaryInfo.cpp \
-	PtrUseVisitor.cpp \
-	RegionInfo.cpp \
-	RegionPass.cpp \
-	RegionPrinter.cpp \
-	ScalarEvolution.cpp \
-	ScalarEvolutionAliasAnalysis.cpp \
-	ScalarEvolutionExpander.cpp \
-	ScalarEvolutionNormalization.cpp \
-	ScopedNoAliasAA.cpp \
-	SparsePropagation.cpp \
-	TargetLibraryInfo.cpp \
-	TargetTransformInfo.cpp \
-	TypeBasedAliasAnalysis.cpp \
-	TypeMetadataUtils.cpp \
-	ValueTracking.cpp \
-	VectorUtils.cpp
-
-.if ${MK_CLANG_EXTRAS} != "no"
-SRCS+=	Analysis.cpp \
-	Trace.cpp
-.endif
-	
-TGHDRS=	Attributes \
-	Intrinsics
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmanalysis/Makefile.depend b/lib/clang/libllvmanalysis/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvmanalysis/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmarmasmparser/Makefile b/lib/clang/libllvmarmasmparser/Makefile
deleted file mode 100644
index 134d8a2ed0dc..000000000000
--- a/lib/clang/libllvmarmasmparser/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	llvmarmasmparser
-
-SRCDIR=	lib/Target/ARM/AsmParser
-INCDIR=	lib/Target/ARM
-SRCS=	ARMAsmParser.cpp
-
-TGHDRS=	ARMGenAsmMatcher \
-	ARMGenInstrInfo \
-	ARMGenRegisterInfo \
-	ARMGenSubtargetInfo
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmarmasmparser/Makefile.depend b/lib/clang/libllvmarmasmparser/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvmarmasmparser/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmarmasmprinter/Makefile b/lib/clang/libllvmarmasmprinter/Makefile
deleted file mode 100644
index b9e9f95b2db5..000000000000
--- a/lib/clang/libllvmarmasmprinter/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	llvmarmasmprinter
-
-SRCDIR=	lib/Target/ARM/InstPrinter
-INCDIR=	lib/Target/ARM
-SRCS=	ARMInstPrinter.cpp
-
-TGHDRS=	ARMGenAsmWriter \
-	ARMGenInstrInfo \
-	ARMGenRegisterInfo \
-	ARMGenSubtargetInfo
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmarmasmprinter/Makefile.depend b/lib/clang/libllvmarmasmprinter/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvmarmasmprinter/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmarmcodegen/Makefile b/lib/clang/libllvmarmcodegen/Makefile
deleted file mode 100644
index a77dfdce68f1..000000000000
--- a/lib/clang/libllvmarmcodegen/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	llvmarmcodegen
-
-SRCDIR=	lib/Target/ARM
-SRCS=	A15SDOptimizer.cpp \
-	ARMAsmPrinter.cpp \
-	ARMBaseInstrInfo.cpp \
-	ARMBaseRegisterInfo.cpp \
-	ARMConstantIslandPass.cpp \
-	ARMConstantPoolValue.cpp \
-	ARMExpandPseudoInsts.cpp \
-	ARMFastISel.cpp \
-	ARMFrameLowering.cpp \
-	ARMHazardRecognizer.cpp \
-	ARMISelDAGToDAG.cpp \
-	ARMISelLowering.cpp \
-	ARMInstrInfo.cpp \
-	ARMLoadStoreOptimizer.cpp \
-	ARMMCInstLower.cpp \
-	ARMMachineFunctionInfo.cpp \
-	ARMOptimizeBarriersPass.cpp \
-	ARMRegisterInfo.cpp \
-	ARMSelectionDAGInfo.cpp \
-	ARMSubtarget.cpp \
-	ARMTargetMachine.cpp \
-	ARMTargetObjectFile.cpp \
-	ARMTargetTransformInfo.cpp \
-	MLxExpansionPass.cpp \
-	Thumb1FrameLowering.cpp \
-	Thumb1InstrInfo.cpp \
-	Thumb2ITBlockPass.cpp \
-	Thumb2InstrInfo.cpp \
-	Thumb2SizeReduction.cpp \
-	ThumbRegisterInfo.cpp
-
-TGHDRS=	ARMGenAsmWriter \
-	ARMGenCallingConv \
-	ARMGenCodeEmitter \
-	ARMGenDAGISel \
-	ARMGenFastISel \
-	ARMGenInstrInfo \
-	ARMGenMCCodeEmitter \
-	ARMGenMCPseudoLowering \
-	ARMGenRegisterInfo \
-	ARMGenSubtargetInfo \
-	Attributes \
-	Intrinsics
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmarmcodegen/Makefile.depend b/lib/clang/libllvmarmcodegen/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvmarmcodegen/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmarmdesc/Makefile b/lib/clang/libllvmarmdesc/Makefile
deleted file mode 100644
index 423f80758aaf..000000000000
--- a/lib/clang/libllvmarmdesc/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	llvmarmdesc
-
-SRCDIR=	lib/Target/ARM/MCTargetDesc
-SRCS=	ARMAsmBackend.cpp \
-	ARMELFObjectWriter.cpp \
-	ARMELFStreamer.cpp \
-	ARMMCAsmInfo.cpp \
-	ARMMCCodeEmitter.cpp \
-	ARMMCExpr.cpp \
-	ARMMCTargetDesc.cpp \
-	ARMMachORelocationInfo.cpp \
-	ARMMachObjectWriter.cpp \
-	ARMTargetStreamer.cpp \
-	ARMUnwindOpAsm.cpp \
-	ARMWinCOFFObjectWriter.cpp \
-	ARMWinCOFFStreamer.cpp
-CFLAGS+= -I${LLVM_SRCS}/${SRCDIR}/..
-
-TGHDRS=	ARMGenInstrInfo \
-	ARMGenMCCodeEmitter \
-	ARMGenRegisterInfo \
-	ARMGenSubtargetInfo \
-	Attributes
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmarmdesc/Makefile.depend b/lib/clang/libllvmarmdesc/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvmarmdesc/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmarmdisassembler/Makefile b/lib/clang/libllvmarmdisassembler/Makefile
deleted file mode 100644
index 6af72652c64b..000000000000
--- a/lib/clang/libllvmarmdisassembler/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	llvmarmdisassembler
-
-SRCDIR=	lib/Target/ARM/Disassembler
-INCDIR=	lib/Target/ARM
-SRCS=	ARMDisassembler.cpp
-
-TGHDRS=	ARMGenDisassemblerTables \
-	ARMGenInstrInfo \
-	ARMGenRegisterInfo \
-	ARMGenSubtargetInfo
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmarmdisassembler/Makefile.depend b/lib/clang/libllvmarmdisassembler/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvmarmdisassembler/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmarminfo/Makefile b/lib/clang/libllvmarminfo/Makefile
deleted file mode 100644
index fcf03549b6e9..000000000000
--- a/lib/clang/libllvmarminfo/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	llvmarminfo
-
-SRCDIR=	lib/Target/ARM/TargetInfo
-INCDIR=	lib/Target/ARM
-SRCS=	ARMTargetInfo.cpp
-
-TGHDRS=	ARMGenInstrInfo \
-	ARMGenRegisterInfo \
-	ARMGenSubtargetInfo \
-	Attributes
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmarminfo/Makefile.depend b/lib/clang/libllvmarminfo/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvmarminfo/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmasmparser/Makefile b/lib/clang/libllvmasmparser/Makefile
deleted file mode 100644
index 6602a8819afd..000000000000
--- a/lib/clang/libllvmasmparser/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	llvmasmparser
-
-SRCDIR=	lib/AsmParser
-SRCS=	LLLexer.cpp \
-	LLParser.cpp \
-	Parser.cpp
-
-TGHDRS=	Attributes \
-	Intrinsics
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmasmparser/Makefile.depend b/lib/clang/libllvmasmparser/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvmasmparser/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmasmprinter/Makefile b/lib/clang/libllvmasmprinter/Makefile
deleted file mode 100644
index 574720aa4efb..000000000000
--- a/lib/clang/libllvmasmprinter/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	llvmasmprinter
-
-SRCDIR=	lib/CodeGen/AsmPrinter
-SRCS=	ARMException.cpp \
-	AddressPool.cpp \
-	AsmPrinter.cpp \
-	AsmPrinterDwarf.cpp \
-	AsmPrinterInlineAsm.cpp \
-	CodeViewDebug.cpp \
-	DIE.cpp \
-	DIEHash.cpp \
-	DbgValueHistoryCalculator.cpp \
-	DebugHandlerBase.cpp \
-	DebugLocStream.cpp \
-	DwarfAccelTable.cpp \
-	DwarfCFIException.cpp \
-	DwarfCompileUnit.cpp \
-	DwarfDebug.cpp \
-	DwarfExpression.cpp \
-	DwarfFile.cpp \
-	DwarfStringPool.cpp \
-	DwarfUnit.cpp \
-	EHStreamer.cpp \
-	ErlangGCPrinter.cpp \
-	OcamlGCPrinter.cpp \
-	WinException.cpp
-
-TGHDRS=	Attributes \
-	Intrinsics
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmasmprinter/Makefile.depend b/lib/clang/libllvmasmprinter/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvmasmprinter/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmbitreader/Makefile b/lib/clang/libllvmbitreader/Makefile
deleted file mode 100644
index 252c9a9979cd..000000000000
--- a/lib/clang/libllvmbitreader/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $FreeBSD$
-
-.include <src.opts.mk>
-
-LIB=	llvmbitreader
-
-SRCDIR=	lib/Bitcode/Reader
-SRCS=	BitcodeReader.cpp \
-	BitstreamReader.cpp
-
-.if ${MK_CLANG_EXTRAS} != "no"
-SRCS+=	BitReader.cpp
-.endif
-
-TGHDRS=	Attributes \
-	Intrinsics
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmbitreader/Makefile.depend b/lib/clang/libllvmbitreader/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvmbitreader/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmbitwriter/Makefile b/lib/clang/libllvmbitwriter/Makefile
deleted file mode 100644
index 4ce8bde6791b..000000000000
--- a/lib/clang/libllvmbitwriter/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $FreeBSD$
-
-.include <src.opts.mk>
-
-LIB=	llvmbitwriter
-
-SRCDIR=	lib/Bitcode/Writer
-SRCS=	BitcodeWriter.cpp \
-	BitcodeWriterPass.cpp \
-	ValueEnumerator.cpp
-
-.if ${MK_CLANG_EXTRAS} != "no"
-SRCS+=	BitWriter.cpp
-.endif
-
-TGHDRS=	Attributes \
-	Intrinsics
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmbitwriter/Makefile.depend b/lib/clang/libllvmbitwriter/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvmbitwriter/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmcodegen/Makefile b/lib/clang/libllvmcodegen/Makefile
deleted file mode 100644
index fc0cbfad4729..000000000000
--- a/lib/clang/libllvmcodegen/Makefile
+++ /dev/null
@@ -1,153 +0,0 @@
-# $FreeBSD$
-
-.include <src.opts.mk>
-
-LIB=	llvmcodegen
-
-SRCDIR=	lib/CodeGen
-SRCS=	AggressiveAntiDepBreaker.cpp \
-	AllocationOrder.cpp \
-	Analysis.cpp \
-	AtomicExpandPass.cpp \
-	BasicTargetTransformInfo.cpp \
-	BranchFolding.cpp \
-	BuiltinGCs.cpp \
-	CalcSpillWeights.cpp \
-	CallingConvLower.cpp \
-	CodeGen.cpp \
-	CodeGenPrepare.cpp \
-	CriticalAntiDepBreaker.cpp \
-	DFAPacketizer.cpp \
-	DeadMachineInstructionElim.cpp \
-	DetectDeadLanes.cpp \
-	DwarfEHPrepare.cpp \
-	EarlyIfConversion.cpp \
-	EdgeBundles.cpp \
-	ExecutionDepsFix.cpp \
-	ExpandISelPseudos.cpp \
-	ExpandPostRAPseudos.cpp \
-	FaultMaps.cpp \
-	FuncletLayout.cpp \
-	GCMetadata.cpp \
-	GCRootLowering.cpp \
-	GlobalMerge.cpp \
-	IfConversion.cpp \
-	ImplicitNullChecks.cpp \
-	InlineSpiller.cpp \
-	InterferenceCache.cpp \
-	InterleavedAccessPass.cpp \
-	IntrinsicLowering.cpp \
-	LLVMTargetMachine.cpp \
-	LatencyPriorityQueue.cpp \
-	LexicalScopes.cpp \
-	LiveDebugValues.cpp \
-	LiveDebugVariables.cpp \
-	LiveInterval.cpp \
-	LiveIntervalAnalysis.cpp \
-	LiveIntervalUnion.cpp \
-	LivePhysRegs.cpp \
-	LiveRangeCalc.cpp \
-	LiveRangeEdit.cpp \
-	LiveRegMatrix.cpp \
-	LiveStackAnalysis.cpp \
-	LiveVariables.cpp \
-	LocalStackSlotAllocation.cpp \
-	LowerEmuTLS.cpp \
-	MIRPrinter.cpp \
-	MIRPrintingPass.cpp \
-	MachineBasicBlock.cpp \
-	MachineBlockFrequencyInfo.cpp \
-	MachineBlockPlacement.cpp \
-	MachineBranchProbabilityInfo.cpp \
-	MachineCSE.cpp \
-	MachineCombiner.cpp \
-	MachineCopyPropagation.cpp \
-	MachineDominanceFrontier.cpp \
-	MachineDominators.cpp \
-	MachineFunction.cpp \
-	MachineFunctionAnalysis.cpp \
-	MachineFunctionPass.cpp \
-	MachineFunctionPrinterPass.cpp \
-	MachineInstr.cpp \
-	MachineInstrBundle.cpp \
-	MachineLICM.cpp \
-	MachineLoopInfo.cpp \
-	MachineModuleInfo.cpp \
-	MachineModuleInfoImpls.cpp \
-	MachinePassRegistry.cpp \
-	MachinePostDominators.cpp \
-	MachineRegionInfo.cpp \
-	MachineRegisterInfo.cpp \
-	MachineSSAUpdater.cpp \
-	MachineScheduler.cpp \
-	MachineSink.cpp \
-	MachineTraceMetrics.cpp \
-	MachineVerifier.cpp \
-	OptimizePHIs.cpp \
-	PHIElimination.cpp \
-	PHIEliminationUtils.cpp \
-	ParallelCG.cpp \
-	PatchableFunction.cpp \
-	PeepholeOptimizer.cpp \
-	PostRAHazardRecognizer.cpp \
-	PostRASchedulerList.cpp \
-	PreISelIntrinsicLowering.cpp \
-	ProcessImplicitDefs.cpp \
-	PrologEpilogInserter.cpp \
-	PseudoSourceValue.cpp \
-	RegAllocBase.cpp \
-	RegAllocBasic.cpp \
-	RegAllocFast.cpp \
-	RegAllocGreedy.cpp \
-	RegAllocPBQP.cpp \
-	RegUsageInfoCollector.cpp \
-	RegUsageInfoPropagate.cpp \
-	RegisterClassInfo.cpp \
-	RegisterCoalescer.cpp \
-	RegisterPressure.cpp \
-	RegisterScavenging.cpp \
-	RegisterUsageInfo.cpp \
-	RenameIndependentSubregs.cpp \
-	SafeStack.cpp \
-	SafeStackColoring.cpp \
-	SafeStackLayout.cpp \
-	ScheduleDAG.cpp \
-	ScheduleDAGInstrs.cpp \
-	ScheduleDAGPrinter.cpp \
-	ScoreboardHazardRecognizer.cpp \
-	ShadowStackGCLowering.cpp \
-	ShrinkWrap.cpp \
-	SjLjEHPrepare.cpp \
-	SlotIndexes.cpp \
-	SpillPlacement.cpp \
-	SplitKit.cpp \
-	StackColoring.cpp \
-	StackMapLivenessAnalysis.cpp \
-	StackMaps.cpp \
-	StackProtector.cpp \
-	StackSlotColoring.cpp \
-	TailDuplication.cpp \
-	TailDuplicator.cpp \
-	TargetFrameLoweringImpl.cpp \
-	TargetInstrInfo.cpp \
-	TargetLoweringBase.cpp \
-	TargetLoweringObjectFileImpl.cpp \
-	TargetOptionsImpl.cpp \
-	TargetPassConfig.cpp \
-	TargetRegisterInfo.cpp \
-	TargetSchedule.cpp \
-	TwoAddressInstructionPass.cpp \
-	UnreachableBlockElim.cpp \
-	VirtRegMap.cpp \
-	WinEHPrepare.cpp \
-	XRayInstrumentation.cpp
-
-.if ${MK_CLANG_EXTRAS} != "no"
-SRCS+=	GCMetadataPrinter.cpp \
-	GCStrategy.cpp
-.endif
-
-TGHDRS=	Attributes \
-	Intrinsics
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmcodegen/Makefile.depend b/lib/clang/libllvmcodegen/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvmcodegen/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmcore/Makefile b/lib/clang/libllvmcore/Makefile
deleted file mode 100644
index 7dea8fb5239c..000000000000
--- a/lib/clang/libllvmcore/Makefile
+++ /dev/null
@@ -1,63 +0,0 @@
-# $FreeBSD$
-
-.include <src.opts.mk>
-
-LIB=	llvmcore
-
-SRCDIR=	lib/IR
-SRCS=	AsmWriter.cpp \
-	Attributes.cpp \
-	AutoUpgrade.cpp \
-	BasicBlock.cpp \
-	Comdat.cpp \
-	ConstantFold.cpp \
-	ConstantRange.cpp \
-	Constants.cpp \
-	Core.cpp \
-	DIBuilder.cpp \
-	DataLayout.cpp \
-	DebugInfo.cpp \
-	DebugInfoMetadata.cpp \
-	DebugLoc.cpp \
-	DiagnosticInfo.cpp \
-	DiagnosticPrinter.cpp \
-	Dominators.cpp \
-	Function.cpp \
-	GCOV.cpp \
-	GVMaterializer.cpp \
-	Globals.cpp \
-	IRBuilder.cpp \
-	IRPrintingPasses.cpp \
-	InlineAsm.cpp \
-	Instruction.cpp \
-	Instructions.cpp \
-	IntrinsicInst.cpp \
-	LLVMContext.cpp \
-	LLVMContextImpl.cpp \
-	LegacyPassManager.cpp \
-	MDBuilder.cpp \
-	Mangler.cpp \
-	Metadata.cpp \
-	Module.cpp \
-	ModuleSummaryIndex.cpp \
-	Operator.cpp \
-	OptBisect.cpp \
-	Pass.cpp \
-	PassManager.cpp \
-	PassRegistry.cpp \
-	ProfileSummary.cpp \
-	Statepoint.cpp \
-	Type.cpp \
-	TypeFinder.cpp \
-	Use.cpp \
-	User.cpp \
-	Value.cpp \
-	ValueSymbolTable.cpp \
-	ValueTypes.cpp \
-	Verifier.cpp
-
-TGHDRS=	Attributes \
-	AttributesCompatFunc \
-	Intrinsics
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmcore/Makefile.depend b/lib/clang/libllvmcore/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvmcore/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmcoverage/Makefile b/lib/clang/libllvmcoverage/Makefile
deleted file mode 100644
index 08af24bbb332..000000000000
--- a/lib/clang/libllvmcoverage/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $FreeBSD$
-
-.include <src.opts.mk>
-
-LIB=	llvmcoverage
-
-SRCDIR=	lib/ProfileData/Coverage
-SRCS=	CoverageMapping.cpp \
-	CoverageMappingReader.cpp \
-	CoverageMappingWriter.cpp
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmdebuginfocodeview/Makefile b/lib/clang/libllvmdebuginfocodeview/Makefile
deleted file mode 100644
index 044ca9cf2f82..000000000000
--- a/lib/clang/libllvmdebuginfocodeview/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# $FreeBSD$
-
-.include <src.opts.mk>
-
-LIB=	llvmdebuginfocodeview
-
-SRCDIR=	lib/DebugInfo/CodeView
-SRCS=	ByteStream.cpp \
-	CVTypeVisitor.cpp \
-	CodeViewError.cpp \
-	FieldListRecordBuilder.cpp \
-	Line.cpp \
-	ListRecordBuilder.cpp \
-	MemoryTypeTableBuilder.cpp \
-	ModuleSubstream.cpp \
-	ModuleSubstreamVisitor.cpp \
-	RecordSerialization.cpp \
-	StreamReader.cpp \
-	StreamWriter.cpp \
-	SymbolDumper.cpp \
-	TypeDumper.cpp \
-	TypeRecord.cpp \
-	TypeRecordBuilder.cpp \
-	TypeStreamMerger.cpp \
-	TypeTableBuilder.cpp
-
-.if ${MK_CLANG_EXTRAS} != "no"
-SRCS+=	EnumTables.cpp \
-	MethodListRecordBuilder.cpp
-.endif
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmdebuginfodwarf/Makefile b/lib/clang/libllvmdebuginfodwarf/Makefile
deleted file mode 100644
index 6af9703980a0..000000000000
--- a/lib/clang/libllvmdebuginfodwarf/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $FreeBSD$
-
-.include <src.opts.mk>
-
-LIB=	llvmdebuginfodwarf
-
-SRCDIR=	lib/DebugInfo/DWARF
-SRCS=	DWARFAbbreviationDeclaration.cpp \
-	DWARFAcceleratorTable.cpp \
-	DWARFCompileUnit.cpp \
-	DWARFContext.cpp \
-	DWARFDebugAbbrev.cpp \
-	DWARFDebugArangeSet.cpp \
-	DWARFDebugAranges.cpp \
-	DWARFDebugFrame.cpp \
-	DWARFDebugInfoEntry.cpp \
-	DWARFDebugLine.cpp \
-	DWARFDebugLoc.cpp \
-	DWARFDebugMacro.cpp \
-	DWARFDebugRangeList.cpp \
-	DWARFFormValue.cpp \
-	DWARFTypeUnit.cpp \
-	DWARFUnit.cpp \
-	DWARFUnitIndex.cpp \
-	SyntaxHighlighting.cpp
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmdebuginfodwarf/Makefile.depend b/lib/clang/libllvmdebuginfodwarf/Makefile.depend
deleted file mode 100644
index 3e7f3f5e7165..000000000000
--- a/lib/clang/libllvmdebuginfodwarf/Makefile.depend
+++ /dev/null
@@ -1,15 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmdebuginfopdb/Makefile b/lib/clang/libllvmdebuginfopdb/Makefile
deleted file mode 100644
index 2462354cc837..000000000000
--- a/lib/clang/libllvmdebuginfopdb/Makefile
+++ /dev/null
@@ -1,70 +0,0 @@
-# $FreeBSD$
-
-.include <src.opts.mk>
-
-LIB=	llvmdebuginfopdb
-
-SRCDIR=	lib/DebugInfo/PDB
-SRCS=	GenericError.cpp \
-	IPDBSourceFile.cpp \
-	PDB.cpp \
-	PDBContext.cpp \
-	PDBExtras.cpp \
-	PDBInterfaceAnchors.cpp \
-	PDBSymDumper.cpp \
-	PDBSymbol.cpp \
-	PDBSymbolAnnotation.cpp \
-	PDBSymbolBlock.cpp \
-	PDBSymbolCompiland.cpp \
-	PDBSymbolCompilandDetails.cpp \
-	PDBSymbolCompilandEnv.cpp \
-	PDBSymbolCustom.cpp \
-	PDBSymbolData.cpp \
-	PDBSymbolExe.cpp \
-	PDBSymbolFunc.cpp \
-	PDBSymbolFuncDebugEnd.cpp \
-	PDBSymbolFuncDebugStart.cpp \
-	PDBSymbolLabel.cpp \
-	PDBSymbolPublicSymbol.cpp \
-	PDBSymbolThunk.cpp \
-	PDBSymbolTypeArray.cpp \
-	PDBSymbolTypeBaseClass.cpp \
-	PDBSymbolTypeBuiltin.cpp \
-	PDBSymbolTypeCustom.cpp \
-	PDBSymbolTypeDimension.cpp \
-	PDBSymbolTypeEnum.cpp \
-	PDBSymbolTypeFriend.cpp \
-	PDBSymbolTypeFunctionArg.cpp \
-	PDBSymbolTypeFunctionSig.cpp \
-	PDBSymbolTypeManaged.cpp \
-	PDBSymbolTypePointer.cpp \
-	PDBSymbolTypeTypedef.cpp \
-	PDBSymbolTypeUDT.cpp \
-	PDBSymbolTypeVTable.cpp \
-	PDBSymbolTypeVTableShape.cpp \
-	PDBSymbolUnknown.cpp \
-	PDBSymbolUsingNamespace.cpp \
-	Raw/DbiStream.cpp \
-	Raw/DbiStreamBuilder.cpp \
-	Raw/EnumTables.cpp \
-	Raw/Hash.cpp \
-	Raw/IndexedStreamData.cpp \
-	Raw/InfoStream.cpp \
-	Raw/InfoStreamBuilder.cpp \
-	Raw/MappedBlockStream.cpp \
-	Raw/ModInfo.cpp \
-	Raw/ModStream.cpp \
-	Raw/MsfBuilder.cpp \
-	Raw/MsfCommon.cpp \
-	Raw/NameHashTable.cpp \
-	Raw/NameMap.cpp \
-	Raw/NameMapBuilder.cpp \
-	Raw/PDBFile.cpp \
-	Raw/PDBFileBuilder.cpp \
-	Raw/PublicsStream.cpp \
-	Raw/RawError.cpp \
-	Raw/RawSession.cpp \
-	Raw/SymbolStream.cpp \
-	Raw/TpiStream.cpp
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmdebuginfopdb/Makefile.depend b/lib/clang/libllvmdebuginfopdb/Makefile.depend
deleted file mode 100644
index 3e7f3f5e7165..000000000000
--- a/lib/clang/libllvmdebuginfopdb/Makefile.depend
+++ /dev/null
@@ -1,15 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmexecutionengine/Makefile b/lib/clang/libllvmexecutionengine/Makefile
deleted file mode 100644
index 304473b8f9b5..000000000000
--- a/lib/clang/libllvmexecutionengine/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	llvmexecutionengine
-
-SRCDIR=	lib/ExecutionEngine
-SRCS=	ExecutionEngine.cpp \
-	ExecutionEngineBindings.cpp \
-	GDBRegistrationListener.cpp \
-	SectionMemoryManager.cpp \
-	TargetSelect.cpp
-
-TGHDRS=	Attributes
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmexecutionengine/Makefile.depend b/lib/clang/libllvmexecutionengine/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvmexecutionengine/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmglobalisel/Makefile b/lib/clang/libllvmglobalisel/Makefile
deleted file mode 100644
index 87b8b54bac63..000000000000
--- a/lib/clang/libllvmglobalisel/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	llvmglobalisel
-
-LIB=	llvmglobalisel
-
-SRCDIR=	lib/CodeGen/GlobalISel
-SRCS=	GlobalISel.cpp
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvminstcombine/Makefile b/lib/clang/libllvminstcombine/Makefile
deleted file mode 100644
index a23b60baf64f..000000000000
--- a/lib/clang/libllvminstcombine/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	llvminstcombine
-
-SRCDIR=	lib/Transforms/InstCombine
-SRCS=	InstCombineAddSub.cpp \
-	InstCombineAndOrXor.cpp \
-	InstCombineCalls.cpp \
-	InstCombineCasts.cpp \
-	InstCombineCompares.cpp \
-	InstCombineLoadStoreAlloca.cpp \
-	InstCombineMulDivRem.cpp \
-	InstCombinePHI.cpp \
-	InstCombineSelect.cpp \
-	InstCombineShifts.cpp \
-	InstCombineSimplifyDemanded.cpp \
-	InstCombineVectorOps.cpp \
-	InstructionCombining.cpp
-
-TGHDRS=	Attributes \
-	Intrinsics
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvminstcombine/Makefile.depend b/lib/clang/libllvminstcombine/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvminstcombine/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvminstrumentation/Makefile b/lib/clang/libllvminstrumentation/Makefile
deleted file mode 100644
index 3ff27d0b64dc..000000000000
--- a/lib/clang/libllvminstrumentation/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $FreeBSD$
-
-.include <src.opts.mk>
-
-LIB=	llvminstrumentation
-
-SRCDIR=	lib/Transforms/Instrumentation
-SRCS=	AddressSanitizer.cpp \
-	BoundsChecking.cpp \
-	DataFlowSanitizer.cpp \
-	EfficiencySanitizer.cpp \
-	GCOVProfiling.cpp \
-	IndirectCallPromotion.cpp \
-	InstrProfiling.cpp \
-	Instrumentation.cpp \
-	MemorySanitizer.cpp \
-	PGOInstrumentation.cpp \
-	SanitizerCoverage.cpp \
-	ThreadSanitizer.cpp
-
-TGHDRS=	Attributes \
-	Intrinsics
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvminstrumentation/Makefile.depend b/lib/clang/libllvminstrumentation/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvminstrumentation/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvminterpreter/Makefile b/lib/clang/libllvminterpreter/Makefile
deleted file mode 100644
index 32bd2e9830ae..000000000000
--- a/lib/clang/libllvminterpreter/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	llvminterpreter
-
-SRCDIR=	lib/ExecutionEngine/Interpreter
-SRCS=	Execution.cpp \
-	ExternalFunctions.cpp \
-	Interpreter.cpp
-
-TGHDRS=	Attributes \
-	Intrinsics
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvminterpreter/Makefile.depend b/lib/clang/libllvminterpreter/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvminterpreter/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmipo/Makefile b/lib/clang/libllvmipo/Makefile
deleted file mode 100644
index 1d9cd519f311..000000000000
--- a/lib/clang/libllvmipo/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-# $FreeBSD$
-
-.include <src.opts.mk>
-
-LIB=	llvmipo
-
-SRCDIR=	lib/Transforms/IPO
-SRCS=	ArgumentPromotion.cpp \
-	BarrierNoopPass.cpp \
-	ConstantMerge.cpp \
-	CrossDSOCFI.cpp \
-	DeadArgumentElimination.cpp \
-	ElimAvailExtern.cpp \
-	ExtractGV.cpp \
-	ForceFunctionAttrs.cpp \
-	FunctionAttrs.cpp \
-	FunctionImport.cpp \
-	GlobalDCE.cpp \
-	GlobalOpt.cpp \
-	IPConstantPropagation.cpp \
-	InferFunctionAttrs.cpp \
-	InlineAlways.cpp \
-	InlineSimple.cpp \
-	Inliner.cpp \
-	Internalize.cpp \
-	LoopExtractor.cpp \
-	LowerTypeTests.cpp \
-	MergeFunctions.cpp \
-	PartialInlining.cpp \
-	PassManagerBuilder.cpp \
-	PruneEH.cpp \
-	SampleProfile.cpp \
-	StripDeadPrototypes.cpp \
-	StripSymbols.cpp \
-	WholeProgramDevirt.cpp
-
-.if ${MK_CLANG_EXTRAS} != "no"
-SRCS+=	IPO.cpp
-.endif
-
-TGHDRS=	Attributes \
-	Intrinsics
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmipo/Makefile.depend b/lib/clang/libllvmipo/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvmipo/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmirreader/Makefile b/lib/clang/libllvmirreader/Makefile
deleted file mode 100644
index 8f89947d7a46..000000000000
--- a/lib/clang/libllvmirreader/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	llvmirreader
-
-SRCDIR=	lib/IRReader
-SRCS=	IRReader.cpp
-
-TGHDRS=	Attributes
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmirreader/Makefile.depend b/lib/clang/libllvmirreader/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvmirreader/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmlibdriver/Makefile b/lib/clang/libllvmlibdriver/Makefile
deleted file mode 100644
index 863ef4853249..000000000000
--- a/lib/clang/libllvmlibdriver/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	llvmlibdriver
-
-SRCDIR=	lib/LibDriver
-SRCS=	LibDriver.cpp
-CFLAGS+= -I${.CURDIR}
-
-TGHDRS=	Options
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmlibdriver/Makefile.depend b/lib/clang/libllvmlibdriver/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvmlibdriver/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmlibdriver/Options.inc b/lib/clang/libllvmlibdriver/Options.inc
deleted file mode 100644
index 37422c14f3a4..000000000000
--- a/lib/clang/libllvmlibdriver/Options.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "Options.inc.h"
diff --git a/lib/clang/libllvmlineeditor/Makefile b/lib/clang/libllvmlineeditor/Makefile
deleted file mode 100644
index 3bf378dfaa5b..000000000000
--- a/lib/clang/libllvmlineeditor/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	llvmlineeditor
-
-SRCDIR=	lib/LineEditor
-SRCS=	LineEditor.cpp
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmlinker/Makefile b/lib/clang/libllvmlinker/Makefile
deleted file mode 100644
index 7808ea18d91d..000000000000
--- a/lib/clang/libllvmlinker/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	llvmlinker
-
-SRCDIR=	lib/Linker
-SRCS=	IRMover.cpp \
-	LinkModules.cpp
-
-TGHDRS=	Attributes \
-	Intrinsics
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmlinker/Makefile.depend b/lib/clang/libllvmlinker/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvmlinker/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmlto/Makefile b/lib/clang/libllvmlto/Makefile
deleted file mode 100644
index da5be7b1f47b..000000000000
--- a/lib/clang/libllvmlto/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $FreeBSD$
-
-.include <src.opts.mk>
-
-LIB=	llvmlto
-
-SRCDIR=	lib/LTO
-SRCS=	LTO.cpp \
-	LTOCodeGenerator.cpp \
-	LTOModule.cpp \
-	ThinLTOCodeGenerator.cpp \
-	UpdateCompilerUsed.cpp
-
-TGHDRS=	Attributes \
-	Intrinsics
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmlto/Makefile.depend b/lib/clang/libllvmlto/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvmlto/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmmc/Makefile b/lib/clang/libllvmmc/Makefile
deleted file mode 100644
index 89625a57c928..000000000000
--- a/lib/clang/libllvmmc/Makefile
+++ /dev/null
@@ -1,60 +0,0 @@
-# $FreeBSD$
-
-.include <src.opts.mk>
-
-LIB=	llvmmc
-
-SRCDIR=	lib/MC
-SRCS=	ConstantPools.cpp \
-	ELFObjectWriter.cpp \
-	MCAsmBackend.cpp \
-	MCAsmInfo.cpp \
-	MCAsmInfoCOFF.cpp \
-	MCAsmInfoDarwin.cpp \
-	MCAsmInfoELF.cpp \
-	MCAsmStreamer.cpp \
-	MCAssembler.cpp \
-	MCCodeEmitter.cpp \
-	MCCodeView.cpp \
-	MCContext.cpp \
-	MCDwarf.cpp \
-	MCELFObjectTargetWriter.cpp \
-	MCELFStreamer.cpp \
-	MCExpr.cpp \
-	MCFragment.cpp \
-	MCInst.cpp \
-	MCInstPrinter.cpp \
-	MCInstrAnalysis.cpp \
-	MCInstrDesc.cpp \
-	MCLinkerOptimizationHint.cpp \
-	MCMachOStreamer.cpp \
-	MCMachObjectTargetWriter.cpp \
-	MCNullStreamer.cpp \
-	MCObjectFileInfo.cpp \
-	MCObjectStreamer.cpp \
-	MCObjectWriter.cpp \
-	MCRegisterInfo.cpp \
-	MCSchedule.cpp \
-	MCSection.cpp \
-	MCSectionCOFF.cpp \
-	MCSectionELF.cpp \
-	MCSectionMachO.cpp \
-	MCStreamer.cpp \
-	MCSubtargetInfo.cpp \
-	MCSymbol.cpp \
-	MCSymbolELF.cpp \
-	MCTargetOptions.cpp \
-	MCValue.cpp \
-	MCWin64EH.cpp \
-	MCWinEH.cpp \
-	MachObjectWriter.cpp \
-	StringTableBuilder.cpp \
-	SubtargetFeature.cpp \
-	WinCOFFObjectWriter.cpp \
-	WinCOFFStreamer.cpp
-
-.if ${MK_CLANG_EXTRAS} != "no"
-SRCS+=	MCLabel.cpp
-.endif
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmmc/Makefile.depend b/lib/clang/libllvmmc/Makefile.depend
deleted file mode 100644
index 3e7f3f5e7165..000000000000
--- a/lib/clang/libllvmmc/Makefile.depend
+++ /dev/null
@@ -1,15 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmmcdisassembler/Makefile b/lib/clang/libllvmmcdisassembler/Makefile
deleted file mode 100644
index ca0eada97c60..000000000000
--- a/lib/clang/libllvmmcdisassembler/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $FreeBSD$
-
-.include <src.opts.mk>
-
-LIB=	llvmmcdisassembler
-
-SRCDIR=	lib/MC/MCDisassembler
-SRCS=	Disassembler.cpp \
-	MCRelocationInfo.cpp
-
-.if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLDB} != "no"
-SRCS+=	MCDisassembler.cpp \
-	MCExternalSymbolizer.cpp \
-	MCSymbolizer.cpp
-.endif
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmmcdisassembler/Makefile.depend b/lib/clang/libllvmmcdisassembler/Makefile.depend
deleted file mode 100644
index 3e7f3f5e7165..000000000000
--- a/lib/clang/libllvmmcdisassembler/Makefile.depend
+++ /dev/null
@@ -1,15 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmmcjit/Makefile b/lib/clang/libllvmmcjit/Makefile
deleted file mode 100644
index 632dd5e425af..000000000000
--- a/lib/clang/libllvmmcjit/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	llvmmcjit
-
-SRCDIR=	lib/ExecutionEngine/MCJIT
-SRCS=	MCJIT.cpp
-
-TGHDRS=	Attributes
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmmcjit/Makefile.depend b/lib/clang/libllvmmcjit/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvmmcjit/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmmcparser/Makefile b/lib/clang/libllvmmcparser/Makefile
deleted file mode 100644
index b39926a0d712..000000000000
--- a/lib/clang/libllvmmcparser/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	llvmmcparser
-
-SRCDIR=	lib/MC/MCParser
-SRCS=	AsmLexer.cpp \
-	AsmParser.cpp \
-	COFFAsmParser.cpp \
-	DarwinAsmParser.cpp \
-	ELFAsmParser.cpp \
-	MCAsmLexer.cpp \
-	MCAsmParser.cpp \
-	MCAsmParserExtension.cpp \
-	MCTargetAsmParser.cpp
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmmcparser/Makefile.depend b/lib/clang/libllvmmcparser/Makefile.depend
deleted file mode 100644
index 3e7f3f5e7165..000000000000
--- a/lib/clang/libllvmmcparser/Makefile.depend
+++ /dev/null
@@ -1,15 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmminimal/Makefile b/lib/clang/libllvmminimal/Makefile
new file mode 100644
index 000000000000..7358d625b485
--- /dev/null
+++ b/lib/clang/libllvmminimal/Makefile
@@ -0,0 +1,62 @@
+# $FreeBSD$
+
+.include "../llvm.pre.mk"
+
+LIB=		llvmminimal
+INTERNALLIB=
+
+SRCDIR=		lib
+SRCS+=		Support/APInt.cpp
+SRCS+=		Support/CommandLine.cpp
+SRCS+=		Support/ConvertUTF.c
+SRCS+=		Support/ConvertUTFWrapper.cpp
+SRCS+=		Support/Debug.cpp
+SRCS+=		Support/Errno.cpp
+SRCS+=		Support/ErrorHandling.cpp
+SRCS+=		Support/FoldingSet.cpp
+SRCS+=		Support/FormattedStream.cpp
+SRCS+=		Support/Hashing.cpp
+SRCS+=		Support/Host.cpp
+SRCS+=		Support/IntEqClasses.cpp
+SRCS+=		Support/Locale.cpp
+SRCS+=		Support/ManagedStatic.cpp
+SRCS+=		Support/MemoryBuffer.cpp
+SRCS+=		Support/Mutex.cpp
+SRCS+=		Support/Path.cpp
+SRCS+=		Support/PrettyStackTrace.cpp
+SRCS+=		Support/Process.cpp
+SRCS+=		Support/Program.cpp
+SRCS+=		Support/Regex.cpp
+SRCS+=		Support/Signals.cpp
+SRCS+=		Support/SmallPtrSet.cpp
+SRCS+=		Support/SmallVector.cpp
+SRCS+=		Support/SourceMgr.cpp
+SRCS+=		Support/StringExtras.cpp
+SRCS+=		Support/StringMap.cpp
+SRCS+=		Support/StringRef.cpp
+SRCS+=		Support/StringSaver.cpp
+SRCS+=		Support/TargetParser.cpp
+SRCS+=		Support/Threading.cpp
+SRCS+=		Support/TimeValue.cpp
+SRCS+=		Support/ToolOutputFile.cpp
+SRCS+=		Support/Triple.cpp
+SRCS+=		Support/Twine.cpp
+SRCS+=		Support/Unicode.cpp
+SRCS+=		Support/circular_raw_ostream.cpp
+SRCS+=		Support/raw_ostream.cpp
+SRCS+=		Support/regcomp.c
+SRCS+=		Support/regerror.c
+SRCS+=		Support/regexec.c
+SRCS+=		Support/regfree.c
+SRCS+=		Support/regstrlcpy.c
+SRCS+=		TableGen/Error.cpp
+SRCS+=		TableGen/Main.cpp
+SRCS+=		TableGen/Record.cpp
+SRCS+=		TableGen/SetTheory.cpp
+SRCS+=		TableGen/StringMatcher.cpp
+SRCS+=		TableGen/TGLexer.cpp
+SRCS+=		TableGen/TGParser.cpp
+SRCS+=		TableGen/TableGenBackend.cpp
+
+.include "../llvm.build.mk"
+.include <bsd.lib.mk>
diff --git a/lib/clang/libllvmmipsasmparser/Makefile b/lib/clang/libllvmmipsasmparser/Makefile
deleted file mode 100644
index b6b87bf28a4e..000000000000
--- a/lib/clang/libllvmmipsasmparser/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	llvmmipsasmparser
-
-SRCDIR=	lib/Target/Mips/AsmParser
-INCDIR=	lib/Target/Mips
-SRCS=	MipsAsmParser.cpp
-
-TGHDRS=	Attributes \
-	MipsGenAsmMatcher \
-	MipsGenInstrInfo \
-	MipsGenRegisterInfo \
-	MipsGenSubtargetInfo
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmmipsasmparser/Makefile.depend b/lib/clang/libllvmmipsasmparser/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvmmipsasmparser/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmmipsasmprinter/Makefile b/lib/clang/libllvmmipsasmprinter/Makefile
deleted file mode 100644
index 94cd25f63f2d..000000000000
--- a/lib/clang/libllvmmipsasmprinter/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	llvmmipsasmprinter
-
-SRCDIR=	lib/Target/Mips/InstPrinter
-INCDIR=	lib/Target/Mips
-SRCS=	MipsInstPrinter.cpp
-
-TGHDRS=	Attributes \
-	MipsGenAsmWriter \
-	MipsGenInstrInfo \
-	MipsGenRegisterInfo \
-	MipsGenSubtargetInfo
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmmipsasmprinter/Makefile.depend b/lib/clang/libllvmmipsasmprinter/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvmmipsasmprinter/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmmipscodegen/Makefile b/lib/clang/libllvmmipscodegen/Makefile
deleted file mode 100644
index 7fe51e94f788..000000000000
--- a/lib/clang/libllvmmipscodegen/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	llvmmipscodegen
-
-SRCDIR=	lib/Target/Mips
-SRCS=	Mips16FrameLowering.cpp \
-	Mips16HardFloat.cpp \
-	Mips16HardFloatInfo.cpp \
-	Mips16ISelDAGToDAG.cpp \
-	Mips16ISelLowering.cpp \
-	Mips16InstrInfo.cpp \
-	Mips16RegisterInfo.cpp \
-	MipsAnalyzeImmediate.cpp \
-	MipsAsmPrinter.cpp \
-	MipsCCState.cpp \
-	MipsConstantIslandPass.cpp \
-	MipsDelaySlotFiller.cpp \
-	MipsFastISel.cpp \
-	MipsFrameLowering.cpp \
-	MipsHazardSchedule.cpp \
-	MipsISelDAGToDAG.cpp \
-	MipsISelLowering.cpp \
-	MipsInstrInfo.cpp \
-	MipsLongBranch.cpp \
-	MipsMCInstLower.cpp \
-	MipsMachineFunction.cpp \
-	MipsModuleISelDAGToDAG.cpp \
-	MipsOptimizePICCall.cpp \
-	MipsOs16.cpp \
-	MipsRegisterInfo.cpp \
-	MipsSEFrameLowering.cpp \
-	MipsSEISelDAGToDAG.cpp \
-	MipsSEISelLowering.cpp \
-	MipsSEInstrInfo.cpp \
-	MipsSERegisterInfo.cpp \
-	MipsSubtarget.cpp \
-	MipsTargetMachine.cpp \
-	MipsTargetObjectFile.cpp
-
-TGHDRS=	Attributes \
-	Intrinsics \
-	MipsGenAsmWriter \
-	MipsGenCallingConv \
-	MipsGenCodeEmitter \
-	MipsGenDAGISel \
-	MipsGenFastISel \
-	MipsGenInstrInfo \
-	MipsGenMCPseudoLowering \
-	MipsGenRegisterInfo \
-	MipsGenSubtargetInfo
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmmipscodegen/Makefile.depend b/lib/clang/libllvmmipscodegen/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvmmipscodegen/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmmipsdesc/Makefile b/lib/clang/libllvmmipsdesc/Makefile
deleted file mode 100644
index 19c585fe42ac..000000000000
--- a/lib/clang/libllvmmipsdesc/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	llvmmipsdesc
-
-SRCDIR=	lib/Target/Mips/MCTargetDesc
-SRCS=	MipsABIFlagsSection.cpp \
-	MipsABIInfo.cpp \
-	MipsAsmBackend.cpp \
-	MipsELFObjectWriter.cpp \
-	MipsELFStreamer.cpp \
-	MipsMCAsmInfo.cpp \
-	MipsMCCodeEmitter.cpp \
-	MipsMCExpr.cpp \
-	MipsMCTargetDesc.cpp \
-	MipsNaClELFStreamer.cpp \
-	MipsOptionRecord.cpp \
-	MipsTargetStreamer.cpp
-CFLAGS+= -I${LLVM_SRCS}/${SRCDIR}/..
-
-TGHDRS=	Attributes \
-	MipsGenInstrInfo \
-	MipsGenMCCodeEmitter \
-	MipsGenRegisterInfo \
-	MipsGenSubtargetInfo
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmmipsdesc/Makefile.depend b/lib/clang/libllvmmipsdesc/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvmmipsdesc/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmmipsdisassembler/Makefile b/lib/clang/libllvmmipsdisassembler/Makefile
deleted file mode 100644
index 8a6006dbcc4b..000000000000
--- a/lib/clang/libllvmmipsdisassembler/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	llvmmipsdisassembler
-
-SRCDIR=	lib/Target/Mips/Disassembler
-INCDIR=	lib/Target/Mips
-SRCS=	MipsDisassembler.cpp
-
-TGHDRS=	Attributes \
-	Intrinsics \
-	MipsGenDisassemblerTables \
-	MipsGenInstrInfo \
-	MipsGenRegisterInfo \
-	MipsGenSubtargetInfo
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmmipsdisassembler/Makefile.depend b/lib/clang/libllvmmipsdisassembler/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvmmipsdisassembler/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmmipsinfo/Makefile b/lib/clang/libllvmmipsinfo/Makefile
deleted file mode 100644
index be8d5883680e..000000000000
--- a/lib/clang/libllvmmipsinfo/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	llvmmipsinfo
-
-SRCDIR=	lib/Target/Mips/TargetInfo
-INCDIR=	lib/Target/Mips
-SRCS=	MipsTargetInfo.cpp
-
-TGHDRS=	Attributes \
-	MipsGenInstrInfo \
-	MipsGenRegisterInfo \
-	MipsGenSubtargetInfo
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmmipsinfo/Makefile.depend b/lib/clang/libllvmmipsinfo/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvmmipsinfo/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmmirparser/Makefile b/lib/clang/libllvmmirparser/Makefile
deleted file mode 100644
index 463244128a79..000000000000
--- a/lib/clang/libllvmmirparser/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	llvmmirparser
-
-SRCDIR=	lib/CodeGen/MIRParser
-SRCS=	MILexer.cpp \
-	MIParser.cpp \
-	MIRParser.cpp
-
-TGHDRS=	Attributes
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmmirparser/Makefile.depend b/lib/clang/libllvmmirparser/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvmmirparser/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmobjcarcopts/Makefile b/lib/clang/libllvmobjcarcopts/Makefile
deleted file mode 100644
index b88c5b5f3ec6..000000000000
--- a/lib/clang/libllvmobjcarcopts/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $FreeBSD$
-
-.include <src.opts.mk>
-
-LIB=	llvmobjcarcopts
-
-SRCDIR=	lib/Transforms/ObjCARC
-SRCS=	DependencyAnalysis.cpp \
-	ObjCARCAPElim.cpp \
-	ObjCARCContract.cpp \
-	ObjCARCExpand.cpp \
-	ObjCARCOpts.cpp \
-	ProvenanceAnalysis.cpp \
-	ProvenanceAnalysisEvaluator.cpp \
-	PtrState.cpp
-
-.if ${MK_CLANG_EXTRAS} != "no"
-SRCS+=	ObjCARC.cpp
-.endif
-
-TGHDRS=	Attributes \
-	Intrinsics
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmobjcarcopts/Makefile.depend b/lib/clang/libllvmobjcarcopts/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvmobjcarcopts/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmobject/Makefile b/lib/clang/libllvmobject/Makefile
deleted file mode 100644
index 61d9c39bce69..000000000000
--- a/lib/clang/libllvmobject/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $FreeBSD$
-
-.include <src.opts.mk>
-
-LIB=	llvmobject
-
-SRCDIR=	lib/Object
-SRCS=	Archive.cpp \
-	ArchiveWriter.cpp \
-	Binary.cpp \
-	COFFObjectFile.cpp \
-	ELF.cpp \
-	ELFObjectFile.cpp \
-	Error.cpp \
-	IRObjectFile.cpp \
-	MachOObjectFile.cpp \
-	MachOUniversal.cpp \
-	ModuleSummaryIndexObjectFile.cpp \
-	ObjectFile.cpp \
-	RecordStreamer.cpp \
-	SymbolicFile.cpp
-
-.if ${MK_CLANG_EXTRAS} != "no"
-SRCS+=	Object.cpp \
-	SymbolSize.cpp
-.endif
-
-TGHDRS=	Attributes
-	
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmobject/Makefile.depend b/lib/clang/libllvmobject/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvmobject/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmobjectyaml/Makefile b/lib/clang/libllvmobjectyaml/Makefile
deleted file mode 100644
index f5f2cef00dac..000000000000
--- a/lib/clang/libllvmobjectyaml/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $FreeBSD$
-
-.include <src.opts.mk>
-
-LIB=	llvmobjectyaml
-
-SRCDIR=	lib/ObjectYAML
-SRCS=	COFFYAML.cpp \
-	ELFYAML.cpp \
-	MachOYAML.cpp
-
-.if ${MK_CLANG_EXTRAS} != "no"
-SRCS+=	ObjectYAML.cpp \
-	YAML.cpp
-.endif
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmoption/Makefile b/lib/clang/libllvmoption/Makefile
deleted file mode 100644
index bf88dba9aa97..000000000000
--- a/lib/clang/libllvmoption/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	llvmoption
-
-SRCDIR=	lib/Option
-SRCS=	Arg.cpp \
-	ArgList.cpp \
-	OptTable.cpp \
-	Option.cpp
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmoption/Makefile.depend b/lib/clang/libllvmoption/Makefile.depend
deleted file mode 100644
index 3e7f3f5e7165..000000000000
--- a/lib/clang/libllvmoption/Makefile.depend
+++ /dev/null
@@ -1,15 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmorcjit/Makefile b/lib/clang/libllvmorcjit/Makefile
deleted file mode 100644
index 6afb50f28c82..000000000000
--- a/lib/clang/libllvmorcjit/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	llvmorcjit
-
-SRCDIR=	lib/ExecutionEngine/Orc
-SRCS=	ExecutionUtils.cpp \
-	IndirectionUtils.cpp \
-	NullResolver.cpp \
-	OrcABISupport.cpp \
-	OrcCBindings.cpp \
-	OrcError.cpp \
-	OrcMCJITReplacement.cpp \
-	OrcRemoteTargetRPCAPI.cpp
-
-TGHDRS=	Attributes \
-	Intrinsics
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmorcjit/Makefile.depend b/lib/clang/libllvmorcjit/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvmorcjit/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmpasses/Makefile b/lib/clang/libllvmpasses/Makefile
deleted file mode 100644
index eba54f6b0006..000000000000
--- a/lib/clang/libllvmpasses/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $FreeBSD$
-
-.include <src.opts.mk>
-
-LIB=	llvmpasses
-
-SRCDIR=	lib/Passes
-SRCS=	PassBuilder.cpp
-
-TGHDRS=	Attributes \
-	Intrinsics
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmpasses/Makefile.depend b/lib/clang/libllvmpasses/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvmpasses/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmpowerpcasmparser/Makefile b/lib/clang/libllvmpowerpcasmparser/Makefile
deleted file mode 100644
index ff1f533a6446..000000000000
--- a/lib/clang/libllvmpowerpcasmparser/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	llvmpowerpcasmparser
-
-SRCDIR=	lib/Target/PowerPC/AsmParser
-INCDIR=	lib/Target/PowerPC
-SRCS=	PPCAsmParser.cpp
-
-TGHDRS=	PPCGenAsmMatcher \
-	PPCGenInstrInfo \
-	PPCGenRegisterInfo \
-	PPCGenSubtargetInfo
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmpowerpcasmparser/Makefile.depend b/lib/clang/libllvmpowerpcasmparser/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvmpowerpcasmparser/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmpowerpcasmprinter/Makefile b/lib/clang/libllvmpowerpcasmprinter/Makefile
deleted file mode 100644
index 0fa17e0625ce..000000000000
--- a/lib/clang/libllvmpowerpcasmprinter/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	llvmpowerpcasmprinter
-
-SRCDIR=	lib/Target/PowerPC/InstPrinter
-INCDIR=	lib/Target/PowerPC
-SRCS=	PPCInstPrinter.cpp
-
-TGHDRS=	PPCGenAsmWriter \
-	PPCGenInstrInfo \
-	PPCGenRegisterInfo \
-	PPCGenSubtargetInfo
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmpowerpcasmprinter/Makefile.depend b/lib/clang/libllvmpowerpcasmprinter/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvmpowerpcasmprinter/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmpowerpccodegen/Makefile b/lib/clang/libllvmpowerpccodegen/Makefile
deleted file mode 100644
index 6e71440009d0..000000000000
--- a/lib/clang/libllvmpowerpccodegen/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	llvmpowerpccodegen
-
-SRCDIR=	lib/Target/PowerPC
-SRCS=	PPCAsmPrinter.cpp \
-	PPCBoolRetToInt.cpp \
-	PPCBranchSelector.cpp \
-	PPCCCState.cpp \
-	PPCCTRLoops.cpp \
-	PPCEarlyReturn.cpp \
- 	PPCFastISel.cpp \
-	PPCFrameLowering.cpp \
-	PPCHazardRecognizers.cpp \
-	PPCISelDAGToDAG.cpp \
-	PPCISelLowering.cpp \
-	PPCInstrInfo.cpp \
-	PPCLoopPreIncPrep.cpp \
-	PPCMCInstLower.cpp \
-	PPCMIPeephole.cpp \
-	PPCMachineFunctionInfo.cpp \
-	PPCQPXLoadSplat.cpp \
-	PPCRegisterInfo.cpp \
-	PPCSubtarget.cpp \
-	PPCTLSDynamicCall.cpp \
-	PPCTOCRegDeps.cpp \
-	PPCTargetMachine.cpp \
-	PPCTargetObjectFile.cpp \
-	PPCTargetTransformInfo.cpp \
-	PPCVSXCopy.cpp \
-	PPCVSXFMAMutate.cpp \
-	PPCVSXSwapRemoval.cpp
-
-TGHDRS=	Attributes \
-	Intrinsics \
-	PPCGenCallingConv \
-	PPCGenCodeEmitter \
-	PPCGenDAGISel \
-	PPCGenFastISel \
-	PPCGenInstrInfo \
-	PPCGenMCCodeEmitter \
-	PPCGenRegisterInfo \
-	PPCGenSubtargetInfo
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmpowerpccodegen/Makefile.depend b/lib/clang/libllvmpowerpccodegen/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvmpowerpccodegen/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmpowerpcdesc/Makefile b/lib/clang/libllvmpowerpcdesc/Makefile
deleted file mode 100644
index b64b9487ac9a..000000000000
--- a/lib/clang/libllvmpowerpcdesc/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	llvmpowerpcdesc
-
-SRCDIR=	lib/Target/PowerPC/MCTargetDesc
-SRCS=	PPCAsmBackend.cpp \
-	PPCELFObjectWriter.cpp \
-	PPCMCAsmInfo.cpp \
-	PPCMCCodeEmitter.cpp \
-	PPCMCExpr.cpp \
-	PPCMCTargetDesc.cpp \
-	PPCMachObjectWriter.cpp \
-	PPCPredicates.cpp
-CFLAGS+= -I${LLVM_SRCS}/${SRCDIR}/..
-
-TGHDRS=	PPCGenInstrInfo \
-	PPCGenMCCodeEmitter \
-	PPCGenRegisterInfo \
-	PPCGenSubtargetInfo
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmpowerpcdesc/Makefile.depend b/lib/clang/libllvmpowerpcdesc/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvmpowerpcdesc/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmpowerpcdisassembler/Makefile b/lib/clang/libllvmpowerpcdisassembler/Makefile
deleted file mode 100644
index 58735e4c0a59..000000000000
--- a/lib/clang/libllvmpowerpcdisassembler/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	llvmpowerpcdisassembler
-
-SRCDIR=	lib/Target/PowerPC/Disassembler
-INCDIR=	lib/Target/PowerPC
-SRCS=	PPCDisassembler.cpp
-
-TGHDRS=	PPCGenDisassemblerTables \
-	PPCGenInstrInfo \
-	PPCGenRegisterInfo \
-	PPCGenSubtargetInfo
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmpowerpcdisassembler/Makefile.depend b/lib/clang/libllvmpowerpcdisassembler/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvmpowerpcdisassembler/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmpowerpcinfo/Makefile b/lib/clang/libllvmpowerpcinfo/Makefile
deleted file mode 100644
index db1577642102..000000000000
--- a/lib/clang/libllvmpowerpcinfo/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	llvmpowerpcinfo
-
-SRCDIR=	lib/Target/PowerPC/TargetInfo
-INCDIR=	lib/Target/PowerPC
-SRCS=	PowerPCTargetInfo.cpp
-
-TGHDRS=	Attributes \
-	PPCGenInstrInfo \
-	PPCGenRegisterInfo \
-	PPCGenSubtargetInfo
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmpowerpcinfo/Makefile.depend b/lib/clang/libllvmpowerpcinfo/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvmpowerpcinfo/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmprofiledata/Makefile b/lib/clang/libllvmprofiledata/Makefile
deleted file mode 100644
index 74e80ffd98c0..000000000000
--- a/lib/clang/libllvmprofiledata/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $FreeBSD$
-
-.include <src.opts.mk>
-
-LIB=	llvmprofiledata
-
-SRCDIR=	lib/ProfileData
-SRCS=	InstrProf.cpp \
-	InstrProfReader.cpp \
-	InstrProfWriter.cpp \
-	ProfileSummaryBuilder.cpp \
-	SampleProf.cpp \
-	SampleProfReader.cpp
-
-.if ${MK_CLANG_EXTRAS} != "no"
-SRCS+=	SampleProfWriter.cpp
-.endif
-
-TGHDRS=	Attributes
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmprofiledata/Makefile.depend b/lib/clang/libllvmprofiledata/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvmprofiledata/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmruntimedyld/Makefile b/lib/clang/libllvmruntimedyld/Makefile
deleted file mode 100644
index a4326b52c6a2..000000000000
--- a/lib/clang/libllvmruntimedyld/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	llvmruntimedyld
-
-SRCDIR=	lib/ExecutionEngine/RuntimeDyld
-SRCS=	RTDyldMemoryManager.cpp \
-	RuntimeDyld.cpp \
-	RuntimeDyldCOFF.cpp \
-	RuntimeDyldChecker.cpp \
-	RuntimeDyldELF.cpp \
-	RuntimeDyldMachO.cpp
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmruntimedyld/Makefile.depend b/lib/clang/libllvmruntimedyld/Makefile.depend
deleted file mode 100644
index 3e7f3f5e7165..000000000000
--- a/lib/clang/libllvmruntimedyld/Makefile.depend
+++ /dev/null
@@ -1,15 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmscalaropts/Makefile b/lib/clang/libllvmscalaropts/Makefile
deleted file mode 100644
index 0a7a4ba7c657..000000000000
--- a/lib/clang/libllvmscalaropts/Makefile
+++ /dev/null
@@ -1,70 +0,0 @@
-# $FreeBSD$
-
-.include <src.opts.mk>
-
-LIB=	llvmscalaropts
-
-SRCDIR=	lib/Transforms/Scalar
-SRCS=	ADCE.cpp \
-	AlignmentFromAssumptions.cpp \
-	BDCE.cpp \
-	ConstantHoisting.cpp \
-	ConstantProp.cpp \
-	CorrelatedValuePropagation.cpp \
-	DCE.cpp \
-	DeadStoreElimination.cpp \
-	EarlyCSE.cpp \
-	FlattenCFGPass.cpp \
-	Float2Int.cpp \
-	GVN.cpp \
-	GVNHoist.cpp \
-	GuardWidening.cpp \
-	IndVarSimplify.cpp \
-	InductiveRangeCheckElimination.cpp \
-	JumpThreading.cpp \
-	LICM.cpp \
-	LoadCombine.cpp \
-	LoopDataPrefetch.cpp \
-	LoopDeletion.cpp \
-	LoopDistribute.cpp \
-	LoopIdiomRecognize.cpp \
-	LoopInterchange.cpp \
-	LoopLoadElimination.cpp \
-	LoopRerollPass.cpp \
-	LoopRotation.cpp \
-	LoopSimplifyCFG.cpp \
-	LoopStrengthReduce.cpp \
-	LoopUnrollPass.cpp \
-	LoopUnswitch.cpp \
-	LoopVersioningLICM.cpp \
-	LowerAtomic.cpp \
-	LowerExpectIntrinsic.cpp \
-	LowerGuardIntrinsic.cpp \
-	MemCpyOptimizer.cpp \
-	MergedLoadStoreMotion.cpp \
-	NaryReassociate.cpp \
-	PartiallyInlineLibCalls.cpp \
-	PlaceSafepoints.cpp \
-	Reassociate.cpp \
-	Reg2Mem.cpp \
-	RewriteStatepointsForGC.cpp \
-	SCCP.cpp \
-	SROA.cpp \
-	Scalarizer.cpp \
-	SeparateConstOffsetFromGEP.cpp \
-	SimplifyCFGPass.cpp \
-	Sink.cpp \
-	SpeculativeExecution.cpp \
-	StraightLineStrengthReduce.cpp \
-	StructurizeCFG.cpp \
-	TailRecursionElimination.cpp
-
-.if ${MK_CLANG_EXTRAS} != "no"
-SRCS+=	LoopInstSimplify.cpp \
-	Scalar.cpp
-.endif
-
-TGHDRS=	Attributes \
-	Intrinsics
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmscalaropts/Makefile.depend b/lib/clang/libllvmscalaropts/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvmscalaropts/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmselectiondag/Makefile b/lib/clang/libllvmselectiondag/Makefile
deleted file mode 100644
index dad2a3f00676..000000000000
--- a/lib/clang/libllvmselectiondag/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	llvmselectiondag
-
-SRCDIR=	lib/CodeGen/SelectionDAG
-SRCS=	DAGCombiner.cpp \
-	FastISel.cpp \
-	FunctionLoweringInfo.cpp \
-	InstrEmitter.cpp \
-	LegalizeDAG.cpp \
-	LegalizeFloatTypes.cpp \
-	LegalizeIntegerTypes.cpp \
-	LegalizeTypes.cpp \
-	LegalizeTypesGeneric.cpp \
-	LegalizeVectorOps.cpp \
-	LegalizeVectorTypes.cpp \
-	ResourcePriorityQueue.cpp \
-	ScheduleDAGFast.cpp \
-	ScheduleDAGRRList.cpp \
-	ScheduleDAGSDNodes.cpp \
-	ScheduleDAGVLIW.cpp \
-	SelectionDAG.cpp \
-	SelectionDAGBuilder.cpp \
-	SelectionDAGDumper.cpp \
-	SelectionDAGISel.cpp \
-	SelectionDAGPrinter.cpp \
-	SelectionDAGTargetInfo.cpp \
-	StatepointLowering.cpp \
-	TargetLowering.cpp
-
-TGHDRS=	Attributes \
-	Intrinsics
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmselectiondag/Makefile.depend b/lib/clang/libllvmselectiondag/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvmselectiondag/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmsparcasmparser/Makefile b/lib/clang/libllvmsparcasmparser/Makefile
deleted file mode 100644
index f4e4f25c8a70..000000000000
--- a/lib/clang/libllvmsparcasmparser/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	llvmsparcasmparser
-
-SRCDIR=	lib/Target/Sparc/AsmParser
-INCDIR=	lib/Target/Sparc
-SRCS=	SparcAsmParser.cpp
-
-TGHDRS=	SparcGenAsmMatcher \
-	SparcGenInstrInfo \
-	SparcGenRegisterInfo \
-	SparcGenSubtargetInfo
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmsparcasmparser/Makefile.depend b/lib/clang/libllvmsparcasmparser/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvmsparcasmparser/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmsparcasmprinter/Makefile b/lib/clang/libllvmsparcasmprinter/Makefile
deleted file mode 100644
index 6144fd4b8226..000000000000
--- a/lib/clang/libllvmsparcasmprinter/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	llvmsparcasmprinter
-
-SRCDIR=	lib/Target/Sparc/InstPrinter
-INCDIR=	lib/Target/Sparc
-SRCS=	SparcInstPrinter.cpp
-
-TGHDRS=	SparcGenAsmWriter \
-	SparcGenInstrInfo \
-	SparcGenRegisterInfo \
-	SparcGenSubtargetInfo
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmsparcasmprinter/Makefile.depend b/lib/clang/libllvmsparcasmprinter/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvmsparcasmprinter/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmsparccodegen/Makefile b/lib/clang/libllvmsparccodegen/Makefile
deleted file mode 100644
index e9ab90e52ca1..000000000000
--- a/lib/clang/libllvmsparccodegen/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	llvmsparccodegen
-
-SRCDIR=	lib/Target/Sparc
-SRCS=	DelaySlotFiller.cpp \
-	LeonPasses.cpp \
-	SparcAsmPrinter.cpp \
-	SparcFrameLowering.cpp \
-	SparcISelDAGToDAG.cpp \
-	SparcISelLowering.cpp \
-	SparcInstrInfo.cpp \
-	SparcMCInstLower.cpp \
-	SparcMachineFunctionInfo.cpp \
-	SparcRegisterInfo.cpp \
-	SparcSubtarget.cpp \
-	SparcTargetMachine.cpp \
-	SparcTargetObjectFile.cpp
-
-TGHDRS=	Attributes \
-	Intrinsics \
-	SparcGenAsmWriter \
-	SparcGenCallingConv \
-	SparcGenCodeEmitter \
-	SparcGenDAGISel \
-	SparcGenInstrInfo \
-	SparcGenMCCodeEmitter \
-	SparcGenRegisterInfo \
-	SparcGenSubtargetInfo
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmsparccodegen/Makefile.depend b/lib/clang/libllvmsparccodegen/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvmsparccodegen/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmsparcdesc/Makefile b/lib/clang/libllvmsparcdesc/Makefile
deleted file mode 100644
index 20605fbc501a..000000000000
--- a/lib/clang/libllvmsparcdesc/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	llvmsparcdesc
-
-SRCDIR=	lib/Target/Sparc/MCTargetDesc
-SRCS=	SparcAsmBackend.cpp \
-	SparcELFObjectWriter.cpp \
-	SparcMCAsmInfo.cpp \
-	SparcMCCodeEmitter.cpp \
-	SparcMCExpr.cpp \
-	SparcMCTargetDesc.cpp \
-	SparcTargetStreamer.cpp
-CFLAGS+= -I${LLVM_SRCS}/${SRCDIR}/..
-
-TGHDRS=	SparcGenInstrInfo \
-	SparcGenMCCodeEmitter \
-	SparcGenRegisterInfo \
-	SparcGenSubtargetInfo
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmsparcdesc/Makefile.depend b/lib/clang/libllvmsparcdesc/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvmsparcdesc/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmsparcdisassembler/Makefile b/lib/clang/libllvmsparcdisassembler/Makefile
deleted file mode 100644
index 1913ee6f64c5..000000000000
--- a/lib/clang/libllvmsparcdisassembler/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	llvmsparcdisassembler
-
-SRCDIR=	lib/Target/Sparc/Disassembler
-INCDIR=	lib/Target/Sparc
-SRCS=	SparcDisassembler.cpp
-
-TGHDRS=	Attributes \
-	Intrinsics \
-	SparcGenDisassemblerTables \
-	SparcGenInstrInfo \
-	SparcGenRegisterInfo \
-	SparcGenSubtargetInfo
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmsparcdisassembler/Makefile.depend b/lib/clang/libllvmsparcdisassembler/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvmsparcdisassembler/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmsparcinfo/Makefile b/lib/clang/libllvmsparcinfo/Makefile
deleted file mode 100644
index 46791f95c0ec..000000000000
--- a/lib/clang/libllvmsparcinfo/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	llvmsparcinfo
-
-SRCDIR=	lib/Target/Sparc/TargetInfo
-INCDIR=	lib/Target/Sparc
-SRCS=	SparcTargetInfo.cpp
-
-TGHDRS=	Attributes \
-	SparcGenInstrInfo \
-	SparcGenRegisterInfo \
-	SparcGenSubtargetInfo
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmsparcinfo/Makefile.depend b/lib/clang/libllvmsparcinfo/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvmsparcinfo/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmsupport/Makefile b/lib/clang/libllvmsupport/Makefile
deleted file mode 100644
index 51543bffc790..000000000000
--- a/lib/clang/libllvmsupport/Makefile
+++ /dev/null
@@ -1,122 +0,0 @@
-# $FreeBSD$
-
-.include <src.opts.mk>
-
-LIB=	llvmsupport
-
-SRCDIR=	lib/Support
-SRCS=	APFloat.cpp \
-	APInt.cpp \
-	APSInt.cpp \
-	ARMBuildAttrs.cpp \
-	Allocator.cpp \
-	Atomic.cpp \
-	BlockFrequency.cpp \
-	BranchProbability.cpp \
-	CachePruning.cpp \
-	CommandLine.cpp \
-	Compression.cpp \
-	ConvertUTF.c \
-	ConvertUTFWrapper.cpp \
-	CrashRecoveryContext.cpp \
-	DAGDeltaAlgorithm.cpp \
-	DataExtractor.cpp \
-	Debug.cpp \
-	DeltaAlgorithm.cpp \
-	Dwarf.cpp \
-	DynamicLibrary.cpp \
-	Errno.cpp \
-	Error.cpp \
-	ErrorHandling.cpp \
-	FoldingSet.cpp \
-	FormattedStream.cpp \
-	GraphWriter.cpp \
-	Hashing.cpp \
-	Host.cpp \
-	IntEqClasses.cpp \
-	IntervalMap.cpp \
-	JamCRC.cpp \
-	LEB128.cpp \
-	LineIterator.cpp \
-	Locale.cpp \
-	LockFileManager.cpp \
-	MD5.cpp \
-	ManagedStatic.cpp \
-	MathExtras.cpp \
-	MemoryBuffer.cpp \
-	MemoryObject.cpp \
-	Mutex.cpp \
-	Options.cpp \
-	Path.cpp \
-	PluginLoader.cpp \
-	PrettyStackTrace.cpp \
-	Process.cpp \
-	Program.cpp \
-	RWMutex.cpp \
-	RandomNumberGenerator.cpp \
-	Regex.cpp \
-	SHA1.cpp \
-	ScaledNumber.cpp \
-	ScopedPrinter.cpp \
-	SearchForAddressOfSpecialSymbol.cpp \
-	Signals.cpp \
-	SmallPtrSet.cpp \
-	SmallVector.cpp \
-	SourceMgr.cpp \
-	SpecialCaseList.cpp \
-	Statistic.cpp \
-	StreamingMemoryObject.cpp \
-	StringExtras.cpp \
-	StringMap.cpp \
-	StringRef.cpp \
-	StringSaver.cpp \
-	TargetParser.cpp \
-	TargetRegistry.cpp \
-	ThreadLocal.cpp \
-	Threading.cpp \
-	TimeValue.cpp \
-	Timer.cpp \
-	ToolOutputFile.cpp \
-	Triple.cpp \
-	Twine.cpp \
-	Unicode.cpp \
-	Valgrind.cpp \
-	YAMLParser.cpp \
-	YAMLTraits.cpp \
-	circular_raw_ostream.cpp \
-	raw_os_ostream.cpp \
-	raw_ostream.cpp \
-	regcomp.c \
-	regerror.c \
-	regexec.c \
-	regfree.c \
-	regstrlcpy.c
-
-.if ${MK_CLANG_FULL} != "no"
-SRCS+=	IntrusiveRefCntPtr.cpp
-.endif
-
-.if ${MK_CLANG_EXTRAS} != "no"
-SRCS+=	ARMWinEH.cpp \
-	COM.cpp \
-	DataStream.cpp \
-	FileOutputBuffer.cpp \
-	FileUtilities.cpp \
-	SystemUtils.cpp \
-	ThreadPool.cpp \
-	Watchdog.cpp
-.endif
-
-.if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLDB} != "no"
-SRCS+=	Memory.cpp
-.endif
-
-.if ${MK_LLDB} != "no"
-SRCS+=	StringPool.cpp
-.endif
-
-.include "../clang.lib.mk"
-
-# Ugly hack to work around CLOCK_PROCESS_CPUTIME_ID not being properly defined
-# between r239347 and r245428.
-CXXFLAGS.Process.cpp=	-DCLOCK_PROCESS_CPUTIME_ID=15
diff --git a/lib/clang/libllvmsupport/Makefile.depend b/lib/clang/libllvmsupport/Makefile.depend
deleted file mode 100644
index 424f5a8641fd..000000000000
--- a/lib/clang/libllvmsupport/Makefile.depend
+++ /dev/null
@@ -1,17 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/libexecinfo \
-	lib/libz \
-	lib/msun \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmsymbolize/Makefile b/lib/clang/libllvmsymbolize/Makefile
deleted file mode 100644
index 88a73c16beec..000000000000
--- a/lib/clang/libllvmsymbolize/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	llvmsymbolize
-
-SRCDIR=	lib/DebugInfo/Symbolize
-SRCS=	DIPrinter.cpp \
-	SymbolizableObjectFile.cpp \
-	Symbolize.cpp
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmsymbolize/Makefile.depend b/lib/clang/libllvmsymbolize/Makefile.depend
deleted file mode 100644
index 3e7f3f5e7165..000000000000
--- a/lib/clang/libllvmsymbolize/Makefile.depend
+++ /dev/null
@@ -1,15 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmtablegen/Makefile b/lib/clang/libllvmtablegen/Makefile
deleted file mode 100644
index be5e5212692d..000000000000
--- a/lib/clang/libllvmtablegen/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	llvmtablegen
-
-SRCDIR=	lib/TableGen
-SRCS=	Error.cpp \
-	Main.cpp \
-	Record.cpp \
-	SetTheory.cpp \
-	StringMatcher.cpp \
-	TGLexer.cpp \
-	TGParser.cpp \
-	TableGenBackend.cpp
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmtablegen/Makefile.depend b/lib/clang/libllvmtablegen/Makefile.depend
deleted file mode 100644
index 3e7f3f5e7165..000000000000
--- a/lib/clang/libllvmtablegen/Makefile.depend
+++ /dev/null
@@ -1,15 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmtarget/Makefile b/lib/clang/libllvmtarget/Makefile
deleted file mode 100644
index 25f977baa20d..000000000000
--- a/lib/clang/libllvmtarget/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $FreeBSD$
-
-.include <src.opts.mk>
-
-LIB=	llvmtarget
-
-SRCDIR=	lib/Target
-SRCS=	Target.cpp \
-	TargetLoweringObjectFile.cpp \
-	TargetMachine.cpp \
-	TargetMachineC.cpp \
-	TargetRecip.cpp \
-	TargetSubtargetInfo.cpp
-
-.if ${MK_CLANG_EXTRAS} != "no"
-SRCS+=	TargetIntrinsicInfo.cpp
-.endif
-	
-TGHDRS=	Attributes \
-	Intrinsics
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmtarget/Makefile.depend b/lib/clang/libllvmtarget/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvmtarget/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmtransformutils/Makefile b/lib/clang/libllvmtransformutils/Makefile
deleted file mode 100644
index 12f375c30fc9..000000000000
--- a/lib/clang/libllvmtransformutils/Makefile
+++ /dev/null
@@ -1,60 +0,0 @@
-# $FreeBSD$
-
-.include <src.opts.mk>
-
-LIB=	llvmtransformutils
-
-SRCDIR=	lib/Transforms/Utils
-SRCS=	ASanStackFrameLayout.cpp \
-	AddDiscriminators.cpp \
-	BasicBlockUtils.cpp \
-	BreakCriticalEdges.cpp \
-	BuildLibCalls.cpp \
-	BypassSlowDivision.cpp \
-	CloneFunction.cpp \
-	CloneModule.cpp \
-	CmpInstAnalysis.cpp \
-	CodeExtractor.cpp \
-	CtorUtils.cpp \
-	DemoteRegToStack.cpp \
-	Evaluator.cpp \
-	FlattenCFG.cpp \
-	FunctionImportUtils.cpp \
-	GlobalStatus.cpp \
-	InlineFunction.cpp \
-	InstructionNamer.cpp \
-	IntegerDivision.cpp \
-	LCSSA.cpp \
-	Local.cpp \
-	LoopSimplify.cpp \
-	LoopUnroll.cpp \
-	LoopUnrollRuntime.cpp \
-	LoopUtils.cpp \
-	LoopVersioning.cpp \
-	LowerInvoke.cpp \
-	LowerSwitch.cpp \
-	Mem2Reg.cpp \
-	MemorySSA.cpp \
-	MetaRenamer.cpp \
-	ModuleUtils.cpp \
-	NameAnonFunctions.cpp \
-	PromoteMemoryToRegister.cpp \
-	SSAUpdater.cpp \
-	SanitizerStats.cpp \
-	SimplifyCFG.cpp \
-	SimplifyIndVar.cpp \
-	SimplifyInstructions.cpp \
-	SimplifyLibCalls.cpp \
-	SplitModule.cpp \
-	SymbolRewriter.cpp \
-	UnifyFunctionExitNodes.cpp \
-	ValueMapper.cpp
-
-.if ${MK_CLANG_EXTRAS} != "no"
-SRCS+=	Utils.cpp
-.endif
-
-TGHDRS=	Attributes \
-	Intrinsics
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmtransformutils/Makefile.depend b/lib/clang/libllvmtransformutils/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvmtransformutils/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmvectorize/Makefile b/lib/clang/libllvmvectorize/Makefile
deleted file mode 100644
index a2ad9f5b45c6..000000000000
--- a/lib/clang/libllvmvectorize/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $FreeBSD$
-
-.include <src.opts.mk>
-
-LIB=	llvmvectorize
-
-SRCDIR=	lib/Transforms/Vectorize
-SRCS=	BBVectorize.cpp \
-	LoadStoreVectorizer.cpp \
-	LoopVectorize.cpp \
-	SLPVectorizer.cpp
-
-.if ${MK_CLANG_EXTRAS} != "no"
-SRCS+=	Vectorize.cpp
-.endif
-
-TGHDRS=	Attributes \
-	Intrinsics
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmvectorize/Makefile.depend b/lib/clang/libllvmvectorize/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvmvectorize/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmx86asmparser/Makefile b/lib/clang/libllvmx86asmparser/Makefile
deleted file mode 100644
index f972065f1236..000000000000
--- a/lib/clang/libllvmx86asmparser/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	llvmx86asmparser
-
-SRCDIR=	lib/Target/X86/AsmParser
-INCDIR=	lib/Target/X86
-SRCS=	X86AsmInstrumentation.cpp \
-	X86AsmParser.cpp
-
-TGHDRS=	X86GenAsmMatcher \
-	X86GenInstrInfo \
-	X86GenRegisterInfo \
-	X86GenSubtargetInfo
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmx86asmparser/Makefile.depend b/lib/clang/libllvmx86asmparser/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvmx86asmparser/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmx86asmprinter/Makefile b/lib/clang/libllvmx86asmprinter/Makefile
deleted file mode 100644
index aa4d31b59a65..000000000000
--- a/lib/clang/libllvmx86asmprinter/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	llvmx86asmprinter
-
-SRCDIR=	lib/Target/X86/InstPrinter
-INCDIR=	lib/Target/X86
-SRCS=	X86ATTInstPrinter.cpp \
-	X86InstComments.cpp \
-	X86IntelInstPrinter.cpp
-
-TGHDRS=	X86GenAsmWriter \
-	X86GenAsmWriter1 \
-	X86GenInstrInfo \
-	X86GenRegisterInfo \
-	X86GenSubtargetInfo
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmx86asmprinter/Makefile.depend b/lib/clang/libllvmx86asmprinter/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvmx86asmprinter/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmx86codegen/Makefile b/lib/clang/libllvmx86codegen/Makefile
deleted file mode 100644
index 47031318cdff..000000000000
--- a/lib/clang/libllvmx86codegen/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	llvmx86codegen
-
-SRCDIR=	lib/Target/X86
-SRCS=	X86AsmPrinter.cpp \
-	X86CallFrameOptimization.cpp \
-	X86ExpandPseudo.cpp \
-	X86FastISel.cpp \
-	X86FixupBWInsts.cpp \
-	X86FixupLEAs.cpp \
-	X86FixupSetCC.cpp \
-	X86FloatingPoint.cpp \
-	X86FrameLowering.cpp \
-	X86ISelDAGToDAG.cpp \
-	X86ISelLowering.cpp \
-	X86InstrInfo.cpp \
-	X86MCInstLower.cpp \
-	X86MachineFunctionInfo.cpp \
-	X86OptimizeLEAs.cpp \
-	X86PadShortFunction.cpp \
-	X86RegisterInfo.cpp \
-	X86SelectionDAGInfo.cpp \
-	X86ShuffleDecodeConstantPool.cpp \
-	X86Subtarget.cpp \
-	X86TargetMachine.cpp \
-	X86TargetObjectFile.cpp \
-	X86TargetTransformInfo.cpp \
-	X86VZeroUpper.cpp \
-	X86WinAllocaExpander.cpp \
-	X86WinEHState.cpp
-
-TGHDRS=	Attributes \
-	Intrinsics \
-	X86GenCallingConv \
-	X86GenDAGISel \
-	X86GenFastISel \
-	X86GenInstrInfo \
-	X86GenRegisterInfo \
-	X86GenSubtargetInfo
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmx86codegen/Makefile.depend b/lib/clang/libllvmx86codegen/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvmx86codegen/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmx86desc/Makefile b/lib/clang/libllvmx86desc/Makefile
deleted file mode 100644
index e6d54bb2f55e..000000000000
--- a/lib/clang/libllvmx86desc/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	llvmx86desc
-
-SRCDIR=	lib/Target/X86/MCTargetDesc
-SRCS=	X86AsmBackend.cpp \
-	X86ELFObjectWriter.cpp \
-	X86MCAsmInfo.cpp \
-	X86MCCodeEmitter.cpp \
-	X86MCTargetDesc.cpp \
-	X86MachObjectWriter.cpp \
-	X86WinCOFFObjectWriter.cpp \
-	X86WinCOFFStreamer.cpp
-CFLAGS+= -I${LLVM_SRCS}/${SRCDIR}/..
-
-TGHDRS=	X86GenInstrInfo \
-	X86GenRegisterInfo \
-	X86GenSubtargetInfo
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmx86desc/Makefile.depend b/lib/clang/libllvmx86desc/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvmx86desc/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmx86disassembler/Makefile b/lib/clang/libllvmx86disassembler/Makefile
deleted file mode 100644
index 5470d9f09794..000000000000
--- a/lib/clang/libllvmx86disassembler/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $FreeBSD$
-
-.include <src.opts.mk>
-
-LIB=	llvmx86disassembler
-
-SRCDIR=	lib/Target/X86/Disassembler
-INCDIR=	lib/Target/X86
-SRCS=	X86Disassembler.cpp \
-	X86DisassemblerDecoder.cpp
-
-TGHDRS=	X86GenDisassemblerTables \
-	X86GenInstrInfo \
-	X86GenRegisterInfo \
-	X86GenSubtargetInfo
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmx86disassembler/Makefile.depend b/lib/clang/libllvmx86disassembler/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvmx86disassembler/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmx86info/Makefile b/lib/clang/libllvmx86info/Makefile
deleted file mode 100644
index bc1a7d7efbda..000000000000
--- a/lib/clang/libllvmx86info/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	llvmx86info
-
-SRCDIR=	lib/Target/X86/TargetInfo
-INCDIR=	lib/Target/X86
-SRCS=	X86TargetInfo.cpp
-
-TGHDRS=	X86GenInstrInfo \
-	X86GenRegisterInfo \
-	X86GenSubtargetInfo
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmx86info/Makefile.depend b/lib/clang/libllvmx86info/Makefile.depend
deleted file mode 100644
index 00c24e795655..000000000000
--- a/lib/clang/libllvmx86info/Makefile.depend
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/libllvmx86utils/Makefile b/lib/clang/libllvmx86utils/Makefile
deleted file mode 100644
index 8355e7e7ccf9..000000000000
--- a/lib/clang/libllvmx86utils/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIB=	llvmx86utils
-
-SRCDIR=	lib/Target/X86/Utils
-INCDIR=	lib/Target/X86
-SRCS=	X86ShuffleDecode.cpp
-
-.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmx86utils/Makefile.depend b/lib/clang/libllvmx86utils/Makefile.depend
deleted file mode 100644
index 3e7f3f5e7165..000000000000
--- a/lib/clang/libllvmx86utils/Makefile.depend
+++ /dev/null
@@ -1,15 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-	lib/libc++ \
-	lib/msun \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/clang/lldb.lib.mk b/lib/clang/lldb.lib.mk
deleted file mode 100644
index d8dc024332c3..000000000000
--- a/lib/clang/lldb.lib.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-# $FreeBSD$
-
-LLDB_SRCS= ${.CURDIR}/../../../contrib/llvm/tools/lldb
-
-CFLAGS+=-I${LLDB_SRCS}/include -I${LLDB_SRCS}/source
-CXXFLAGS+=-std=c++11 -DLLDB_DISABLE_PYTHON                      
-
-.include "clang.lib.mk"
diff --git a/lib/clang/llvm.build.mk b/lib/clang/llvm.build.mk
new file mode 100644
index 000000000000..f3e7f93547d1
--- /dev/null
+++ b/lib/clang/llvm.build.mk
@@ -0,0 +1,50 @@
+# $FreeBSD$
+
+.ifndef LLVM_SRCS
+.error Please define LLVM_SRCS before including this file
+.endif
+
+.ifndef SRCDIR
+.error Please define SRCDIR before including this file
+.endif
+
+.PATH:		${LLVM_SRCS}/${SRCDIR}
+
+CFLAGS+=	-I${.CURDIR}/../../../lib/clang/include
+CFLAGS+=	-I${LLVM_SRCS}/include
+CFLAGS+=	-DLLVM_ON_UNIX
+CFLAGS+=	-DLLVM_ON_FREEBSD
+CFLAGS+=	-D__STDC_LIMIT_MACROS
+CFLAGS+=	-D__STDC_CONSTANT_MACROS
+#CFLAGS+=	-DNDEBUG
+
+TARGET_ARCH?=	${MACHINE_ARCH}
+BUILD_ARCH?=	${MACHINE_ARCH}
+
+# Armv6 uses hard float abi, unless the CPUTYPE has soft in it.
+# arm (for armv4 and armv5 CPUs) always uses the soft float ABI.
+# For all other targets, we stick with 'unknown'.
+.if ${TARGET_ARCH:Marmv6*} && (!defined(CPUTYPE) || ${CPUTYPE:M*soft*} == "")
+TARGET_ABI=	gnueabihf
+.elif ${TARGET_ARCH:Marm*}
+TARGET_ABI=	gnueabi
+.else
+TARGET_ABI=	unknown
+.endif
+OS_VERSION=	freebsd12.0
+
+TARGET_TRIPLE?=	${TARGET_ARCH:C/amd64/x86_64/:C/arm64/aarch64/}-${TARGET_ABI}-${OS_VERSION}
+BUILD_TRIPLE?=	${BUILD_ARCH:C/amd64/x86_64/:C/arm64/aarch64/}-unknown-${OS_VERSION}
+
+CFLAGS+=	-DLLVM_DEFAULT_TARGET_TRIPLE=\"${TARGET_TRIPLE}\"
+CFLAGS+=	-DLLVM_HOST_TRIPLE=\"${BUILD_TRIPLE}\"
+CFLAGS+=	-DDEFAULT_SYSROOT=\"${TOOLS_PREFIX}\"
+
+CXXFLAGS+=	-std=c++11
+CXXFLAGS+=	-fno-exceptions
+CXXFLAGS+=	-fno-rtti
+CXXFLAGS.clang+= -stdlib=libc++
+
+.if ${MACHINE_CPUARCH} == "arm"
+STATIC_CXXFLAGS+= -mlong-calls
+.endif
diff --git a/usr.bin/clang/Makefile b/usr.bin/clang/Makefile
index 5d4c514baa8f..d560a8a08c68 100644
--- a/usr.bin/clang/Makefile
+++ b/usr.bin/clang/Makefile
@@ -2,38 +2,40 @@
 
 .include <src.opts.mk>
 
-SUBDIR=	clang clang-tblgen llvm-tblgen
+SUBDIR+=	clang
+SUBDIR+=	clang-tblgen
+SUBDIR+=	llvm-tblgen
 
 .if !defined(TOOLS_PREFIX)
 .if ${MK_CLANG_EXTRAS} != "no"
-SUBDIR+=bugpoint \
-	clang-format \
-	llc \
-	lli \
-	llvm-ar \
-	llvm-as \
-	llvm-bcanalyzer \
-	llvm-cov \
-	llvm-cxxdump \
-	llvm-diff \
-	llvm-dis \
-	llvm-dwarfdump \
-	llvm-extract \
-	llvm-link \
-	llvm-lto \
-	llvm-mc \
-	llvm-nm \
-	llvm-objdump \
-	llvm-pdbdump \
-	llvm-profdata \
-	llvm-rtdyld \
-	llvm-symbolizer \
-	opt
+SUBDIR+=	bugpoint
+SUBDIR+=	clang-format
+SUBDIR+=	llc
+SUBDIR+=	lli
+SUBDIR+=	llvm-ar
+SUBDIR+=	llvm-as
+SUBDIR+=	llvm-bcanalyzer
+SUBDIR+=	llvm-cov
+SUBDIR+=	llvm-cxxdump
+SUBDIR+=	llvm-diff
+SUBDIR+=	llvm-dis
+SUBDIR+=	llvm-dwarfdump
+SUBDIR+=	llvm-extract
+SUBDIR+=	llvm-link
+SUBDIR+=	llvm-lto
+SUBDIR+=	llvm-mc
+SUBDIR+=	llvm-nm
+SUBDIR+=	llvm-objdump
+SUBDIR+=	llvm-pdbdump
+SUBDIR+=	llvm-profdata
+SUBDIR+=	llvm-rtdyld
+SUBDIR+=	llvm-symbolizer
+SUBDIR+=	opt
 .endif
 
 .if ${MK_LLDB} != "no"
-SUBDIR+=lldb
-.endif
+SUBDIR+=	lldb
+.endif # MK_LLDB
 .endif # TOOLS_PREFIX
 
 SUBDIR_PARALLEL=
diff --git a/usr.bin/clang/Makefile.inc b/usr.bin/clang/Makefile.inc
new file mode 100644
index 000000000000..265f86d1ed55
--- /dev/null
+++ b/usr.bin/clang/Makefile.inc
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+.include "../Makefile.inc"
diff --git a/usr.bin/clang/bugpoint/Makefile b/usr.bin/clang/bugpoint/Makefile
index ebe81473f616..2f0cb9eb417f 100644
--- a/usr.bin/clang/bugpoint/Makefile
+++ b/usr.bin/clang/bugpoint/Makefile
@@ -1,45 +1,18 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+PROG_CXX=	bugpoint
 
-PROG_CXX=bugpoint
-
-SRCDIR=	tools/bugpoint
-SRCS=	BugDriver.cpp \
-	CrashDebugger.cpp \
-	ExecutionDriver.cpp \
-	ExtractFunction.cpp \
-	FindBugs.cpp \
-	Miscompilation.cpp \
-	OptimizerDriver.cpp \
-	ToolRunner.cpp \
-	bugpoint.cpp
-
-TGHDRS=	Attributes \
-	Intrinsics
-
-LIBDEPS=llvmcodegen \
-	llvmipo \
-	llvmirreader \
-	llvminstrumentation \
-	llvmlinker \
-	llvmobjcarcopts \
-	llvmscalaropts \
-	llvmtarget \
-	llvmvectorize \
-	llvmbitwriter \
-	llvmasmparser \
-	llvminstcombine \
-	llvmobject \
-	llvmbitreader \
-	llvmmcparser \
-	llvmmc \
-	llvmtransformutils \
-	llvmanalysis \
-	llvmprofiledata \
-	llvmcore \
-	llvmsupport
+SRCDIR=		tools/bugpoint
+SRCS+=		BugDriver.cpp
+SRCS+=		CrashDebugger.cpp
+SRCS+=		ExecutionDriver.cpp
+SRCS+=		ExtractFunction.cpp
+SRCS+=		FindBugs.cpp
+SRCS+=		Miscompilation.cpp
+SRCS+=		OptimizerDriver.cpp
+SRCS+=		ToolRunner.cpp
+SRCS+=		bugpoint.cpp
 
 LIBADD+=	z
 
-.include "../clang.prog.mk"
+.include "../llvm.prog.mk"
diff --git a/usr.bin/clang/bugpoint/Makefile.depend b/usr.bin/clang/bugpoint/Makefile.depend
deleted file mode 100644
index 00803ce5994f..000000000000
--- a/usr.bin/clang/bugpoint/Makefile.depend
+++ /dev/null
@@ -1,45 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	gnu/lib/csu \
-	gnu/lib/libgcc \
-	include \
-	include/xlocale \
-	lib/${CSU_DIR} \
-	lib/clang/libllvmanalysis \
-	lib/clang/libllvmasmparser \
-	lib/clang/libllvmbitreader \
-	lib/clang/libllvmbitwriter \
-	lib/clang/libllvmcodegen \
-	lib/clang/libllvmcore \
-	lib/clang/libllvminstcombine \
-	lib/clang/libllvminstrumentation \
-	lib/clang/libllvmipo \
-	lib/clang/libllvmirreader \
-	lib/clang/libllvmlinker \
-	lib/clang/libllvmmc \
-	lib/clang/libllvmmcparser \
-	lib/clang/libllvmobjcarcopts \
-	lib/clang/libllvmobject \
-	lib/clang/libllvmprofiledata \
-	lib/clang/libllvmscalaropts \
-	lib/clang/libllvmsupport \
-	lib/clang/libllvmtarget \
-	lib/clang/libllvmtransformutils \
-	lib/clang/libllvmvectorize \
-	lib/libc \
-	lib/libc++ \
-	lib/libcompiler_rt \
-	lib/libthr \
-	lib/libz \
-	lib/msun \
-	lib/ncurses/ncursesw \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/usr.bin/clang/clang-format/Makefile b/usr.bin/clang/clang-format/Makefile
index 58213ae6bbca..ddcc89ab497d 100644
--- a/usr.bin/clang/clang-format/Makefile
+++ b/usr.bin/clang/clang-format/Makefile
@@ -1,23 +1,9 @@
 # $FreeBSD$
 
+PROG_CXX=	clang-format
 MAN=
-.include <bsd.own.mk>
 
-PROG_CXX=clang-format
-
-SRCDIR=	tools/clang/tools/clang-format
-SRCS=	ClangFormat.cpp
-
-LIBDEPS=clangformat \
-	clangtoolingcore \
-	clangrewrite \
-	clangast \
-	clanglex \
-	clangbasic \
-	llvmcore \
-	llvmmc \
-	llvmsupport
-
-TGHDRS=	DiagnosticCommonKinds
+SRCDIR=		tools/clang/tools/clang-format
+SRCS+=		ClangFormat.cpp
 
 .include "../clang.prog.mk"
diff --git a/usr.bin/clang/clang-format/Makefile.depend b/usr.bin/clang/clang-format/Makefile.depend
deleted file mode 100644
index 6c4e251a3e77..000000000000
--- a/usr.bin/clang/clang-format/Makefile.depend
+++ /dev/null
@@ -1,32 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	gnu/lib/csu \
-	gnu/lib/libgcc \
-	include \
-	include/xlocale \
-	lib/${CSU_DIR} \
-	lib/clang/libclangast \
-	lib/clang/libclangbasic \
-	lib/clang/libclangformat \
-	lib/clang/libclanglex \
-	lib/clang/libclangrewrite \
-	lib/clang/libclangtoolingcore \
-	lib/clang/libllvmcore \
-	lib/clang/libllvmmc \
-	lib/clang/libllvmsupport \
-	lib/libc \
-	lib/libc++ \
-	lib/libcompiler_rt \
-	lib/libthr \
-	lib/msun \
-	lib/ncurses/ncursesw \
-	usr.bin/clang/clang-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/usr.bin/clang/clang-tblgen/Makefile b/usr.bin/clang/clang-tblgen/Makefile
index 0f64ad373789..8d6df0822656 100644
--- a/usr.bin/clang/clang-tblgen/Makefile
+++ b/usr.bin/clang/clang-tblgen/Makefile
@@ -1,22 +1,17 @@
 # $FreeBSD$
 
+PROG_CXX=	clang-tblgen
 MAN=
-.include <bsd.own.mk>
 
-PROG_CXX=clang-tblgen
+SRCDIR=		tools/clang/utils/TableGen
+SRCS+=		ClangASTNodesEmitter.cpp
+SRCS+=		ClangAttrEmitter.cpp
+SRCS+=		ClangCommentCommandInfoEmitter.cpp
+SRCS+=		ClangCommentHTMLNamedCharacterReferenceEmitter.cpp
+SRCS+=		ClangCommentHTMLTagsEmitter.cpp
+SRCS+=		ClangDiagnosticsEmitter.cpp
+SRCS+=		ClangSACheckersEmitter.cpp
+SRCS+=		NeonEmitter.cpp
+SRCS+=		TableGen.cpp
 
-SRCDIR=	tools/clang/utils/TableGen
-SRCS=	ClangASTNodesEmitter.cpp \
-	ClangAttrEmitter.cpp \
-	ClangCommentCommandInfoEmitter.cpp \
-	ClangCommentHTMLNamedCharacterReferenceEmitter.cpp \
-	ClangCommentHTMLTagsEmitter.cpp \
-	ClangDiagnosticsEmitter.cpp \
-	ClangSACheckersEmitter.cpp \
-	NeonEmitter.cpp \
-	TableGen.cpp
-
-LIBDEPS=llvmtablegen \
-	llvmsupport
-
-.include "../clang.prog.mk"
+.include "../llvm.prog.mk"
diff --git a/usr.bin/clang/clang-tblgen/Makefile.depend b/usr.bin/clang/clang-tblgen/Makefile.depend
deleted file mode 100644
index 58ed9a748cc7..000000000000
--- a/usr.bin/clang/clang-tblgen/Makefile.depend
+++ /dev/null
@@ -1,24 +0,0 @@
-# $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/libthr \
-	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 b1dd7c184a5a..231c5cdd897a 100644
--- a/usr.bin/clang/clang.prog.mk
+++ b/usr.bin/clang/clang.prog.mk
@@ -1,23 +1,22 @@
 # $FreeBSD$
 
-LLVM_SRCS= ${.CURDIR}/../../../contrib/llvm
+LLVM_SRCS=	${.CURDIR}/../../../contrib/llvm
+CLANG_SRCS=	${LLVM_SRCS}/tools/clang
 
-.include "../../lib/clang/clang.build.mk"
+CFLAGS+=	-I${.OBJDIR}/../../../lib/clang/libclang
+CFLAGS+=	-I${.OBJDIR}/../../../lib/clang/libllvm
 
-.for lib in ${LIBDEPS}
-DPADD+=	${.OBJDIR}/../../../lib/clang/lib${lib}/lib${lib}.a
-LDADD+=	${.OBJDIR}/../../../lib/clang/lib${lib}/lib${lib}.a
-.endfor
-
-PACKAGE=	clang
+.include "${.CURDIR}/../../../lib/clang/clang.build.mk"
 
-LIBADD+= ncursesw pthread
-
-BINDIR?= /usr/bin
+LIBDEPS+=	clang
+LIBDEPS+=	llvm
 
+.for lib in ${LIBDEPS}
+DPADD+=		${.OBJDIR}/../../../lib/clang/lib${lib}/lib${lib}.a
+LDADD+=		${.OBJDIR}/../../../lib/clang/lib${lib}/lib${lib}.a
+.endfor
 
-.if ${MK_SHARED_TOOLCHAIN} == "no"
-NO_SHARED= yes
-.endif
+LIBADD+=	ncursesw
+LIBADD+=	pthread
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/clang/clang/Makefile b/usr.bin/clang/clang/Makefile
index 832ef3491df2..b32f6649cb19 100644
--- a/usr.bin/clang/clang/Makefile
+++ b/usr.bin/clang/clang/Makefile
@@ -2,12 +2,12 @@
 
 .include <src.opts.mk>
 
-PROG_CXX=clang
+PROG_CXX=	clang
 
-SRCDIR=	tools/clang/tools/driver
-SRCS=	cc1_main.cpp \
-	cc1as_main.cpp \
-	driver.cpp
+SRCDIR=		tools/clang/tools/driver
+SRCS+=		cc1_main.cpp
+SRCS+=		cc1as_main.cpp
+SRCS+=		driver.cpp
 
 .if ${MK_SHARED_TOOLCHAIN} == "no"
 NO_SHARED?= yes
@@ -34,104 +34,6 @@ MLINKS+= clang.1 cc.1 \
 	clang.1 cpp.1
 .endif
 
-TGHDRS=	Attributes \
-	Intrinsics \
-	DiagnosticCommonKinds \
-	DiagnosticDriverKinds \
-	DiagnosticFrontendKinds \
-	DiagnosticLexKinds \
-	DiagnosticSemaKinds \
-	Options
-
-.if ${MK_CLANG_FULL} != "no"
-_clangarcmigrate=		clangarcmigrate
-_clangstaticanalyzerfrontend=	clangstaticanalyzerfrontend
-_clangstaticanalyzercheckers=	clangstaticanalyzercheckers
-_clangstaticanalyzercore=	clangstaticanalyzercore
-.endif # MK_CLANG_FULL
-
-LIBDEPS=llvmaarch64codegen \
-	llvmaarch64asmparser \
-	llvmaarch64disassembler \
-	llvmarmcodegen \
-	llvmarmasmparser \
-	llvmarmdisassembler \
-	llvmmipscodegen \
-	llvmmipsasmparser \
-	llvmmipsdesc \
-	llvmpowerpccodegen \
-	llvmpowerpcasmparser \
-	llvmpowerpcdesc \
-	llvmpowerpcdisassembler \
-	llvmsparccodegen \
-	llvmsparcasmparser \
-	llvmsparcdesc \
-	llvmx86codegen \
-	llvmx86asmparser \
-	llvmx86desc \
-	clangfrontendtool \
-	llvmglobalisel \
-	llvmaarch64desc \
-	llvmaarch64asmprinter \
-	llvmaarch64info \
-	llvmaarch64utils \
-	llvmarmdesc \
-	llvmarmasmprinter \
-	llvmarminfo \
-	llvmmipsasmprinter \
-	llvmmipsinfo \
-	llvmpowerpcasmprinter \
-	llvmpowerpcinfo \
-	llvmsparcasmprinter \
-	llvmsparcinfo \
-	llvmasmprinter \
-	llvmdebuginfocodeview \
-	llvmselectiondag \
-	llvmcodegen \
-	llvmx86asmprinter \
-	llvmx86utils \
-	llvmx86info \
-	llvmmcdisassembler \
-	clangcodegen \
-	llvmipo \
-	llvmvectorize \
-	llvminstrumentation \
-	llvmobjcarcopts \
-	llvmscalaropts \
-	llvminstcombine \
-	llvmtarget \
-	llvmbitwriter \
-	llvmirreader \
-	llvmasmparser \
-	llvmlinker \
-	llvmtransformutils \
-	llvmanalysis \
-	llvmcoverage \
-	llvmobject \
-	clangrewritefrontend \
-	${_clangarcmigrate} \
-	${_clangstaticanalyzerfrontend} \
-	clangfrontend \
-	clangdriver \
-	llvmoption \
-	llvmprofiledata \
-	clangparse \
-	llvmmcparser \
-	clangserialization \
-	llvmbitreader \
-	clangsema \
-	clangedit \
-	${_clangstaticanalyzercheckers} \
-	${_clangstaticanalyzercore} \
-	clanganalysis \
-	clangast \
-	clangrewrite \
-	clanglex \
-	clangbasic \
-	llvmcore \
-	llvmmc \
-	llvmsupport
-
 LIBADD+=	z
 
 .include "../clang.prog.mk"
diff --git a/usr.bin/clang/clang/Makefile.depend b/usr.bin/clang/clang/Makefile.depend
deleted file mode 100644
index eea6f096a115..000000000000
--- a/usr.bin/clang/clang/Makefile.depend
+++ /dev/null
@@ -1,100 +0,0 @@
-# $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/libllvmaarch64asmprinter \
-	lib/clang/libllvmaarch64codegen \
-	lib/clang/libllvmaarch64desc \
-	lib/clang/libllvmaarch64info \
-	lib/clang/libllvmaarch64utils \
-	lib/clang/libllvmanalysis \
-	lib/clang/libllvmarmasmparser \
-	lib/clang/libllvmarmasmprinter \
-	lib/clang/libllvmarmcodegen \
-	lib/clang/libllvmarmdesc \
-	lib/clang/libllvmarminfo \
-	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/libllvmipo \
-	lib/clang/libllvmirreader \
-	lib/clang/libllvmlinker \
-	lib/clang/libllvmmc \
-	lib/clang/libllvmmcdisassembler \
-	lib/clang/libllvmmcparser \
-	lib/clang/libllvmmipsasmparser \
-	lib/clang/libllvmmipsasmprinter \
-	lib/clang/libllvmmipscodegen \
-	lib/clang/libllvmmipsdesc \
-	lib/clang/libllvmmipsinfo \
-	lib/clang/libllvmobjcarcopts \
-	lib/clang/libllvmobject \
-	lib/clang/libllvmoption \
-	lib/clang/libllvmpowerpcasmparser \
-	lib/clang/libllvmpowerpcasmprinter \
-	lib/clang/libllvmpowerpccodegen \
-	lib/clang/libllvmpowerpcdesc \
-	lib/clang/libllvmpowerpcinfo \
-	lib/clang/libllvmprofiledata \
-	lib/clang/libllvmscalaropts \
-	lib/clang/libllvmselectiondag \
-	lib/clang/libllvmsparcasmparser \
-	lib/clang/libllvmsparcasmprinter \
-	lib/clang/libllvmsparccodegen \
-	lib/clang/libllvmsparcdesc \
-	lib/clang/libllvmsparcinfo \
-	lib/clang/libllvmsupport \
-	lib/clang/libllvmtarget \
-	lib/clang/libllvmtransformutils \
-	lib/clang/libllvmvectorize \
-	lib/clang/libllvmx86asmparser \
-	lib/clang/libllvmx86asmprinter \
-	lib/clang/libllvmx86codegen \
-	lib/clang/libllvmx86desc \
-	lib/clang/libllvmx86info \
-	lib/clang/libllvmx86utils \
-	lib/libc \
-	lib/libc++ \
-	lib/libcompiler_rt \
-	lib/libthr \
-	lib/libz \
-	lib/msun \
-	lib/ncurses/ncursesw \
-	usr.bin/clang/clang-tblgen.host \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/usr.bin/clang/llc/Makefile b/usr.bin/clang/llc/Makefile
index 4fb6b913c74a..0855f3b0ee25 100644
--- a/usr.bin/clang/llc/Makefile
+++ b/usr.bin/clang/llc/Makefile
@@ -1,77 +1,10 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+PROG_CXX=	llc
 
-PROG_CXX=llc
-
-SRCDIR=	tools/llc
-SRCS=	llc.cpp
-
-TGHDRS=	Attributes \
-	Intrinsics
-
-LIBDEPS=llvmaarch64codegen \
-	llvmaarch64asmparser \
-	llvmaarch64disassembler \
-	llvmarmcodegen \
-	llvmarmasmparser \
-	llvmarmdisassembler \
-	llvmmipscodegen \
-	llvmmipsasmparser \
-	llvmmipsdesc \
-	llvmmipsdisassembler \
-	llvmpowerpccodegen \
-	llvmpowerpcasmparser \
-	llvmpowerpcdesc \
-	llvmpowerpcdisassembler \
-	llvmsparccodegen \
-	llvmsparcasmparser \
-	llvmsparcdesc \
-	llvmsparcdisassembler \
-	llvmx86codegen \
-	llvmx86asmparser \
-	llvmx86desc \
-	llvmx86disassembler \
-	llvmasmprinter \
-	llvmirreader \
-	llvmmirparser \
-	llvmselectiondag \
-	llvmglobalisel \
-	llvmaarch64desc \
-	llvmaarch64asmprinter \
-	llvmaarch64info \
-	llvmaarch64utils \
-	llvmarmdesc \
-	llvmarmasmprinter \
-	llvmarminfo \
-	llvmmipsasmprinter \
-	llvmmipsinfo \
-	llvmpowerpcasmprinter \
-	llvmpowerpcinfo \
-	llvmsparcasmprinter \
-	llvmsparcinfo \
-	llvmdebuginfocodeview \
-	llvmx86asmprinter \
-	llvmx86utils \
-	llvmobject \
-	llvmmcparser \
-	llvmx86info \
-	llvmmcdisassembler \
-	llvmcodegen \
-	llvmscalaropts \
-	llvminstcombine \
-	llvmbitreader \
-	llvmbitwriter \
-	llvminstrumentation \
-	llvmtransformutils \
-	llvmtarget \
-	llvmanalysis \
-	llvmprofiledata \
-	llvmmc \
-	llvmasmparser \
-	llvmcore \
-	llvmsupport
+SRCDIR=		tools/llc
+SRCS+=		llc.cpp
 
 LIBADD+=	z
 
-.include "../clang.prog.mk"
+.include "../llvm.prog.mk"
diff --git a/usr.bin/clang/llc/Makefile.depend b/usr.bin/clang/llc/Makefile.depend
deleted file mode 100644
index 374f8711669d..000000000000
--- a/usr.bin/clang/llc/Makefile.depend
+++ /dev/null
@@ -1,83 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	gnu/lib/csu \
-	gnu/lib/libgcc \
-	include \
-	include/xlocale \
-	lib/${CSU_DIR} \
-	lib/clang/libllvmaarch64asmparser \
-	lib/clang/libllvmaarch64asmprinter \
-	lib/clang/libllvmaarch64codegen \
-	lib/clang/libllvmaarch64desc \
-	lib/clang/libllvmaarch64disassembler \
-	lib/clang/libllvmaarch64info \
-	lib/clang/libllvmaarch64utils \
-	lib/clang/libllvmanalysis \
-	lib/clang/libllvmarmasmparser \
-	lib/clang/libllvmarmasmprinter \
-	lib/clang/libllvmarmcodegen \
-	lib/clang/libllvmarmdesc \
-	lib/clang/libllvmarmdisassembler \
-	lib/clang/libllvmarminfo \
-	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/libllvmirreader \
-	lib/clang/libllvmmc \
-	lib/clang/libllvmmcdisassembler \
-	lib/clang/libllvmmcparser \
-	lib/clang/libllvmmipsasmparser \
-	lib/clang/libllvmmipsasmprinter \
-	lib/clang/libllvmmipscodegen \
-	lib/clang/libllvmmipsdesc \
-	lib/clang/libllvmmipsdisassembler \
-	lib/clang/libllvmmipsinfo \
-	lib/clang/libllvmmirparser \
-	lib/clang/libllvmobject \
-	lib/clang/libllvmpowerpcasmparser \
-	lib/clang/libllvmpowerpcasmprinter \
-	lib/clang/libllvmpowerpccodegen \
-	lib/clang/libllvmpowerpcdesc \
-	lib/clang/libllvmpowerpcdisassembler \
-	lib/clang/libllvmpowerpcinfo \
-	lib/clang/libllvmprofiledata \
-	lib/clang/libllvmscalaropts \
-	lib/clang/libllvmselectiondag \
-	lib/clang/libllvmsparcasmparser \
-	lib/clang/libllvmsparcasmprinter \
-	lib/clang/libllvmsparccodegen \
-	lib/clang/libllvmsparcdesc \
-	lib/clang/libllvmsparcdisassembler \
-	lib/clang/libllvmsparcinfo \
-	lib/clang/libllvmsupport \
-	lib/clang/libllvmtarget \
-	lib/clang/libllvmtransformutils \
-	lib/clang/libllvmx86asmparser \
-	lib/clang/libllvmx86asmprinter \
-	lib/clang/libllvmx86codegen \
-	lib/clang/libllvmx86desc \
-	lib/clang/libllvmx86disassembler \
-	lib/clang/libllvmx86info \
-	lib/clang/libllvmx86utils \
-	lib/libc \
-	lib/libc++ \
-	lib/libcompiler_rt \
-	lib/libthr \
-	lib/libz \
-	lib/msun \
-	lib/ncurses/ncursesw \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/usr.bin/clang/lldb/Makefile b/usr.bin/clang/lldb/Makefile
index 915600db115d..1c3603ddf098 100644
--- a/usr.bin/clang/lldb/Makefile
+++ b/usr.bin/clang/lldb/Makefile
@@ -1,178 +1,34 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+LLVM_SRCS=	${.CURDIR}/../../../contrib/llvm
+CLANG_SRCS=	${LLVM_SRCS}/tools/clang
+LLDB_SRCS=	${LLVM_SRCS}/tools/lldb
 
-PROG_CXX=lldb
-
-LLDB_SRCS=${.CURDIR}/../../../contrib/llvm/tools/lldb
+PROG_CXX=	lldb
+# Man page directory
+.PATH:		${LLDB_SRCS}/docs
 
 CFLAGS+=	-I${LLDB_SRCS}/include
-CXXFLAGS+=	-std=c++11
-.if ${MACHINE_CPUARCH} == "arm"
-CFLAGS+=	-mlong-calls
-.endif
 
-SRCDIR=	tools/lldb/tools/driver
-SRCS=	Driver.cpp \
-	Platform.cpp
+SRCDIR=		tools/lldb/tools/driver
+SRCS+=		Driver.cpp
+SRCS+=		Platform.cpp
 
-# Man page directory
-.PATH: ${LLDB_SRCS}/docs
+.include "${.CURDIR}/../../../lib/clang/clang.build.mk"
 
-LIBADD+=	edit panel ncursesw execinfo z
+LIBDEPS+=	lldb
+LIBDEPS+=	clang
+LIBDEPS+=	llvm
 
-LLDB_LIBS=\
-	lldb \
-	lldbAPI \
-	lldbBreakpoint \
-	lldbCommands \
-	lldbDataFormatters \
-	lldbHostCommon \
-	lldbHostFreeBSD \
-	lldbHostPOSIX \
-	lldbCore \
-	lldbExpression \
-	lldbInitialization \
-	lldbInterpreter \
-	lldbSymbol \
-	lldbTarget \
-	lldbUtility \
-	\
-	lldbPluginDisassemblerLLVM \
-	lldbPluginSymbolFileDWARF \
-	lldbPluginSymbolFilePDB \
-	lldbPluginSymbolFileSymtab \
-	lldbPluginDynamicLoaderStatic \
-	lldbPluginDynamicLoaderPosixDYLD \
-	lldbPluginCPlusPlusLanguage \
-	lldbPluginObjCLanguage \
-	lldbPluginObjectFileELF \
-	lldbPluginObjectFileJIT \
-	lldbPluginSymbolVendorELF \
-	lldbPluginProcessGDBRemote \
-	lldbPluginProcessUtility \
-	lldbPluginPlatformGDB \
-	lldbPluginPlatformFreeBSD \
-	lldbPluginObjectContainerBSDArchive \
-	lldbPluginUnwindAssemblyInstEmulation \
-	lldbPluginUnwindAssemblyX86 \
-	lldbPluginCXXItaniumABI \
-	lldbPluginABISysV_arm \
-	lldbPluginABISysV_arm64 \
-	lldbPluginABISysV_i386 \
-	lldbPluginABISysV_x86_64 \
-	lldbPluginABISysV_ppc \
-	lldbPluginABISysV_ppc64 \
-	lldbPluginABISysV_mips \
-	lldbPluginABISysV_mips64 \
-	lldbPluginInstructionARM \
-	lldbPluginInstructionARM64 \
-	lldbPluginInstructionMIPS \
-	lldbPluginInstructionMIPS64 \
-	lldbPluginMemoryHistoryASan \
-	lldbPluginInstrumentationRuntimeAddressSanitizer \
-	lldbPluginProcessElfCore \
-	lldbPluginJITLoaderGDB \
-	lldbPluginExpressionParserClang \
-	lldbPluginExpressionParserGo \
-	lldbPluginProcessFreeBSD \
-	lldbPluginProcessPOSIX \
-	lldbPluginScriptInterpreterNone
-
-LDADD+=	-Wl,--start-group
-.for lib in ${LLDB_LIBS}
-DPADD+=	${.OBJDIR}/../../../lib/clang/lib${lib}/lib${lib}.a
-LDADD+=	${.OBJDIR}/../../../lib/clang/lib${lib}/lib${lib}.a
+.for lib in ${LIBDEPS}
+DPADD+=		${.OBJDIR}/../../../lib/clang/lib${lib}/lib${lib}.a
+LDADD+=		${.OBJDIR}/../../../lib/clang/lib${lib}/lib${lib}.a
 .endfor
-LDADD+=	-Wl,--end-group
-
-# Clang and LLVM libraries
-LIBDEPS=\
-	clangcodegen \
-	clangrewritefrontend \
-	llvmaarch64codegen \
-	llvmaarch64asmparser \
-	llvmaarch64disassembler \
-	llvmarmcodegen \
-	llvmarmasmparser \
-	llvmarmdisassembler \
-	llvmmipscodegen \
-	llvmmipsasmparser \
-	llvmmipsdesc \
-	llvmmipsdisassembler \
-	llvmpowerpccodegen \
-	llvmpowerpcasmparser \
-	llvmpowerpcdesc \
-	llvmpowerpcdisassembler \
-	llvmsparccodegen \
-	llvmsparcasmparser \
-	llvmsparcdesc \
-	llvmsparcdisassembler \
-	llvmx86codegen \
-	llvmx86asmparser \
-	llvmx86desc \
-	llvmx86disassembler \
-	llvminterpreter \
-	llvmipo \
-	llvmselectiondag \
-	llvmmcjit \
-	llvmexecutionengine \
-	llvmruntimedyld \
-	llvmcoverage \
-	llvmglobalisel \
-	llvmaarch64desc \
-	llvmaarch64asmprinter \
-	llvmaarch64info \
-	llvmaarch64utils \
-	llvmarmdesc \
-	llvmarmasmprinter \
-	llvmarminfo \
-	llvmmipsasmprinter \
-	llvmmipsinfo \
-	llvmpowerpcasmprinter \
-	llvmpowerpcinfo \
-	llvmsparcasmprinter \
-	llvmsparcinfo \
-	llvmasmprinter \
-	llvmx86asmprinter \
-	llvmx86utils \
-	llvmx86info \
-	llvmmcdisassembler \
-	llvmcodegen \
-	llvmdebuginfopdb \
-	llvmdebuginfocodeview \
-	llvmbitwriter \
-	llvmvectorize \
-	llvmscalaropts \
-	llvmtarget \
-	llvmobject \
-	llvminstrumentation \
-	llvmirreader \
-	llvmasmparser \
-	llvminstcombine \
-	llvmlinker \
-	llvmobjcarcopts \
-	llvmtransformutils \
-	llvmanalysis \
-	clangfrontend \
-	clangdriver \
-	llvmoption \
-	clangparse \
-	llvmmcparser \
-	clangserialization \
-	llvmbitreader \
-	clangsema \
-	clanganalysis \
-	clangedit \
-	clangast \
-	llvmprofiledata \
-	clangrewrite \
-	clanglex \
-	clangbasic \
-	llvmmc \
-	llvmcore \
-	llvmsupport
 
+LIBADD+=	edit
+LIBADD+=	panel
+LIBADD+=	ncursesw
 LIBADD+=	pthread
+LIBADD+=	z
 
-.include "../clang.prog.mk"
+.include <bsd.prog.mk>
diff --git a/usr.bin/clang/lldb/Makefile.depend b/usr.bin/clang/lldb/Makefile.depend
deleted file mode 100644
index acf1b8cea080..000000000000
--- a/usr.bin/clang/lldb/Makefile.depend
+++ /dev/null
@@ -1,159 +0,0 @@
-# $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/liblldbInitialization \
-	lib/clang/liblldbInterpreter \
-	lib/clang/liblldbPluginABISysV_arm \
-	lib/clang/liblldbPluginABISysV_arm64 \
-	lib/clang/liblldbPluginABISysV_i386 \
-	lib/clang/liblldbPluginABISysV_mips \
-	lib/clang/liblldbPluginABISysV_mips64 \
-	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/liblldbPluginExpressionParserClang \
-	lib/clang/liblldbPluginExpressionParserGo \
-	lib/clang/liblldbPluginInstructionARM \
-	lib/clang/liblldbPluginInstructionARM64 \
-	lib/clang/liblldbPluginInstructionMIPS \
-	lib/clang/liblldbPluginInstructionMIPS64 \
-	lib/clang/liblldbPluginInstrumentationRuntimeAddressSanitizer \
-	lib/clang/liblldbPluginJITLoaderGDB \
-	lib/clang/liblldbPluginLanguageCPlusPlus \
-	lib/clang/liblldbPluginLanguageObjC \
-	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/liblldbPluginScriptInterpreterNone \
-	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/libllvmaarch64asmprinter \
-	lib/clang/libllvmaarch64codegen \
-	lib/clang/libllvmaarch64desc \
-	lib/clang/libllvmaarch64disassembler \
-	lib/clang/libllvmaarch64info \
-	lib/clang/libllvmaarch64utils \
-	lib/clang/libllvmanalysis \
-	lib/clang/libllvmarmasmparser \
-	lib/clang/libllvmarmasmprinter \
-	lib/clang/libllvmarmcodegen \
-	lib/clang/libllvmarmdesc \
-	lib/clang/libllvmarmdisassembler \
-	lib/clang/libllvmarminfo \
-	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/libllvmipo \
-	lib/clang/libllvmirreader \
-	lib/clang/libllvmlinker \
-	lib/clang/libllvmmc \
-	lib/clang/libllvmmcdisassembler \
-	lib/clang/libllvmmcjit \
-	lib/clang/libllvmmcparser \
-	lib/clang/libllvmmipsasmparser \
-	lib/clang/libllvmmipsasmprinter \
-	lib/clang/libllvmmipscodegen \
-	lib/clang/libllvmmipsdesc \
-	lib/clang/libllvmmipsdisassembler \
-	lib/clang/libllvmmipsinfo \
-	lib/clang/libllvmobjcarcopts \
-	lib/clang/libllvmobject \
-	lib/clang/libllvmoption \
-	lib/clang/libllvmpowerpcasmparser \
-	lib/clang/libllvmpowerpcasmprinter \
-	lib/clang/libllvmpowerpccodegen \
-	lib/clang/libllvmpowerpcdesc \
-	lib/clang/libllvmpowerpcdisassembler \
-	lib/clang/libllvmpowerpcinfo \
-	lib/clang/libllvmprofiledata \
-	lib/clang/libllvmruntimedyld \
-	lib/clang/libllvmscalaropts \
-	lib/clang/libllvmselectiondag \
-	lib/clang/libllvmsparcasmparser \
-	lib/clang/libllvmsparcasmprinter \
-	lib/clang/libllvmsparccodegen \
-	lib/clang/libllvmsparcdesc \
-	lib/clang/libllvmsparcdisassembler \
-	lib/clang/libllvmsparcinfo \
-	lib/clang/libllvmsupport \
-	lib/clang/libllvmtarget \
-	lib/clang/libllvmtransformutils \
-	lib/clang/libllvmvectorize \
-	lib/clang/libllvmx86asmparser \
-	lib/clang/libllvmx86asmprinter \
-	lib/clang/libllvmx86codegen \
-	lib/clang/libllvmx86desc \
-	lib/clang/libllvmx86disassembler \
-	lib/clang/libllvmx86info \
-	lib/clang/libllvmx86utils \
-	lib/libc \
-	lib/libc++ \
-	lib/libcompiler_rt \
-	lib/libedit \
-	lib/libelf \
-	lib/libexecinfo \
-	lib/libthr \
-	lib/libz \
-	lib/msun \
-	lib/ncurses/ncurses \
-	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/lli/Makefile b/usr.bin/clang/lli/Makefile
index eacbf87e4e6c..ebe7a008279c 100644
--- a/usr.bin/clang/lli/Makefile
+++ b/usr.bin/clang/lli/Makefile
@@ -1,50 +1,11 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+PROG_CXX=	lli
 
-PROG_CXX=lli
-
-SRCDIR=	tools/lli
-SRCS=	OrcLazyJIT.cpp \
-	lli.cpp
-
-TGHDRS=	Attributes \
-	Intrinsics
-
-LIBDEPS=llvmirreader \
-	llvminterpreter \
-	llvmmcjit \
-	llvmorcjit \
-	llvmx86codegen \
-	llvmx86asmparser \
-	llvmx86desc \
-	llvmx86disassembler \
-	llvmasmparser \
-	llvmexecutionengine \
-	llvmruntimedyld \
-	llvmselectiondag \
-	llvmasmprinter \
-	llvmcodegen \
-	llvminstrumentation \
-	llvmbitwriter \
-	llvmscalaropts \
-	llvminstcombine \
-	llvmtarget \
-	llvmtransformutils \
-	llvmanalysis \
-	llvmprofiledata \
-	llvmdebuginfocodeview \
-	llvmobject \
-	llvmbitreader \
-	llvmx86asmprinter \
-	llvmx86utils \
-	llvmcore \
-	llvmmcparser \
-	llvmx86info \
-	llvmmcdisassembler \
-	llvmmc \
-	llvmsupport
+SRCDIR=		tools/lli
+SRCS+=		OrcLazyJIT.cpp
+SRCS+=		lli.cpp
 
 LIBADD+=	z
 
-.include "../clang.prog.mk"
+.include "../llvm.prog.mk"
diff --git a/usr.bin/clang/lli/Makefile.depend b/usr.bin/clang/lli/Makefile.depend
deleted file mode 100644
index 7ceb1a77c55d..000000000000
--- a/usr.bin/clang/lli/Makefile.depend
+++ /dev/null
@@ -1,56 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	gnu/lib/csu \
-	gnu/lib/libgcc \
-	include \
-	include/xlocale \
-	lib/${CSU_DIR} \
-	lib/clang/libllvmanalysis \
-	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/libllvminterpreter \
-	lib/clang/libllvmirreader \
-	lib/clang/libllvmmc \
-	lib/clang/libllvmmcdisassembler \
-	lib/clang/libllvmmcjit \
-	lib/clang/libllvmmcparser \
-	lib/clang/libllvmobject \
-	lib/clang/libllvmorcjit \
-	lib/clang/libllvmprofiledata \
-	lib/clang/libllvmruntimedyld \
-	lib/clang/libllvmscalaropts \
-	lib/clang/libllvmselectiondag \
-	lib/clang/libllvmsupport \
-	lib/clang/libllvmtarget \
-	lib/clang/libllvmtransformutils \
-	lib/clang/libllvmx86asmparser \
-	lib/clang/libllvmx86asmprinter \
-	lib/clang/libllvmx86codegen \
-	lib/clang/libllvmx86desc \
-	lib/clang/libllvmx86disassembler \
-	lib/clang/libllvmx86info \
-	lib/clang/libllvmx86utils \
-	lib/libc \
-	lib/libc++ \
-	lib/libcompiler_rt \
-	lib/libthr \
-	lib/libz \
-	lib/msun \
-	lib/ncurses/ncursesw \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/usr.bin/clang/llvm-ar/Makefile b/usr.bin/clang/llvm-ar/Makefile
index 0a67286ca3d5..546882127496 100644
--- a/usr.bin/clang/llvm-ar/Makefile
+++ b/usr.bin/clang/llvm-ar/Makefile
@@ -1,75 +1,10 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+PROG_CXX=	llvm-ar
 
-PROG_CXX=llvm-ar
-
-SRCDIR=	tools/llvm-ar
-SRCS=	llvm-ar.cpp
-
-TGHDRS=	Attributes
-
-LIBDEPS=llvmaarch64codegen \
-	llvmaarch64asmparser \
-	llvmaarch64disassembler \
-	llvmarmcodegen \
-	llvmarmasmparser \
-	llvmarmdisassembler \
-	llvmmipscodegen \
-	llvmmipsasmparser \
-	llvmmipsdesc \
-	llvmmipsdisassembler \
-	llvmpowerpccodegen \
-	llvmpowerpcasmparser \
-	llvmpowerpcdesc \
-	llvmpowerpcdisassembler \
-	llvmsparccodegen \
-	llvmsparcasmparser \
-	llvmsparcdesc \
-	llvmsparcdisassembler \
-	llvmx86codegen \
-	llvmx86asmparser \
-	llvmx86desc \
-	llvmx86disassembler \
-	llvmlibdriver \
-	llvmobject \
-	llvmglobalisel \
-	llvmaarch64desc \
-	llvmaarch64asmprinter \
-	llvmaarch64info \
-	llvmaarch64utils \
-	llvmarmdesc \
-	llvmarmasmprinter \
-	llvmarminfo \
-	llvmmipsasmprinter \
-	llvmmipsinfo \
-	llvmpowerpcasmprinter \
-	llvmpowerpcinfo \
-	llvmsparcasmprinter \
-	llvmsparcinfo \
-	llvmasmprinter \
-	llvmdebuginfocodeview \
-	llvmselectiondag \
-	llvmcodegen \
-	llvmscalaropts \
-	llvminstcombine \
-	llvmbitwriter \
-	llvminstrumentation \
-	llvmtransformutils \
-	llvmtarget \
-	llvmanalysis \
-	llvmprofiledata \
-	llvmx86asmprinter \
-	llvmx86utils \
-	llvmx86info \
-	llvmmcdisassembler \
-	llvmmcparser \
-	llvmmc \
-	llvmbitreader \
-	llvmcore \
-	llvmoption \
-	llvmsupport
+SRCDIR=		tools/llvm-ar
+SRCS+=		llvm-ar.cpp
 
 LIBADD+=	z
 
-.include "../clang.prog.mk"
+.include "../llvm.prog.mk"
diff --git a/usr.bin/clang/llvm-ar/Makefile.depend b/usr.bin/clang/llvm-ar/Makefile.depend
deleted file mode 100644
index 6c076d851aa3..000000000000
--- a/usr.bin/clang/llvm-ar/Makefile.depend
+++ /dev/null
@@ -1,82 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	gnu/lib/csu \
-	gnu/lib/libgcc \
-	include \
-	include/xlocale \
-	lib/${CSU_DIR} \
-	lib/clang/libllvmaarch64asmparser \
-	lib/clang/libllvmaarch64asmprinter \
-	lib/clang/libllvmaarch64codegen \
-	lib/clang/libllvmaarch64desc \
-	lib/clang/libllvmaarch64disassembler \
-	lib/clang/libllvmaarch64info \
-	lib/clang/libllvmaarch64utils \
-	lib/clang/libllvmanalysis \
-	lib/clang/libllvmarmasmparser \
-	lib/clang/libllvmarmasmprinter \
-	lib/clang/libllvmarmcodegen \
-	lib/clang/libllvmarmdesc \
-	lib/clang/libllvmarmdisassembler \
-	lib/clang/libllvmarminfo \
-	lib/clang/libllvmasmprinter \
-	lib/clang/libllvmbitreader \
-	lib/clang/libllvmbitwriter \
-	lib/clang/libllvmcodegen \
-	lib/clang/libllvmcore \
-	lib/clang/libllvminstcombine \
-	lib/clang/libllvminstrumentation \
-	lib/clang/libllvmlibdriver \
-	lib/clang/libllvmmc \
-	lib/clang/libllvmmcdisassembler \
-	lib/clang/libllvmmcparser \
-	lib/clang/libllvmmipsasmparser \
-	lib/clang/libllvmmipsasmprinter \
-	lib/clang/libllvmmipscodegen \
-	lib/clang/libllvmmipsdesc \
-	lib/clang/libllvmmipsdisassembler \
-	lib/clang/libllvmmipsinfo \
-	lib/clang/libllvmobject \
-	lib/clang/libllvmoption \
-	lib/clang/libllvmpowerpcasmparser \
-	lib/clang/libllvmpowerpcasmprinter \
-	lib/clang/libllvmpowerpccodegen \
-	lib/clang/libllvmpowerpcdesc \
-	lib/clang/libllvmpowerpcdisassembler \
-	lib/clang/libllvmpowerpcinfo \
-	lib/clang/libllvmprofiledata \
-	lib/clang/libllvmscalaropts \
-	lib/clang/libllvmselectiondag \
-	lib/clang/libllvmsparcasmparser \
-	lib/clang/libllvmsparcasmprinter \
-	lib/clang/libllvmsparccodegen \
-	lib/clang/libllvmsparcdesc \
-	lib/clang/libllvmsparcdisassembler \
-	lib/clang/libllvmsparcinfo \
-	lib/clang/libllvmsupport \
-	lib/clang/libllvmtarget \
-	lib/clang/libllvmtransformutils \
-	lib/clang/libllvmx86asmparser \
-	lib/clang/libllvmx86asmprinter \
-	lib/clang/libllvmx86codegen \
-	lib/clang/libllvmx86desc \
-	lib/clang/libllvmx86disassembler \
-	lib/clang/libllvmx86info \
-	lib/clang/libllvmx86utils \
-	lib/libc \
-	lib/libc++ \
-	lib/libcompiler_rt \
-	lib/libthr \
-	lib/libz \
-	lib/msun \
-	lib/ncurses/ncursesw \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/usr.bin/clang/llvm-as/Makefile b/usr.bin/clang/llvm-as/Makefile
index 433c43b8fbd4..02c853e20655 100644
--- a/usr.bin/clang/llvm-as/Makefile
+++ b/usr.bin/clang/llvm-as/Makefile
@@ -1,19 +1,10 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+PROG_CXX=	llvm-as
 
-PROG_CXX=llvm-as
+SRCDIR=		tools/llvm-as
+SRCS+=		llvm-as.cpp
 
-SRCDIR=	tools/llvm-as
-SRCS=	llvm-as.cpp
+LIBADD+=	z
 
-TGHDRS=	Attributes
-
-LIBDEPS=llvmasmparser \
-	llvmbitwriter \
-	llvmanalysis \
-	llvmprofiledata \
-	llvmcore \
-	llvmsupport
-
-.include "../clang.prog.mk"
+.include "../llvm.prog.mk"
diff --git a/usr.bin/clang/llvm-as/Makefile.depend b/usr.bin/clang/llvm-as/Makefile.depend
deleted file mode 100644
index a41464d429d5..000000000000
--- a/usr.bin/clang/llvm-as/Makefile.depend
+++ /dev/null
@@ -1,27 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	gnu/lib/csu \
-	gnu/lib/libgcc \
-	include \
-	include/xlocale \
-	lib/${CSU_DIR} \
-	lib/clang/libllvmasmparser \
-	lib/clang/libllvmbitwriter \
-	lib/clang/libllvmcore \
-	lib/clang/libllvmsupport \
-	lib/libc \
-	lib/libc++ \
-	lib/libcompiler_rt \
-	lib/libthr \
-	lib/msun \
-	lib/ncurses/ncursesw \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/usr.bin/clang/llvm-bcanalyzer/Makefile b/usr.bin/clang/llvm-bcanalyzer/Makefile
index f900fdc08f26..7e878991c6d1 100644
--- a/usr.bin/clang/llvm-bcanalyzer/Makefile
+++ b/usr.bin/clang/llvm-bcanalyzer/Makefile
@@ -1,16 +1,10 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+PROG_CXX=	llvm-bcanalyzer
 
-PROG_CXX=llvm-bcanalyzer
+SRCDIR=		tools/llvm-bcanalyzer
+SRCS+=		llvm-bcanalyzer.cpp
 
-SRCDIR=	tools/llvm-bcanalyzer
-SRCS=	llvm-bcanalyzer.cpp
+LIBADD+=	z
 
-TGHDRS=	Attributes
-
-LIBDEPS=llvmbitreader \
-	llvmcore \
-	llvmsupport
-
-.include "../clang.prog.mk"
+.include "../llvm.prog.mk"
diff --git a/usr.bin/clang/llvm-bcanalyzer/Makefile.depend b/usr.bin/clang/llvm-bcanalyzer/Makefile.depend
deleted file mode 100644
index d5ac336e90c9..000000000000
--- a/usr.bin/clang/llvm-bcanalyzer/Makefile.depend
+++ /dev/null
@@ -1,26 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	gnu/lib/csu \
-	gnu/lib/libgcc \
-	include \
-	include/xlocale \
-	lib/${CSU_DIR} \
-	lib/clang/libllvmbitreader \
-	lib/clang/libllvmcore \
-	lib/clang/libllvmsupport \
-	lib/libc \
-	lib/libc++ \
-	lib/libcompiler_rt \
-	lib/libthr \
-	lib/msun \
-	lib/ncurses/ncursesw \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/usr.bin/clang/llvm-cov/Makefile b/usr.bin/clang/llvm-cov/Makefile
index eb0db1a42f8d..17ad0e11a460 100644
--- a/usr.bin/clang/llvm-cov/Makefile
+++ b/usr.bin/clang/llvm-cov/Makefile
@@ -1,30 +1,19 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+PROG_CXX=	llvm-cov
 
-PROG_CXX=llvm-cov
-
-SRCDIR=	tools/llvm-cov
-SRCS=	CodeCoverage.cpp \
-	CoverageFilters.cpp \
-	CoverageReport.cpp \
-	CoverageSummaryInfo.cpp \
-	SourceCoverageView.cpp \
-	SourceCoverageViewHTML.cpp \
-	SourceCoverageViewText.cpp \
-	TestingSupport.cpp \
-	gcov.cpp \
-	llvm-cov.cpp
-
-LIBDEPS=llvmcoverage \
-	llvmprofiledata \
-	llvmobject \
-	llvmbitreader \
-	llvmmcparser \
-	llvmmc \
-	llvmcore \
-	llvmsupport
+SRCDIR=		tools/llvm-cov
+SRCS+=		CodeCoverage.cpp
+SRCS+=		CoverageFilters.cpp
+SRCS+=		CoverageReport.cpp
+SRCS+=		CoverageSummaryInfo.cpp
+SRCS+=		SourceCoverageView.cpp
+SRCS+=		SourceCoverageViewHTML.cpp
+SRCS+=		SourceCoverageViewText.cpp
+SRCS+=		TestingSupport.cpp
+SRCS+=		gcov.cpp
+SRCS+=		llvm-cov.cpp
 
 LIBADD+=	z
 
-.include "../clang.prog.mk"
+.include "../llvm.prog.mk"
diff --git a/usr.bin/clang/llvm-cov/Makefile.depend b/usr.bin/clang/llvm-cov/Makefile.depend
deleted file mode 100644
index 652277f62011..000000000000
--- a/usr.bin/clang/llvm-cov/Makefile.depend
+++ /dev/null
@@ -1,30 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	gnu/lib/csu \
-	gnu/lib/libgcc \
-	include \
-	include/xlocale \
-	lib/${CSU_DIR} \
-	lib/clang/libllvmbitreader \
-	lib/clang/libllvmcore \
-	lib/clang/libllvmmc \
-	lib/clang/libllvmmcparser \
-	lib/clang/libllvmobject \
-	lib/clang/libllvmprofiledata \
-	lib/clang/libllvmsupport \
-	lib/libc \
-	lib/libc++ \
-	lib/libcompiler_rt \
-	lib/libthr \
-	lib/libz \
-	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/llvm-cxxdump/Makefile b/usr.bin/clang/llvm-cxxdump/Makefile
index 78f94d48fb6a..21d0daf3ee11 100644
--- a/usr.bin/clang/llvm-cxxdump/Makefile
+++ b/usr.bin/clang/llvm-cxxdump/Makefile
@@ -1,73 +1,12 @@
 # $FreeBSD$
 
+PROG_CXX=	llvm-cxxdump
 MAN=
-.include <bsd.own.mk>
 
-PROG_CXX=llvm-cxxdump
-
-SRCDIR=	tools/llvm-cxxdump
-SRCS=	Error.cpp \
-	llvm-cxxdump.cpp
-
-LIBDEPS=llvmaarch64codegen \
-	llvmaarch64asmparser \
-	llvmaarch64disassembler \
-	llvmarmcodegen \
-	llvmarmasmparser \
-	llvmarmdisassembler \
-	llvmmipscodegen \
-	llvmmipsasmparser \
-	llvmmipsdesc \
-	llvmmipsdisassembler \
-	llvmpowerpccodegen \
-	llvmpowerpcasmparser \
-	llvmpowerpcdesc \
-	llvmpowerpcdisassembler \
-	llvmsparccodegen \
-	llvmsparcasmparser \
-	llvmsparcdesc \
-	llvmsparcdisassembler \
-	llvmx86codegen \
-	llvmx86asmparser \
-	llvmx86desc \
-	llvmx86disassembler \
-	llvmobject \
-	llvmglobalisel \
-	llvmaarch64desc \
-	llvmaarch64asmprinter \
-	llvmaarch64info \
-	llvmaarch64utils \
-	llvmarmdesc \
-	llvmarmasmprinter \
-	llvmarminfo \
-	llvmmipsasmprinter \
-	llvmmipsinfo \
-	llvmpowerpcasmprinter \
-	llvmpowerpcinfo \
-	llvmsparcasmprinter \
-	llvmsparcinfo \
-	llvmasmprinter \
-	llvmdebuginfocodeview \
-	llvmselectiondag \
-	llvmcodegen \
-	llvmscalaropts \
-	llvminstcombine \
-	llvmbitwriter \
-	llvminstrumentation \
-	llvmtransformutils \
-	llvmtarget \
-	llvmanalysis \
-	llvmprofiledata \
-	llvmx86asmprinter \
-	llvmx86utils \
-	llvmbitreader \
-	llvmcore \
-	llvmmcparser \
-	llvmx86info \
-	llvmmcdisassembler \
-	llvmmc \
-	llvmsupport
+SRCDIR=		tools/llvm-cxxdump
+SRCS+=		Error.cpp
+SRCS+=		llvm-cxxdump.cpp
 
 LIBADD+=	z
 
-.include "../clang.prog.mk"
+.include "../llvm.prog.mk"
diff --git a/usr.bin/clang/llvm-cxxdump/Makefile.depend b/usr.bin/clang/llvm-cxxdump/Makefile.depend
deleted file mode 100644
index e1873fe58abc..000000000000
--- a/usr.bin/clang/llvm-cxxdump/Makefile.depend
+++ /dev/null
@@ -1,79 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	gnu/lib/csu \
-	gnu/lib/libgcc \
-	include \
-	include/xlocale \
-	lib/${CSU_DIR} \
-	lib/clang/libllvmaarch64asmparser \
-	lib/clang/libllvmaarch64asmprinter \
-	lib/clang/libllvmaarch64codegen \
-	lib/clang/libllvmaarch64desc \
-	lib/clang/libllvmaarch64disassembler \
-	lib/clang/libllvmaarch64info \
-	lib/clang/libllvmaarch64utils \
-	lib/clang/libllvmanalysis \
-	lib/clang/libllvmarmasmparser \
-	lib/clang/libllvmarmasmprinter \
-	lib/clang/libllvmarmcodegen \
-	lib/clang/libllvmarmdesc \
-	lib/clang/libllvmarmdisassembler \
-	lib/clang/libllvmarminfo \
-	lib/clang/libllvmasmprinter \
-	lib/clang/libllvmbitreader \
-	lib/clang/libllvmbitwriter \
-	lib/clang/libllvmcodegen \
-	lib/clang/libllvmcore \
-	lib/clang/libllvminstcombine \
-	lib/clang/libllvminstrumentation \
-	lib/clang/libllvmmc \
-	lib/clang/libllvmmcdisassembler \
-	lib/clang/libllvmmcparser \
-	lib/clang/libllvmmipsasmparser \
-	lib/clang/libllvmmipsasmprinter \
-	lib/clang/libllvmmipscodegen \
-	lib/clang/libllvmmipsdesc \
-	lib/clang/libllvmmipsdisassembler \
-	lib/clang/libllvmmipsinfo \
-	lib/clang/libllvmobject \
-	lib/clang/libllvmpowerpcasmparser \
-	lib/clang/libllvmpowerpcasmprinter \
-	lib/clang/libllvmpowerpccodegen \
-	lib/clang/libllvmpowerpcdesc \
-	lib/clang/libllvmpowerpcdisassembler \
-	lib/clang/libllvmpowerpcinfo \
-	lib/clang/libllvmprofiledata \
-	lib/clang/libllvmscalaropts \
-	lib/clang/libllvmselectiondag \
-	lib/clang/libllvmsparcasmparser \
-	lib/clang/libllvmsparcasmprinter \
-	lib/clang/libllvmsparccodegen \
-	lib/clang/libllvmsparcdesc \
-	lib/clang/libllvmsparcdisassembler \
-	lib/clang/libllvmsparcinfo \
-	lib/clang/libllvmsupport \
-	lib/clang/libllvmtarget \
-	lib/clang/libllvmtransformutils \
-	lib/clang/libllvmx86asmparser \
-	lib/clang/libllvmx86asmprinter \
-	lib/clang/libllvmx86codegen \
-	lib/clang/libllvmx86desc \
-	lib/clang/libllvmx86disassembler \
-	lib/clang/libllvmx86info \
-	lib/clang/libllvmx86utils \
-	lib/libc \
-	lib/libc++ \
-	lib/libcompiler_rt \
-	lib/libthr \
-	lib/libz \
-	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/llvm-diff/Makefile b/usr.bin/clang/llvm-diff/Makefile
index d836a4155360..4c667853d9c5 100644
--- a/usr.bin/clang/llvm-diff/Makefile
+++ b/usr.bin/clang/llvm-diff/Makefile
@@ -1,21 +1,13 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+PROG_CXX=	llvm-diff
 
-PROG_CXX=llvm-diff
+SRCDIR=		tools/llvm-diff
+SRCS+=		DiffConsumer.cpp
+SRCS+=		DiffLog.cpp
+SRCS+=		DifferenceEngine.cpp
+SRCS+=		llvm-diff.cpp
 
-SRCDIR=	tools/llvm-diff
-SRCS=	DiffConsumer.cpp \
-	DiffLog.cpp \
-	DifferenceEngine.cpp \
-	llvm-diff.cpp
+LIBADD+=	z
 
-TGHDRS=	Attributes
-
-LIBDEPS=llvmirreader \
-	llvmasmparser \
-	llvmbitreader \
-	llvmcore \
-	llvmsupport
-
-.include "../clang.prog.mk"
+.include "../llvm.prog.mk"
diff --git a/usr.bin/clang/llvm-diff/Makefile.depend b/usr.bin/clang/llvm-diff/Makefile.depend
deleted file mode 100644
index 0406d2f347e7..000000000000
--- a/usr.bin/clang/llvm-diff/Makefile.depend
+++ /dev/null
@@ -1,28 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	gnu/lib/csu \
-	gnu/lib/libgcc \
-	include \
-	include/xlocale \
-	lib/${CSU_DIR} \
-	lib/clang/libllvmasmparser \
-	lib/clang/libllvmbitreader \
-	lib/clang/libllvmcore \
-	lib/clang/libllvmirreader \
-	lib/clang/libllvmsupport \
-	lib/libc \
-	lib/libc++ \
-	lib/libcompiler_rt \
-	lib/libthr \
-	lib/msun \
-	lib/ncurses/ncursesw \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/usr.bin/clang/llvm-dis/Makefile b/usr.bin/clang/llvm-dis/Makefile
index 85289384f400..97de6e056f87 100644
--- a/usr.bin/clang/llvm-dis/Makefile
+++ b/usr.bin/clang/llvm-dis/Makefile
@@ -1,17 +1,8 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+PROG_CXX=	llvm-dis
 
-PROG_CXX=llvm-dis
+SRCDIR=		tools/llvm-dis
+SRCS+=		llvm-dis.cpp
 
-SRCDIR=	tools/llvm-dis
-SRCS=	llvm-dis.cpp
-
-TGHDRS=	Attributes \
-	Intrinsics
-
-LIBDEPS=llvmbitreader \
-	llvmcore \
-	llvmsupport
-
-.include "../clang.prog.mk"
+.include "../llvm.prog.mk"
diff --git a/usr.bin/clang/llvm-dis/Makefile.depend b/usr.bin/clang/llvm-dis/Makefile.depend
deleted file mode 100644
index bf56a27044f5..000000000000
--- a/usr.bin/clang/llvm-dis/Makefile.depend
+++ /dev/null
@@ -1,27 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	gnu/lib/csu \
-	gnu/lib/libgcc \
-	include \
-	include/xlocale \
-	lib/${CSU_DIR} \
-	lib/clang/libllvmanalysis \
-	lib/clang/libllvmbitreader \
-	lib/clang/libllvmcore \
-	lib/clang/libllvmsupport \
-	lib/libc \
-	lib/libc++ \
-	lib/libcompiler_rt \
-	lib/libthr \
-	lib/msun \
-	lib/ncurses/ncursesw \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/usr.bin/clang/llvm-dwarfdump/Makefile b/usr.bin/clang/llvm-dwarfdump/Makefile
index 3cbec80dcff2..d56bb4395495 100644
--- a/usr.bin/clang/llvm-dwarfdump/Makefile
+++ b/usr.bin/clang/llvm-dwarfdump/Makefile
@@ -1,20 +1,10 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+PROG_CXX=	llvm-dwarfdump
 
-PROG_CXX=llvm-dwarfdump
-
-SRCDIR=	tools/llvm-dwarfdump
-SRCS=	llvm-dwarfdump.cpp
-
-LIBDEPS=llvmdebuginfodwarf \
-	llvmobject \
-	llvmbitreader \
-	llvmcore \
-	llvmmcparser \
-	llvmmc \
-	llvmsupport
+SRCDIR=		tools/llvm-dwarfdump
+SRCS+=		llvm-dwarfdump.cpp
 
 LIBADD+=	z
 
-.include "../clang.prog.mk"
+.include "../llvm.prog.mk"
diff --git a/usr.bin/clang/llvm-dwarfdump/Makefile.depend b/usr.bin/clang/llvm-dwarfdump/Makefile.depend
deleted file mode 100644
index 0f0517818727..000000000000
--- a/usr.bin/clang/llvm-dwarfdump/Makefile.depend
+++ /dev/null
@@ -1,30 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	gnu/lib/csu \
-	gnu/lib/libgcc \
-	include \
-	include/xlocale \
-	lib/${CSU_DIR} \
-	lib/clang/libllvmbitreader \
-	lib/clang/libllvmcore \
-	lib/clang/libllvmdebuginfodwarf \
-	lib/clang/libllvmmc \
-	lib/clang/libllvmmcparser \
-	lib/clang/libllvmobject \
-	lib/clang/libllvmsupport \
-	lib/libc \
-	lib/libc++ \
-	lib/libcompiler_rt \
-	lib/libthr \
-	lib/libz \
-	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/llvm-extract/Makefile b/usr.bin/clang/llvm-extract/Makefile
index 04f405078575..cc356a060c4b 100644
--- a/usr.bin/clang/llvm-extract/Makefile
+++ b/usr.bin/clang/llvm-extract/Makefile
@@ -1,33 +1,10 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+PROG_CXX=	llvm-extract
 
-PROG_CXX=llvm-extract
-
-SRCDIR=	tools/llvm-extract
-SRCS=	llvm-extract.cpp
-
-TGHDRS=	Attributes
-
-LIBDEPS=llvmbitwriter \
-	llvmipo \
-	llvmirreader \
-	llvmasmparser \
-	llvminstrumentation \
-	llvmlinker \
-	llvmobject \
-	llvmbitreader \
-	llvmmcparser \
-	llvmmc \
-	llvmscalaropts \
-	llvminstcombine \
-	llvmvectorize \
-	llvmtransformutils \
-	llvmanalysis \
-	llvmprofiledata \
-	llvmcore \
-	llvmsupport
+SRCDIR=		tools/llvm-extract
+SRCS+=		llvm-extract.cpp
 
 LIBADD+=	z
 
-.include "../clang.prog.mk"
+.include "../llvm.prog.mk"
diff --git a/usr.bin/clang/llvm-extract/Makefile.depend b/usr.bin/clang/llvm-extract/Makefile.depend
deleted file mode 100644
index 35cf93b1855a..000000000000
--- a/usr.bin/clang/llvm-extract/Makefile.depend
+++ /dev/null
@@ -1,40 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	gnu/lib/csu \
-	gnu/lib/libgcc \
-	include \
-	include/xlocale \
-	lib/${CSU_DIR} \
-	lib/clang/libllvmanalysis \
-	lib/clang/libllvmasmparser \
-	lib/clang/libllvmbitreader \
-	lib/clang/libllvmbitwriter \
-	lib/clang/libllvmcore \
-	lib/clang/libllvminstcombine \
-	lib/clang/libllvmipo \
-	lib/clang/libllvmirreader \
-	lib/clang/libllvmlinker \
-	lib/clang/libllvmmc \
-	lib/clang/libllvmmcparser \
-	lib/clang/libllvmobject \
-	lib/clang/libllvmprofiledata \
-	lib/clang/libllvmscalaropts \
-	lib/clang/libllvmsupport \
-	lib/clang/libllvmtransformutils \
-	lib/clang/libllvmvectorize \
-	lib/libc \
-	lib/libc++ \
-	lib/libcompiler_rt \
-	lib/libthr \
-	lib/msun \
-	lib/ncurses/ncursesw \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/usr.bin/clang/llvm-link/Makefile b/usr.bin/clang/llvm-link/Makefile
index 311987ba00d4..9af68e8fa1ff 100644
--- a/usr.bin/clang/llvm-link/Makefile
+++ b/usr.bin/clang/llvm-link/Makefile
@@ -1,28 +1,10 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+PROG_CXX=	llvm-link
 
-PROG_CXX=llvm-link
-
-SRCDIR=	tools/llvm-link
-SRCS=	llvm-link.cpp
-
-TGHDRS=	Attributes
-
-LIBDEPS=llvmbitwriter \
-	llvmirreader \
-	llvmlinker \
-	llvmobject \
-	llvmtransformutils \
-	llvmasmparser \
-	llvmanalysis \
-	llvmprofiledata \
-	llvmbitreader \
-	llvmcore \
-	llvmmcparser \
-	llvmmc \
-	llvmsupport
+SRCDIR=		tools/llvm-link
+SRCS+=		llvm-link.cpp
 
 LIBADD+=	z
 
-.include "../clang.prog.mk"
+.include "../llvm.prog.mk"
diff --git a/usr.bin/clang/llvm-link/Makefile.depend b/usr.bin/clang/llvm-link/Makefile.depend
deleted file mode 100644
index 0195115bc3eb..000000000000
--- a/usr.bin/clang/llvm-link/Makefile.depend
+++ /dev/null
@@ -1,35 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	gnu/lib/csu \
-	gnu/lib/libgcc \
-	include \
-	include/xlocale \
-	lib/${CSU_DIR} \
-	lib/clang/libllvmanalysis \
-	lib/clang/libllvmasmparser \
-	lib/clang/libllvmbitreader \
-	lib/clang/libllvmbitwriter \
-	lib/clang/libllvmcore \
-	lib/clang/libllvmirreader \
-	lib/clang/libllvmlinker \
-	lib/clang/libllvmmc \
-	lib/clang/libllvmmcparser \
-	lib/clang/libllvmobject \
-	lib/clang/libllvmsupport \
-	lib/clang/libllvmtransformutils \
-	lib/libc \
-	lib/libc++ \
-	lib/libcompiler_rt \
-	lib/libthr \
-	lib/msun \
-	lib/ncurses/ncursesw \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/usr.bin/clang/llvm-lto/Makefile b/usr.bin/clang/llvm-lto/Makefile
index 4f6e25604eb8..500605868b83 100644
--- a/usr.bin/clang/llvm-lto/Makefile
+++ b/usr.bin/clang/llvm-lto/Makefile
@@ -1,82 +1,11 @@
 # $FreeBSD$
 
+PROG_CXX=	llvm-lto
 MAN=
-.include <bsd.own.mk>
 
-PROG_CXX=llvm-lto
-
-SRCDIR=	tools/llvm-lto
-SRCS=	llvm-lto.cpp
-
-TGHDRS=	Attributes \
-	Intrinsics
-
-LIBDEPS=llvmaarch64codegen \
-	llvmaarch64asmparser \
-	llvmaarch64disassembler \
-	llvmarmcodegen \
-	llvmarmasmparser \
-	llvmarmdisassembler \
-	llvmmipscodegen \
-	llvmmipsasmparser \
-	llvmmipsdesc \
-	llvmmipsdisassembler \
-	llvmpowerpccodegen \
-	llvmpowerpcasmparser \
-	llvmpowerpcdesc \
-	llvmpowerpcdisassembler \
-	llvmsparccodegen \
-	llvmsparcasmparser \
-	llvmsparcdesc \
-	llvmsparcdisassembler \
-	llvmx86codegen \
-	llvmx86asmparser \
-	llvmx86desc \
-	llvmx86disassembler \
-	llvmlto \
-	llvmglobalisel \
-	llvmaarch64desc \
-	llvmaarch64asmprinter \
-	llvmaarch64info \
-	llvmaarch64utils \
-	llvmarmdesc \
-	llvmarmasmprinter \
-	llvmarminfo \
-	llvmmipsasmprinter \
-	llvmmipsinfo \
-	llvmpowerpcasmprinter \
-	llvmpowerpcinfo \
-	llvmsparcasmprinter \
-	llvmsparcinfo \
-	llvmasmprinter \
-	llvmdebuginfocodeview \
-	llvmselectiondag \
-	llvmx86asmprinter \
-	llvmx86utils \
-	llvmx86info \
-	llvmmcdisassembler \
-	llvmcodegen \
-	llvmbitwriter \
-	llvmtarget \
-	llvmobjcarcopts \
-	llvmipo \
-	llvmirreader \
-	llvmasmparser \
-	llvmobject \
-	llvmbitreader \
-	llvmmcparser \
-	llvmscalaropts \
-	llvminstcombine \
-	llvmlinker \
-	llvminstrumentation \
-	llvmmc \
-	llvmvectorize \
-	llvmtransformutils \
-	llvmanalysis \
-	llvmprofiledata \
-	llvmcore \
-	llvmsupport
+SRCDIR=		tools/llvm-lto
+SRCS=		llvm-lto.cpp
 
 LIBADD+=	z
 
-.include "../clang.prog.mk"
+.include "../llvm.prog.mk"
diff --git a/usr.bin/clang/llvm-lto/Makefile.depend b/usr.bin/clang/llvm-lto/Makefile.depend
deleted file mode 100644
index 6915918c6cc2..000000000000
--- a/usr.bin/clang/llvm-lto/Makefile.depend
+++ /dev/null
@@ -1,87 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	gnu/lib/csu \
-	gnu/lib/libgcc \
-	include \
-	include/xlocale \
-	lib/${CSU_DIR} \
-	lib/clang/libllvmaarch64asmparser \
-	lib/clang/libllvmaarch64asmprinter \
-	lib/clang/libllvmaarch64codegen \
-	lib/clang/libllvmaarch64desc \
-	lib/clang/libllvmaarch64disassembler \
-	lib/clang/libllvmaarch64info \
-	lib/clang/libllvmaarch64utils \
-	lib/clang/libllvmanalysis \
-	lib/clang/libllvmarmasmparser \
-	lib/clang/libllvmarmasmprinter \
-	lib/clang/libllvmarmcodegen \
-	lib/clang/libllvmarmdesc \
-	lib/clang/libllvmarmdisassembler \
-	lib/clang/libllvmarminfo \
-	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/libllvmipo \
-	lib/clang/libllvmirreader \
-	lib/clang/libllvmlinker \
-	lib/clang/libllvmlto \
-	lib/clang/libllvmmc \
-	lib/clang/libllvmmcdisassembler \
-	lib/clang/libllvmmcparser \
-	lib/clang/libllvmmipsasmparser \
-	lib/clang/libllvmmipsasmprinter \
-	lib/clang/libllvmmipscodegen \
-	lib/clang/libllvmmipsdesc \
-	lib/clang/libllvmmipsdisassembler \
-	lib/clang/libllvmmipsinfo \
-	lib/clang/libllvmobjcarcopts \
-	lib/clang/libllvmobject \
-	lib/clang/libllvmpowerpcasmparser \
-	lib/clang/libllvmpowerpcasmprinter \
-	lib/clang/libllvmpowerpccodegen \
-	lib/clang/libllvmpowerpcdesc \
-	lib/clang/libllvmpowerpcdisassembler \
-	lib/clang/libllvmpowerpcinfo \
-	lib/clang/libllvmprofiledata \
-	lib/clang/libllvmscalaropts \
-	lib/clang/libllvmselectiondag \
-	lib/clang/libllvmsparcasmparser \
-	lib/clang/libllvmsparcasmprinter \
-	lib/clang/libllvmsparccodegen \
-	lib/clang/libllvmsparcdesc \
-	lib/clang/libllvmsparcdisassembler \
-	lib/clang/libllvmsparcinfo \
-	lib/clang/libllvmsupport \
-	lib/clang/libllvmtarget \
-	lib/clang/libllvmtransformutils \
-	lib/clang/libllvmvectorize \
-	lib/clang/libllvmx86asmparser \
-	lib/clang/libllvmx86asmprinter \
-	lib/clang/libllvmx86codegen \
-	lib/clang/libllvmx86desc \
-	lib/clang/libllvmx86disassembler \
-	lib/clang/libllvmx86info \
-	lib/clang/libllvmx86utils \
-	lib/libc \
-	lib/libc++ \
-	lib/libcompiler_rt \
-	lib/libthr \
-	lib/libz \
-	lib/msun \
-	lib/ncurses/ncursesw \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/usr.bin/clang/llvm-mc/Makefile b/usr.bin/clang/llvm-mc/Makefile
index 2ab2389eec8e..64176f1b72a6 100644
--- a/usr.bin/clang/llvm-mc/Makefile
+++ b/usr.bin/clang/llvm-mc/Makefile
@@ -1,54 +1,12 @@
 # $FreeBSD$
 
+PROG_CXX=	llvm-mc
 MAN=
-.include <bsd.own.mk>
 
-PROG_CXX=llvm-mc
-
-SRCDIR=	tools/llvm-mc
-SRCS=	Disassembler.cpp \
-	llvm-mc.cpp
-
-LIBDEPS=llvmaarch64asmparser \
-	llvmarmasmparser \
-	llvmmipsasmparser \
-	llvmpowerpcasmparser \
-	llvmsparcasmparser \
-	llvmx86asmparser \
-	llvmmipsdesc \
-	llvmpowerpcdesc \
-	llvmsparcdesc \
-	llvmx86desc \
-	llvmaarch64disassembler \
-	llvmarmdisassembler \
-	llvmmipsdisassembler \
-	llvmpowerpcdisassembler \
-	llvmsparcdisassembler \
-	llvmx86disassembler \
-	llvmmipsinfo \
-	llvmpowerpcinfo \
-	llvmsparcinfo \
-	llvmx86info \
-	llvmmipsasmprinter \
-	llvmpowerpcasmprinter \
-	llvmsparcasmprinter \
-	llvmx86asmprinter \
-	llvmx86utils \
-	llvmobject \
-	llvmbitreader \
-	llvmcore \
-	llvmmcparser \
-	llvmaarch64desc \
-	llvmaarch64asmprinter \
-	llvmaarch64info \
-	llvmaarch64utils \
-	llvmarmdesc \
-	llvmarmasmprinter \
-	llvmarminfo \
-	llvmmcdisassembler \
-	llvmmc \
-	llvmsupport
+SRCDIR=		tools/llvm-mc
+SRCS+=		Disassembler.cpp
+SRCS+=		llvm-mc.cpp
 
 LIBADD+=	z
 
-.include "../clang.prog.mk"
+.include "../llvm.prog.mk"
diff --git a/usr.bin/clang/llvm-mc/Makefile.depend b/usr.bin/clang/llvm-mc/Makefile.depend
deleted file mode 100644
index e1873fe58abc..000000000000
--- a/usr.bin/clang/llvm-mc/Makefile.depend
+++ /dev/null
@@ -1,79 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	gnu/lib/csu \
-	gnu/lib/libgcc \
-	include \
-	include/xlocale \
-	lib/${CSU_DIR} \
-	lib/clang/libllvmaarch64asmparser \
-	lib/clang/libllvmaarch64asmprinter \
-	lib/clang/libllvmaarch64codegen \
-	lib/clang/libllvmaarch64desc \
-	lib/clang/libllvmaarch64disassembler \
-	lib/clang/libllvmaarch64info \
-	lib/clang/libllvmaarch64utils \
-	lib/clang/libllvmanalysis \
-	lib/clang/libllvmarmasmparser \
-	lib/clang/libllvmarmasmprinter \
-	lib/clang/libllvmarmcodegen \
-	lib/clang/libllvmarmdesc \
-	lib/clang/libllvmarmdisassembler \
-	lib/clang/libllvmarminfo \
-	lib/clang/libllvmasmprinter \
-	lib/clang/libllvmbitreader \
-	lib/clang/libllvmbitwriter \
-	lib/clang/libllvmcodegen \
-	lib/clang/libllvmcore \
-	lib/clang/libllvminstcombine \
-	lib/clang/libllvminstrumentation \
-	lib/clang/libllvmmc \
-	lib/clang/libllvmmcdisassembler \
-	lib/clang/libllvmmcparser \
-	lib/clang/libllvmmipsasmparser \
-	lib/clang/libllvmmipsasmprinter \
-	lib/clang/libllvmmipscodegen \
-	lib/clang/libllvmmipsdesc \
-	lib/clang/libllvmmipsdisassembler \
-	lib/clang/libllvmmipsinfo \
-	lib/clang/libllvmobject \
-	lib/clang/libllvmpowerpcasmparser \
-	lib/clang/libllvmpowerpcasmprinter \
-	lib/clang/libllvmpowerpccodegen \
-	lib/clang/libllvmpowerpcdesc \
-	lib/clang/libllvmpowerpcdisassembler \
-	lib/clang/libllvmpowerpcinfo \
-	lib/clang/libllvmprofiledata \
-	lib/clang/libllvmscalaropts \
-	lib/clang/libllvmselectiondag \
-	lib/clang/libllvmsparcasmparser \
-	lib/clang/libllvmsparcasmprinter \
-	lib/clang/libllvmsparccodegen \
-	lib/clang/libllvmsparcdesc \
-	lib/clang/libllvmsparcdisassembler \
-	lib/clang/libllvmsparcinfo \
-	lib/clang/libllvmsupport \
-	lib/clang/libllvmtarget \
-	lib/clang/libllvmtransformutils \
-	lib/clang/libllvmx86asmparser \
-	lib/clang/libllvmx86asmprinter \
-	lib/clang/libllvmx86codegen \
-	lib/clang/libllvmx86desc \
-	lib/clang/libllvmx86disassembler \
-	lib/clang/libllvmx86info \
-	lib/clang/libllvmx86utils \
-	lib/libc \
-	lib/libc++ \
-	lib/libcompiler_rt \
-	lib/libthr \
-	lib/libz \
-	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/llvm-nm/Makefile b/usr.bin/clang/llvm-nm/Makefile
index 34cceaafdd6c..55e35c3c14dc 100644
--- a/usr.bin/clang/llvm-nm/Makefile
+++ b/usr.bin/clang/llvm-nm/Makefile
@@ -1,48 +1,10 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+PROG_CXX=	llvm-nm
 
-PROG_CXX=llvm-nm
-
-SRCDIR=	tools/llvm-nm
-SRCS=	llvm-nm.cpp
-
-TGHDRS=	Attributes
-
-LIBDEPS=llvmaarch64asmparser \
-	llvmarmasmparser \
-	llvmmipsasmparser \
-	llvmpowerpcasmparser \
-	llvmsparcasmparser \
-	llvmx86asmparser \
-	llvmaarch64desc \
-	llvmarmdesc \
-	llvmmipsdesc \
-	llvmpowerpcdesc \
-	llvmsparcdesc \
-	llvmx86desc \
-	llvmaarch64info \
-	llvmarminfo \
-	llvmmipsinfo \
-	llvmpowerpcinfo \
-	llvmsparcinfo \
-	llvmx86info \
-	llvmobject \
-	llvmaarch64asmprinter \
-	llvmaarch64utils \
-	llvmarmasmprinter \
-	llvmmipsasmprinter \
-	llvmpowerpcasmprinter \
-	llvmsparcasmprinter \
-	llvmbitreader \
-	llvmmcdisassembler \
-	llvmx86asmprinter \
-	llvmx86utils \
-	llvmcore \
-	llvmmcparser \
-	llvmmc \
-	llvmsupport
+SRCDIR=		tools/llvm-nm
+SRCS+=		llvm-nm.cpp
 
 LIBADD+=	z
 
-.include "../clang.prog.mk"
+.include "../llvm.prog.mk"
diff --git a/usr.bin/clang/llvm-nm/Makefile.depend b/usr.bin/clang/llvm-nm/Makefile.depend
deleted file mode 100644
index df4b7a20a73e..000000000000
--- a/usr.bin/clang/llvm-nm/Makefile.depend
+++ /dev/null
@@ -1,80 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	gnu/lib/csu \
-	gnu/lib/libgcc \
-	include \
-	include/xlocale \
-	lib/${CSU_DIR} \
-	lib/clang/libllvmaarch64asmparser \
-	lib/clang/libllvmaarch64asmprinter \
-	lib/clang/libllvmaarch64codegen \
-	lib/clang/libllvmaarch64desc \
-	lib/clang/libllvmaarch64disassembler \
-	lib/clang/libllvmaarch64info \
-	lib/clang/libllvmaarch64utils \
-	lib/clang/libllvmanalysis \
-	lib/clang/libllvmarmasmparser \
-	lib/clang/libllvmarmasmprinter \
-	lib/clang/libllvmarmcodegen \
-	lib/clang/libllvmarmdesc \
-	lib/clang/libllvmarmdisassembler \
-	lib/clang/libllvmarminfo \
-	lib/clang/libllvmasmprinter \
-	lib/clang/libllvmbitreader \
-	lib/clang/libllvmbitwriter \
-	lib/clang/libllvmcodegen \
-	lib/clang/libllvmcore \
-	lib/clang/libllvminstcombine \
-	lib/clang/libllvminstrumentation \
-	lib/clang/libllvmmc \
-	lib/clang/libllvmmcdisassembler \
-	lib/clang/libllvmmcparser \
-	lib/clang/libllvmmipsasmparser \
-	lib/clang/libllvmmipsasmprinter \
-	lib/clang/libllvmmipscodegen \
-	lib/clang/libllvmmipsdesc \
-	lib/clang/libllvmmipsdisassembler \
-	lib/clang/libllvmmipsinfo \
-	lib/clang/libllvmobject \
-	lib/clang/libllvmpowerpcasmparser \
-	lib/clang/libllvmpowerpcasmprinter \
-	lib/clang/libllvmpowerpccodegen \
-	lib/clang/libllvmpowerpcdesc \
-	lib/clang/libllvmpowerpcdisassembler \
-	lib/clang/libllvmpowerpcinfo \
-	lib/clang/libllvmprofiledata \
-	lib/clang/libllvmscalaropts \
-	lib/clang/libllvmselectiondag \
-	lib/clang/libllvmsparcasmparser \
-	lib/clang/libllvmsparcasmprinter \
-	lib/clang/libllvmsparccodegen \
-	lib/clang/libllvmsparcdesc \
-	lib/clang/libllvmsparcdisassembler \
-	lib/clang/libllvmsparcinfo \
-	lib/clang/libllvmsupport \
-	lib/clang/libllvmtarget \
-	lib/clang/libllvmtransformutils \
-	lib/clang/libllvmx86asmparser \
-	lib/clang/libllvmx86asmprinter \
-	lib/clang/libllvmx86codegen \
-	lib/clang/libllvmx86desc \
-	lib/clang/libllvmx86disassembler \
-	lib/clang/libllvmx86info \
-	lib/clang/libllvmx86utils \
-	lib/libc \
-	lib/libc++ \
-	lib/libcompiler_rt \
-	lib/libthr \
-	lib/libz \
-	lib/msun \
-	lib/ncurses/ncursesw \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/usr.bin/clang/llvm-objdump/Makefile b/usr.bin/clang/llvm-objdump/Makefile
index 2d714bc66f10..91bb011440e5 100644
--- a/usr.bin/clang/llvm-objdump/Makefile
+++ b/usr.bin/clang/llvm-objdump/Makefile
@@ -1,60 +1,14 @@
 # $FreeBSD$
 
+PROG_CXX=	llvm-objdump
 MAN=
-.include <bsd.own.mk>
 
-PROG_CXX=llvm-objdump
-
-SRCDIR=	tools/llvm-objdump
-SRCS=	COFFDump.cpp \
-	ELFDump.cpp \
-	MachODump.cpp \
-	llvm-objdump.cpp
-
-LIBDEPS=llvmmipsdesc \
-	llvmpowerpcdesc \
-	llvmsparcdesc \
-	llvmx86desc \
-	llvmaarch64disassembler \
-	llvmarmdisassembler \
-	llvmmipsdisassembler \
-	llvmpowerpcdisassembler \
-	llvmsparcdisassembler \
-	llvmx86disassembler \
-	llvmmipsinfo \
-	llvmpowerpcinfo \
-	llvmsparcinfo \
-	llvmx86info \
-	llvmcodegen \
-	llvmdebuginfodwarf \
-	llvmobject \
-	llvmmipsasmprinter \
-	llvmpowerpcasmprinter \
-	llvmsparcasmprinter \
-	llvmx86asmprinter \
-	llvmx86utils \
-	llvmaarch64desc \
-	llvmaarch64asmprinter \
-	llvmaarch64info \
-	llvmaarch64utils \
-	llvmarmdesc \
-	llvmarmasmprinter \
-	llvmarminfo \
-	llvmmcdisassembler \
-	llvmbitwriter \
-	llvminstrumentation \
-	llvmscalaropts \
-	llvminstcombine \
-	llvmtarget \
-	llvmtransformutils \
-	llvmanalysis \
-	llvmprofiledata \
-	llvmbitreader \
-	llvmcore \
-	llvmmcparser \
-	llvmmc \
-	llvmsupport
+SRCDIR=		tools/llvm-objdump
+SRCS+=		COFFDump.cpp
+SRCS+=		ELFDump.cpp
+SRCS+=		MachODump.cpp
+SRCS+=		llvm-objdump.cpp
 
 LIBADD+=	z
 
-.include "../clang.prog.mk"
+.include "../llvm.prog.mk"
diff --git a/usr.bin/clang/llvm-objdump/Makefile.depend b/usr.bin/clang/llvm-objdump/Makefile.depend
deleted file mode 100644
index 40d8758bddcc..000000000000
--- a/usr.bin/clang/llvm-objdump/Makefile.depend
+++ /dev/null
@@ -1,80 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	gnu/lib/csu \
-	gnu/lib/libgcc \
-	include \
-	include/xlocale \
-	lib/${CSU_DIR} \
-	lib/clang/libllvmaarch64asmparser \
-	lib/clang/libllvmaarch64asmprinter \
-	lib/clang/libllvmaarch64codegen \
-	lib/clang/libllvmaarch64desc \
-	lib/clang/libllvmaarch64disassembler \
-	lib/clang/libllvmaarch64info \
-	lib/clang/libllvmaarch64utils \
-	lib/clang/libllvmanalysis \
-	lib/clang/libllvmarmasmparser \
-	lib/clang/libllvmarmasmprinter \
-	lib/clang/libllvmarmcodegen \
-	lib/clang/libllvmarmdesc \
-	lib/clang/libllvmarmdisassembler \
-	lib/clang/libllvmarminfo \
-	lib/clang/libllvmasmprinter \
-	lib/clang/libllvmbitreader \
-	lib/clang/libllvmbitwriter \
-	lib/clang/libllvmcodegen \
-	lib/clang/libllvmcore \
-	lib/clang/libllvmdebuginfodwarf \
-	lib/clang/libllvminstcombine \
-	lib/clang/libllvminstrumentation \
-	lib/clang/libllvmmc \
-	lib/clang/libllvmmcdisassembler \
-	lib/clang/libllvmmcparser \
-	lib/clang/libllvmmipsasmparser \
-	lib/clang/libllvmmipsasmprinter \
-	lib/clang/libllvmmipscodegen \
-	lib/clang/libllvmmipsdesc \
-	lib/clang/libllvmmipsdisassembler \
-	lib/clang/libllvmmipsinfo \
-	lib/clang/libllvmobject \
-	lib/clang/libllvmpowerpcasmparser \
-	lib/clang/libllvmpowerpcasmprinter \
-	lib/clang/libllvmpowerpccodegen \
-	lib/clang/libllvmpowerpcdesc \
-	lib/clang/libllvmpowerpcdisassembler \
-	lib/clang/libllvmpowerpcinfo \
-	lib/clang/libllvmprofiledata \
-	lib/clang/libllvmscalaropts \
-	lib/clang/libllvmselectiondag \
-	lib/clang/libllvmsparcasmparser \
-	lib/clang/libllvmsparcasmprinter \
-	lib/clang/libllvmsparccodegen \
-	lib/clang/libllvmsparcdesc \
-	lib/clang/libllvmsparcdisassembler \
-	lib/clang/libllvmsparcinfo \
-	lib/clang/libllvmsupport \
-	lib/clang/libllvmtarget \
-	lib/clang/libllvmtransformutils \
-	lib/clang/libllvmx86asmparser \
-	lib/clang/libllvmx86asmprinter \
-	lib/clang/libllvmx86codegen \
-	lib/clang/libllvmx86desc \
-	lib/clang/libllvmx86disassembler \
-	lib/clang/libllvmx86info \
-	lib/clang/libllvmx86utils \
-	lib/libc \
-	lib/libc++ \
-	lib/libcompiler_rt \
-	lib/libthr \
-	lib/libz \
-	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/llvm-pdbdump/Makefile b/usr.bin/clang/llvm-pdbdump/Makefile
index e7876453c386..27680dcb217e 100644
--- a/usr.bin/clang/llvm-pdbdump/Makefile
+++ b/usr.bin/clang/llvm-pdbdump/Makefile
@@ -1,35 +1,22 @@
 # $FreeBSD$
 
+PROG_CXX=	llvm-pdbdump
 MAN=
-.include <bsd.own.mk>
 
-PROG_CXX=llvm-pdbdump
+SRCDIR=		tools/llvm-pdbdump
+SRCS+=		BuiltinDumper.cpp
+SRCS+=		ClassDefinitionDumper.cpp
+SRCS+=		CompilandDumper.cpp
+SRCS+=		EnumDumper.cpp
+SRCS+=		ExternalSymbolDumper.cpp
+SRCS+=		FunctionDumper.cpp
+SRCS+=		LLVMOutputStyle.cpp
+SRCS+=		LinePrinter.cpp
+SRCS+=		PdbYaml.cpp
+SRCS+=		TypeDumper.cpp
+SRCS+=		TypedefDumper.cpp
+SRCS+=		VariableDumper.cpp
+SRCS+=		YAMLOutputStyle.cpp
+SRCS+=		llvm-pdbdump.cpp
 
-SRCDIR=	tools/llvm-pdbdump
-SRCS=	BuiltinDumper.cpp \
-	ClassDefinitionDumper.cpp \
-	CompilandDumper.cpp \
-	EnumDumper.cpp \
-	ExternalSymbolDumper.cpp \
-	FunctionDumper.cpp \
-	LLVMOutputStyle.cpp \
-	LinePrinter.cpp \
-	PdbYaml.cpp \
-	TypeDumper.cpp \
-	TypedefDumper.cpp \
-	VariableDumper.cpp \
-	YAMLOutputStyle.cpp \
-	llvm-pdbdump.cpp
-
-LIBDEPS=llvmdebuginfopdb \
-	llvmobject \
-	llvmdebuginfocodeview \
-	llvmbitreader \
-	llvmcore \
-	llvmmcparser \
-	llvmmc \
-	llvmsupport
-
-LIBADD+=	z
-
-.include "../clang.prog.mk"
+.include "../llvm.prog.mk"
diff --git a/usr.bin/clang/llvm-pdbdump/Makefile.depend b/usr.bin/clang/llvm-pdbdump/Makefile.depend
deleted file mode 100644
index 99720d3f22b4..000000000000
--- a/usr.bin/clang/llvm-pdbdump/Makefile.depend
+++ /dev/null
@@ -1,30 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	gnu/lib/csu \
-	gnu/lib/libgcc \
-	include \
-	include/xlocale \
-	lib/${CSU_DIR} \
-	lib/clang/libllvmbitreader \
-	lib/clang/libllvmcore \
-	lib/clang/libllvmdebuginfopdb \
-	lib/clang/libllvmmc \
-	lib/clang/libllvmmcparser \
-	lib/clang/libllvmobject \
-	lib/clang/libllvmsupport \
-	lib/libc \
-	lib/libc++ \
-	lib/libcompiler_rt \
-	lib/libthr \
-	lib/libz \
-	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/llvm-profdata/Makefile b/usr.bin/clang/llvm-profdata/Makefile
index a3986f7c3b33..d243113c6a73 100644
--- a/usr.bin/clang/llvm-profdata/Makefile
+++ b/usr.bin/clang/llvm-profdata/Makefile
@@ -1,18 +1,10 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+PROG_CXX=	llvm-profdata
 
-PROG_CXX=llvm-profdata
-
-SRCDIR=	tools/llvm-profdata
-SRCS=	llvm-profdata.cpp
-
-TGHDRS=	Attributes
-
-LIBDEPS=llvmprofiledata \
-	llvmcore \
-	llvmsupport
+SRCDIR=		tools/llvm-profdata
+SRCS+=		llvm-profdata.cpp
 
 LIBADD+=	z
 
-.include "../clang.prog.mk"
+.include "../llvm.prog.mk"
diff --git a/usr.bin/clang/llvm-profdata/Makefile.depend b/usr.bin/clang/llvm-profdata/Makefile.depend
deleted file mode 100644
index 42a42b2f0296..000000000000
--- a/usr.bin/clang/llvm-profdata/Makefile.depend
+++ /dev/null
@@ -1,31 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	gnu/lib/csu \
-	gnu/lib/libgcc \
-	include \
-	include/xlocale \
-	lib/${CSU_DIR} \
-	lib/clang/libllvmbitreader \
-	lib/clang/libllvmcore \
-	lib/clang/libllvmmc \
-	lib/clang/libllvmmcparser \
-	lib/clang/libllvmobject \
-	lib/clang/libllvmprofiledata \
-	lib/clang/libllvmsupport \
-	lib/libc \
-	lib/libc++ \
-	lib/libcompiler_rt \
-	lib/libthr \
-	lib/libz \
-	lib/msun \
-	lib/ncurses/ncursesw \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/usr.bin/clang/llvm-rtdyld/Makefile b/usr.bin/clang/llvm-rtdyld/Makefile
index 39192aea5333..2e7b9b4f8d10 100644
--- a/usr.bin/clang/llvm-rtdyld/Makefile
+++ b/usr.bin/clang/llvm-rtdyld/Makefile
@@ -1,75 +1,11 @@
 # $FreeBSD$
 
+PROG_CXX=	llvm-rtdyld
 MAN=
-.include <bsd.own.mk>
 
-PROG_CXX=llvm-rtdyld
-
-SRCDIR=	tools/llvm-rtdyld
-SRCS=	llvm-rtdyld.cpp
-
-LIBDEPS=llvmaarch64codegen \
-	llvmaarch64asmparser \
-	llvmaarch64disassembler \
-	llvmarmcodegen \
-	llvmarmasmparser \
-	llvmarmdisassembler \
-	llvmmipscodegen \
-	llvmmipsasmparser \
-	llvmmipsdesc \
-	llvmmipsdisassembler \
-	llvmpowerpccodegen \
-	llvmpowerpcasmparser \
-	llvmpowerpcdesc \
-	llvmpowerpcdisassembler \
-	llvmsparccodegen \
-	llvmsparcasmparser \
-	llvmsparcdesc \
-	llvmsparcdisassembler \
-	llvmx86codegen \
-	llvmx86asmparser \
-	llvmx86desc \
-	llvmx86disassembler \
-	llvmdebuginfodwarf \
-	llvmexecutionengine \
-	llvmruntimedyld \
-	llvmglobalisel \
-	llvmaarch64desc \
-	llvmaarch64asmprinter \
-	llvmaarch64info \
-	llvmaarch64utils \
-	llvmarmdesc \
-	llvmarmasmprinter \
-	llvmarminfo \
-	llvmmipsasmprinter \
-	llvmmipsinfo \
-	llvmpowerpcasmprinter \
-	llvmpowerpcinfo \
-	llvmsparcasmprinter \
-	llvmsparcinfo \
-	llvmasmprinter \
-	llvmdebuginfocodeview \
-	llvmselectiondag \
-	llvmcodegen \
-	llvmscalaropts \
-	llvminstcombine \
-	llvmbitwriter \
-	llvminstrumentation \
-	llvmtransformutils \
-	llvmx86asmprinter \
-	llvmx86utils \
-	llvmx86info \
-	llvmmcdisassembler \
-	llvmobject \
-	llvmmcparser \
-	llvmbitreader \
-	llvmtarget \
-	llvmmc \
-	llvmanalysis \
-	llvmprofiledata \
-	llvmcore \
-	llvmsupport
+SRCDIR=		tools/llvm-rtdyld
+SRCS+=		llvm-rtdyld.cpp
 
 LIBADD+=	z
 
-.include "../clang.prog.mk"
+.include "../llvm.prog.mk"
diff --git a/usr.bin/clang/llvm-rtdyld/Makefile.depend b/usr.bin/clang/llvm-rtdyld/Makefile.depend
deleted file mode 100644
index bf4a9bae9d7a..000000000000
--- a/usr.bin/clang/llvm-rtdyld/Makefile.depend
+++ /dev/null
@@ -1,83 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	gnu/lib/csu \
-	gnu/lib/libgcc \
-	include \
-	include/xlocale \
-	lib/${CSU_DIR} \
-	lib/clang/libllvmaarch64asmparser \
-	lib/clang/libllvmaarch64asmprinter \
-	lib/clang/libllvmaarch64codegen \
-	lib/clang/libllvmaarch64desc \
-	lib/clang/libllvmaarch64disassembler \
-	lib/clang/libllvmaarch64info \
-	lib/clang/libllvmaarch64utils \
-	lib/clang/libllvmanalysis \
-	lib/clang/libllvmarmasmparser \
-	lib/clang/libllvmarmasmprinter \
-	lib/clang/libllvmarmcodegen \
-	lib/clang/libllvmarmdesc \
-	lib/clang/libllvmarmdisassembler \
-	lib/clang/libllvmarminfo \
-	lib/clang/libllvmasmprinter \
-	lib/clang/libllvmbitreader \
-	lib/clang/libllvmbitwriter \
-	lib/clang/libllvmcodegen \
-	lib/clang/libllvmcore \
-	lib/clang/libllvmdebuginfodwarf \
-	lib/clang/libllvmexecutionengine \
-	lib/clang/libllvminstcombine \
-	lib/clang/libllvminstrumentation \
-	lib/clang/libllvmmc \
-	lib/clang/libllvmmcdisassembler \
-	lib/clang/libllvmmcjit \
-	lib/clang/libllvmmcparser \
-	lib/clang/libllvmmipsasmparser \
-	lib/clang/libllvmmipsasmprinter \
-	lib/clang/libllvmmipscodegen \
-	lib/clang/libllvmmipsdesc \
-	lib/clang/libllvmmipsdisassembler \
-	lib/clang/libllvmmipsinfo \
-	lib/clang/libllvmobject \
-	lib/clang/libllvmpowerpcasmparser \
-	lib/clang/libllvmpowerpcasmprinter \
-	lib/clang/libllvmpowerpccodegen \
-	lib/clang/libllvmpowerpcdesc \
-	lib/clang/libllvmpowerpcdisassembler \
-	lib/clang/libllvmpowerpcinfo \
-	lib/clang/libllvmprofiledata \
-	lib/clang/libllvmruntimedyld \
-	lib/clang/libllvmscalaropts \
-	lib/clang/libllvmselectiondag \
-	lib/clang/libllvmsparcasmparser \
-	lib/clang/libllvmsparcasmprinter \
-	lib/clang/libllvmsparccodegen \
-	lib/clang/libllvmsparcdesc \
-	lib/clang/libllvmsparcdisassembler \
-	lib/clang/libllvmsparcinfo \
-	lib/clang/libllvmsupport \
-	lib/clang/libllvmtarget \
-	lib/clang/libllvmtransformutils \
-	lib/clang/libllvmx86asmparser \
-	lib/clang/libllvmx86asmprinter \
-	lib/clang/libllvmx86codegen \
-	lib/clang/libllvmx86desc \
-	lib/clang/libllvmx86disassembler \
-	lib/clang/libllvmx86info \
-	lib/clang/libllvmx86utils \
-	lib/libc \
-	lib/libc++ \
-	lib/libcompiler_rt \
-	lib/libthr \
-	lib/libz \
-	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/llvm-symbolizer/Makefile b/usr.bin/clang/llvm-symbolizer/Makefile
index 142e3075149f..1c8719439813 100644
--- a/usr.bin/clang/llvm-symbolizer/Makefile
+++ b/usr.bin/clang/llvm-symbolizer/Makefile
@@ -1,23 +1,10 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+PROG_CXX=	llvm-symbolizer
 
-PROG_CXX=llvm-symbolizer
-
-SRCDIR=	tools/llvm-symbolizer
-SRCS=	llvm-symbolizer.cpp
-
-LIBDEPS=llvmsymbolize \
-	llvmdebuginfodwarf \
-	llvmdebuginfopdb \
-	llvmdebuginfocodeview \
-	llvmobject \
-	llvmbitreader \
-	llvmcore \
-	llvmmcparser \
-	llvmmc \
-	llvmsupport
+SRCDIR=		tools/llvm-symbolizer
+SRCS+=		llvm-symbolizer.cpp
 
 LIBADD+=	z
 
-.include "../clang.prog.mk"
+.include "../llvm.prog.mk"
diff --git a/usr.bin/clang/llvm-symbolizer/Makefile.depend b/usr.bin/clang/llvm-symbolizer/Makefile.depend
deleted file mode 100644
index d489ccea0a94..000000000000
--- a/usr.bin/clang/llvm-symbolizer/Makefile.depend
+++ /dev/null
@@ -1,32 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	gnu/lib/csu \
-	gnu/lib/libgcc \
-	include \
-	include/xlocale \
-	lib/${CSU_DIR} \
-	lib/clang/libllvmbitreader \
-	lib/clang/libllvmcore \
-	lib/clang/libllvmdebuginfodwarf \
-	lib/clang/libllvmdebuginfopdb \
-	lib/clang/libllvmmc \
-	lib/clang/libllvmmcparser \
-	lib/clang/libllvmobject \
-	lib/clang/libllvmsupport \
-	lib/clang/libllvmsymbolize \
-	lib/libc \
-	lib/libc++ \
-	lib/libcompiler_rt \
-	lib/libthr \
-	lib/libz \
-	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/llvm-tblgen/Makefile b/usr.bin/clang/llvm-tblgen/Makefile
index 2ca876a89f8f..0963526a80dc 100644
--- a/usr.bin/clang/llvm-tblgen/Makefile
+++ b/usr.bin/clang/llvm-tblgen/Makefile
@@ -1,45 +1,40 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+PROG_CXX=	llvm-tblgen
 
-PROG_CXX=llvm-tblgen
+SRCDIR=		utils/TableGen
+SRCS+=		AsmMatcherEmitter.cpp
+SRCS+=		AsmWriterEmitter.cpp
+SRCS+=		AsmWriterInst.cpp
+SRCS+=		Attributes.cpp
+SRCS+=		CTagsEmitter.cpp
+SRCS+=		CallingConvEmitter.cpp
+SRCS+=		CodeEmitterGen.cpp
+SRCS+=		CodeGenDAGPatterns.cpp
+SRCS+=		CodeGenInstruction.cpp
+SRCS+=		CodeGenMapTable.cpp
+SRCS+=		CodeGenRegisters.cpp
+SRCS+=		CodeGenSchedule.cpp
+SRCS+=		CodeGenTarget.cpp
+SRCS+=		DAGISelEmitter.cpp
+SRCS+=		DAGISelMatcher.cpp
+SRCS+=		DAGISelMatcherEmitter.cpp
+SRCS+=		DAGISelMatcherGen.cpp
+SRCS+=		DAGISelMatcherOpt.cpp
+SRCS+=		DFAPacketizerEmitter.cpp
+SRCS+=		DisassemblerEmitter.cpp
+SRCS+=		FastISelEmitter.cpp
+SRCS+=		FixedLenDecoderEmitter.cpp
+SRCS+=		InstrInfoEmitter.cpp
+SRCS+=		IntrinsicEmitter.cpp
+SRCS+=		OptParserEmitter.cpp
+SRCS+=		PseudoLoweringEmitter.cpp
+SRCS+=		RegisterInfoEmitter.cpp
+SRCS+=		SearchableTableEmitter.cpp
+SRCS+=		SubtargetEmitter.cpp
+SRCS+=		TableGen.cpp
+SRCS+=		X86DisassemblerTables.cpp
+SRCS+=		X86ModRMFilters.cpp
+SRCS+=		X86RecognizableInstr.cpp
 
-SRCDIR=	utils/TableGen
-SRCS=	AsmMatcherEmitter.cpp \
-	AsmWriterEmitter.cpp \
-	AsmWriterInst.cpp \
-	Attributes.cpp \
-	CTagsEmitter.cpp \
-	CallingConvEmitter.cpp \
-	CodeEmitterGen.cpp \
-	CodeGenDAGPatterns.cpp \
-	CodeGenInstruction.cpp \
-	CodeGenMapTable.cpp \
-	CodeGenRegisters.cpp \
-	CodeGenSchedule.cpp \
-	CodeGenTarget.cpp \
-	DAGISelEmitter.cpp \
-	DAGISelMatcher.cpp \
-	DAGISelMatcherEmitter.cpp \
-	DAGISelMatcherGen.cpp \
-	DAGISelMatcherOpt.cpp \
-	DFAPacketizerEmitter.cpp \
-	DisassemblerEmitter.cpp \
-	FastISelEmitter.cpp \
-	FixedLenDecoderEmitter.cpp \
-	InstrInfoEmitter.cpp \
-	IntrinsicEmitter.cpp \
-	OptParserEmitter.cpp \
-	PseudoLoweringEmitter.cpp \
-	RegisterInfoEmitter.cpp \
-	SearchableTableEmitter.cpp \
-	SubtargetEmitter.cpp \
-	TableGen.cpp \
-	X86DisassemblerTables.cpp \
-	X86ModRMFilters.cpp \
-	X86RecognizableInstr.cpp
-
-LIBDEPS=llvmtablegen \
-	llvmsupport
-
-.include "../clang.prog.mk"
+.include "../llvm.prog.mk"
diff --git a/usr.bin/clang/llvm-tblgen/Makefile.depend b/usr.bin/clang/llvm-tblgen/Makefile.depend
deleted file mode 100644
index 58ed9a748cc7..000000000000
--- a/usr.bin/clang/llvm-tblgen/Makefile.depend
+++ /dev/null
@@ -1,24 +0,0 @@
-# $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/libthr \
-	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/llvm.prog.mk b/usr.bin/clang/llvm.prog.mk
new file mode 100644
index 000000000000..b85e8013b409
--- /dev/null
+++ b/usr.bin/clang/llvm.prog.mk
@@ -0,0 +1,25 @@
+# $FreeBSD$
+
+LLVM_SRCS=	${.CURDIR}/../../../contrib/llvm
+
+CFLAGS+=	-I${.OBJDIR}/../../../lib/clang/libllvm
+
+.include "${.CURDIR}/../../../lib/clang/llvm.build.mk"
+
+# Special case for the bootstrap-tools phase.
+.if defined(TOOLS_PREFIX) && \
+    (${PROG_CXX} == "clang-tblgen" || ${PROG_CXX} == "llvm-tblgen")
+LIBDEPS+=	llvmminimal
+.else
+LIBDEPS+=	llvm
+.endif
+
+.for lib in ${LIBDEPS}
+DPADD+=		${.OBJDIR}/../../../lib/clang/lib${lib}/lib${lib}.a
+LDADD+=		${.OBJDIR}/../../../lib/clang/lib${lib}/lib${lib}.a
+.endfor
+
+LIBADD+=	ncursesw
+LIBADD+=	pthread
+
+.include <bsd.prog.mk>
diff --git a/usr.bin/clang/opt/Makefile b/usr.bin/clang/opt/Makefile
index 2ea7dc2d5077..9733f9a517eb 100644
--- a/usr.bin/clang/opt/Makefile
+++ b/usr.bin/clang/opt/Makefile
@@ -1,87 +1,16 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+PROG_CXX=	opt
 
-PROG_CXX=opt
-
-SRCDIR=	tools/opt
-SRCS=	AnalysisWrappers.cpp \
-	BreakpointPrinter.cpp \
-	GraphPrinters.cpp \
-	NewPMDriver.cpp \
-	PassPrinters.cpp \
-	PrintSCC.cpp \
-	opt.cpp
-
-TGHDRS=	Attributes \
-	Intrinsics
-
-LIBDEPS=llvmaarch64codegen \
-	llvmaarch64asmparser \
-	llvmaarch64disassembler \
-	llvmarmcodegen \
-	llvmarmasmparser \
-	llvmarmdisassembler \
-	llvmmipscodegen \
-	llvmmipsasmparser \
-	llvmmipsdesc \
-	llvmmipsdisassembler \
-	llvmpowerpccodegen \
-	llvmpowerpcasmparser \
-	llvmpowerpcdesc \
-	llvmpowerpcdisassembler \
-	llvmsparccodegen \
-	llvmsparcasmparser \
-	llvmsparcdesc \
-	llvmsparcdisassembler \
-	llvmx86codegen \
-	llvmx86asmparser \
-	llvmx86desc \
-	llvmx86disassembler \
-	llvmobjcarcopts \
-	llvmpasses \
-	llvmglobalisel \
-	llvmaarch64desc \
-	llvmaarch64asmprinter \
-	llvmaarch64info \
-	llvmaarch64utils \
-	llvmarmdesc \
-	llvmarmasmprinter \
-	llvmarminfo \
-	llvmmipsasmprinter \
-	llvmmipsinfo \
-	llvmpowerpcasmprinter \
-	llvmpowerpcinfo \
-	llvmsparcasmprinter \
-	llvmsparcinfo \
-	llvmasmprinter \
-	llvmdebuginfocodeview \
-	llvmselectiondag \
-	llvmx86asmprinter \
-	llvmx86utils \
-	llvmx86info \
-	llvmmcdisassembler \
-	llvmcodegen \
-	llvmbitwriter \
-	llvmtarget \
-	llvmipo \
-	llvmirreader \
-	llvmasmparser \
-	llvmobject \
-	llvmmcparser \
-	llvmbitreader \
-	llvmlinker \
-	llvminstrumentation \
-	llvmmc \
-	llvmscalaropts \
-	llvminstcombine \
-	llvmvectorize \
-	llvmtransformutils \
-	llvmanalysis \
-	llvmprofiledata \
-	llvmcore \
-	llvmsupport
+SRCDIR=		tools/opt
+SRCS+=		AnalysisWrappers.cpp
+SRCS+=		BreakpointPrinter.cpp
+SRCS+=		GraphPrinters.cpp
+SRCS+=		NewPMDriver.cpp
+SRCS+=		PassPrinters.cpp
+SRCS+=		PrintSCC.cpp
+SRCS+=		opt.cpp
 
 LIBADD+=	z
 
-.include "../clang.prog.mk"
+.include "../llvm.prog.mk"
diff --git a/usr.bin/clang/opt/Makefile.depend b/usr.bin/clang/opt/Makefile.depend
deleted file mode 100644
index b2a718f2d70c..000000000000
--- a/usr.bin/clang/opt/Makefile.depend
+++ /dev/null
@@ -1,87 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	gnu/lib/csu \
-	gnu/lib/libgcc \
-	include \
-	include/xlocale \
-	lib/${CSU_DIR} \
-	lib/clang/libllvmaarch64asmparser \
-	lib/clang/libllvmaarch64asmprinter \
-	lib/clang/libllvmaarch64codegen \
-	lib/clang/libllvmaarch64desc \
-	lib/clang/libllvmaarch64disassembler \
-	lib/clang/libllvmaarch64info \
-	lib/clang/libllvmaarch64utils \
-	lib/clang/libllvmanalysis \
-	lib/clang/libllvmarmasmparser \
-	lib/clang/libllvmarmasmprinter \
-	lib/clang/libllvmarmcodegen \
-	lib/clang/libllvmarmdesc \
-	lib/clang/libllvmarmdisassembler \
-	lib/clang/libllvmarminfo \
-	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/libllvmipo \
-	lib/clang/libllvmirreader \
-	lib/clang/libllvmlinker \
-	lib/clang/libllvmmc \
-	lib/clang/libllvmmcdisassembler \
-	lib/clang/libllvmmcparser \
-	lib/clang/libllvmmipsasmparser \
-	lib/clang/libllvmmipsasmprinter \
-	lib/clang/libllvmmipscodegen \
-	lib/clang/libllvmmipsdesc \
-	lib/clang/libllvmmipsdisassembler \
-	lib/clang/libllvmmipsinfo \
-	lib/clang/libllvmobjcarcopts \
-	lib/clang/libllvmobject \
-	lib/clang/libllvmpasses \
-	lib/clang/libllvmpowerpcasmparser \
-	lib/clang/libllvmpowerpcasmprinter \
-	lib/clang/libllvmpowerpccodegen \
-	lib/clang/libllvmpowerpcdesc \
-	lib/clang/libllvmpowerpcdisassembler \
-	lib/clang/libllvmpowerpcinfo \
-	lib/clang/libllvmprofiledata \
-	lib/clang/libllvmscalaropts \
-	lib/clang/libllvmselectiondag \
-	lib/clang/libllvmsparcasmparser \
-	lib/clang/libllvmsparcasmprinter \
-	lib/clang/libllvmsparccodegen \
-	lib/clang/libllvmsparcdesc \
-	lib/clang/libllvmsparcdisassembler \
-	lib/clang/libllvmsparcinfo \
-	lib/clang/libllvmsupport \
-	lib/clang/libllvmtarget \
-	lib/clang/libllvmtransformutils \
-	lib/clang/libllvmvectorize \
-	lib/clang/libllvmx86asmparser \
-	lib/clang/libllvmx86asmprinter \
-	lib/clang/libllvmx86codegen \
-	lib/clang/libllvmx86desc \
-	lib/clang/libllvmx86disassembler \
-	lib/clang/libllvmx86info \
-	lib/clang/libllvmx86utils \
-	lib/libc \
-	lib/libc++ \
-	lib/libcompiler_rt \
-	lib/libthr \
-	lib/libz \
-	lib/msun \
-	lib/ncurses/ncursesw \
-	usr.bin/clang/llvm-tblgen.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif