d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reapply 310775, now it also builds correctly if lldb is disabled:

Browse Source 
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
This commit is contained in:
Dimitry Andric 2016-12-30 18:00:31 +00:00
parent 0c8bd6a7d8
commit 30d4828e63
2 changed files with 35 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
lib/clang/libllvm/Makefile
View File

@ -308,24 +308,24 @@ SRCS_MIN+= DebugInfo/CodeView/TypeRecord.cpp
SRCS_MIN+= DebugInfo/CodeView/TypeRecordBuilder.cpp SRCS_MIN+= DebugInfo/CodeView/TypeRecordBuilder.cpp
SRCS_MIN+= DebugInfo/CodeView/TypeStreamMerger.cpp SRCS_MIN+= DebugInfo/CodeView/TypeStreamMerger.cpp
SRCS_MIN+= DebugInfo/CodeView/TypeTableBuilder.cpp SRCS_MIN+= DebugInfo/CodeView/TypeTableBuilder.cpp
SRCS_EXT+= DebugInfo/DWARF/DWARFAbbreviationDeclaration.cpp SRCS_MIW+= DebugInfo/DWARF/DWARFAbbreviationDeclaration.cpp
SRCS_EXT+= DebugInfo/DWARF/DWARFAcceleratorTable.cpp SRCS_MIW+= DebugInfo/DWARF/DWARFAcceleratorTable.cpp
SRCS_EXT+= DebugInfo/DWARF/DWARFCompileUnit.cpp SRCS_MIW+= DebugInfo/DWARF/DWARFCompileUnit.cpp
SRCS_EXT+= DebugInfo/DWARF/DWARFContext.cpp SRCS_MIW+= DebugInfo/DWARF/DWARFContext.cpp
SRCS_EXT+= DebugInfo/DWARF/DWARFDebugAbbrev.cpp SRCS_MIW+= DebugInfo/DWARF/DWARFDebugAbbrev.cpp
SRCS_EXT+= DebugInfo/DWARF/DWARFDebugArangeSet.cpp SRCS_MIW+= DebugInfo/DWARF/DWARFDebugArangeSet.cpp
SRCS_EXT+= DebugInfo/DWARF/DWARFDebugAranges.cpp SRCS_MIW+= DebugInfo/DWARF/DWARFDebugAranges.cpp
SRCS_EXT+= DebugInfo/DWARF/DWARFDebugFrame.cpp SRCS_MIW+= DebugInfo/DWARF/DWARFDebugFrame.cpp
SRCS_EXT+= DebugInfo/DWARF/DWARFDebugInfoEntry.cpp SRCS_MIW+= DebugInfo/DWARF/DWARFDebugInfoEntry.cpp
SRCS_EXT+= DebugInfo/DWARF/DWARFDebugLine.cpp SRCS_MIW+= DebugInfo/DWARF/DWARFDebugLine.cpp
SRCS_EXT+= DebugInfo/DWARF/DWARFDebugLoc.cpp SRCS_MIW+= DebugInfo/DWARF/DWARFDebugLoc.cpp
SRCS_EXT+= DebugInfo/DWARF/DWARFDebugMacro.cpp SRCS_MIW+= DebugInfo/DWARF/DWARFDebugMacro.cpp
SRCS_EXT+= DebugInfo/DWARF/DWARFDebugRangeList.cpp SRCS_MIW+= DebugInfo/DWARF/DWARFDebugRangeList.cpp
SRCS_EXT+= DebugInfo/DWARF/DWARFFormValue.cpp SRCS_MIW+= DebugInfo/DWARF/DWARFFormValue.cpp
SRCS_EXT+= DebugInfo/DWARF/DWARFTypeUnit.cpp SRCS_MIW+= DebugInfo/DWARF/DWARFTypeUnit.cpp
SRCS_EXT+= DebugInfo/DWARF/DWARFUnit.cpp SRCS_MIW+= DebugInfo/DWARF/DWARFUnit.cpp
SRCS_EXT+= DebugInfo/DWARF/DWARFUnitIndex.cpp SRCS_MIW+= DebugInfo/DWARF/DWARFUnitIndex.cpp
SRCS_EXT+= DebugInfo/DWARF/SyntaxHighlighting.cpp SRCS_MIW+= DebugInfo/DWARF/SyntaxHighlighting.cpp
SRCS_EXT+= DebugInfo/PDB/GenericError.cpp SRCS_EXT+= DebugInfo/PDB/GenericError.cpp
SRCS_EXT+= DebugInfo/PDB/PDB.cpp SRCS_EXT+= DebugInfo/PDB/PDB.cpp
SRCS_EXT+= DebugInfo/PDB/PDBContext.cpp SRCS_EXT+= DebugInfo/PDB/PDBContext.cpp
@ -484,10 +484,10 @@ SRCS_MIN+= MC/MCCodeEmitter.cpp
SRCS_MIN+= MC/MCCodeView.cpp SRCS_MIN+= MC/MCCodeView.cpp
SRCS_MIN+= MC/MCContext.cpp SRCS_MIN+= MC/MCContext.cpp
SRCS_XDL+= MC/MCDisassembler/Disassembler.cpp SRCS_XDL+= MC/MCDisassembler/Disassembler.cpp
SRCS_XDB+= MC/MCDisassembler/MCDisassembler.cpp SRCS_XDW+= MC/MCDisassembler/MCDisassembler.cpp
SRCS_XDB+= MC/MCDisassembler/MCExternalSymbolizer.cpp SRCS_XDW+= MC/MCDisassembler/MCExternalSymbolizer.cpp
SRCS_MIN+= MC/MCDisassembler/MCRelocationInfo.cpp SRCS_MIN+= MC/MCDisassembler/MCRelocationInfo.cpp
SRCS_XDB+= MC/MCDisassembler/MCSymbolizer.cpp SRCS_XDW+= MC/MCDisassembler/MCSymbolizer.cpp
SRCS_MIN+= MC/MCDwarf.cpp SRCS_MIN+= MC/MCDwarf.cpp
SRCS_MIN+= MC/MCELFObjectTargetWriter.cpp SRCS_MIN+= MC/MCELFObjectTargetWriter.cpp
SRCS_MIN+= MC/MCELFStreamer.cpp SRCS_MIN+= MC/MCELFStreamer.cpp
@ -698,8 +698,8 @@ SRCS_MIN+= Target/AArch64/AArch64TargetMachine.cpp
SRCS_MIN+= Target/AArch64/AArch64TargetObjectFile.cpp SRCS_MIN+= Target/AArch64/AArch64TargetObjectFile.cpp
SRCS_MIN+= Target/AArch64/AArch64TargetTransformInfo.cpp SRCS_MIN+= Target/AArch64/AArch64TargetTransformInfo.cpp
SRCS_MIN+= Target/AArch64/AsmParser/AArch64AsmParser.cpp SRCS_MIN+= Target/AArch64/AsmParser/AArch64AsmParser.cpp
SRCS_XDB+= Target/AArch64/Disassembler/AArch64Disassembler.cpp SRCS_XDW+= 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/InstPrinter/AArch64InstPrinter.cpp
SRCS_MIN+= Target/AArch64/MCTargetDesc/AArch64AsmBackend.cpp SRCS_MIN+= Target/AArch64/MCTargetDesc/AArch64AsmBackend.cpp
SRCS_MIN+= Target/AArch64/MCTargetDesc/AArch64ELFObjectWriter.cpp SRCS_MIN+= Target/AArch64/MCTargetDesc/AArch64ELFObjectWriter.cpp
@ -760,7 +760,7 @@ SRCS_MIN+= Target/ARM/Thumb2InstrInfo.cpp
SRCS_MIN+= Target/ARM/Thumb2SizeReduction.cpp SRCS_MIN+= Target/ARM/Thumb2SizeReduction.cpp
SRCS_MIN+= Target/ARM/ThumbRegisterInfo.cpp SRCS_MIN+= Target/ARM/ThumbRegisterInfo.cpp
SRCS_MIN+= Target/Mips/AsmParser/MipsAsmParser.cpp SRCS_MIN+= Target/Mips/AsmParser/MipsAsmParser.cpp
SRCS_XDB+= Target/Mips/Disassembler/MipsDisassembler.cpp SRCS_XDW+= Target/Mips/Disassembler/MipsDisassembler.cpp
SRCS_MIN+= Target/Mips/InstPrinter/MipsInstPrinter.cpp SRCS_MIN+= Target/Mips/InstPrinter/MipsInstPrinter.cpp
SRCS_MIN+= Target/Mips/MCTargetDesc/MipsABIFlagsSection.cpp SRCS_MIN+= Target/Mips/MCTargetDesc/MipsABIFlagsSection.cpp
SRCS_MIN+= Target/Mips/MCTargetDesc/MipsABIInfo.cpp SRCS_MIN+= Target/Mips/MCTargetDesc/MipsABIInfo.cpp
@ -849,7 +849,7 @@ SRCS_MIN+= Target/PowerPC/PPCVSXSwapRemoval.cpp
SRCS_MIN+= Target/PowerPC/TargetInfo/PowerPCTargetInfo.cpp SRCS_MIN+= Target/PowerPC/TargetInfo/PowerPCTargetInfo.cpp
SRCS_MIN+= Target/Sparc/AsmParser/SparcAsmParser.cpp SRCS_MIN+= Target/Sparc/AsmParser/SparcAsmParser.cpp
SRCS_MIN+= Target/Sparc/DelaySlotFiller.cpp SRCS_MIN+= Target/Sparc/DelaySlotFiller.cpp
SRCS_XDB+= Target/Sparc/Disassembler/SparcDisassembler.cpp SRCS_XDW+= Target/Sparc/Disassembler/SparcDisassembler.cpp
SRCS_MIN+= Target/Sparc/InstPrinter/SparcInstPrinter.cpp SRCS_MIN+= Target/Sparc/InstPrinter/SparcInstPrinter.cpp
SRCS_MIN+= Target/Sparc/LeonPasses.cpp SRCS_MIN+= Target/Sparc/LeonPasses.cpp
SRCS_MIN+= Target/Sparc/MCTargetDesc/SparcAsmBackend.cpp SRCS_MIN+= Target/Sparc/MCTargetDesc/SparcAsmBackend.cpp
@ -879,8 +879,8 @@ SRCS_MIN+= Target/TargetRecip.cpp
SRCS_MIN+= Target/TargetSubtargetInfo.cpp SRCS_MIN+= Target/TargetSubtargetInfo.cpp
SRCS_MIN+= Target/X86/AsmParser/X86AsmInstrumentation.cpp SRCS_MIN+= Target/X86/AsmParser/X86AsmInstrumentation.cpp
SRCS_MIN+= Target/X86/AsmParser/X86AsmParser.cpp SRCS_MIN+= Target/X86/AsmParser/X86AsmParser.cpp
SRCS_XDB+= Target/X86/Disassembler/X86Disassembler.cpp SRCS_XDW+= 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/X86ATTInstPrinter.cpp
SRCS_MIN+= Target/X86/InstPrinter/X86InstComments.cpp SRCS_MIN+= Target/X86/InstPrinter/X86InstComments.cpp
SRCS_MIN+= Target/X86/InstPrinter/X86IntelInstPrinter.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_EXT+= Transforms/Vectorize/Vectorize.cpp
SRCS_ALL+= ${SRCS_MIN} SRCS_ALL+= ${SRCS_MIN}
.if !defined(TOOLS_PREFIX)
SRCS_ALL+= ${SRCS_MIW}
.endif
.if ${MK_CLANG_EXTRAS} != "no" .if ${MK_CLANG_EXTRAS} != "no"
SRCS_ALL+= ${SRCS_EXT} SRCS_ALL+= ${SRCS_EXT}
.endif .endif
@ -1105,6 +1108,9 @@ SRCS_ALL+= ${SRCS_XDB}
.if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLDB} != "no" || ${MK_LLD} != "no" .if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLDB} != "no" || ${MK_LLD} != "no"
SRCS_ALL+= ${SRCS_XDL} SRCS_ALL+= ${SRCS_XDL}
.endif .endif
.if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLDB} != "no" || !defined(TOOLS_PREFIX)
SRCS_ALL+= ${SRCS_XDW}
.endif
SRCS+= ${SRCS_ALL:O} SRCS+= ${SRCS_ALL:O}
llvm/IR/Attributes.inc: ${LLVM_SRCS}/include/llvm/IR/Attributes.td llvm/IR/Attributes.inc: ${LLVM_SRCS}/include/llvm/IR/Attributes.td

3
usr.bin/clang/Makefile
View File

@ -7,6 +7,8 @@ SUBDIR+= clang-tblgen
SUBDIR+= llvm-tblgen SUBDIR+= llvm-tblgen
.if !defined(TOOLS_PREFIX) .if !defined(TOOLS_PREFIX)
SUBDIR+= llvm-objdump
.if ${MK_CLANG_EXTRAS} != "no" .if ${MK_CLANG_EXTRAS} != "no"
SUBDIR+= bugpoint SUBDIR+= bugpoint
SUBDIR+= clang-format SUBDIR+= clang-format
@ -25,7 +27,6 @@ SUBDIR+= llvm-link
SUBDIR+= llvm-lto SUBDIR+= llvm-lto
SUBDIR+= llvm-mc SUBDIR+= llvm-mc
SUBDIR+= llvm-nm SUBDIR+= llvm-nm
SUBDIR+= llvm-objdump
SUBDIR+= llvm-pdbdump SUBDIR+= llvm-pdbdump
SUBDIR+= llvm-profdata SUBDIR+= llvm-profdata
SUBDIR+= llvm-rtdyld SUBDIR+= llvm-rtdyld