Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 5 May 2020 17:10:50 +0000 (UTC)
From:      Dimitry Andric <dim@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject:   svn commit: r360660 - in stable/11: . 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...
Message-ID:  <202005051710.045HAo8H047883@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dim
Date: Tue May  5 17:10:49 2020
New Revision: 360660
URL: https://svnweb.freebsd.org/changeset/base/360660

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/11/contrib/llvm-project/   (props changed)
Deleted:
  stable/11/contrib/compiler-rt/
  stable/11/contrib/libc++/
  stable/11/contrib/libunwind/
  stable/11/contrib/llvm/
  stable/11/contrib/openmp/
Modified:
  stable/11/MAINTAINERS
  stable/11/contrib/llvm-project/libcxx/include/__errc
  stable/11/contrib/llvm-project/libcxx/include/errno.h
  stable/11/gnu/usr.bin/cc/include/Makefile
  stable/11/lib/clang/clang.build.mk
  stable/11/lib/clang/clang.pre.mk
  stable/11/lib/clang/libclang/Makefile
  stable/11/lib/clang/liblldb/Makefile
  stable/11/lib/clang/libllvm/Makefile
  stable/11/lib/clang/libllvmminimal/Makefile
  stable/11/lib/clang/lldb.pre.mk
  stable/11/lib/clang/llvm.build.mk
  stable/11/lib/clang/llvm.pre.mk
  stable/11/lib/libblocksruntime/Makefile
  stable/11/lib/libc++/Makefile
  stable/11/lib/libc++experimental/Makefile
  stable/11/lib/libc/arm/aeabi/Makefile.inc
  stable/11/lib/libclang_rt/Makefile.inc
  stable/11/lib/libcompiler_rt/Makefile.inc
  stable/11/lib/libexecinfo/Makefile
  stable/11/lib/libgcc_eh/Makefile.inc
  stable/11/lib/libomp/Makefile
  stable/11/share/doc/llvm/Makefile
  stable/11/share/doc/llvm/clang/Makefile
  stable/11/share/mk/bsd.clang-analyze.mk
  stable/11/stand/i386/boot2/Makefile
  stable/11/stand/libsa/Makefile
  stable/11/usr.bin/clang/bugpoint/Makefile
  stable/11/usr.bin/clang/clang-format/Makefile
  stable/11/usr.bin/clang/clang-tblgen/Makefile
  stable/11/usr.bin/clang/clang/Makefile
  stable/11/usr.bin/clang/llc/Makefile
  stable/11/usr.bin/clang/lld/Makefile
  stable/11/usr.bin/clang/lldb-tblgen/Makefile
  stable/11/usr.bin/clang/lldb/Makefile
  stable/11/usr.bin/clang/lli/Makefile
  stable/11/usr.bin/clang/llvm-ar/Makefile
  stable/11/usr.bin/clang/llvm-as/Makefile
  stable/11/usr.bin/clang/llvm-bcanalyzer/Makefile
  stable/11/usr.bin/clang/llvm-cov/Makefile
  stable/11/usr.bin/clang/llvm-cxxdump/Makefile
  stable/11/usr.bin/clang/llvm-cxxfilt/Makefile
  stable/11/usr.bin/clang/llvm-diff/Makefile
  stable/11/usr.bin/clang/llvm-dis/Makefile
  stable/11/usr.bin/clang/llvm-dwarfdump/Makefile
  stable/11/usr.bin/clang/llvm-extract/Makefile
  stable/11/usr.bin/clang/llvm-link/Makefile
  stable/11/usr.bin/clang/llvm-lto/Makefile
  stable/11/usr.bin/clang/llvm-lto2/Makefile
  stable/11/usr.bin/clang/llvm-mc/Makefile
  stable/11/usr.bin/clang/llvm-mca/Makefile
  stable/11/usr.bin/clang/llvm-modextract/Makefile
  stable/11/usr.bin/clang/llvm-nm/Makefile
  stable/11/usr.bin/clang/llvm-objcopy/Makefile
  stable/11/usr.bin/clang/llvm-objdump/Makefile
  stable/11/usr.bin/clang/llvm-pdbutil/Makefile
  stable/11/usr.bin/clang/llvm-profdata/Makefile
  stable/11/usr.bin/clang/llvm-rtdyld/Makefile
  stable/11/usr.bin/clang/llvm-symbolizer/Makefile
  stable/11/usr.bin/clang/llvm-tblgen/Makefile
  stable/11/usr.bin/clang/llvm-xray/Makefile
  stable/11/usr.bin/clang/opt/Makefile
