6 files changed, 64 insertions, 61 deletions

diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile
index ad9630f95725..16a465761302 100644
--- a/devel/llvm-devel/Makefile
+++ b/devel/llvm-devel/Makefile
@@ -10,23 +10,7 @@ PKGNAMESUFFIX=	-devel
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	LLVM and Clang
 
-# License are listed in the order they appear in LICENSE.TXT
-LICENSE=	LLVM GTEST REGEX MIT ARM PD
-LICENSE_COMB=	multi
-LICENSE_NAME_LLVM=	LLVM Release License
-LICENSE_PERMS_LLVM=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-LICENSE_FILE_LLVM=	${WRKSRC}/LICENSE.TXT
-LICENSE_NAME_GTEST=	Google test license
-LICENSE_PERMS_GTEST=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-LICENSE_FILE_GTEST=	${WRKSRC}/utils/unittest/googletest/LICENSE.TXT
-LICENSE_NAME_REGEX=	OpenBSD Regex License
-LICENSE_PERMS_REGEX=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-LICENSE_FILE_REGEX=	${WRKSRC}/lib/Support/COPYRIGHT.regex
-# pyyaml tests are under the MIT license
-LICENSE_NAME_ARM=	ARM Limited license
-LICENSE_PERMS_ARM=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-LICENSE_FILE_ARM=	${WRKSRC}/lib/Target/ARM/LICENSE.TXT
-# md5 is in the public domain
+.include "Makefile.LICENSE"
 
 LLVM_SUFFIX=	-devel
 LLVM_PREFIX=	${PREFIX}/llvm${LLVM_SUFFIX}
@@ -118,7 +102,6 @@ LLD_GH_SUBDIR=		tools/lld:lld
 LLD_GH_TAGNAME=		${LLD_COMMIT}:lld
 LLDB_BUILD_DEPENDS=	swig3.0:devel/swig30
 LLDB_DESC=		Install lldb, the LLVM debugger
-LLDB_EXTRA_PATCHES=	${PATCHDIR}/lldb-patch-tools_lldb_source_Plugins_Process_FreeBSD_ProcessFreeBSD.cpp
 LLDB_GH_PROJECT=	lldb:lldb
 LLDB_GH_SUBDIR=		tools/lldb:lldb
 LLDB_GH_TAGNAME=	${LLDB_COMMIT}:lldb
@@ -285,6 +268,7 @@ MAN1SRCS+=	clang.1 \
 		diagtool.1 \
 		scan-build.1
 CLANG_PATTERN=	(c-index-test|clang|scan-|Reporter.py|ScanView.py|scanview.css|sorttable.js|startfile.py|-analyzer)
+USES+=	gnome
 .endif
 
 .if ${PORT_OPTIONS:MCOMPILER_RT}
@@ -350,6 +334,8 @@ _COMPILER_RT_LIBS= \
 	libclang_rt.asan_cxx-x86_64.a \
 	libclang_rt.asan_cxx-x86_64.a.syms \
 	libclang_rt.builtins-x86_64.a \
+	libclang_rt.cfi-x86_64.a \
+	libclang_rt.cfi_diag-x86_64.a \
 	libclang_rt.dd-x86_64.a \
 	libclang_rt.dyndd-x86_64.so \
 	libclang_rt.fuzzer-x86_64.a \
