diff options
Diffstat (limited to 'usr.bin')
29 files changed, 175 insertions, 156 deletions
diff --git a/usr.bin/clang/Makefile b/usr.bin/clang/Makefile index c19f7b6efd32..692b6c806590 100644 --- a/usr.bin/clang/Makefile +++ b/usr.bin/clang/Makefile @@ -2,7 +2,7 @@ .include <src.opts.mk> -SUBDIR= clang clang-tblgen tblgen +SUBDIR= clang clang-tblgen llvm-tblgen .if !defined(TOOLS_PREFIX) .if ${MK_CLANG_EXTRAS} != "no" @@ -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..6c675da77427 100644 --- a/usr.bin/clang/bugpoint/Makefile +++ b/usr.bin/clang/bugpoint/Makefile @@ -15,28 +15,31 @@ 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 \ llvmcore \ llvmsupport +LIBADD+= z + .include "../clang.prog.mk" diff --git a/usr.bin/clang/clang/Makefile b/usr.bin/clang/clang/Makefile index 92ed6e47be22..3665888fd46a 100644 --- a/usr.bin/clang/clang/Makefile +++ b/usr.bin/clang/clang/Makefile @@ -34,7 +34,9 @@ MLINKS+= clang.1 cc.1 \ clang.1 cpp.1 .endif -TGHDRS= DiagnosticCommonKinds \ +TGHDRS= Attributes \ + Intrinsics \ + DiagnosticCommonKinds \ DiagnosticDriverKinds \ DiagnosticFrontendKinds \ DiagnosticLexKinds \ @@ -68,40 +70,37 @@ LIBDEPS=clangfrontendtool \ clangbasic \ llvmoption \ llvmobjcarcopts \ - llvmlinker \ - llvmirreader \ llvmipo \ llvmvectorize \ - llvmbitwriter \ + llvmlinker \ + llvmirreader \ llvmasmparser \ llvmaarch64codegen \ llvmaarch64asmparser \ llvmaarch64desc \ llvmaarch64info \ - llvmaarch64instprinter \ + llvmaarch64asmprinter \ llvmaarch64utils \ - llvmarmdisassembler \ llvmarmcodegen \ llvmarmasmparser \ llvmarmdesc \ llvmarminfo \ - llvmarminstprinter \ + llvmarmasmprinter \ llvmmipscodegen \ llvmmipsasmparser \ llvmmipsdesc \ llvmmipsinfo \ - llvmmipsinstprinter \ - llvmpowerpcdisassembler \ + llvmmipsasmprinter \ llvmpowerpccodegen \ llvmpowerpcasmparser \ llvmpowerpcdesc \ llvmpowerpcinfo \ - llvmpowerpcinstprinter \ + llvmpowerpcasmprinter \ llvmsparccodegen \ llvmsparcasmparser \ llvmsparcdesc \ llvmsparcinfo \ - llvmsparcinstprinter \ + llvmsparcasmprinter \ llvmx86asmparser \ llvmx86codegen \ llvmselectiondag \ @@ -109,11 +108,11 @@ LIBDEPS=clangfrontendtool \ llvmcodegen \ llvmtarget \ llvmscalaropts \ - llvmprofiledata \ llvminstcombine \ llvminstrumentation \ + llvmprofiledata \ llvmtransformutils \ - llvmipa \ + llvmbitwriter \ llvmanalysis \ llvmx86desc \ llvmobject \ @@ -121,7 +120,7 @@ LIBDEPS=clangfrontendtool \ llvmbitreader \ llvmmcdisassembler \ llvmx86info \ - llvmx86instprinter \ + llvmx86asmprinter \ llvmmc \ llvmx86utils \ llvmcore \ diff --git a/usr.bin/clang/llc/Makefile b/usr.bin/clang/llc/Makefile index d54a3ce3c65a..a9d16db787bb 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,12 +64,12 @@ LIBDEPS=llvmmirparser \ llvmbitreader \ llvmmcdisassembler \ llvmx86info \ - llvmx86instprinter \ + llvmx86asmprinter \ llvmmc \ llvmx86utils \ llvmcore \ llvmsupport -LIBADD+= z +LIBADD+= z .include "../clang.prog.mk" diff --git a/usr.bin/clang/lldb/Makefile b/usr.bin/clang/lldb/Makefile index da997f746ffc..b2c905045580 100644 --- a/usr.bin/clang/lldb/Makefile +++ b/usr.bin/clang/lldb/Makefile @@ -19,7 +19,7 @@ SRCS= Driver.cpp \ # Man page directory .PATH: ${LLDB_SRCS}/docs -LIBADD= edit panel ncursesw execinfo z +LIBADD+= edit panel ncursesw execinfo z LLDB_LIBS=\ lldb \ @@ -49,12 +49,16 @@ LLDB_LIBS=\ lldbPluginABISysV_x86_64 \ lldbPluginCXXItaniumABI \ lldbPluginDisassemblerLLVM \ + lldbPluginExpressionParserClang \ + lldbPluginExpressionParserGo \ lldbPluginInstructionARM \ lldbPluginInstructionARM64 \ lldbPluginInstructionMIPS \ lldbPluginInstructionMIPS64 \ lldbPluginInstrumentationRuntimeAddressSanitizer \ lldbPluginJITLoaderGDB \ + lldbPluginLanguageCPlusPlus \ + lldbPluginLanguageObjC \ lldbPluginSymbolFileDWARF \ lldbPluginSymbolFileSymtab \ lldbPluginDynamicLoaderStatic \ @@ -63,6 +67,7 @@ LLDB_LIBS=\ lldbPluginObjectContainerBSDArchive \ lldbPluginObjectFileELF \ lldbPluginObjectFileJIT \ + lldbPluginScriptInterpreterNone \ lldbPluginSymbolVendorELF \ lldbPluginPlatformFreeBSD \ lldbPluginPlatformGDB \ @@ -112,32 +117,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 \ @@ -149,7 +154,6 @@ LIBDEPS=\ llvmprofiledata \ llvminstcombine \ llvmtransformutils \ - llvmipa \ llvmanalysis \ llvminstrumentation \ llvmx86desc \ @@ -158,7 +162,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..b7826b97cc79 100644 --- a/usr.bin/clang/lli/Makefile +++ b/usr.bin/clang/lli/Makefile @@ -6,11 +6,11 @@ PROG_CXX=lli SRCDIR= tools/lli SRCS= OrcLazyJIT.cpp \ - RemoteMemoryManager.cpp \ - RemoteTarget.cpp \ - RemoteTargetExternal.cpp \ lli.cpp +TGHDRS= Attributes \ + Intrinsics + LIBDEPS=llvmx86disassembler \ llvmx86asmparser \ llvmirreader \ @@ -19,19 +19,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 \ @@ -44,6 +44,6 @@ LIBDEPS=llvmx86disassembler \ llvmcore \ llvmsupport -LIBADD= z +LIBADD+= z .include "../clang.prog.mk" diff --git a/usr.bin/clang/llvm-ar/Makefile b/usr.bin/clang/llvm-ar/Makefile index 512625761abc..60520671c32d 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,12 +62,12 @@ LIBDEPS=llvmlibdriver \ llvmbitreader \ llvmmcdisassembler \ llvmx86info \ - llvmx86instprinter \ + llvmx86asmprinter \ llvmmc \ llvmx86utils \ llvmcore \ llvmsupport -LIBADD= z +LIBADD+= z .include "../clang.prog.mk" 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-cov/Makefile b/usr.bin/clang/llvm-cov/Makefile index f752034bda58..cca47540d0c6 100644 --- a/usr.bin/clang/llvm-cov/Makefile +++ b/usr.bin/clang/llvm-cov/Makefile @@ -22,4 +22,6 @@ LIBDEPS=llvmprofiledata \ llvmcore \ llvmsupport +LIBADD+= z + .include "../clang.prog.mk" diff --git a/usr.bin/clang/llvm-cxxdump/Makefile b/usr.bin/clang/llvm-cxxdump/Makefile index b483930fb8e5..33a08a9fd333 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 \ @@ -66,6 +66,6 @@ LIBDEPS=llvmaarch64disassembler \ llvmcore \ llvmsupport -LIBADD= z +LIBADD+= z .include "../clang.prog.mk" 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-dwarfdump/Makefile b/usr.bin/clang/llvm-dwarfdump/Makefile index dab8e377d5ac..32f3afa0727f 100644 --- a/usr.bin/clang/llvm-dwarfdump/Makefile +++ b/usr.bin/clang/llvm-dwarfdump/Makefile @@ -15,6 +15,6 @@ LIBDEPS=llvmdebuginfodwarf \ llvmcore \ llvmsupport -LIBADD= z +LIBADD+= z .include "../clang.prog.mk" 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..3e0dc8347b2a 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 \ @@ -72,6 +75,6 @@ LIBDEPS=llvmaarch64disassembler \ llvmcore \ llvmsupport -LIBADD= z +LIBADD+= z .include "../clang.prog.mk" diff --git a/usr.bin/clang/llvm-mc/Makefile b/usr.bin/clang/llvm-mc/Makefile index 0fe37c1228e3..b19ea9015402 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,12 +60,12 @@ LIBDEPS=llvmaarch64disassembler \ llvmbitreader \ llvmmcdisassembler \ llvmx86info \ - llvmx86instprinter \ + llvmx86asmprinter \ llvmmc \ llvmx86utils \ llvmcore \ llvmsupport -LIBADD= z +LIBADD+= z .include "../clang.prog.mk" diff --git a/usr.bin/clang/llvm-nm/Makefile b/usr.bin/clang/llvm-nm/Makefile index 38dd8714e5c8..7eb9d9f0f586 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,12 +60,12 @@ LIBDEPS=llvmaarch64disassembler \ llvmbitreader \ llvmmcdisassembler \ llvmx86info \ - llvmx86instprinter \ + llvmx86asmprinter \ llvmmc \ llvmx86utils \ llvmcore \ llvmsupport -LIBADD= z +LIBADD+= z .include "../clang.prog.mk" diff --git a/usr.bin/clang/llvm-objdump/Makefile b/usr.bin/clang/llvm-objdump/Makefile index 49123a5f8200..dcbf1f91240e 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,12 +63,12 @@ LIBDEPS=llvmdebuginfodwarf \ llvmbitreader \ llvmmcdisassembler \ llvmx86info \ - llvmx86instprinter \ + llvmx86asmprinter \ llvmmc \ llvmx86utils \ llvmcore \ llvmsupport -LIBADD= z +LIBADD+= z .include "../clang.prog.mk" diff --git a/usr.bin/clang/llvm-pdbdump/Makefile b/usr.bin/clang/llvm-pdbdump/Makefile index 5487490921c8..72d6214c4dc2 100644 --- a/usr.bin/clang/llvm-pdbdump/Makefile +++ b/usr.bin/clang/llvm-pdbdump/Makefile @@ -26,6 +26,6 @@ LIBDEPS=llvmdebuginfopdb \ llvmcore \ llvmsupport -LIBADD= z +LIBADD+= z .include "../clang.prog.mk" diff --git a/usr.bin/clang/llvm-profdata/Makefile b/usr.bin/clang/llvm-profdata/Makefile index 50785210205e..95fc7e55133c 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 \ @@ -15,4 +17,6 @@ LIBDEPS=llvmprofiledata \ llvmcore \ llvmsupport +LIBADD+= z + .include "../clang.prog.mk" diff --git a/usr.bin/clang/llvm-rtdyld/Makefile b/usr.bin/clang/llvm-rtdyld/Makefile index ee386b4286b6..3c5304b34904 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,12 +63,12 @@ LIBDEPS=llvmdebuginfodwarf \ llvmbitreader \ llvmmcdisassembler \ llvmx86info \ - llvmx86instprinter \ + llvmx86asmprinter \ llvmmc \ llvmx86utils \ llvmcore \ llvmsupport -LIBADD= z +LIBADD+= z .include "../clang.prog.mk" diff --git a/usr.bin/clang/llvm-symbolizer/Makefile b/usr.bin/clang/llvm-symbolizer/Makefile index c6281fdb1fc0..a71663bf5868 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 \ @@ -17,6 +17,6 @@ LIBDEPS=llvmdebuginfopdb \ llvmcore \ llvmsupport -LIBADD= z +LIBADD+= z .include "../clang.prog.mk" diff --git a/usr.bin/clang/tblgen/Makefile b/usr.bin/clang/llvm-tblgen/Makefile index 75a45de8e53c..14b46db89ca9 100644 --- a/usr.bin/clang/tblgen/Makefile +++ b/usr.bin/clang/llvm-tblgen/Makefile @@ -2,12 +2,13 @@ .include <bsd.own.mk> -PROG_CXX=tblgen +PROG_CXX=llvm-tblgen SRCDIR= utils/TableGen SRCS= AsmMatcherEmitter.cpp \ AsmWriterEmitter.cpp \ AsmWriterInst.cpp \ + Attributes.cpp \ CTagsEmitter.cpp \ CallingConvEmitter.cpp \ CodeEmitterGen.cpp \ diff --git a/usr.bin/clang/tblgen/Makefile.depend b/usr.bin/clang/llvm-tblgen/Makefile.depend index 58ed9a748cc7..58ed9a748cc7 100644 --- a/usr.bin/clang/tblgen/Makefile.depend +++ b/usr.bin/clang/llvm-tblgen/Makefile.depend diff --git a/usr.bin/clang/tblgen/tblgen.1 b/usr.bin/clang/llvm-tblgen/llvm-tblgen.1 index 9ee3841dc841..9ee3841dc841 100644 --- a/usr.bin/clang/tblgen/tblgen.1 +++ b/usr.bin/clang/llvm-tblgen/llvm-tblgen.1 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..9285a3c21c3b 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 \ @@ -78,6 +80,6 @@ LIBDEPS=llvmpasses \ llvmcore \ llvmsupport -LIBADD= z +LIBADD+= z .include "../clang.prog.mk" |