Index: devel/llvm-devel/Makefile
===================================================================
--- devel/llvm-devel/Makefile	(revision 459400)
+++ devel/llvm-devel/Makefile	(working copy)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	llvm
-PORTVERSION=	${LLVM_MAJOR}.d${SNAPDATE}
-PORTREVISION=	1
+PORTVERSION=	${LLVM_MAJOR}.g${SNAPDATE}
 CATEGORIES=	devel lang
 PKGNAMESUFFIX=	-devel
 
@@ -231,7 +230,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MCOMPILER_RT}
-COMPILER_RT_PATTERN=	(asan_blacklist.txt|sanitizer|include.xray)
+COMPILER_RT_PATTERN=	(asan_blacklist.txt|cfi_blacklist.txt|sanitizer|include.xray)
 .endif
 
 .if ${PORT_OPTIONS:MLIT}
Index: devel/llvm-devel/Makefile.snapshot
===================================================================
--- devel/llvm-devel/Makefile.snapshot	(revision 459400)
+++ devel/llvm-devel/Makefile.snapshot	(working copy)
@@ -4,14 +4,14 @@
 #
 # Generated by: files/gen-Makefile.snapshot.sh.
 #
-LLVM_MAJOR=	6.0
+LLVM_MAJOR=	7.0
 LLVM_RELEASE=	${LLVM_MAJOR}.0
-SNAPDATE=	20171207
+SNAPDATE=	20180119
 
