Date: Fri, 20 Dec 2019 19:53:05 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r355940 - in head: . contrib/compiler-rt contrib/libc++ contrib/libunwind contrib/llvm contrib/llvm-project/clang contrib/llvm-project/compiler-rt contrib/llvm-project/libcxx contrib/ll... Message-ID: <201912201953.xBKJr5B7043461@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim Date: Fri Dec 20 19:53:05 2019 New Revision: 355940 URL: https://svnweb.freebsd.org/changeset/base/355940 Log: Move all sources from the llvm project into contrib/llvm-project. This uses the new layout of the upstream repository, which was recently migrated to GitHub, and converted into a "monorepo". That is, most of the earlier separate sub-projects with their own branches and tags were consolidated into one top-level directory, and are now branched and tagged together. Updating the vendor area to match this layout is next. Added: - copied from r355939, vendor/llvm-project/master/ head/contrib/llvm-project/clang/ - copied from r355939, head/contrib/llvm/tools/clang/ head/contrib/llvm-project/compiler-rt/ - copied from r355939, head/contrib/compiler-rt/ head/contrib/llvm-project/libcxx/ - copied from r355939, head/contrib/libc++/ head/contrib/llvm-project/libunwind/ - copied from r355939, head/contrib/libunwind/ head/contrib/llvm-project/lld/ - copied from r355939, head/contrib/llvm/tools/lld/ head/contrib/llvm-project/lldb/ - copied from r355939, head/contrib/llvm/tools/lldb/ head/contrib/llvm-project/llvm/ - copied from r355939, head/contrib/llvm/ head/contrib/llvm-project/openmp/ - copied from r355939, head/contrib/openmp/ Directory Properties: head/contrib/llvm-project/ (props changed) Deleted: head/contrib/compiler-rt/ head/contrib/libc++/ head/contrib/libunwind/ head/contrib/llvm/ head/contrib/llvm-project/llvm/tools/clang/ head/contrib/llvm-project/llvm/tools/lld/ head/contrib/llvm-project/llvm/tools/lldb/ head/contrib/openmp/ Modified: head/MAINTAINERS head/gnu/usr.bin/cc/include/Makefile head/lib/clang/clang.build.mk head/lib/clang/clang.pre.mk head/lib/clang/libclang/Makefile head/lib/clang/liblldb/Makefile head/lib/clang/libllvm/Makefile head/lib/clang/libllvmminimal/Makefile head/lib/clang/lldb.pre.mk head/lib/clang/llvm.build.mk head/lib/clang/llvm.pre.mk head/lib/libblocksruntime/Makefile head/lib/libc++/Makefile head/lib/libc++experimental/Makefile head/lib/libc/arm/aeabi/Makefile.inc head/lib/libclang_rt/Makefile.inc head/lib/libcompiler_rt/Makefile.inc head/lib/libexecinfo/Makefile head/lib/libgcc_eh/Makefile.inc head/lib/libomp/Makefile head/share/doc/llvm/Makefile head/share/doc/llvm/clang/Makefile head/share/mk/bsd.clang-analyze.mk head/stand/i386/boot2/Makefile head/stand/libsa/Makefile head/sys/modules/aesni/Makefile head/sys/modules/blake2/Makefile head/usr.bin/clang/bugpoint/Makefile head/usr.bin/clang/clang-format/Makefile head/usr.bin/clang/clang-tblgen/Makefile head/usr.bin/clang/clang/Makefile head/usr.bin/clang/llc/Makefile head/usr.bin/clang/lld/Makefile head/usr.bin/clang/lldb-tblgen/Makefile head/usr.bin/clang/lldb/Makefile head/usr.bin/clang/lli/Makefile head/usr.bin/clang/llvm-ar/Makefile head/usr.bin/clang/llvm-as/Makefile head/usr.bin/clang/llvm-bcanalyzer/Makefile head/usr.bin/clang/llvm-cov/Makefile head/usr.bin/clang/llvm-cxxdump/Makefile head/usr.bin/clang/llvm-cxxfilt/Makefile head/usr.bin/clang/llvm-diff/Makefile head/usr.bin/clang/llvm-dis/Makefile head/usr.bin/clang/llvm-dwarfdump/Makefile head/usr.bin/clang/llvm-extract/Makefile head/usr.bin/clang/llvm-link/Makefile head/usr.bin/clang/llvm-lto/Makefile head/usr.bin/clang/llvm-lto2/Makefile head/usr.bin/clang/llvm-mc/Makefile head/usr.bin/clang/llvm-mca/Makefile head/usr.bin/clang/llvm-modextract/Makefile head/usr.bin/clang/llvm-nm/Makefile head/usr.bin/clang/llvm-objcopy/Makefile head/usr.bin/clang/llvm-objdump/Makefile head/usr.bin/clang/llvm-pdbutil/Makefile head/usr.bin/clang/llvm-profdata/Makefile head/usr.bin/clang/llvm-rtdyld/Makefile head/usr.bin/clang/llvm-symbolizer/Makefile head/usr.bin/clang/llvm-tblgen/Makefile head/usr.bin/clang/llvm-xray/Makefile head/usr.bin/clang/opt/Makefile Modified: head/MAINTAINERS ============================================================================== --- head/MAINTAINERS Fri Dec 20 18:23:50 2019 (r355939) +++ head/MAINTAINERS Fri Dec 20 19:53:05 2019 (r355940) @@ -38,14 +38,15 @@ subsystem login notes ath(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org contrib/atf ngie,#test Pre-commit review requested. contrib/capsicum-test ngie,#capsicum,#test Pre-commit review requested. -contrib/compiler-rt dim Pre-commit review preferred. contrib/googletest ngie,#test Pre-commit review requested. -contrib/ipfilter cy Pre-commit review requested. -contrib/libc++ dim Pre-commit review preferred. -contrib/libcxxrt dim Pre-commit review preferred. -contrib/libunwind dim,emaste,jhb Pre-commit review preferred. -contrib/llvm dim Pre-commit review preferred. -contrib/llvm/tools/lldb dim,emaste Pre-commit review preferred. +contrib/ipfilter cy Pre-commit review requested. +contrib/libcxxrt dim,emaste Pre-commit review preferred. +contrib/llvm-project/compiler-rt dim Pre-commit review preferred. +contrib/llvm-project/libcxx dim Pre-commit review preferred. +contrib/llvm-project/libunwind dim,emaste,jhb Pre-commit review preferred. +contrib/llvm-project/lldb dim,emaste Pre-commit review preferred. +contrib/llvm-project/llvm dim Pre-commit review preferred. +contrib/llvm-project/openmp dim,emaste Pre-commit review preferred. contrib/netbsd-tests ngie,#test Pre-commit review requested. contrib/pjdfstest asomers,ngie,pjd,#test Pre-commit review requested. *env(3) secteam Due to the problematic security history of this Modified: head/gnu/usr.bin/cc/include/Makefile ============================================================================== --- head/gnu/usr.bin/cc/include/Makefile Fri Dec 20 18:23:50 2019 (r355939) +++ head/gnu/usr.bin/cc/include/Makefile Fri Dec 20 19:53:05 2019 (r355940) @@ -6,7 +6,7 @@ INCSDIR=${INCLUDEDIR}/gcc/${GCCVER} -.PATH: ${GCCDIR}/config/${GCC_CPU} ${SRCTOP}/contrib/llvm/tools/clang/lib/Headers +.PATH: ${GCCDIR}/config/${GCC_CPU} ${SRCTOP}/contrib/llvm-project/clang/lib/Headers .if ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64" INCS= ammintrin.h emmintrin.h mmintrin.h mm3dnow.h pmmintrin.h \ Modified: head/lib/clang/clang.build.mk ============================================================================== --- head/lib/clang/clang.build.mk Fri Dec 20 18:23:50 2019 (r355939) +++ head/lib/clang/clang.build.mk Fri Dec 20 19:53:05 2019 (r355940) @@ -2,16 +2,8 @@ .include <src.opts.mk> -.ifndef LLVM_SRCS -.error Please define LLVM_SRCS before including this file -.endif - .ifndef CLANG_SRCS .error Please define CLANG_SRCS before including this file -.endif - -.ifndef SRCDIR -.error Please define SRCDIR before including this file .endif CFLAGS+= -I${CLANG_SRCS}/include Modified: head/lib/clang/clang.pre.mk ============================================================================== --- head/lib/clang/clang.pre.mk Fri Dec 20 18:23:50 2019 (r355939) +++ head/lib/clang/clang.pre.mk Fri Dec 20 19:53:05 2019 (r355940) @@ -2,6 +2,6 @@ .include "llvm.pre.mk" -CLANG_SRCS= ${LLVM_SRCS}/tools/clang +CLANG_SRCS= ${LLVM_BASE}/clang CLANG_TBLGEN?= clang-tblgen Modified: head/lib/clang/libclang/Makefile ============================================================================== --- head/lib/clang/libclang/Makefile Fri Dec 20 18:23:50 2019 (r355939) +++ head/lib/clang/libclang/Makefile Fri Dec 20 19:53:05 2019 (r355940) @@ -18,7 +18,7 @@ CFLAGS.Targets.cpp+= -include ../freebsd_cc_version.h CXXFLAGS.Module.cpp+= -fpermissive .endif -SRCDIR= tools/clang/lib +SRCDIR= clang/lib # Explanation of different SRCS variants below: # SRCS_MIN: always required, even for bootstrap Modified: head/lib/clang/liblldb/Makefile ============================================================================== --- head/lib/clang/liblldb/Makefile Fri Dec 20 18:23:50 2019 (r355939) +++ head/lib/clang/liblldb/Makefile Fri Dec 20 19:53:05 2019 (r355940) @@ -3,7 +3,7 @@ .include "../lldb.pre.mk" LIB= lldb -SRCDIR= tools/lldb/source +SRCDIR= lldb/source CFLAGS+= -I${LLDB_SRCS}/include CFLAGS+= -I${LLDB_SRCS}/source Modified: head/lib/clang/libllvm/Makefile ============================================================================== --- head/lib/clang/libllvm/Makefile Fri Dec 20 18:23:50 2019 (r355939) +++ head/lib/clang/libllvm/Makefile Fri Dec 20 19:53:05 2019 (r355940) @@ -24,7 +24,7 @@ CFLAGS+= -I${LLVM_SRCS}/lib/Target/${arch} . endif .endfor -SRCDIR= lib +SRCDIR= llvm/lib # Explanation of different SRCS variants below: # SRCS_MIN: always required, even for bootstrap Modified: head/lib/clang/libllvmminimal/Makefile ============================================================================== --- head/lib/clang/libllvmminimal/Makefile Fri Dec 20 18:23:50 2019 (r355939) +++ head/lib/clang/libllvmminimal/Makefile Fri Dec 20 19:53:05 2019 (r355940) @@ -5,7 +5,7 @@ LIB= llvmminimal INTERNALLIB= -SRCDIR= lib +SRCDIR= llvm/lib SRCS+= Demangle/ItaniumDemangle.cpp SRCS+= Support/APFloat.cpp SRCS+= Support/APInt.cpp Modified: head/lib/clang/lldb.pre.mk ============================================================================== --- head/lib/clang/lldb.pre.mk Fri Dec 20 18:23:50 2019 (r355939) +++ head/lib/clang/lldb.pre.mk Fri Dec 20 19:53:05 2019 (r355940) @@ -2,4 +2,4 @@ .include "clang.pre.mk" -LLDB_SRCS= ${LLVM_SRCS}/tools/lldb +LLDB_SRCS= ${LLVM_BASE}/lldb Modified: head/lib/clang/llvm.build.mk ============================================================================== --- head/lib/clang/llvm.build.mk Fri Dec 20 18:23:50 2019 (r355939) +++ head/lib/clang/llvm.build.mk Fri Dec 20 19:53:05 2019 (r355940) @@ -2,6 +2,10 @@ .include <src.opts.mk> +.ifndef LLVM_BASE +.error Please define LLVM_BASE before including this file +.endif + .ifndef LLVM_SRCS .error Please define LLVM_SRCS before including this file .endif @@ -10,7 +14,7 @@ .error Please define SRCDIR before including this file .endif -.PATH: ${LLVM_SRCS}/${SRCDIR} +.PATH: ${LLVM_BASE}/${SRCDIR} CFLAGS+= -I${SRCTOP}/lib/clang/include CFLAGS+= -I${LLVM_SRCS}/include Modified: head/lib/clang/llvm.pre.mk ============================================================================== --- head/lib/clang/llvm.pre.mk Fri Dec 20 18:23:50 2019 (r355939) +++ head/lib/clang/llvm.pre.mk Fri Dec 20 19:53:05 2019 (r355940) @@ -1,5 +1,7 @@ + # $FreeBSD$ -LLVM_SRCS= ${SRCTOP}/contrib/llvm +LLVM_BASE= ${SRCTOP}/contrib/llvm-project +LLVM_SRCS= ${LLVM_BASE}/llvm LLVM_TBLGEN?= llvm-tblgen Modified: head/lib/libblocksruntime/Makefile ============================================================================== --- head/lib/libblocksruntime/Makefile Fri Dec 20 18:23:50 2019 (r355939) +++ head/lib/libblocksruntime/Makefile Fri Dec 20 19:53:05 2019 (r355940) @@ -6,7 +6,7 @@ SHLIB_MAJOR=0 CFLAGS+=-I${.CURDIR} WARNS?= 2 -.PATH: ${SRCTOP}/contrib/compiler-rt/lib/BlocksRuntime +.PATH: ${SRCTOP}/contrib/llvm-project/compiler-rt/lib/BlocksRuntime INCS= Block.h Block_private.h SRCS= data.c runtime.c Modified: head/lib/libc++/Makefile ============================================================================== --- head/lib/libc++/Makefile Fri Dec 20 18:23:50 2019 (r355939) +++ head/lib/libc++/Makefile Fri Dec 20 19:53:05 2019 (r355940) @@ -4,8 +4,8 @@ PACKAGE= clibs _LIBCXXRTDIR= ${SRCTOP}/contrib/libcxxrt -HDRDIR= ${SRCTOP}/contrib/libc++/include -SRCDIR= ${SRCTOP}/contrib/libc++/src +HDRDIR= ${SRCTOP}/contrib/llvm-project/libcxx/include +SRCDIR= ${SRCTOP}/contrib/llvm-project/libcxx/src CXXINCLUDEDIR= ${INCLUDEDIR}/c++/v${SHLIB_MAJOR} .if ${MACHINE_CPUARCH} == "arm" STATIC_CXXFLAGS+= -mlong-calls Modified: head/lib/libc++experimental/Makefile ============================================================================== --- head/lib/libc++experimental/Makefile Fri Dec 20 18:23:50 2019 (r355939) +++ head/lib/libc++experimental/Makefile Fri Dec 20 19:53:05 2019 (r355940) @@ -3,7 +3,7 @@ .include <src.opts.mk> PACKAGE= clibs -SRCDIR= ${SRCTOP}/contrib/libc++ +SRCDIR= ${SRCTOP}/contrib/llvm-project/libcxx LIB= c++experimental NO_PIC= Modified: head/lib/libc/arm/aeabi/Makefile.inc ============================================================================== --- head/lib/libc/arm/aeabi/Makefile.inc Fri Dec 20 18:23:50 2019 (r355939) +++ head/lib/libc/arm/aeabi/Makefile.inc Fri Dec 20 19:53:05 2019 (r355940) @@ -21,7 +21,7 @@ SRCS+= aeabi_vfp_double.S \ # libc. This causes issues when other parts of libc call these functions. # We work around this by including these functions in libc but mark them as # hidden so users of libc will not pick up these versions. -.PATH: ${SRCTOP}/contrib/compiler-rt/lib/builtins/arm +.PATH: ${SRCTOP}/contrib/llvm-project/compiler-rt/lib/builtins/arm SRCS+= aeabi_memcmp.S \ aeabi_memcpy.S \ Modified: head/lib/libclang_rt/Makefile.inc ============================================================================== --- head/lib/libclang_rt/Makefile.inc Fri Dec 20 18:23:50 2019 (r355939) +++ head/lib/libclang_rt/Makefile.inc Fri Dec 20 19:53:05 2019 (r355940) @@ -10,7 +10,7 @@ CRTARCH?= armhf .else CRTARCH?= ${MACHINE_ARCH:C/amd64/x86_64/} .endif -CRTSRC= ${SRCTOP}/contrib/compiler-rt +CRTSRC= ${SRCTOP}/contrib/llvm-project/compiler-rt .PATH: ${CRTSRC}/lib Modified: head/lib/libcompiler_rt/Makefile.inc ============================================================================== --- head/lib/libcompiler_rt/Makefile.inc Fri Dec 20 18:23:50 2019 (r355939) +++ head/lib/libcompiler_rt/Makefile.inc Fri Dec 20 19:53:05 2019 (r355940) @@ -2,7 +2,7 @@ CRTARCH= ${MACHINE_CPUARCH:C/amd64/x86_64/} -CRTSRC= ${SRCTOP}/contrib/compiler-rt/lib/builtins +CRTSRC= ${SRCTOP}/contrib/llvm-project/compiler-rt/lib/builtins .PATH: ${CRTSRC}/${CRTARCH} .PATH: ${CRTSRC} Modified: head/lib/libexecinfo/Makefile ============================================================================== --- head/lib/libexecinfo/Makefile Fri Dec 20 18:23:50 2019 (r355939) +++ head/lib/libexecinfo/Makefile Fri Dec 20 19:53:05 2019 (r355940) @@ -11,7 +11,7 @@ SHLIB_MAJOR= 1 INCS= execinfo.h SRCS= backtrace.c symtab.c unwind.c -CFLAGS+= -I${SRCTOP}/contrib/libunwind/include +CFLAGS+= -I${SRCTOP}/contrib/llvm-project/libunwind/include LIBADD= elf Modified: head/lib/libgcc_eh/Makefile.inc ============================================================================== --- head/lib/libgcc_eh/Makefile.inc Fri Dec 20 18:23:50 2019 (r355939) +++ head/lib/libgcc_eh/Makefile.inc Fri Dec 20 19:53:05 2019 (r355940) @@ -1,8 +1,8 @@ # $FreeBSD$ -COMPILERRTDIR= ${SRCTOP}/contrib/compiler-rt -UNWINDINCDIR= ${SRCTOP}/contrib/libunwind/include -UNWINDSRCDIR= ${SRCTOP}/contrib/libunwind/src +COMPILERRTDIR= ${SRCTOP}/contrib/llvm-project/compiler-rt +UNWINDINCDIR= ${SRCTOP}/contrib/llvm-project/libunwind/include +UNWINDSRCDIR= ${SRCTOP}/contrib/llvm-project/libunwind/src STATIC_CFLAGS+=${PICFLAG} -fvisibility=hidden -DVISIBILITY_HIDDEN @@ -35,5 +35,5 @@ STATIC_CXXFLAGS+= -fvisibility=hidden -fPIC # Probably need to just move this earlier or use CXXFLAGS .if ${MK_DIRDEPS_BUILD} == "yes" # Avoid dependency on lib/libc++ -CFLAGS+= -isystem ${SRCTOP}/contrib/libc++/include -nostdinc++ +CFLAGS+= -isystem ${SRCTOP}/contrib/llvm-project/libcxx/include -nostdinc++ .endif Modified: head/lib/libomp/Makefile ============================================================================== --- head/lib/libomp/Makefile Fri Dec 20 18:23:50 2019 (r355939) +++ head/lib/libomp/Makefile Fri Dec 20 19:53:05 2019 (r355940) @@ -4,7 +4,7 @@ SHLIB_NAME= libomp.so -OMPSRC= ${SRCTOP}/contrib/openmp/runtime/src +OMPSRC= ${SRCTOP}/contrib/llvm-project/openmp/runtime/src ITTSRC= ${OMPSRC}/thirdparty/ittnotify .PATH: ${OMPSRC} .PATH: ${ITTSRC} Modified: head/share/doc/llvm/Makefile ============================================================================== --- head/share/doc/llvm/Makefile Fri Dec 20 18:23:50 2019 (r355939) +++ head/share/doc/llvm/Makefile Fri Dec 20 19:53:05 2019 (r355940) @@ -2,7 +2,7 @@ SUBDIR= clang -SRCDIR= ${SRCTOP}/contrib/llvm +SRCDIR= ${SRCTOP}/contrib/llvm-project/llvm .PATH: ${SRCDIR} ${SRCDIR}/lib/Support Modified: head/share/doc/llvm/clang/Makefile ============================================================================== --- head/share/doc/llvm/clang/Makefile Fri Dec 20 18:23:50 2019 (r355939) +++ head/share/doc/llvm/clang/Makefile Fri Dec 20 19:53:05 2019 (r355940) @@ -1,6 +1,6 @@ # $FreeBSD$ -SRCDIR= ${SRCTOP}/contrib/llvm/tools/clang +SRCDIR= ${SRCTOP}/contrib/llvm-project/clang .PATH: ${SRCDIR} Modified: head/share/mk/bsd.clang-analyze.mk ============================================================================== --- head/share/mk/bsd.clang-analyze.mk Fri Dec 20 18:23:50 2019 (r355939) +++ head/share/mk/bsd.clang-analyze.mk Fri Dec 20 19:53:05 2019 (r355940) @@ -14,7 +14,7 @@ # html - generate html in obj.plist/ directories. # plist - generate xml obj.plist files. # See also: -# contrib/llvm/tools/clang/include/clang/StaticAnalyzer/Core/Analyses.def +# contrib/llvm-project/clang/include/clang/StaticAnalyzer/Core/Analyses.def # # CLANG_ANALYZE_OUTPUT_DIR Sets which directory output set by # CLANG_ANALYZE_OUTPUT is placed into. Modified: head/stand/i386/boot2/Makefile ============================================================================== --- head/stand/i386/boot2/Makefile Fri Dec 20 18:23:50 2019 (r355939) +++ head/stand/i386/boot2/Makefile Fri Dec 20 19:53:05 2019 (r355940) @@ -79,7 +79,7 @@ boot2.bin: boot2.out ${OBJCOPY} -S -O binary boot2.out ${.TARGET} # For __ashldi3 -.PATH: ${SRCTOP}/contrib/compiler-rt/lib/builtins +.PATH: ${SRCTOP}/contrib/llvm-project/compiler-rt/lib/builtins CFLAGS.ashldi3.c= -Wno-missing-prototypes -Wno-missing-declarations CLEANFILES+= ashldi3.o Modified: head/stand/libsa/Makefile ============================================================================== --- head/stand/libsa/Makefile Fri Dec 20 18:23:50 2019 (r355939) +++ head/stand/libsa/Makefile Fri Dec 20 19:53:05 2019 (r355940) @@ -53,7 +53,7 @@ CFLAGS.clang+= -mno-movt .endif CFLAGS.clang+= -mfpu=none -.PATH: ${SRCTOP}/contrib/compiler-rt/lib/builtins/arm/ +.PATH: ${SRCTOP}/contrib/llvm-project/compiler-rt/lib/builtins/arm/ SRCS+= aeabi_idivmod.S aeabi_ldivmod.S aeabi_uidivmod.S aeabi_uldivmod.S SRCS+= aeabi_memcmp.S aeabi_memcpy.S aeabi_memmove.S aeabi_memset.S .endif @@ -63,7 +63,7 @@ SRCS+= aeabi_memcmp.S aeabi_memcpy.S aeabi_memmove.S a .endif # Compiler support functions -.PATH: ${SRCTOP}/contrib/compiler-rt/lib/builtins/ +.PATH: ${SRCTOP}/contrib/llvm-project/compiler-rt/lib/builtins/ # __clzsi2 and ctzsi2 for various builtin functions SRCS+= clzsi2.c ctzsi2.c # Divide and modulus functions called by the compiler Modified: head/sys/modules/aesni/Makefile ============================================================================== --- head/sys/modules/aesni/Makefile Fri Dec 20 18:23:50 2019 (r355939) +++ head/sys/modules/aesni/Makefile Fri Dec 20 19:53:05 2019 (r355940) @@ -1,7 +1,7 @@ # $FreeBSD$ .PATH: ${SRCTOP}/sys/crypto/aesni -.PATH: ${SRCTOP}/contrib/llvm/tools/clang/lib/Headers +.PATH: ${SRCTOP}/contrib/llvm-project/clang/lib/Headers KMOD= aesni SRCS= aesni.c Modified: head/sys/modules/blake2/Makefile ============================================================================== --- head/sys/modules/blake2/Makefile Fri Dec 20 18:23:50 2019 (r355939) +++ head/sys/modules/blake2/Makefile Fri Dec 20 19:53:05 2019 (r355940) @@ -3,7 +3,7 @@ .PATH: ${SRCTOP}/sys/contrib/libb2 .PATH: ${SRCTOP}/sys/crypto/blake2 .PATH: ${SRCTOP}/sys/opencrypto -.PATH: ${SRCTOP}/contrib/llvm/tools/clang/lib/Headers +.PATH: ${SRCTOP}/contrib/llvm-project/clang/lib/Headers KMOD = blake2 Modified: head/usr.bin/clang/bugpoint/Makefile ============================================================================== --- head/usr.bin/clang/bugpoint/Makefile Fri Dec 20 18:23:50 2019 (r355939) +++ head/usr.bin/clang/bugpoint/Makefile Fri Dec 20 19:53:05 2019 (r355940) @@ -2,7 +2,7 @@ PROG_CXX= bugpoint -SRCDIR= tools/bugpoint +SRCDIR= llvm/tools/bugpoint SRCS+= BugDriver.cpp SRCS+= CrashDebugger.cpp SRCS+= ExecutionDriver.cpp Modified: head/usr.bin/clang/clang-format/Makefile ============================================================================== --- head/usr.bin/clang/clang-format/Makefile Fri Dec 20 18:23:50 2019 (r355939) +++ head/usr.bin/clang/clang-format/Makefile Fri Dec 20 19:53:05 2019 (r355940) @@ -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" Modified: head/usr.bin/clang/clang-tblgen/Makefile ============================================================================== --- head/usr.bin/clang/clang-tblgen/Makefile Fri Dec 20 18:23:50 2019 (r355939) +++ head/usr.bin/clang/clang-tblgen/Makefile Fri Dec 20 19:53:05 2019 (r355940) @@ -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 Modified: head/usr.bin/clang/clang/Makefile ============================================================================== --- head/usr.bin/clang/clang/Makefile Fri Dec 20 18:23:50 2019 (r355939) +++ head/usr.bin/clang/clang/Makefile Fri Dec 20 19:53:05 2019 (r355940) @@ -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 Modified: head/usr.bin/clang/llc/Makefile ============================================================================== --- head/usr.bin/clang/llc/Makefile Fri Dec 20 18:23:50 2019 (r355939) +++ head/usr.bin/clang/llc/Makefile Fri Dec 20 19:53:05 2019 (r355940) @@ -2,7 +2,7 @@ PROG_CXX= llc -SRCDIR= tools/llc +SRCDIR= llvm/tools/llc SRCS+= llc.cpp LIBADD+= z Modified: head/usr.bin/clang/lld/Makefile ============================================================================== --- head/usr.bin/clang/lld/Makefile Fri Dec 20 18:23:50 2019 (r355939) +++ head/usr.bin/clang/lld/Makefile Fri Dec 20 19:53:05 2019 (r355940) @@ -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 Modified: head/usr.bin/clang/lldb-tblgen/Makefile ============================================================================== --- head/usr.bin/clang/lldb-tblgen/Makefile Fri Dec 20 18:23:50 2019 (r355939) +++ head/usr.bin/clang/lldb-tblgen/Makefile Fri Dec 20 19:53:05 2019 (r355940) @@ -3,7 +3,7 @@ PROG_CXX= lldb-tblgen MAN= -SRCDIR= tools/lldb/utils/TableGen +SRCDIR= lldb/utils/TableGen SRCS+= LLDBOptionDefEmitter.cpp SRCS+= LLDBTableGen.cpp Modified: head/usr.bin/clang/lldb/Makefile ============================================================================== --- head/usr.bin/clang/lldb/Makefile Fri Dec 20 18:23:50 2019 (r355939) +++ head/usr.bin/clang/lldb/Makefile Fri Dec 20 19:53:05 2019 (r355940) @@ -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" Modified: head/usr.bin/clang/lli/Makefile ============================================================================== --- head/usr.bin/clang/lli/Makefile Fri Dec 20 18:23:50 2019 (r355939) +++ head/usr.bin/clang/lli/Makefile Fri Dec 20 19:53:05 2019 (r355940) @@ -2,7 +2,7 @@ PROG_CXX= lli -SRCDIR= tools/lli +SRCDIR= llvm/tools/lli SRCS+= lli.cpp LIBADD+= z Modified: head/usr.bin/clang/llvm-ar/Makefile ============================================================================== --- head/usr.bin/clang/llvm-ar/Makefile Fri Dec 20 18:23:50 2019 (r355939) +++ head/usr.bin/clang/llvm-ar/Makefile Fri Dec 20 19:53:05 2019 (r355940) @@ -2,7 +2,7 @@ PROG_CXX= llvm-ar -SRCDIR= tools/llvm-ar +SRCDIR= llvm/tools/llvm-ar SRCS+= llvm-ar.cpp LIBADD+= z Modified: head/usr.bin/clang/llvm-as/Makefile ============================================================================== --- head/usr.bin/clang/llvm-as/Makefile Fri Dec 20 18:23:50 2019 (r355939) +++ head/usr.bin/clang/llvm-as/Makefile Fri Dec 20 19:53:05 2019 (r355940) @@ -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" Modified: head/usr.bin/clang/llvm-bcanalyzer/Makefile ============================================================================== --- head/usr.bin/clang/llvm-bcanalyzer/Makefile Fri Dec 20 18:23:50 2019 (r355939) +++ head/usr.bin/clang/llvm-bcanalyzer/Makefile Fri Dec 20 19:53:05 2019 (r355940) @@ -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" Modified: head/usr.bin/clang/llvm-cov/Makefile ============================================================================== --- head/usr.bin/clang/llvm-cov/Makefile Fri Dec 20 18:23:50 2019 (r355939) +++ head/usr.bin/clang/llvm-cov/Makefile Fri Dec 20 19:53:05 2019 (r355940) @@ -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 Modified: head/usr.bin/clang/llvm-cxxdump/Makefile ============================================================================== --- head/usr.bin/clang/llvm-cxxdump/Makefile Fri Dec 20 18:23:50 2019 (r355939) +++ head/usr.bin/clang/llvm-cxxdump/Makefile Fri Dec 20 19:53:05 2019 (r355940) @@ -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 Modified: head/usr.bin/clang/llvm-cxxfilt/Makefile ============================================================================== --- head/usr.bin/clang/llvm-cxxfilt/Makefile Fri Dec 20 18:23:50 2019 (r355939) +++ head/usr.bin/clang/llvm-cxxfilt/Makefile Fri Dec 20 19:53:05 2019 (r355940) @@ -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" Modified: head/usr.bin/clang/llvm-diff/Makefile ============================================================================== --- head/usr.bin/clang/llvm-diff/Makefile Fri Dec 20 18:23:50 2019 (r355939) +++ head/usr.bin/clang/llvm-diff/Makefile Fri Dec 20 19:53:05 2019 (r355940) @@ -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 Modified: head/usr.bin/clang/llvm-dis/Makefile ============================================================================== --- head/usr.bin/clang/llvm-dis/Makefile Fri Dec 20 18:23:50 2019 (r355939) +++ head/usr.bin/clang/llvm-dis/Makefile Fri Dec 20 19:53:05 2019 (r355940) @@ -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" Modified: head/usr.bin/clang/llvm-dwarfdump/Makefile ============================================================================== --- head/usr.bin/clang/llvm-dwarfdump/Makefile Fri Dec 20 18:23:50 2019 (r355939) +++ head/usr.bin/clang/llvm-dwarfdump/Makefile Fri Dec 20 19:53:05 2019 (r355940) @@ -2,7 +2,7 @@ PROG_CXX= llvm-dwarfdump -SRCDIR= tools/llvm-dwarfdump +SRCDIR= llvm/tools/llvm-dwarfdump SRCS+= Statistics.cpp SRCS+= llvm-dwarfdump.cpp Modified: head/usr.bin/clang/llvm-extract/Makefile ============================================================================== --- head/usr.bin/clang/llvm-extract/Makefile Fri Dec 20 18:23:50 2019 (r355939) +++ head/usr.bin/clang/llvm-extract/Makefile Fri Dec 20 19:53:05 2019 (r355940) @@ -2,7 +2,7 @@ PROG_CXX= llvm-extract -SRCDIR= tools/llvm-extract +SRCDIR= llvm/tools/llvm-extract SRCS+= llvm-extract.cpp LIBADD+= z Modified: head/usr.bin/clang/llvm-link/Makefile ============================================================================== --- head/usr.bin/clang/llvm-link/Makefile Fri Dec 20 18:23:50 2019 (r355939) +++ head/usr.bin/clang/llvm-link/Makefile Fri Dec 20 19:53:05 2019 (r355940) @@ -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" Modified: head/usr.bin/clang/llvm-lto/Makefile ============================================================================== --- head/usr.bin/clang/llvm-lto/Makefile Fri Dec 20 18:23:50 2019 (r355939) +++ head/usr.bin/clang/llvm-lto/Makefile Fri Dec 20 19:53:05 2019 (r355940) @@ -3,7 +3,7 @@ PROG_CXX= llvm-lto MAN= -SRCDIR= tools/llvm-lto +SRCDIR= llvm/tools/llvm-lto SRCS= llvm-lto.cpp LIBADD+= z Modified: head/usr.bin/clang/llvm-lto2/Makefile ============================================================================== --- head/usr.bin/clang/llvm-lto2/Makefile Fri Dec 20 18:23:50 2019 (r355939) +++ head/usr.bin/clang/llvm-lto2/Makefile Fri Dec 20 19:53:05 2019 (r355940) @@ -3,7 +3,7 @@ PROG_CXX= llvm-lto2 MAN= -SRCDIR= tools/llvm-lto2 +SRCDIR= llvm/tools/llvm-lto2 SRCS= llvm-lto2.cpp LIBADD+= z Modified: head/usr.bin/clang/llvm-mc/Makefile ============================================================================== --- head/usr.bin/clang/llvm-mc/Makefile Fri Dec 20 18:23:50 2019 (r355939) +++ head/usr.bin/clang/llvm-mc/Makefile Fri Dec 20 19:53:05 2019 (r355940) @@ -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 Modified: head/usr.bin/clang/llvm-mca/Makefile ============================================================================== --- head/usr.bin/clang/llvm-mca/Makefile Fri Dec 20 18:23:50 2019 (r355939) +++ head/usr.bin/clang/llvm-mca/Makefile Fri Dec 20 19:53:05 2019 (r355940) @@ -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 Modified: head/usr.bin/clang/llvm-modextract/Makefile ============================================================================== --- head/usr.bin/clang/llvm-modextract/Makefile Fri Dec 20 18:23:50 2019 (r355939) +++ head/usr.bin/clang/llvm-modextract/Makefile Fri Dec 20 19:53:05 2019 (r355940) @@ -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" Modified: head/usr.bin/clang/llvm-nm/Makefile ============================================================================== --- head/usr.bin/clang/llvm-nm/Makefile Fri Dec 20 18:23:50 2019 (r355939) +++ head/usr.bin/clang/llvm-nm/Makefile Fri Dec 20 19:53:05 2019 (r355940) @@ -2,7 +2,7 @@ PROG_CXX= llvm-nm -SRCDIR= tools/llvm-nm +SRCDIR= llvm/tools/llvm-nm SRCS+= llvm-nm.cpp LIBADD+= z Modified: head/usr.bin/clang/llvm-objcopy/Makefile ============================================================================== --- head/usr.bin/clang/llvm-objcopy/Makefile Fri Dec 20 18:23:50 2019 (r355939) +++ head/usr.bin/clang/llvm-objcopy/Makefile Fri Dec 20 19:53:05 2019 (r355940) @@ -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 Modified: head/usr.bin/clang/llvm-objdump/Makefile ============================================================================== --- head/usr.bin/clang/llvm-objdump/Makefile Fri Dec 20 18:23:50 2019 (r355939) +++ head/usr.bin/clang/llvm-objdump/Makefile Fri Dec 20 19:53:05 2019 (r355940) @@ -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 Modified: head/usr.bin/clang/llvm-pdbutil/Makefile ============================================================================== --- head/usr.bin/clang/llvm-pdbutil/Makefile Fri Dec 20 18:23:50 2019 (r355939) +++ head/usr.bin/clang/llvm-pdbutil/Makefile Fri Dec 20 19:53:05 2019 (r355940) @@ -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 Modified: head/usr.bin/clang/llvm-profdata/Makefile ============================================================================== --- head/usr.bin/clang/llvm-profdata/Makefile Fri Dec 20 18:23:50 2019 (r355939) +++ head/usr.bin/clang/llvm-profdata/Makefile Fri Dec 20 19:53:05 2019 (r355940) @@ -2,7 +2,7 @@ PROG_CXX= llvm-profdata -SRCDIR= tools/llvm-profdata +SRCDIR= llvm/tools/llvm-profdata SRCS+= llvm-profdata.cpp LIBADD+= z Modified: head/usr.bin/clang/llvm-rtdyld/Makefile ============================================================================== --- head/usr.bin/clang/llvm-rtdyld/Makefile Fri Dec 20 18:23:50 2019 (r355939) +++ head/usr.bin/clang/llvm-rtdyld/Makefile Fri Dec 20 19:53:05 2019 (r355940) @@ -3,7 +3,7 @@ PROG_CXX= llvm-rtdyld MAN= -SRCDIR= tools/llvm-rtdyld +SRCDIR= llvm/tools/llvm-rtdyld SRCS+= llvm-rtdyld.cpp LIBADD+= z Modified: head/usr.bin/clang/llvm-symbolizer/Makefile ============================================================================== --- head/usr.bin/clang/llvm-symbolizer/Makefile Fri Dec 20 18:23:50 2019 (r355939) +++ head/usr.bin/clang/llvm-symbolizer/Makefile Fri Dec 20 19:53:05 2019 (r355940) @@ -2,7 +2,7 @@ PROG_CXX= llvm-symbolizer -SRCDIR= tools/llvm-symbolizer +SRCDIR= llvm/tools/llvm-symbolizer SRCS+= llvm-symbolizer.cpp LIBADD+= z Modified: head/usr.bin/clang/llvm-tblgen/Makefile ============================================================================== --- head/usr.bin/clang/llvm-tblgen/Makefile Fri Dec 20 18:23:50 2019 (r355939) +++ head/usr.bin/clang/llvm-tblgen/Makefile Fri Dec 20 19:53:05 2019 (r355940) @@ -2,7 +2,7 @@ PROG_CXX= llvm-tblgen -SRCDIR= utils/TableGen +SRCDIR= llvm/utils/TableGen SRCS+= AsmMatcherEmitter.cpp SRCS+= AsmWriterEmitter.cpp SRCS+= AsmWriterInst.cpp Modified: head/usr.bin/clang/llvm-xray/Makefile ============================================================================== --- head/usr.bin/clang/llvm-xray/Makefile Fri Dec 20 18:23:50 2019 (r355939) +++ head/usr.bin/clang/llvm-xray/Makefile Fri Dec 20 19:53:05 2019 (r355940) @@ -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 Modified: head/usr.bin/clang/opt/Makefile ============================================================================== --- head/usr.bin/clang/opt/Makefile Fri Dec 20 18:23:50 2019 (r355939) +++ head/usr.bin/clang/opt/Makefile Fri Dec 20 19:53:05 2019 (r355940) @@ -2,7 +2,7 @@ PROG_CXX= opt -SRCDIR= tools/opt +SRCDIR= llvm/tools/opt SRCS+= AnalysisWrappers.cpp SRCS+= BreakpointPrinter.cpp SRCS+= Debugify.cpp
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201912201953.xBKJr5B7043461>