From 1357722508cf71b513b8fb34cf69cd5c9eec323c Mon Sep 17 00:00:00 2001
From: Dimitry Andric <dim@FreeBSD.org>
Date: Thu, 29 Dec 2016 13:27:04 +0000
Subject: [PATCH] Move llvm-objdump from CLANG_EXTRAS to installed by default

We currently install three tools from binutils 2.17.50: as, ld, and
objdump. Work is underway to migrate to a permissively-licensed
tool-chain, with one goal being the retirement of binutils 2.17.50.

LLVM's llvm-objdump is intended to be compatible with GNU objdump
although it is currently missing some options and may have formatting
differences. Enable it by default for testing and further investigation.
It may later be changed to install as /usr/bin/objdump, it becomes a
fully viable replacement.

Reviewed by:	emaste
Differential Revision:	https://reviews.freebsd.org/D8879
---
 lib/clang/libllvm/Makefile | 46 +++++++++++++++++++++-----------------
 usr.bin/clang/Makefile     |  3 ++-
 2 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/lib/clang/libllvm/Makefile b/lib/clang/libllvm/Makefile
index d51056161fda..11e2e18d4134 100644
--- a/lib/clang/libllvm/Makefile
+++ b/lib/clang/libllvm/Makefile
@@ -308,24 +308,24 @@ SRCS_MIN+=	DebugInfo/CodeView/TypeRecord.cpp
 SRCS_MIN+=	DebugInfo/CodeView/TypeRecordBuilder.cpp
 SRCS_MIN+=	DebugInfo/CodeView/TypeStreamMerger.cpp
 SRCS_MIN+=	DebugInfo/CodeView/TypeTableBuilder.cpp
-SRCS_EXT+=	DebugInfo/DWARF/DWARFAbbreviationDeclaration.cpp
-SRCS_EXT+=	DebugInfo/DWARF/DWARFAcceleratorTable.cpp
-SRCS_EXT+=	DebugInfo/DWARF/DWARFCompileUnit.cpp
-SRCS_EXT+=	DebugInfo/DWARF/DWARFContext.cpp
-SRCS_EXT+=	DebugInfo/DWARF/DWARFDebugAbbrev.cpp
-SRCS_EXT+=	DebugInfo/DWARF/DWARFDebugArangeSet.cpp
-SRCS_EXT+=	DebugInfo/DWARF/DWARFDebugAranges.cpp
-SRCS_EXT+=	DebugInfo/DWARF/DWARFDebugFrame.cpp
-SRCS_EXT+=	DebugInfo/DWARF/DWARFDebugInfoEntry.cpp
-SRCS_EXT+=	DebugInfo/DWARF/DWARFDebugLine.cpp
-SRCS_EXT+=	DebugInfo/DWARF/DWARFDebugLoc.cpp
-SRCS_EXT+=	DebugInfo/DWARF/DWARFDebugMacro.cpp
-SRCS_EXT+=	DebugInfo/DWARF/DWARFDebugRangeList.cpp
-SRCS_EXT+=	DebugInfo/DWARF/DWARFFormValue.cpp
-SRCS_EXT+=	DebugInfo/DWARF/DWARFTypeUnit.cpp
-SRCS_EXT+=	DebugInfo/DWARF/DWARFUnit.cpp
-SRCS_EXT+=	DebugInfo/DWARF/DWARFUnitIndex.cpp
-SRCS_EXT+=	DebugInfo/DWARF/SyntaxHighlighting.cpp
+SRCS_MIW+=	DebugInfo/DWARF/DWARFAbbreviationDeclaration.cpp
+SRCS_MIW+=	DebugInfo/DWARF/DWARFAcceleratorTable.cpp
+SRCS_MIW+=	DebugInfo/DWARF/DWARFCompileUnit.cpp
+SRCS_MIW+=	DebugInfo/DWARF/DWARFContext.cpp
+SRCS_MIW+=	DebugInfo/DWARF/DWARFDebugAbbrev.cpp
+SRCS_MIW+=	DebugInfo/DWARF/DWARFDebugArangeSet.cpp
+SRCS_MIW+=	DebugInfo/DWARF/DWARFDebugAranges.cpp
+SRCS_MIW+=	DebugInfo/DWARF/DWARFDebugFrame.cpp
+SRCS_MIW+=	DebugInfo/DWARF/DWARFDebugInfoEntry.cpp
+SRCS_MIW+=	DebugInfo/DWARF/DWARFDebugLine.cpp
+SRCS_MIW+=	DebugInfo/DWARF/DWARFDebugLoc.cpp
+SRCS_MIW+=	DebugInfo/DWARF/DWARFDebugMacro.cpp
+SRCS_MIW+=	DebugInfo/DWARF/DWARFDebugRangeList.cpp
+SRCS_MIW+=	DebugInfo/DWARF/DWARFFormValue.cpp
+SRCS_MIW+=	DebugInfo/DWARF/DWARFTypeUnit.cpp
+SRCS_MIW+=	DebugInfo/DWARF/DWARFUnit.cpp
+SRCS_MIW+=	DebugInfo/DWARF/DWARFUnitIndex.cpp
+SRCS_MIW+=	DebugInfo/DWARF/SyntaxHighlighting.cpp
 SRCS_EXT+=	DebugInfo/PDB/GenericError.cpp
 SRCS_EXT+=	DebugInfo/PDB/PDB.cpp
 SRCS_EXT+=	DebugInfo/PDB/PDBContext.cpp
