Build and install a shared libLLVM, llvm-config and llvm includes.

This is required to build the radeonsi Mesa driver.

ok patrick@

95 files changed, 460 insertions, 964 deletions

diff --git a/gnu/usr.bin/clang/Makefile b/gnu/usr.bin/clang/Makefile
index 4d763806d78..13656a7cf6d 100644
--- a/gnu/usr.bin/clang/Makefile
+++ b/gnu/usr.bin/clang/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2019/03/05 06:04:32 jsg Exp $
+# $OpenBSD: Makefile,v 1.11 2019/03/05 09:44:38 jsg Exp $
 
 .include <bsd.own.mk>
 
@@ -12,55 +12,14 @@ SUBDIR+=llvm-tblgen
 SUBDIR+=include/llvm/IR
 SUBDIR+=include/llvm/Transforms/InstCombine
 
-# these need Intrinsics.gen
-SUBDIR+=libLLVMCore
-SUBDIR+=libLLVMIRReader
-SUBDIR+=libLLVMCodeGen
-SUBDIR+=libLLVMSelectionDAG
-SUBDIR+=libLLVMAsmPrinter
-# only required by llc
-#SUBDIR+=libLLVMMIRParser
-SUBDIR+=libLLVMBinaryFormat
-SUBDIR+=libLLVMBitReader
-SUBDIR+=libLLVMBitWriter
-SUBDIR+=libLLVMTransformUtils
-SUBDIR+=libLLVMInstrumentation
-SUBDIR+=libLLVMInstCombine
-SUBDIR+=libLLVMScalarOpts
-SUBDIR+=libLLVMipo
-SUBDIR+=libLLVMVectorize
-SUBDIR+=libLLVMObjCARCOpts
-SUBDIR+=libLLVMLinker
-SUBDIR+=libLLVMAnalysis
-SUBDIR+=libLLVMMC
-SUBDIR+=libLLVMMCParser
-SUBDIR+=libLLVMMCDisassembler
-SUBDIR+=libLLVMObject
-SUBDIR+=libLLVMOption
-SUBDIR+=libLLVMTarget
-SUBDIR+=libLLVMAsmParser
-SUBDIR+=libLLVMProfileData
-SUBDIR+=libLLVMCoverage
-SUBDIR+=libLLVMDebugInfoCodeView
-SUBDIR+=libLLVMDebugInfoDWARF
-SUBDIR+=libLLVMDebugInfoMSF
-SUBDIR+=libLLVMDebugInfoPDB
-SUBDIR+=libLLVMExecutionEngine
-SUBDIR+=libLLVMGlobalISel
-SUBDIR+=libLLVMLTO
-SUBDIR+=libLLVMPasses
-SUBDIR+=libLLVMCoroutines
-SUBDIR+=libLLVMDemangle
-
 .for arch in ${LLVM_ARCHS}
 .if "${arch}" == ${LLVM_ARCH} || "${arch}" == "AMDGPU" || make(obj)
 SUBDIR+=include/llvm/${arch}
 .endif
 .endfor
 
-.for _l in ${BACKEND_LIBS}
-SUBDIR+=lib${_l}
-.endfor
+SUBDIR+=libLLVM
+SUBDIR+=llvm-config
 
 SUBDIR+=clang-tblgen
 SUBDIR+=include/clang
diff --git a/gnu/usr.bin/clang/clang/Makefile b/gnu/usr.bin/clang/clang/Makefile
index 25495eab0a0..c0383de739d 100644
--- a/gnu/usr.bin/clang/clang/Makefile
+++ b/gnu/usr.bin/clang/clang/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2019/01/27 16:59:41 patrick Exp $
+# $OpenBSD: Makefile,v 1.13 2019/03/05 09:44:39 jsg Exp $
 
 .include <bsd.own.mk>
 
@@ -43,47 +43,9 @@ LLVM_LIBDEPS=	clangFrontendTool \
 		clangAST \
 		clangLex \
 		clangBasic \
-		clangBasicTargets \
-		LLVMLTO \
-		LLVMPasses \
-		LLVMOption \
-		LLVMObjCARCOpts \
-		LLVMipo \
-		LLVMVectorize \
-		LLVMLinker \
-		LLVMIRReader \
-		LLVMAsmParser \
-		${BACKEND_ASMPARSER} \
-		${BACKEND_CODEGEN} \
-		LLVMSelectionDAG \
-		LLVMAsmPrinter \
-		LLVMCodeGen \
-		LLVMTarget \
-		LLVMScalarOpts \
-		LLVMInstCombine \
-		LLVMInstrumentation \
-		LLVMProfileData \
-		LLVMCoverage \
-		LLVMDebugInfoCodeView \
-		LLVMDebugInfoDWARF \
-		LLVMDebugInfoMSF \
-		LLVMGlobalISel \
-		LLVMTransformUtils \
-		LLVMCoroutines \
-		LLVMDemangle \
-		LLVMBitWriter \
-		LLVMAnalysis \
-		${BACKEND_DESC} \
-		LLVMObject \
-		LLVMMCParser \
-		LLVMBitReader \
-		LLVMMCDisassembler \
-		${BACKEND_INFO} \
-		${BACKEND_ASMPRINTER} \
-		LLVMMC \
-		${BACKEND_UTILS} \
-		LLVMBinaryFormat \
-		LLVMCore \
-		LLVMSupport
+		clangBasicTargets
+
+DPADD+= ${.OBJDIR}/../libLLVM/libLLVM.a
+LDADD+= ${.OBJDIR}/../libLLVM/libLLVM.a
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/clang/include/llvm/Config/Makefile b/gnu/usr.bin/clang/include/llvm/Config/Makefile
index a4fb09e6dce..a4042a33210 100644
--- a/gnu/usr.bin/clang/include/llvm/Config/Makefile
+++ b/gnu/usr.bin/clang/include/llvm/Config/Makefile
@@ -1,15 +1,16 @@
-# $OpenBSD: Makefile,v 1.4 2019/03/05 06:04:32 jsg Exp $
+# $OpenBSD: Makefile,v 1.5 2019/03/05 09:44:39 jsg Exp $
 
 .include <bsd.own.mk>
 
 .include "../../../Makefile.arch"
+.include "../../../Makefile.inc"
 
-DEFS=	AsmParsers.def AsmPrinters.def Disassemblers.def Targets.def
+DEFS=	AsmParsers.def AsmPrinters.def Disassemblers.def Targets.def llvm-config.h
 
-all: ${DEFS}
+HDRS=	abi-breaking.h
+INCDIR=	/usr/include/llvm/Config
 
-install:
-	@# Nothing here so far ...
+all: ${DEFS} ${HDRS}
 
 clean cleandir:
 	rm -f ${DEFS}
@@ -24,4 +25,27 @@ Targets.def:
 	printf "LLVM_TARGET(AMDGPU)\n" >$@
 	printf "LLVM_TARGET(${LLVM_ARCH})\n#undef LLVM_TARGET\n" >>$@
 
+llvm-config.h: llvm-config.h.in
+	cp ${.CURDIR}/llvm-config.h.in $@
+	echo "\n#define LLVM_DEFAULT_TARGET_TRIPLE \"${TRIPLE}\"" >> $@
+	echo "#define LLVM_HOST_TRIPLE \"${TRIPLE}\"" >> $@
+	echo "\n#endif" >> $@
+
+install includes: ${DEFS}
+	${INSTALL} -d -m 755 ${DESTDIR}${INCDIR}
+	@cd ${.CURDIR}; for i in $(HDRS); do \
+	    j="cmp -s $$i ${DESTDIR}${INCDIR}/$$i || \
+		${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} \
+		-m 444 $$i ${DESTDIR}${INCDIR}"; \
+	    echo $$j; \
+	    eval "$$j"; \
+	done
+	@cd ${.OBJDIR}; for i in $(DEFS); do \
+	    j="cmp -s $$i ${DESTDIR}${INCDIR}/$$i || \
+		${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} \
+		-m 444 $$i ${DESTDIR}${INCDIR}"; \
+	    echo $$j; \
+	    eval "$$j"; \
+	done
+
 .include <bsd.obj.mk>
diff --git a/gnu/usr.bin/clang/include/llvm/Config/llvm-config.h b/gnu/usr.bin/clang/include/llvm/Config/llvm-config.h.in
index 061e01faf2d..13c04b5983c 100644
--- a/gnu/usr.bin/clang/include/llvm/Config/llvm-config.h
+++ b/gnu/usr.bin/clang/include/llvm/Config/llvm-config.h.in
@@ -93,5 +93,3 @@
  * PrintStatistics() or PrintStatisticsJSON()
  */
 #define LLVM_FORCE_ENABLE_STATS 0
-
-#endif
diff --git a/gnu/usr.bin/clang/include/llvm/IR/Makefile b/gnu/usr.bin/clang/include/llvm/IR/Makefile
index 0e90980eae4..d0adf6418d4 100644
--- a/gnu/usr.bin/clang/include/llvm/IR/Makefile
+++ b/gnu/usr.bin/clang/include/llvm/IR/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2019/01/27 16:59:41 patrick Exp $
+# $OpenBSD: Makefile,v 1.6 2019/03/05 09:44:39 jsg Exp $
 
 .include <bsd.own.mk>
 
@@ -6,10 +6,9 @@ LLVM_SRCS=	${.CURDIR}/../../../../../llvm
 
 DEFS=	Attributes.inc IntrinsicEnums.inc IntrinsicImpl.inc
 
-all: ${DEFS}
+INCDIR=	/usr/include/llvm/IR
 
-install:
-	@# Nothing here so far ...
+all: ${DEFS}
 
 clean cleandir:
 	rm -f ${DEFS}
@@ -32,4 +31,14 @@ IntrinsicImpl.inc: ${LLVM_SRCS}/include/llvm/IR/Intrinsics.td
 		-I${LLVM_SRCS}/include \
 		-o ${.TARGET} ${.ALLSRC}
 
+install includes: ${DEFS}
+	${INSTALL} -d -m 755 ${DESTDIR}${INCDIR}
+	@cd ${.OBJDIR}; for i in $(DEFS); do \
+	    j="cmp -s $$i ${DESTDIR}${INCDIR}/$$i || \
+		${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} \
+		-m 444 $$i ${DESTDIR}${INCDIR}"; \
+	    echo $$j; \
+	    eval "$$j"; \
+	done
+
 .include <bsd.obj.mk>
diff --git a/gnu/usr.bin/clang/libLLVM/Makefile b/gnu/usr.bin/clang/libLLVM/Makefile
new file mode 100644
index 00000000000..d5ea773d9e1
--- /dev/null
+++ b/gnu/usr.bin/clang/libLLVM/Makefile
@@ -0,0 +1,69 @@
+.include "../Makefile.arch"
+
+.include "../libLLVMAMDGPUAsmParser/Makefile"
+.include "../libLLVMAMDGPUAsmPrinter/Makefile"
+.include "../libLLVMAMDGPUCodeGen/Makefile"
+.include "../libLLVMAMDGPUDesc/Makefile"
+.include "../libLLVMAMDGPUDisassembler/Makefile"
+.include "../libLLVMAMDGPUInfo/Makefile"
+.include "../libLLVMAMDGPUUtils/Makefile"
+.include "../libLLVMAnalysis/Makefile"
+.include "../libLLVMAsmParser/Makefile"
+.include "../libLLVMAsmPrinter/Makefile"
+.include "../libLLVMBinaryFormat/Makefile"
+.include "../libLLVMBitReader/Makefile"
+.include "../libLLVMBitWriter/Makefile"
+.include "../libLLVMCodeGen/Makefile"
+.include "../libLLVMCore/Makefile"
+.include "../libLLVMCoroutines/Makefile"
+.include "../libLLVMCoverage/Makefile"
+.include "../libLLVMDebugInfoCodeView/Makefile"
+.include "../libLLVMDebugInfoDWARF/Makefile"
+.include "../libLLVMDebugInfoMSF/Makefile"
+.include "../libLLVMDebugInfoPDB/Makefile"
+.include "../libLLVMDemangle/Makefile"
+.include "../libLLVMExecutionEngine/Makefile"
+.include "../libLLVMGlobalISel/Makefile"
+.include "../libLLVMIRReader/Makefile"
+.include "../libLLVMInstCombine/Makefile"
+.include "../libLLVMInstrumentation/Makefile"
+.include "../libLLVMLTO/Makefile"
+.include "../libLLVMLinker/Makefile"
+.include "../libLLVMMC/Makefile"
+.include "../libLLVMMCDisassembler/Makefile"
+.include "../libLLVMMCParser/Makefile"
+.include "../libLLVMMIRParser/Makefile"
+.include "../libLLVMObjCARCOpts/Makefile"
+.include "../libLLVMObject/Makefile"
+.include "../libLLVMOption/Makefile"
+.include "../libLLVMPasses/Makefile"
+.include "../libLLVMProfileData/Makefile"
+.include "../libLLVMScalarOpts/Makefile"
+.include "../libLLVMSelectionDAG/Makefile"
+.include "../libLLVMSupport/Makefile.shared"
+.include "../libLLVMTableGen/Makefile.shared"
+.include "../libLLVMTarget/Makefile"
+.include "../libLLVMTransformUtils/Makefile"
+.include "../libLLVMVectorize/Makefile"
+.include "../libLLVM${LLVM_ARCH}AsmParser/Makefile"
+.include "../libLLVM${LLVM_ARCH}AsmPrinter/Makefile"
+.include "../libLLVM${LLVM_ARCH}CodeGen/Makefile"
+.include "../libLLVM${LLVM_ARCH}Desc/Makefile"
+.include "../libLLVM${LLVM_ARCH}Disassembler/Makefile"
+.include "../libLLVM${LLVM_ARCH}Info/Makefile"
+.if "${LLVM_ARCH}" == "X86" || "${LLVM_ARCH}" == "AArch64" || "${LLVM_ARCH}" == "ARM"
+.include "../libLLVM${LLVM_ARCH}Utils/Makefile"
+.endif
+.include "../libLLVMipo/Makefile"
+
+LIB=	LLVM
+
+includes:
+	cd ${LLVM_SRCS}/include; \
+	pax -rw -pa -L \
+	    `find llvm llvm-c -follow -type f \
+	    '(' -name '*.def' -or -name '*.h' -or -name '*.td' \
+	    -or -name '*.inc' ')' \
+	    -print` ${DESTDIR}/usr/include
+
+.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVM/shlib_version b/gnu/usr.bin/clang/libLLVM/shlib_version
new file mode 100644
index 00000000000..97c9f92d6b8
--- /dev/null
+++ b/gnu/usr.bin/clang/libLLVM/shlib_version
@@ -0,0 +1,2 @@
+major=0
+minor=0
diff --git a/gnu/usr.bin/clang/libLLVMAArch64AsmParser/Makefile b/gnu/usr.bin/clang/libLLVMAArch64AsmParser/Makefile
index 7dee711378b..2c6bbe7730b 100644
--- a/gnu/usr.bin/clang/libLLVMAArch64AsmParser/Makefile
+++ b/gnu/usr.bin/clang/libLLVMAArch64AsmParser/Makefile
@@ -1,18 +1,11 @@
-# $OpenBSD: Makefile,v 1.2 2017/07/09 15:28:34 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:39 jsg Exp $
 
 LIB=	LLVMAArch64AsmParser
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/AArch64 \
 		-I${LLVM_SRCS}/lib/Target/AArch64
 
