diff options
Diffstat (limited to 'usr.bin')
35 files changed, 42 insertions, 41 deletions
diff --git a/usr.bin/clang/bugpoint/Makefile b/usr.bin/clang/bugpoint/Makefile index 2f0cb9eb417f..c68f68ab5415 100644 --- a/usr.bin/clang/bugpoint/Makefile +++ b/usr.bin/clang/bugpoint/Makefile @@ -2,7 +2,7 @@ PROG_CXX= bugpoint -SRCDIR= tools/bugpoint +SRCDIR= llvm/tools/bugpoint SRCS+= BugDriver.cpp SRCS+= CrashDebugger.cpp SRCS+= ExecutionDriver.cpp diff --git a/usr.bin/clang/clang-format/Makefile b/usr.bin/clang/clang-format/Makefile index ddcc89ab497d..3ace97fd8482 100644 --- a/usr.bin/clang/clang-format/Makefile +++ b/usr.bin/clang/clang-format/Makefile @@ -3,7 +3,7 @@ PROG_CXX= clang-format MAN= -SRCDIR= tools/clang/tools/clang-format +SRCDIR= clang/tools/clang-format SRCS+= ClangFormat.cpp .include "../clang.prog.mk" diff --git a/usr.bin/clang/clang-tblgen/Makefile b/usr.bin/clang/clang-tblgen/Makefile index 3d24674f0b1f..b28e937c1f24 100644 --- a/usr.bin/clang/clang-tblgen/Makefile +++ b/usr.bin/clang/clang-tblgen/Makefile @@ -3,7 +3,7 @@ PROG_CXX= clang-tblgen MAN= -SRCDIR= tools/clang/utils/TableGen +SRCDIR= clang/utils/TableGen SRCS+= ClangASTNodesEmitter.cpp SRCS+= ClangAttrEmitter.cpp SRCS+= ClangCommentCommandInfoEmitter.cpp diff --git a/usr.bin/clang/clang/Makefile b/usr.bin/clang/clang/Makefile index 37f890af960b..8dab2301cbc4 100644 --- a/usr.bin/clang/clang/Makefile +++ b/usr.bin/clang/clang/Makefile @@ -4,7 +4,7 @@ PROG_CXX= clang -SRCDIR= tools/clang/tools/driver +SRCDIR= clang/tools/driver SRCS+= cc1_main.cpp SRCS+= cc1as_main.cpp SRCS+= cc1gen_reproducer_main.cpp diff --git a/usr.bin/clang/llc/Makefile b/usr.bin/clang/llc/Makefile index 0855f3b0ee25..ce9e11e3bf45 100644 --- a/usr.bin/clang/llc/Makefile +++ b/usr.bin/clang/llc/Makefile @@ -2,7 +2,7 @@ PROG_CXX= llc -SRCDIR= tools/llc +SRCDIR= llvm/tools/llc SRCS+= llc.cpp LIBADD+= z diff --git a/usr.bin/clang/lld/Makefile b/usr.bin/clang/lld/Makefile index 0d8801f491bf..69ad4e2445c8 100644 --- a/usr.bin/clang/lld/Makefile +++ b/usr.bin/clang/lld/Makefile @@ -2,8 +2,9 @@ .include <src.opts.mk> -LLVM_SRCS= ${SRCTOP}/contrib/llvm -LLD_SRCS= ${LLVM_SRCS}/tools/lld +LLVM_BASE= ${SRCTOP}/contrib/llvm-project +LLVM_SRCS= ${LLVM_BASE}/llvm +LLD_SRCS= ${LLVM_BASE}/lld PACKAGE= lld PROG_CXX= ld.lld @@ -24,7 +25,7 @@ CFLAGS+= -I${LLD_SRCS}/include CFLAGS+= -I${.OBJDIR} CFLAGS+= -I${OBJTOP}/lib/clang/libllvm -SRCDIR= tools/lld +SRCDIR= lld SRCS+= Common/Args.cpp SRCS+= Common/ErrorHandler.cpp SRCS+= Common/Filesystem.cpp diff --git a/usr.bin/clang/lldb-tblgen/Makefile b/usr.bin/clang/lldb-tblgen/Makefile index a5157d2c3a1c..5f83ac635310 100644 --- a/usr.bin/clang/lldb-tblgen/Makefile +++ b/usr.bin/clang/lldb-tblgen/Makefile @@ -3,7 +3,7 @@ PROG_CXX= lldb-tblgen MAN= -SRCDIR= tools/lldb/utils/TableGen +SRCDIR= lldb/utils/TableGen SRCS+= LLDBOptionDefEmitter.cpp SRCS+= LLDBTableGen.cpp diff --git a/usr.bin/clang/lldb/Makefile b/usr.bin/clang/lldb/Makefile index f5f6f54b93b8..cadf68293560 100644 --- a/usr.bin/clang/lldb/Makefile +++ b/usr.bin/clang/lldb/Makefile @@ -10,7 +10,7 @@ PROG_CXX= lldb CFLAGS+= -I${LLDB_SRCS}/include CFLAGS+= -I${.OBJDIR} -SRCDIR= tools/lldb/tools/driver +SRCDIR= lldb/tools/driver SRCS+= Driver.cpp .include "${SRCTOP}/lib/clang/clang.build.mk" diff --git a/usr.bin/clang/lli/Makefile b/usr.bin/clang/lli/Makefile index dd8072daa147..cce7d9b5db65 100644 --- a/usr.bin/clang/lli/Makefile +++ b/usr.bin/clang/lli/Makefile @@ -2,7 +2,7 @@ PROG_CXX= lli -SRCDIR= tools/lli +SRCDIR= llvm/tools/lli SRCS+= lli.cpp LIBADD+= z diff --git a/usr.bin/clang/llvm-ar/Makefile b/usr.bin/clang/llvm-ar/Makefile index f6116ecefcc4..e5ac6d54ac5b 100644 --- a/usr.bin/clang/llvm-ar/Makefile +++ b/usr.bin/clang/llvm-ar/Makefile @@ -2,7 +2,7 @@ PROG_CXX= llvm-ar -SRCDIR= tools/llvm-ar +SRCDIR= llvm/tools/llvm-ar SRCS+= llvm-ar.cpp LIBADD+= z diff --git a/usr.bin/clang/llvm-as/Makefile b/usr.bin/clang/llvm-as/Makefile index d60bd497fd09..49d9d172e341 100644 --- a/usr.bin/clang/llvm-as/Makefile +++ b/usr.bin/clang/llvm-as/Makefile @@ -2,7 +2,7 @@ PROG_CXX= llvm-as -SRCDIR= tools/llvm-as +SRCDIR= llvm/tools/llvm-as SRCS+= llvm-as.cpp .include "../llvm.prog.mk" diff --git a/usr.bin/clang/llvm-bcanalyzer/Makefile b/usr.bin/clang/llvm-bcanalyzer/Makefile index 1b1c7ad4ecfc..ad327ce2832e 100644 --- a/usr.bin/clang/llvm-bcanalyzer/Makefile +++ b/usr.bin/clang/llvm-bcanalyzer/Makefile @@ -2,7 +2,7 @@ PROG_CXX= llvm-bcanalyzer -SRCDIR= tools/llvm-bcanalyzer +SRCDIR= llvm/tools/llvm-bcanalyzer SRCS+= llvm-bcanalyzer.cpp .include "../llvm.prog.mk" diff --git a/usr.bin/clang/llvm-cov/Makefile b/usr.bin/clang/llvm-cov/Makefile index 3b110941db81..b1b4fc207cbe 100644 --- a/usr.bin/clang/llvm-cov/Makefile +++ b/usr.bin/clang/llvm-cov/Makefile @@ -8,7 +8,7 @@ LINKS= ${BINDIR}/llvm-cov ${BINDIR}/gcov MLINKS= llvm-cov.1 gcov.1 .endif -SRCDIR= tools/llvm-cov +SRCDIR= llvm/tools/llvm-cov SRCS+= CodeCoverage.cpp SRCS+= CoverageExporterJson.cpp SRCS+= CoverageExporterLcov.cpp diff --git a/usr.bin/clang/llvm-cxxdump/Makefile b/usr.bin/clang/llvm-cxxdump/Makefile index 1de671910c59..81c695f97759 100644 --- a/usr.bin/clang/llvm-cxxdump/Makefile +++ b/usr.bin/clang/llvm-cxxdump/Makefile @@ -3,7 +3,7 @@ PROG_CXX= llvm-cxxdump MAN= -SRCDIR= tools/llvm-cxxdump +SRCDIR= llvm/tools/llvm-cxxdump SRCS+= Error.cpp SRCS+= llvm-cxxdump.cpp diff --git a/usr.bin/clang/llvm-cxxfilt/Makefile b/usr.bin/clang/llvm-cxxfilt/Makefile index 74b1d420be2d..f86af88d5210 100644 --- a/usr.bin/clang/llvm-cxxfilt/Makefile +++ b/usr.bin/clang/llvm-cxxfilt/Makefile @@ -3,7 +3,7 @@ PROG_CXX= llvm-cxxfilt MAN= -SRCDIR= tools/llvm-cxxfilt +SRCDIR= llvm/tools/llvm-cxxfilt SRCS+= llvm-cxxfilt.cpp .include "../llvm.prog.mk" diff --git a/usr.bin/clang/llvm-diff/Makefile b/usr.bin/clang/llvm-diff/Makefile index 6879af092c71..b7a989656907 100644 --- a/usr.bin/clang/llvm-diff/Makefile +++ b/usr.bin/clang/llvm-diff/Makefile @@ -2,7 +2,7 @@ PROG_CXX= llvm-diff -SRCDIR= tools/llvm-diff +SRCDIR= llvm/tools/llvm-diff SRCS+= DiffConsumer.cpp SRCS+= DiffLog.cpp SRCS+= DifferenceEngine.cpp diff --git a/usr.bin/clang/llvm-dis/Makefile b/usr.bin/clang/llvm-dis/Makefile index 97de6e056f87..d12c3fc9fcb6 100644 --- a/usr.bin/clang/llvm-dis/Makefile +++ b/usr.bin/clang/llvm-dis/Makefile @@ -2,7 +2,7 @@ PROG_CXX= llvm-dis -SRCDIR= tools/llvm-dis +SRCDIR= llvm/tools/llvm-dis SRCS+= llvm-dis.cpp .include "../llvm.prog.mk" diff --git a/usr.bin/clang/llvm-dwarfdump/Makefile b/usr.bin/clang/llvm-dwarfdump/Makefile index e871d88f01f4..d50237dbc9ec 100644 --- a/usr.bin/clang/llvm-dwarfdump/Makefile +++ b/usr.bin/clang/llvm-dwarfdump/Makefile @@ -2,7 +2,7 @@ PROG_CXX= llvm-dwarfdump -SRCDIR= tools/llvm-dwarfdump +SRCDIR= llvm/tools/llvm-dwarfdump SRCS+= Statistics.cpp SRCS+= llvm-dwarfdump.cpp diff --git a/usr.bin/clang/llvm-extract/Makefile b/usr.bin/clang/llvm-extract/Makefile index cc356a060c4b..7a0a5b205a4f 100644 --- a/usr.bin/clang/llvm-extract/Makefile +++ b/usr.bin/clang/llvm-extract/Makefile @@ -2,7 +2,7 @@ PROG_CXX= llvm-extract -SRCDIR= tools/llvm-extract +SRCDIR= llvm/tools/llvm-extract SRCS+= llvm-extract.cpp LIBADD+= z diff --git a/usr.bin/clang/llvm-link/Makefile b/usr.bin/clang/llvm-link/Makefile index 1c5d02f3cdab..5fb3a7a85943 100644 --- a/usr.bin/clang/llvm-link/Makefile +++ b/usr.bin/clang/llvm-link/Makefile @@ -2,7 +2,7 @@ PROG_CXX= llvm-link -SRCDIR= tools/llvm-link +SRCDIR= llvm/tools/llvm-link SRCS+= llvm-link.cpp .include "../llvm.prog.mk" diff --git a/usr.bin/clang/llvm-lto/Makefile b/usr.bin/clang/llvm-lto/Makefile index 500605868b83..96af172288f1 100644 --- a/usr.bin/clang/llvm-lto/Makefile +++ b/usr.bin/clang/llvm-lto/Makefile @@ -3,7 +3,7 @@ PROG_CXX= llvm-lto MAN= -SRCDIR= tools/llvm-lto +SRCDIR= llvm/tools/llvm-lto SRCS= llvm-lto.cpp LIBADD+= z diff --git a/usr.bin/clang/llvm-lto2/Makefile b/usr.bin/clang/llvm-lto2/Makefile index 7e67c1bae972..430aef07e17c 100644 --- a/usr.bin/clang/llvm-lto2/Makefile +++ b/usr.bin/clang/llvm-lto2/Makefile @@ -3,7 +3,7 @@ PROG_CXX= llvm-lto2 MAN= -SRCDIR= tools/llvm-lto2 +SRCDIR= llvm/tools/llvm-lto2 SRCS= llvm-lto2.cpp LIBADD+= z diff --git a/usr.bin/clang/llvm-mc/Makefile b/usr.bin/clang/llvm-mc/Makefile index 64176f1b72a6..e0101ce674eb 100644 --- a/usr.bin/clang/llvm-mc/Makefile +++ b/usr.bin/clang/llvm-mc/Makefile @@ -3,7 +3,7 @@ PROG_CXX= llvm-mc MAN= -SRCDIR= tools/llvm-mc +SRCDIR= llvm/tools/llvm-mc SRCS+= Disassembler.cpp SRCS+= llvm-mc.cpp diff --git a/usr.bin/clang/llvm-mca/Makefile b/usr.bin/clang/llvm-mca/Makefile index e0a39efc7363..9bde2446cab1 100644 --- a/usr.bin/clang/llvm-mca/Makefile +++ b/usr.bin/clang/llvm-mca/Makefile @@ -2,7 +2,7 @@ PROG_CXX= llvm-mca -SRCDIR= tools/llvm-mca +SRCDIR= llvm/tools/llvm-mca SRCS+= CodeRegion.cpp SRCS+= CodeRegionGenerator.cpp SRCS+= PipelinePrinter.cpp @@ -18,7 +18,7 @@ SRCS+= Views/TimelineView.cpp SRCS+= Views/View.cpp SRCS+= llvm-mca.cpp -CFLAGS+= -I${LLVM_SRCS}/${SRCDIR} +CFLAGS+= -I${LLVM_BASE}/${SRCDIR} LIBADD+= z diff --git a/usr.bin/clang/llvm-modextract/Makefile b/usr.bin/clang/llvm-modextract/Makefile index 75904ddcf90a..4d17e1593359 100644 --- a/usr.bin/clang/llvm-modextract/Makefile +++ b/usr.bin/clang/llvm-modextract/Makefile @@ -3,7 +3,7 @@ PROG_CXX= llvm-modextract MAN= -SRCDIR= tools/llvm-modextract +SRCDIR= llvm/tools/llvm-modextract SRCS= llvm-modextract.cpp .include "../llvm.prog.mk" diff --git a/usr.bin/clang/llvm-nm/Makefile b/usr.bin/clang/llvm-nm/Makefile index 55e35c3c14dc..02f16887a7cf 100644 --- a/usr.bin/clang/llvm-nm/Makefile +++ b/usr.bin/clang/llvm-nm/Makefile @@ -2,7 +2,7 @@ PROG_CXX= llvm-nm -SRCDIR= tools/llvm-nm +SRCDIR= llvm/tools/llvm-nm SRCS+= llvm-nm.cpp LIBADD+= z diff --git a/usr.bin/clang/llvm-objcopy/Makefile b/usr.bin/clang/llvm-objcopy/Makefile index 497e8d7eb939..7218fd8ae3fe 100644 --- a/usr.bin/clang/llvm-objcopy/Makefile +++ b/usr.bin/clang/llvm-objcopy/Makefile @@ -3,7 +3,7 @@ PROG_CXX= llvm-objcopy MAN= -SRCDIR= tools/llvm-objcopy +SRCDIR= llvm/tools/llvm-objcopy SRCS+= Buffer.cpp SRCS+= COFF/COFFObjcopy.cpp SRCS+= COFF/Object.cpp @@ -21,15 +21,15 @@ SRCS+= llvm-objcopy.cpp .include "${SRCTOP}/lib/clang/llvm.pre.mk" CFLAGS+= -I${.OBJDIR} -CFLAGS+= -I${LLVM_SRCS}/${SRCDIR} +CFLAGS+= -I${LLVM_BASE}/${SRCDIR} .include "${SRCTOP}/lib/clang/llvm.build.mk" .for hdr in ObjcopyOpts StripOpts -${hdr}.inc: ${LLVM_SRCS}/${SRCDIR}/${hdr}.td +${hdr}.inc: ${LLVM_BASE}/${SRCDIR}/${hdr}.td ${LLVM_TBLGEN} -gen-opt-parser-defs \ -I ${LLVM_SRCS}/include -d ${.TARGET}.d -o ${.TARGET} \ - ${LLVM_SRCS}/${SRCDIR}/${hdr}.td + ${LLVM_BASE}/${SRCDIR}/${hdr}.td TGHDRS+= ${hdr}.inc .endfor diff --git a/usr.bin/clang/llvm-objdump/Makefile b/usr.bin/clang/llvm-objdump/Makefile index 43d1fe8d357a..3a6a2f006b0b 100644 --- a/usr.bin/clang/llvm-objdump/Makefile +++ b/usr.bin/clang/llvm-objdump/Makefile @@ -2,7 +2,7 @@ PROG_CXX= llvm-objdump -SRCDIR= tools/llvm-objdump +SRCDIR= llvm/tools/llvm-objdump SRCS+= COFFDump.cpp SRCS+= ELFDump.cpp SRCS+= MachODump.cpp diff --git a/usr.bin/clang/llvm-pdbutil/Makefile b/usr.bin/clang/llvm-pdbutil/Makefile index 1e8b7605f908..5476361e48c1 100644 --- a/usr.bin/clang/llvm-pdbutil/Makefile +++ b/usr.bin/clang/llvm-pdbutil/Makefile @@ -2,7 +2,7 @@ PROG_CXX= llvm-pdbutil -SRCDIR= tools/llvm-pdbutil +SRCDIR= llvm/tools/llvm-pdbutil SRCS+= BytesOutputStyle.cpp SRCS+= DumpOutputStyle.cpp SRCS+= ExplainOutputStyle.cpp diff --git a/usr.bin/clang/llvm-profdata/Makefile b/usr.bin/clang/llvm-profdata/Makefile index d243113c6a73..77e6d78e35e9 100644 --- a/usr.bin/clang/llvm-profdata/Makefile +++ b/usr.bin/clang/llvm-profdata/Makefile @@ -2,7 +2,7 @@ PROG_CXX= llvm-profdata -SRCDIR= tools/llvm-profdata +SRCDIR= llvm/tools/llvm-profdata SRCS+= llvm-profdata.cpp LIBADD+= z diff --git a/usr.bin/clang/llvm-rtdyld/Makefile b/usr.bin/clang/llvm-rtdyld/Makefile index 2e7b9b4f8d10..a9d25e5213c2 100644 --- a/usr.bin/clang/llvm-rtdyld/Makefile +++ b/usr.bin/clang/llvm-rtdyld/Makefile @@ -3,7 +3,7 @@ PROG_CXX= llvm-rtdyld MAN= -SRCDIR= tools/llvm-rtdyld +SRCDIR= llvm/tools/llvm-rtdyld SRCS+= llvm-rtdyld.cpp LIBADD+= z diff --git a/usr.bin/clang/llvm-symbolizer/Makefile b/usr.bin/clang/llvm-symbolizer/Makefile index 1c8719439813..b83039eb44a9 100644 --- a/usr.bin/clang/llvm-symbolizer/Makefile +++ b/usr.bin/clang/llvm-symbolizer/Makefile @@ -2,7 +2,7 @@ PROG_CXX= llvm-symbolizer -SRCDIR= tools/llvm-symbolizer +SRCDIR= llvm/tools/llvm-symbolizer SRCS+= llvm-symbolizer.cpp LIBADD+= z diff --git a/usr.bin/clang/llvm-tblgen/Makefile b/usr.bin/clang/llvm-tblgen/Makefile index 6507e7dd8cd2..a3be4c4b2ff1 100644 --- a/usr.bin/clang/llvm-tblgen/Makefile +++ b/usr.bin/clang/llvm-tblgen/Makefile @@ -2,7 +2,7 @@ PROG_CXX= llvm-tblgen -SRCDIR= utils/TableGen +SRCDIR= llvm/utils/TableGen SRCS+= AsmMatcherEmitter.cpp SRCS+= AsmWriterEmitter.cpp SRCS+= AsmWriterInst.cpp diff --git a/usr.bin/clang/llvm-xray/Makefile b/usr.bin/clang/llvm-xray/Makefile index 3ed4ff73a7f9..26083e54795f 100644 --- a/usr.bin/clang/llvm-xray/Makefile +++ b/usr.bin/clang/llvm-xray/Makefile @@ -3,7 +3,7 @@ PROG_CXX= llvm-xray MAN= -SRCDIR= tools/llvm-xray +SRCDIR= llvm/tools/llvm-xray SRCS+= func-id-helper.cpp SRCS+= llvm-xray.cpp SRCS+= xray-account.cpp diff --git a/usr.bin/clang/opt/Makefile b/usr.bin/clang/opt/Makefile index a6c409663564..b15590fc4cd5 100644 --- a/usr.bin/clang/opt/Makefile +++ b/usr.bin/clang/opt/Makefile @@ -2,7 +2,7 @@ PROG_CXX= opt -SRCDIR= tools/opt +SRCDIR= llvm/tools/opt SRCS+= AnalysisWrappers.cpp SRCS+= BreakpointPrinter.cpp SRCS+= Debugify.cpp |