18 files changed, 27 insertions, 29 deletions

diff --git a/lib/clang/clang.build.mk b/lib/clang/clang.build.mk
index 7452edd7714d..0d3151178eb9 100644
--- a/lib/clang/clang.build.mk
+++ b/lib/clang/clang.build.mk
@@ -2,18 +2,10 @@
 
 .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
 
 .if ${MK_CLANG_FULL} != "no"
diff --git a/lib/clang/clang.pre.mk b/lib/clang/clang.pre.mk
index fee5b3581f8f..520a9300e6ce 100644
--- a/lib/clang/clang.pre.mk
+++ b/lib/clang/clang.pre.mk
@@ -2,6 +2,6 @@
 
 .include "llvm.pre.mk"
 
-CLANG_SRCS=	${LLVM_SRCS}/tools/clang
+CLANG_SRCS=	${LLVM_BASE}/clang
 
 CLANG_TBLGEN?=	clang-tblgen
diff --git a/lib/clang/libclang/Makefile b/lib/clang/libclang/Makefile
index 445326677a7f..be9c0c337ac5 100644
--- a/lib/clang/libclang/Makefile
+++ b/lib/clang/libclang/Makefile
@@ -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
diff --git a/lib/clang/liblldb/Makefile b/lib/clang/liblldb/Makefile
index a85f4cf2bde5..98e15cf8d793 100644
--- a/lib/clang/liblldb/Makefile
+++ b/lib/clang/liblldb/Makefile
@@ -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
diff --git a/lib/clang/libllvm/Makefile b/lib/clang/libllvm/Makefile
index aa9fc2a37a17..2741136dd82d 100644
--- a/lib/clang/libllvm/Makefile
+++ b/lib/clang/libllvm/Makefile
@@ -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
diff --git a/lib/clang/libllvmminimal/Makefile b/lib/clang/libllvmminimal/Makefile
index 44f3ac2bdaed..f3443035296b 100644
--- a/lib/clang/libllvmminimal/Makefile
+++ b/lib/clang/libllvmminimal/Makefile
@@ -5,7 +5,7 @@
 LIB=		llvmminimal
 INTERNALLIB=
 
-SRCDIR=		lib
+SRCDIR=		llvm/lib
 SRCS+=		Demangle/ItaniumDemangle.cpp
 SRCS+=		Support/APFloat.cpp
 SRCS+=		Support/APInt.cpp
diff --git a/lib/clang/lldb.pre.mk b/lib/clang/lldb.pre.mk
index 1849b9b35c97..dbbfa1dba049 100644
--- a/lib/clang/lldb.pre.mk
+++ b/lib/clang/lldb.pre.mk
@@ -2,4 +2,4 @@
 
 .include "clang.pre.mk"
 
-LLDB_SRCS=	${LLVM_SRCS}/tools/lldb
+LLDB_SRCS=	${LLVM_BASE}/lldb
diff --git a/lib/clang/llvm.build.mk b/lib/clang/llvm.build.mk
index e9ee58637ee9..5ccd5c3b5278 100644
--- a/lib/clang/llvm.build.mk
+++ b/lib/clang/llvm.build.mk
@@ -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
diff --git a/lib/clang/llvm.pre.mk b/lib/clang/llvm.pre.mk
index 9245b9824a19..774d7d47ea37 100644
--- a/lib/clang/llvm.pre.mk
+++ b/lib/clang/llvm.pre.mk
@@ -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
diff --git a/lib/libblocksruntime/Makefile b/lib/libblocksruntime/Makefile
index a7b04d8ac07a..c61134d1ea5e 100644
--- a/lib/libblocksruntime/Makefile
+++ b/lib/libblocksruntime/Makefile
@@ -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
diff --git a/lib/libc++/Makefile b/lib/libc++/Makefile
index b8c94af96086..8db7a451c14f 100644
--- a/lib/libc++/Makefile
+++ b/lib/libc++/Makefile
@@ -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
diff --git a/lib/libc++experimental/Makefile b/lib/libc++experimental/Makefile
index b75f82a1259a..f3b17c5cff9a 100644
--- a/lib/libc++experimental/Makefile
+++ b/lib/libc++experimental/Makefile
@@ -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=
diff --git a/lib/libc/arm/aeabi/Makefile.inc b/lib/libc/arm/aeabi/Makefile.inc
index ecb1a1f2866e..9ccabc2186f9 100644
--- a/lib/libc/arm/aeabi/Makefile.inc
+++ b/lib/libc/arm/aeabi/Makefile.inc
@@ -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		\
diff --git a/lib/libclang_rt/Makefile.inc b/lib/libclang_rt/Makefile.inc
index aeaba094af5e..6ce11f1e2bcb 100644
--- a/lib/libclang_rt/Makefile.inc
+++ b/lib/libclang_rt/Makefile.inc
@@ -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
 
diff --git a/lib/libcompiler_rt/Makefile.inc b/lib/libcompiler_rt/Makefile.inc
index d6e46deab595..22b305c636bf 100644
--- a/lib/libcompiler_rt/Makefile.inc
+++ b/lib/libcompiler_rt/Makefile.inc
@@ -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}
diff --git a/lib/libexecinfo/Makefile b/lib/libexecinfo/Makefile
index d130d5795918..cc7b5a406638 100644
--- a/lib/libexecinfo/Makefile
+++ b/lib/libexecinfo/Makefile
@@ -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
 
diff --git a/lib/libgcc_eh/Makefile.inc b/lib/libgcc_eh/Makefile.inc
index a556ff20d882..404c3ac00689 100644
--- a/lib/libgcc_eh/Makefile.inc
+++ b/lib/libgcc_eh/Makefile.inc
@@ -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
diff --git a/lib/libomp/Makefile b/lib/libomp/Makefile
index f64ee0369b2e..5fcc09ed7380 100644
--- a/lib/libomp/Makefile
+++ b/lib/libomp/Makefile
@@ -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}