-.include <bsd.own.mk>
-SRCS=	AArch64AsmParser.cpp
+SRCS+=	AArch64AsmParser.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/Target/AArch64/AsmParser
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMAArch64AsmPrinter/Makefile b/gnu/usr.bin/clang/libLLVMAArch64AsmPrinter/Makefile
index 23eb0c45831..3d5ac2d92c7 100644
--- a/gnu/usr.bin/clang/libLLVMAArch64AsmPrinter/Makefile
+++ b/gnu/usr.bin/clang/libLLVMAArch64AsmPrinter/Makefile
@@ -1,18 +1,11 @@
-# $OpenBSD: Makefile,v 1.2 2017/07/09 15:28:34 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:39 jsg Exp $
 
 LIB=	LLVMAArch64AsmPrinter
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/AArch64 \
 		-I${LLVM_SRCS}/lib/Target/AArch64
 
-.include <bsd.own.mk>
-SRCS=	AArch64InstPrinter.cpp
+SRCS+=	AArch64InstPrinter.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/Target/AArch64/InstPrinter
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMAArch64CodeGen/Makefile b/gnu/usr.bin/clang/libLLVMAArch64CodeGen/Makefile
index c7333b25152..2bc56be5a4e 100644
--- a/gnu/usr.bin/clang/libLLVMAArch64CodeGen/Makefile
+++ b/gnu/usr.bin/clang/libLLVMAArch64CodeGen/Makefile
@@ -1,14 +1,12 @@
-# $OpenBSD: Makefile,v 1.7 2018/08/12 17:07:00 mortimer Exp $
+# $OpenBSD: Makefile,v 1.8 2019/03/05 09:44:39 jsg Exp $
 
 LIB=	LLVMAArch64CodeGen
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/AArch64 \
 		-I${LLVM_SRCS}/lib/Target/AArch64
 
-.include <bsd.own.mk>
-SRCS=	AArch64A57FPLoadBalancing.cpp \
+SRCS+=	AArch64A57FPLoadBalancing.cpp \
 	AArch64AdvSIMDScalarPass.cpp \
 	AArch64AsmPrinter.cpp \
 	AArch64CallLowering.cpp \
@@ -46,8 +44,3 @@ SRCS=	AArch64A57FPLoadBalancing.cpp \
 	AArch64TargetTransformInfo.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/Target/AArch64
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMAArch64Desc/Makefile b/gnu/usr.bin/clang/libLLVMAArch64Desc/Makefile
index 49137c9dda2..6140c69314b 100644
--- a/gnu/usr.bin/clang/libLLVMAArch64Desc/Makefile
+++ b/gnu/usr.bin/clang/libLLVMAArch64Desc/Makefile
@@ -1,14 +1,12 @@
-# $OpenBSD: Makefile,v 1.3 2017/10/04 20:57:09 patrick Exp $
+# $OpenBSD: Makefile,v 1.4 2019/03/05 09:44:39 jsg Exp $
 
 LIB=	LLVMAArch64Desc
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/AArch64 \
 		-I${LLVM_SRCS}/lib/Target/AArch64
 
-.include <bsd.own.mk>
-SRCS=	AArch64AsmBackend.cpp \
+SRCS+=	AArch64AsmBackend.cpp \
 	AArch64ELFObjectWriter.cpp \
 	AArch64ELFStreamer.cpp \
 	AArch64MachObjectWriter.cpp \
@@ -21,8 +19,3 @@ SRCS=	AArch64AsmBackend.cpp \
 	AArch64WinCOFFStreamer.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/Target/AArch64/MCTargetDesc
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMAArch64Disassembler/Makefile b/gnu/usr.bin/clang/libLLVMAArch64Disassembler/Makefile
index ecfdaaf3433..1e6c7f0c6d0 100644
--- a/gnu/usr.bin/clang/libLLVMAArch64Disassembler/Makefile
+++ b/gnu/usr.bin/clang/libLLVMAArch64Disassembler/Makefile
@@ -1,19 +1,12 @@
-# $OpenBSD: Makefile,v 1.2 2017/07/09 15:28:34 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:39 jsg Exp $
 
 LIB=	LLVMAArch64Disassembler
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/AArch64 \
 		-I${LLVM_SRCS}/lib/Target/AArch64
 
-.include <bsd.own.mk>
-SRCS=	AArch64Disassembler.cpp \
+SRCS+=	AArch64Disassembler.cpp \
 	AArch64ExternalSymbolizer.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/Target/AArch64/Disassembler
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMAArch64Info/Makefile b/gnu/usr.bin/clang/libLLVMAArch64Info/Makefile
index bca81a4efda..c3637c76100 100644
--- a/gnu/usr.bin/clang/libLLVMAArch64Info/Makefile
+++ b/gnu/usr.bin/clang/libLLVMAArch64Info/Makefile
@@ -1,18 +1,11 @@
-# $OpenBSD: Makefile,v 1.2 2017/07/09 15:28:34 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:39 jsg Exp $
 
 LIB=	LLVMAArch64Info
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/AArch64 \
 		-I${LLVM_SRCS}/lib/Target/AArch64
 
-.include <bsd.own.mk>
-SRCS=	AArch64TargetInfo.cpp
+SRCS+=	AArch64TargetInfo.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/Target/AArch64/TargetInfo
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMAArch64Utils/Makefile b/gnu/usr.bin/clang/libLLVMAArch64Utils/Makefile
index 146e5454682..57ec2961965 100644
--- a/gnu/usr.bin/clang/libLLVMAArch64Utils/Makefile
+++ b/gnu/usr.bin/clang/libLLVMAArch64Utils/Makefile
@@ -1,18 +1,11 @@
-# $OpenBSD: Makefile,v 1.2 2017/07/09 15:28:34 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:39 jsg Exp $
 
 LIB=	LLVMAArch64Utils
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/AArch64 \
 		-I${LLVM_SRCS}/lib/Target/AArch64
 
-.include <bsd.own.mk>
-SRCS=	AArch64BaseInfo.cpp
+SRCS+=	AArch64BaseInfo.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/Target/AArch64/Utils
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMAMDGPUAsmParser/Makefile b/gnu/usr.bin/clang/libLLVMAMDGPUAsmParser/Makefile
index e0e2550d605..9f3b7c9d410 100644
--- a/gnu/usr.bin/clang/libLLVMAMDGPUAsmParser/Makefile
+++ b/gnu/usr.bin/clang/libLLVMAMDGPUAsmParser/Makefile
@@ -1,18 +1,11 @@
-# $OpenBSD: Makefile,v 1.1 2019/01/29 00:18:23 jsg Exp $
+# $OpenBSD: Makefile,v 1.2 2019/03/05 09:44:39 jsg Exp $
 
 LIB=	LLVMAMDGPUAsmParser
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/AMDGPU \
 		-I${LLVM_SRCS}/lib/Target/AMDGPU
 
-.include <bsd.own.mk>
-SRCS=	AMDGPUAsmParser.cpp
+SRCS+=	AMDGPUAsmParser.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/Target/AMDGPU/AsmParser
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMAMDGPUAsmPrinter/Makefile b/gnu/usr.bin/clang/libLLVMAMDGPUAsmPrinter/Makefile
index 32a04dc9077..f2e1caba258 100644
--- a/gnu/usr.bin/clang/libLLVMAMDGPUAsmPrinter/Makefile
+++ b/gnu/usr.bin/clang/libLLVMAMDGPUAsmPrinter/Makefile
@@ -1,18 +1,11 @@
-# $OpenBSD: Makefile,v 1.1 2019/01/29 00:18:23 jsg Exp $
+# $OpenBSD: Makefile,v 1.2 2019/03/05 09:44:39 jsg Exp $
 
 LIB=	LLVMAMDGPUAsmPrinter
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/AMDGPU \
 		-I${LLVM_SRCS}/lib/Target/AMDGPU
 
-.include <bsd.own.mk>
-SRCS=	AMDGPUInstPrinter.cpp
+SRCS+=	AMDGPUInstPrinter.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/Target/AMDGPU/InstPrinter
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMAMDGPUCodeGen/Makefile b/gnu/usr.bin/clang/libLLVMAMDGPUCodeGen/Makefile
index b73a4c35a9c..162b8094418 100644
--- a/gnu/usr.bin/clang/libLLVMAMDGPUCodeGen/Makefile
+++ b/gnu/usr.bin/clang/libLLVMAMDGPUCodeGen/Makefile
@@ -1,14 +1,12 @@
-# $OpenBSD: Makefile,v 1.1 2019/01/29 05:51:30 jsg Exp $
+# $OpenBSD: Makefile,v 1.2 2019/03/05 09:44:39 jsg Exp $
 
 LIB=	LLVMAMDGPUCodeGen
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/AMDGPU \
 		-I${LLVM_SRCS}/lib/Target/AMDGPU
 
-.include <bsd.own.mk>
-SRCS=	AMDGPUAliasAnalysis.cpp \
+SRCS+=	AMDGPUAliasAnalysis.cpp \
 	AMDGPUAlwaysInlinePass.cpp \
 	AMDGPUAnnotateKernelFeatures.cpp \
 	AMDGPUAnnotateUniformValues.cpp \
@@ -95,8 +93,3 @@ SRCS=	AMDGPUAliasAnalysis.cpp \
 	GCNILPSched.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/Target/AMDGPU
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMAMDGPUDesc/Makefile b/gnu/usr.bin/clang/libLLVMAMDGPUDesc/Makefile
index 2a039384658..deb76635db6 100644
--- a/gnu/usr.bin/clang/libLLVMAMDGPUDesc/Makefile
+++ b/gnu/usr.bin/clang/libLLVMAMDGPUDesc/Makefile
@@ -1,14 +1,12 @@
-# $OpenBSD: Makefile,v 1.1 2019/01/29 00:18:23 jsg Exp $
+# $OpenBSD: Makefile,v 1.2 2019/03/05 09:44:39 jsg Exp $
 
 LIB=	LLVMAMDGPUDesc
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/AMDGPU \
 		-I${LLVM_SRCS}/lib/Target/AMDGPU
 
-.include <bsd.own.mk>
-SRCS=	AMDGPUAsmBackend.cpp \
+SRCS+=	AMDGPUAsmBackend.cpp \
 	AMDGPUELFObjectWriter.cpp \
 	AMDGPUELFStreamer.cpp \
 	AMDGPUMCAsmInfo.cpp \
@@ -20,8 +18,3 @@ SRCS=	AMDGPUAsmBackend.cpp \
 	SIMCCodeEmitter.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/Target/AMDGPU/MCTargetDesc
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMAMDGPUDisassembler/Makefile b/gnu/usr.bin/clang/libLLVMAMDGPUDisassembler/Makefile
index 8d1fdf96ff5..ab2f322a16e 100644
--- a/gnu/usr.bin/clang/libLLVMAMDGPUDisassembler/Makefile
+++ b/gnu/usr.bin/clang/libLLVMAMDGPUDisassembler/Makefile
@@ -1,18 +1,11 @@
-# $OpenBSD: Makefile,v 1.1 2019/01/29 00:18:23 jsg Exp $
+# $OpenBSD: Makefile,v 1.2 2019/03/05 09:44:39 jsg Exp $
 
 LIB=	LLVMAMDGPUDisassembler
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/AMDGPU \
 		-I${LLVM_SRCS}/lib/Target/AMDGPU
 
-.include <bsd.own.mk>
-SRCS=	AMDGPUDisassembler.cpp
+SRCS+=	AMDGPUDisassembler.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/Target/AMDGPU/Disassembler
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMAMDGPUInfo/Makefile b/gnu/usr.bin/clang/libLLVMAMDGPUInfo/Makefile
index e469444e9f7..7607996255e 100644
--- a/gnu/usr.bin/clang/libLLVMAMDGPUInfo/Makefile
+++ b/gnu/usr.bin/clang/libLLVMAMDGPUInfo/Makefile
@@ -1,18 +1,11 @@
-# $OpenBSD: Makefile,v 1.1 2019/01/29 00:18:23 jsg Exp $
+# $OpenBSD: Makefile,v 1.2 2019/03/05 09:44:39 jsg Exp $
 
 LIB=	LLVMAMDGPUInfo
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/AMDGPU \
 		-I${LLVM_SRCS}/lib/Target/AMDGPU
 