Directory Properties:
  stable/11/   (props changed)
  stable/11/contrib/llvm-project/clang/   (props changed)
  stable/11/contrib/llvm-project/compiler-rt/   (props changed)
  stable/11/contrib/llvm-project/libcxx/   (props changed)
  stable/11/contrib/llvm-project/libunwind/   (props changed)
  stable/11/contrib/llvm-project/lld/   (props changed)
  stable/11/contrib/llvm-project/lldb/   (props changed)
  stable/11/contrib/llvm-project/llvm/   (props changed)
  stable/11/contrib/llvm-project/openmp/   (props changed)

Modified: stable/11/MAINTAINERS
==============================================================================
--- stable/11/MAINTAINERS	Tue May  5 15:29:16 2020	(r360659)
+++ stable/11/MAINTAINERS	Tue May  5 17:10:49 2020	(r360660)
@@ -37,11 +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/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	freebsd-testing,ngie	Pre-commit review requested.
 contrib/pjdfstest	freebsd-testing,ngie,pjd	Pre-commit review requested.
 dev/usb/wlan	adrian	Pre-commit review requested, send to freebsd-wireless@freebsd.org

Modified: stable/11/contrib/llvm-project/libcxx/include/__errc
==============================================================================
--- head/contrib/llvm-project/libcxx/include/__errc	Fri Dec 20 19:53:05 2019	(r355940)
+++ stable/11/contrib/llvm-project/libcxx/include/__errc	Tue May  5 17:10:49 2020	(r360660)
@@ -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/11/contrib/llvm-project/libcxx/include/errno.h
==============================================================================
--- head/contrib/llvm-project/libcxx/include/errno.h	Fri Dec 20 19:53:05 2019	(r355940)
+++ stable/11/contrib/llvm-project/libcxx/include/errno.h	Tue May  5 17:10:49 2020	(r360660)
@@ -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/11/gnu/usr.bin/cc/include/Makefile
==============================================================================
--- stable/11/gnu/usr.bin/cc/include/Makefile	Tue May  5 15:29:16 2020	(r360659)
+++ stable/11/gnu/usr.bin/cc/include/Makefile	Tue May  5 17:10:49 2020	(r360660)
@@ -6,7 +6,7 @@
 
 INCSDIR=${INCLUDEDIR}/gcc/${GCCVER}
 
-.PATH: ${GCCDIR}/config/${GCC_CPU} ${.CURDIR}/../../../../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/11/lib/clang/clang.build.mk
==============================================================================
--- stable/11/lib/clang/clang.build.mk	Tue May  5 15:29:16 2020	(r360659)
+++ stable/11/lib/clang/clang.build.mk	Tue May  5 17:10:49 2020	(r360660)
@@ -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: stable/11/lib/clang/clang.pre.mk
==============================================================================
--- stable/11/lib/clang/clang.pre.mk	Tue May  5 15:29:16 2020	(r360659)
+++ stable/11/lib/clang/clang.pre.mk	Tue May  5 17:10:49 2020	(r360660)
@@ -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/11/lib/clang/libclang/Makefile
==============================================================================
--- stable/11/lib/clang/libclang/Makefile	Tue May  5 15:29:16 2020	(r360659)
+++ stable/11/lib/clang/libclang/Makefile	Tue May  5 17:10:49 2020	(r360660)
@@ -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/11/lib/clang/liblldb/Makefile
==============================================================================
--- stable/11/lib/clang/liblldb/Makefile	Tue May  5 15:29:16 2020	(r360659)
+++ stable/11/lib/clang/liblldb/Makefile	Tue May  5 17:10:49 2020	(r360660)
@@ -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/11/lib/clang/libllvm/Makefile
==============================================================================
--- stable/11/lib/clang/libllvm/Makefile	Tue May  5 15:29:16 2020	(r360659)
+++ stable/11/lib/clang/libllvm/Makefile	Tue May  5 17:10:49 2020	(r360660)
@@ -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/11/lib/clang/libllvmminimal/Makefile
==============================================================================
--- stable/11/lib/clang/libllvmminimal/Makefile	Tue May  5 15:29:16 2020	(r360659)
+++ stable/11/lib/clang/libllvmminimal/Makefile	Tue May  5 17:10:49 2020	(r360660)
@@ -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/11/lib/clang/lldb.pre.mk
==============================================================================
--- stable/11/lib/clang/lldb.pre.mk	Tue May  5 15:29:16 2020	(r360659)
+++ stable/11/lib/clang/lldb.pre.mk	Tue May  5 17:10:49 2020	(r360660)
@@ -2,4 +2,4 @@
 
 .include "clang.pre.mk"
 