-LLVM_COMMIT=		113753f1f65a96c18833e19fe61645b144f0bbdd
-CLANG_COMMIT=		08fe1221761fe36d59a47304d2b5e6ba66c61c87
-COMPILER_RT_COMMIT=	3c704eefe1dfb7f35e80b8af9bd80c6eeaf7d5de
-EXTRAS_COMMIT=		96f87452282d2684d6793e747206e396e8cd2359
-LLD_COMMIT=		db62e74d04a3dbf789695b68191eaeaf20bc3a65
-LLDB_COMMIT=		bdf0d2c215f1c639ccf63e1f9480be6a27402650
-OPENMP_COMMIT=		5a07983cf589c66eba013ea59d76ff828582eab7
+LLVM_COMMIT=		09008367fcab044c0b30cb75bb675523b051ce13
+CLANG_COMMIT=		d57b406bf4744b18d43b473a9a172116a57d8efd
+COMPILER_RT_COMMIT=	97adb78eaae40595d052cfa76514db8256063bea
+EXTRAS_COMMIT=		8758bc70ce987491b97e7522ecf88631bf46c600
+LLD_COMMIT=		a76f90f9d12fc93de43603fc96785ac21181e923
+LLDB_COMMIT=		013ade4ac6ec9ac52ac69d54d9f6adeb8cfc26cb
+OPENMP_COMMIT=		4b547f3c93d0a207d55b1d213c770d6641a917f1
Index: devel/llvm-devel/distinfo
===================================================================
--- devel/llvm-devel/distinfo	(revision 459400)
+++ devel/llvm-devel/distinfo	(working copy)
@@ -1,15 +1,15 @@
-TIMESTAMP = 1512667354
-SHA256 (llvm-mirror-llvm-6.0.d20171207-113753f1f65a96c18833e19fe61645b144f0bbdd_GH0.tar.gz) = 182e934e0465dede3ed3ed1cefbc2c668e7d8dd3b5cec8662b680cf872ebe081
-SIZE (llvm-mirror-llvm-6.0.d20171207-113753f1f65a96c18833e19fe61645b144f0bbdd_GH0.tar.gz) = 37295580
-SHA256 (llvm-mirror-clang-08fe1221761fe36d59a47304d2b5e6ba66c61c87_GH0.tar.gz) = 37d8de5adfc1f4bb94f7b26a2a17ccd96755ade4a35f2011be49a7bbe7e1d5c7
-SIZE (llvm-mirror-clang-08fe1221761fe36d59a47304d2b5e6ba66c61c87_GH0.tar.gz) = 16568216
-SHA256 (llvm-mirror-compiler-rt-3c704eefe1dfb7f35e80b8af9bd80c6eeaf7d5de_GH0.tar.gz) = ad28696ccd16f70166bd647ef5b0f8b5c71a60a6bc74a933d83e90cfd5fc4d48
-SIZE (llvm-mirror-compiler-rt-3c704eefe1dfb7f35e80b8af9bd80c6eeaf7d5de_GH0.tar.gz) = 2857864
-SHA256 (llvm-mirror-clang-tools-extra-96f87452282d2684d6793e747206e396e8cd2359_GH0.tar.gz) = 9d31ca871b07d7c5ae5436f4a61028ca6a13902a8f8dc04b4503b462b79a0b61
-SIZE (llvm-mirror-clang-tools-extra-96f87452282d2684d6793e747206e396e8cd2359_GH0.tar.gz) = 984269
-SHA256 (llvm-mirror-lld-db62e74d04a3dbf789695b68191eaeaf20bc3a65_GH0.tar.gz) = 9de7271d14c1edfeb763421b6f8bc0ea5b3123c4cc705205153c3698518d8ae2
-SIZE (llvm-mirror-lld-db62e74d04a3dbf789695b68191eaeaf20bc3a65_GH0.tar.gz) = 1043983
-SHA256 (llvm-mirror-lldb-bdf0d2c215f1c639ccf63e1f9480be6a27402650_GH0.tar.gz) = 8a0e003390b4ae59fe4b8843b1a8ea0180136495f3d27a964cb2697ac226730d
-SIZE (llvm-mirror-lldb-bdf0d2c215f1c639ccf63e1f9480be6a27402650_GH0.tar.gz) = 24279490
-SHA256 (llvm-mirror-openmp-5a07983cf589c66eba013ea59d76ff828582eab7_GH0.tar.gz) = ad67cdb6b24a85f978348b86ab8db0a0b8c3851a1faab4e7ff2e1ac43659beaa
-SIZE (llvm-mirror-openmp-5a07983cf589c66eba013ea59d76ff828582eab7_GH0.tar.gz) = 2841699
+TIMESTAMP = 1516356097
+SHA256 (llvm-mirror-llvm-7.0.g20180119-09008367fcab044c0b30cb75bb675523b051ce13_GH0.tar.gz) = cd1f0d6a55e2fdc07e357cbc2def14da02e35b5f8db306e5f5fc5f125c0716cc
+SIZE (llvm-mirror-llvm-7.0.g20180119-09008367fcab044c0b30cb75bb675523b051ce13_GH0.tar.gz) = 38288844
+SHA256 (llvm-mirror-clang-d57b406bf4744b18d43b473a9a172116a57d8efd_GH0.tar.gz) = bff99a5907a4ae1c3ff47000eac86b692e9510252cc637f79ca3ba7d00987fd0
+SIZE (llvm-mirror-clang-d57b406bf4744b18d43b473a9a172116a57d8efd_GH0.tar.gz) = 16850102
+SHA256 (llvm-mirror-compiler-rt-97adb78eaae40595d052cfa76514db8256063bea_GH0.tar.gz) = 4b0a66c1c7120dd9fb2907349c45079b5f40a51e6c4b2abf8473cfd4bf3051ac
+SIZE (llvm-mirror-compiler-rt-97adb78eaae40595d052cfa76514db8256063bea_GH0.tar.gz) = 2901154
+SHA256 (llvm-mirror-clang-tools-extra-8758bc70ce987491b97e7522ecf88631bf46c600_GH0.tar.gz) = 7c208ea48a2325a3e5e12c69093ffde1bb7bd5958e2d6eeec62fcf7a64744752
+SIZE (llvm-mirror-clang-tools-extra-8758bc70ce987491b97e7522ecf88631bf46c600_GH0.tar.gz) = 1029437
+SHA256 (llvm-mirror-lld-a76f90f9d12fc93de43603fc96785ac21181e923_GH0.tar.gz) = 1a73bb5126b060f713c5e695e4d0ed7fd706a5a3c7283d9b6fc4d50b5c9abd82
+SIZE (llvm-mirror-lld-a76f90f9d12fc93de43603fc96785ac21181e923_GH0.tar.gz) = 1091967
+SHA256 (llvm-mirror-lldb-013ade4ac6ec9ac52ac69d54d9f6adeb8cfc26cb_GH0.tar.gz) = 9eecd48f3d782b5dd06a34697755510b193b6a9d0085275943215517eec60f0a
+SIZE (llvm-mirror-lldb-013ade4ac6ec9ac52ac69d54d9f6adeb8cfc26cb_GH0.tar.gz) = 24280652
+SHA256 (llvm-mirror-openmp-4b547f3c93d0a207d55b1d213c770d6641a917f1_GH0.tar.gz) = 17220548f2a070b46f9583458e5a3fb3f3ef3666a16f55aec3bdcc1df14a35a1
+SIZE (llvm-mirror-openmp-4b547f3c93d0a207d55b1d213c770d6641a917f1_GH0.tar.gz) = 2842763
Index: devel/llvm-devel/files/clang-patch-tools_clang_lib_Headers_CMakeLists.txt
===================================================================
--- devel/llvm-devel/files/clang-patch-tools_clang_lib_Headers_CMakeLists.txt	(revision 459400)
+++ devel/llvm-devel/files/clang-patch-tools_clang_lib_Headers_CMakeLists.txt	(working copy)
@@ -1,6 +1,6 @@
 --- tools/clang/lib/Headers/CMakeLists.txt.orig
 +++ tools/clang/lib/Headers/CMakeLists.txt