-.include <bsd.own.mk>
-SRCS=	AMDGPUTargetInfo.cpp
+SRCS+=	AMDGPUTargetInfo.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/Target/AMDGPU/TargetInfo
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMAMDGPUUtils/Makefile b/gnu/usr.bin/clang/libLLVMAMDGPUUtils/Makefile
index b7f72f26842..ff3e4f5cd83 100644
--- a/gnu/usr.bin/clang/libLLVMAMDGPUUtils/Makefile
+++ b/gnu/usr.bin/clang/libLLVMAMDGPUUtils/Makefile
@@ -1,21 +1,14 @@
-# $OpenBSD: Makefile,v 1.1 2019/01/29 00:18:23 jsg Exp $
+# $OpenBSD: Makefile,v 1.2 2019/03/05 09:44:39 jsg Exp $
 
 LIB=	LLVMAMDGPUUtils
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/AMDGPU \
 		-I${LLVM_SRCS}/lib/Target/AMDGPU
 
-.include <bsd.own.mk>
-SRCS=	AMDGPUBaseInfo.cpp \
+SRCS+=	AMDGPUBaseInfo.cpp \
 	AMDKernelCodeTUtils.cpp \
 	AMDGPUAsmUtils.cpp \
 	AMDGPULaneDominator.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/Target/AMDGPU/Utils
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMARMAsmParser/Makefile b/gnu/usr.bin/clang/libLLVMARMAsmParser/Makefile
index 3ea079ed9ba..e677010573f 100644
--- a/gnu/usr.bin/clang/libLLVMARMAsmParser/Makefile
+++ b/gnu/usr.bin/clang/libLLVMARMAsmParser/Makefile
@@ -1,17 +1,10 @@
-# $OpenBSD: Makefile,v 1.2 2017/07/09 15:28:34 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:39 jsg Exp $
 
 LIB=	LLVMARMAsmParser
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/ARM -I${LLVM_SRCS}/lib/Target/ARM
 
-.include <bsd.own.mk>
-SRCS=	ARMAsmParser.cpp
+SRCS+=	ARMAsmParser.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/Target/ARM/AsmParser
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMARMAsmPrinter/Makefile b/gnu/usr.bin/clang/libLLVMARMAsmPrinter/Makefile
index 2116721af18..4e78686147a 100644
--- a/gnu/usr.bin/clang/libLLVMARMAsmPrinter/Makefile
+++ b/gnu/usr.bin/clang/libLLVMARMAsmPrinter/Makefile
@@ -1,17 +1,10 @@
-# $OpenBSD: Makefile,v 1.2 2017/07/09 15:28:34 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:39 jsg Exp $
 
 LIB=	LLVMARMAsmPrinter
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/ARM -I${LLVM_SRCS}/lib/Target/ARM
 
-.include <bsd.own.mk>
-SRCS=	ARMInstPrinter.cpp
+SRCS+=	ARMInstPrinter.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/Target/ARM/InstPrinter
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMARMCodeGen/Makefile b/gnu/usr.bin/clang/libLLVMARMCodeGen/Makefile
index 7a7f4af4e5f..929233adb54 100644
--- a/gnu/usr.bin/clang/libLLVMARMCodeGen/Makefile
+++ b/gnu/usr.bin/clang/libLLVMARMCodeGen/Makefile
@@ -1,13 +1,11 @@
-# $OpenBSD: Makefile,v 1.6 2019/01/27 16:59:41 patrick Exp $
+# $OpenBSD: Makefile,v 1.7 2019/03/05 09:44:39 jsg Exp $
 
 LIB=	LLVMARMCodeGen
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/ARM -I${LLVM_SRCS}/lib/Target/ARM
 
-.include <bsd.own.mk>
-SRCS=	A15SDOptimizer.cpp \
+SRCS+=	A15SDOptimizer.cpp \
 	ARMAsmPrinter.cpp \
 	ARMBaseInstrInfo.cpp \
 	ARMBaseRegisterInfo.cpp \
@@ -47,8 +45,3 @@ SRCS=	A15SDOptimizer.cpp \
 	Thumb2SizeReduction.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/Target/ARM
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMARMDesc/Makefile b/gnu/usr.bin/clang/libLLVMARMDesc/Makefile
index 19f9e229214..33d1330bb12 100644
--- a/gnu/usr.bin/clang/libLLVMARMDesc/Makefile
+++ b/gnu/usr.bin/clang/libLLVMARMDesc/Makefile
@@ -1,13 +1,11 @@
-# $OpenBSD: Makefile,v 1.2 2017/07/09 15:28:34 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:39 jsg Exp $
 
 LIB=	LLVMARMDesc
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/ARM -I${LLVM_SRCS}/lib/Target/ARM
 
-.include <bsd.own.mk>
-SRCS=	ARMAsmBackend.cpp \
+SRCS+=	ARMAsmBackend.cpp \
 	ARMELFObjectWriter.cpp \
 	ARMELFStreamer.cpp \
 	ARMMachObjectWriter.cpp \
@@ -22,8 +20,3 @@ SRCS=	ARMAsmBackend.cpp \
 	ARMWinCOFFStreamer.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/Target/ARM/MCTargetDesc
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMARMDisassembler/Makefile b/gnu/usr.bin/clang/libLLVMARMDisassembler/Makefile
index 755ed0b1e4b..309962f9283 100644
--- a/gnu/usr.bin/clang/libLLVMARMDisassembler/Makefile
+++ b/gnu/usr.bin/clang/libLLVMARMDisassembler/Makefile
@@ -1,17 +1,10 @@
-# $OpenBSD: Makefile,v 1.2 2017/07/09 15:28:34 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:39 jsg Exp $
 
 LIB=	LLVMARMDisassembler
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/ARM -I${LLVM_SRCS}/lib/Target/ARM
 
-.include <bsd.own.mk>
-SRCS=	ARMDisassembler.cpp
+SRCS+=	ARMDisassembler.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/Target/ARM/Disassembler
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMARMInfo/Makefile b/gnu/usr.bin/clang/libLLVMARMInfo/Makefile
index 86590891764..c82e3bd13ad 100644
--- a/gnu/usr.bin/clang/libLLVMARMInfo/Makefile
+++ b/gnu/usr.bin/clang/libLLVMARMInfo/Makefile
@@ -1,17 +1,10 @@
-# $OpenBSD: Makefile,v 1.2 2017/07/09 15:28:34 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:39 jsg Exp $
 
 LIB=	LLVMARMInfo
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/ARM -I${LLVM_SRCS}/lib/Target/ARM
 
-.include <bsd.own.mk>
-SRCS=	ARMTargetInfo.cpp
+SRCS+=	ARMTargetInfo.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/Target/ARM/TargetInfo
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMARMUtils/Makefile b/gnu/usr.bin/clang/libLLVMARMUtils/Makefile
index 2ed49611b85..4dc5803124e 100644
--- a/gnu/usr.bin/clang/libLLVMARMUtils/Makefile
+++ b/gnu/usr.bin/clang/libLLVMARMUtils/Makefile
@@ -1,17 +1,10 @@
-# $OpenBSD: Makefile,v 1.1 2018/04/06 14:44:04 patrick Exp $
+# $OpenBSD: Makefile,v 1.2 2019/03/05 09:44:40 jsg Exp $
 
 LIB=	LLVMARMUtils
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/ARM -I${LLVM_SRCS}/lib/Target/ARM
 
-.include <bsd.own.mk>
-SRCS=	ARMBaseInfo.cpp
+SRCS+=	ARMBaseInfo.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/Target/ARM/Utils
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMAnalysis/Makefile b/gnu/usr.bin/clang/libLLVMAnalysis/Makefile
index 003dd153881..453ed8cedcb 100644
--- a/gnu/usr.bin/clang/libLLVMAnalysis/Makefile
+++ b/gnu/usr.bin/clang/libLLVMAnalysis/Makefile
@@ -1,13 +1,11 @@
-# $OpenBSD: Makefile,v 1.8 2019/02/26 23:39:51 jsg Exp $
+# $OpenBSD: Makefile,v 1.9 2019/03/05 09:44:40 jsg Exp $
 
 LIB=	LLVMAnalysis
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${LLVM_SRCS}/include/llvm/Analysis
 
-.include <bsd.own.mk>
-SRCS=	AliasAnalysis.cpp \
+SRCS+=	AliasAnalysis.cpp \
 	AliasAnalysisEvaluator.cpp \
 	AliasAnalysisSummary.cpp \
 	AliasSetTracker.cpp \
@@ -101,9 +99,4 @@ AnalysisAnalysis.cpp:
 
 .PATH:	${.CURDIR}/../../../llvm/lib/Analysis
 
-install:
-	@# Nothing here so far ...
-
 CLEANFILES+= AnalysisAnalysis.cpp
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMAsmParser/Makefile b/gnu/usr.bin/clang/libLLVMAsmParser/Makefile
index 27ae910df05..84f7d9fc3f7 100644
--- a/gnu/usr.bin/clang/libLLVMAsmParser/Makefile
+++ b/gnu/usr.bin/clang/libLLVMAsmParser/Makefile
@@ -1,19 +1,12 @@
-# $OpenBSD: Makefile,v 1.2 2017/07/09 15:28:34 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:40 jsg Exp $
 
 LIB=	LLVMAsmParser
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${LLVM_SRCS}/include/llvm/Analysis
 
-.include <bsd.own.mk>
-SRCS=	LLLexer.cpp \
+SRCS+=	LLLexer.cpp \
 	LLParser.cpp \
 	Parser.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/AsmParser
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMAsmPrinter/Makefile b/gnu/usr.bin/clang/libLLVMAsmPrinter/Makefile
index 63c10254c0f..0c47c27fe9f 100644
--- a/gnu/usr.bin/clang/libLLVMAsmPrinter/Makefile
+++ b/gnu/usr.bin/clang/libLLVMAsmPrinter/Makefile
@@ -1,11 +1,9 @@
-# $OpenBSD: Makefile,v 1.4 2019/01/27 16:59:41 patrick Exp $
+# $OpenBSD: Makefile,v 1.5 2019/03/05 09:44:40 jsg Exp $
 
 LIB=	LLVMAsmPrinter
-NOPIC=
 NOPROFILE=
 
-.include <bsd.own.mk>
-SRCS=	ARMException.cpp \
+SRCS+=	ARMException.cpp \
 	AccelTable.cpp \
 	AddressPool.cpp \
 	AsmPrinter.cpp \
@@ -31,8 +29,3 @@ SRCS=	ARMException.cpp \
 	WinException.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/CodeGen/AsmPrinter
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMBinaryFormat/Makefile b/gnu/usr.bin/clang/libLLVMBinaryFormat/Makefile
index 03adb5bb9ed..3068ca52ada 100644
--- a/gnu/usr.bin/clang/libLLVMBinaryFormat/Makefile
+++ b/gnu/usr.bin/clang/libLLVMBinaryFormat/Makefile
@@ -1,19 +1,12 @@
-# $OpenBSD: Makefile,v 1.2 2019/01/27 16:59:41 patrick Exp $
+# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:40 jsg Exp $
 
 LIB=	LLVMBinaryFormat
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${LLVM_SRCS}/include/llvm/BinaryFormat
 
-.include <bsd.own.mk>
-SRCS=	Dwarf.cpp \
+SRCS+=	Dwarf.cpp \
 	Magic.cpp \
 	Wasm.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/BinaryFormat
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMBitReader/Makefile b/gnu/usr.bin/clang/libLLVMBitReader/Makefile
index c45ca82f9aa..fa7edd4d4d8 100644
--- a/gnu/usr.bin/clang/libLLVMBitReader/Makefile
+++ b/gnu/usr.bin/clang/libLLVMBitReader/Makefile
@@ -1,21 +1,14 @@
-# $OpenBSD: Makefile,v 1.3 2017/07/09 15:28:34 espie Exp $
+# $OpenBSD: Makefile,v 1.4 2019/03/05 09:44:40 jsg Exp $
 
 LIB=	LLVMBitReader
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${LLVM_SRCS}/include/llvm/Bitcode
 
-.include <bsd.own.mk>
-SRCS=	BitReader.cpp \
+SRCS+=	BitReader.cpp \
 	BitcodeReader.cpp \
 	BitstreamReader.cpp \
 	MetadataLoader.cpp \
 	ValueList.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/Bitcode/Reader
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMBitWriter/Makefile b/gnu/usr.bin/clang/libLLVMBitWriter/Makefile
index 1879d79d4d8..7e4b9ea948c 100644
--- a/gnu/usr.bin/clang/libLLVMBitWriter/Makefile
+++ b/gnu/usr.bin/clang/libLLVMBitWriter/Makefile
@@ -1,18 +1,11 @@
-# $OpenBSD: Makefile,v 1.2 2017/07/09 15:28:34 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:40 jsg Exp $
 
 LIB=	LLVMBitWriter
-NOPIC=
 NOPROFILE=
 
-.include <bsd.own.mk>
-SRCS=	BitWriter.cpp \
+SRCS+=	BitWriter.cpp \
 	BitcodeWriter.cpp \
 	BitcodeWriterPass.cpp \
 	ValueEnumerator.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/Bitcode/Writer
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMCodeGen/Makefile b/gnu/usr.bin/clang/libLLVMCodeGen/Makefile
index 524bcd0c0c1..fec0c4e238a 100644
--- a/gnu/usr.bin/clang/libLLVMCodeGen/Makefile
+++ b/gnu/usr.bin/clang/libLLVMCodeGen/Makefile
@@ -1,14 +1,12 @@
-# $OpenBSD: Makefile,v 1.10 2019/02/26 23:39:51 jsg Exp $
+# $OpenBSD: Makefile,v 1.11 2019/03/05 09:44:40 jsg Exp $
 
 LIB=	LLVMCodeGen
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=-I${LLVM_SRC}/include/llvm/CodeGen
 CPPFLAGS+=-I${LLVM_SRC}/include/llvm/CodeGen/PBQP
 
