llvm: updated to 6.0.1

6.0.1:

Non-comprehensive list of changes in this release

Support for retpolines was added to help mitigate “branch target injection” (variant 2) of the “Spectre” speculative side channels described by Project Zero and the Spectre paper.
The Redirects argument of llvm::sys::ExecuteAndWait and llvm::sys::ExecuteNoWait was changed to an ArrayRef of optional StringRef‘s to make it safer and more convenient to use.
The backend name was added to the Target Registry to allow run-time information to be fed back into TableGen. Out-of-tree targets will need to add the name used in the def X : Target definition to the call to RegisterTarget.
The Debugify pass was added to opt to facilitate testing of debug info preservation. This pass attaches synthetic DILocations and DIVariables to the instructions in a Module. The CheckDebugify pass determines how much of the metadata is lost.
Significantly improved quality of CodeView debug info for Windows.
Preliminary support for Sanitizers and sibling features on X86(_64) NetBSD (ASan, UBsan, TSan, MSan, SafeStack, libFuzzer).

Changes to the LLVM IR
----------------------
The fast-math-flags (FMF) have been updated. Previously, the ‘fast’ flag indicated that floating-point reassociation was allowed and all other flags were set too. The ‘fast’ flag still exists, but there is a new flag called ‘reassoc’ to indicate specifically that reassociation is allowed. A new bit called ‘afn’ was also added to selectively allow approximations for common mathlib functions like square-root. The new flags provide more flexibility to enable/disable specific floating-point optimizations. Making the optimizer respond appropriately to these flags is an ongoing effort.

Changes to the AArch64 Target
-----------------------------
Enabled the new GlobalISel instruction selection framework by default at -O0.

Changes to the ARM Target
-------------------------
Support for enabling SjLj exception handling on platforms where it isn’t the default.

Changes to the Hexagon Target
-----------------------------
The Hexagon backend now supports V65 ISA.
The -mhvx option now takes an optional value that specifies the ISA version of the HVX coprocessor. The available values are v60, v62 and v65. By default, the value is set to be the same as the CPU version.
The compiler option -mhvx-double is deprecated and will be removed in the next release of the compiler. Programmers should use the -mhvx-length option to specify the desired vector length: -mhvx-length=64b for 64-byte vectors and -mhvx-length=128b for 128-byte vectors. While the current default vector length is 64 bytes, users should always specify the length explicitly, since the default value may change in the future.
The target feature hvx-double is deprecated and will be removed in the next release. LLVM IR generators should use target features hvx-length64b and hvx-length128b to indicate the vector length. The length should always be specified when HVX code generation is enabled.

Changes to the MIPS Target
--------------------------
Fixed numerous bugs:

fpowi on MIPS64 giving incorrect results when used with a negative integer.
Usage of the asm ‘c’ constraint with the wrong datatype causing an assert/crash.
Fixed a conversion bug when using the DSP ASE.
Fixed an inconsistency where objects were not marked as using the microMIPS as when the micromips function attribute or the ”.set micromips” directive was used.
Reordered the MIPSR6 specific hazard scheduler pass to after the delay slot filler, fixing a class of rare edge case bugs where the delay slot filler would violate ISA restrictions.
Fixed a crash when using a type of unknown size with gp relative addressing.
Corrected the j macro for microMIPS.
Corrected the encoding of movep for microMIPS32r6.
Fixed an issue with the usage of insert instructions having an invalid set of operands.
Fixed an issue where TLS symbols were not marked as such.
Enabled the usage of register scavenging with MSA, due to its shorter offsets for loads and stores.
Corrected the ELF headers when using the DSP ASE.

New features:

The long branch pass now generates some R6 specific instructions when targeting MIPSR6.
The delay slot filler now performs more branch conversions if delay slots cannot be filled.
The MIPS MT ASE is now fully supported.
Added support for the lapc pseudo instruction.
Improved the selection of multiple instructions (dext, nmadd, nmsub).
Further improved microMIPS codesize reduction.

Deprecation notices:

microMIPS64R6 support was been deprecated since 5.0, and has now been completely removed.

Changes to the SystemZ Target
-----------------------------
During this release the SystemZ target has:

Added support for 128-bit atomic operations.
Added support for the “o” constraint for inline asm statements.

Changes to the X86 Target
-------------------------
During this release the X86 target has:

Added support for enabling SjLj exception handling on platforms where it isn’t the default.
Added intrinsics for Intel Extensions: VAES, GFNI, VPCLMULQDQ, AVX512VBMI2, AVX512BITALG, AVX512VNNI.
Added support for Intel Icelake CPU.
Fixed some X87 codegen bugs.
Added instruction scheduling information for Intel Sandy Bridge, Ivy Bridge, Haswell, Broadwell, and Skylake CPUs.
Improved scheduler model for AMD Jaguar CPUs.
Improved llvm-mc’s disassembler for some EVEX encoded instructions.
Add support for i8 and i16 vector signed/unsigned min/max horizontal reductions.
Improved codegen for memory comparisons
Improved codegen for i32 vector multiplies
Improved codegen for scalar integer absolute values
Improved codegen for vector integer rotations (XOP and AVX512)
Improved codegen of data being transferred between GPRs and K-registers.
Improved codegen for vector truncations.
Improved folding of address computations into gather/scatter instructions.
Gained initial support recognizing variable shuffles from vector element extracts and inserts.
Improved documentation for SSE/AVX intrinsics in intrin.h header files.
Gained support for emitting retpolines, including automatic insertion of the necessary thunks or using external thunks.

5 files changed, 112 insertions, 56 deletions

diff --git a/lang/llvm/Makefile b/lang/llvm/Makefile
index ccd265acb39..f567c162abc 100644
--- a/lang/llvm/Makefile
+++ b/lang/llvm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2018/05/22 12:39:23 adam Exp $
+# $NetBSD: Makefile,v 1.32 2018/08/07 10:44:50 adam Exp $
 #
 # when updating this, please also update:
 # devel/include-what-you-use
