aboutsummaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/clang/Makefile54
-rw-r--r--usr.bin/clang/Makefile.inc3
-rw-r--r--usr.bin/clang/bugpoint/Makefile51
-rw-r--r--usr.bin/clang/bugpoint/Makefile.depend45
-rw-r--r--usr.bin/clang/clang-format/Makefile20
-rw-r--r--usr.bin/clang/clang-format/Makefile.depend32
-rw-r--r--usr.bin/clang/clang-tblgen/Makefile29
-rw-r--r--usr.bin/clang/clang-tblgen/Makefile.depend24
-rw-r--r--usr.bin/clang/clang.prog.mk27
-rw-r--r--usr.bin/clang/clang/Makefile108
-rw-r--r--usr.bin/clang/clang/Makefile.depend100
-rw-r--r--usr.bin/clang/llc/Makefile75
-rw-r--r--usr.bin/clang/llc/Makefile.depend83
-rw-r--r--usr.bin/clang/lldb/Makefile186
-rw-r--r--usr.bin/clang/lldb/Makefile.depend159
-rw-r--r--usr.bin/clang/lli/Makefile49
-rw-r--r--usr.bin/clang/lli/Makefile.depend56
-rw-r--r--usr.bin/clang/llvm-ar/Makefile73
-rw-r--r--usr.bin/clang/llvm-ar/Makefile.depend82
-rw-r--r--usr.bin/clang/llvm-as/Makefile19
-rw-r--r--usr.bin/clang/llvm-as/Makefile.depend27
-rw-r--r--usr.bin/clang/llvm-bcanalyzer/Makefile16
-rw-r--r--usr.bin/clang/llvm-bcanalyzer/Makefile.depend26
-rw-r--r--usr.bin/clang/llvm-cov/Makefile37
-rw-r--r--usr.bin/clang/llvm-cov/Makefile.depend30
-rw-r--r--usr.bin/clang/llvm-cxxdump/Makefile71
-rw-r--r--usr.bin/clang/llvm-cxxdump/Makefile.depend79
-rw-r--r--usr.bin/clang/llvm-diff/Makefile24
-rw-r--r--usr.bin/clang/llvm-diff/Makefile.depend28
-rw-r--r--usr.bin/clang/llvm-dis/Makefile17
-rw-r--r--usr.bin/clang/llvm-dis/Makefile.depend27
-rw-r--r--usr.bin/clang/llvm-dwarfdump/Makefile18
-rw-r--r--usr.bin/clang/llvm-dwarfdump/Makefile.depend30
-rw-r--r--usr.bin/clang/llvm-extract/Makefile31
-rw-r--r--usr.bin/clang/llvm-extract/Makefile.depend40
-rw-r--r--usr.bin/clang/llvm-link/Makefile26
-rw-r--r--usr.bin/clang/llvm-link/Makefile.depend35
-rw-r--r--usr.bin/clang/llvm-lto/Makefile79
-rw-r--r--usr.bin/clang/llvm-lto/Makefile.depend87
-rw-r--r--usr.bin/clang/llvm-mc/Makefile52
-rw-r--r--usr.bin/clang/llvm-mc/Makefile.depend79
-rw-r--r--usr.bin/clang/llvm-nm/Makefile46
-rw-r--r--usr.bin/clang/llvm-nm/Makefile.depend80
-rw-r--r--usr.bin/clang/llvm-objdump/Makefile60
-rw-r--r--usr.bin/clang/llvm-objdump/Makefile.depend80
-rw-r--r--usr.bin/clang/llvm-pdbdump/Makefile47
-rw-r--r--usr.bin/clang/llvm-pdbdump/Makefile.depend30
-rw-r--r--usr.bin/clang/llvm-profdata/Makefile16
-rw-r--r--usr.bin/clang/llvm-profdata/Makefile.depend31
-rw-r--r--usr.bin/clang/llvm-rtdyld/Makefile72
-rw-r--r--usr.bin/clang/llvm-rtdyld/Makefile.depend83
-rw-r--r--usr.bin/clang/llvm-symbolizer/Makefile21
-rw-r--r--usr.bin/clang/llvm-symbolizer/Makefile.depend32
-rw-r--r--usr.bin/clang/llvm-tblgen/Makefile77
-rw-r--r--usr.bin/clang/llvm-tblgen/Makefile.depend24
-rw-r--r--usr.bin/clang/llvm.prog.mk25
-rw-r--r--usr.bin/clang/opt/Makefile91
-rw-r--r--usr.bin/clang/opt/Makefile.depend87
58 files changed, 282 insertions, 2754 deletions
diff --git a/usr.bin/clang/Makefile b/usr.bin/clang/Makefile
index 5d4c514baa8f1..d560a8a08c68a 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 0000000000000..265f86d1ed55a
--- /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 ebe81473f6165..2f0cb9eb417fa 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 00803ce5994f0..0000000000000
--- 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 58213ae6bbcac..ddcc89ab497d3 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 6c4e251a3e77c..0000000000000
--- 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 0f64ad373789f..8d6df0822656f 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 58ed9a748cc7b..0000000000000
--- 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 b1dd7c184a5a4..231c5cdd897a4 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 832ef3491df20..b32f6649cb19f 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 eea6f096a1155..0000000000000
--- 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 4fb6b913c74a8..0855f3b0ee254 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 374f8711669dd..0000000000000
--- 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 915600db115d5..1c3603ddf098b 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 acf1b8cea0805..0000000000000
--- 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 eacbf87e4e6ca..ebe7a008279c5 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 7ceb1a77c55d1..0000000000000
--- 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 0a67286ca3d59..5468821274967 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 6c076d851aa3e..0000000000000
--- 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 433c43b8fbd40..02c853e206550 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 a41464d429d5a..0000000000000
--- 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 f900fdc08f26a..7e878991c6d1a 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 d5ac336e90c92..0000000000000
--- 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 eb0db1a42f8d0..17ad0e11a4608 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 652277f620111..0000000000000
--- 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 78f94d48fb6a2..21d0daf3ee119 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 e1873fe58abc2..0000000000000
--- 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 d836a41553607..4c667853d9c5b 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 0406d2f347e71..0000000000000
--- 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 85289384f4006..97de6e056f877 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 bf56a27044f51..0000000000000
--- 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 3cbec80dcff20..d56bb43954951 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 0f05178187278..0000000000000
--- 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 04f4050785754..cc356a060c4b2 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 35cf93b1855a6..0000000000000
--- 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 311987ba00d41..9af68e8fa1ff6 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 0195115bc3ebb..0000000000000
--- 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 4f6e25604eb82..500605868b836 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 6915918c6cc2f..0000000000000
--- 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 2ab2389eec8e9..64176f1b72a60 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 e1873fe58abc2..0000000000000
--- 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 34cceaafdd6c2..55e35c3c14dc7 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 df4b7a20a73ed..0000000000000
--- 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 2d714bc66f107..91bb011440e56 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 40d8758bddcce..0000000000000
--- 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 e7876453c386d..27680dcb217e2 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 99720d3f22b49..0000000000000
--- 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 a3986f7c3b334..d243113c6a734 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 42a42b2f02966..0000000000000
--- 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 39192aea53332..2e7b9b4f8d10a 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 bf4a9bae9d7a0..0000000000000
--- 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 142e3075149f8..1c87194398139 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 d489ccea0a943..0000000000000
--- 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 2ca876a89f8f1..0963526a80dc6 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 58ed9a748cc7b..0000000000000
--- 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 0000000000000..b85e8013b4096
--- /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 2ea7dc2d50772..9733f9a517ebe 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 b2a718f2d70c9..0000000000000
--- 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