-.include <bsd.own.mk>
-SRCS=	AggressiveAntiDepBreaker.cpp \
+SRCS+=	AggressiveAntiDepBreaker.cpp \
 	AllocationOrder.cpp \
 	CodeGenAnalysis.cpp \
 	AtomicExpandPass.cpp \
@@ -180,9 +178,4 @@ CodeGenLowLevelType.cpp:
 
 .PATH:	${.CURDIR}/../../../llvm/lib/CodeGen
 
-install:
-	@# Nothing here so far ...
-
 CLEANFILES+= CodeGenAnalysis.cpp CodeGenLowLevelType.cpp
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMCore/Makefile b/gnu/usr.bin/clang/libLLVMCore/Makefile
index ed10902af34..65df68f050d 100644
--- a/gnu/usr.bin/clang/libLLVMCore/Makefile
+++ b/gnu/usr.bin/clang/libLLVMCore/Makefile
@@ -1,13 +1,11 @@
-# $OpenBSD: Makefile,v 1.7 2019/02/26 23:39:51 jsg Exp $
+# $OpenBSD: Makefile,v 1.8 2019/03/05 09:44:40 jsg Exp $
 
 LIB=	LLVMCore
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${LLVM_SRCS}/include/llvm/IR
 
-.include <bsd.own.mk>
-SRCS=	AsmWriter.cpp \
+SRCS+=	AsmWriter.cpp \
 	Attributes.cpp \
 	AutoUpgrade.cpp \
 	BasicBlock.cpp \
@@ -72,9 +70,4 @@ AttributesCompatFunc.inc: AttributesCompatFunc.td
 		-I${LLVM_SRCS}/include \
 		-o ${.TARGET} ${.ALLSRC}
 
-install:
-	@# Nothing here so far ...
-
 CLEANFILES+= CoreCore.cpp
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMCoroutines/Makefile b/gnu/usr.bin/clang/libLLVMCoroutines/Makefile
index 27e8df77d2c..ba8e17fcfb3 100644
--- a/gnu/usr.bin/clang/libLLVMCoroutines/Makefile
+++ b/gnu/usr.bin/clang/libLLVMCoroutines/Makefile
@@ -1,14 +1,12 @@
-# $OpenBSD: Makefile,v 1.2 2017/07/09 15:28:35 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:40 jsg Exp $
 
 LIB=	LLVMCoroutines
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${LLVM_SRCS}/include/llvm/Transforms
 CPPFLAGS+=	-I${LLVM_SRCS}/include/llvm/Transforms/Coroutines
 
-.include <bsd.own.mk>
-SRCS=	Coroutines.cpp \
+SRCS+=	Coroutines.cpp \
 	CoroCleanup.cpp \
 	CoroEarly.cpp \
 	CoroElide.cpp \
@@ -16,8 +14,3 @@ SRCS=	Coroutines.cpp \
 	CoroSplit.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/Transforms/Coroutines
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMCoverage/Makefile b/gnu/usr.bin/clang/libLLVMCoverage/Makefile
index 73021b68f01..17a7f476ce4 100644
--- a/gnu/usr.bin/clang/libLLVMCoverage/Makefile
+++ b/gnu/usr.bin/clang/libLLVMCoverage/Makefile
@@ -1,19 +1,12 @@
-# $OpenBSD: Makefile,v 1.2 2017/07/09 15:28:35 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:40 jsg Exp $
 
 LIB=	LLVMCoverage
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${LLVM_SRCS}/include/llvm/ProfileData/Coverage
 
-.include <bsd.own.mk>
-SRCS=	CoverageMapping.cpp \
+SRCS+=	CoverageMapping.cpp \
 	CoverageMappingReader.cpp \
 	CoverageMappingWriter.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/ProfileData/Coverage
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMDebugInfoCodeView/Makefile b/gnu/usr.bin/clang/libLLVMDebugInfoCodeView/Makefile
index a1637041aca..a82464b980c 100644
--- a/gnu/usr.bin/clang/libLLVMDebugInfoCodeView/Makefile
+++ b/gnu/usr.bin/clang/libLLVMDebugInfoCodeView/Makefile
@@ -1,13 +1,11 @@
-# $OpenBSD: Makefile,v 1.7 2019/02/26 23:39:51 jsg Exp $
+# $OpenBSD: Makefile,v 1.8 2019/03/05 09:44:40 jsg Exp $
 
 LIB=	LLVMDebugInfoCodeView
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${LLVM_SRCS}/include/llvm/DebugInfo/CodeView
 
-.include <bsd.own.mk>
-SRCS=	AppendingTypeTableBuilder.cpp \
+SRCS+=	AppendingTypeTableBuilder.cpp \
 	CodeViewError.cpp \
 	CodeViewRecordIO.cpp \
 	ContinuationRecordBuilder.cpp \
@@ -51,9 +49,4 @@ DebugInfoCodeViewEnumTables.cpp:
 
 .PATH:	${.CURDIR}/../../../llvm/lib/DebugInfo/CodeView
 
-install:
-	@# Nothing here so far ...
-
 CLEANFILES+= DebugInfoCodeViewEnumTables.cpp
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMDebugInfoDWARF/Makefile b/gnu/usr.bin/clang/libLLVMDebugInfoDWARF/Makefile
index d50f8479be3..d47804a4784 100644
--- a/gnu/usr.bin/clang/libLLVMDebugInfoDWARF/Makefile
+++ b/gnu/usr.bin/clang/libLLVMDebugInfoDWARF/Makefile
@@ -1,13 +1,11 @@
-# $OpenBSD: Makefile,v 1.5 2019/01/27 16:59:41 patrick Exp $
+# $OpenBSD: Makefile,v 1.6 2019/03/05 09:44:40 jsg Exp $
 
 LIB=	LLVMDebugInfoDWARF
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${LLVM_SRCS}/include/llvm/DebugInfo/DWARF
 
-.include <bsd.own.mk>
-SRCS=	DWARFAbbreviationDeclaration.cpp \
+SRCS+=	DWARFAbbreviationDeclaration.cpp \
 	DWARFAcceleratorTable.cpp \
 	DWARFAddressRange.cpp \
 	DWARFCompileUnit.cpp \
@@ -36,8 +34,3 @@ SRCS=	DWARFAbbreviationDeclaration.cpp \
 	DWARFVerifier.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/DebugInfo/DWARF
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMDebugInfoMSF/Makefile b/gnu/usr.bin/clang/libLLVMDebugInfoMSF/Makefile
index d16edc7eddf..fc4f1bcadf5 100644
--- a/gnu/usr.bin/clang/libLLVMDebugInfoMSF/Makefile
+++ b/gnu/usr.bin/clang/libLLVMDebugInfoMSF/Makefile
@@ -1,20 +1,13 @@
-# $OpenBSD: Makefile,v 1.3 2017/10/04 20:57:09 patrick Exp $
+# $OpenBSD: Makefile,v 1.4 2019/03/05 09:44:40 jsg Exp $
 
 LIB=	LLVMDebugInfoMSF
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${LLVM_SRCS}/include/llvm/DebugInfo/MSF
 
-.include <bsd.own.mk>
-SRCS=	MappedBlockStream.cpp \
+SRCS+=	MappedBlockStream.cpp \
 	MSFBuilder.cpp \
 	MSFCommon.cpp \
 	MSFError.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/DebugInfo/MSF
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMDebugInfoPDB/Makefile b/gnu/usr.bin/clang/libLLVMDebugInfoPDB/Makefile
index c73117cd569..8e942743685 100644
--- a/gnu/usr.bin/clang/libLLVMDebugInfoPDB/Makefile
+++ b/gnu/usr.bin/clang/libLLVMDebugInfoPDB/Makefile
@@ -1,13 +1,11 @@
-# $OpenBSD: Makefile,v 1.2 2019/02/26 23:39:51 jsg Exp $
+# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:40 jsg Exp $
 
 LIB=	LLVMDebugInfoPDB
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${LLVM_SRCS}/include/llvm/DebugInfo/PDB
 
-.include <bsd.own.mk>
-SRCS=	DbiModuleDescriptor.cpp \
+SRCS+=	DbiModuleDescriptor.cpp \
 	DbiModuleDescriptorBuilder.cpp \
 	DbiModuleList.cpp \
 	DbiStream.cpp \
@@ -86,9 +84,4 @@ DebugInfoPDBEnumTables.cpp:
 .PATH:	${.CURDIR}/../../../llvm/lib/DebugInfo/PDB
 .PATH:	${.CURDIR}/../../../llvm/lib/DebugInfo/PDB/Native
 
-install:
-	@# Nothing here so far ...
-
 CLEANFILES+= DebugInfoPDBEnumTables.cpp
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMDemangle/Makefile b/gnu/usr.bin/clang/libLLVMDemangle/Makefile
index 57132f40bdc..0a5e11455aa 100644
--- a/gnu/usr.bin/clang/libLLVMDemangle/Makefile
+++ b/gnu/usr.bin/clang/libLLVMDemangle/Makefile
@@ -1,17 +1,10 @@
-# $OpenBSD: Makefile,v 1.2 2017/07/09 15:28:35 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:40 jsg Exp $
 
 LIB=	LLVMDemangle
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${LLVM_SRCS}/include/llvm/Demangle
 
-.include <bsd.own.mk>
-SRCS=	ItaniumDemangle.cpp
+SRCS+=	ItaniumDemangle.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/Demangle
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMExecutionEngine/Makefile b/gnu/usr.bin/clang/libLLVMExecutionEngine/Makefile
index dee11834094..2546566dcb8 100644
--- a/gnu/usr.bin/clang/libLLVMExecutionEngine/Makefile
+++ b/gnu/usr.bin/clang/libLLVMExecutionEngine/Makefile
@@ -1,13 +1,11 @@
-# $OpenBSD: Makefile,v 1.3 2019/02/26 23:39:51 jsg Exp $
+# $OpenBSD: Makefile,v 1.4 2019/03/05 09:44:40 jsg Exp $
 
 LIB=	LLVMExecutionEngine
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${LLVM_SRCS}/include/llvm/ExecutionEngine
 
-.include <bsd.own.mk>
-SRCS=	Execution.cpp \
+SRCS+=	Execution.cpp \
 	ExecutionEngine.cpp \
 	ExecutionEngineCore.cpp \
 	ExecutionEngineBindings.cpp \
@@ -45,9 +43,4 @@ ExecutionEngineCore.cpp:
 .PATH:	${.CURDIR}/../../../llvm/lib/ExecutionEngine/RuntimeDyld
 .PATH:	${.CURDIR}/../../../llvm/lib/ExecutionEngine/RuntimeDyld/Targets
 
-install:
-	@# Nothing here so far ...
-
 CLEANFILES+= ExecutionEngineCore.cpp
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMGlobalISel/Makefile b/gnu/usr.bin/clang/libLLVMGlobalISel/Makefile
index 00ef1d1c2f9..a502c22a3f3 100644
--- a/gnu/usr.bin/clang/libLLVMGlobalISel/Makefile
+++ b/gnu/usr.bin/clang/libLLVMGlobalISel/Makefile
@@ -1,11 +1,9 @@
-# $OpenBSD: Makefile,v 1.5 2019/02/26 23:39:51 jsg Exp $
+# $OpenBSD: Makefile,v 1.6 2019/03/05 09:44:40 jsg Exp $
 
 LIB=	LLVMGlobalISel
-NOPIC=
 NOPROFILE=
 
-.include <bsd.own.mk>
-SRCS=	CallLowering.cpp \
+SRCS+=	CallLowering.cpp \
 	GlobalISel.cpp \
 	IRTranslator.cpp \
 	InstructionSelect.cpp \
@@ -27,9 +25,4 @@ GlobalISelUtils.cpp:
 
 .PATH:	${.CURDIR}/../../../llvm/lib/CodeGen/GlobalISel
 
-install:
-	@# Nothing here so far ...
-
 CLEANFILES+= GlobalISelUtils.cpp
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMIRReader/Makefile b/gnu/usr.bin/clang/libLLVMIRReader/Makefile
index 00c5622a777..26cdda2aaf6 100644
--- a/gnu/usr.bin/clang/libLLVMIRReader/Makefile
+++ b/gnu/usr.bin/clang/libLLVMIRReader/Makefile
@@ -1,17 +1,10 @@
-# $OpenBSD: Makefile,v 1.2 2017/07/09 15:28:35 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:40 jsg Exp $
 
 LIB=	LLVMIRReader
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${LLVM_SRCS}/include/llvm/IRReader
 
-.include <bsd.own.mk>
-SRCS=	IRReader.cpp
+SRCS+=	IRReader.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/IRReader
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMInstCombine/Makefile b/gnu/usr.bin/clang/libLLVMInstCombine/Makefile
index e69faa97c14..c15a0524a5f 100644
--- a/gnu/usr.bin/clang/libLLVMInstCombine/Makefile
+++ b/gnu/usr.bin/clang/libLLVMInstCombine/Makefile
@@ -1,15 +1,13 @@
-# $OpenBSD: Makefile,v 1.3 2019/01/27 16:59:41 patrick Exp $
+# $OpenBSD: Makefile,v 1.4 2019/03/05 09:44:40 jsg Exp $
 
 LIB=	LLVMInstCombine
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${LLVM_SRCS}/include/llvm/Transforms
 CPPFLAGS+=	-I${LLVM_SRCS}/include/llvm/Transforms/InstCombine
 CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/Transforms/InstCombine
 
-.include <bsd.own.mk>
-SRCS=	AggressiveInstCombine.cpp \
+SRCS+=	AggressiveInstCombine.cpp \
 	InstructionCombining.cpp \
 	InstCombineAddSub.cpp \
 	InstCombineAndOrXor.cpp \