-LLDB_SRCS=	${LLVM_SRCS}/tools/lldb
+LLDB_SRCS=	${LLVM_BASE}/lldb

Modified: stable/11/lib/clang/llvm.build.mk
==============================================================================
--- stable/11/lib/clang/llvm.build.mk	Tue May  5 15:29:16 2020	(r360659)
+++ stable/11/lib/clang/llvm.build.mk	Tue May  5 17:10:49 2020	(r360660)
@@ -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: stable/11/lib/clang/llvm.pre.mk
==============================================================================
--- stable/11/lib/clang/llvm.pre.mk	Tue May  5 15:29:16 2020	(r360659)
+++ stable/11/lib/clang/llvm.pre.mk	Tue May  5 17:10:49 2020	(r360660)
@@ -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/11/lib/libblocksruntime/Makefile
==============================================================================
--- stable/11/lib/libblocksruntime/Makefile	Tue May  5 15:29:16 2020	(r360659)
+++ stable/11/lib/libblocksruntime/Makefile	Tue May  5 17:10:49 2020	(r360660)
@@ -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/11/lib/libc++/Makefile
==============================================================================
--- stable/11/lib/libc++/Makefile	Tue May  5 15:29:16 2020	(r360659)
+++ stable/11/lib/libc++/Makefile	Tue May  5 17:10:49 2020	(r360660)
@@ -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/11/lib/libc++experimental/Makefile
==============================================================================
--- stable/11/lib/libc++experimental/Makefile	Tue May  5 15:29:16 2020	(r360659)
+++ stable/11/lib/libc++experimental/Makefile	Tue May  5 17:10:49 2020	(r360660)
@@ -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: stable/11/lib/libc/arm/aeabi/Makefile.inc
==============================================================================
--- stable/11/lib/libc/arm/aeabi/Makefile.inc	Tue May  5 15:29:16 2020	(r360659)
+++ stable/11/lib/libc/arm/aeabi/Makefile.inc	Tue May  5 17:10:49 2020	(r360660)
@@ -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/11/lib/libclang_rt/Makefile.inc
==============================================================================
--- stable/11/lib/libclang_rt/Makefile.inc	Tue May  5 15:29:16 2020	(r360659)
+++ stable/11/lib/libclang_rt/Makefile.inc	Tue May  5 17:10:49 2020	(r360660)
@@ -3,7 +3,7 @@
 .include <src.opts.mk>
 
 CRTARCH=	${MACHINE_CPUARCH:C/amd64/x86_64/}
-CRTSRC=		${SRCTOP}/contrib/compiler-rt
+CRTSRC=		${SRCTOP}/contrib/llvm-project/compiler-rt
 
 .PATH:		${CRTSRC}/lib
 