@@ -699,7 +699,7 @@ SRCS_MIN+=	Target/AArch64/AArch64TargetObjectFile.cpp
 SRCS_MIN+=	Target/AArch64/AArch64TargetTransformInfo.cpp
 SRCS_MIN+=	Target/AArch64/AsmParser/AArch64AsmParser.cpp
 SRCS_XDB+=	Target/AArch64/Disassembler/AArch64Disassembler.cpp
-SRCS_XDB+=	Target/AArch64/Disassembler/AArch64ExternalSymbolizer.cpp
+SRCS_XDW+=	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
@@ -880,7 +880,7 @@ SRCS_MIN+=	Target/TargetSubtargetInfo.cpp
 SRCS_MIN+=	Target/X86/AsmParser/X86AsmInstrumentation.cpp
 SRCS_MIN+=	Target/X86/AsmParser/X86AsmParser.cpp
 SRCS_XDB+=	Target/X86/Disassembler/X86Disassembler.cpp
-SRCS_XDB+=	Target/X86/Disassembler/X86DisassemblerDecoder.cpp
+SRCS_XDW+=	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
@@ -1090,6 +1090,9 @@ SRCS_MIN+=	Transforms/Vectorize/SLPVectorizer.cpp
 SRCS_EXT+=	Transforms/Vectorize/Vectorize.cpp
 
 SRCS_ALL+=	${SRCS_MIN}
+.if !defined(TOOLS_PREFIX)
+SRCS_ALL+=	${SRCS_MIW}
+.endif
 .if ${MK_CLANG_EXTRAS} != "no"
 SRCS_ALL+=	${SRCS_EXT}
 .endif
@@ -1105,6 +1108,9 @@ SRCS_ALL+=	${SRCS_XDB}
 .if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLDB} != "no" || ${MK_LLD} != "no"
 SRCS_ALL+=	${SRCS_XDL}
 .endif
+.if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLDB} != "no" || !defined(TOOLS_PREFIX)
+SRCS_ALL+=	${SRCS_XDW}
+.endif
 SRCS+=		${SRCS_ALL:O}
 
 llvm/IR/Attributes.inc: ${LLVM_SRCS}/include/llvm/IR/Attributes.td
diff --git a/usr.bin/clang/Makefile b/usr.bin/clang/Makefile
index c6ba2b3aa141..0bb49aa43ed2 100644
--- a/usr.bin/clang/Makefile
+++ b/usr.bin/clang/Makefile
@@ -7,6 +7,8 @@ SUBDIR+=	clang-tblgen
 SUBDIR+=	llvm-tblgen
 
 .if !defined(TOOLS_PREFIX)
+SUBDIR+=	llvm-objdump
+
 .if ${MK_CLANG_EXTRAS} != "no"
 SUBDIR+=	bugpoint
 SUBDIR+=	clang-format
@@ -25,7 +27,6 @@ SUBDIR+=	llvm-link
 SUBDIR+=	llvm-lto
 SUBDIR+=	llvm-mc
 SUBDIR+=	llvm-nm
-SUBDIR+=	llvm-objdump
 SUBDIR+=	llvm-pdbdump
 SUBDIR+=	llvm-profdata
 SUBDIR+=	llvm-rtdyld