diff --git a/devel/llvm-devel/Makefile.LICENSE b/devel/llvm-devel/Makefile.LICENSE
new file mode 100644
index 000000000000..8ddbb6286601
--- /dev/null
+++ b/devel/llvm-devel/Makefile.LICENSE
@@ -0,0 +1,29 @@
+# $FreeBSD$
+#
+# The "LLVM Release License" is largely a copy of the NCSA license, but
+# it contains extra verbiage about its interaction with third party
+# licenses so it is handled as a seperate license.
+#
+# Third party software licenses in the LLVM tree include:
+# Program             License
+# -------             -------
+# Google Test         BSD3CLAUSE
+# OpenBSD regex       REGEX
+# pyyaml tests        MIT
+# ARM contributions   ARM
+# md5 contributions   PD
+
+LICENSE=	ARM BSD3CLAUSE LLVM MIT PD REGEX
+LICENSE_COMB=	multi
+
+LICENSE_FILE_ARM=	${WRKSRC}/lib/Target/ARM/LICENSE.TXT
+LICENSE_FILE_BSD3CLAUSE=	${WRKSRC}/utils/unittest/googletest/LICENSE.TXT
+LICENSE_FILE_LLVM=	${WRKSRC}/LICENSE.TXT
+LICENSE_FILE_MIT=	${WRKSRC}/test/YAMLParser/LICENSE.txt
+LICENSE_FILE_REGEX=	${WRKSRC}/lib/Support/COPYRIGHT.regex
+LICENSE_NAME_ARM=	ARM Limited license
+LICENSE_NAME_LLVM=	LLVM Release License
+LICENSE_NAME_REGEX=	OpenBSD Regex License
+LICENSE_PERMS_ARM=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+LICENSE_PERMS_LLVM=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+LICENSE_PERMS_REGEX=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
diff --git a/devel/llvm-devel/Makefile.snapshot b/devel/llvm-devel/Makefile.snapshot
index fb59cb246121..cee85a721351 100644
--- a/devel/llvm-devel/Makefile.snapshot
+++ b/devel/llvm-devel/Makefile.snapshot
@@ -6,12 +6,12 @@
 #
 LLVM_MAJOR=	8
 LLVM_RELEASE=	${LLVM_MAJOR}.0.0
-SNAPDATE=	20180925
+SNAPDATE=	20181001
 