Modified: stable/11/lib/libcompiler_rt/Makefile.inc
==============================================================================
--- stable/11/lib/libcompiler_rt/Makefile.inc	Tue May  5 15:29:16 2020	(r360659)
+++ stable/11/lib/libcompiler_rt/Makefile.inc	Tue May  5 17:10:49 2020	(r360660)
@@ -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/11/lib/libexecinfo/Makefile
==============================================================================
--- stable/11/lib/libexecinfo/Makefile	Tue May  5 15:29:16 2020	(r360659)
+++ stable/11/lib/libexecinfo/Makefile	Tue May  5 17:10:49 2020	(r360660)
@@ -10,6 +10,7 @@ SHLIB_MAJOR=	1
 
 INCS=		execinfo.h
 SRCS=		backtrace.c symtab.c unwind.c
+CFLAGS+=	-I${SRCTOP}/contrib/llvm-project/libunwind/include
 
 LIBADD=		elf
 

Modified: stable/11/lib/libgcc_eh/Makefile.inc
==============================================================================
--- stable/11/lib/libgcc_eh/Makefile.inc	Tue May  5 15:29:16 2020	(r360659)
+++ stable/11/lib/libgcc_eh/Makefile.inc	Tue May  5 17:10:49 2020	(r360660)
@@ -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
 
@@ -34,5 +34,5 @@ CXXFLAGS+=	-fno-rtti
 STATIC_CXXFLAGS+= -fvisibility=hidden -fPIC
 .if ${MK_DIRDEPS_BUILD} == "yes"
 # Avoid dependency on lib/libc++
-CFLAGS+=	-I${SRCTOP}/contrib/libc++/include
+CFLAGS+=	-isystem ${SRCTOP}/contrib/llvm-project/libcxx/include -nostdinc++
 .endif

Modified: stable/11/lib/libomp/Makefile
==============================================================================
--- stable/11/lib/libomp/Makefile	Tue May  5 15:29:16 2020	(r360659)
+++ stable/11/lib/libomp/Makefile	Tue May  5 17:10:49 2020	(r360660)
@@ -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/11/share/doc/llvm/Makefile
==============================================================================
--- stable/11/share/doc/llvm/Makefile	Tue May  5 15:29:16 2020	(r360659)
+++ stable/11/share/doc/llvm/Makefile	Tue May  5 17:10:49 2020	(r360660)
@@ -2,7 +2,7 @@
 
 SUBDIR=		clang
 
-SRCDIR=		${.CURDIR}/../../../contrib/llvm
+SRCDIR=		${SRCTOP}/contrib/llvm-project/llvm
 
 .PATH: ${SRCDIR} ${SRCDIR}/lib/Support
 

Modified: stable/11/share/doc/llvm/clang/Makefile
==============================================================================
--- stable/11/share/doc/llvm/clang/Makefile	Tue May  5 15:29:16 2020	(r360659)
+++ stable/11/share/doc/llvm/clang/Makefile	Tue May  5 17:10:49 2020	(r360660)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-SRCDIR=		${.CURDIR}/../../../../contrib/llvm/tools/clang
+SRCDIR=		${SRCTOP}/contrib/llvm-project/clang
 
 .PATH: ${SRCDIR}
 