@@ -27,8 +25,3 @@ SRCS=	AggressiveInstCombine.cpp \
 
 .PATH:	${.CURDIR}/../../../llvm/lib/Transforms/InstCombine
 .PATH:	${.CURDIR}/../../../llvm/lib/Transforms/AggressiveInstCombine
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMInstrumentation/Makefile b/gnu/usr.bin/clang/libLLVMInstrumentation/Makefile
index e6b9ebcb792..7c75aa6b217 100644
--- a/gnu/usr.bin/clang/libLLVMInstrumentation/Makefile
+++ b/gnu/usr.bin/clang/libLLVMInstrumentation/Makefile
@@ -1,13 +1,11 @@
-# $OpenBSD: Makefile,v 1.6 2019/01/27 16:59:41 patrick Exp $
+# $OpenBSD: Makefile,v 1.7 2019/03/05 09:44:40 jsg Exp $
 
 LIB=	LLVMInstrumentation
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${LLVM_SRCS}/include/llvm/Transforms
 
-.include <bsd.own.mk>
-SRCS=	AddressSanitizer.cpp \
+SRCS+=	AddressSanitizer.cpp \
 	BoundsChecking.cpp \
 	CGProfile.cpp \
 	DataFlowSanitizer.cpp \
@@ -24,8 +22,3 @@ SRCS=	AddressSanitizer.cpp \
 	ThreadSanitizer.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/Transforms/Instrumentation
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMLTO/Makefile b/gnu/usr.bin/clang/libLLVMLTO/Makefile
index 48490845ff5..9a427a7909f 100644
--- a/gnu/usr.bin/clang/libLLVMLTO/Makefile
+++ b/gnu/usr.bin/clang/libLLVMLTO/Makefile
@@ -1,13 +1,11 @@
-# $OpenBSD: Makefile,v 1.4 2017/10/04 20:57:09 patrick Exp $
+# $OpenBSD: Makefile,v 1.5 2019/03/05 09:44:40 jsg Exp $
 
 LIB=	LLVMLTO
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${LLVM_SRCS}/include/llvm/LTO
 
-.include <bsd.own.mk>
-SRCS=	Caching.cpp \
+SRCS+=	Caching.cpp \
 	LTO.cpp \
 	LTOBackend.cpp \
 	LTOCodeGenerator.cpp \
@@ -16,8 +14,3 @@ SRCS=	Caching.cpp \
 	ThinLTOCodeGenerator.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/LTO
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMLinker/Makefile b/gnu/usr.bin/clang/libLLVMLinker/Makefile
index afc561aa93a..b9d615bb7a3 100644
--- a/gnu/usr.bin/clang/libLLVMLinker/Makefile
+++ b/gnu/usr.bin/clang/libLLVMLinker/Makefile
@@ -1,18 +1,11 @@
-# $OpenBSD: Makefile,v 1.2 2017/07/09 15:28:35 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:40 jsg Exp $
 
 LIB=	LLVMLinker
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${LLVM_SRCS}/include/llvm/Linker
 
-.include <bsd.own.mk>
-SRCS=	IRMover.cpp \
+SRCS+=	IRMover.cpp \
 	LinkModules.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/Linker
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMMC/Makefile b/gnu/usr.bin/clang/libLLVMMC/Makefile
index 9ca2e7f6add..7cbfe00986b 100644
--- a/gnu/usr.bin/clang/libLLVMMC/Makefile
+++ b/gnu/usr.bin/clang/libLLVMMC/Makefile
@@ -1,13 +1,11 @@
-# $OpenBSD: Makefile,v 1.6 2019/01/27 16:59:41 patrick Exp $
+# $OpenBSD: Makefile,v 1.7 2019/03/05 09:44:40 jsg Exp $
 
 LIB=	LLVMMC
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${LLVM_SRCS}/include/llvm/MC
 
-.include <bsd.own.mk>
-SRCS=	ConstantPools.cpp \
+SRCS+=	ConstantPools.cpp \
 	ELFObjectWriter.cpp \
 	MCAsmBackend.cpp \
 	MCAsmInfo.cpp \
@@ -62,8 +60,3 @@ SRCS=	ConstantPools.cpp \
 	WinCOFFObjectWriter.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/MC
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMMCDisassembler/Makefile b/gnu/usr.bin/clang/libLLVMMCDisassembler/Makefile
index fa5e789fa2b..1287a41ee69 100644
--- a/gnu/usr.bin/clang/libLLVMMCDisassembler/Makefile
+++ b/gnu/usr.bin/clang/libLLVMMCDisassembler/Makefile
@@ -1,19 +1,12 @@
-# $OpenBSD: Makefile,v 1.3 2018/10/04 11:43:29 patrick Exp $
+# $OpenBSD: Makefile,v 1.4 2019/03/05 09:44:41 jsg Exp $
 
 LIB=	LLVMMCDisassembler
-NOPIC=
 NOPROFILE=
 
-.include <bsd.own.mk>
-SRCS=	Disassembler.cpp \
+SRCS+=	Disassembler.cpp \
 	MCDisassembler.cpp \
 	MCExternalSymbolizer.cpp \
 	MCRelocationInfo.cpp \
 	MCSymbolizer.cpp \
 
 .PATH:	${.CURDIR}/../../../llvm/lib/MC/MCDisassembler
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMMCParser/Makefile b/gnu/usr.bin/clang/libLLVMMCParser/Makefile
index b8d212b09dc..db42330d38b 100644
--- a/gnu/usr.bin/clang/libLLVMMCParser/Makefile
+++ b/gnu/usr.bin/clang/libLLVMMCParser/Makefile
@@ -1,13 +1,11 @@
-# $OpenBSD: Makefile,v 1.2 2017/07/09 15:28:35 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:41 jsg Exp $
 
 LIB=	LLVMMCParser
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${LLVM_SRCS}/include/llvm/MC/MCParser
 
-.include <bsd.own.mk>
-SRCS=	AsmLexer.cpp \
+SRCS+=	AsmLexer.cpp \
 	AsmParser.cpp \
 	COFFAsmParser.cpp \
 	DarwinAsmParser.cpp \
@@ -18,8 +16,3 @@ SRCS=	AsmLexer.cpp \
 	MCTargetAsmParser.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/MC/MCParser
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMMIRParser/Makefile b/gnu/usr.bin/clang/libLLVMMIRParser/Makefile
index e4ffaa8ce39..f3ddfdfec17 100644
--- a/gnu/usr.bin/clang/libLLVMMIRParser/Makefile
+++ b/gnu/usr.bin/clang/libLLVMMIRParser/Makefile
@@ -1,17 +1,10 @@
-# $OpenBSD: Makefile,v 1.2 2017/07/09 15:28:35 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:41 jsg Exp $
 
 LIB=	LLVMMIRParser
-NOPIC=
 NOPROFILE=
 
-.include <bsd.own.mk>
-SRCS=	MILexer.cpp \
+SRCS+=	MILexer.cpp \
 	MIParser.cpp \
 	MIRParser.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/CodeGen/MIRParser
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMMipsAsmParser/Makefile b/gnu/usr.bin/clang/libLLVMMipsAsmParser/Makefile
index 381bbc5affd..288d9b81749 100644
--- a/gnu/usr.bin/clang/libLLVMMipsAsmParser/Makefile
+++ b/gnu/usr.bin/clang/libLLVMMipsAsmParser/Makefile
@@ -1,18 +1,11 @@
-# $OpenBSD: Makefile,v 1.2 2017/07/09 15:28:35 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:41 jsg Exp $
 
 LIB=	LLVMMipsAsmParser
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/Mips \
 		-I${LLVM_SRCS}/lib/Target/Mips
 
-.include <bsd.own.mk>
-SRCS=	MipsAsmParser.cpp
+SRCS+=	MipsAsmParser.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/Target/Mips/AsmParser
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMMipsAsmPrinter/Makefile b/gnu/usr.bin/clang/libLLVMMipsAsmPrinter/Makefile
index d085891bac9..344bfd18f50 100644
--- a/gnu/usr.bin/clang/libLLVMMipsAsmPrinter/Makefile
+++ b/gnu/usr.bin/clang/libLLVMMipsAsmPrinter/Makefile
@@ -1,17 +1,10 @@
-# $OpenBSD: Makefile,v 1.2 2017/07/09 15:28:35 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:41 jsg Exp $
 
 LIB=	LLVMMipsAsmPrinter
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/Mips -I${LLVM_SRCS}/lib/Target/Mips
 
-.include <bsd.own.mk>
-SRCS=	MipsInstPrinter.cpp
+SRCS+=	MipsInstPrinter.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/Target/Mips/InstPrinter
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMMipsCodeGen/Makefile b/gnu/usr.bin/clang/libLLVMMipsCodeGen/Makefile
index 77c4a88fbef..27b13b91ba2 100644
--- a/gnu/usr.bin/clang/libLLVMMipsCodeGen/Makefile
+++ b/gnu/usr.bin/clang/libLLVMMipsCodeGen/Makefile
@@ -1,13 +1,11 @@
-# $OpenBSD: Makefile,v 1.4 2019/01/27 16:59:41 patrick Exp $
+# $OpenBSD: Makefile,v 1.5 2019/03/05 09:44:41 jsg Exp $
 
 LIB=	LLVMMipsCodeGen
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/Mips -I${LLVM_SRCS}/lib/Target/Mips
 
-.include <bsd.own.mk>
-SRCS=	MicroMipsSizeReduction.cpp \
+SRCS+=	MicroMipsSizeReduction.cpp \
 	Mips16FrameLowering.cpp \
 	Mips16HardFloat.cpp \
 	Mips16HardFloatInfo.cpp \
@@ -47,8 +45,3 @@ SRCS=	MicroMipsSizeReduction.cpp \
 	MipsTargetObjectFile.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/Target/Mips
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMMipsDesc/Makefile b/gnu/usr.bin/clang/libLLVMMipsDesc/Makefile
index b6ff0aaa0c6..d1ebae8670e 100644
--- a/gnu/usr.bin/clang/libLLVMMipsDesc/Makefile
+++ b/gnu/usr.bin/clang/libLLVMMipsDesc/Makefile
@@ -1,13 +1,11 @@
-# $OpenBSD: Makefile,v 1.2 2017/07/09 15:28:35 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:41 jsg Exp $
 
 LIB=	LLVMMipsDesc
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/Mips -I${LLVM_SRCS}/lib/Target/Mips
 
-.include <bsd.own.mk>
-SRCS=	MipsABIInfo.cpp \
+SRCS+=	MipsABIInfo.cpp \
 	MipsABIFlagsSection.cpp \
 	MipsAsmBackend.cpp \
 	MipsELFObjectWriter.cpp \
@@ -21,8 +19,3 @@ SRCS=	MipsABIInfo.cpp \
 	MipsTargetStreamer.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/Target/Mips/MCTargetDesc
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMMipsDisassembler/Makefile b/gnu/usr.bin/clang/libLLVMMipsDisassembler/Makefile
index c1ec190bb67..e431e0de10b 100644
--- a/gnu/usr.bin/clang/libLLVMMipsDisassembler/Makefile
+++ b/gnu/usr.bin/clang/libLLVMMipsDisassembler/Makefile
@@ -1,17 +1,10 @@
-# $OpenBSD: Makefile,v 1.2 2017/07/09 15:28:35 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:41 jsg Exp $
 
 LIB=	LLVMMipsDisassembler
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/Mips -I${LLVM_SRCS}/lib/Target/Mips
 
-.include <bsd.own.mk>
-SRCS=	MipsDisassembler.cpp
+SRCS+=	MipsDisassembler.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/Target/Mips/Disassembler
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMMipsInfo/Makefile b/gnu/usr.bin/clang/libLLVMMipsInfo/Makefile
index f73fcebb1e7..ffb1d892d08 100644
--- a/gnu/usr.bin/clang/libLLVMMipsInfo/Makefile
+++ b/gnu/usr.bin/clang/libLLVMMipsInfo/Makefile
@@ -1,17 +1,10 @@
-# $OpenBSD: Makefile,v 1.2 2017/07/09 15:28:35 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:41 jsg Exp $
 
 LIB=	LLVMMipsInfo
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/Mips -I${LLVM_SRCS}/lib/Target/Mips
 
-.include <bsd.own.mk>
-SRCS=	MipsTargetInfo.cpp
+SRCS+=	MipsTargetInfo.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/Target/Mips/TargetInfo
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMObjCARCOpts/Makefile b/gnu/usr.bin/clang/libLLVMObjCARCOpts/Makefile
index 93265a45d21..51b5dd66a0f 100644
--- a/gnu/usr.bin/clang/libLLVMObjCARCOpts/Makefile
+++ b/gnu/usr.bin/clang/libLLVMObjCARCOpts/Makefile
@@ -1,13 +1,11 @@
-# $OpenBSD: Makefile,v 1.2 2017/07/09 15:28:35 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:41 jsg Exp $
 
 LIB=	LLVMObjCARCOpts
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${LLVM_SRCS}/include/llvm/Transforms
 
-.include <bsd.own.mk>
-SRCS=	ObjCARC.cpp \
+SRCS+=	ObjCARC.cpp \
 	ObjCARCOpts.cpp \
 	ObjCARCExpand.cpp \
 	ObjCARCAPElim.cpp \
@@ -18,8 +16,3 @@ SRCS=	ObjCARC.cpp \
 	PtrState.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/Transforms/ObjCARC
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMObject/Makefile b/gnu/usr.bin/clang/libLLVMObject/Makefile
index a45aabc7b1b..b84439eb38b 100644
--- a/gnu/usr.bin/clang/libLLVMObject/Makefile
+++ b/gnu/usr.bin/clang/libLLVMObject/Makefile
@@ -1,13 +1,11 @@
-# $OpenBSD: Makefile,v 1.6 2019/02/26 23:39:51 jsg Exp $
+# $OpenBSD: Makefile,v 1.7 2019/03/05 09:44:41 jsg Exp $
 
 LIB=	LLVMObject
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${LLVM_SRCS}/include/llvm/Object
 
