From 084b3adb032d101332970584fcb7909223f64c62 Mon Sep 17 00:00:00 2001
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sun, 4 Sep 2016 16:54:55 +0000
Subject: [PATCH] Some further micro-optimizations for the libllvm and lldb
 build.

---
 lib/clang/libllvm/Makefile  | 30 +++++++++---------------------
 usr.bin/clang/lldb/Makefile |  1 -
 2 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/lib/clang/libllvm/Makefile b/lib/clang/libllvm/Makefile
index bcbbc8bbff1c..d51056161fda 100644
--- a/lib/clang/libllvm/Makefile
+++ b/lib/clang/libllvm/Makefile
@@ -88,7 +88,6 @@ SRCS_MIN+=	Analysis/ScopedNoAliasAA.cpp
 SRCS_MIN+=	Analysis/SparsePropagation.cpp
 SRCS_MIN+=	Analysis/TargetLibraryInfo.cpp
 SRCS_MIN+=	Analysis/TargetTransformInfo.cpp
-#SRCS_EXT+=	Analysis/Trace.cpp
 SRCS_MIN+=	Analysis/TypeBasedAliasAnalysis.cpp
 SRCS_MIN+=	Analysis/TypeMetadataUtils.cpp
 SRCS_MIN+=	Analysis/ValueTracking.cpp
@@ -96,10 +95,8 @@ SRCS_MIN+=	Analysis/VectorUtils.cpp
 SRCS_MIN+=	AsmParser/LLLexer.cpp
 SRCS_MIN+=	AsmParser/LLParser.cpp
 SRCS_MIN+=	AsmParser/Parser.cpp
-#SRCS_EXT+=	Bitcode/Reader/BitReader.cpp
 SRCS_MIN+=	Bitcode/Reader/BitcodeReader.cpp
 SRCS_MIN+=	Bitcode/Reader/BitstreamReader.cpp
-#SRCS_EXT+=	Bitcode/Writer/BitWriter.cpp
 SRCS_MIN+=	Bitcode/Writer/BitcodeWriter.cpp
 SRCS_MIN+=	Bitcode/Writer/BitcodeWriterPass.cpp
 SRCS_MIN+=	Bitcode/Writer/ValueEnumerator.cpp
@@ -300,7 +297,6 @@ SRCS_MIN+=	DebugInfo/CodeView/FieldListRecordBuilder.cpp
 SRCS_MIN+=	DebugInfo/CodeView/Line.cpp
 SRCS_MIN+=	DebugInfo/CodeView/ListRecordBuilder.cpp
 SRCS_MIN+=	DebugInfo/CodeView/MemoryTypeTableBuilder.cpp
-#SRCS_EXT+=	DebugInfo/CodeView/MethodListRecordBuilder.cpp
 SRCS_MIN+=	DebugInfo/CodeView/ModuleSubstream.cpp
 SRCS_MIN+=	DebugInfo/CodeView/ModuleSubstreamVisitor.cpp
 SRCS_MIN+=	DebugInfo/CodeView/RecordSerialization.cpp
@@ -331,7 +327,6 @@ SRCS_EXT+=	DebugInfo/DWARF/DWARFUnit.cpp
 SRCS_EXT+=	DebugInfo/DWARF/DWARFUnitIndex.cpp
 SRCS_EXT+=	DebugInfo/DWARF/SyntaxHighlighting.cpp
 SRCS_EXT+=	DebugInfo/PDB/GenericError.cpp
-#SRCS_EXT+=	DebugInfo/PDB/IPDBSourceFile.cpp
 SRCS_EXT+=	DebugInfo/PDB/PDB.cpp
 SRCS_EXT+=	DebugInfo/PDB/PDBContext.cpp
 SRCS_EXT+=	DebugInfo/PDB/PDBExtras.cpp
@@ -408,7 +403,6 @@ SRCS_EXT+=	ExecutionEngine/Orc/OrcABISupport.cpp
 SRCS_EXT+=	ExecutionEngine/Orc/OrcCBindings.cpp
 SRCS_EXT+=	ExecutionEngine/Orc/OrcError.cpp
 SRCS_EXT+=	ExecutionEngine/Orc/OrcMCJITReplacement.cpp
-#SRCS_EXT+=	ExecutionEngine/Orc/OrcRemoteTargetRPCAPI.cpp
 SRCS_XDB+=	ExecutionEngine/RuntimeDyld/RTDyldMemoryManager.cpp
 SRCS_XDB+=	ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp
 SRCS_XDB+=	ExecutionEngine/RuntimeDyld/RuntimeDyldCOFF.cpp
