From 390be9fc05dd2fadb6c04827cd78716b183b5d2c Mon Sep 17 00:00:00 2001
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sat, 24 Aug 2019 22:07:38 +0000
Subject: [PATCH] Update build glue for a build of clang plus lld (enabled via
 MK_LLD).

---
 lib/clang/libllvm/Makefile | 2 +-
 usr.bin/clang/lld/Makefile | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/clang/libllvm/Makefile b/lib/clang/libllvm/Makefile
index 618be2d7db81..1413074b73dd 100644
--- a/lib/clang/libllvm/Makefile
+++ b/lib/clang/libllvm/Makefile
@@ -847,7 +847,7 @@ SRCS_MIN+=	Support/MemoryBuffer.cpp
 SRCS_MIN+=	Support/Mutex.cpp
 SRCS_MIN+=	Support/NativeFormatting.cpp
 SRCS_MIN+=	Support/Optional.cpp
-#SRCS_LLD+=	Support/Parallel.cpp
+SRCS_LLD+=	Support/Parallel.cpp
 SRCS_MIN+=	Support/Path.cpp
 SRCS_MIN+=	Support/PluginLoader.cpp
 SRCS_MIN+=	Support/PrettyStackTrace.cpp
diff --git a/usr.bin/clang/lld/Makefile b/usr.bin/clang/lld/Makefile
index 96c2693c97d7..09cc973b15d9 100644
--- a/usr.bin/clang/lld/Makefile
+++ b/usr.bin/clang/lld/Makefile
@@ -23,6 +23,7 @@ CFLAGS+=	-I${OBJTOP}/lib/clang/libllvm
 SRCDIR=		tools/lld
 SRCS+=		Common/Args.cpp
 SRCS+=		Common/ErrorHandler.cpp
+SRCS+=		Common/Filesystem.cpp
 SRCS+=		Common/Memory.cpp
 SRCS+=		Common/Reproduce.cpp
 SRCS+=		Common/Strings.cpp
@@ -49,7 +50,6 @@ SRCS+=		ELF/DWARF.cpp
 SRCS+=		ELF/Driver.cpp
 SRCS+=		ELF/DriverUtils.cpp
 SRCS+=		ELF/EhFrame.cpp
-SRCS+=		ELF/Filesystem.cpp
 SRCS+=		ELF/ICF.cpp
 SRCS+=		ELF/InputFiles.cpp
 SRCS+=		ELF/InputSection.cpp
@@ -96,6 +96,7 @@ TGHDRS+=	${INCFILE}
 DPSRCS+=	${TGHDRS}
 CLEANFILES+=	${TGHDRS} ${TGHDRS:C/$/.d/}
 
+LIBADD+=	execinfo
 LIBADD+=	ncursesw
 LIBADD+=	pthread
 LIBADD+=	z