Modified: stable/11/share/mk/bsd.clang-analyze.mk
==============================================================================
--- stable/11/share/mk/bsd.clang-analyze.mk	Tue May  5 15:29:16 2020	(r360659)
+++ stable/11/share/mk/bsd.clang-analyze.mk	Tue May  5 17:10:49 2020	(r360660)
@@ -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/11/stand/i386/boot2/Makefile
==============================================================================
--- stable/11/stand/i386/boot2/Makefile	Tue May  5 15:29:16 2020	(r360659)
+++ stable/11/stand/i386/boot2/Makefile	Tue May  5 17:10:49 2020	(r360660)
@@ -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/11/stand/libsa/Makefile
==============================================================================
--- stable/11/stand/libsa/Makefile	Tue May  5 15:29:16 2020	(r360659)
+++ stable/11/stand/libsa/Makefile	Tue May  5 17:10:49 2020	(r360660)
@@ -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/11/usr.bin/clang/bugpoint/Makefile
==============================================================================
--- stable/11/usr.bin/clang/bugpoint/Makefile	Tue May  5 15:29:16 2020	(r360659)
+++ stable/11/usr.bin/clang/bugpoint/Makefile	Tue May  5 17:10:49 2020	(r360660)
@@ -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/11/usr.bin/clang/clang-format/Makefile
==============================================================================
--- stable/11/usr.bin/clang/clang-format/Makefile	Tue May  5 15:29:16 2020	(r360659)
+++ stable/11/usr.bin/clang/clang-format/Makefile	Tue May  5 17:10:49 2020	(r360660)
@@ -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/11/usr.bin/clang/clang-tblgen/Makefile
==============================================================================
--- stable/11/usr.bin/clang/clang-tblgen/Makefile	Tue May  5 15:29:16 2020	(r360659)
+++ stable/11/usr.bin/clang/clang-tblgen/Makefile	Tue May  5 17:10:49 2020	(r360660)
@@ -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/11/usr.bin/clang/clang/Makefile
==============================================================================
--- stable/11/usr.bin/clang/clang/Makefile	Tue May  5 15:29:16 2020	(r360659)
+++ stable/11/usr.bin/clang/clang/Makefile	Tue May  5 17:10:49 2020	(r360660)
@@ -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/11/usr.bin/clang/llc/Makefile
==============================================================================
--- stable/11/usr.bin/clang/llc/Makefile	Tue May  5 15:29:16 2020	(r360659)
+++ stable/11/usr.bin/clang/llc/Makefile	Tue May  5 17:10:49 2020	(r360660)
@@ -2,7 +2,7 @@
 
 PROG_CXX=	llc
 
-SRCDIR=		tools/llc
+SRCDIR=		llvm/tools/llc
 SRCS+=		llc.cpp
 
 LIBADD+=	z

Modified: stable/11/usr.bin/clang/lld/Makefile
==============================================================================
--- stable/11/usr.bin/clang/lld/Makefile	Tue May  5 15:29:16 2020	(r360659)
+++ stable/11/usr.bin/clang/lld/Makefile	Tue May  5 17:10:49 2020	(r360660)
@@ -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
@@ -23,7 +24,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/11/usr.bin/clang/lldb-tblgen/Makefile
==============================================================================
--- stable/11/usr.bin/clang/lldb-tblgen/Makefile	Tue May  5 15:29:16 2020	(r360659)
+++ stable/11/usr.bin/clang/lldb-tblgen/Makefile	Tue May  5 17:10:49 2020	(r360660)
@@ -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/11/usr.bin/clang/lldb/Makefile
==============================================================================
--- stable/11/usr.bin/clang/lldb/Makefile	Tue May  5 15:29:16 2020	(r360659)
+++ stable/11/usr.bin/clang/lldb/Makefile	Tue May  5 17:10:49 2020	(r360660)
@@ -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/11/usr.bin/clang/lli/Makefile
==============================================================================
--- stable/11/usr.bin/clang/lli/Makefile	Tue May  5 15:29:16 2020	(r360659)
+++ stable/11/usr.bin/clang/lli/Makefile	Tue May  5 17:10:49 2020	(r360660)
@@ -2,7 +2,7 @@
 
 PROG_CXX=	lli
 
-SRCDIR=		tools/lli
+SRCDIR=		llvm/tools/lli
 SRCS+=		lli.cpp
 
 LIBADD+=	z

