Next part of updating llvm/clang build glue: getting the

WITH_CLANG_EXTRAS tools built.

11 files changed, 37 insertions, 22 deletions

diff --git a/lib/clang/Makefile b/lib/clang/Makefile
index eacda63..42f190a 100644
--- a/lib/clang/Makefile
+++ b/lib/clang/Makefile
@@ -66,7 +66,6 @@ SUBDIR=	libclanganalysis \
 	libllvmarmasmprinter \
 	libllvmarmcodegen \
 	libllvmarmdesc \
-	libllvmarmdisassembler \
 	libllvmarminfo \
 	libllvmmipsasmparser \
 	libllvmmipsasmprinter \
@@ -77,7 +76,6 @@ SUBDIR=	libclanganalysis \
 	libllvmpowerpcasmprinter \
 	libllvmpowerpccodegen \
 	libllvmpowerpcdesc \
-	libllvmpowerpcdisassembler \
 	libllvmpowerpcinfo \
 	libllvmsparcasmparser \
 	libllvmsparcasmprinter \
@@ -105,9 +103,11 @@ SUBDIR+=libllvmdebuginfodwarf \
 .if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLDB} != "no"
 SUBDIR+=libllvmexecutionengine \
 	libllvmaarch64disassembler \
+	libllvmarmdisassembler \
 	libllvminterpreter \
 	libllvmmcjit \
 	libllvmmipsdisassembler \
+	libllvmpowerpcdisassembler \
 	libllvmruntimedyld \
 	libllvmsparcdisassembler \
 	libllvmx86disassembler
diff --git a/lib/clang/libllvmaarch64disassembler/Makefile b/lib/clang/libllvmaarch64disassembler/Makefile
index 12b5025..f8d71a9 100644
--- a/lib/clang/libllvmaarch64disassembler/Makefile
+++ b/lib/clang/libllvmaarch64disassembler/Makefile
@@ -1,16 +1,13 @@
 # $FreeBSD$
 
-.include <src.opts.mk>
+.include <bsd.own.mk>
 
 LIB=	llvmaarch64disassembler
 
 SRCDIR=	lib/Target/AArch64/Disassembler
 INCDIR=	lib/Target/AArch64
-SRCS=	AArch64Disassembler.cpp
-
-.if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLDB} != "no"
-SRCS+=	AArch64ExternalSymbolizer.cpp
-.endif
+SRCS=	AArch64Disassembler.cpp \
+	AArch64ExternalSymbolizer.cpp
 
 TGHDRS=	Attributes \
 	Intrinsics \
diff --git a/lib/clang/libllvmexecutionengine/Makefile b/lib/clang/libllvmexecutionengine/Makefile
index 13855a0..304473b 100644
--- a/lib/clang/libllvmexecutionengine/Makefile
+++ b/lib/clang/libllvmexecutionengine/Makefile
@@ -11,4 +11,6 @@ SRCS=	ExecutionEngine.cpp \
 	SectionMemoryManager.cpp \
 	TargetSelect.cpp
 
+TGHDRS=	Attributes
+
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvminterpreter/Makefile b/lib/clang/libllvminterpreter/Makefile
index 06fcca4..52880e0 100644
--- a/lib/clang/libllvminterpreter/Makefile
+++ b/lib/clang/libllvminterpreter/Makefile
@@ -9,6 +9,7 @@ SRCS=	Execution.cpp \
 	ExternalFunctions.cpp \
 	Interpreter.cpp \
 
-TGHDRS=	Intrinsics
+TGHDRS=	Attributes \
+	Intrinsics
 
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmlto/Makefile b/lib/clang/libllvmlto/Makefile
index 776c45f..c7cb9da 100644
--- a/lib/clang/libllvmlto/Makefile
+++ b/lib/clang/libllvmlto/Makefile
@@ -8,6 +8,7 @@ SRCDIR=	lib/LTO
 SRCS=	LTOCodeGenerator.cpp \
 	LTOModule.cpp
 
