In preparation for reusing libLLVM component library Makefiles to build

libLLVM from a single directory avoid reused filenames by symlinking
duplicated names with a prefix of the component library name so object
file names will be unique.

symlink approach suggested by deraadt@ ok patrick@

13 files changed, 100 insertions, 29 deletions

diff --git a/gnu/usr.bin/clang/libLLVMAnalysis/Makefile b/gnu/usr.bin/clang/libLLVMAnalysis/Makefile
index 1bc298fd34b..003dd153881 100644
--- a/gnu/usr.bin/clang/libLLVMAnalysis/Makefile
+++ b/gnu/usr.bin/clang/libLLVMAnalysis/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2019/01/27 16:59:41 patrick Exp $
+# $OpenBSD: Makefile,v 1.8 2019/02/26 23:39:51 jsg Exp $
 
 LIB=	LLVMAnalysis
 NOPIC=
@@ -11,7 +11,7 @@ SRCS=	AliasAnalysis.cpp \
 	AliasAnalysisEvaluator.cpp \
 	AliasAnalysisSummary.cpp \
 	AliasSetTracker.cpp \
-	Analysis.cpp \
+	AnalysisAnalysis.cpp \
 	AssumptionCache.cpp \
 	BasicAliasAnalysis.cpp \
 	BlockFrequencyInfo.cpp \
@@ -96,9 +96,14 @@ SRCS=	AliasAnalysis.cpp \
 	ValueTracking.cpp \
 	VectorUtils.cpp
 
+AnalysisAnalysis.cpp:
+	ln -s ${LLVM_SRCS}/lib/Analysis/Analysis.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/libLLVMCodeGen/Makefile b/gnu/usr.bin/clang/libLLVMCodeGen/Makefile
index 3cf270e9422..524bcd0c0c1 100644
--- a/gnu/usr.bin/clang/libLLVMCodeGen/Makefile
+++ b/gnu/usr.bin/clang/libLLVMCodeGen/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2019/01/27 16:59:41 patrick Exp $
+# $OpenBSD: Makefile,v 1.10 2019/02/26 23:39:51 jsg Exp $
 
 LIB=	LLVMCodeGen
 NOPIC=
@@ -10,7 +10,7 @@ CPPFLAGS+=-I${LLVM_SRC}/include/llvm/CodeGen/PBQP
 .include <bsd.own.mk>
 SRCS=	AggressiveAntiDepBreaker.cpp \
 	AllocationOrder.cpp \
-	Analysis.cpp \
+	CodeGenAnalysis.cpp \
 	AtomicExpandPass.cpp \
 	BasicTargetTransformInfo.cpp \
 	BranchFolding.cpp \
@@ -67,7 +67,7 @@ SRCS=	AggressiveAntiDepBreaker.cpp \
 	LiveVariables.cpp \
 	LocalStackSlotAllocation.cpp \
 	LoopTraversal.cpp \
-	LowLevelType.cpp \
+	CodeGenLowLevelType.cpp \
 	LowerEmuTLS.cpp \
 	MachineBasicBlock.cpp \
 	MachineBlockFrequencyInfo.cpp \
@@ -172,9 +172,17 @@ SRCS=	AggressiveAntiDepBreaker.cpp \
 	WinEHPrepare.cpp \
 	XRayInstrumentation.cpp
 
+CodeGenAnalysis.cpp:
+	ln -s ${LLVM_SRCS}/lib/CodeGen/Analysis.cpp $@
+
+CodeGenLowLevelType.cpp:
+	ln -s ${LLVM_SRCS}/lib/CodeGen/LowLevelType.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 9e61e0bd870..ed10902af34 100644
--- a/gnu/usr.bin/clang/libLLVMCore/Makefile
+++ b/gnu/usr.bin/clang/libLLVMCore/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2019/02/25 14:40:16 jsg Exp $
+# $OpenBSD: Makefile,v 1.7 2019/02/26 23:39:51 jsg Exp $
 
 LIB=	LLVMCore
 NOPIC=
@@ -15,7 +15,7 @@ SRCS=	AsmWriter.cpp \
 	ConstantFold.cpp \
 	ConstantRange.cpp \
 	Constants.cpp \
-	Core.cpp \
+	CoreCore.cpp \
 	DIBuilder.cpp \
 	DataLayout.cpp \
 	DebugInfo.cpp \
@@ -59,6 +59,9 @@ SRCS=	AsmWriter.cpp \
 	ValueSymbolTable.cpp \
 	Verifier.cpp
 