@@ -490,10 +484,10 @@ SRCS_MIN+=	MC/MCCodeEmitter.cpp
 SRCS_MIN+=	MC/MCCodeView.cpp
 SRCS_MIN+=	MC/MCContext.cpp
 SRCS_XDL+=	MC/MCDisassembler/Disassembler.cpp
-SRCS_XDL+=	MC/MCDisassembler/MCDisassembler.cpp
-SRCS_XDL+=	MC/MCDisassembler/MCExternalSymbolizer.cpp
+SRCS_XDB+=	MC/MCDisassembler/MCDisassembler.cpp
+SRCS_XDB+=	MC/MCDisassembler/MCExternalSymbolizer.cpp
 SRCS_MIN+=	MC/MCDisassembler/MCRelocationInfo.cpp
-SRCS_XDL+=	MC/MCDisassembler/MCSymbolizer.cpp
+SRCS_XDB+=	MC/MCDisassembler/MCSymbolizer.cpp
 SRCS_MIN+=	MC/MCDwarf.cpp
 SRCS_MIN+=	MC/MCELFObjectTargetWriter.cpp
 SRCS_MIN+=	MC/MCELFStreamer.cpp
@@ -503,7 +497,6 @@ SRCS_MIN+=	MC/MCInst.cpp
 SRCS_MIN+=	MC/MCInstPrinter.cpp
 SRCS_MIN+=	MC/MCInstrAnalysis.cpp
 SRCS_MIN+=	MC/MCInstrDesc.cpp
-#SRCS_EXT+=	MC/MCLabel.cpp
 SRCS_MIN+=	MC/MCLinkerOptimizationHint.cpp
 SRCS_MIN+=	MC/MCMachOStreamer.cpp
 SRCS_MIN+=	MC/MCMachObjectTargetWriter.cpp
@@ -558,8 +551,6 @@ SRCS_MIN+=	Object/SymbolicFile.cpp
 SRCS_MIN+=	ObjectYAML/COFFYAML.cpp
 SRCS_MIN+=	ObjectYAML/ELFYAML.cpp
 SRCS_MIN+=	ObjectYAML/MachOYAML.cpp
-#SRCS_EXT+=	ObjectYAML/ObjectYAML.cpp
-#SRCS_EXT+=	ObjectYAML/YAML.cpp
 SRCS_MIN+=	Option/Arg.cpp
 SRCS_MIN+=	Option/ArgList.cpp
 SRCS_MIN+=	Option/OptTable.cpp
@@ -579,7 +570,6 @@ SRCS_MIN+=	Support/APFloat.cpp
 SRCS_MIN+=	Support/APInt.cpp
 SRCS_MIN+=	Support/APSInt.cpp
 SRCS_MIN+=	Support/ARMBuildAttrs.cpp
-#SRCS_EXT+=	Support/ARMWinEH.cpp
 SRCS_MIN+=	Support/Allocator.cpp
 SRCS_MIN+=	Support/Atomic.cpp
 SRCS_MIN+=	Support/BlockFrequency.cpp
@@ -660,7 +650,6 @@ SRCS_MIN+=	Support/Triple.cpp
 SRCS_MIN+=	Support/Twine.cpp
 SRCS_MIN+=	Support/Unicode.cpp
 SRCS_MIN+=	Support/Valgrind.cpp
-#SRCS_EXT+=	Support/Watchdog.cpp
 SRCS_MIN+=	Support/YAMLParser.cpp
 SRCS_MIN+=	Support/YAMLTraits.cpp
 SRCS_MIN+=	Support/circular_raw_ostream.cpp
@@ -709,8 +698,8 @@ SRCS_MIN+=	Target/AArch64/AArch64TargetMachine.cpp
 SRCS_MIN+=	Target/AArch64/AArch64TargetObjectFile.cpp
 SRCS_MIN+=	Target/AArch64/AArch64TargetTransformInfo.cpp
 SRCS_MIN+=	Target/AArch64/AsmParser/AArch64AsmParser.cpp
-SRCS_XDL+=	Target/AArch64/Disassembler/AArch64Disassembler.cpp
-SRCS_MIN+=	Target/AArch64/Disassembler/AArch64ExternalSymbolizer.cpp
+SRCS_XDB+=	Target/AArch64/Disassembler/AArch64Disassembler.cpp
+SRCS_XDB+=	Target/AArch64/Disassembler/AArch64ExternalSymbolizer.cpp
 SRCS_MIN+=	Target/AArch64/InstPrinter/AArch64InstPrinter.cpp
 SRCS_MIN+=	Target/AArch64/MCTargetDesc/AArch64AsmBackend.cpp
 SRCS_MIN+=	Target/AArch64/MCTargetDesc/AArch64ELFObjectWriter.cpp