-LLVM_COMMIT=		b418c2351b1fdf6faf6a2d010d804e895ef49932
-CLANG_COMMIT=		d6cae43ad5a45c099fa3917def61170a9fdf6c97
-COMPILER_RT_COMMIT=	c5cf78381530dda36a14ef2eef0d94f8c87ae674
-EXTRAS_COMMIT=		0eddbe908913429e4f69b4a877f9c0ca28e08382
-LLD_COMMIT=		bc9e188d140ff03d5851a6bebe76e486d389d856
-LLDB_COMMIT=		12046a6124750689bba1c3eb881e366be4030a77
-OPENMP_COMMIT=		e1688b470b8ef3441983d333a6642e7b19d29b90
+LLVM_COMMIT=		5877e4ed63ba21fb57f2c7fb4ed4950288e2a28c
+CLANG_COMMIT=		a866fe7bf7c577b698229106f0ddc2d31b285de8
+COMPILER_RT_COMMIT=	87620816074a8059648940d59dd0a37d30089a0a
+EXTRAS_COMMIT=		35eb918a95a05e7d91bc7cf026f19db869354eaa
+LLD_COMMIT=		df3e3050ef26292a8c7d2d16b073588eba28db6c
+LLDB_COMMIT=		b062a1225880b697f79ca92afb986e2b59be65c8
+OPENMP_COMMIT=		be73d23db2027fdb14e4cfa3b35fc17fd50558a3
diff --git a/devel/llvm-devel/distinfo b/devel/llvm-devel/distinfo
index c9216e637000..84bc6c6b799b 100644
--- a/devel/llvm-devel/distinfo
+++ b/devel/llvm-devel/distinfo
@@ -1,15 +1,15 @@
-TIMESTAMP = 1537891825
-SHA256 (llvm-mirror-llvm-8.0.d20180925-b418c2351b1fdf6faf6a2d010d804e895ef49932_GH0.tar.gz) = f70fea382b3058b06416925f3a796f72e0b1bdc72f5a68283daadbb68b851c50
-SIZE (llvm-mirror-llvm-8.0.d20180925-b418c2351b1fdf6faf6a2d010d804e895ef49932_GH0.tar.gz) = 43610028
-SHA256 (llvm-mirror-clang-d6cae43ad5a45c099fa3917def61170a9fdf6c97_GH0.tar.gz) = 9f4bec9fe0f739a19f88ae2ae2414d6f8bde13c6ee9ce495db77475ed5d41de8
-SIZE (llvm-mirror-clang-d6cae43ad5a45c099fa3917def61170a9fdf6c97_GH0.tar.gz) = 17743175
-SHA256 (llvm-mirror-compiler-rt-c5cf78381530dda36a14ef2eef0d94f8c87ae674_GH0.tar.gz) = b5537492aa4fef086c8782db33d17fbfcca110900626c2f40a3baa0643fd698d
-SIZE (llvm-mirror-compiler-rt-c5cf78381530dda36a14ef2eef0d94f8c87ae674_GH0.tar.gz) = 3169979
-SHA256 (llvm-mirror-clang-tools-extra-0eddbe908913429e4f69b4a877f9c0ca28e08382_GH0.tar.gz) = ba1fd5634240facd766958a83642aa4563a210cb83ed8b470cad50a21c66d4ed
-SIZE (llvm-mirror-clang-tools-extra-0eddbe908913429e4f69b4a877f9c0ca28e08382_GH0.tar.gz) = 1284915
-SHA256 (llvm-mirror-lld-bc9e188d140ff03d5851a6bebe76e486d389d856_GH0.tar.gz) = dc0bec0ee38e45fff568d1a096c791a435ce5aaaad5049cd108fd8073d5cb326
-SIZE (llvm-mirror-lld-bc9e188d140ff03d5851a6bebe76e486d389d856_GH0.tar.gz) = 1311086
-SHA256 (llvm-mirror-lldb-12046a6124750689bba1c3eb881e366be4030a77_GH0.tar.gz) = 809923ab8aef405c1529b40a7f37eb8506a328cca305f56e858474156a912173
-SIZE (llvm-mirror-lldb-12046a6124750689bba1c3eb881e366be4030a77_GH0.tar.gz) = 24534585
-SHA256 (llvm-mirror-openmp-e1688b470b8ef3441983d333a6642e7b19d29b90_GH0.tar.gz) = 434e57ba3cf4c6aef50905f66529595c2f45742155b8403631cfd59084454efa
-SIZE (llvm-mirror-openmp-e1688b470b8ef3441983d333a6642e7b19d29b90_GH0.tar.gz) = 1446924
+TIMESTAMP = 1538434534
+SHA256 (llvm-mirror-llvm-8.0.d20181001-5877e4ed63ba21fb57f2c7fb4ed4950288e2a28c_GH0.tar.gz) = d0c117be40576264eb8efd34640b5dbb607bec8781155c0e97a9b5aec9d943fb
+SIZE (llvm-mirror-llvm-8.0.d20181001-5877e4ed63ba21fb57f2c7fb4ed4950288e2a28c_GH0.tar.gz) = 43693701
+SHA256 (llvm-mirror-clang-a866fe7bf7c577b698229106f0ddc2d31b285de8_GH0.tar.gz) = 07493d309ce4cd8410d8d14da97c7f911e23bb7b1de85f65d23584d59a615e0d
+SIZE (llvm-mirror-clang-a866fe7bf7c577b698229106f0ddc2d31b285de8_GH0.tar.gz) = 17763531
+SHA256 (llvm-mirror-compiler-rt-87620816074a8059648940d59dd0a37d30089a0a_GH0.tar.gz) = 445f052008b38252ef856a5ea343fddc21eb919b6cfc927c9253662ef7071a24
+SIZE (llvm-mirror-compiler-rt-87620816074a8059648940d59dd0a37d30089a0a_GH0.tar.gz) = 3178030
+SHA256 (llvm-mirror-clang-tools-extra-35eb918a95a05e7d91bc7cf026f19db869354eaa_GH0.tar.gz) = 15d2ac8d0e8e1c7d3f71364a4a61be01cc36c9956fe98878f5fb5365899d6686
+SIZE (llvm-mirror-clang-tools-extra-35eb918a95a05e7d91bc7cf026f19db869354eaa_GH0.tar.gz) = 1290314
+SHA256 (llvm-mirror-lld-df3e3050ef26292a8c7d2d16b073588eba28db6c_GH0.tar.gz) = b7431fd2ce11a88b06f4b456cffac1cb747bea075a47480c706edcd6b59d189d
+SIZE (llvm-mirror-lld-df3e3050ef26292a8c7d2d16b073588eba28db6c_GH0.tar.gz) = 1314749
+SHA256 (llvm-mirror-lldb-b062a1225880b697f79ca92afb986e2b59be65c8_GH0.tar.gz) = 27dfab3fe813b169295f5d9b6207750ae378bade4db152abd30487e71942b96d
+SIZE (llvm-mirror-lldb-b062a1225880b697f79ca92afb986e2b59be65c8_GH0.tar.gz) = 24541049
+SHA256 (llvm-mirror-openmp-be73d23db2027fdb14e4cfa3b35fc17fd50558a3_GH0.tar.gz) = 63c4c05f9aad0178b91e1617ef5d7619d1dae7c19a5432a974248496aab49d51
+SIZE (llvm-mirror-openmp-be73d23db2027fdb14e4cfa3b35fc17fd50558a3_GH0.tar.gz) = 1453322
diff --git a/devel/llvm-devel/files/lldb-patch-tools_lldb_source_Plugins_Process_FreeBSD_ProcessFreeBSD.cpp b/devel/llvm-devel/files/lldb-patch-tools_lldb_source_Plugins_Process_FreeBSD_ProcessFreeBSD.cpp
deleted file mode 100644
index 1c6b0582a522..000000000000
--- a/devel/llvm-devel/files/lldb-patch-tools_lldb_source_Plugins_Process_FreeBSD_ProcessFreeBSD.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- tools/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.cpp.orig
-+++ tools/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.cpp
-@@ -335,7 +335,7 @@
-     GetTarget().SetArchitecture(module_arch);
- 
-   // Initialize the target module list
--  GetTarget().SetExecutableModule(exe_module_sp, true);
-+  GetTarget().SetExecutableModule(exe_module_sp, eLoadDependentsYes);
- 
-   SetSTDIOFileDescriptor(m_monitor->GetTerminalFD());
- 
-@@ -519,7 +519,7 @@
-           executable_search_paths.GetSize() ? &executable_search_paths : NULL);
-       if (!error.Success())
-         return;
--      target->SetExecutableModule(exe_module_sp, true);
-+      target->SetExecutableModule(exe_module_sp, eLoadDependentsYes);
-     }
-   }
- }
diff --git a/devel/llvm-devel/pkg-plist b/devel/llvm-devel/pkg-plist
index 4ba16db2f1df..d3d4c94bc941 100644
--- a/devel/llvm-devel/pkg-plist
+++ b/devel/llvm-devel/pkg-plist
@@ -1812,17 +1812,21 @@ llvm-devel/include/llvm/DebugInfo/PDB/Native/InfoStreamBuilder.h
 llvm-devel/include/llvm/DebugInfo/PDB/Native/ModuleDebugStream.h
 llvm-devel/include/llvm/DebugInfo/PDB/Native/NamedStreamMap.h
 llvm-devel/include/llvm/DebugInfo/PDB/Native/NativeCompilandSymbol.h