-@@ -44,7 +44,6 @@
+@@ -56,7 +56,6 @@
    intrin.h
    inttypes.h
    iso646.h
@@ -8,7 +8,7 @@
    lwpintrin.h
    lzcntintrin.h
    mm3dnow.h
-@@ -64,20 +63,12 @@
+@@ -76,21 +75,13 @@
    s390intrin.h
    shaintrin.h
    smmintrin.h
@@ -25,7 +25,8 @@
    tmmintrin.h
    unwind.h
    vadefs.h
+   vaesintrin.h
 -  varargs.h
    vecintrin.h
+   vpclmulqdqintrin.h
    wmmintrin.h
-   __wmmintrin_aes.h
Index: devel/llvm-devel/files/gen-Makefile.snapshot.sh
===================================================================
--- devel/llvm-devel/files/gen-Makefile.snapshot.sh	(revision 459400)
+++ devel/llvm-devel/files/gen-Makefile.snapshot.sh	(working copy)
@@ -17,7 +17,7 @@
 #
 # Generated by: files/gen-Makefile.snapshot.sh.
 #
-LLVM_MAJOR=	6.0
+LLVM_MAJOR=	7.0
 LLVM_RELEASE=	\${LLVM_MAJOR}.0
 SNAPDATE=	$(date +%Y%m%d)
 
Index: devel/llvm-devel/pkg-plist
===================================================================
--- devel/llvm-devel/pkg-plist	(revision 459400)
+++ devel/llvm-devel/pkg-plist	(working copy)
@@ -80,24 +80,6 @@
 %%LIT%%llvm-devel/bin/llvm-lit
 %%LIT%%bin/FileCheck-devel
 %%LIT%%llvm-devel/bin/FileCheck