-.include <bsd.own.mk>
-SRCS=	Archive.cpp \
+SRCS+=	Archive.cpp \
 	ArchiveWriter.cpp \
 	Binary.cpp \
 	COFFObjectFile.cpp \
@@ -33,9 +31,4 @@ ObjectError.cpp:
 
 .PATH:	${.CURDIR}/../../../llvm/lib/Object
 
-install:
-	@# Nothing here so far ...
-
 CLEANFILES+= ObjectError.cpp
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMOption/Makefile b/gnu/usr.bin/clang/libLLVMOption/Makefile
index 3ada099988c..36ee1f5ad54 100644
--- a/gnu/usr.bin/clang/libLLVMOption/Makefile
+++ b/gnu/usr.bin/clang/libLLVMOption/Makefile
@@ -1,20 +1,13 @@
-# $OpenBSD: Makefile,v 1.2 2017/07/09 15:28:35 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:41 jsg Exp $
 
 LIB=	LLVMOption
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${LLVM_SRCS}/include/llvm/Option
 
-.include <bsd.own.mk>
-SRCS=	Arg.cpp \
+SRCS+=	Arg.cpp \
 	ArgList.cpp \
 	Option.cpp \
 	OptTable.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/Option
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMPasses/Makefile b/gnu/usr.bin/clang/libLLVMPasses/Makefile
index 3bd0c32184b..948cca4f917 100644
--- a/gnu/usr.bin/clang/libLLVMPasses/Makefile
+++ b/gnu/usr.bin/clang/libLLVMPasses/Makefile
@@ -1,17 +1,10 @@
-# $OpenBSD: Makefile,v 1.2 2017/07/09 15:28:35 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:41 jsg Exp $
 
 LIB=	LLVMPasses
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${LLVM_SRCS}/include/llvm/Passes
 
-.include <bsd.own.mk>
-SRCS=	PassBuilder.cpp
+SRCS+=	PassBuilder.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/Passes
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMPowerPCAsmParser/Makefile b/gnu/usr.bin/clang/libLLVMPowerPCAsmParser/Makefile
index 9c5c4fa06aa..fd32106d1de 100644
--- a/gnu/usr.bin/clang/libLLVMPowerPCAsmParser/Makefile
+++ b/gnu/usr.bin/clang/libLLVMPowerPCAsmParser/Makefile
@@ -1,18 +1,11 @@
-# $OpenBSD: Makefile,v 1.2 2017/07/09 15:28:35 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:41 jsg Exp $
 
 LIB=	LLVMPowerPCAsmParser
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=      -I${.OBJDIR}/../include/llvm/PowerPC \
 		-I${LLVM_SRCS}/lib/Target/PowerPC
 
-.include <bsd.own.mk>
-SRCS=	PPCAsmParser.cpp
+SRCS+=	PPCAsmParser.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/Target/PowerPC/AsmParser
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMPowerPCAsmPrinter/Makefile b/gnu/usr.bin/clang/libLLVMPowerPCAsmPrinter/Makefile
index 618f791cf86..ec3cc9ab722 100644
--- a/gnu/usr.bin/clang/libLLVMPowerPCAsmPrinter/Makefile
+++ b/gnu/usr.bin/clang/libLLVMPowerPCAsmPrinter/Makefile
@@ -1,18 +1,11 @@
-# $OpenBSD: Makefile,v 1.2 2017/07/09 15:28:35 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:41 jsg Exp $
 
 LIB=	LLVMPowerPCAsmPrinter
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=      -I${.OBJDIR}/../include/llvm/PowerPC \
 		-I${LLVM_SRCS}/lib/Target/PowerPC
 
-.include <bsd.own.mk>
-SRCS=	PPCInstPrinter.cpp
+SRCS+=	PPCInstPrinter.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/Target/PowerPC/InstPrinter
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMPowerPCCodeGen/Makefile b/gnu/usr.bin/clang/libLLVMPowerPCCodeGen/Makefile
index da4f3f48d19..050d227549b 100644
--- a/gnu/usr.bin/clang/libLLVMPowerPCCodeGen/Makefile
+++ b/gnu/usr.bin/clang/libLLVMPowerPCCodeGen/Makefile
@@ -1,14 +1,12 @@
-# $OpenBSD: Makefile,v 1.5 2018/04/06 14:44:04 patrick Exp $
+# $OpenBSD: Makefile,v 1.6 2019/03/05 09:44:41 jsg Exp $
 
 LIB=	LLVMPowerPCCodeGen
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/PowerPC \
 		-I${LLVM_SRCS}/lib/Target/PowerPC
 
-.include <bsd.own.mk>
-SRCS=	PPCBoolRetToInt.cpp \
+SRCS+=	PPCBoolRetToInt.cpp \
 	PPCAsmPrinter.cpp \
 	PPCBranchCoalescing.cpp \
 	PPCBranchSelector.cpp \
@@ -41,8 +39,3 @@ SRCS=	PPCBoolRetToInt.cpp \
 	PPCVSXSwapRemoval.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/Target/PowerPC
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMPowerPCDesc/Makefile b/gnu/usr.bin/clang/libLLVMPowerPCDesc/Makefile
index 8eb3548b4a0..4a3204b3f0e 100644
--- a/gnu/usr.bin/clang/libLLVMPowerPCDesc/Makefile
+++ b/gnu/usr.bin/clang/libLLVMPowerPCDesc/Makefile
@@ -1,14 +1,12 @@
-# $OpenBSD: Makefile,v 1.2 2017/07/09 15:28:35 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:41 jsg Exp $
 
 LIB=	LLVMPowerPCDesc
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=      -I${.OBJDIR}/../include/llvm/PowerPC \
 		-I${LLVM_SRCS}/lib/Target/PowerPC
 
-.include <bsd.own.mk>
-SRCS=	PPCAsmBackend.cpp \
+SRCS+=	PPCAsmBackend.cpp \
 	PPCMCTargetDesc.cpp \
 	PPCMCAsmInfo.cpp \
 	PPCMCCodeEmitter.cpp \
@@ -18,8 +16,3 @@ SRCS=	PPCAsmBackend.cpp \
 	PPCELFObjectWriter.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/Target/PowerPC/MCTargetDesc
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMPowerPCDisassembler/Makefile b/gnu/usr.bin/clang/libLLVMPowerPCDisassembler/Makefile
index a2d3d3f9965..59ec8e91124 100644
--- a/gnu/usr.bin/clang/libLLVMPowerPCDisassembler/Makefile
+++ b/gnu/usr.bin/clang/libLLVMPowerPCDisassembler/Makefile
@@ -1,18 +1,11 @@
-# $OpenBSD: Makefile,v 1.2 2017/07/09 15:28:35 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:41 jsg Exp $
 
 LIB=	LLVMPowerPCDisassembler
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=      -I${.OBJDIR}/../include/llvm/PowerPC \
 		-I${LLVM_SRCS}/lib/Target/PowerPC
 
-.include <bsd.own.mk>
-SRCS=	PPCDisassembler.cpp
+SRCS+=	PPCDisassembler.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/Target/PowerPC/Disassembler
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMPowerPCInfo/Makefile b/gnu/usr.bin/clang/libLLVMPowerPCInfo/Makefile
index 22f8ddb0787..87aa585cad0 100644
--- a/gnu/usr.bin/clang/libLLVMPowerPCInfo/Makefile
+++ b/gnu/usr.bin/clang/libLLVMPowerPCInfo/Makefile
@@ -1,18 +1,11 @@
-# $OpenBSD: Makefile,v 1.2 2017/07/09 15:28:35 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:41 jsg Exp $
 
 LIB=	LLVMPowerPCInfo
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=      -I${.OBJDIR}/../include/llvm/PowerPC \
 		-I${LLVM_SRCS}/lib/Target/PowerPC
 
-.include <bsd.own.mk>
-SRCS=	PowerPCTargetInfo.cpp
+SRCS+=	PowerPCTargetInfo.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/Target/PowerPC/TargetInfo
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMProfileData/Makefile b/gnu/usr.bin/clang/libLLVMProfileData/Makefile
index 5a0cb0af935..c61269c11bd 100644
--- a/gnu/usr.bin/clang/libLLVMProfileData/Makefile
+++ b/gnu/usr.bin/clang/libLLVMProfileData/Makefile
@@ -1,13 +1,11 @@
-# $OpenBSD: Makefile,v 1.3 2017/07/09 15:28:35 espie Exp $
+# $OpenBSD: Makefile,v 1.4 2019/03/05 09:44:41 jsg Exp $
 
 LIB=	LLVMProfileData
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${LLVM_SRCS}/include/llvm/ProfileData
 
-.include <bsd.own.mk>
-SRCS=	InstrProf.cpp \
+SRCS+=	InstrProf.cpp \
 	InstrProfReader.cpp \
 	InstrProfWriter.cpp \
 	ProfileSummaryBuilder.cpp \
@@ -16,8 +14,3 @@ SRCS=	InstrProf.cpp \
 	SampleProfWriter.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/ProfileData
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMScalarOpts/Makefile b/gnu/usr.bin/clang/libLLVMScalarOpts/Makefile
index 8e13c26b8d9..1c7e7eb595d 100644
--- a/gnu/usr.bin/clang/libLLVMScalarOpts/Makefile
+++ b/gnu/usr.bin/clang/libLLVMScalarOpts/Makefile
@@ -1,14 +1,12 @@
-# $OpenBSD: Makefile,v 1.9 2019/02/26 23:39:51 jsg Exp $
+# $OpenBSD: Makefile,v 1.10 2019/03/05 09:44:41 jsg Exp $
 
 LIB=	LLVMScalarOpts
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${LLVM_SRCS}/include/llvm/Transforms
 CPPFLAGS+=	-I${LLVM_SRCS}/include/llvm/Transforms/Scalar
 
-.include <bsd.own.mk>
-SRCS=	ADCE.cpp \
+SRCS+=	ADCE.cpp \
 	AlignmentFromAssumptions.cpp \
 	BDCE.cpp \
 	CallSiteSplitting.cpp \
@@ -83,9 +81,4 @@ ScalarSCCP.cpp:
 
 .PATH:	${.CURDIR}/../../../llvm/lib/Transforms/Scalar
 
-install:
-	@# Nothing here so far ...
-
 CLEANFILES+= ScalarSCCP.cpp
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMSelectionDAG/Makefile b/gnu/usr.bin/clang/libLLVMSelectionDAG/Makefile
index 908c32af3e2..244efd92c1c 100644
--- a/gnu/usr.bin/clang/libLLVMSelectionDAG/Makefile
+++ b/gnu/usr.bin/clang/libLLVMSelectionDAG/Makefile
@@ -1,11 +1,9 @@
-# $OpenBSD: Makefile,v 1.4 2017/10/04 20:57:09 patrick Exp $
+# $OpenBSD: Makefile,v 1.5 2019/03/05 09:44:41 jsg Exp $
 
 LIB=	LLVMSelectionDAG
-NOPIC=
 NOPROFILE=
 
-.include <bsd.own.mk>
-SRCS=	DAGCombiner.cpp \
+SRCS+=	DAGCombiner.cpp \
 	FastISel.cpp \
 	FunctionLoweringInfo.cpp \
 	InstrEmitter.cpp \
@@ -32,8 +30,3 @@ SRCS=	DAGCombiner.cpp \
 	TargetLowering.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/CodeGen/SelectionDAG
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMSparcAsmParser/Makefile b/gnu/usr.bin/clang/libLLVMSparcAsmParser/Makefile
index a605dc1ad86..9a5b9d29847 100644
--- a/gnu/usr.bin/clang/libLLVMSparcAsmParser/Makefile
+++ b/gnu/usr.bin/clang/libLLVMSparcAsmParser/Makefile
@@ -1,18 +1,11 @@
-# $OpenBSD: Makefile,v 1.2 2017/07/09 15:28:35 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:41 jsg Exp $
 
 LIB=	LLVMSparcAsmParser
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/Sparc \
 		-I${LLVM_SRCS}/lib/Target/Sparc
 
-.include <bsd.own.mk>
-SRCS=	SparcAsmParser.cpp
+SRCS+=	SparcAsmParser.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/Target/Sparc/AsmParser
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMSparcAsmPrinter/Makefile b/gnu/usr.bin/clang/libLLVMSparcAsmPrinter/Makefile
index 8495b62b955..b43688b9f5f 100644
--- a/gnu/usr.bin/clang/libLLVMSparcAsmPrinter/Makefile
+++ b/gnu/usr.bin/clang/libLLVMSparcAsmPrinter/Makefile
@@ -1,18 +1,11 @@
-# $OpenBSD: Makefile,v 1.2 2017/07/09 15:28:35 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:42 jsg Exp $
 
 LIB=	LLVMSparcAsmPrinter
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/Sparc \
 		-I${LLVM_SRCS}/lib/Target/Sparc
 
-.include <bsd.own.mk>
-SRCS=	SparcInstPrinter.cpp
+SRCS+=	SparcInstPrinter.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/Target/Sparc/InstPrinter
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMSparcCodeGen/Makefile b/gnu/usr.bin/clang/libLLVMSparcCodeGen/Makefile
index 4ae28b00d4c..fd0fec1a0a7 100644
--- a/gnu/usr.bin/clang/libLLVMSparcCodeGen/Makefile
+++ b/gnu/usr.bin/clang/libLLVMSparcCodeGen/Makefile
@@ -1,14 +1,12 @@
-# $OpenBSD: Makefile,v 1.3 2017/07/09 15:28:35 espie Exp $
+# $OpenBSD: Makefile,v 1.4 2019/03/05 09:44:42 jsg Exp $
 
 LIB=	LLVMSparcCodeGen
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/Sparc \
 		-I${LLVM_SRCS}/lib/Target/Sparc
 
