diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2023-04-14 21:41:27 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2023-06-22 18:20:56 +0000 |
| commit | bdd1243df58e60e85101c09001d9812a789b6bc4 (patch) | |
| tree | a1ce621c7301dd47ba2ddc3b8eaa63b441389481 /usr.bin/clang | |
| parent | 781624ca2d054430052c828ba8d2c2eaf2d733e7 (diff) | |
| parent | e3b557809604d036af6e00c60f012c2025b59a5e (diff) | |
| download | src-bdd1243df58e60e85101c09001d9812a789b6bc4.tar.gz src-bdd1243df58e60e85101c09001d9812a789b6bc4.zip | |
Merge llvm-project main llvmorg-16-init-18548-gb0daacf58f41
This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and
openmp to llvmorg-16-init-18548-gb0daacf58f41.
PR: 271047
MFC after: 1 month
Diffstat (limited to 'usr.bin/clang')
24 files changed, 33 insertions, 2 deletions
diff --git a/usr.bin/clang/bugpoint/Makefile b/usr.bin/clang/bugpoint/Makefile index c68f68ab5415..2ca34d2579e3 100644 --- a/usr.bin/clang/bugpoint/Makefile +++ b/usr.bin/clang/bugpoint/Makefile @@ -14,5 +14,6 @@ SRCS+= ToolRunner.cpp SRCS+= bugpoint.cpp LIBADD+= z +LIBADD+= zstd .include "../llvm.prog.mk" diff --git a/usr.bin/clang/clang/Makefile b/usr.bin/clang/clang/Makefile index 0c5c3a9b9592..1e946276c76b 100644 --- a/usr.bin/clang/clang/Makefile +++ b/usr.bin/clang/clang/Makefile @@ -34,6 +34,7 @@ MLINKS+= clang.1 cc.1 \ clang.1 cpp.1 LIBADD+= z +LIBADD+= zstd # Ensure we don't add CFLAGS.clang when using GCC NO_TARGET_FLAGS= diff --git a/usr.bin/clang/llc/Makefile b/usr.bin/clang/llc/Makefile index ce9e11e3bf45..42835ff00656 100644 --- a/usr.bin/clang/llc/Makefile +++ b/usr.bin/clang/llc/Makefile @@ -6,5 +6,6 @@ SRCDIR= llvm/tools/llc SRCS+= llc.cpp LIBADD+= z +LIBADD+= zstd .include "../llvm.prog.mk" diff --git a/usr.bin/clang/lld/Makefile b/usr.bin/clang/lld/Makefile index aed22a7ae847..fb10ca7176d1 100644 --- a/usr.bin/clang/lld/Makefile +++ b/usr.bin/clang/lld/Makefile @@ -26,6 +26,7 @@ CFLAGS+= -I${LLD_SRCS}/ELF CFLAGS+= -I${LLD_SRCS}/include CFLAGS+= -I${.OBJDIR} CFLAGS+= -I${OBJTOP}/lib/clang/libllvm +CFLAGS+= -I${SRCTOP}/sys/contrib/zstd/lib SRCDIR= lld SRCS+= Common/Args.cpp @@ -78,6 +79,8 @@ SRCS+= ELF/Thunks.cpp SRCS+= ELF/Writer.cpp SRCS+= tools/lld/lld.cpp +CFLAGS.lld.cpp+= -Dlld_main=main + .include "${SRCTOP}/lib/clang/llvm.build.mk" LIBDEPS+= llvm @@ -105,5 +108,6 @@ LIBADD+= tinfow .endif LIBADD+= pthread LIBADD+= z +LIBADD+= zstd .include <bsd.prog.mk> diff --git a/usr.bin/clang/lldb-server/Makefile b/usr.bin/clang/lldb-server/Makefile index 532c2aa2047a..838f8f164d5c 100644 --- a/usr.bin/clang/lldb-server/Makefile +++ b/usr.bin/clang/lldb-server/Makefile @@ -50,5 +50,6 @@ LIBADD+= ncursesw LIBADD+= panel LIBADD+= pthread LIBADD+= z +LIBADD+= zstd .include <bsd.prog.mk> diff --git a/usr.bin/clang/lldb/Makefile b/usr.bin/clang/lldb/Makefile index 0637b8844cad..158b8780df56 100644 --- a/usr.bin/clang/lldb/Makefile +++ b/usr.bin/clang/lldb/Makefile @@ -44,5 +44,6 @@ LIBADD+= ncursesw LIBADD+= panelw LIBADD+= pthread LIBADD+= z +LIBADD+= zstd .include <bsd.prog.mk> diff --git a/usr.bin/clang/lli/Makefile b/usr.bin/clang/lli/Makefile index ec3e1f3e4ec8..0c8d621f42a6 100644 --- a/usr.bin/clang/lli/Makefile +++ b/usr.bin/clang/lli/Makefile @@ -7,5 +7,6 @@ SRCS+= ExecutionUtils.cpp SRCS+= lli.cpp LIBADD+= z +LIBADD+= zstd .include "../llvm.prog.mk" diff --git a/usr.bin/clang/llvm-dwarfdump/Makefile b/usr.bin/clang/llvm-dwarfdump/Makefile index 6e91ad763ba1..d5aaf812f8c4 100644 --- a/usr.bin/clang/llvm-dwarfdump/Makefile +++ b/usr.bin/clang/llvm-dwarfdump/Makefile @@ -8,5 +8,6 @@ SRCS+= Statistics.cpp SRCS+= llvm-dwarfdump.cpp LIBADD+= z +LIBADD+= zstd .include "../llvm.prog.mk" diff --git a/usr.bin/clang/llvm-dwarfutil/Makefile b/usr.bin/clang/llvm-dwarfutil/Makefile index a436acf0e197..0be0eefcea3e 100644 --- a/usr.bin/clang/llvm-dwarfutil/Makefile +++ b/usr.bin/clang/llvm-dwarfutil/Makefile @@ -23,5 +23,6 @@ DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} LIBADD+= z +LIBADD+= zstd .include "../llvm.prog.mk" diff --git a/usr.bin/clang/llvm-dwp/Makefile b/usr.bin/clang/llvm-dwp/Makefile index bce5474b84b5..c47729aea678 100644 --- a/usr.bin/clang/llvm-dwp/Makefile +++ b/usr.bin/clang/llvm-dwp/Makefile @@ -7,5 +7,6 @@ SRCDIR= llvm/tools/llvm-dwp SRCS+= llvm-dwp.cpp LIBADD+= z +LIBADD+= zstd .include "../llvm.prog.mk" diff --git a/usr.bin/clang/llvm-lto/Makefile b/usr.bin/clang/llvm-lto/Makefile index 96af172288f1..35e2b87fef3c 100644 --- a/usr.bin/clang/llvm-lto/Makefile +++ b/usr.bin/clang/llvm-lto/Makefile @@ -7,5 +7,6 @@ SRCDIR= llvm/tools/llvm-lto SRCS= llvm-lto.cpp LIBADD+= z +LIBADD+= zstd .include "../llvm.prog.mk" diff --git a/usr.bin/clang/llvm-lto2/Makefile b/usr.bin/clang/llvm-lto2/Makefile index 430aef07e17c..37a5e7f794c0 100644 --- a/usr.bin/clang/llvm-lto2/Makefile +++ b/usr.bin/clang/llvm-lto2/Makefile @@ -7,5 +7,6 @@ SRCDIR= llvm/tools/llvm-lto2 SRCS= llvm-lto2.cpp LIBADD+= z +LIBADD+= zstd .include "../llvm.prog.mk" diff --git a/usr.bin/clang/llvm-mc/Makefile b/usr.bin/clang/llvm-mc/Makefile index e0101ce674eb..cb3080481607 100644 --- a/usr.bin/clang/llvm-mc/Makefile +++ b/usr.bin/clang/llvm-mc/Makefile @@ -8,5 +8,6 @@ SRCS+= Disassembler.cpp SRCS+= llvm-mc.cpp LIBADD+= z +LIBADD+= zstd .include "../llvm.prog.mk" diff --git a/usr.bin/clang/llvm-nm/Makefile b/usr.bin/clang/llvm-nm/Makefile index e0c41e4a0254..30071da0e7dc 100644 --- a/usr.bin/clang/llvm-nm/Makefile +++ b/usr.bin/clang/llvm-nm/Makefile @@ -7,6 +7,8 @@ PROG_CXX= llvm-nm SRCDIR= llvm/tools/llvm-nm SRCS+= llvm-nm.cpp +CFLAGS.llvm-nm.cpp+= -Dllvm_nm_main=main + .include "${SRCTOP}/lib/clang/llvm.pre.mk" CFLAGS+= -I${.OBJDIR} diff --git a/usr.bin/clang/llvm-objcopy/Makefile b/usr.bin/clang/llvm-objcopy/Makefile index 1f4b8a3609af..335badf81ed9 100644 --- a/usr.bin/clang/llvm-objcopy/Makefile +++ b/usr.bin/clang/llvm-objcopy/Makefile @@ -28,6 +28,7 @@ DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} LIBADD+= z +LIBADD+= zstd LINKS= ${BINDIR}/llvm-objcopy ${BINDIR}/llvm-strip diff --git a/usr.bin/clang/llvm-objdump/Makefile b/usr.bin/clang/llvm-objdump/Makefile index c20bc172528f..d8d80443d965 100644 --- a/usr.bin/clang/llvm-objdump/Makefile +++ b/usr.bin/clang/llvm-objdump/Makefile @@ -31,6 +31,7 @@ DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} LIBADD+= z +LIBADD+= zstd LINKS= ${BINDIR}/llvm-objdump ${BINDIR}/objdump MLINKS= llvm-objdump.1 objdump.1 diff --git a/usr.bin/clang/llvm-profdata/Makefile b/usr.bin/clang/llvm-profdata/Makefile index 77e6d78e35e9..b3b0d63346de 100644 --- a/usr.bin/clang/llvm-profdata/Makefile +++ b/usr.bin/clang/llvm-profdata/Makefile @@ -5,6 +5,9 @@ PROG_CXX= llvm-profdata SRCDIR= llvm/tools/llvm-profdata SRCS+= llvm-profdata.cpp +CFLAGS.llvm-profdata.cpp+= -Dllvm_profdata_main=main + LIBADD+= z +LIBADD+= zstd .include "../llvm.prog.mk" diff --git a/usr.bin/clang/llvm-readobj/Makefile b/usr.bin/clang/llvm-readobj/Makefile index 4b547d81c583..d47cdfa329fc 100644 --- a/usr.bin/clang/llvm-readobj/Makefile +++ b/usr.bin/clang/llvm-readobj/Makefile @@ -18,6 +18,8 @@ SRCS+= Win64EHDumper.cpp SRCS+= WindowsResourceDumper.cpp SRCS+= XCOFFDumper.cpp +CFLAGS.llvm-readobj.cpp+= -Dllvm_readobj_main=main + .include "${SRCTOP}/lib/clang/llvm.pre.mk" CFLAGS+= -I${.OBJDIR} @@ -35,6 +37,7 @@ DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} LIBADD+= z +LIBADD+= zstd LINKS+= ${BINDIR}/llvm-readobj ${BINDIR}/llvm-readelf diff --git a/usr.bin/clang/llvm-rtdyld/Makefile b/usr.bin/clang/llvm-rtdyld/Makefile index a9d25e5213c2..6c7bd97f4bd0 100644 --- a/usr.bin/clang/llvm-rtdyld/Makefile +++ b/usr.bin/clang/llvm-rtdyld/Makefile @@ -7,5 +7,6 @@ SRCDIR= llvm/tools/llvm-rtdyld SRCS+= llvm-rtdyld.cpp LIBADD+= z +LIBADD+= zstd .include "../llvm.prog.mk" diff --git a/usr.bin/clang/llvm-size/Makefile b/usr.bin/clang/llvm-size/Makefile index bce5cf834e0c..59b9dac68ec3 100644 --- a/usr.bin/clang/llvm-size/Makefile +++ b/usr.bin/clang/llvm-size/Makefile @@ -7,6 +7,8 @@ PROG_CXX= llvm-size SRCDIR= llvm/tools/llvm-size SRCS+= llvm-size.cpp +CFLAGS.llvm-size.cpp+= -Dllvm_size_main=main + .include "${SRCTOP}/lib/clang/llvm.pre.mk" CFLAGS+= -I${.OBJDIR} diff --git a/usr.bin/clang/llvm-symbolizer/Makefile b/usr.bin/clang/llvm-symbolizer/Makefile index fcaf8facf1b8..0308b58bba55 100644 --- a/usr.bin/clang/llvm-symbolizer/Makefile +++ b/usr.bin/clang/llvm-symbolizer/Makefile @@ -25,6 +25,7 @@ DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} LIBADD+= z +LIBADD+= zstd LINKS+= ${BINDIR}/llvm-symbolizer ${BINDIR}/llvm-addr2line diff --git a/usr.bin/clang/llvm-tblgen/Makefile b/usr.bin/clang/llvm-tblgen/Makefile index 02f696ccc29e..bd2859e162d6 100644 --- a/usr.bin/clang/llvm-tblgen/Makefile +++ b/usr.bin/clang/llvm-tblgen/Makefile @@ -50,6 +50,7 @@ SRCS+= OptParserEmitter.cpp SRCS+= OptRSTEmitter.cpp SRCS+= PredicateExpander.cpp SRCS+= PseudoLoweringEmitter.cpp +SRCS+= RISCVTargetDefEmitter.cpp SRCS+= RegisterBankEmitter.cpp SRCS+= RegisterInfoEmitter.cpp SRCS+= SDNodeProperties.cpp diff --git a/usr.bin/clang/llvm-xray/Makefile b/usr.bin/clang/llvm-xray/Makefile index 26083e54795f..1be3eb059e81 100644 --- a/usr.bin/clang/llvm-xray/Makefile +++ b/usr.bin/clang/llvm-xray/Makefile @@ -16,5 +16,6 @@ SRCS+= xray-registry.cpp SRCS+= xray-stacks.cpp LIBADD+= z +LIBADD+= zstd .include "../llvm.prog.mk" diff --git a/usr.bin/clang/opt/Makefile b/usr.bin/clang/opt/Makefile index f6b2bea4894d..27e0395942f6 100644 --- a/usr.bin/clang/opt/Makefile +++ b/usr.bin/clang/opt/Makefile @@ -5,11 +5,10 @@ PROG_CXX= opt SRCDIR= llvm/tools/opt SRCS+= AnalysisWrappers.cpp SRCS+= BreakpointPrinter.cpp -SRCS+= GraphPrinters.cpp SRCS+= NewPMDriver.cpp -SRCS+= PrintSCC.cpp SRCS+= opt.cpp LIBADD+= z +LIBADD+= zstd .include "../llvm.prog.mk" |