-%%LLDB%%llvm-devel/%%PYTHON_SITELIBDIR%%/lldb/__init__.py
-%%LLDB%%llvm-devel/%%PYTHON_SITELIBDIR%%/lldb/_lldb.so
-%%LLDB%%llvm-devel/%%PYTHON_SITELIBDIR%%/lldb/embedded_interpreter.py
-%%LLDB%%llvm-devel/%%PYTHON_SITELIBDIR%%/lldb/formatters/Logger.py
-%%LLDB%%llvm-devel/%%PYTHON_SITELIBDIR%%/lldb/formatters/__init__.py
-%%LLDB%%llvm-devel/%%PYTHON_SITELIBDIR%%/lldb/formatters/attrib_fromdict.py
-%%LLDB%%llvm-devel/%%PYTHON_SITELIBDIR%%/lldb/formatters/cache.py
-%%LLDB%%llvm-devel/%%PYTHON_SITELIBDIR%%/lldb/formatters/cpp/__init__.py
-%%LLDB%%llvm-devel/%%PYTHON_SITELIBDIR%%/lldb/formatters/cpp/gnu_libstdcpp.py
-%%LLDB%%llvm-devel/%%PYTHON_SITELIBDIR%%/lldb/formatters/cpp/libcxx.py
-%%LLDB%%llvm-devel/%%PYTHON_SITELIBDIR%%/lldb/formatters/metrics.py
-%%LLDB%%llvm-devel/%%PYTHON_SITELIBDIR%%/lldb/formatters/synth.py
-%%LLDB%%llvm-devel/%%PYTHON_SITELIBDIR%%/lldb/lldb-argdumper
-%%LLDB%%llvm-devel/%%PYTHON_SITELIBDIR%%/lldb/runtime/__init__.py
-%%LLDB%%llvm-devel/%%PYTHON_SITELIBDIR%%/lldb/utils/__init__.py
-%%LLDB%%llvm-devel/%%PYTHON_SITELIBDIR%%/lldb/utils/symbolication.py
-%%LLDB%%llvm-devel/%%PYTHON_SITELIBDIR%%/six.py
-%%COMPILER_RT%%llvm-devel/asan_blacklist.txt
 llvm-devel/bin/bugpoint
 %%CLANG%%llvm-devel/bin/c-index-test
 %%CLANG%%llvm-devel/bin/clang
@@ -186,7 +168,6 @@
 llvm-devel/bin/verify-uselistorder
 %%LLD%%llvm-devel/bin/wasm-ld
 llvm-devel/bin/yaml2obj
-llvm-devel/cfi_blacklist.txt
 %%CLANG%%llvm-devel/include/clang-c/BuildSystem.h
 %%CLANG%%llvm-devel/include/clang-c/CXCompilationDatabase.h
 %%CLANG%%llvm-devel/include/clang-c/CXErrorCode.h
@@ -672,6 +653,7 @@
 %%CLANG%%llvm-devel/include/clang/StaticAnalyzer/Frontend/ModelConsumer.h
 %%CLANG%%llvm-devel/include/clang/Tooling/ASTDiff/ASTDiff.h
 %%CLANG%%llvm-devel/include/clang/Tooling/ASTDiff/ASTDiffInternal.h
+%%CLANG%%llvm-devel/include/clang/Tooling/AllTUsExecution.h
 %%CLANG%%llvm-devel/include/clang/Tooling/ArgumentsAdjusters.h
 %%CLANG%%llvm-devel/include/clang/Tooling/CommonOptionsParser.h
 %%CLANG%%llvm-devel/include/clang/Tooling/CompilationDatabase.h
@@ -720,6 +702,7 @@
 %%LLD%%llvm-devel/include/lld/Common/Strings.h
 %%LLD%%llvm-devel/include/lld/Common/TargetOptionsCommandFlags.h
 %%LLD%%llvm-devel/include/lld/Common/Threads.h
+%%LLD%%llvm-devel/include/lld/Common/Timer.h
 %%LLD%%llvm-devel/include/lld/Common/Version.h
 %%LLD%%llvm-devel/include/lld/Core/AbsoluteAtom.h
 %%LLD%%llvm-devel/include/lld/Core/ArchiveLibraryFile.h
@@ -1114,6 +1097,7 @@
 %%LLDB%%llvm-devel/include/lldb/Utility/DataExtractor.h
 %%LLDB%%llvm-devel/include/lldb/Utility/Either.h
 %%LLDB%%llvm-devel/include/lldb/Utility/Endian.h
+%%LLDB%%llvm-devel/include/lldb/Utility/Environment.h
 %%LLDB%%llvm-devel/include/lldb/Utility/FastDemangle.h
 %%LLDB%%llvm-devel/include/lldb/Utility/FileSpec.h
 %%LLDB%%llvm-devel/include/lldb/Utility/Flags.h
