Add a WITH_CLANG_EXTRAS option for src.conf(5), disabled by default,

that builds the following additional llvm/clang tools:

- bugpoint
- llc
- lli
- llvm-ar
- llvm-as
- llvm-bcanalyzer
- llvm-diff
- llvm-dis
- llvm-extract
- llvm-ld
- llvm-link
- llvm-mc
- llvm-nm
- llvm-objdump
- llvm-prof
- llvm-ranlib
- llvm-rtdyld
- llvm-stub
- macho-dump
- opt

These tools are mainly useful for people that want to manipulate llvm
bitcode (.bc) and llvm assembly language (.ll) files, or want to tinker
with llvm and clang themselves.

MFC after:	2 weeks

19 files changed, 197 insertions, 0 deletions

diff --git a/lib/clang/Makefile b/lib/clang/Makefile
index 8f7d18a..e0a6201 100644
--- a/lib/clang/Makefile
+++ b/lib/clang/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 .if !make(install)
 SUBDIR=	libclanganalysis \
 	libclangarcmigrate \
@@ -60,6 +62,19 @@ SUBDIR=	libclanganalysis \
 	libllvmx86info \
 	libllvmx86instprinter \
 	libllvmx86utils
+
+.if ${MK_CLANG_EXTRAS} != "no"
+SUBDIR+=libllvmarchive \
+	libllvmdebuginfo \
+	libllvmexecutionengine \
+	libllvminterpreter \
+	libllvmjit \
+	libllvmlinker \
+	libllvmmcdisassembler \
+	libllvmmcjit \
+	libllvmobject \
+	libllvmruntimedyld
+.endif
 .endif
 
 SUBDIR+= include
diff --git a/lib/clang/libllvmanalysis/Makefile b/lib/clang/libllvmanalysis/Makefile
index 2b0bccf..301c39b 100644
--- a/lib/clang/libllvmanalysis/Makefile
+++ b/lib/clang/libllvmanalysis/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 LIB=	llvmanalysis
 
 SRCDIR=	lib/Analysis
@@ -55,6 +57,14 @@ SRCS=	AliasAnalysis.cpp \
 	TypeBasedAliasAnalysis.cpp \
 	ValueTracking.cpp
 
+.if ${MK_CLANG_EXTRAS} != "no"
+SRCS+=	BlockFrequencyInfo.cpp \
+	LibCallSemantics.cpp \
+	PathNumbering.cpp \
+	PathProfileInfo.cpp \
+	PathProfileVerifier.cpp
+.endif
+
 TGHDRS=	Intrinsics
 
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmarchive/Makefile b/lib/clang/libllvmarchive/Makefile
new file mode 100644
index 0000000..a28f2f5
--- /dev/null
+++ b/lib/clang/libllvmarchive/Makefile
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+LIB=	llvmarchive
+
+SRCDIR=	lib/Archive
+SRCS=	Archive.cpp \
+	ArchiveReader.cpp \
+	ArchiveWriter.cpp
+
+.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmdebuginfo/Makefile b/lib/clang/libllvmdebuginfo/Makefile
new file mode 100644
index 0000000..b724157
--- /dev/null
+++ b/lib/clang/libllvmdebuginfo/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+LIB=	llvmdebuginfo
+
+SRCDIR=	lib/DebugInfo
+SRCS=	DIContext.cpp \
+	DWARFAbbreviationDeclaration.cpp \
+	DWARFCompileUnit.cpp \
+	DWARFContext.cpp \
+	DWARFDebugAbbrev.cpp \
+	DWARFDebugArangeSet.cpp \
+	DWARFDebugAranges.cpp \
+	DWARFDebugInfoEntry.cpp \
+	DWARFDebugLine.cpp \
+	DWARFFormValue.cpp
+
+.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmexecutionengine/Makefile b/lib/clang/libllvmexecutionengine/Makefile
new file mode 100644
index 0000000..c0dde71
--- /dev/null
+++ b/lib/clang/libllvmexecutionengine/Makefile
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+LIB=	llvmexecutionengine
+
+SRCDIR=	lib/ExecutionEngine
+SRCS=	ExecutionEngine.cpp \
+	ExecutionEngineBindings.cpp \
+	TargetSelect.cpp
+
+.include "../clang.lib.mk"
diff --git a/lib/clang/libllvminterpreter/Makefile b/lib/clang/libllvminterpreter/Makefile
new file mode 100644
index 0000000..6a1b453
--- /dev/null
+++ b/lib/clang/libllvminterpreter/Makefile
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+LIB=	llvminterpreter
+
+SRCDIR=	lib/ExecutionEngine/Interpreter
+SRCS=	Execution.cpp \
+	ExternalFunctions.cpp \
+	Interpreter.cpp \
+
+TGHDRS=	Intrinsics
+
+.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmipa/Makefile b/lib/clang/libllvmipa/Makefile
index fc241df..4caa0e5 100644
--- a/lib/clang/libllvmipa/Makefile
+++ b/lib/clang/libllvmipa/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 LIB=	llvmipa
 
 SRCDIR=	lib/Analysis/IPA