@@ -16,7 +16,7 @@
 # Always update all */buildlink3.mk to require the latest stable release
 # version in BUILDLINK_API_DEPENDS, as there is no backwards compatibility
 
-DISTNAME=	llvm-5.0.2.src
+DISTNAME=	llvm-6.0.1.src
 PKGNAME=	${DISTNAME:S/.src//}
 CATEGORIES=	lang devel
 MASTER_SITES=	http://llvm.org/releases/${PKGVERSION_NOREV}/
@@ -103,4 +103,5 @@ post-extract:
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../lang/python/tool.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/llvm/PLIST b/lang/llvm/PLIST
index 470d1f5ca0a..e1eb455345a 100644
--- a/lang/llvm/PLIST
+++ b/lang/llvm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2017/12/01 19:22:12 adam Exp $
+@comment $NetBSD: PLIST,v 1.7 2018/08/07 10:44:50 adam Exp $
 bin/FileCheck
 bin/bugpoint
 bin/count
@@ -11,6 +11,7 @@ bin/llvm-as
 bin/llvm-bcanalyzer
 bin/llvm-c-test
 bin/llvm-cat
+bin/llvm-cfi-verify
 bin/llvm-config
 bin/llvm-cov
 bin/llvm-cvtres
@@ -32,11 +33,13 @@ bin/llvm-mcmarkup
 bin/llvm-modextract
 bin/llvm-mt
 bin/llvm-nm
+bin/llvm-objcopy
 bin/llvm-objdump
 bin/llvm-opt-report
 bin/llvm-pdbutil
 bin/llvm-profdata
 bin/llvm-ranlib
+bin/llvm-rc
 bin/llvm-readelf
 bin/llvm-readobj
 bin/llvm-rtdyld
@@ -59,6 +62,7 @@ include/llvm-c/Analysis.h
 include/llvm-c/BitReader.h
 include/llvm-c/BitWriter.h
 include/llvm-c/Core.h
+include/llvm-c/DebugInfo.h
 include/llvm-c/Disassembler.h
 include/llvm-c/ErrorHandling.h
 include/llvm-c/ExecutionEngine.h
@@ -169,6 +173,7 @@ include/llvm/Analysis/CallGraph.h
 include/llvm/Analysis/CallGraphSCCPass.h
 include/llvm/Analysis/CallPrinter.h
 include/llvm/Analysis/CaptureTracking.h
+include/llvm/Analysis/CmpInstAnalysis.h
 include/llvm/Analysis/CodeMetrics.h
 include/llvm/Analysis/ConstantFolding.h
 include/llvm/Analysis/DOTGraphTraitsPass.h
@@ -212,7 +217,7 @@ include/llvm/Analysis/ObjCARCAliasAnalysis.h
 include/llvm/Analysis/ObjCARCAnalysisUtils.h
 include/llvm/Analysis/ObjCARCInstKind.h
 include/llvm/Analysis/ObjectUtils.h
-include/llvm/Analysis/OptimizationDiagnosticInfo.h
+include/llvm/Analysis/OptimizationRemarkEmitter.h
 include/llvm/Analysis/OrderedBasicBlock.h
 include/llvm/Analysis/PHITransAddr.h
 include/llvm/Analysis/Passes.h
@@ -239,6 +244,8 @@ include/llvm/Analysis/TargetTransformInfoImpl.h
 include/llvm/Analysis/Trace.h
 include/llvm/Analysis/TypeBasedAliasAnalysis.h
 include/llvm/Analysis/TypeMetadataUtils.h
+include/llvm/Analysis/ValueLattice.h
+include/llvm/Analysis/ValueLatticeUtils.h
 include/llvm/Analysis/ValueTracking.h
 include/llvm/Analysis/VectorUtils.h
 include/llvm/AsmParser/Parser.h
@@ -249,6 +256,7 @@ include/llvm/BinaryFormat/Dwarf.h
 include/llvm/BinaryFormat/ELF.h
 include/llvm/BinaryFormat/ELFRelocs/AArch64.def
 include/llvm/BinaryFormat/ELFRelocs/AMDGPU.def
+include/llvm/BinaryFormat/ELFRelocs/ARC.def
 include/llvm/BinaryFormat/ELFRelocs/ARM.def
 include/llvm/BinaryFormat/ELFRelocs/AVR.def
 include/llvm/BinaryFormat/ELFRelocs/BPF.def
@@ -267,7 +275,7 @@ include/llvm/BinaryFormat/MachO.def
 include/llvm/BinaryFormat/MachO.h
 include/llvm/BinaryFormat/Magic.h
 include/llvm/BinaryFormat/Wasm.h
-include/llvm/BinaryFormat/WasmRelocs/WebAssembly.def
+include/llvm/BinaryFormat/WasmRelocs.def
 include/llvm/Bitcode/BitCodes.h
 include/llvm/Bitcode/BitcodeReader.h
 include/llvm/Bitcode/BitcodeWriter.h
@@ -281,7 +289,8 @@ include/llvm/CodeGen/AtomicExpandUtils.h
 include/llvm/CodeGen/BasicTTIImpl.h
 include/llvm/CodeGen/CalcSpillWeights.h
 include/llvm/CodeGen/CallingConvLower.h
-include/llvm/CodeGen/CommandFlags.h
+include/llvm/CodeGen/CommandFlags.def
+include/llvm/CodeGen/CostTable.h
 include/llvm/CodeGen/DAGCombine.h
 include/llvm/CodeGen/DFAPacketizer.h
 include/llvm/CodeGen/DIE.h
@@ -298,11 +307,12 @@ include/llvm/CodeGen/GCMetadataPrinter.h
 include/llvm/CodeGen/GCStrategy.h
 include/llvm/CodeGen/GCs.h
 include/llvm/CodeGen/GlobalISel/CallLowering.h
-include/llvm/CodeGen/GlobalISel/GISelAccessor.h
+include/llvm/CodeGen/GlobalISel/GISelWorkList.h
 include/llvm/CodeGen/GlobalISel/IRTranslator.h
 include/llvm/CodeGen/GlobalISel/InstructionSelect.h
 include/llvm/CodeGen/GlobalISel/InstructionSelector.h
 include/llvm/CodeGen/GlobalISel/InstructionSelectorImpl.h
+include/llvm/CodeGen/GlobalISel/LegalizationArtifactCombiner.h
 include/llvm/CodeGen/GlobalISel/Legalizer.h
 include/llvm/CodeGen/GlobalISel/LegalizerHelper.h
 include/llvm/CodeGen/GlobalISel/LegalizerInfo.h
@@ -321,13 +331,13 @@ include/llvm/CodeGen/LexicalScopes.h
 include/llvm/CodeGen/LinkAllAsmWriterComponents.h
 include/llvm/CodeGen/LinkAllCodegenComponents.h
 include/llvm/CodeGen/LiveInterval.h
-include/llvm/CodeGen/LiveIntervalAnalysis.h
 include/llvm/CodeGen/LiveIntervalUnion.h
+include/llvm/CodeGen/LiveIntervals.h
 include/llvm/CodeGen/LivePhysRegs.h
 include/llvm/CodeGen/LiveRangeEdit.h
 include/llvm/CodeGen/LiveRegMatrix.h
 include/llvm/CodeGen/LiveRegUnits.h
-include/llvm/CodeGen/LiveStackAnalysis.h
+include/llvm/CodeGen/LiveStacks.h
 include/llvm/CodeGen/LiveVariables.h
 include/llvm/CodeGen/LowLevelType.h
 include/llvm/CodeGen/MIRParser/MIRParser.h
@@ -381,7 +391,9 @@ include/llvm/CodeGen/RegisterPressure.h
 include/llvm/CodeGen/RegisterScavenging.h
 include/llvm/CodeGen/RegisterUsageInfo.h
 include/llvm/CodeGen/ResourcePriorityQueue.h
+include/llvm/CodeGen/RuntimeLibcalls.def
 include/llvm/CodeGen/RuntimeLibcalls.h
+include/llvm/CodeGen/SDNodeProperties.td
 include/llvm/CodeGen/ScheduleDAG.h
 include/llvm/CodeGen/ScheduleDAGInstrs.h
 include/llvm/CodeGen/ScheduleDAGMutation.h
@@ -398,9 +410,18 @@ include/llvm/CodeGen/SlotIndexes.h
 include/llvm/CodeGen/StackMaps.h
 include/llvm/CodeGen/StackProtector.h
 include/llvm/CodeGen/TailDuplicator.h
+include/llvm/CodeGen/TargetCallingConv.h
+include/llvm/CodeGen/TargetFrameLowering.h
+include/llvm/CodeGen/TargetInstrInfo.h
+include/llvm/CodeGen/TargetLowering.h
+include/llvm/CodeGen/TargetLoweringObjectFile.h
 include/llvm/CodeGen/TargetLoweringObjectFileImpl.h
+include/llvm/CodeGen/TargetOpcodes.def
+include/llvm/CodeGen/TargetOpcodes.h
 include/llvm/CodeGen/TargetPassConfig.h
+include/llvm/CodeGen/TargetRegisterInfo.h
 include/llvm/CodeGen/TargetSchedule.h
+include/llvm/CodeGen/TargetSubtargetInfo.h
 include/llvm/CodeGen/UnreachableBlockElim.h
 include/llvm/CodeGen/ValueTypes.h
 include/llvm/CodeGen/ValueTypes.td
@@ -412,6 +433,7 @@ include/llvm/Config/Disassemblers.def
 include/llvm/Config/Targets.def
 include/llvm/Config/abi-breaking.h
 include/llvm/Config/llvm-config.h
+include/llvm/DebugInfo/CodeView/AppendingTypeTableBuilder.h
 include/llvm/DebugInfo/CodeView/CVDebugRecord.h
 include/llvm/DebugInfo/CodeView/CVRecord.h
 include/llvm/DebugInfo/CodeView/CVSymbolVisitor.h
@@ -419,8 +441,10 @@ include/llvm/DebugInfo/CodeView/CVTypeVisitor.h
 include/llvm/DebugInfo/CodeView/CodeView.h
 include/llvm/DebugInfo/CodeView/CodeViewError.h
 include/llvm/DebugInfo/CodeView/CodeViewRecordIO.h
+include/llvm/DebugInfo/CodeView/CodeViewRegisters.def
 include/llvm/DebugInfo/CodeView/CodeViewSymbols.def
 include/llvm/DebugInfo/CodeView/CodeViewTypes.def
+include/llvm/DebugInfo/CodeView/ContinuationRecordBuilder.h
 include/llvm/DebugInfo/CodeView/DebugChecksumsSubsection.h
 include/llvm/DebugInfo/CodeView/DebugCrossExSubsection.h
 include/llvm/DebugInfo/CodeView/DebugCrossImpSubsection.h
@@ -438,9 +462,13 @@ include/llvm/DebugInfo/CodeView/EnumTables.h
 include/llvm/DebugInfo/CodeView/Formatters.h
 include/llvm/DebugInfo/CodeView/FunctionId.h
 include/llvm/DebugInfo/CodeView/GUID.h
+include/llvm/DebugInfo/CodeView/GlobalTypeTableBuilder.h
 include/llvm/DebugInfo/CodeView/LazyRandomTypeCollection.h
 include/llvm/DebugInfo/CodeView/Line.h
+include/llvm/DebugInfo/CodeView/MergingTypeTableBuilder.h
+include/llvm/DebugInfo/CodeView/RecordName.h
 include/llvm/DebugInfo/CodeView/RecordSerialization.h
+include/llvm/DebugInfo/CodeView/SimpleTypeSerializer.h
 include/llvm/DebugInfo/CodeView/StringsAndChecksums.h
 include/llvm/DebugInfo/CodeView/SymbolDeserializer.h
 include/llvm/DebugInfo/CodeView/SymbolDumpDelegate.h
@@ -454,16 +482,13 @@ include/llvm/DebugInfo/CodeView/SymbolVisitorDelegate.h
 include/llvm/DebugInfo/CodeView/TypeCollection.h
 include/llvm/DebugInfo/CodeView/TypeDeserializer.h
 include/llvm/DebugInfo/CodeView/TypeDumpVisitor.h
+include/llvm/DebugInfo/CodeView/TypeHashing.h
 include/llvm/DebugInfo/CodeView/TypeIndex.h
 include/llvm/DebugInfo/CodeView/TypeIndexDiscovery.h
-include/llvm/DebugInfo/CodeView/TypeName.h
 include/llvm/DebugInfo/CodeView/TypeRecord.h
-include/llvm/DebugInfo/CodeView/TypeRecordBuilder.h
 include/llvm/DebugInfo/CodeView/TypeRecordMapping.h
-include/llvm/DebugInfo/CodeView/TypeSerializer.h
 include/llvm/DebugInfo/CodeView/TypeStreamMerger.h
 include/llvm/DebugInfo/CodeView/TypeSymbolEmitter.h
-include/llvm/DebugInfo/CodeView/TypeTableBuilder.h
 include/llvm/DebugInfo/CodeView/TypeTableCollection.h
 include/llvm/DebugInfo/CodeView/TypeVisitorCallbackPipeline.h
 include/llvm/DebugInfo/CodeView/TypeVisitorCallbacks.h
@@ -485,8 +510,10 @@ include/llvm/DebugInfo/DWARF/DWARFDebugMacro.h
 include/llvm/DebugInfo/DWARF/DWARFDebugPubTable.h
 include/llvm/DebugInfo/DWARF/DWARFDebugRangeList.h
 include/llvm/DebugInfo/DWARF/DWARFDie.h
+include/llvm/DebugInfo/DWARF/DWARFExpression.h
 include/llvm/DebugInfo/DWARF/DWARFFormValue.h
 include/llvm/DebugInfo/DWARF/DWARFGdbIndex.h
+include/llvm/DebugInfo/DWARF/DWARFObject.h
 include/llvm/DebugInfo/DWARF/DWARFRelocMap.h
 include/llvm/DebugInfo/DWARF/DWARFSection.h
 include/llvm/DebugInfo/DWARF/DWARFTypeUnit.h
@@ -497,7 +524,6 @@ include/llvm/DebugInfo/MSF/IMSFFile.h
 include/llvm/DebugInfo/MSF/MSFBuilder.h
 include/llvm/DebugInfo/MSF/MSFCommon.h
 include/llvm/DebugInfo/MSF/MSFError.h
-include/llvm/DebugInfo/MSF/MSFStreamLayout.h
 include/llvm/DebugInfo/MSF/MappedBlockStream.h
 include/llvm/DebugInfo/PDB/ConcreteSymbolEnumerator.h
 include/llvm/DebugInfo/PDB/DIA/DIADataStream.h
@@ -505,12 +531,14 @@ include/llvm/DebugInfo/PDB/DIA/DIAEnumDebugStreams.h
 include/llvm/DebugInfo/PDB/DIA/DIAEnumLineNumbers.h
 include/llvm/DebugInfo/PDB/DIA/DIAEnumSourceFiles.h
 include/llvm/DebugInfo/PDB/DIA/DIAEnumSymbols.h
+include/llvm/DebugInfo/PDB/DIA/DIAEnumTables.h
 include/llvm/DebugInfo/PDB/DIA/DIAError.h
 include/llvm/DebugInfo/PDB/DIA/DIALineNumber.h
 include/llvm/DebugInfo/PDB/DIA/DIARawSymbol.h
 include/llvm/DebugInfo/PDB/DIA/DIASession.h
 include/llvm/DebugInfo/PDB/DIA/DIASourceFile.h
 include/llvm/DebugInfo/PDB/DIA/DIASupport.h
+include/llvm/DebugInfo/PDB/DIA/DIATable.h
 include/llvm/DebugInfo/PDB/GenericError.h
 include/llvm/DebugInfo/PDB/IPDBDataStream.h
 include/llvm/DebugInfo/PDB/IPDBEnumChildren.h
@@ -518,6 +546,7 @@ include/llvm/DebugInfo/PDB/IPDBLineNumber.h
 include/llvm/DebugInfo/PDB/IPDBRawSymbol.h
 include/llvm/DebugInfo/PDB/IPDBSession.h
 include/llvm/DebugInfo/PDB/IPDBSourceFile.h
+include/llvm/DebugInfo/PDB/IPDBTable.h
 include/llvm/DebugInfo/PDB/Native/DbiModuleDescriptor.h
 include/llvm/DebugInfo/PDB/Native/DbiModuleDescriptorBuilder.h
 include/llvm/DebugInfo/PDB/Native/DbiModuleList.h
@@ -525,6 +554,7 @@ include/llvm/DebugInfo/PDB/Native/DbiStream.h
 include/llvm/DebugInfo/PDB/Native/DbiStreamBuilder.h
 include/llvm/DebugInfo/PDB/Native/EnumTables.h
 include/llvm/DebugInfo/PDB/Native/Formatters.h
+include/llvm/DebugInfo/PDB/Native/GSIStreamBuilder.h
 include/llvm/DebugInfo/PDB/Native/GlobalsStream.h
 include/llvm/DebugInfo/PDB/Native/Hash.h
 include/llvm/DebugInfo/PDB/Native/HashTable.h
@@ -536,6 +566,8 @@ include/llvm/DebugInfo/PDB/Native/NamedStreamMap.h
 include/llvm/DebugInfo/PDB/Native/NativeBuiltinSymbol.h
 include/llvm/DebugInfo/PDB/Native/NativeCompilandSymbol.h
 include/llvm/DebugInfo/PDB/Native/NativeEnumModules.h
+include/llvm/DebugInfo/PDB/Native/NativeEnumSymbol.h
+include/llvm/DebugInfo/PDB/Native/NativeEnumTypes.h
 include/llvm/DebugInfo/PDB/Native/NativeExeSymbol.h
 include/llvm/DebugInfo/PDB/Native/NativeRawSymbol.h
 include/llvm/DebugInfo/PDB/Native/NativeSession.h
@@ -544,7 +576,6 @@ include/llvm/DebugInfo/PDB/Native/PDBFileBuilder.h
 include/llvm/DebugInfo/PDB/Native/PDBStringTable.h
 include/llvm/DebugInfo/PDB/Native/PDBStringTableBuilder.h
 include/llvm/DebugInfo/PDB/Native/PublicsStream.h
-include/llvm/DebugInfo/PDB/Native/PublicsStreamBuilder.h
 include/llvm/DebugInfo/PDB/Native/RawConstants.h
 include/llvm/DebugInfo/PDB/Native/RawError.h
 include/llvm/DebugInfo/PDB/Native/RawTypes.h
@@ -623,11 +654,19 @@ include/llvm/ExecutionEngine/Orc/RPCSerialization.h
 include/llvm/ExecutionEngine/Orc/RPCUtils.h
 include/llvm/ExecutionEngine/Orc/RTDyldObjectLinkingLayer.h
 include/llvm/ExecutionEngine/Orc/RawByteChannel.h
+include/llvm/ExecutionEngine/Orc/RemoteObjectLayer.h
+include/llvm/ExecutionEngine/Orc/SymbolStringPool.h
 include/llvm/ExecutionEngine/OrcMCJITReplacement.h
 include/llvm/ExecutionEngine/RTDyldMemoryManager.h
 include/llvm/ExecutionEngine/RuntimeDyld.h
 include/llvm/ExecutionEngine/RuntimeDyldChecker.h
 include/llvm/ExecutionEngine/SectionMemoryManager.h
+include/llvm/FuzzMutate/FuzzerCLI.h
+include/llvm/FuzzMutate/IRMutator.h
+include/llvm/FuzzMutate/OpDescriptor.h
+include/llvm/FuzzMutate/Operations.h
+include/llvm/FuzzMutate/Random.h
+include/llvm/FuzzMutate/RandomIRBuilder.h
 include/llvm/IR/Argument.h
 include/llvm/IR/AssemblyAnnotationWriter.h
 include/llvm/IR/Attributes.gen
@@ -651,6 +690,7 @@ include/llvm/IR/DebugInfoMetadata.h
 include/llvm/IR/DebugLoc.h
 include/llvm/IR/DerivedTypes.h
 include/llvm/IR/DerivedUser.h
+include/llvm/IR/DiagnosticHandler.h
 include/llvm/IR/DiagnosticInfo.h
 include/llvm/IR/DiagnosticPrinter.h
 include/llvm/IR/Dominators.h
@@ -749,8 +789,10 @@ include/llvm/MC/MCAsmInfoDarwin.h
 include/llvm/MC/MCAsmInfoELF.h
 include/llvm/MC/MCAsmInfoWasm.h
 include/llvm/MC/MCAsmLayout.h
+include/llvm/MC/MCAsmMacro.h
 include/llvm/MC/MCAssembler.h
 include/llvm/MC/MCCodeEmitter.h
+include/llvm/MC/MCCodePadder.h
 include/llvm/MC/MCCodeView.h
 include/llvm/MC/MCContext.h
 include/llvm/MC/MCDirectives.h
@@ -802,7 +844,7 @@ include/llvm/MC/MCSymbolELF.h
 include/llvm/MC/MCSymbolMachO.h
 include/llvm/MC/MCSymbolWasm.h
 include/llvm/MC/MCTargetOptions.h
-include/llvm/MC/MCTargetOptionsCommandFlags.h
+include/llvm/MC/MCTargetOptionsCommandFlags.def
 include/llvm/MC/MCValue.h
 include/llvm/MC/MCWasmObjectWriter.h
 include/llvm/MC/MCWasmStreamer.h
@@ -840,6 +882,7 @@ include/llvm/Object/WindowsResource.h
 include/llvm/ObjectYAML/COFFYAML.h
 include/llvm/ObjectYAML/CodeViewYAMLDebugSections.h
 include/llvm/ObjectYAML/CodeViewYAMLSymbols.h
+include/llvm/ObjectYAML/CodeViewYAMLTypeHashing.h
 include/llvm/ObjectYAML/CodeViewYAMLTypes.h
 include/llvm/ObjectYAML/DWARFEmitter.h
 include/llvm/ObjectYAML/DWARFYAML.h
@@ -863,6 +906,7 @@ include/llvm/Passes/PassBuilder.h
 include/llvm/ProfileData/Coverage/CoverageMapping.h
 include/llvm/ProfileData/Coverage/CoverageMappingReader.h
 include/llvm/ProfileData/Coverage/CoverageMappingWriter.h
+include/llvm/ProfileData/GCOV.h
 include/llvm/ProfileData/InstrProf.h
 include/llvm/ProfileData/InstrProfData.inc
 include/llvm/ProfileData/InstrProfReader.h
@@ -872,7 +916,8 @@ include/llvm/ProfileData/SampleProf.h
 include/llvm/ProfileData/SampleProfReader.h
 include/llvm/ProfileData/SampleProfWriter.h
 include/llvm/Support/AArch64TargetParser.def
-include/llvm/Support/AMDGPUCodeObjectMetadata.h
+include/llvm/Support/AMDGPUKernelDescriptor.h
+include/llvm/Support/AMDGPUMetadata.h
 include/llvm/Support/ARMAttributeParser.h
 include/llvm/Support/ARMBuildAttributes.h
 include/llvm/Support/ARMEHABI.h
@@ -901,6 +946,7 @@ include/llvm/Support/Casting.h
 include/llvm/Support/Chrono.h
 include/llvm/Support/CodeGen.h
 include/llvm/Support/CodeGenCWrappers.h
+include/llvm/Support/CodeGenCoverage.h
 include/llvm/Support/CommandLine.h
 include/llvm/Support/Compiler.h
 include/llvm/Support/Compression.h
@@ -929,7 +975,6 @@ include/llvm/Support/FormatProviders.h
 include/llvm/Support/FormatVariadic.h
 include/llvm/Support/FormatVariadicDetails.h
 include/llvm/Support/FormattedStream.h
-include/llvm/Support/GCOV.h
 include/llvm/Support/GenericDomTree.h
 include/llvm/Support/GenericDomTreeConstruction.h
 include/llvm/Support/GlobPattern.h
@@ -1002,6 +1047,7 @@ include/llvm/Support/Valgrind.h
 include/llvm/Support/Watchdog.h
 include/llvm/Support/Win64EH.h
 include/llvm/Support/WindowsError.h
+include/llvm/Support/X86TargetParser.def
 include/llvm/Support/YAMLParser.h
 include/llvm/Support/YAMLTraits.h
 include/llvm/Support/circular_raw_ostream.h
@@ -1019,28 +1065,18 @@ include/llvm/TableGen/SetTheory.h
 include/llvm/TableGen/StringMatcher.h
 include/llvm/TableGen/StringToOffsetTable.h
 include/llvm/TableGen/TableGenBackend.h
-include/llvm/Target/CostTable.h
 include/llvm/Target/GenericOpcodes.td
 include/llvm/Target/GlobalISel/RegisterBank.td
 include/llvm/Target/GlobalISel/SelectionDAGCompat.td
 include/llvm/Target/GlobalISel/Target.td
 include/llvm/Target/Target.td
-include/llvm/Target/TargetCallingConv.h
 include/llvm/Target/TargetCallingConv.td
-include/llvm/Target/TargetFrameLowering.h
-include/llvm/Target/TargetInstrInfo.h
 include/llvm/Target/TargetIntrinsicInfo.h
 include/llvm/Target/TargetItinerary.td
-include/llvm/Target/TargetLowering.h
-include/llvm/Target/TargetLoweringObjectFile.h
 include/llvm/Target/TargetMachine.h
-include/llvm/Target/TargetOpcodes.def
-include/llvm/Target/TargetOpcodes.h
 include/llvm/Target/TargetOptions.h
-include/llvm/Target/TargetRegisterInfo.h
 include/llvm/Target/TargetSchedule.td
 include/llvm/Target/TargetSelectionDAG.td
-include/llvm/Target/TargetSubtargetInfo.h
 include/llvm/Testing/Support/Error.h
 include/llvm/Testing/Support/SupportHelpers.h
 include/llvm/ToolDrivers/llvm-dlltool/DlltoolDriver.h
@@ -1050,6 +1086,7 @@ include/llvm/Transforms/GCOVProfiler.h
 include/llvm/Transforms/IPO.h
 include/llvm/Transforms/IPO/AlwaysInliner.h
 include/llvm/Transforms/IPO/ArgumentPromotion.h
+include/llvm/Transforms/IPO/CalledValuePropagation.h
 include/llvm/Transforms/IPO/ConstantMerge.h
 include/llvm/Transforms/IPO/CrossDSOCFI.h
 include/llvm/Transforms/IPO/DeadArgumentElimination.h
@@ -1074,6 +1111,7 @@ include/llvm/Transforms/InstCombine/InstCombine.h
 include/llvm/Transforms/InstCombine/InstCombineWorklist.h
 include/llvm/Transforms/InstrProfiling.h
 include/llvm/Transforms/Instrumentation.h
+include/llvm/Transforms/Instrumentation/BoundsChecking.h
 include/llvm/Transforms/ObjCARC.h
 include/llvm/Transforms/PGOInstrumentation.h
 include/llvm/Transforms/SampleProfile.h
@@ -1081,10 +1119,12 @@ include/llvm/Transforms/Scalar.h
 include/llvm/Transforms/Scalar/ADCE.h
 include/llvm/Transforms/Scalar/AlignmentFromAssumptions.h
 include/llvm/Transforms/Scalar/BDCE.h
+include/llvm/Transforms/Scalar/CallSiteSplitting.h
 include/llvm/Transforms/Scalar/ConstantHoisting.h
 include/llvm/Transforms/Scalar/CorrelatedValuePropagation.h
 include/llvm/Transforms/Scalar/DCE.h
 include/llvm/Transforms/Scalar/DeadStoreElimination.h
+include/llvm/Transforms/Scalar/DivRemPairs.h
 include/llvm/Transforms/Scalar/EarlyCSE.h
 include/llvm/Transforms/Scalar/Float2Int.h
 include/llvm/Transforms/Scalar/GVN.h
@@ -1117,11 +1157,13 @@ include/llvm/Transforms/Scalar/NaryReassociate.h
 include/llvm/Transforms/Scalar/NewGVN.h
 include/llvm/Transforms/Scalar/PartiallyInlineLibCalls.h
 include/llvm/Transforms/Scalar/Reassociate.h
+include/llvm/Transforms/Scalar/RewriteStatepointsForGC.h
 include/llvm/Transforms/Scalar/SCCP.h
 include/llvm/Transforms/Scalar/SROA.h
 include/llvm/Transforms/Scalar/SimpleLoopUnswitch.h
 include/llvm/Transforms/Scalar/SimplifyCFG.h
 include/llvm/Transforms/Scalar/Sink.h
+include/llvm/Transforms/Scalar/SpeculateAroundPHIs.h
 include/llvm/Transforms/Scalar/SpeculativeExecution.h
 include/llvm/Transforms/Scalar/TailRecursionElimination.h
 include/llvm/Transforms/Utils/ASanStackFrameLayout.h
@@ -1130,10 +1172,11 @@ include/llvm/Transforms/Utils/BasicBlockUtils.h
 include/llvm/Transforms/Utils/BreakCriticalEdges.h
 include/llvm/Transforms/Utils/BuildLibCalls.h
 include/llvm/Transforms/Utils/BypassSlowDivision.h
+include/llvm/Transforms/Utils/CallPromotionUtils.h
 include/llvm/Transforms/Utils/Cloning.h
-include/llvm/Transforms/Utils/CmpInstAnalysis.h
 include/llvm/Transforms/Utils/CodeExtractor.h
 include/llvm/Transforms/Utils/CtorUtils.h
+include/llvm/Transforms/Utils/EntryExitInstrumenter.h
 include/llvm/Transforms/Utils/EscapeEnumerator.h
 include/llvm/Transforms/Utils/Evaluator.h
 include/llvm/Transforms/Utils/FunctionComparator.h
@@ -1170,6 +1213,10 @@ include/llvm/Transforms/Utils/ValueMapper.h
 include/llvm/Transforms/Vectorize.h
 include/llvm/Transforms/Vectorize/LoopVectorize.h
 include/llvm/Transforms/Vectorize/SLPVectorizer.h
+include/llvm/WindowsManifest/WindowsManifestMerger.h
+include/llvm/WindowsResource/ResourceProcessor.h
+include/llvm/WindowsResource/ResourceScriptToken.h
+include/llvm/WindowsResource/ResourceScriptTokenList.h
 include/llvm/XRay/Graph.h
 include/llvm/XRay/InstrumentationMap.h
 include/llvm/XRay/Trace.h
@@ -1204,7 +1251,7 @@ lib/cmake/llvm/LLVMProcessSources.cmake
 lib/cmake/llvm/TableGen.cmake
 lib/cmake/llvm/VersionFromVCS.cmake
 ${PLIST.notdylib}lib/libLLVM-${PKGVERSION}.${SOEXT}
-${PLIST.notdylib}lib/libLLVM-5.0.${SOEXT}
+${PLIST.notdylib}lib/libLLVM-6.0.${SOEXT}
 lib/libLLVM.${SOEXT}
 ${PLIST.AArch64}lib/libLLVMAArch64AsmParser.a
 ${PLIST.AArch64}lib/libLLVMAArch64AsmPrinter.a
@@ -1226,9 +1273,11 @@ ${PLIST.ARM}lib/libLLVMARMCodeGen.a
 ${PLIST.ARM}lib/libLLVMARMDesc.a
 ${PLIST.ARM}lib/libLLVMARMDisassembler.a
 ${PLIST.ARM}lib/libLLVMARMInfo.a
+lib/libLLVMARMUtils.a
 lib/libLLVMAnalysis.a
 lib/libLLVMAsmParser.a
 lib/libLLVMAsmPrinter.a
+lib/libLLVMBPFAsmParser.a
 ${PLIST.BPF}lib/libLLVMBPFAsmPrinter.a
 ${PLIST.BPF}lib/libLLVMBPFCodeGen.a
 ${PLIST.BPF}lib/libLLVMBPFDesc.a
@@ -1248,6 +1297,7 @@ lib/libLLVMDebugInfoPDB.a
 lib/libLLVMDemangle.a
 lib/libLLVMDlltoolDriver.a
 lib/libLLVMExecutionEngine.a
+lib/libLLVMFuzzMutate.a
 lib/libLLVMGlobalISel.a
 ${PLIST.Hexagon}lib/libLLVMHexagonAsmParser.a
 ${PLIST.Hexagon}lib/libLLVMHexagonCodeGen.a
@@ -1315,6 +1365,7 @@ lib/libLLVMTableGen.a
 lib/libLLVMTarget.a
 lib/libLLVMTransformUtils.a
 lib/libLLVMVectorize.a
+lib/libLLVMWindowsManifest.a
 ${PLIST.X86}lib/libLLVMX86AsmParser.a
 ${PLIST.X86}lib/libLLVMX86AsmPrinter.a
 ${PLIST.X86}lib/libLLVMX86CodeGen.a
@@ -1331,7 +1382,7 @@ lib/libLLVMXRay.a
 lib/libLLVMipo.a
 lib/libLTO.${SOEXT}
 ${PLIST.notdylib}lib/libLTO.${SOEXT}.${PKGVERSION}
-${PLIST.notdylib}lib/libLTO.${SOEXT}.5
+${PLIST.notdylib}lib/libLTO.${SOEXT}.6
 share/opt-viewer/opt-diff.py
 share/opt-viewer/opt-stats.py
 share/opt-viewer/opt-viewer.py
diff --git a/lang/llvm/distinfo b/lang/llvm/distinfo
index 9f22f7d60ca..ec038dd88af 100644
--- a/lang/llvm/distinfo
+++ b/lang/llvm/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.15 2018/05/22 12:39:23 adam Exp $
+$NetBSD: distinfo,v 1.16 2018/08/07 10:44:50 adam Exp $
 
-SHA1 (llvm-5.0.2.src.tar.xz) = 576d005305335049b89608d897d7ec184d99c6e1
-RMD160 (llvm-5.0.2.src.tar.xz) = b2083bf510d806fd2d7601905f2bf5c03f4de2b8
-SHA512 (llvm-5.0.2.src.tar.xz) = 3588be5ed969c3f7f6f16f56a12a6af2814d3d3c960d4a36ffebb0446cc75f19220bccee7fc605f9b01f5d5c188a905a046193cc12dec42dd5922048b5c27fe1
-Size (llvm-5.0.2.src.tar.xz) = 23451868 bytes
+SHA1 (llvm-6.0.1.src.tar.xz) = 09a6316c5225cab255ba12391e7abe5ff4d28935
+RMD160 (llvm-6.0.1.src.tar.xz) = 6bfc568d0cab4d82ac948f54b18017d8e8ead934
+SHA512 (llvm-6.0.1.src.tar.xz) = cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9
+Size (llvm-6.0.1.src.tar.xz) = 25306628 bytes
 SHA1 (patch-CMakeLists.txt) = 78e2dab2bf73f7e466ca2788fe6444e39b4ebd80
-SHA1 (patch-cmake_config-ix.cmake) = 4675b1dfca3850dbed6c494bf6a8f6fc6d500c20
+SHA1 (patch-cmake_config-ix.cmake) = a345420169e4066e22d28ca6ad10840e83ccfa76
 SHA1 (patch-cmake_modules_AddLLVM.cmake) = 4bfb98c5d99797155d0fb13a43352d31f6cfe783
 SHA1 (patch-cmake_modules_CheckAtomic.cmake) = 51e4fdf3bc24b50fc4d4bfa1ec5ba6c82ef946b4
 SHA1 (patch-cmake_modules_HandleLLVMOptions.cmake) = 271e6f5a8cebf8162c4e3b758e96f451b434269b
 SHA1 (patch-include_llvm_Support_DataTypes.h.cmake) = 18ebb1fcd2499d1216d5c3afe0bbb55fe63fe3ef
-SHA1 (patch-tools_llvm-shlib_CMakeLists.txt) = 70d8f320f217d99e6f991709a080450bc05631cd
+SHA1 (patch-tools_llvm-shlib_CMakeLists.txt) = bf6db476781a5670032bc5476a02d9db73ca6d59
diff --git a/lang/llvm/patches/patch-cmake_config-ix.cmake b/lang/llvm/patches/patch-cmake_config-ix.cmake
index 68d3ef46f08..b256675c2fe 100644
--- a/lang/llvm/patches/patch-cmake_config-ix.cmake
+++ b/lang/llvm/patches/patch-cmake_config-ix.cmake
@@ -1,15 +1,15 @@
-$NetBSD: patch-cmake_config-ix.cmake,v 1.2 2017/12/01 19:22:12 adam Exp $
+$NetBSD: patch-cmake_config-ix.cmake,v 1.3 2018/08/07 10:44:50 adam Exp $
 
 Do not generate invalid llvm-config in pkgsrc.
 
---- cmake/config-ix.cmake.orig	2017-05-19 01:55:05.000000000 +0000
+--- cmake/config-ix.cmake.orig	2018-01-02 17:53:08.000000000 +0000
 +++ cmake/config-ix.cmake
-@@ -135,7 +135,7 @@ if( NOT PURE_WINDOWS AND NOT LLVM_USE_SA
-   endif()
-   if(LLVM_ENABLE_TERMINFO)
-     set(HAVE_TERMINFO 0)
--    foreach(library tinfo terminfo curses ncurses ncursesw)
-+    foreach(library terminfo curses ncurses ncursesw tinfo)
-       string(TOUPPER ${library} library_suffix)
-       check_library_exists(${library} setupterm "" HAVE_TERMINFO_${library_suffix})
-       if(HAVE_TERMINFO_${library_suffix})
+@@ -153,7 +153,7 @@ if(NOT LLVM_USE_SANITIZER MATCHES "Memor
+     endif()
+     if(LLVM_ENABLE_TERMINFO)
+       set(HAVE_TERMINFO 0)
+-      foreach(library tinfo terminfo curses ncurses ncursesw)
++      foreach(library terminfo curses ncurses ncursesw tinfo)
+         string(TOUPPER ${library} library_suffix)
+         check_library_exists(${library} setupterm "" HAVE_TERMINFO_${library_suffix})
+         if(HAVE_TERMINFO_${library_suffix})
diff --git a/lang/llvm/patches/patch-tools_llvm-shlib_CMakeLists.txt b/lang/llvm/patches/patch-tools_llvm-shlib_CMakeLists.txt
index 89d2548c368..0943b6ae7b5 100644
--- a/lang/llvm/patches/patch-tools_llvm-shlib_CMakeLists.txt
+++ b/lang/llvm/patches/patch-tools_llvm-shlib_CMakeLists.txt
@@ -1,14 +1,17 @@
-$NetBSD: patch-tools_llvm-shlib_CMakeLists.txt,v 1.2 2017/12/01 19:22:12 adam Exp $
+$NetBSD: patch-tools_llvm-shlib_CMakeLists.txt,v 1.3 2018/08/07 10:44:50 adam Exp $
 
 Use the Linux style linking everywhere except Darwin and SunOS.
 
---- tools/llvm-shlib/CMakeLists.txt.orig	2017-07-11 01:17:44.000000000 +0000
+--- tools/llvm-shlib/CMakeLists.txt.orig	2017-07-19 16:07:51.000000000 +0000
 +++ tools/llvm-shlib/CMakeLists.txt
-@@ -37,15 +37,15 @@ endif()
+@@ -37,10 +37,11 @@ endif()
  add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB SONAME ${SOURCES})
  
  list(REMOVE_DUPLICATES LIB_NAMES)
--if(("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") OR (MINGW) OR (HAIKU) OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD") OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "DragonFly")) # FIXME: It should be "GNU ld for elf"
+-if(("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") OR (MINGW) OR (HAIKU)
+-   OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD")
+-   OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "DragonFly")
+-   OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "SunOS")) # FIXME: It should be "GNU ld for elf"
 +if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
 +  set(LIB_NAMES -Wl,-all_load ${LIB_NAMES})
 +elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "SunOS")
@@ -17,9 +20,10 @@ Use the Linux style linking everywhere except Darwin and SunOS.
    configure_file(
    ${CMAKE_CURRENT_SOURCE_DIR}/simple_version_script.map.in
    ${LLVM_LIBRARY_DIR}/tools/llvm-shlib/simple_version_script.map)
--
--  # GNU ld doesn't resolve symbols in the version script.
-   set(LIB_NAMES -Wl,--version-script,${LLVM_LIBRARY_DIR}/tools/llvm-shlib/simple_version_script.map -Wl,--whole-archive ${LIB_NAMES} -Wl,--no-whole-archive)
+@@ -51,8 +52,6 @@ if(("${CMAKE_SYSTEM_NAME}" STREQUAL "Lin
+     # Solaris ld does not accept global: *; so there is no way to version *all* global symbols
+     set(LIB_NAMES -Wl,--version-script,${LLVM_LIBRARY_DIR}/tools/llvm-shlib/simple_version_script.map ${LIB_NAMES})
+   endif()
 -elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
 -  set(LIB_NAMES -Wl,-all_load ${LIB_NAMES})
  endif()