aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ObsoleteFiles.inc1
-rw-r--r--lib/clang/Makefile4
-rw-r--r--lib/clang/libllvmaarch64disassembler/Makefile9
-rw-r--r--lib/clang/libllvmexecutionengine/Makefile2
-rw-r--r--lib/clang/libllvminterpreter/Makefile3
-rw-r--r--lib/clang/libllvmlto/Makefile3
-rw-r--r--lib/clang/libllvmmcjit/Makefile2
-rw-r--r--lib/clang/libllvmmirparser/Makefile11
-rw-r--r--lib/clang/libllvmorcjit/Makefile3
-rw-r--r--lib/clang/libllvmpasses/Makefile3
-rw-r--r--lib/clang/libllvmsymbolize/Makefile12
-rw-r--r--lib/clang/libllvmx86disassembler/Makefile7
-rw-r--r--usr.bin/clang/Makefile1
-rw-r--r--usr.bin/clang/bugpoint/Makefile13
-rw-r--r--usr.bin/clang/clang/Makefile2
-rw-r--r--usr.bin/clang/llc/Makefile20
-rw-r--r--usr.bin/clang/lldb/Makefile12
-rw-r--r--usr.bin/clang/lli/Makefile9
-rw-r--r--usr.bin/clang/llvm-ar/Makefile18
-rw-r--r--usr.bin/clang/llvm-as/Makefile2
-rw-r--r--usr.bin/clang/llvm-bcanalyzer/Makefile2
-rw-r--r--usr.bin/clang/llvm-cxxdump/Makefile16
-rw-r--r--usr.bin/clang/llvm-diff/Makefile2
-rw-r--r--usr.bin/clang/llvm-dis/Makefile4
-rw-r--r--usr.bin/clang/llvm-extract/Makefile10
-rw-r--r--usr.bin/clang/llvm-link/Makefile8
-rw-r--r--usr.bin/clang/llvm-lto/Makefile25
-rw-r--r--usr.bin/clang/llvm-mc/Makefile16
-rw-r--r--usr.bin/clang/llvm-nm/Makefile18
-rw-r--r--usr.bin/clang/llvm-objdump/Makefile16
-rw-r--r--usr.bin/clang/llvm-profdata/Makefile2
-rw-r--r--usr.bin/clang/llvm-rtdyld/Makefile16
-rw-r--r--usr.bin/clang/llvm-symbolizer/Makefile6
-rw-r--r--usr.bin/clang/macho-dump/Makefile18
-rw-r--r--usr.bin/clang/opt/Makefile22
35 files changed, 172 insertions, 146 deletions
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 8d6a94be9580..f0923e84578c 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -39,6 +39,7 @@
# done
# yyyymmdd: new clang import which bumps version from 3.7.1 to 3.8.0.
+OLD_FILES+=usr/bin/macho-dump
OLD_FILES+=usr/lib/clang/3.7.1/include/sanitizer/allocator_interface.h
OLD_FILES+=usr/lib/clang/3.7.1/include/sanitizer/asan_interface.h
OLD_FILES+=usr/lib/clang/3.7.1/include/sanitizer/common_interface_defs.h
diff --git a/lib/clang/Makefile b/lib/clang/Makefile
index eacda631abc6..42f190a09ebe 100644
--- a/lib/clang/Makefile
+++ b/lib/clang/Makefile
@@ -66,7 +66,6 @@ SUBDIR= libclanganalysis \
libllvmarmasmprinter \
libllvmarmcodegen \
libllvmarmdesc \
- libllvmarmdisassembler \
libllvmarminfo \
libllvmmipsasmparser \
libllvmmipsasmprinter \
@@ -77,7 +76,6 @@ SUBDIR= libclanganalysis \
libllvmpowerpcasmprinter \
libllvmpowerpccodegen \
libllvmpowerpcdesc \
- libllvmpowerpcdisassembler \
libllvmpowerpcinfo \
libllvmsparcasmparser \
libllvmsparcasmprinter \
@@ -105,9 +103,11 @@ SUBDIR+=libllvmdebuginfodwarf \
.if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLDB} != "no"
SUBDIR+=libllvmexecutionengine \
libllvmaarch64disassembler \
+ libllvmarmdisassembler \
libllvminterpreter \
libllvmmcjit \
libllvmmipsdisassembler \
+ libllvmpowerpcdisassembler \
libllvmruntimedyld \
libllvmsparcdisassembler \
libllvmx86disassembler
diff --git a/lib/clang/libllvmaarch64disassembler/Makefile b/lib/clang/libllvmaarch64disassembler/Makefile
index 12b5025b44e9..f8d71a940328 100644
--- a/lib/clang/libllvmaarch64disassembler/Makefile
+++ b/lib/clang/libllvmaarch64disassembler/Makefile
@@ -1,16 +1,13 @@
# $FreeBSD$
-.include <src.opts.mk>
+.include <bsd.own.mk>
LIB= llvmaarch64disassembler
SRCDIR= lib/Target/AArch64/Disassembler
INCDIR= lib/Target/AArch64
-SRCS= AArch64Disassembler.cpp
-
-.if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLDB} != "no"
-SRCS+= AArch64ExternalSymbolizer.cpp
-.endif
+SRCS= AArch64Disassembler.cpp \
+ AArch64ExternalSymbolizer.cpp
TGHDRS= Attributes \
Intrinsics \
diff --git a/lib/clang/libllvmexecutionengine/Makefile b/lib/clang/libllvmexecutionengine/Makefile
index 13855a010ae7..304473b8f9b5 100644
--- a/lib/clang/libllvmexecutionengine/Makefile
+++ b/lib/clang/libllvmexecutionengine/Makefile
@@ -11,4 +11,6 @@ SRCS= ExecutionEngine.cpp \
SectionMemoryManager.cpp \
TargetSelect.cpp
+TGHDRS= Attributes
+
.include "../clang.lib.mk"
diff --git a/lib/clang/libllvminterpreter/Makefile b/lib/clang/libllvminterpreter/Makefile
index 06fcca4fb9f9..52880e0890ae 100644
--- a/lib/clang/libllvminterpreter/Makefile
+++ b/lib/clang/libllvminterpreter/Makefile
@@ -9,6 +9,7 @@ SRCS= Execution.cpp \
ExternalFunctions.cpp \
Interpreter.cpp \
-TGHDRS= Intrinsics
+TGHDRS= Attributes \
+ Intrinsics
.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmlto/Makefile b/lib/clang/libllvmlto/Makefile
index 776c45f573ca..c7cb9da53fe3 100644
--- a/lib/clang/libllvmlto/Makefile
+++ b/lib/clang/libllvmlto/Makefile
@@ -8,6 +8,7 @@ SRCDIR= lib/LTO
SRCS= LTOCodeGenerator.cpp \
LTOModule.cpp
-TGHDRS= Intrinsics
+TGHDRS= Attributes \
+ Intrinsics
.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmmcjit/Makefile b/lib/clang/libllvmmcjit/Makefile
index 207fd81725d4..632dd5e425af 100644
--- a/lib/clang/libllvmmcjit/Makefile
+++ b/lib/clang/libllvmmcjit/Makefile
@@ -7,4 +7,6 @@ LIB= llvmmcjit
SRCDIR= lib/ExecutionEngine/MCJIT
SRCS= MCJIT.cpp
+TGHDRS= Attributes
+
.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmmirparser/Makefile b/lib/clang/libllvmmirparser/Makefile
index a3a64c69ab5c..463244128a79 100644
--- a/lib/clang/libllvmmirparser/Makefile
+++ b/lib/clang/libllvmmirparser/Makefile
@@ -1,15 +1,14 @@
# $FreeBSD$
-.include <src.opts.mk>
+.include <bsd.own.mk>
LIB= llvmmirparser
SRCDIR= lib/CodeGen/MIRParser
-SRCS= MIParser.cpp \
+SRCS= MILexer.cpp \
+ MIParser.cpp \
MIRParser.cpp
-.if ${MK_CLANG_EXTRAS} != "no"
-SRCS+= MILexer.cpp
-.endif
-
+TGHDRS= Attributes
+
.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmorcjit/Makefile b/lib/clang/libllvmorcjit/Makefile
index 27259b2914ff..985d5ab7724f 100644
--- a/lib/clang/libllvmorcjit/Makefile
+++ b/lib/clang/libllvmorcjit/Makefile
@@ -13,4 +13,7 @@ SRCS= ExecutionUtils.cpp \
OrcMCJITReplacement.cpp \
OrcTargetSupport.cpp
+TGHDRS= Attributes \
+ Intrinsics
+
.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmpasses/Makefile b/lib/clang/libllvmpasses/Makefile
index ed4e20dbf2b9..eba54f6b0006 100644
--- a/lib/clang/libllvmpasses/Makefile
+++ b/lib/clang/libllvmpasses/Makefile
@@ -7,6 +7,7 @@ LIB= llvmpasses
SRCDIR= lib/Passes
SRCS= PassBuilder.cpp
-TGHDRS= Intrinsics
+TGHDRS= Attributes \
+ Intrinsics
.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmsymbolize/Makefile b/lib/clang/libllvmsymbolize/Makefile
new file mode 100644
index 000000000000..88a73c16beec
--- /dev/null
+++ b/lib/clang/libllvmsymbolize/Makefile
@@ -0,0 +1,12 @@
+# $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/libllvmx86disassembler/Makefile b/lib/clang/libllvmx86disassembler/Makefile
index 23ec976875d4..5470d9f09794 100644
--- a/lib/clang/libllvmx86disassembler/Makefile
+++ b/lib/clang/libllvmx86disassembler/Makefile
@@ -6,11 +6,8 @@ LIB= llvmx86disassembler
SRCDIR= lib/Target/X86/Disassembler
INCDIR= lib/Target/X86
-SRCS= X86Disassembler.cpp
-
-.if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLDB} != "no"
-SRCS+= X86DisassemblerDecoder.cpp
-.endif
+SRCS= X86Disassembler.cpp \
+ X86DisassemblerDecoder.cpp
TGHDRS= X86GenDisassemblerTables \
X86GenInstrInfo \
diff --git a/usr.bin/clang/Makefile b/usr.bin/clang/Makefile
index 8e42cdad3548..692b6c806590 100644
--- a/usr.bin/clang/Makefile
+++ b/usr.bin/clang/Makefile
@@ -27,7 +27,6 @@ SUBDIR+=bugpoint \
llvm-profdata \
llvm-rtdyld \
llvm-symbolizer \
- macho-dump \
opt
.endif
diff --git a/usr.bin/clang/bugpoint/Makefile b/usr.bin/clang/bugpoint/Makefile
index dc520bbb6c6a..5dd0ede1c444 100644
--- a/usr.bin/clang/bugpoint/Makefile
+++ b/usr.bin/clang/bugpoint/Makefile
@@ -15,24 +15,25 @@ SRCS= BugDriver.cpp \
ToolRunner.cpp \
bugpoint.cpp
-TGHDRS= Intrinsics
+TGHDRS= Attributes \
+ Intrinsics
+
LIBDEPS=llvmcodegen \
llvmtarget \
llvmobjcarcopts \
- llvmirreader \
llvmbitwriter \
- llvmlinker \
llvmipo \
llvmvectorize \
+ llvmlinker \
+ llvmirreader \
llvmscalaropts \
+ llvminstcombine \
+ llvminstrumentation \
llvmprofiledata \
llvmobject \
llvmmcparser \
llvmbitreader \
- llvminstcombine \
- llvminstrumentation \
llvmtransformutils \
- llvmipa \
llvmmc \
llvmanalysis \
llvmasmparser \
diff --git a/usr.bin/clang/clang/Makefile b/usr.bin/clang/clang/Makefile
index b6deacb335cc..e28ba9de5f32 100644
--- a/usr.bin/clang/clang/Makefile
+++ b/usr.bin/clang/clang/Makefile
@@ -77,7 +77,6 @@ LIBDEPS=clangfrontendtool \
llvmaarch64info \
llvmaarch64asmprinter \
llvmaarch64utils \
- llvmarmdisassembler \
llvmarmcodegen \
llvmarmasmparser \
llvmarmdesc \
@@ -88,7 +87,6 @@ LIBDEPS=clangfrontendtool \
llvmmipsdesc \
llvmmipsinfo \
llvmmipsasmprinter \
- llvmpowerpcdisassembler \
llvmpowerpccodegen \
llvmpowerpcasmparser \
llvmpowerpcdesc \
diff --git a/usr.bin/clang/llc/Makefile b/usr.bin/clang/llc/Makefile
index d54a3ce3c65a..e6c0d5a75b2c 100644
--- a/usr.bin/clang/llc/Makefile
+++ b/usr.bin/clang/llc/Makefile
@@ -7,7 +7,9 @@ PROG_CXX=llc
SRCDIR= tools/llc
SRCS= llc.cpp
-TGHDRS= Intrinsics
+TGHDRS= Attributes \
+ Intrinsics
+
LIBDEPS=llvmmirparser \
llvmirreader \
llvmasmparser \
@@ -16,32 +18,32 @@ LIBDEPS=llvmmirparser \
llvmaarch64asmparser \
llvmaarch64desc \
llvmaarch64info \
- llvmaarch64instprinter \
+ llvmaarch64asmprinter \
llvmaarch64utils \
llvmarmdisassembler \
llvmarmcodegen \
llvmarmasmparser \
llvmarmdesc \
llvmarminfo \
- llvmarminstprinter \
+ llvmarmasmprinter \
llvmmipsdisassembler \
llvmmipscodegen \
llvmmipsasmparser \
llvmmipsdesc \
llvmmipsinfo \
- llvmmipsinstprinter \
+ llvmmipsasmprinter \
llvmpowerpcdisassembler \
llvmpowerpccodegen \
llvmpowerpcasmparser \
llvmpowerpcdesc \
llvmpowerpcinfo \
- llvmpowerpcinstprinter \
+ llvmpowerpcasmprinter \
llvmsparcdisassembler \
llvmsparccodegen \
llvmsparcasmparser \
llvmsparcdesc \
llvmsparcinfo \
- llvmsparcinstprinter \
+ llvmsparcasmprinter \
llvmx86disassembler \
llvmx86asmparser \
llvmx86codegen \
@@ -50,11 +52,11 @@ LIBDEPS=llvmmirparser \
llvmcodegen \
llvmtarget \
llvmscalaropts \
- llvmprofiledata \
llvminstcombine \
llvminstrumentation \
+ llvmprofiledata \
llvmtransformutils \
- llvmipa \
+ llvmbitwriter \
llvmanalysis \
llvmx86desc \
llvmobject \
@@ -62,7 +64,7 @@ LIBDEPS=llvmmirparser \
llvmbitreader \
llvmmcdisassembler \
llvmx86info \
- llvmx86instprinter \
+ llvmx86asmprinter \
llvmmc \
llvmx86utils \
llvmcore \
diff --git a/usr.bin/clang/lldb/Makefile b/usr.bin/clang/lldb/Makefile
index 1b014e6d0a0a..cf4ddf5ceef0 100644
--- a/usr.bin/clang/lldb/Makefile
+++ b/usr.bin/clang/lldb/Makefile
@@ -109,32 +109,32 @@ LIBDEPS=\
llvmaarch64asmparser \
llvmaarch64desc \
llvmaarch64info \
- llvmaarch64instprinter \
+ llvmaarch64asmprinter \
llvmaarch64utils \
llvmarmdisassembler \
llvmarmcodegen \
llvmarmasmparser \
llvmarmdesc \
llvmarminfo \
- llvmarminstprinter \
+ llvmarmasmprinter \
llvmmipsdisassembler \
llvmmipscodegen \
llvmmipsasmparser \
llvmmipsdesc \
llvmmipsinfo \
- llvmmipsinstprinter \
+ llvmmipsasmprinter \
llvmpowerpcdisassembler \
llvmpowerpccodegen \
llvmpowerpcasmparser \
llvmpowerpcdesc \
llvmpowerpcinfo \
- llvmpowerpcinstprinter \
+ llvmpowerpcasmprinter \
llvmsparcdisassembler \
llvmsparccodegen \
llvmsparcasmparser \
llvmsparcdesc \
llvmsparcinfo \
- llvmsparcinstprinter \
+ llvmsparcasmprinter \
llvmx86disassembler \
llvmx86asmparser \
llvmx86codegen \
@@ -155,7 +155,7 @@ LIBDEPS=\
llvmbitreader \
llvmmcdisassembler \
llvmx86info \
- llvmx86instprinter \
+ llvmx86asmprinter \
llvmmc \
llvmx86utils \
llvmcore \
diff --git a/usr.bin/clang/lli/Makefile b/usr.bin/clang/lli/Makefile
index 785209552df8..149602ee7702 100644
--- a/usr.bin/clang/lli/Makefile
+++ b/usr.bin/clang/lli/Makefile
@@ -11,6 +11,9 @@ SRCS= OrcLazyJIT.cpp \
RemoteTargetExternal.cpp \
lli.cpp
+TGHDRS= Attributes \
+ Intrinsics
+
LIBDEPS=llvmx86disassembler \
llvmx86asmparser \
llvmirreader \
@@ -19,19 +22,19 @@ LIBDEPS=llvmx86disassembler \
llvmx86desc \
llvmx86info \
llvmmcdisassembler \
- llvmx86instprinter \
+ llvmx86asmprinter \
llvmx86utils \
llvmselectiondag \
llvmasmprinter \
llvminterpreter \
llvmcodegen \
llvmscalaropts \
- llvmprofiledata \
llvminstcombine \
+ llvmbitwriter \
llvminstrumentation \
+ llvmprofiledata \
llvmorcjit \
llvmtransformutils \
- llvmipa \
llvmmcjit \
llvmexecutionengine \
llvmtarget \
diff --git a/usr.bin/clang/llvm-ar/Makefile b/usr.bin/clang/llvm-ar/Makefile
index 512625761abc..8be2741df7a5 100644
--- a/usr.bin/clang/llvm-ar/Makefile
+++ b/usr.bin/clang/llvm-ar/Makefile
@@ -7,6 +7,8 @@ PROG_CXX=llvm-ar
SRCDIR= tools/llvm-ar
SRCS= llvm-ar.cpp
+TGHDRS= Attributes
+
LIBDEPS=llvmlibdriver \
llvmoption \
llvmaarch64disassembler \
@@ -14,32 +16,32 @@ LIBDEPS=llvmlibdriver \
llvmaarch64asmparser \
llvmaarch64desc \
llvmaarch64info \
- llvmaarch64instprinter \
+ llvmaarch64asmprinter \
llvmaarch64utils \
llvmarmdisassembler \
llvmarmcodegen \
llvmarmasmparser \
llvmarmdesc \
llvmarminfo \
- llvmarminstprinter \
+ llvmarmasmprinter \
llvmmipsdisassembler \
llvmmipscodegen \
llvmmipsasmparser \
llvmmipsdesc \
llvmmipsinfo \
- llvmmipsinstprinter \
+ llvmmipsasmprinter \
llvmpowerpcdisassembler \
llvmpowerpccodegen \
llvmpowerpcasmparser \
llvmpowerpcdesc \
llvmpowerpcinfo \
- llvmpowerpcinstprinter \
+ llvmpowerpcasmprinter \
llvmsparcdisassembler \
llvmsparccodegen \
llvmsparcasmparser \
llvmsparcdesc \
llvmsparcinfo \
- llvmsparcinstprinter \
+ llvmsparcasmprinter \
llvmx86disassembler \
llvmx86asmparser \
llvmx86codegen \
@@ -48,11 +50,11 @@ LIBDEPS=llvmlibdriver \
llvmcodegen \
llvmtarget \
llvmscalaropts \
- llvmprofiledata \
llvminstcombine \
llvminstrumentation \
+ llvmprofiledata \
llvmtransformutils \
- llvmipa \
+ llvmbitwriter \
llvmanalysis \
llvmx86desc \
llvmobject \
@@ -60,7 +62,7 @@ LIBDEPS=llvmlibdriver \
llvmbitreader \
llvmmcdisassembler \
llvmx86info \
- llvmx86instprinter \
+ llvmx86asmprinter \
llvmmc \
llvmx86utils \
llvmcore \
diff --git a/usr.bin/clang/llvm-as/Makefile b/usr.bin/clang/llvm-as/Makefile
index d3d07327e80c..964f6faea604 100644
--- a/usr.bin/clang/llvm-as/Makefile
+++ b/usr.bin/clang/llvm-as/Makefile
@@ -7,6 +7,8 @@ PROG_CXX=llvm-as
SRCDIR= tools/llvm-as
SRCS= llvm-as.cpp
+TGHDRS= Attributes
+
LIBDEPS=llvmbitwriter \
llvmasmparser \
llvmcore \
diff --git a/usr.bin/clang/llvm-bcanalyzer/Makefile b/usr.bin/clang/llvm-bcanalyzer/Makefile
index 54446dcb1cdf..f900fdc08f26 100644
--- a/usr.bin/clang/llvm-bcanalyzer/Makefile
+++ b/usr.bin/clang/llvm-bcanalyzer/Makefile
@@ -7,6 +7,8 @@ PROG_CXX=llvm-bcanalyzer
SRCDIR= tools/llvm-bcanalyzer
SRCS= llvm-bcanalyzer.cpp
+TGHDRS= Attributes
+
LIBDEPS=llvmbitreader \
llvmcore \
llvmsupport
diff --git a/usr.bin/clang/llvm-cxxdump/Makefile b/usr.bin/clang/llvm-cxxdump/Makefile
index b483930fb8e5..0c2e97889e86 100644
--- a/usr.bin/clang/llvm-cxxdump/Makefile
+++ b/usr.bin/clang/llvm-cxxdump/Makefile
@@ -14,32 +14,32 @@ LIBDEPS=llvmaarch64disassembler \
llvmaarch64asmparser \
llvmaarch64desc \
llvmaarch64info \
- llvmaarch64instprinter \
+ llvmaarch64asmprinter \
llvmaarch64utils \
llvmarmdisassembler \
llvmarmcodegen \
llvmarmasmparser \
llvmarmdesc \
llvmarminfo \
- llvmarminstprinter \
+ llvmarmasmprinter \
llvmmipsdisassembler \
llvmmipscodegen \
llvmmipsasmparser \
llvmmipsdesc \
llvmmipsinfo \
- llvmmipsinstprinter \
+ llvmmipsasmprinter \
llvmpowerpcdisassembler \
llvmpowerpccodegen \
llvmpowerpcasmparser \
llvmpowerpcdesc \
llvmpowerpcinfo \
- llvmpowerpcinstprinter \
+ llvmpowerpcasmprinter \
llvmsparcdisassembler \
llvmsparccodegen \
llvmsparcasmparser \
llvmsparcdesc \
llvmsparcinfo \
- llvmsparcinstprinter \
+ llvmsparcasmprinter \
llvmx86disassembler \
llvmx86asmparser \
llvmx86codegen \
@@ -48,16 +48,16 @@ LIBDEPS=llvmaarch64disassembler \
llvmcodegen \
llvmtarget \
llvmscalaropts \
- llvmprofiledata \
llvminstcombine \
llvminstrumentation \
+ llvmprofiledata \
llvmtransformutils \
- llvmipa \
+ llvmbitwriter \
llvmanalysis \
llvmx86desc \
llvmmcdisassembler \
llvmx86info \
- llvmx86instprinter \
+ llvmx86asmprinter \
llvmx86utils \
llvmobject \
llvmmcparser \
diff --git a/usr.bin/clang/llvm-diff/Makefile b/usr.bin/clang/llvm-diff/Makefile
index 527daa22908f..0891d47256c1 100644
--- a/usr.bin/clang/llvm-diff/Makefile
+++ b/usr.bin/clang/llvm-diff/Makefile
@@ -10,6 +10,8 @@ SRCS= llvm-diff.cpp \
DiffLog.cpp \
DifferenceEngine.cpp
+TGHDRS= Attributes
+
LIBDEPS=llvmirreader \
llvmbitreader \
llvmasmparser \
diff --git a/usr.bin/clang/llvm-dis/Makefile b/usr.bin/clang/llvm-dis/Makefile
index 62e5b2ec3ae8..0fb8884debd1 100644
--- a/usr.bin/clang/llvm-dis/Makefile
+++ b/usr.bin/clang/llvm-dis/Makefile
@@ -7,7 +7,9 @@ PROG_CXX=llvm-dis
SRCDIR= tools/llvm-dis
SRCS= llvm-dis.cpp
-TGHDRS= Intrinsics
+TGHDRS= Attributes \
+ Intrinsics
+
LIBDEPS=llvmanalysis \
llvmbitreader \
llvmcore \
diff --git a/usr.bin/clang/llvm-extract/Makefile b/usr.bin/clang/llvm-extract/Makefile
index 5e5f4a910c59..92d69c3f4d85 100644
--- a/usr.bin/clang/llvm-extract/Makefile
+++ b/usr.bin/clang/llvm-extract/Makefile
@@ -7,9 +7,9 @@ PROG_CXX=llvm-extract
SRCDIR= tools/llvm-extract
SRCS= llvm-extract.cpp
-LIBDEPS=llvmirreader \
- llvmasmparser \
- llvmbitwriter \
+TGHDRS= Attributes
+
+LIBDEPS=llvmbitwriter \
llvmipo \
llvmvectorize \
llvmscalaropts \
@@ -17,10 +17,12 @@ LIBDEPS=llvmirreader \
llvmobject \
llvmmcparser \
llvmmc \
+ llvmlinker \
+ llvmirreader \
llvmbitreader \
+ llvmasmparser \
llvminstcombine \
llvmtransformutils \
- llvmipa \
llvmanalysis \
llvmcore \
llvmsupport
diff --git a/usr.bin/clang/llvm-link/Makefile b/usr.bin/clang/llvm-link/Makefile
index d75a85476551..d556f9a8ce45 100644
--- a/usr.bin/clang/llvm-link/Makefile
+++ b/usr.bin/clang/llvm-link/Makefile
@@ -7,13 +7,17 @@ PROG_CXX=llvm-link
SRCDIR= tools/llvm-link
SRCS= llvm-link.cpp
-LIBDEPS=llvmirreader \
+TGHDRS= Attributes
+
+LIBDEPS=llvmobject \
+ llvmmcparser \
+ llvmmc \
+ llvmirreader \
llvmasmparser \
llvmbitwriter \
llvmbitreader \
llvmlinker \
llvmtransformutils \
- llvmipa \
llvmanalysis \
llvmcore \
llvmsupport
diff --git a/usr.bin/clang/llvm-lto/Makefile b/usr.bin/clang/llvm-lto/Makefile
index abda95144d22..0c1fe27410bd 100644
--- a/usr.bin/clang/llvm-lto/Makefile
+++ b/usr.bin/clang/llvm-lto/Makefile
@@ -8,38 +8,40 @@ PROG_CXX=llvm-lto
SRCDIR= tools/llvm-lto
SRCS= llvm-lto.cpp
-TGHDRS= Intrinsics
+TGHDRS= Attributes \
+ Intrinsics
+
LIBDEPS=llvmaarch64disassembler \
llvmaarch64codegen \
llvmaarch64asmparser \
llvmaarch64desc \
llvmaarch64info \
- llvmaarch64instprinter \
+ llvmaarch64asmprinter \
llvmaarch64utils \
llvmarmdisassembler \
llvmarmcodegen \
llvmarmasmparser \
llvmarmdesc \
llvmarminfo \
- llvmarminstprinter \
+ llvmarmasmprinter \
llvmmipsdisassembler \
llvmmipscodegen \
llvmmipsasmparser \
llvmmipsdesc \
llvmmipsinfo \
- llvmmipsinstprinter \
+ llvmmipsasmprinter \
llvmpowerpcdisassembler \
llvmpowerpccodegen \
llvmpowerpcasmparser \
llvmpowerpcdesc \
llvmpowerpcinfo \
- llvmpowerpcinstprinter \
+ llvmpowerpcasmprinter \
llvmsparcdisassembler \
llvmsparccodegen \
llvmsparcasmparser \
llvmsparcdesc \
llvmsparcinfo \
- llvmsparcinstprinter \
+ llvmsparcasmprinter \
llvmx86disassembler \
llvmx86asmparser \
llvmx86codegen \
@@ -47,24 +49,25 @@ LIBDEPS=llvmaarch64disassembler \
llvmasmprinter \
llvmx86desc \
llvmx86info \
- llvmx86instprinter \
+ llvmx86asmprinter \
llvmx86utils \
llvmmcdisassembler \
llvmlto \
llvmobjcarcopts \
- llvmlinker \
llvmipo \
llvmvectorize \
+ llvmlinker \
+ llvmirreader \
+ llvmasmparser \
llvmcodegen \
llvmtarget \
llvmscalaropts \
+ llvminstcombine \
+ llvminstrumentation \
llvmprofiledata \
llvmobject \
llvmmcparser \
- llvminstcombine \
- llvminstrumentation \
llvmtransformutils \
- llvmipa \
llvmmc \
llvmbitwriter \
llvmbitreader \
diff --git a/usr.bin/clang/llvm-mc/Makefile b/usr.bin/clang/llvm-mc/Makefile
index 0fe37c1228e3..e6a29ad0a071 100644
--- a/usr.bin/clang/llvm-mc/Makefile
+++ b/usr.bin/clang/llvm-mc/Makefile
@@ -14,32 +14,32 @@ LIBDEPS=llvmaarch64disassembler \
llvmaarch64asmparser \
llvmaarch64desc \
llvmaarch64info \
- llvmaarch64instprinter \
+ llvmaarch64asmprinter \
llvmaarch64utils \
llvmarmdisassembler \
llvmarmcodegen \
llvmarmasmparser \
llvmarmdesc \
llvmarminfo \
- llvmarminstprinter \
+ llvmarmasmprinter \
llvmmipsdisassembler \
llvmmipscodegen \
llvmmipsasmparser \
llvmmipsdesc \
llvmmipsinfo \
- llvmmipsinstprinter \
+ llvmmipsasmprinter \
llvmpowerpcdisassembler \
llvmpowerpccodegen \
llvmpowerpcasmparser \
llvmpowerpcdesc \
llvmpowerpcinfo \
- llvmpowerpcinstprinter \
+ llvmpowerpcasmprinter \
llvmsparcdisassembler \
llvmsparccodegen \
llvmsparcasmparser \
llvmsparcdesc \
llvmsparcinfo \
- llvmsparcinstprinter \
+ llvmsparcasmprinter \
llvmx86disassembler \
llvmx86asmparser \
llvmx86codegen \
@@ -48,11 +48,11 @@ LIBDEPS=llvmaarch64disassembler \
llvmcodegen \
llvmtarget \
llvmscalaropts \
- llvmprofiledata \
llvminstcombine \
llvminstrumentation \
+ llvmprofiledata \
llvmtransformutils \
- llvmipa \
+ llvmbitwriter \
llvmanalysis \
llvmx86desc \
llvmobject \
@@ -60,7 +60,7 @@ LIBDEPS=llvmaarch64disassembler \
llvmbitreader \
llvmmcdisassembler \
llvmx86info \
- llvmx86instprinter \
+ llvmx86asmprinter \
llvmmc \
llvmx86utils \
llvmcore \
diff --git a/usr.bin/clang/llvm-nm/Makefile b/usr.bin/clang/llvm-nm/Makefile
index 38dd8714e5c8..23d3e6ab36f7 100644
--- a/usr.bin/clang/llvm-nm/Makefile
+++ b/usr.bin/clang/llvm-nm/Makefile
@@ -7,37 +7,39 @@ PROG_CXX=llvm-nm
SRCDIR= tools/llvm-nm
SRCS= llvm-nm.cpp
+TGHDRS= Attributes
+
LIBDEPS=llvmaarch64disassembler \
llvmaarch64codegen \
llvmaarch64asmparser \
llvmaarch64desc \
llvmaarch64info \
- llvmaarch64instprinter \
+ llvmaarch64asmprinter \
llvmaarch64utils \
llvmarmdisassembler \
llvmarmcodegen \
llvmarmasmparser \
llvmarmdesc \
llvmarminfo \
- llvmarminstprinter \
+ llvmarmasmprinter \
llvmmipsdisassembler \
llvmmipscodegen \
llvmmipsasmparser \
llvmmipsdesc \
llvmmipsinfo \
- llvmmipsinstprinter \
+ llvmmipsasmprinter \
llvmpowerpcdisassembler \
llvmpowerpccodegen \
llvmpowerpcasmparser \
llvmpowerpcdesc \
llvmpowerpcinfo \
- llvmpowerpcinstprinter \
+ llvmpowerpcasmprinter \
llvmsparcdisassembler \
llvmsparccodegen \
llvmsparcasmparser \
llvmsparcdesc \
llvmsparcinfo \
- llvmsparcinstprinter \
+ llvmsparcasmprinter \
llvmx86disassembler \
llvmx86asmparser \
llvmx86codegen \
@@ -46,11 +48,11 @@ LIBDEPS=llvmaarch64disassembler \
llvmcodegen \
llvmtarget \
llvmscalaropts \
- llvmprofiledata \
llvminstcombine \
llvminstrumentation \
+ llvmprofiledata \
llvmtransformutils \
- llvmipa \
+ llvmbitwriter \
llvmanalysis \
llvmx86desc \
llvmobject \
@@ -58,7 +60,7 @@ LIBDEPS=llvmaarch64disassembler \
llvmbitreader \
llvmmcdisassembler \
llvmx86info \
- llvmx86instprinter \
+ llvmx86asmprinter \
llvmmc \
llvmx86utils \
llvmcore \
diff --git a/usr.bin/clang/llvm-objdump/Makefile b/usr.bin/clang/llvm-objdump/Makefile
index 49123a5f8200..ebcc2372931c 100644
--- a/usr.bin/clang/llvm-objdump/Makefile
+++ b/usr.bin/clang/llvm-objdump/Makefile
@@ -17,32 +17,32 @@ LIBDEPS=llvmdebuginfodwarf \
llvmaarch64asmparser \
llvmaarch64desc \
llvmaarch64info \
- llvmaarch64instprinter \
+ llvmaarch64asmprinter \
llvmaarch64utils \
llvmarmdisassembler \
llvmarmcodegen \
llvmarmasmparser \
llvmarmdesc \
llvmarminfo \
- llvmarminstprinter \
+ llvmarmasmprinter \
llvmmipsdisassembler \
llvmmipscodegen \
llvmmipsasmparser \
llvmmipsdesc \
llvmmipsinfo \
- llvmmipsinstprinter \
+ llvmmipsasmprinter \
llvmpowerpcdisassembler \
llvmpowerpccodegen \
llvmpowerpcasmparser \
llvmpowerpcdesc \
llvmpowerpcinfo \
- llvmpowerpcinstprinter \
+ llvmpowerpcasmprinter \
llvmsparcdisassembler \
llvmsparccodegen \
llvmsparcasmparser \
llvmsparcdesc \
llvmsparcinfo \
- llvmsparcinstprinter \
+ llvmsparcasmprinter \
llvmx86disassembler \
llvmx86asmparser \
llvmx86codegen \
@@ -51,11 +51,11 @@ LIBDEPS=llvmdebuginfodwarf \
llvmcodegen \
llvmtarget \
llvmscalaropts \
- llvmprofiledata \
llvminstcombine \
llvminstrumentation \
+ llvmprofiledata \
llvmtransformutils \
- llvmipa \
+ llvmbitwriter \
llvmanalysis \
llvmx86desc \
llvmobject \
@@ -63,7 +63,7 @@ LIBDEPS=llvmdebuginfodwarf \
llvmbitreader \
llvmmcdisassembler \
llvmx86info \
- llvmx86instprinter \
+ llvmx86asmprinter \
llvmmc \
llvmx86utils \
llvmcore \
diff --git a/usr.bin/clang/llvm-profdata/Makefile b/usr.bin/clang/llvm-profdata/Makefile
index 50785210205e..7cd4ab6f7922 100644
--- a/usr.bin/clang/llvm-profdata/Makefile
+++ b/usr.bin/clang/llvm-profdata/Makefile
@@ -7,6 +7,8 @@ PROG_CXX=llvm-profdata
SRCDIR= tools/llvm-profdata
SRCS= llvm-profdata.cpp
+TGHDRS= Attributes
+
LIBDEPS=llvmprofiledata \
llvmobject \
llvmmcparser \
diff --git a/usr.bin/clang/llvm-rtdyld/Makefile b/usr.bin/clang/llvm-rtdyld/Makefile
index ee386b4286b6..453fe31f2137 100644
--- a/usr.bin/clang/llvm-rtdyld/Makefile
+++ b/usr.bin/clang/llvm-rtdyld/Makefile
@@ -17,32 +17,32 @@ LIBDEPS=llvmdebuginfodwarf \
llvmaarch64asmparser \
llvmaarch64desc \
llvmaarch64info \
- llvmaarch64instprinter \
+ llvmaarch64asmprinter \
llvmaarch64utils \
llvmarmdisassembler \
llvmarmcodegen \
llvmarmasmparser \
llvmarmdesc \
llvmarminfo \
- llvmarminstprinter \
+ llvmarmasmprinter \
llvmmipsdisassembler \
llvmmipscodegen \
llvmmipsasmparser \
llvmmipsdesc \
llvmmipsinfo \
- llvmmipsinstprinter \
+ llvmmipsasmprinter \
llvmpowerpcdisassembler \
llvmpowerpccodegen \
llvmpowerpcasmparser \
llvmpowerpcdesc \
llvmpowerpcinfo \
- llvmpowerpcinstprinter \
+ llvmpowerpcasmprinter \
llvmsparcdisassembler \
llvmsparccodegen \
llvmsparcasmparser \
llvmsparcdesc \
llvmsparcinfo \
- llvmsparcinstprinter \
+ llvmsparcasmprinter \
llvmx86disassembler \
llvmx86asmparser \
llvmx86codegen \
@@ -51,11 +51,11 @@ LIBDEPS=llvmdebuginfodwarf \
llvmcodegen \
llvmtarget \
llvmscalaropts \
- llvmprofiledata \
llvminstcombine \
llvminstrumentation \
+ llvmprofiledata \
llvmtransformutils \
- llvmipa \
+ llvmbitwriter \
llvmanalysis \
llvmx86desc \
llvmobject \
@@ -63,7 +63,7 @@ LIBDEPS=llvmdebuginfodwarf \
llvmbitreader \
llvmmcdisassembler \
llvmx86info \
- llvmx86instprinter \
+ llvmx86asmprinter \
llvmmc \
llvmx86utils \
llvmcore \
diff --git a/usr.bin/clang/llvm-symbolizer/Makefile b/usr.bin/clang/llvm-symbolizer/Makefile
index c6281fdb1fc0..367a13995c3a 100644
--- a/usr.bin/clang/llvm-symbolizer/Makefile
+++ b/usr.bin/clang/llvm-symbolizer/Makefile
@@ -5,10 +5,10 @@
PROG_CXX=llvm-symbolizer
SRCDIR= tools/llvm-symbolizer
-SRCS= llvm-symbolizer.cpp \
- LLVMSymbolize.cpp
+SRCS= llvm-symbolizer.cpp
-LIBDEPS=llvmdebuginfopdb \
+LIBDEPS=llvmsymbolize \
+ llvmdebuginfopdb \
llvmdebuginfodwarf \
llvmobject \
llvmmcparser \
diff --git a/usr.bin/clang/macho-dump/Makefile b/usr.bin/clang/macho-dump/Makefile
deleted file mode 100644
index d74326cac05d..000000000000
--- a/usr.bin/clang/macho-dump/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $FreeBSD$
-
-MAN=
-.include <bsd.own.mk>
-
-PROG_CXX=macho-dump
-
-SRCDIR= tools/macho-dump
-SRCS= macho-dump.cpp
-
-LIBDEPS=llvmobject \
- llvmmcparser \
- llvmmc \
- llvmbitreader \
- llvmcore \
- llvmsupport
-
-.include "../clang.prog.mk"
diff --git a/usr.bin/clang/opt/Makefile b/usr.bin/clang/opt/Makefile
index e85575983734..cf0c3cfb7f70 100644
--- a/usr.bin/clang/opt/Makefile
+++ b/usr.bin/clang/opt/Makefile
@@ -13,39 +13,41 @@ SRCS= AnalysisWrappers.cpp \
PrintSCC.cpp \
opt.cpp
-TGHDRS= Intrinsics
+TGHDRS= Attributes \
+ Intrinsics
+
LIBDEPS=llvmpasses \
llvmaarch64disassembler \
llvmaarch64codegen \
llvmaarch64asmparser \
llvmaarch64desc \
llvmaarch64info \
- llvmaarch64instprinter \
+ llvmaarch64asmprinter \
llvmaarch64utils \
llvmarmdisassembler \
llvmarmcodegen \
llvmarmasmparser \
llvmarmdesc \
llvmarminfo \
- llvmarminstprinter \
+ llvmarmasmprinter \
llvmmipsdisassembler \
llvmmipscodegen \
llvmmipsasmparser \
llvmmipsdesc \
llvmmipsinfo \
- llvmmipsinstprinter \
+ llvmmipsasmprinter \
llvmpowerpcdisassembler \
llvmpowerpccodegen \
llvmpowerpcasmparser \
llvmpowerpcdesc \
llvmpowerpcinfo \
- llvmpowerpcinstprinter \
+ llvmpowerpcasmprinter \
llvmsparcdisassembler \
llvmsparccodegen \
llvmsparcasmparser \
llvmsparcdesc \
llvmsparcinfo \
- llvmsparcinstprinter \
+ llvmsparcasmprinter \
llvmx86disassembler \
llvmx86asmparser \
llvmx86codegen \
@@ -56,19 +58,19 @@ LIBDEPS=llvmpasses \
llvmx86desc \
llvmmcdisassembler \
llvmx86info \
- llvmx86instprinter \
+ llvmx86asmprinter \
llvmx86utils \
llvmipo \
llvmvectorize \
+ llvmlinker \
llvmobjcarcopts \
llvmscalaropts \
+ llvminstcombine \
+ llvminstrumentation \
llvmprofiledata \
llvmobject \
llvmmcparser \
- llvminstcombine \
- llvminstrumentation \
llvmtransformutils \
- llvmipa \
llvmmc \
llvmanalysis \
llvmirreader \