@@ -8,6 +10,10 @@ SRCS=	CallGraph.cpp \
 	FindUsedTypes.cpp \
 	GlobalsModRef.cpp
 
+.if ${MK_CLANG_EXTRAS} != "no"
+SRCS+=	IPA.cpp
+.endif
+
 TGHDRS=	Intrinsics
 
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmipo/Makefile b/lib/clang/libllvmipo/Makefile
index 42cc2fa..a493532 100644
--- a/lib/clang/libllvmipo/Makefile
+++ b/lib/clang/libllvmipo/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 LIB=	llvmipo
 
 SRCDIR=	lib/Transforms/IPO
@@ -23,6 +25,10 @@ SRCS=	ArgumentPromotion.cpp \
 	StripDeadPrototypes.cpp \
 	StripSymbols.cpp
 
+.if ${MK_CLANG_EXTRAS} != "no"
+SRCS+=	IPO.cpp
+.endif
+
 TGHDRS=	Intrinsics
 
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmjit/Makefile b/lib/clang/libllvmjit/Makefile
new file mode 100644
index 0000000..fc92fd0
--- /dev/null
+++ b/lib/clang/libllvmjit/Makefile
@@ -0,0 +1,14 @@
+# $FreeBSD$
+
+LIB=	llvmjit
+
+SRCDIR=	lib/ExecutionEngine/JIT
+SRCS=	Intercept.cpp \
+	JIT.cpp \
+	JITDebugRegisterer.cpp \
+	JITDwarfEmitter.cpp \
+	JITEmitter.cpp \
+	JITMemoryManager.cpp \
+	OProfileJITEventListener.cpp
+
+.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmlinker/Makefile b/lib/clang/libllvmlinker/Makefile
new file mode 100644
index 0000000..73f153b
--- /dev/null
+++ b/lib/clang/libllvmlinker/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+LIB=	llvmlinker
+
+SRCDIR=	lib/Linker
+SRCS=	LinkArchives.cpp \
+	LinkItems.cpp \
+	LinkModules.cpp \
+	Linker.cpp
+
+.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmmc/Makefile b/lib/clang/libllvmmc/Makefile
index 5fef440..9bb5723 100644
--- a/lib/clang/libllvmmc/Makefile
+++ b/lib/clang/libllvmmc/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 LIB=	llvmmc
 
 SRCDIR=	lib/MC
@@ -43,4 +45,8 @@ SRCS=	ELFObjectWriter.cpp \
 	WinCOFFObjectWriter.cpp \
 	WinCOFFStreamer.cpp
 