@@ -771,7 +760,7 @@ SRCS_MIN+=	Target/ARM/Thumb2InstrInfo.cpp
 SRCS_MIN+=	Target/ARM/Thumb2SizeReduction.cpp
 SRCS_MIN+=	Target/ARM/ThumbRegisterInfo.cpp
 SRCS_MIN+=	Target/Mips/AsmParser/MipsAsmParser.cpp
-SRCS_XDL+=	Target/Mips/Disassembler/MipsDisassembler.cpp
+SRCS_XDB+=	Target/Mips/Disassembler/MipsDisassembler.cpp
 SRCS_MIN+=	Target/Mips/InstPrinter/MipsInstPrinter.cpp
 SRCS_MIN+=	Target/Mips/MCTargetDesc/MipsABIFlagsSection.cpp
 SRCS_MIN+=	Target/Mips/MCTargetDesc/MipsABIInfo.cpp
@@ -860,7 +849,7 @@ SRCS_MIN+=	Target/PowerPC/PPCVSXSwapRemoval.cpp
 SRCS_MIN+=	Target/PowerPC/TargetInfo/PowerPCTargetInfo.cpp
 SRCS_MIN+=	Target/Sparc/AsmParser/SparcAsmParser.cpp
 SRCS_MIN+=	Target/Sparc/DelaySlotFiller.cpp
-SRCS_XDL+=	Target/Sparc/Disassembler/SparcDisassembler.cpp
+SRCS_XDB+=	Target/Sparc/Disassembler/SparcDisassembler.cpp
 SRCS_MIN+=	Target/Sparc/InstPrinter/SparcInstPrinter.cpp
 SRCS_MIN+=	Target/Sparc/LeonPasses.cpp
 SRCS_MIN+=	Target/Sparc/MCTargetDesc/SparcAsmBackend.cpp
@@ -883,7 +872,6 @@ SRCS_MIN+=	Target/Sparc/SparcTargetMachine.cpp
 SRCS_MIN+=	Target/Sparc/SparcTargetObjectFile.cpp
 SRCS_MIN+=	Target/Sparc/TargetInfo/SparcTargetInfo.cpp
 SRCS_MIN+=	Target/Target.cpp
-#SRCS_EXT+=	Target/TargetIntrinsicInfo.cpp
 SRCS_MIN+=	Target/TargetLoweringObjectFile.cpp
 SRCS_MIN+=	Target/TargetMachine.cpp
 SRCS_MIN+=	Target/TargetMachineC.cpp
@@ -891,8 +879,8 @@ SRCS_MIN+=	Target/TargetRecip.cpp
 SRCS_MIN+=	Target/TargetSubtargetInfo.cpp
 SRCS_MIN+=	Target/X86/AsmParser/X86AsmInstrumentation.cpp
 SRCS_MIN+=	Target/X86/AsmParser/X86AsmParser.cpp
-SRCS_XDL+=	Target/X86/Disassembler/X86Disassembler.cpp
-SRCS_XDL+=	Target/X86/Disassembler/X86DisassemblerDecoder.cpp
+SRCS_XDB+=	Target/X86/Disassembler/X86Disassembler.cpp
+SRCS_XDB+=	Target/X86/Disassembler/X86DisassemblerDecoder.cpp
 SRCS_MIN+=	Target/X86/InstPrinter/X86ATTInstPrinter.cpp
 SRCS_MIN+=	Target/X86/InstPrinter/X86InstComments.cpp
 SRCS_MIN+=	Target/X86/InstPrinter/X86IntelInstPrinter.cpp
diff --git a/usr.bin/clang/lldb/Makefile b/usr.bin/clang/lldb/Makefile
index cb61bf1dd10d..857d6163321e 100644
--- a/usr.bin/clang/lldb/Makefile
+++ b/usr.bin/clang/lldb/Makefile
@@ -10,7 +10,6 @@ CFLAGS+=	-I${LLDB_SRCS}/include
 
 SRCDIR=		tools/lldb/tools/driver
 SRCS+=		Driver.cpp
-SRCS+=		Platform.cpp
 
 .include "${SRCTOP}/lib/clang/clang.build.mk"