+CoreCore.cpp:
+	ln -s ${LLVM_SRCS}/lib/IR/Core.cpp $@
+
 .PATH:	${.CURDIR}/../../../llvm/lib/IR
 
 Attributes.o: AttributesCompatFunc.inc
@@ -72,4 +75,6 @@ AttributesCompatFunc.inc: AttributesCompatFunc.td
 install:
 	@# Nothing here so far ...
 
+CLEANFILES+= CoreCore.cpp
+
 .include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMDebugInfoCodeView/Makefile b/gnu/usr.bin/clang/libLLVMDebugInfoCodeView/Makefile
index f9267e8544a..a1637041aca 100644
--- a/gnu/usr.bin/clang/libLLVMDebugInfoCodeView/Makefile
+++ b/gnu/usr.bin/clang/libLLVMDebugInfoCodeView/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2018/10/04 11:43:29 patrick Exp $
+# $OpenBSD: Makefile,v 1.7 2019/02/26 23:39:51 jsg Exp $
 
 LIB=	LLVMDebugInfoCodeView
 NOPIC=
@@ -25,7 +25,7 @@ SRCS=	AppendingTypeTableBuilder.cpp \
 	DebugSubsectionVisitor.cpp \
 	DebugSymbolRVASubsection.cpp \
 	DebugSymbolsSubsection.cpp \
-	EnumTables.cpp \
+	DebugInfoCodeViewEnumTables.cpp \
 	Formatters.cpp \
 	GlobalTypeTableBuilder.cpp \
 	LazyRandomTypeCollection.cpp \
@@ -46,9 +46,14 @@ SRCS=	AppendingTypeTableBuilder.cpp \
 	TypeStreamMerger.cpp \
 	TypeTableCollection.cpp
 
+DebugInfoCodeViewEnumTables.cpp:
+	ln -s ${LLVM_SRCS}/lib/DebugInfo/CodeView/EnumTables.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/libLLVMDebugInfoPDB/Makefile b/gnu/usr.bin/clang/libLLVMDebugInfoPDB/Makefile
index 49ffc1e4db8..c73117cd569 100644
--- a/gnu/usr.bin/clang/libLLVMDebugInfoPDB/Makefile
+++ b/gnu/usr.bin/clang/libLLVMDebugInfoPDB/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2018/10/04 11:43:29 patrick Exp $
+# $OpenBSD: Makefile,v 1.2 2019/02/26 23:39:51 jsg Exp $
 
 LIB=	LLVMDebugInfoPDB
 NOPIC=
@@ -12,7 +12,7 @@ SRCS=	DbiModuleDescriptor.cpp \
 	DbiModuleList.cpp \
 	DbiStream.cpp \
 	DbiStreamBuilder.cpp \
-	EnumTables.cpp \
+	DebugInfoPDBEnumTables.cpp \
 	GSIStreamBuilder.cpp \
 	GenericError.cpp \
 	GlobalsStream.cpp \
@@ -80,10 +80,15 @@ SRCS=	DbiModuleDescriptor.cpp \
 	TpiStreamBuilder.cpp \
 	UDTLayout.cpp \
 
+DebugInfoPDBEnumTables.cpp:
+	ln -s ${LLVM_SRCS}/lib/DebugInfo/PDB/Native/EnumTables.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/libLLVMExecutionEngine/Makefile b/gnu/usr.bin/clang/libLLVMExecutionEngine/Makefile
index 820222629be..dee11834094 100644
--- a/gnu/usr.bin/clang/libLLVMExecutionEngine/Makefile
+++ b/gnu/usr.bin/clang/libLLVMExecutionEngine/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2019/02/25 14:40:16 jsg Exp $
+# $OpenBSD: Makefile,v 1.3 2019/02/26 23:39:51 jsg Exp $
 
 LIB=	LLVMExecutionEngine
 NOPIC=
@@ -9,6 +9,7 @@ CPPFLAGS+=	-I${LLVM_SRCS}/include/llvm/ExecutionEngine
 .include <bsd.own.mk>
 SRCS=	Execution.cpp \
 	ExecutionEngine.cpp \
+	ExecutionEngineCore.cpp \
 	ExecutionEngineBindings.cpp \
 	ExecutionUtils.cpp \
 	ExternalFunctions.cpp \
@@ -32,7 +33,10 @@ SRCS=	Execution.cpp \
 	RuntimeDyldELFMips.cpp \
 	RuntimeDyldMachO.cpp \
 	SectionMemoryManager.cpp \