Modified: stable/11/usr.bin/clang/llvm-ar/Makefile
==============================================================================
--- stable/11/usr.bin/clang/llvm-ar/Makefile	Tue May  5 15:29:16 2020	(r360659)
+++ stable/11/usr.bin/clang/llvm-ar/Makefile	Tue May  5 17:10:49 2020	(r360660)
@@ -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/11/usr.bin/clang/llvm-as/Makefile
==============================================================================
--- stable/11/usr.bin/clang/llvm-as/Makefile	Tue May  5 15:29:16 2020	(r360659)
+++ stable/11/usr.bin/clang/llvm-as/Makefile	Tue May  5 17:10:49 2020	(r360660)
@@ -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/11/usr.bin/clang/llvm-bcanalyzer/Makefile
==============================================================================
--- stable/11/usr.bin/clang/llvm-bcanalyzer/Makefile	Tue May  5 15:29:16 2020	(r360659)
+++ stable/11/usr.bin/clang/llvm-bcanalyzer/Makefile	Tue May  5 17:10:49 2020	(r360660)
@@ -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/11/usr.bin/clang/llvm-cov/Makefile
==============================================================================
--- stable/11/usr.bin/clang/llvm-cov/Makefile	Tue May  5 15:29:16 2020	(r360659)
+++ stable/11/usr.bin/clang/llvm-cov/Makefile	Tue May  5 17:10:49 2020	(r360660)
@@ -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/11/usr.bin/clang/llvm-cxxdump/Makefile
==============================================================================
--- stable/11/usr.bin/clang/llvm-cxxdump/Makefile	Tue May  5 15:29:16 2020	(r360659)
+++ stable/11/usr.bin/clang/llvm-cxxdump/Makefile	Tue May  5 17:10:49 2020	(r360660)
@@ -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/11/usr.bin/clang/llvm-cxxfilt/Makefile
==============================================================================
--- stable/11/usr.bin/clang/llvm-cxxfilt/Makefile	Tue May  5 15:29:16 2020	(r360659)
+++ stable/11/usr.bin/clang/llvm-cxxfilt/Makefile	Tue May  5 17:10:49 2020	(r360660)
@@ -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/11/usr.bin/clang/llvm-diff/Makefile
==============================================================================
--- stable/11/usr.bin/clang/llvm-diff/Makefile	Tue May  5 15:29:16 2020	(r360659)
+++ stable/11/usr.bin/clang/llvm-diff/Makefile	Tue May  5 17:10:49 2020	(r360660)
@@ -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/11/usr.bin/clang/llvm-dis/Makefile
==============================================================================
--- stable/11/usr.bin/clang/llvm-dis/Makefile	Tue May  5 15:29:16 2020	(r360659)
+++ stable/11/usr.bin/clang/llvm-dis/Makefile	Tue May  5 17:10:49 2020	(r360660)
@@ -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/11/usr.bin/clang/llvm-dwarfdump/Makefile
==============================================================================
--- stable/11/usr.bin/clang/llvm-dwarfdump/Makefile	Tue May  5 15:29:16 2020	(r360659)
+++ stable/11/usr.bin/clang/llvm-dwarfdump/Makefile	Tue May  5 17:10:49 2020	(r360660)
@@ -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/11/usr.bin/clang/llvm-extract/Makefile
==============================================================================
--- stable/11/usr.bin/clang/llvm-extract/Makefile	Tue May  5 15:29:16 2020	(r360659)
+++ stable/11/usr.bin/clang/llvm-extract/Makefile	Tue May  5 17:10:49 2020	(r360660)
@@ -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/11/usr.bin/clang/llvm-link/Makefile
==============================================================================
--- stable/11/usr.bin/clang/llvm-link/Makefile	Tue May  5 15:29:16 2020	(r360659)
+++ stable/11/usr.bin/clang/llvm-link/Makefile	Tue May  5 17:10:49 2020	(r360660)
@@ -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/11/usr.bin/clang/llvm-lto/Makefile
==============================================================================
--- stable/11/usr.bin/clang/llvm-lto/Makefile	Tue May  5 15:29:16 2020	(r360659)
+++ stable/11/usr.bin/clang/llvm-lto/Makefile	Tue May  5 17:10:49 2020	(r360660)
@@ -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/11/usr.bin/clang/llvm-lto2/Makefile
==============================================================================
--- stable/11/usr.bin/clang/llvm-lto2/Makefile	Tue May  5 15:29:16 2020	(r360659)
+++ stable/11/usr.bin/clang/llvm-lto2/Makefile	Tue May  5 17:10:49 2020	(r360660)
@@ -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/11/usr.bin/clang/llvm-mc/Makefile
==============================================================================
--- stable/11/usr.bin/clang/llvm-mc/Makefile	Tue May  5 15:29:16 2020	(r360659)
+++ stable/11/usr.bin/clang/llvm-mc/Makefile	Tue May  5 17:10:49 2020	(r360660)
@@ -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/11/usr.bin/clang/llvm-mca/Makefile
==============================================================================
--- stable/11/usr.bin/clang/llvm-mca/Makefile	Tue May  5 15:29:16 2020	(r360659)
+++ stable/11/usr.bin/clang/llvm-mca/Makefile	Tue May  5 17:10:49 2020	(r360660)
@@ -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/11/usr.bin/clang/llvm-modextract/Makefile
==============================================================================
--- stable/11/usr.bin/clang/llvm-modextract/Makefile	Tue May  5 15:29:16 2020	(r360659)
+++ stable/11/usr.bin/clang/llvm-modextract/Makefile	Tue May  5 17:10:49 2020	(r360660)
@@ -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/11/usr.bin/clang/llvm-nm/Makefile
==============================================================================
--- stable/11/usr.bin/clang/llvm-nm/Makefile	Tue May  5 15:29:16 2020	(r360659)
+++ stable/11/usr.bin/clang/llvm-nm/Makefile	Tue May  5 17:10:49 2020	(r360660)
@@ -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/11/usr.bin/clang/llvm-objcopy/Makefile
==============================================================================
--- stable/11/usr.bin/clang/llvm-objcopy/Makefile	Tue May  5 15:29:16 2020	(r360659)
+++ stable/11/usr.bin/clang/llvm-objcopy/Makefile	Tue May  5 17:10:49 2020	(r360660)
@@ -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/11/usr.bin/clang/llvm-objdump/Makefile
==============================================================================
--- stable/11/usr.bin/clang/llvm-objdump/Makefile	Tue May  5 15:29:16 2020	(r360659)
+++ stable/11/usr.bin/clang/llvm-objdump/Makefile	Tue May  5 17:10:49 2020	(r360660)
@@ -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/11/usr.bin/clang/llvm-pdbutil/Makefile
==============================================================================
--- stable/11/usr.bin/clang/llvm-pdbutil/Makefile	Tue May  5 15:29:16 2020	(r360659)
+++ stable/11/usr.bin/clang/llvm-pdbutil/Makefile	Tue May  5 17:10:49 2020	(r360660)
@@ -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/11/usr.bin/clang/llvm-profdata/Makefile
==============================================================================
--- stable/11/usr.bin/clang/llvm-profdata/Makefile	Tue May  5 15:29:16 2020	(r360659)
+++ stable/11/usr.bin/clang/llvm-profdata/Makefile	Tue May  5 17:10:49 2020	(r360660)
@@ -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/11/usr.bin/clang/llvm-rtdyld/Makefile
==============================================================================
--- stable/11/usr.bin/clang/llvm-rtdyld/Makefile	Tue May  5 15:29:16 2020	(r360659)
+++ stable/11/usr.bin/clang/llvm-rtdyld/Makefile	Tue May  5 17:10:49 2020	(r360660)
@@ -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/11/usr.bin/clang/llvm-symbolizer/Makefile
==============================================================================
--- stable/11/usr.bin/clang/llvm-symbolizer/Makefile	Tue May  5 15:29:16 2020	(r360659)
+++ stable/11/usr.bin/clang/llvm-symbolizer/Makefile	Tue May  5 17:10:49 2020	(r360660)
@@ -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/11/usr.bin/clang/llvm-tblgen/Makefile
==============================================================================
--- stable/11/usr.bin/clang/llvm-tblgen/Makefile	Tue May  5 15:29:16 2020	(r360659)
+++ stable/11/usr.bin/clang/llvm-tblgen/Makefile	Tue May  5 17:10:49 2020	(r360660)
@@ -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/11/usr.bin/clang/llvm-xray/Makefile
==============================================================================
--- stable/11/usr.bin/clang/llvm-xray/Makefile	Tue May  5 15:29:16 2020	(r360659)
+++ stable/11/usr.bin/clang/llvm-xray/Makefile	Tue May  5 17:10:49 2020	(r360660)
@@ -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/11/usr.bin/clang/opt/Makefile
==============================================================================
--- stable/11/usr.bin/clang/opt/Makefile	Tue May  5 15:29:16 2020	(r360659)
+++ stable/11/usr.bin/clang/opt/Makefile	Tue May  5 17:10:49 2020	(r360660)
@@ -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?202005051710.045HAo8H047883>