+.if ${MK_CLANG_EXTRAS} != "no"
+SRCS+=	MCDisassembler.cpp
+.endif
+
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmmcdisassembler/Makefile b/lib/clang/libllvmmcdisassembler/Makefile
new file mode 100644
index 0000000..dc5f294
--- /dev/null
+++ b/lib/clang/libllvmmcdisassembler/Makefile
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+LIB=	llvmmcdisassembler
+
+SRCDIR=	lib/MC/MCDisassembler
+SRCS=	Disassembler.cpp \
+	EDDisassembler.cpp \
+	EDInst.cpp \
+	EDOperand.cpp \
+	EDToken.cpp
+
+.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmmcjit/Makefile b/lib/clang/libllvmmcjit/Makefile
new file mode 100644
index 0000000..58e2529
--- /dev/null
+++ b/lib/clang/libllvmmcjit/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+LIB=	llvmmcjit
+
+SRCDIR=	lib/ExecutionEngine/MCJIT
+SRCS=	Intercept.cpp \
+	MCJIT.cpp
+
+.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmobject/Makefile b/lib/clang/libllvmobject/Makefile
new file mode 100644
index 0000000..d056dc7
--- /dev/null
+++ b/lib/clang/libllvmobject/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+LIB=	llvmobject
+
+SRCDIR=	lib/Object
+SRCS=	Archive.cpp \
+	Binary.cpp \
+	COFFObjectFile.cpp \
+	ELFObjectFile.cpp \
+	Error.cpp \
+	MachOObject.cpp \
+	MachOObjectFile.cpp \
+	Object.cpp \
+	ObjectFile.cpp
+
+.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmruntimedyld/Makefile b/lib/clang/libllvmruntimedyld/Makefile
new file mode 100644
index 0000000..c17f031
--- /dev/null
+++ b/lib/clang/libllvmruntimedyld/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+LIB=	llvmruntimedyld
+
+SRCDIR=	lib/ExecutionEngine/RuntimeDyld
+SRCS=	RuntimeDyld.cpp \
+	RuntimeDyldMachO.cpp
+
+.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmscalaropts/Makefile b/lib/clang/libllvmscalaropts/Makefile
index c376b68..2023595 100644
--- a/lib/clang/libllvmscalaropts/Makefile
+++ b/lib/clang/libllvmscalaropts/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 LIB=	llvmscalaropts
 
 SRCDIR=	lib/Transforms/Scalar
@@ -31,6 +33,13 @@ SRCS=	ADCE.cpp \
 	Sink.cpp \
 	TailRecursionElimination.cpp
 
+.if ${MK_CLANG_EXTRAS} != "no"
+SRCS+=	LoopInstSimplify.cpp \
+	LowerAtomic.cpp \
+	Reg2Mem.cpp \
+	Scalar.cpp
+.endif
+
 TGHDRS=	Intrinsics
 
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmsupport/Makefile b/lib/clang/libllvmsupport/Makefile
index e1a16c4..fb9309f 100644
--- a/lib/clang/libllvmsupport/Makefile
+++ b/lib/clang/libllvmsupport/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 LIB=	llvmsupport
 
 SRCDIR=	lib/Support
@@ -67,4 +69,14 @@ SRCS=	APFloat.cpp \
 	system_error.cpp
 LLVM_REQUIRES_RTTI=
 
+.if ${MK_CLANG_EXTRAS} != "no"
+SRCS+=	BlockFrequency.cpp \
+	BranchProbability.cpp \
+	DataExtractor.cpp \
+	Disassembler.cpp \
+	FileUtilities.cpp \
+	MemoryObject.cpp \
+	SystemUtils.cpp
+.endif
+
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmtransformutils/Makefile b/lib/clang/libllvmtransformutils/Makefile
index 18eecda..1969781 100644
--- a/lib/clang/libllvmtransformutils/Makefile
+++ b/lib/clang/libllvmtransformutils/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 LIB=	llvmtransformutils
 
 SRCDIR=	lib/Transforms/Utils
@@ -29,6 +31,11 @@ SRCS=	AddrModeMatcher.cpp \
 	UnifyFunctionExitNodes.cpp \
 	ValueMapper.cpp
 
+.if ${MK_CLANG_EXTRAS} != "no"
+SRCS+=	SimplifyInstructions.cpp \
+	Utils.cpp
+.endif
+
 TGHDRS=	Intrinsics
 
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmx86disassembler/Makefile b/lib/clang/libllvmx86disassembler/Makefile
index 1d1b3b6..9b73800 100644
--- a/lib/clang/libllvmx86disassembler/Makefile
+++ b/lib/clang/libllvmx86disassembler/Makefile
@@ -1,11 +1,17 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 LIB=	llvmx86disassembler
 
 SRCDIR=	lib/Target/X86/Disassembler
 INCDIR=	lib/Target/X86
 SRCS=	X86Disassembler.cpp
 
+.if ${MK_CLANG_EXTRAS} != "no"
+SRCS+=	X86DisassemblerDecoder.c
+.endif
+
 TGHDRS=	X86GenDisassemblerTables \
 	X86GenEDInfo \
 	X86GenInstrInfo \