@@ -1328,6 +1312,7 @@
 llvm-devel/include/llvm/Analysis/ScalarEvolutionNormalization.h
 llvm-devel/include/llvm/Analysis/ScopedNoAliasAA.h
 llvm-devel/include/llvm/Analysis/SparsePropagation.h
+llvm-devel/include/llvm/Analysis/SyntheticCountsUtils.h
 llvm-devel/include/llvm/Analysis/TargetFolder.h
 llvm-devel/include/llvm/Analysis/TargetLibraryInfo.def
 llvm-devel/include/llvm/Analysis/TargetLibraryInfo.h
@@ -1367,7 +1352,7 @@
 llvm-devel/include/llvm/BinaryFormat/MachO.h
 llvm-devel/include/llvm/BinaryFormat/Magic.h
 llvm-devel/include/llvm/BinaryFormat/Wasm.h
-llvm-devel/include/llvm/BinaryFormat/WasmRelocs/WebAssembly.def
+llvm-devel/include/llvm/BinaryFormat/WasmRelocs.def
 llvm-devel/include/llvm/Bitcode/BitCodes.h
 llvm-devel/include/llvm/Bitcode/BitcodeReader.h
 llvm-devel/include/llvm/Bitcode/BitcodeWriter.h
@@ -1423,13 +1408,13 @@
 llvm-devel/include/llvm/CodeGen/LinkAllAsmWriterComponents.h
 llvm-devel/include/llvm/CodeGen/LinkAllCodegenComponents.h
 llvm-devel/include/llvm/CodeGen/LiveInterval.h
-llvm-devel/include/llvm/CodeGen/LiveIntervalAnalysis.h
 llvm-devel/include/llvm/CodeGen/LiveIntervalUnion.h
+llvm-devel/include/llvm/CodeGen/LiveIntervals.h
 llvm-devel/include/llvm/CodeGen/LivePhysRegs.h
 llvm-devel/include/llvm/CodeGen/LiveRangeEdit.h
 llvm-devel/include/llvm/CodeGen/LiveRegMatrix.h
 llvm-devel/include/llvm/CodeGen/LiveRegUnits.h
-llvm-devel/include/llvm/CodeGen/LiveStackAnalysis.h
+llvm-devel/include/llvm/CodeGen/LiveStacks.h
 llvm-devel/include/llvm/CodeGen/LiveVariables.h
 llvm-devel/include/llvm/CodeGen/LowLevelType.h
 llvm-devel/include/llvm/CodeGen/MIRParser/MIRParser.h
@@ -1485,6 +1470,7 @@
 llvm-devel/include/llvm/CodeGen/ResourcePriorityQueue.h
 llvm-devel/include/llvm/CodeGen/RuntimeLibcalls.def
 llvm-devel/include/llvm/CodeGen/RuntimeLibcalls.h
+llvm-devel/include/llvm/CodeGen/SDNodeProperties.td
 llvm-devel/include/llvm/CodeGen/ScheduleDAG.h
 llvm-devel/include/llvm/CodeGen/ScheduleDAGInstrs.h
 llvm-devel/include/llvm/CodeGen/ScheduleDAGMutation.h
@@ -1553,6 +1539,7 @@
 llvm-devel/include/llvm/DebugInfo/CodeView/Formatters.h
 llvm-devel/include/llvm/DebugInfo/CodeView/FunctionId.h
 llvm-devel/include/llvm/DebugInfo/CodeView/GUID.h
+llvm-devel/include/llvm/DebugInfo/CodeView/GlobalTypeTableBuilder.h
 llvm-devel/include/llvm/DebugInfo/CodeView/LazyRandomTypeCollection.h
 llvm-devel/include/llvm/DebugInfo/CodeView/Line.h
 llvm-devel/include/llvm/DebugInfo/CodeView/MergingTypeTableBuilder.h