+llvm-devel/include/llvm/DebugInfo/PDB/Native/NativeEnumGlobals.h
 llvm-devel/include/llvm/DebugInfo/PDB/Native/NativeEnumModules.h
 llvm-devel/include/llvm/DebugInfo/PDB/Native/NativeEnumTypes.h
 llvm-devel/include/llvm/DebugInfo/PDB/Native/NativeExeSymbol.h
 llvm-devel/include/llvm/DebugInfo/PDB/Native/NativeRawSymbol.h
 llvm-devel/include/llvm/DebugInfo/PDB/Native/NativeSession.h
 llvm-devel/include/llvm/DebugInfo/PDB/Native/NativeSymbolEnumerator.h
+llvm-devel/include/llvm/DebugInfo/PDB/Native/NativeTypeArray.h
 llvm-devel/include/llvm/DebugInfo/PDB/Native/NativeTypeBuiltin.h
 llvm-devel/include/llvm/DebugInfo/PDB/Native/NativeTypeEnum.h
 llvm-devel/include/llvm/DebugInfo/PDB/Native/NativeTypeFunctionSig.h
 llvm-devel/include/llvm/DebugInfo/PDB/Native/NativeTypePointer.h
+llvm-devel/include/llvm/DebugInfo/PDB/Native/NativeTypeTypedef.h
 llvm-devel/include/llvm/DebugInfo/PDB/Native/NativeTypeUDT.h