-.include <bsd.own.mk>
-SRCS=	DelaySlotFiller.cpp \
+SRCS+=	DelaySlotFiller.cpp \
 	LeonPasses.cpp \
 	SparcAsmPrinter.cpp \
 	SparcInstrInfo.cpp \
@@ -23,8 +21,3 @@ SRCS=	DelaySlotFiller.cpp \
 	SparcTargetObjectFile.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/Target/Sparc
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMSparcDesc/Makefile b/gnu/usr.bin/clang/libLLVMSparcDesc/Makefile
index fb79c0c2b82..788b218aea1 100644
--- a/gnu/usr.bin/clang/libLLVMSparcDesc/Makefile
+++ b/gnu/usr.bin/clang/libLLVMSparcDesc/Makefile
@@ -1,14 +1,12 @@
-# $OpenBSD: Makefile,v 1.2 2017/07/09 15:28:35 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:42 jsg Exp $
 
 LIB=	LLVMSparcDesc
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/Sparc \
 		-I${LLVM_SRCS}/lib/Target/Sparc
 
-.include <bsd.own.mk>
-SRCS=	SparcAsmBackend.cpp \
+SRCS+=	SparcAsmBackend.cpp \
 	SparcELFObjectWriter.cpp \
 	SparcMCAsmInfo.cpp \
 	SparcMCCodeEmitter.cpp \
@@ -17,8 +15,3 @@ SRCS=	SparcAsmBackend.cpp \
 	SparcTargetStreamer.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/Target/Sparc/MCTargetDesc
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMSparcDisassembler/Makefile b/gnu/usr.bin/clang/libLLVMSparcDisassembler/Makefile
index 078baf0bbb0..a5aa5f97248 100644
--- a/gnu/usr.bin/clang/libLLVMSparcDisassembler/Makefile
+++ b/gnu/usr.bin/clang/libLLVMSparcDisassembler/Makefile
@@ -1,18 +1,11 @@
-# $OpenBSD: Makefile,v 1.2 2017/07/09 15:28:35 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:42 jsg Exp $
 
 LIB=	LLVMSparcDisassembler
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/Sparc \
 		-I${LLVM_SRCS}/lib/Target/Sparc
 
-.include <bsd.own.mk>
-SRCS=	SparcDisassembler.cpp
+SRCS+=	SparcDisassembler.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/Target/Sparc/Disassembler
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMSparcInfo/Makefile b/gnu/usr.bin/clang/libLLVMSparcInfo/Makefile
index 029d66af7b5..eda4f914fcf 100644
--- a/gnu/usr.bin/clang/libLLVMSparcInfo/Makefile
+++ b/gnu/usr.bin/clang/libLLVMSparcInfo/Makefile
@@ -1,18 +1,11 @@
-# $OpenBSD: Makefile,v 1.2 2017/07/09 15:28:35 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:42 jsg Exp $
 
 LIB=	LLVMSparcInfo
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/Sparc \
 		-I${LLVM_SRCS}/lib/Target/Sparc
 
-.include <bsd.own.mk>
-SRCS=	SparcTargetInfo.cpp
+SRCS+=	SparcTargetInfo.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/Target/Sparc/TargetInfo
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMSupport/Makefile.shared b/gnu/usr.bin/clang/libLLVMSupport/Makefile.shared
new file mode 100644
index 00000000000..7bc0ff12335
--- /dev/null
+++ b/gnu/usr.bin/clang/libLLVMSupport/Makefile.shared
@@ -0,0 +1,133 @@
+# $OpenBSD: Makefile.shared,v 1.1 2019/03/05 09:44:42 jsg Exp $
+
+LIB=	LLVMSupport
+
+NOPROFILE=
+
+CPPFLAGS+=	-I${LLVM_SRCS}/include/llvm/Support
+
+
+SRCS+=	AMDGPUMetadata.cpp \
+	APFloat.cpp \
+	APInt.cpp \
+	APSInt.cpp \
+	ARMAttributeParser.cpp \
+	ARMBuildAttrs.cpp \
+	ARMWinEH.cpp \
+	Allocator.cpp \
+	BinaryStreamError.cpp \
+	BinaryStreamReader.cpp \
+	BinaryStreamRef.cpp \
+	BinaryStreamWriter.cpp \
+	BlockFrequency.cpp \
+	BranchProbability.cpp \
+	circular_raw_ostream.cpp \
+	COM.cpp \
+	CachePruning.cpp \
+	Chrono.cpp \
+	CodeGenCoverage.cpp \
+	CommandLine.cpp \
+	Compression.cpp \
+	ConvertUTF.cpp \
+	ConvertUTFWrapper.cpp \
+	CrashRecoveryContext.cpp \
+	DAGDeltaAlgorithm.cpp \
+	DJB.cpp \
+	DataExtractor.cpp \
+	Debug.cpp \
+	DebugCounter.cpp \
+	DeltaAlgorithm.cpp \
+	SupportError.cpp \
+	ErrorHandling.cpp \
+	FileUtilities.cpp \
+	FileOutputBuffer.cpp \
+	FoldingSet.cpp \
+	FormatVariadic.cpp \
+	FormattedStream.cpp \
+	GlobPattern.cpp \
+	GraphWriter.cpp \
+	Hashing.cpp \
+	InitLLVM.cpp \
+	IntEqClasses.cpp \
+	IntervalMap.cpp \
+	JSON.cpp \
+	JamCRC.cpp \
+	KnownBits.cpp \
+	LEB128.cpp \
+	LineIterator.cpp \
+	Locale.cpp \
+	LockFileManager.cpp \
+	SupportLowLevelType.cpp \
+	ManagedStatic.cpp \
+	MathExtras.cpp \
+	MemoryBuffer.cpp \
+	MD5.cpp \
+	NativeFormatting.cpp \
+	Options.cpp \
+	Parallel.cpp \
+	PluginLoader.cpp \
+	PrettyStackTrace.cpp \
+	RandomNumberGenerator.cpp \
+	Regex.cpp \
+	ScaledNumber.cpp \
+	ScopedPrinter.cpp \
+	SHA1.cpp \
+	SmallPtrSet.cpp \
+	SmallVector.cpp \
+	SourceMgr.cpp \
+	SpecialCaseList.cpp \
+	Statistic.cpp \
+	StringExtras.cpp \
+	StringMap.cpp \
+	StringPool.cpp \
+	StringSaver.cpp \
+	StringRef.cpp \
+	SystemUtils.cpp \
+	TarWriter.cpp \
+	TargetParser.cpp \
+	ThreadPool.cpp \
+	Timer.cpp \
+	ToolOutputFile.cpp \
+	TrigramIndex.cpp \
+	Triple.cpp \
+	Twine.cpp \
+	Unicode.cpp \
+	YAMLParser.cpp \
+	YAMLTraits.cpp \
+	raw_os_ostream.cpp \
+	raw_ostream.cpp \
+	regcomp.c \
+	regerror.c \
+	regexec.c \
+	regfree.c \
+	regstrlcpy.c \
+	Atomic.cpp \
+	DynamicLibrary.cpp \
+	Errno.cpp \
+	Host.cpp \
+	Memory.cpp \
+	Mutex.cpp \
+	Path.cpp \
+	Process.cpp \
+	Program.cpp \
+	RWMutex.cpp \
+	Signals.cpp \
+	TargetRegistry.cpp \
+	ThreadLocal.cpp \
+	Threading.cpp \
+	UnicodeCaseFold.cpp \
+	Valgrind.cpp \
+	VersionTuple.cpp \
+	Watchdog.cpp \
+	WithColor.cpp \
+	xxhash.cpp
+
+SupportError.cpp:
+	ln -s ${LLVM_SRCS}/lib/Support/Error.cpp $@
+
+SupportLowLevelType.cpp:
+	ln -s ${LLVM_SRCS}/lib/Support/LowLevelType.cpp $@
+
+.PATH:	${.CURDIR}/../../../llvm/lib/Support
+
+CLEANFILES+= SupportError.cpp SupportLowLevelType.cpp
diff --git a/gnu/usr.bin/clang/libLLVMTableGen/Makefile.shared b/gnu/usr.bin/clang/libLLVMTableGen/Makefile.shared
new file mode 100644
index 00000000000..bdd62e90e2f
--- /dev/null
+++ b/gnu/usr.bin/clang/libLLVMTableGen/Makefile.shared
@@ -0,0 +1,25 @@
+# $OpenBSD: Makefile.shared,v 1.1 2019/03/05 09:44:42 jsg Exp $
+
+LIB=	LLVMTableGen
+
+NOPROFILE=
+
+CPPFLAGS+=	-I${LLVM_SRCS}/include/llvm/TableGen
+
+
+SRCS+=	TableGenError.cpp \
+	Main.cpp \
+	JSONBackend.cpp \
+	Record.cpp \
+	SetTheory.cpp \
+	StringMatcher.cpp \
+	TableGenBackend.cpp \
+	TGLexer.cpp \
+	TGParser.cpp
+
+TableGenError.cpp:
+	ln -s ${LLVM_SRCS}/lib/TableGen/Error.cpp $@
+
+.PATH:	${.CURDIR}/../../../llvm/lib/TableGen
+
+CLEANFILES+= TableGenError.cpp
diff --git a/gnu/usr.bin/clang/libLLVMTarget/Makefile b/gnu/usr.bin/clang/libLLVMTarget/Makefile
index 522a7de6f93..bbfb77f93cb 100644
--- a/gnu/usr.bin/clang/libLLVMTarget/Makefile
+++ b/gnu/usr.bin/clang/libLLVMTarget/Makefile
@@ -1,21 +1,14 @@
-# $OpenBSD: Makefile,v 1.3 2017/07/09 15:28:35 espie Exp $
+# $OpenBSD: Makefile,v 1.4 2019/03/05 09:44:42 jsg Exp $
 
 LIB=	LLVMTarget
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${LLVM_SRCS}/include/llvm/Target
 
-.include <bsd.own.mk>
-SRCS=	Target.cpp \
+SRCS+=	Target.cpp \
 	TargetIntrinsicInfo.cpp \
 	TargetLoweringObjectFile.cpp \
 	TargetMachine.cpp \
 	TargetMachineC.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/Target
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMTransformUtils/Makefile b/gnu/usr.bin/clang/libLLVMTransformUtils/Makefile
index bf432ef62f5..454e9a12acd 100644
--- a/gnu/usr.bin/clang/libLLVMTransformUtils/Makefile
+++ b/gnu/usr.bin/clang/libLLVMTransformUtils/Makefile
@@ -1,14 +1,12 @@
-# $OpenBSD: Makefile,v 1.9 2019/02/26 23:39:51 jsg Exp $
+# $OpenBSD: Makefile,v 1.10 2019/03/05 09:44:42 jsg Exp $
 
 LIB=	LLVMTransformUtils
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${LLVM_SRCS}/include/llvm/Transforms
 CPPFLAGS+=	-I${LLVM_SRCS}/include/llvm/Transforms/Utils
 
-.include <bsd.own.mk>
-SRCS=	ASanStackFrameLayout.cpp \
+SRCS+=	ASanStackFrameLayout.cpp \
 	AddDiscriminators.cpp \
 	BasicBlockUtils.cpp \
 	BreakCriticalEdges.cpp \
@@ -71,9 +69,4 @@ TransformUtilsUtils.cpp:
 
 .PATH:	${.CURDIR}/../../../llvm/lib/Transforms/Utils
 
-install:
-	@# Nothing here so far ...
-
 CLEANFILES+= TransformUtilsUtils.cpp
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMVectorize/Makefile b/gnu/usr.bin/clang/libLLVMVectorize/Makefile
index 5d4138823d2..752a23a9a98 100644
--- a/gnu/usr.bin/clang/libLLVMVectorize/Makefile
+++ b/gnu/usr.bin/clang/libLLVMVectorize/Makefile
@@ -1,13 +1,11 @@
-# $OpenBSD: Makefile,v 1.6 2019/01/27 16:59:42 patrick Exp $
+# $OpenBSD: Makefile,v 1.7 2019/03/05 09:44:42 jsg Exp $
 
 LIB=	LLVMVectorize
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${LLVM_SRCS}/include/llvm/Transforms
 
-.include <bsd.own.mk>
-SRCS=	LoadStoreVectorizer.cpp \
+SRCS+=	LoadStoreVectorizer.cpp \
 	LoopVectorizationLegality.cpp \
 	LoopVectorize.cpp \
 	SLPVectorizer.cpp \
@@ -17,8 +15,3 @@ SRCS=	LoadStoreVectorizer.cpp \
 	Vectorize.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/Transforms/Vectorize
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMX86AsmParser/Makefile b/gnu/usr.bin/clang/libLLVMX86AsmParser/Makefile
index dcaf589059b..f9ad34c1561 100644
--- a/gnu/usr.bin/clang/libLLVMX86AsmParser/Makefile
+++ b/gnu/usr.bin/clang/libLLVMX86AsmParser/Makefile
@@ -1,18 +1,11 @@
-# $OpenBSD: Makefile,v 1.2 2017/07/09 15:28:35 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:42 jsg Exp $
 
 LIB=	LLVMX86AsmParser
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/X86 -I${LLVM_SRCS}/lib/Target/X86
 