@@ -1726,6 +1713,7 @@
 llvm-devel/include/llvm/ExecutionEngine/ObjectMemoryBuffer.h
 llvm-devel/include/llvm/ExecutionEngine/Orc/CompileOnDemandLayer.h
 llvm-devel/include/llvm/ExecutionEngine/Orc/CompileUtils.h
+llvm-devel/include/llvm/ExecutionEngine/Orc/Core.h
 llvm-devel/include/llvm/ExecutionEngine/Orc/ExecutionUtils.h
 llvm-devel/include/llvm/ExecutionEngine/Orc/GlobalMappingLayer.h
 llvm-devel/include/llvm/ExecutionEngine/Orc/IRCompileLayer.h
@@ -2194,6 +2182,7 @@
 llvm-devel/include/llvm/Transforms/IPO/PassManagerBuilder.h
 llvm-devel/include/llvm/Transforms/IPO/SCCP.h
 llvm-devel/include/llvm/Transforms/IPO/StripDeadPrototypes.h
+llvm-devel/include/llvm/Transforms/IPO/SyntheticCountsPropagation.h
 llvm-devel/include/llvm/Transforms/IPO/ThinLTOBitcodeWriter.h
 llvm-devel/include/llvm/Transforms/IPO/WholeProgramDevirt.h
 llvm-devel/include/llvm/Transforms/InstCombine/InstCombine.h
@@ -2246,6 +2235,7 @@
 llvm-devel/include/llvm/Transforms/Scalar/NewGVN.h
 llvm-devel/include/llvm/Transforms/Scalar/PartiallyInlineLibCalls.h
 llvm-devel/include/llvm/Transforms/Scalar/Reassociate.h
+llvm-devel/include/llvm/Transforms/Scalar/RewriteStatepointsForGC.h
 llvm-devel/include/llvm/Transforms/Scalar/SCCP.h
 llvm-devel/include/llvm/Transforms/Scalar/SROA.h
 llvm-devel/include/llvm/Transforms/Scalar/SimpleLoopUnswitch.h
@@ -2316,9 +2306,11 @@
 %%COMPILER_RT%%llvm-devel/include/sanitizer/coverage_interface.h
 %%COMPILER_RT%%llvm-devel/include/sanitizer/dfsan_interface.h
 %%COMPILER_RT%%llvm-devel/include/sanitizer/esan_interface.h
+%%COMPILER_RT%%llvm-devel/include/sanitizer/hwasan_interface.h
 %%COMPILER_RT%%llvm-devel/include/sanitizer/linux_syscall_hooks.h
 %%COMPILER_RT%%llvm-devel/include/sanitizer/lsan_interface.h
 %%COMPILER_RT%%llvm-devel/include/sanitizer/msan_interface.h
+%%COMPILER_RT%%llvm-devel/include/sanitizer/scudo_interface.h
 %%COMPILER_RT%%llvm-devel/include/sanitizer/tsan_interface.h
 %%COMPILER_RT%%llvm-devel/include/sanitizer/tsan_interface_atomic.h
 %%COMPILER_RT%%llvm-devel/include/xray/xray_interface.h
@@ -2343,6 +2335,7 @@
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/arm_neon.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/armintr.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/avx2intrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/avx512bitalgintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/avx512bwintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/avx512cdintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/avx512dqintrin.h
@@ -2351,13 +2344,19 @@
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/avx512ifmaintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/avx512ifmavlintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/avx512pfintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/avx512vbmi2intrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/avx512vbmiintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/avx512vbmivlintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/avx512vlbitalgintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/avx512vlbwintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/avx512vlcdintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/avx512vldqintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/avx512vlintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/avx512vlvbmi2intrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/avx512vlvnniintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/avx512vnniintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/avx512vpopcntdqintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/avx512vpopcntdqvlintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/avxintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/bmi2intrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/bmiintrin.h
@@ -2375,6 +2374,7 @@
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/fma4intrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/fmaintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/fxsrintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/gfniintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/htmintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/htmxlintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/ia32intrin.h
@@ -2392,6 +2392,7 @@
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/mwaitxintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/nmmintrin.h
 %%OPENMP%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/omp.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/ompt.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/opencl-c.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/pkuintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/pmmintrin.h