-TGHDRS=	Intrinsics
+TGHDRS=	Attributes \
+	Intrinsics
 
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmmcjit/Makefile b/lib/clang/libllvmmcjit/Makefile
index 207fd81..632dd5e 100644
--- a/lib/clang/libllvmmcjit/Makefile
+++ b/lib/clang/libllvmmcjit/Makefile
@@ -7,4 +7,6 @@ LIB=	llvmmcjit
 SRCDIR=	lib/ExecutionEngine/MCJIT
 SRCS=	MCJIT.cpp
 
+TGHDRS=	Attributes
+
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmmirparser/Makefile b/lib/clang/libllvmmirparser/Makefile
index a3a64c6..4632441 100644
--- a/lib/clang/libllvmmirparser/Makefile
+++ b/lib/clang/libllvmmirparser/Makefile
@@ -1,15 +1,14 @@
 # $FreeBSD$
 
-.include <src.opts.mk>
+.include <bsd.own.mk>
 
 LIB=	llvmmirparser
 
 SRCDIR=	lib/CodeGen/MIRParser
-SRCS=	MIParser.cpp \
+SRCS=	MILexer.cpp \
+	MIParser.cpp \
 	MIRParser.cpp
 
-.if ${MK_CLANG_EXTRAS} != "no"
-SRCS+=	MILexer.cpp
-.endif
-	
+TGHDRS=	Attributes
+
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmorcjit/Makefile b/lib/clang/libllvmorcjit/Makefile
index 27259b2..985d5ab 100644
--- a/lib/clang/libllvmorcjit/Makefile
+++ b/lib/clang/libllvmorcjit/Makefile
@@ -13,4 +13,7 @@ SRCS=	ExecutionUtils.cpp \
 	OrcMCJITReplacement.cpp \
 	OrcTargetSupport.cpp
 
+TGHDRS=	Attributes \
+	Intrinsics
+
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmpasses/Makefile b/lib/clang/libllvmpasses/Makefile
index ed4e20d..eba54f6 100644
--- a/lib/clang/libllvmpasses/Makefile
+++ b/lib/clang/libllvmpasses/Makefile
@@ -7,6 +7,7 @@ LIB=	llvmpasses
 SRCDIR=	lib/Passes
 SRCS=	PassBuilder.cpp
 
-TGHDRS=	Intrinsics
+TGHDRS=	Attributes \
+	Intrinsics
 
 .include "../clang.lib.mk"
diff --git a/lib/clang/libllvmsymbolize/Makefile b/lib/clang/libllvmsymbolize/Makefile
new file mode 100644
index 0000000..88a73c1
--- /dev/null
+++ b/lib/clang/libllvmsymbolize/Makefile
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+LIB=	llvmsymbolize
+
+SRCDIR=	lib/DebugInfo/Symbolize
+SRCS=	DIPrinter.cpp \
+	SymbolizableObjectFile.cpp \
+	Symbolize.cpp
+
+.include "../clang.lib.mk"
diff --git a/lib/clang/libllvmx86disassembler/Makefile b/lib/clang/libllvmx86disassembler/Makefile
index 23ec976..5470d9f 100644
--- a/lib/clang/libllvmx86disassembler/Makefile
+++ b/lib/clang/libllvmx86disassembler/Makefile
@@ -6,11 +6,8 @@ LIB=	llvmx86disassembler
 
 SRCDIR=	lib/Target/X86/Disassembler
 INCDIR=	lib/Target/X86
-SRCS=	X86Disassembler.cpp
-
-.if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLDB} != "no"
-SRCS+=	X86DisassemblerDecoder.cpp
-.endif
+SRCS=	X86Disassembler.cpp \
+	X86DisassemblerDecoder.cpp
 
 TGHDRS=	X86GenDisassemblerTables \
 	X86GenInstrInfo \