-.include <bsd.own.mk>
-SRCS=	X86AsmInstrumentation.cpp \
+SRCS+=	X86AsmInstrumentation.cpp \
 	X86AsmParser.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/Target/X86/AsmParser
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMX86AsmPrinter/Makefile b/gnu/usr.bin/clang/libLLVMX86AsmPrinter/Makefile
index de22d47d83d..7e7acb1ac06 100644
--- a/gnu/usr.bin/clang/libLLVMX86AsmPrinter/Makefile
+++ b/gnu/usr.bin/clang/libLLVMX86AsmPrinter/Makefile
@@ -1,20 +1,13 @@
-# $OpenBSD: Makefile,v 1.3 2019/01/27 16:59:42 patrick Exp $
+# $OpenBSD: Makefile,v 1.4 2019/03/05 09:44:42 jsg Exp $
 
 LIB=	LLVMX86AsmPrinter
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/X86 -I${LLVM_SRCS}/lib/Target/X86
 
-.include <bsd.own.mk>
-SRCS=	X86ATTInstPrinter.cpp \
+SRCS+=	X86ATTInstPrinter.cpp \
 	X86InstPrinterCommon.cpp \
 	X86IntelInstPrinter.cpp \
 	X86InstComments.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/Target/X86/InstPrinter
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMX86CodeGen/Makefile b/gnu/usr.bin/clang/libLLVMX86CodeGen/Makefile
index a5e747537c4..6d2be0b7668 100644
--- a/gnu/usr.bin/clang/libLLVMX86CodeGen/Makefile
+++ b/gnu/usr.bin/clang/libLLVMX86CodeGen/Makefile
@@ -1,13 +1,11 @@
-# $OpenBSD: Makefile,v 1.11 2019/01/27 16:59:42 patrick Exp $
+# $OpenBSD: Makefile,v 1.12 2019/03/05 09:44:42 jsg Exp $
 
 LIB=	LLVMX86CodeGen
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/X86 -I${LLVM_SRCS}/lib/Target/X86
 
-.include <bsd.own.mk>
-SRCS=	ShadowCallStack.cpp\
+SRCS+=	ShadowCallStack.cpp\
 	X86AsmPrinter.cpp \
 	X86AvoidStoreForwardingBlocks.cpp \
 	X86CallFrameOptimization.cpp \
@@ -55,8 +53,3 @@ SRCS=	ShadowCallStack.cpp\
 	X86OptimizeLEAs.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/Target/X86
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMX86Desc/Makefile b/gnu/usr.bin/clang/libLLVMX86Desc/Makefile
index e49c41c34a5..963199549a6 100644
--- a/gnu/usr.bin/clang/libLLVMX86Desc/Makefile
+++ b/gnu/usr.bin/clang/libLLVMX86Desc/Makefile
@@ -1,13 +1,11 @@
-# $OpenBSD: Makefile,v 1.4 2018/04/06 14:44:04 patrick Exp $
+# $OpenBSD: Makefile,v 1.5 2019/03/05 09:44:42 jsg Exp $
 
 LIB=	LLVMX86Desc
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/X86 -I${LLVM_SRCS}/lib/Target/X86
 
-.include <bsd.own.mk>
-SRCS=	X86AsmBackend.cpp \
+SRCS+=	X86AsmBackend.cpp \
 	X86MCTargetDesc.cpp \
 	X86MCAsmInfo.cpp \
 	X86MCCodeEmitter.cpp \
@@ -18,8 +16,3 @@ SRCS=	X86AsmBackend.cpp \
 	X86WinCOFFTargetStreamer.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/Target/X86/MCTargetDesc
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMX86Disassembler/Makefile b/gnu/usr.bin/clang/libLLVMX86Disassembler/Makefile
index a109eed1777..90e82767fe9 100644
--- a/gnu/usr.bin/clang/libLLVMX86Disassembler/Makefile
+++ b/gnu/usr.bin/clang/libLLVMX86Disassembler/Makefile
@@ -1,18 +1,11 @@
-# $OpenBSD: Makefile,v 1.2 2017/07/09 15:28:35 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:42 jsg Exp $
 
 LIB=	LLVMX86Disassembler
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/X86 -I${LLVM_SRCS}/lib/Target/X86
 
-.include <bsd.own.mk>
-SRCS=	X86Disassembler.cpp \
+SRCS+=	X86Disassembler.cpp \
 	X86DisassemblerDecoder.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/Target/X86/Disassembler
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMX86Info/Makefile b/gnu/usr.bin/clang/libLLVMX86Info/Makefile
index cee1072f845..d691206a30a 100644
--- a/gnu/usr.bin/clang/libLLVMX86Info/Makefile
+++ b/gnu/usr.bin/clang/libLLVMX86Info/Makefile
@@ -1,17 +1,10 @@
-# $OpenBSD: Makefile,v 1.2 2017/07/09 15:28:35 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:42 jsg Exp $
 
 LIB=	LLVMX86Info
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/X86 -I${LLVM_SRCS}/lib/Target/X86
 
-.include <bsd.own.mk>
-SRCS=	X86TargetInfo.cpp
+SRCS+=	X86TargetInfo.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/Target/X86/TargetInfo
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMX86Utils/Makefile b/gnu/usr.bin/clang/libLLVMX86Utils/Makefile
index 065652d2041..4b896dbd977 100644
--- a/gnu/usr.bin/clang/libLLVMX86Utils/Makefile
+++ b/gnu/usr.bin/clang/libLLVMX86Utils/Makefile
@@ -1,17 +1,10 @@
-# $OpenBSD: Makefile,v 1.2 2017/07/09 15:28:35 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:42 jsg Exp $
 
 LIB=	LLVMX86Utils
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${.OBJDIR}/../include/llvm/X86 -I${LLVM_SRCS}/lib/Target/X86
 
-.include <bsd.own.mk>
-SRCS=	X86ShuffleDecode.cpp
+SRCS+=	X86ShuffleDecode.cpp
 
 .PATH:	${.CURDIR}/../../../llvm/lib/Target/X86/Utils
-
-install:
-	@# Nothing here so far ...
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMipo/Makefile b/gnu/usr.bin/clang/libLLVMipo/Makefile
index d1e0084ca9d..c1fc902adff 100644
--- a/gnu/usr.bin/clang/libLLVMipo/Makefile
+++ b/gnu/usr.bin/clang/libLLVMipo/Makefile
@@ -1,14 +1,12 @@
-# $OpenBSD: Makefile,v 1.9 2019/02/26 23:39:51 jsg Exp $
+# $OpenBSD: Makefile,v 1.10 2019/03/05 09:44:42 jsg Exp $
 
 LIB=	LLVMipo
-NOPIC=
 NOPROFILE=
 
 CPPFLAGS+=	-I${LLVM_SRCS}/include/llvm/Transforms
 CPPFLAGS+=	-I${LLVM_SRCS}/include/llvm/Transforms/IPO
 
-.include <bsd.own.mk>
-SRCS=	ArgumentPromotion.cpp \
+SRCS+=	ArgumentPromotion.cpp \
 	AlwaysInliner.cpp \
 	BarrierNoopPass.cpp \
 	BlockExtractor.cpp \
@@ -49,9 +47,4 @@ ipoSCCP.cpp:
 
 .PATH:	${.CURDIR}/../../../llvm/lib/Transforms/IPO
 
-install:
-	@# Nothing here so far ...
-
 CLEANFILES+= ipoSCCP.cpp
-
-.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/llc/Makefile b/gnu/usr.bin/clang/llc/Makefile
index 7d631e67c2c..f2f3b468dbc 100644
--- a/gnu/usr.bin/clang/llc/Makefile
+++ b/gnu/usr.bin/clang/llc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2017/04/17 19:58:53 pascal Exp $
+# $OpenBSD: Makefile,v 1.3 2019/03/05 09:44:42 jsg Exp $
 
 PROG=	llc
 NOMAN=
@@ -7,33 +7,9 @@ SRCS=	llc.cpp
 
 .PATH: ${.CURDIR}/../../../llvm/tools/llc
 
-LLVM_LIBDEPS=	LLVMMIRParser \
-		LLVMIRReader \
-		LLVMAsmParser \
-		${BACKEND_DISASSEMBLER} \
-		${BACKEND_ASMPARSER} \
-		${BACKEND_CODEGEN} \
-		LLVMSelectionDAG \
-		LLVMAsmPrinter \
-		LLVMCodeGen \
-		LLVMTarget \
-		LLVMScalarOpts \
-		LLVMInstCombine \
-		LLVMInstrumentation \
-		LLVMProfileData \
-		LLVMTransformUtils \
-		LLVMBitWriter \
-		LLVMAnalysis \
-		${BACKEND_DESC} \
-		LLVMObject \
-		LLVMMCParser \
-		LLVMBitReader \
-		LLVMMCDisassembler \
-		${BACKEND_INFO} \
-		${BACKEND_ASMPRINTER} \
-		LLVMMC \
-		${BACKEND_UTILS} \
-		LLVMCore \
-		LLVMSupport
+LLVM_LIBDEPS=
+
+DPADD+= ${.OBJDIR}/../libLLVM/libLLVM.a
+LDADD+= ${.OBJDIR}/../libLLVM/libLLVM.a
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/clang/lld/Makefile b/gnu/usr.bin/clang/lld/Makefile
index 130ef1c1558..7d167f34b94 100644
--- a/gnu/usr.bin/clang/lld/Makefile
+++ b/gnu/usr.bin/clang/lld/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2018/07/26 13:20:53 kettenis Exp $
+# $OpenBSD: Makefile,v 1.15 2019/03/05 09:44:42 jsg Exp $
 
 .include <bsd.own.mk>
 
@@ -20,47 +20,9 @@ CPPFLAGS+=	-I${.CURDIR}/../../../llvm/tools/lld/include
 
 LLVM_LIBDEPS=	lldELF \
 		lldCommon \
-		lldCore \
-		LLVMLTO \
-		LLVMPasses \
-		LLVMOption \
-		LLVMObjCARCOpts \
-		LLVMipo \
-		LLVMVectorize \
-		LLVMLinker \
-		LLVMIRReader \
-		LLVMAsmParser \
-		${BACKEND_ASMPARSER} \
-		${BACKEND_CODEGEN} \
-		LLVMSelectionDAG \
-		LLVMAsmPrinter \
-		LLVMCodeGen \
-		LLVMTarget \
-		LLVMScalarOpts \
-		LLVMInstCombine \
-		LLVMInstrumentation \
-		LLVMProfileData \
-		LLVMCoverage \
-		LLVMDebugInfoCodeView \
-		LLVMDebugInfoDWARF \
-		LLVMDebugInfoMSF \
-		LLVMGlobalISel \
-		LLVMTransformUtils \
-		LLVMCoroutines \
-		LLVMDemangle \
-		LLVMBitWriter \
-		LLVMAnalysis \
-		${BACKEND_DESC} \
-		LLVMObject \
-		LLVMMCParser \
-		LLVMBitReader \
-		LLVMMCDisassembler \
-		${BACKEND_INFO} \
-		${BACKEND_ASMPRINTER} \
-		LLVMMC \
-		${BACKEND_UTILS} \
-		LLVMBinaryFormat \
-		LLVMCore \
-		LLVMSupport
+		lldCore
+
+DPADD+= ${.OBJDIR}/../libLLVM/libLLVM.a
+LDADD+= ${.OBJDIR}/../libLLVM/libLLVM.a
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/clang/lldb/Makefile b/gnu/usr.bin/clang/lldb/Makefile
index 8c093c2376a..ba77345fdc0 100644
--- a/gnu/usr.bin/clang/lldb/Makefile
+++ b/gnu/usr.bin/clang/lldb/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2019/01/27 22:42:14 patrick Exp $
+# $OpenBSD: Makefile,v 1.5 2019/03/05 09:44:42 jsg Exp $
 
 .include <bsd.own.mk>
 
@@ -18,51 +18,7 @@ CPPFLAGS+=	${CLANG_INCLUDES}
 .PATH:	${.CURDIR}/../../../llvm/tools/lldb/tools/driver
 .PATH:	${.CURDIR}/../../../llvm/tools/lldb/docs
 
-LLVM_LIBDEPS=	${BACKEND_ASMPARSER} \
-		${BACKEND_ASMPRINTER} \
-		${BACKEND_CODEGEN} \
-		${BACKEND_DESC} \
-		${BACKEND_DISASSEMBLER} \
-		${BACKEND_INFO} \
-		${BACKEND_UTILS} \
-		LLVMAnalysis \
-		LLVMAsmParser \
-		LLVMAsmPrinter \
-		LLVMBinaryFormat \
-		LLVMBitReader \
-		LLVMBitWriter \
-		LLVMCodeGen \
-		LLVMCore \
-		LLVMCoroutines \
-		LLVMCoverage \
-		LLVMDebugInfoCodeView \
-		LLVMDebugInfoDWARF \
-		LLVMDebugInfoMSF \
-		LLVMDebugInfoPDB \
-		LLVMDemangle \
-		LLVMExecutionEngine \
-		LLVMGlobalISel \
-		LLVMIRReader \
-		LLVMInstCombine \
-		LLVMInstrumentation \
-		LLVMLTO \
-		LLVMLinker \
-		LLVMMC \
-		LLVMMCDisassembler \
-		LLVMMCParser \
-		LLVMObjCARCOpts \
-		LLVMObject \
-		LLVMOption \
-		LLVMPasses \
-		LLVMProfileData \
-		LLVMScalarOpts \
-		LLVMSelectionDAG \
-		LLVMSupport \
-		LLVMTarget \
-		LLVMTransformUtils \
-		LLVMVectorize \
-		LLVMipo \
-		clangAST \
+LLVM_LIBDEPS=	clangAST \
 		clangAnalysis \
 		clangBasic \
 		clangBasicTargets \
@@ -112,6 +68,8 @@ LLVM_LIBDEPS=	${BACKEND_ASMPARSER} \
 		lldbPluginUnwindAssembly \
 		lldbSymbol \
 		lldbTarget \
-		lldbUtility \
+		lldbUtility
+
+LDADD+= -L ${.OBJDIR}/../libLLVM -lLLVM
 
 .include <bsd.prog.mk>