From owner-svn-src-stable-12@freebsd.org Tue Jan 7 19:49:24 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B35D31F0EF7; Tue, 7 Jan 2020 19:49:24 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47sjd050fHz4X8W; Tue, 7 Jan 2020 19:49:24 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A23444221; Tue, 7 Jan 2020 19:49:24 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 007JnOpx091471; Tue, 7 Jan 2020 19:49:24 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 007JnA7p091402; Tue, 7 Jan 2020 19:49:10 GMT (envelope-from dim@FreeBSD.org) Message-Id: <202001071949.007JnA7p091402@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Tue, 7 Jan 2020 19:49:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r356462 - in stable/12: . contrib/compiler-rt contrib/libc++ contrib/libunwind contrib/llvm contrib/llvm-project/libcxx/include contrib/openmp gnu/usr.bin/cc/include lib/clang lib/clang... X-SVN-Group: stable-12 X-SVN-Commit-Author: dim X-SVN-Commit-Paths: in stable/12: . contrib/compiler-rt contrib/libc++ contrib/libunwind contrib/llvm contrib/llvm-project/libcxx/include contrib/openmp gnu/usr.bin/cc/include lib/clang lib/clang/libclang lib/clang/libll... X-SVN-Commit-Revision: 356462 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Jan 2020 19:49:24 -0000 Author: dim Date: Tue Jan 7 19:49:10 2020 New Revision: 356462 URL: https://svnweb.freebsd.org/changeset/base/356462 Log: MFC r355940: 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 r355940, head/contrib/llvm-project/ Directory Properties: stable/12/contrib/llvm-project/ (props changed) Deleted: stable/12/contrib/compiler-rt/ stable/12/contrib/libc++/ stable/12/contrib/libunwind/ stable/12/contrib/llvm/ stable/12/contrib/openmp/ Modified: stable/12/MAINTAINERS stable/12/contrib/llvm-project/libcxx/include/__errc stable/12/contrib/llvm-project/libcxx/include/errno.h stable/12/gnu/usr.bin/cc/include/Makefile stable/12/lib/clang/clang.build.mk stable/12/lib/clang/clang.pre.mk stable/12/lib/clang/libclang/Makefile stable/12/lib/clang/liblldb/Makefile stable/12/lib/clang/libllvm/Makefile stable/12/lib/clang/libllvmminimal/Makefile stable/12/lib/clang/lldb.pre.mk stable/12/lib/clang/llvm.build.mk stable/12/lib/clang/llvm.pre.mk stable/12/lib/libblocksruntime/Makefile stable/12/lib/libc++/Makefile stable/12/lib/libc++experimental/Makefile stable/12/lib/libc/arm/aeabi/Makefile.inc stable/12/lib/libclang_rt/Makefile.inc stable/12/lib/libcompiler_rt/Makefile.inc stable/12/lib/libgcc_eh/Makefile.inc stable/12/lib/libomp/Makefile stable/12/share/doc/llvm/Makefile stable/12/share/doc/llvm/clang/Makefile stable/12/share/mk/bsd.clang-analyze.mk stable/12/stand/i386/boot2/Makefile stable/12/stand/libsa/Makefile stable/12/sys/modules/aesni/Makefile stable/12/sys/modules/blake2/Makefile stable/12/usr.bin/clang/bugpoint/Makefile stable/12/usr.bin/clang/clang-format/Makefile stable/12/usr.bin/clang/clang-tblgen/Makefile stable/12/usr.bin/clang/clang/Makefile stable/12/usr.bin/clang/llc/Makefile stable/12/usr.bin/clang/lld/Makefile stable/12/usr.bin/clang/lldb-tblgen/Makefile stable/12/usr.bin/clang/lldb/Makefile stable/12/usr.bin/clang/lli/Makefile stable/12/usr.bin/clang/llvm-ar/Makefile stable/12/usr.bin/clang/llvm-as/Makefile stable/12/usr.bin/clang/llvm-bcanalyzer/Makefile stable/12/usr.bin/clang/llvm-cov/Makefile stable/12/usr.bin/clang/llvm-cxxdump/Makefile stable/12/usr.bin/clang/llvm-cxxfilt/Makefile stable/12/usr.bin/clang/llvm-diff/Makefile stable/12/usr.bin/clang/llvm-dis/Makefile stable/12/usr.bin/clang/llvm-dwarfdump/Makefile stable/12/usr.bin/clang/llvm-extract/Makefile stable/12/usr.bin/clang/llvm-link/Makefile stable/12/usr.bin/clang/llvm-lto/Makefile stable/12/usr.bin/clang/llvm-lto2/Makefile stable/12/usr.bin/clang/llvm-mc/Makefile stable/12/usr.bin/clang/llvm-mca/Makefile stable/12/usr.bin/clang/llvm-modextract/Makefile stable/12/usr.bin/clang/llvm-nm/Makefile stable/12/usr.bin/clang/llvm-objcopy/Makefile stable/12/usr.bin/clang/llvm-objdump/Makefile stable/12/usr.bin/clang/llvm-pdbutil/Makefile stable/12/usr.bin/clang/llvm-profdata/Makefile stable/12/usr.bin/clang/llvm-rtdyld/Makefile stable/12/usr.bin/clang/llvm-symbolizer/Makefile stable/12/usr.bin/clang/llvm-tblgen/Makefile stable/12/usr.bin/clang/llvm-xray/Makefile stable/12/usr.bin/clang/opt/Makefile Directory Properties: stable/12/ (props changed) stable/12/contrib/llvm-project/clang/ (props changed) stable/12/contrib/llvm-project/compiler-rt/ (props changed) stable/12/contrib/llvm-project/libcxx/ (props changed) stable/12/contrib/llvm-project/libunwind/ (props changed) stable/12/contrib/llvm-project/lld/ (props changed) stable/12/contrib/llvm-project/lldb/ (props changed) stable/12/contrib/llvm-project/llvm/ (props changed) stable/12/contrib/llvm-project/openmp/ (props changed) Modified: stable/12/MAINTAINERS ============================================================================== --- stable/12/MAINTAINERS Tue Jan 7 18:42:53 2020 (r356461) +++ stable/12/MAINTAINERS Tue Jan 7 19:49:10 2020 (r356462) @@ -37,14 +37,13 @@ subsystem login notes ----------------------------- atf freebsd-testing,jmmv,ngie Pre-commit review requested. ath(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org -contrib/compiler-rt dim Pre-commit review preferred. -contrib/libc++ dim Pre-commit review preferred. -contrib/libcxxrt dim Pre-commit review preferred. -contrib/llvm dim Pre-commit review preferred. -contrib/llvm/tools/lldb emaste Pre-commit review preferred. -contrib/netbsd-tests freebsd-testing,ngie Pre-commit review requested. -contrib/pjdfstest freebsd-testing,asomers,ngie,pjd Pre-commit review requested. -dev/usb/wlan adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org +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. *env(3) secteam Due to the problematic security history of this code, please have patches reviewed by secteam. etc/mail gshapiro Pre-commit review requested. Keep in sync with -STABLE. Modified: stable/12/contrib/llvm-project/libcxx/include/__errc ============================================================================== --- head/contrib/llvm-project/libcxx/include/__errc Fri Dec 20 19:53:05 2019 (r355940) +++ stable/12/contrib/llvm-project/libcxx/include/__errc Tue Jan 7 19:49:10 2020 (r356462) @@ -45,7 +45,6 @@ enum class errc identifier_removed, // EIDRM illegal_byte_sequence, // EILSEQ inappropriate_io_control_operation, // ENOTTY - integrity_check_failed, // EINTEGRITY interrupted, // EINTR invalid_argument, // EINVAL invalid_seek, // ESPIPE @@ -143,7 +142,6 @@ _LIBCPP_DECLARE_STRONG_ENUM(errc) identifier_removed = EIDRM, illegal_byte_sequence = EILSEQ, inappropriate_io_control_operation = ENOTTY, - integrity_check_failed = EINTEGRITY, interrupted = EINTR, invalid_argument = EINVAL, invalid_seek = ESPIPE, Modified: stable/12/contrib/llvm-project/libcxx/include/errno.h ============================================================================== --- head/contrib/llvm-project/libcxx/include/errno.h Fri Dec 20 19:53:05 2019 (r355940) +++ stable/12/contrib/llvm-project/libcxx/include/errno.h Tue Jan 7 19:49:10 2020 (r356462) @@ -32,79 +32,49 @@ Macros: #ifdef __cplusplus -#if !defined(EOWNERDEAD) || !defined(ENOTRECOVERABLE) || !defined(EINTEGRITY) +#if !defined(EOWNERDEAD) || !defined(ENOTRECOVERABLE) -#if defined(ELAST) +#ifdef ELAST static const int __elast1 = ELAST+1; static const int __elast2 = ELAST+2; -static const int __elast3 = ELAST+3; #else static const int __elast1 = 104; static const int __elast2 = 105; -static const int __elast3 = 106; #endif -#if !defined(EOWNERDEAD) && !defined(ENOTRECOVERABLE) && !defined(EINTEGRITY) -#define ENOTRECOVERABLE __elast1 -#define EOWNERDEAD __elast2 -#define EINTEGRITY __elast3 -#if defined(ELAST) -#undef ELAST -#define ELAST EINTEGRITY -#endif +#ifdef ENOTRECOVERABLE -#elif !defined(EOWNERDEAD) && !defined(ENOTRECOVERABLE) && defined(EINTEGRITY) -#define ENOTRECOVERABLE __elast1 -#define EOWNERDEAD __elast2 -#if defined(ELAST) -#undef ELAST -#define ELAST EOWNERDEAD -#endif - -#elif !defined(EOWNERDEAD) && defined(ENOTRECOVERABLE) && !defined(EINTEGRITY) #define EOWNERDEAD __elast1 -#define EINTEGRITY __elast2 -#if defined(ELAST) -#undef ELAST -#define ELAST EINTEGRITY -#endif -#elif !defined(EOWNERDEAD) && defined(ENOTRECOVERABLE) && defined(EINTEGRITY) -#define EOWNERDEAD __elast1 -#if defined(ELAST) +#ifdef ELAST #undef ELAST #define ELAST EOWNERDEAD #endif -#elif defined(EOWNERDEAD) && !defined(ENOTRECOVERABLE) && !defined(EINTEGRITY) -#define ENOTRECOVERABLE __elast1 -#define EINTEGRITY __elast2 -#if defined(ELAST) -#undef ELAST -#define ELAST EINTEGRITY -#endif +#elif defined(EOWNERDEAD) -#elif defined(EOWNERDEAD) && !defined(ENOTRECOVERABLE) && defined(EINTEGRITY) #define ENOTRECOVERABLE __elast1 -#if defined(ELAST) +#ifdef ELAST #undef ELAST #define ELAST ENOTRECOVERABLE #endif -#elif defined(EOWNERDEAD) && defined(ENOTRECOVERABLE) && !defined(EINTEGRITY) -#define EINTEGRITY __elast1 -#if defined(ELAST) +#else // defined(EOWNERDEAD) + +#define EOWNERDEAD __elast1 +#define ENOTRECOVERABLE __elast2 +#ifdef ELAST #undef ELAST -#define ELAST EINTEGRITY +#define ELAST ENOTRECOVERABLE #endif -#endif // !defined(OWNERDEAD) && !defined(NOTRECOVERABLE) && !defined(INTEGRITY) +#endif // defined(EOWNERDEAD) -#endif // !defined(OWNERDEAD) || !defined(NOTRECOVERABLE) || !defined(INTEGRITY) +#endif // !defined(EOWNERDEAD) || !defined(ENOTRECOVERABLE) // supply errno values likely to be missing, particularly on Windows @@ -420,10 +390,6 @@ static const int __elast3 = 106; #ifndef EMLINK #define EMLINK 9979 -#endif - -#ifndef EINTEGRITY -#define EINTEGRITY 9980 #endif #endif // __cplusplus Modified: stable/12/gnu/usr.bin/cc/include/Makefile ============================================================================== --- stable/12/gnu/usr.bin/cc/include/Makefile Tue Jan 7 18:42:53 2020 (r356461) +++ stable/12/gnu/usr.bin/cc/include/Makefile Tue Jan 7 19:49:10 2020 (r356462) @@ -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: stable/12/lib/clang/clang.build.mk ============================================================================== --- stable/12/lib/clang/clang.build.mk Tue Jan 7 18:42:53 2020 (r356461) +++ stable/12/lib/clang/clang.build.mk Tue Jan 7 19:49:10 2020 (r356462) @@ -2,16 +2,8 @@ .include -.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: stable/12/lib/clang/clang.pre.mk ============================================================================== --- stable/12/lib/clang/clang.pre.mk Tue Jan 7 18:42:53 2020 (r356461) +++ stable/12/lib/clang/clang.pre.mk Tue Jan 7 19:49:10 2020 (r356462) @@ -2,6 +2,6 @@ .include "llvm.pre.mk" -CLANG_SRCS= ${LLVM_SRCS}/tools/clang +CLANG_SRCS= ${LLVM_BASE}/clang CLANG_TBLGEN?= clang-tblgen Modified: stable/12/lib/clang/libclang/Makefile ============================================================================== --- stable/12/lib/clang/libclang/Makefile Tue Jan 7 18:42:53 2020 (r356461) +++ stable/12/lib/clang/libclang/Makefile Tue Jan 7 19:49:10 2020 (r356462) @@ -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: stable/12/lib/clang/liblldb/Makefile ============================================================================== --- stable/12/lib/clang/liblldb/Makefile Tue Jan 7 18:42:53 2020 (r356461) +++ stable/12/lib/clang/liblldb/Makefile Tue Jan 7 19:49:10 2020 (r356462) @@ -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: stable/12/lib/clang/libllvm/Makefile ============================================================================== --- stable/12/lib/clang/libllvm/Makefile Tue Jan 7 18:42:53 2020 (r356461) +++ stable/12/lib/clang/libllvm/Makefile Tue Jan 7 19:49:10 2020 (r356462) @@ -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: stable/12/lib/clang/libllvmminimal/Makefile ============================================================================== --- stable/12/lib/clang/libllvmminimal/Makefile Tue Jan 7 18:42:53 2020 (r356461) +++ stable/12/lib/clang/libllvmminimal/Makefile Tue Jan 7 19:49:10 2020 (r356462) @@ -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: stable/12/lib/clang/lldb.pre.mk ============================================================================== --- stable/12/lib/clang/lldb.pre.mk Tue Jan 7 18:42:53 2020 (r356461) +++ stable/12/lib/clang/lldb.pre.mk Tue Jan 7 19:49:10 2020 (r356462) @@ -2,4 +2,4 @@ .include "clang.pre.mk" -LLDB_SRCS= ${LLVM_SRCS}/tools/lldb +LLDB_SRCS= ${LLVM_BASE}/lldb Modified: stable/12/lib/clang/llvm.build.mk ============================================================================== --- stable/12/lib/clang/llvm.build.mk Tue Jan 7 18:42:53 2020 (r356461) +++ stable/12/lib/clang/llvm.build.mk Tue Jan 7 19:49:10 2020 (r356462) @@ -2,6 +2,10 @@ .include +.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: stable/12/lib/clang/llvm.pre.mk ============================================================================== --- stable/12/lib/clang/llvm.pre.mk Tue Jan 7 18:42:53 2020 (r356461) +++ stable/12/lib/clang/llvm.pre.mk Tue Jan 7 19:49:10 2020 (r356462) @@ -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: stable/12/lib/libblocksruntime/Makefile ============================================================================== --- stable/12/lib/libblocksruntime/Makefile Tue Jan 7 18:42:53 2020 (r356461) +++ stable/12/lib/libblocksruntime/Makefile Tue Jan 7 19:49:10 2020 (r356462) @@ -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: stable/12/lib/libc++/Makefile ============================================================================== --- stable/12/lib/libc++/Makefile Tue Jan 7 18:42:53 2020 (r356461) +++ stable/12/lib/libc++/Makefile Tue Jan 7 19:49:10 2020 (r356462) @@ -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: stable/12/lib/libc++experimental/Makefile ============================================================================== --- stable/12/lib/libc++experimental/Makefile Tue Jan 7 18:42:53 2020 (r356461) +++ stable/12/lib/libc++experimental/Makefile Tue Jan 7 19:49:10 2020 (r356462) @@ -3,7 +3,7 @@ .include PACKAGE= clibs -SRCDIR= ${SRCTOP}/contrib/libc++ +SRCDIR= ${SRCTOP}/contrib/llvm-project/libcxx LIB= c++experimental NO_PIC= Modified: stable/12/lib/libc/arm/aeabi/Makefile.inc ============================================================================== --- stable/12/lib/libc/arm/aeabi/Makefile.inc Tue Jan 7 18:42:53 2020 (r356461) +++ stable/12/lib/libc/arm/aeabi/Makefile.inc Tue Jan 7 19:49:10 2020 (r356462) @@ -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: stable/12/lib/libclang_rt/Makefile.inc ============================================================================== --- stable/12/lib/libclang_rt/Makefile.inc Tue Jan 7 18:42:53 2020 (r356461) +++ stable/12/lib/libclang_rt/Makefile.inc Tue Jan 7 19:49:10 2020 (r356462) @@ -10,7 +10,7 @@ CRTARCH?= armhf .else CRTARCH?= ${MACHINE_CPUARCH:C/amd64/x86_64/} .endif -CRTSRC= ${SRCTOP}/contrib/compiler-rt +CRTSRC= ${SRCTOP}/contrib/llvm-project/compiler-rt .PATH: ${CRTSRC}/lib Modified: stable/12/lib/libcompiler_rt/Makefile.inc ============================================================================== --- stable/12/lib/libcompiler_rt/Makefile.inc Tue Jan 7 18:42:53 2020 (r356461) +++ stable/12/lib/libcompiler_rt/Makefile.inc Tue Jan 7 19:49:10 2020 (r356462) @@ -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: stable/12/lib/libgcc_eh/Makefile.inc ============================================================================== --- stable/12/lib/libgcc_eh/Makefile.inc Tue Jan 7 18:42:53 2020 (r356461) +++ stable/12/lib/libgcc_eh/Makefile.inc Tue Jan 7 19:49:10 2020 (r356462) @@ -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 @@ -33,5 +33,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: stable/12/lib/libomp/Makefile ============================================================================== --- stable/12/lib/libomp/Makefile Tue Jan 7 18:42:53 2020 (r356461) +++ stable/12/lib/libomp/Makefile Tue Jan 7 19:49:10 2020 (r356462) @@ -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: stable/12/share/doc/llvm/Makefile ============================================================================== --- stable/12/share/doc/llvm/Makefile Tue Jan 7 18:42:53 2020 (r356461) +++ stable/12/share/doc/llvm/Makefile Tue Jan 7 19:49:10 2020 (r356462) @@ -2,7 +2,7 @@ SUBDIR= clang -SRCDIR= ${SRCTOP}/contrib/llvm +SRCDIR= ${SRCTOP}/contrib/llvm-project/llvm .PATH: ${SRCDIR} ${SRCDIR}/lib/Support Modified: stable/12/share/doc/llvm/clang/Makefile ============================================================================== --- stable/12/share/doc/llvm/clang/Makefile Tue Jan 7 18:42:53 2020 (r356461) +++ stable/12/share/doc/llvm/clang/Makefile Tue Jan 7 19:49:10 2020 (r356462) @@ -1,6 +1,6 @@ # $FreeBSD$ -SRCDIR= ${SRCTOP}/contrib/llvm/tools/clang +SRCDIR= ${SRCTOP}/contrib/llvm-project/clang .PATH: ${SRCDIR} Modified: stable/12/share/mk/bsd.clang-analyze.mk ============================================================================== --- stable/12/share/mk/bsd.clang-analyze.mk Tue Jan 7 18:42:53 2020 (r356461) +++ stable/12/share/mk/bsd.clang-analyze.mk Tue Jan 7 19:49:10 2020 (r356462) @@ -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: stable/12/stand/i386/boot2/Makefile ============================================================================== --- stable/12/stand/i386/boot2/Makefile Tue Jan 7 18:42:53 2020 (r356461) +++ stable/12/stand/i386/boot2/Makefile Tue Jan 7 19:49:10 2020 (r356462) @@ -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: stable/12/stand/libsa/Makefile ============================================================================== --- stable/12/stand/libsa/Makefile Tue Jan 7 18:42:53 2020 (r356461) +++ stable/12/stand/libsa/Makefile Tue Jan 7 19:49:10 2020 (r356462) @@ -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: stable/12/sys/modules/aesni/Makefile ============================================================================== --- stable/12/sys/modules/aesni/Makefile Tue Jan 7 18:42:53 2020 (r356461) +++ stable/12/sys/modules/aesni/Makefile Tue Jan 7 19:49:10 2020 (r356462) @@ -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: stable/12/sys/modules/blake2/Makefile ============================================================================== --- stable/12/sys/modules/blake2/Makefile Tue Jan 7 18:42:53 2020 (r356461) +++ stable/12/sys/modules/blake2/Makefile Tue Jan 7 19:49:10 2020 (r356462) @@ -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: stable/12/usr.bin/clang/bugpoint/Makefile ============================================================================== --- stable/12/usr.bin/clang/bugpoint/Makefile Tue Jan 7 18:42:53 2020 (r356461) +++ stable/12/usr.bin/clang/bugpoint/Makefile Tue Jan 7 19:49:10 2020 (r356462) @@ -2,7 +2,7 @@ PROG_CXX= bugpoint -SRCDIR= tools/bugpoint +SRCDIR= llvm/tools/bugpoint SRCS+= BugDriver.cpp SRCS+= CrashDebugger.cpp SRCS+= ExecutionDriver.cpp Modified: stable/12/usr.bin/clang/clang-format/Makefile ============================================================================== --- stable/12/usr.bin/clang/clang-format/Makefile Tue Jan 7 18:42:53 2020 (r356461) +++ stable/12/usr.bin/clang/clang-format/Makefile Tue Jan 7 19:49:10 2020 (r356462) @@ -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: stable/12/usr.bin/clang/clang-tblgen/Makefile ============================================================================== --- stable/12/usr.bin/clang/clang-tblgen/Makefile Tue Jan 7 18:42:53 2020 (r356461) +++ stable/12/usr.bin/clang/clang-tblgen/Makefile Tue Jan 7 19:49:10 2020 (r356462) @@ -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: stable/12/usr.bin/clang/clang/Makefile ============================================================================== --- stable/12/usr.bin/clang/clang/Makefile Tue Jan 7 18:42:53 2020 (r356461) +++ stable/12/usr.bin/clang/clang/Makefile Tue Jan 7 19:49:10 2020 (r356462) @@ -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: stable/12/usr.bin/clang/llc/Makefile ============================================================================== --- stable/12/usr.bin/clang/llc/Makefile Tue Jan 7 18:42:53 2020 (r356461) +++ stable/12/usr.bin/clang/llc/Makefile Tue Jan 7 19:49:10 2020 (r356462) @@ -2,7 +2,7 @@ PROG_CXX= llc -SRCDIR= tools/llc +SRCDIR= llvm/tools/llc SRCS+= llc.cpp LIBADD+= z Modified: stable/12/usr.bin/clang/lld/Makefile ============================================================================== --- stable/12/usr.bin/clang/lld/Makefile Tue Jan 7 18:42:53 2020 (r356461) +++ stable/12/usr.bin/clang/lld/Makefile Tue Jan 7 19:49:10 2020 (r356462) @@ -2,8 +2,9 @@ .include -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: stable/12/usr.bin/clang/lldb-tblgen/Makefile ============================================================================== --- stable/12/usr.bin/clang/lldb-tblgen/Makefile Tue Jan 7 18:42:53 2020 (r356461) +++ stable/12/usr.bin/clang/lldb-tblgen/Makefile Tue Jan 7 19:49:10 2020 (r356462) @@ -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: stable/12/usr.bin/clang/lldb/Makefile ============================================================================== --- stable/12/usr.bin/clang/lldb/Makefile Tue Jan 7 18:42:53 2020 (r356461) +++ stable/12/usr.bin/clang/lldb/Makefile Tue Jan 7 19:49:10 2020 (r356462) @@ -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: stable/12/usr.bin/clang/lli/Makefile ============================================================================== --- stable/12/usr.bin/clang/lli/Makefile Tue Jan 7 18:42:53 2020 (r356461) +++ stable/12/usr.bin/clang/lli/Makefile Tue Jan 7 19:49:10 2020 (r356462) @@ -2,7 +2,7 @@ PROG_CXX= lli -SRCDIR= tools/lli +SRCDIR= llvm/tools/lli SRCS+= lli.cpp LIBADD+= z Modified: stable/12/usr.bin/clang/llvm-ar/Makefile ============================================================================== --- stable/12/usr.bin/clang/llvm-ar/Makefile Tue Jan 7 18:42:53 2020 (r356461) +++ stable/12/usr.bin/clang/llvm-ar/Makefile Tue Jan 7 19:49:10 2020 (r356462) @@ -2,7 +2,7 @@ PROG_CXX= llvm-ar -SRCDIR= tools/llvm-ar +SRCDIR= llvm/tools/llvm-ar SRCS+= llvm-ar.cpp LIBADD+= z Modified: stable/12/usr.bin/clang/llvm-as/Makefile ============================================================================== --- stable/12/usr.bin/clang/llvm-as/Makefile Tue Jan 7 18:42:53 2020 (r356461) +++ stable/12/usr.bin/clang/llvm-as/Makefile Tue Jan 7 19:49:10 2020 (r356462) @@ -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: stable/12/usr.bin/clang/llvm-bcanalyzer/Makefile ============================================================================== --- stable/12/usr.bin/clang/llvm-bcanalyzer/Makefile Tue Jan 7 18:42:53 2020 (r356461) +++ stable/12/usr.bin/clang/llvm-bcanalyzer/Makefile Tue Jan 7 19:49:10 2020 (r356462) @@ -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: stable/12/usr.bin/clang/llvm-cov/Makefile ============================================================================== --- stable/12/usr.bin/clang/llvm-cov/Makefile Tue Jan 7 18:42:53 2020 (r356461) +++ stable/12/usr.bin/clang/llvm-cov/Makefile Tue Jan 7 19:49:10 2020 (r356462) @@ -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: stable/12/usr.bin/clang/llvm-cxxdump/Makefile ============================================================================== --- stable/12/usr.bin/clang/llvm-cxxdump/Makefile Tue Jan 7 18:42:53 2020 (r356461) +++ stable/12/usr.bin/clang/llvm-cxxdump/Makefile Tue Jan 7 19:49:10 2020 (r356462) @@ -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: stable/12/usr.bin/clang/llvm-cxxfilt/Makefile ============================================================================== --- stable/12/usr.bin/clang/llvm-cxxfilt/Makefile Tue Jan 7 18:42:53 2020 (r356461) +++ stable/12/usr.bin/clang/llvm-cxxfilt/Makefile Tue Jan 7 19:49:10 2020 (r356462) @@ -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: stable/12/usr.bin/clang/llvm-diff/Makefile ============================================================================== --- stable/12/usr.bin/clang/llvm-diff/Makefile Tue Jan 7 18:42:53 2020 (r356461) +++ stable/12/usr.bin/clang/llvm-diff/Makefile Tue Jan 7 19:49:10 2020 (r356462) @@ -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: stable/12/usr.bin/clang/llvm-dis/Makefile ============================================================================== --- stable/12/usr.bin/clang/llvm-dis/Makefile Tue Jan 7 18:42:53 2020 (r356461) +++ stable/12/usr.bin/clang/llvm-dis/Makefile Tue Jan 7 19:49:10 2020 (r356462) @@ -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: stable/12/usr.bin/clang/llvm-dwarfdump/Makefile ============================================================================== --- stable/12/usr.bin/clang/llvm-dwarfdump/Makefile Tue Jan 7 18:42:53 2020 (r356461) +++ stable/12/usr.bin/clang/llvm-dwarfdump/Makefile Tue Jan 7 19:49:10 2020 (r356462) @@ -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: stable/12/usr.bin/clang/llvm-extract/Makefile ============================================================================== --- stable/12/usr.bin/clang/llvm-extract/Makefile Tue Jan 7 18:42:53 2020 (r356461) +++ stable/12/usr.bin/clang/llvm-extract/Makefile Tue Jan 7 19:49:10 2020 (r356462) @@ -2,7 +2,7 @@ PROG_CXX= llvm-extract -SRCDIR= tools/llvm-extract +SRCDIR= llvm/tools/llvm-extract SRCS+= llvm-extract.cpp LIBADD+= z Modified: stable/12/usr.bin/clang/llvm-link/Makefile ============================================================================== --- stable/12/usr.bin/clang/llvm-link/Makefile Tue Jan 7 18:42:53 2020 (r356461) +++ stable/12/usr.bin/clang/llvm-link/Makefile Tue Jan 7 19:49:10 2020 (r356462) @@ -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: stable/12/usr.bin/clang/llvm-lto/Makefile ============================================================================== --- stable/12/usr.bin/clang/llvm-lto/Makefile Tue Jan 7 18:42:53 2020 (r356461) +++ stable/12/usr.bin/clang/llvm-lto/Makefile Tue Jan 7 19:49:10 2020 (r356462) @@ -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: stable/12/usr.bin/clang/llvm-lto2/Makefile ============================================================================== --- stable/12/usr.bin/clang/llvm-lto2/Makefile Tue Jan 7 18:42:53 2020 (r356461) +++ stable/12/usr.bin/clang/llvm-lto2/Makefile Tue Jan 7 19:49:10 2020 (r356462) @@ -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: stable/12/usr.bin/clang/llvm-mc/Makefile ============================================================================== --- stable/12/usr.bin/clang/llvm-mc/Makefile Tue Jan 7 18:42:53 2020 (r356461) +++ stable/12/usr.bin/clang/llvm-mc/Makefile Tue Jan 7 19:49:10 2020 (r356462) @@ -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: stable/12/usr.bin/clang/llvm-mca/Makefile ============================================================================== --- stable/12/usr.bin/clang/llvm-mca/Makefile Tue Jan 7 18:42:53 2020 (r356461) +++ stable/12/usr.bin/clang/llvm-mca/Makefile Tue Jan 7 19:49:10 2020 (r356462) @@ -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: stable/12/usr.bin/clang/llvm-modextract/Makefile ============================================================================== --- stable/12/usr.bin/clang/llvm-modextract/Makefile Tue Jan 7 18:42:53 2020 (r356461) +++ stable/12/usr.bin/clang/llvm-modextract/Makefile Tue Jan 7 19:49:10 2020 (r356462) @@ -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: stable/12/usr.bin/clang/llvm-nm/Makefile ============================================================================== --- stable/12/usr.bin/clang/llvm-nm/Makefile Tue Jan 7 18:42:53 2020 (r356461) +++ stable/12/usr.bin/clang/llvm-nm/Makefile Tue Jan 7 19:49:10 2020 (r356462) @@ -2,7 +2,7 @@ PROG_CXX= llvm-nm -SRCDIR= tools/llvm-nm +SRCDIR= llvm/tools/llvm-nm SRCS+= llvm-nm.cpp LIBADD+= z Modified: stable/12/usr.bin/clang/llvm-objcopy/Makefile ============================================================================== --- stable/12/usr.bin/clang/llvm-objcopy/Makefile Tue Jan 7 18:42:53 2020 (r356461) +++ stable/12/usr.bin/clang/llvm-objcopy/Makefile Tue Jan 7 19:49:10 2020 (r356462) @@ -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: stable/12/usr.bin/clang/llvm-objdump/Makefile ============================================================================== --- stable/12/usr.bin/clang/llvm-objdump/Makefile Tue Jan 7 18:42:53 2020 (r356461) +++ stable/12/usr.bin/clang/llvm-objdump/Makefile Tue Jan 7 19:49:10 2020 (r356462) @@ -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: stable/12/usr.bin/clang/llvm-pdbutil/Makefile ============================================================================== --- stable/12/usr.bin/clang/llvm-pdbutil/Makefile Tue Jan 7 18:42:53 2020 (r356461) +++ stable/12/usr.bin/clang/llvm-pdbutil/Makefile Tue Jan 7 19:49:10 2020 (r356462) @@ -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: stable/12/usr.bin/clang/llvm-profdata/Makefile ============================================================================== --- stable/12/usr.bin/clang/llvm-profdata/Makefile Tue Jan 7 18:42:53 2020 (r356461) +++ stable/12/usr.bin/clang/llvm-profdata/Makefile Tue Jan 7 19:49:10 2020 (r356462) @@ -2,7 +2,7 @@ PROG_CXX= llvm-profdata -SRCDIR= tools/llvm-profdata +SRCDIR= llvm/tools/llvm-profdata SRCS+= llvm-profdata.cpp LIBADD+= z Modified: stable/12/usr.bin/clang/llvm-rtdyld/Makefile ============================================================================== --- stable/12/usr.bin/clang/llvm-rtdyld/Makefile Tue Jan 7 18:42:53 2020 (r356461) +++ stable/12/usr.bin/clang/llvm-rtdyld/Makefile Tue Jan 7 19:49:10 2020 (r356462) @@ -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: stable/12/usr.bin/clang/llvm-symbolizer/Makefile ============================================================================== --- stable/12/usr.bin/clang/llvm-symbolizer/Makefile Tue Jan 7 18:42:53 2020 (r356461) +++ stable/12/usr.bin/clang/llvm-symbolizer/Makefile Tue Jan 7 19:49:10 2020 (r356462) @@ -2,7 +2,7 @@ PROG_CXX= llvm-symbolizer -SRCDIR= tools/llvm-symbolizer +SRCDIR= llvm/tools/llvm-symbolizer SRCS+= llvm-symbolizer.cpp LIBADD+= z Modified: stable/12/usr.bin/clang/llvm-tblgen/Makefile ============================================================================== --- stable/12/usr.bin/clang/llvm-tblgen/Makefile Tue Jan 7 18:42:53 2020 (r356461) +++ stable/12/usr.bin/clang/llvm-tblgen/Makefile Tue Jan 7 19:49:10 2020 (r356462) @@ -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: stable/12/usr.bin/clang/llvm-xray/Makefile ============================================================================== --- stable/12/usr.bin/clang/llvm-xray/Makefile Tue Jan 7 18:42:53 2020 (r356461) +++ stable/12/usr.bin/clang/llvm-xray/Makefile Tue Jan 7 19:49:10 2020 (r356462) @@ -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: stable/12/usr.bin/clang/opt/Makefile ============================================================================== --- stable/12/usr.bin/clang/opt/Makefile Tue Jan 7 18:42:53 2020 (r356461) +++ stable/12/usr.bin/clang/opt/Makefile Tue Jan 7 19:49:10 2020 (r356462) @@ -2,7 +2,7 @@ PROG_CXX= opt -SRCDIR= tools/opt +SRCDIR= llvm/tools/opt SRCS+= AnalysisWrappers.cpp SRCS+= BreakpointPrinter.cpp SRCS+= Debugify.cpp