+llvm-devel/include/llvm/DebugInfo/PDB/Native/NativeTypeVTShape.h
 llvm-devel/include/llvm/DebugInfo/PDB/Native/PDBFile.h
 llvm-devel/include/llvm/DebugInfo/PDB/Native/PDBFileBuilder.h
 llvm-devel/include/llvm/DebugInfo/PDB/Native/PDBStringTable.h
@@ -1898,10 +1902,12 @@ llvm-devel/include/llvm/ExecutionEngine/Orc/GlobalMappingLayer.h
 llvm-devel/include/llvm/ExecutionEngine/Orc/IRCompileLayer.h
 llvm-devel/include/llvm/ExecutionEngine/Orc/IRTransformLayer.h
 llvm-devel/include/llvm/ExecutionEngine/Orc/IndirectionUtils.h
+llvm-devel/include/llvm/ExecutionEngine/Orc/JITTargetMachineBuilder.h
 llvm-devel/include/llvm/ExecutionEngine/Orc/LLJIT.h
 llvm-devel/include/llvm/ExecutionEngine/Orc/LambdaResolver.h
 llvm-devel/include/llvm/ExecutionEngine/Orc/Layer.h
 llvm-devel/include/llvm/ExecutionEngine/Orc/LazyEmittingLayer.h
+llvm-devel/include/llvm/ExecutionEngine/Orc/LazyReexports.h
 llvm-devel/include/llvm/ExecutionEngine/Orc/Legacy.h
 llvm-devel/include/llvm/ExecutionEngine/Orc/NullResolver.h
 llvm-devel/include/llvm/ExecutionEngine/Orc/ObjectTransformLayer.h
@@ -1916,6 +1922,7 @@ llvm-devel/include/llvm/ExecutionEngine/Orc/RTDyldObjectLinkingLayer.h
 llvm-devel/include/llvm/ExecutionEngine/Orc/RawByteChannel.h
 llvm-devel/include/llvm/ExecutionEngine/Orc/RemoteObjectLayer.h
 llvm-devel/include/llvm/ExecutionEngine/Orc/SymbolStringPool.h
+llvm-devel/include/llvm/ExecutionEngine/Orc/ThreadSafeModule.h
 llvm-devel/include/llvm/ExecutionEngine/OrcMCJITReplacement.h
 llvm-devel/include/llvm/ExecutionEngine/RTDyldMemoryManager.h
 llvm-devel/include/llvm/ExecutionEngine/RuntimeDyld.h
@@ -2266,6 +2273,7 @@ llvm-devel/include/llvm/Support/Locale.h
 llvm-devel/include/llvm/Support/LockFileManager.h
 llvm-devel/include/llvm/Support/LowLevelTypeImpl.h
 llvm-devel/include/llvm/Support/MD5.h
+llvm-devel/include/llvm/Support/MSVCErrorWorkarounds.h
 llvm-devel/include/llvm/Support/MachineValueType.h
 llvm-devel/include/llvm/Support/ManagedStatic.h
 llvm-devel/include/llvm/Support/MathExtras.h