@@ -2407,7 +2408,9 @@
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/tmmintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/unwind.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/vadefs.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/vaesintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/vecintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/vpclmulqdqintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/wmmintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/x86intrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/xmmintrin.h
@@ -2750,8 +2753,27 @@
 %%LLDB%%llvm-devel/lib/liblldbUtilityHelpers.a
 %%OPENMP%%llvm-devel/lib/libomp.so
 %%OPENMP%%llvm-devel/lib/libomptarget.so
+%%LLDB%%llvm-devel/lib/python2.%%LLVM_LIB_VER%%/site-packages/lldb/__init__.py
+%%LLDB%%llvm-devel/lib/python2.%%LLVM_LIB_VER%%/site-packages/lldb/_lldb.so
+%%LLDB%%llvm-devel/lib/python2.%%LLVM_LIB_VER%%/site-packages/lldb/embedded_interpreter.py
+%%LLDB%%llvm-devel/lib/python2.%%LLVM_LIB_VER%%/site-packages/lldb/formatters/Logger.py
+%%LLDB%%llvm-devel/lib/python2.%%LLVM_LIB_VER%%/site-packages/lldb/formatters/__init__.py
+%%LLDB%%llvm-devel/lib/python2.%%LLVM_LIB_VER%%/site-packages/lldb/formatters/attrib_fromdict.py
+%%LLDB%%llvm-devel/lib/python2.%%LLVM_LIB_VER%%/site-packages/lldb/formatters/cache.py
+%%LLDB%%llvm-devel/lib/python2.%%LLVM_LIB_VER%%/site-packages/lldb/formatters/cpp/__init__.py
+%%LLDB%%llvm-devel/lib/python2.%%LLVM_LIB_VER%%/site-packages/lldb/formatters/cpp/gnu_libstdcpp.py
+%%LLDB%%llvm-devel/lib/python2.%%LLVM_LIB_VER%%/site-packages/lldb/formatters/cpp/libcxx.py
+%%LLDB%%llvm-devel/lib/python2.%%LLVM_LIB_VER%%/site-packages/lldb/formatters/metrics.py
+%%LLDB%%llvm-devel/lib/python2.%%LLVM_LIB_VER%%/site-packages/lldb/formatters/synth.py
+%%LLDB%%llvm-devel/lib/python2.%%LLVM_LIB_VER%%/site-packages/lldb/lldb-argdumper
+%%LLDB%%llvm-devel/lib/python2.%%LLVM_LIB_VER%%/site-packages/lldb/runtime/__init__.py
+%%LLDB%%llvm-devel/lib/python2.%%LLVM_LIB_VER%%/site-packages/lldb/utils/__init__.py
+%%LLDB%%llvm-devel/lib/python2.%%LLVM_LIB_VER%%/site-packages/lldb/utils/symbolication.py
+%%LLDB%%llvm-devel/lib/python2.%%LLVM_LIB_VER%%/site-packages/six.py
 %%CLANG%%llvm-devel/libexec/c++-analyzer
 %%CLANG%%llvm-devel/libexec/ccc-analyzer
+%%COMPILER_RT%%llvm-devel/share/asan_blacklist.txt
+%%COMPILER_RT%%llvm-devel/share/cfi_blacklist.txt
 %%CLANG%%llvm-devel/share/clang/bash-autocomplete.sh
 %%CLANG%%llvm-devel/share/clang/clang-format-bbedit.applescript
 %%CLANG%%llvm-devel/share/clang/clang-format-diff.py
Index: lang/clang-devel/Makefile
===================================================================
--- lang/clang-devel/Makefile	(revision 459400)
+++ lang/clang-devel/Makefile	(working copy)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	clang
-PORTVERSION=	${LLVM_MAJOR}.d${SNAPDATE}
-PORTREVISION=	1
+PORTVERSION=	${LLVM_MAJOR}.g${SNAPDATE}
 CATEGORIES=	lang devel
 PKGNAMESUFFIX=	-devel