-	TargetSelect.cpp \
+	TargetSelect.cpp
+
+ExecutionEngineCore.cpp:
+	ln -s ${LLVM_SRCS}/lib/ExecutionEngine/Orc/Core.cpp $@
 
 .PATH:	${.CURDIR}/../../../llvm/lib/ExecutionEngine
 .PATH:	${.CURDIR}/../../../llvm/lib/ExecutionEngine/Interpreter
@@ -41,8 +45,9 @@ SRCS=	Execution.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 26fe11f20f9..00ef1d1c2f9 100644
--- a/gnu/usr.bin/clang/libLLVMGlobalISel/Makefile
+++ b/gnu/usr.bin/clang/libLLVMGlobalISel/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2019/01/27 16:59:41 patrick Exp $
+# $OpenBSD: Makefile,v 1.5 2019/02/26 23:39:51 jsg Exp $
 
 LIB=	LLVMGlobalISel
 NOPIC=
@@ -20,11 +20,16 @@ SRCS=	CallLowering.cpp \
 	RegBankSelect.cpp \
 	RegisterBank.cpp \
 	RegisterBankInfo.cpp \
-	Utils.cpp
+	GlobalISelUtils.cpp
+
+GlobalISelUtils.cpp:
+	ln -s ${LLVM_SRCS}/lib/CodeGen/GlobalISel/Utils.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/libLLVMObject/Makefile b/gnu/usr.bin/clang/libLLVMObject/Makefile
index 741fd0a0a81..a45aabc7b1b 100644
--- a/gnu/usr.bin/clang/libLLVMObject/Makefile
+++ b/gnu/usr.bin/clang/libLLVMObject/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2017/10/04 20:57:09 patrick Exp $
+# $OpenBSD: Makefile,v 1.6 2019/02/26 23:39:51 jsg Exp $
 
 LIB=	LLVMObject
 NOPIC=
@@ -14,7 +14,7 @@ SRCS=	Archive.cpp \
 	Decompressor.cpp \
 	ELF.cpp \
 	ELFObjectFile.cpp \
-	Error.cpp \
+	ObjectError.cpp \
 	IRObjectFile.cpp \
 	IRSymtab.cpp \
 	MachOObjectFile.cpp \
@@ -28,9 +28,14 @@ SRCS=	Archive.cpp \
 	WasmObjectFile.cpp \
 	WindowsResource.cpp
 
+ObjectError.cpp:
+	ln -s ${LLVM_SRCS}/lib/Object/Error.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/libLLVMScalarOpts/Makefile b/gnu/usr.bin/clang/libLLVMScalarOpts/Makefile
index 89296c2d3c8..8e13c26b8d9 100644
--- a/gnu/usr.bin/clang/libLLVMScalarOpts/Makefile
+++ b/gnu/usr.bin/clang/libLLVMScalarOpts/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2019/02/25 14:40:16 jsg Exp $
+# $OpenBSD: Makefile,v 1.9 2019/02/26 23:39:51 jsg Exp $
 
 LIB=	LLVMScalarOpts
 NOPIC=
@@ -64,7 +64,7 @@ SRCS=	ADCE.cpp \
 	Reassociate.cpp \
 	Reg2Mem.cpp \
 	RewriteStatepointsForGC.cpp \
-	SCCP.cpp \
+	ScalarSCCP.cpp \
 	SROA.cpp \
 	Scalar.cpp \
 	Scalarizer.cpp \
@@ -78,9 +78,14 @@ SRCS=	ADCE.cpp \
 	StructurizeCFG.cpp \
 	TailRecursionElimination.cpp
 
+ScalarSCCP.cpp:
+	ln -s ${LLVM_SRCS}/lib/Transforms/Scalar/SCCP.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/libLLVMSupport/Makefile b/gnu/usr.bin/clang/libLLVMSupport/Makefile
index 10e49e94bcc..4f41d255f99 100644
--- a/gnu/usr.bin/clang/libLLVMSupport/Makefile
+++ b/gnu/usr.bin/clang/libLLVMSupport/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2019/02/25 14:40:16 jsg Exp $
+# $OpenBSD: Makefile,v 1.9 2019/02/26 23:39:51 jsg Exp $
 
 LIB=	LLVMSupport
 NOPIC=
@@ -37,7 +37,7 @@ SRCS=	AMDGPUMetadata.cpp \
 	Debug.cpp \
 	DebugCounter.cpp \
 	DeltaAlgorithm.cpp \
-	Error.cpp \
+	SupportError.cpp \
 	ErrorHandling.cpp \
 	FileUtilities.cpp \
 	FileOutputBuffer.cpp \
@@ -57,7 +57,7 @@ SRCS=	AMDGPUMetadata.cpp \
 	LineIterator.cpp \
 	Locale.cpp \
 	LockFileManager.cpp \
-	LowLevelType.cpp \
+	SupportLowLevelType.cpp \
 	ManagedStatic.cpp \
 	MathExtras.cpp \
 	MemoryBuffer.cpp \
@@ -122,9 +122,17 @@ SRCS=	AMDGPUMetadata.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
 
 install:
 	@# Nothing here so far ...
 
+CLEANFILES+= SupportError.cpp SupportLowLevelType.cpp
+
 .include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMTableGen/Makefile b/gnu/usr.bin/clang/libLLVMTableGen/Makefile
index 987635e62f3..33861cf79bd 100644
--- a/gnu/usr.bin/clang/libLLVMTableGen/Makefile
+++ b/gnu/usr.bin/clang/libLLVMTableGen/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2019/01/27 16:59:42 patrick Exp $
+# $OpenBSD: Makefile,v 1.4 2019/02/26 23:39:51 jsg Exp $
 
 LIB=	LLVMTableGen
 NOPIC=
@@ -7,7 +7,7 @@ NOPROFILE=
 CPPFLAGS+=	-I${LLVM_SRCS}/include/llvm/TableGen
 
 .include <bsd.own.mk>
-SRCS=	Error.cpp \
+SRCS=	TableGenError.cpp \
 	Main.cpp \
 	JSONBackend.cpp \
 	Record.cpp \
@@ -17,9 +17,14 @@ SRCS=	Error.cpp \
 	TGLexer.cpp \
 	TGParser.cpp
 
+TableGenError.cpp:
+	ln -s ${LLVM_SRCS}/lib/TableGen/Error.cpp $@
+
 .PATH:	${.CURDIR}/../../../llvm/lib/TableGen
 
 install:
 	@# Nothing here so far ...
 
+CLEANFILES+= TableGenError.cpp
+
 .include <bsd.lib.mk>
diff --git a/gnu/usr.bin/clang/libLLVMTransformUtils/Makefile b/gnu/usr.bin/clang/libLLVMTransformUtils/Makefile
index 7125c047780..bf432ef62f5 100644
--- a/gnu/usr.bin/clang/libLLVMTransformUtils/Makefile
+++ b/gnu/usr.bin/clang/libLLVMTransformUtils/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2019/02/25 14:40:16 jsg Exp $
+# $OpenBSD: Makefile,v 1.9 2019/02/26 23:39:51 jsg Exp $
 
 LIB=	LLVMTransformUtils
 NOPIC=
@@ -62,13 +62,18 @@ SRCS=	ASanStackFrameLayout.cpp \
 	StripNonLineTableDebugInfo.cpp \
 	SymbolRewriter.cpp \
 	UnifyFunctionExitNodes.cpp \
-	Utils.cpp \
+	TransformUtilsUtils.cpp \
 	VNCoercion.cpp \
 	ValueMapper.cpp
 
+TransformUtilsUtils.cpp:
+	ln -s ${LLVM_SRCS}/lib/Transforms/Utils/Utils.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/libLLVMipo/Makefile b/gnu/usr.bin/clang/libLLVMipo/Makefile
index 59a2d37dee6..d1e0084ca9d 100644
--- a/gnu/usr.bin/clang/libLLVMipo/Makefile
+++ b/gnu/usr.bin/clang/libLLVMipo/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2019/02/25 14:40:16 jsg Exp $
+# $OpenBSD: Makefile,v 1.9 2019/02/26 23:39:51 jsg Exp $
 
 LIB=	LLVMipo
 NOPIC=
@@ -36,7 +36,7 @@ SRCS=	ArgumentPromotion.cpp \
 	PartialInlining.cpp \
 	PassManagerBuilder.cpp \
 	PruneEH.cpp \
-	SCCP.cpp \
+	ipoSCCP.cpp \
 	SampleProfile.cpp \
 	StripDeadPrototypes.cpp \
 	StripSymbols.cpp \
@@ -44,9 +44,14 @@ SRCS=	ArgumentPromotion.cpp \
 	ThinLTOBitcodeWriter.cpp \
 	WholeProgramDevirt.cpp
 
+ipoSCCP.cpp:
+	ln -s ${LLVM_SRCS}/lib/Transforms/IPO/SCCP.cpp $@
+
 .PATH:	${.CURDIR}/../../../llvm/lib/Transforms/IPO
 
 install:
 	@# Nothing here so far ...
 
+CLEANFILES+= ipoSCCP.cpp
+
 .include <bsd.lib.mk>