Update to a new snapshot matching our upcoming paper.

Sponsored by:	DARPA, AFRL

4 files changed, 27 insertions, 40 deletions

diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile
index 0c859e81eb1e..909da28cd7ee 100644
--- a/devel/llvm-devel/Makefile
+++ b/devel/llvm-devel/Makefile
@@ -11,6 +11,10 @@ MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	LLVM and Clang
 
 .include "Makefile.LICENSE"
+LICENSE+=	LLVM2
+LICENSE_FILE_LLVM2=	${WRKSRC}/LICENSE.TXT
+LICENSE_NAME_LLVM2= 	Apache License 2.0 with LLVM Exceptions
+LICENSE_PERMS_LLVM2=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 LLVM_SUFFIX=	-devel
 LLVM_PREFIX=	${PREFIX}/llvm${LLVM_SUFFIX}
@@ -421,10 +425,6 @@ post-patch-CLANG-on:
 	    ${PATCH_WRKSRC}/tools/clang/tools/clang-format/clang-format-sublime.py \
 	    ${PATCH_WRKSRC}/tools/clang/tools/clang-format/git-clang-format
 
-post-patch-COMPILER_RT-on:
-	cd ${WRKSRC_compiler_rt} && \
-	${PATCH} -p0 < ${PATCHDIR}/compiler-rt-safestack_platform.h
-
 post-build-COMPILER_RT-on:
 	${MKDIR} ${WRKDIR}/compiler-rt-build
 	cd ${WRKDIR}/compiler-rt-build && \
diff --git a/devel/llvm-devel/Makefile.snapshot b/devel/llvm-devel/Makefile.snapshot
index 8e8fdb11a96a..ecfd9d9008de 100644
--- a/devel/llvm-devel/Makefile.snapshot
+++ b/devel/llvm-devel/Makefile.snapshot
@@ -6,12 +6,12 @@
 #
 LLVM_MAJOR=	9
 LLVM_RELEASE=	${LLVM_MAJOR}.0.0
-SNAPDATE=	20190118
+SNAPDATE=	20190122
 
-LLVM_COMMIT=		5570b0702238f61773d973fe6b8163c535dce2fb
-CLANG_COMMIT=		87155c67f399837e1875acd5658a8ff76c3f3164
-COMPILER_RT_COMMIT=	205e34f422a7d170d8a1e53c2cfe6f38e7ea8659
-EXTRAS_COMMIT=		9e454c861c254debad1a0cbac9a56f8d6f84d058
-LLD_COMMIT=		0a0e0cb4cce9d95873248788de7ba620b6918236
-LLDB_COMMIT=		f031f20ae94286eba6274f7019db47872af033fd
-OPENMP_COMMIT=		e223da31a44825cd907ed89306d8bcf3313b3180
+LLVM_COMMIT=		4b96e4b486d2a92e8f7820f6efa2c2aa0023bb66
+CLANG_COMMIT=		7f77c0c9a77506be62cd0c96fbfc1c0c8b3d5220
+COMPILER_RT_COMMIT=	225c642c81174798d0af44148018faa0022ef056
+EXTRAS_COMMIT=		10ead75b2238df9e3ddb19dc73431a57cb0ffb66
+LLD_COMMIT=		e4443d35d929f53a03dcfb72283c53c5fe549d23
+LLDB_COMMIT=		e29cec1fb4a359e5ac39bc472ad2e48aa4a97229
+OPENMP_COMMIT=		c1fe93aaa489a8e621016755bf5269602ab54d8d
diff --git a/devel/llvm-devel/distinfo b/devel/llvm-devel/distinfo
index 8d84d097ac46..e81124a03362 100644
--- a/devel/llvm-devel/distinfo
+++ b/devel/llvm-devel/distinfo
@@ -1,15 +1,15 @@
-TIMESTAMP = 1547847258
-SHA256 (llvm-mirror-llvm-9.0.d20190118-5570b0702238f61773d973fe6b8163c535dce2fb_GH0.tar.gz) = 8b359d4ef2a73e044b1d570d7abb343c10842c071121d8d6dff641c36553e5fa
-SIZE (llvm-mirror-llvm-9.0.d20190118-5570b0702238f61773d973fe6b8163c535dce2fb_GH0.tar.gz) = 45954312
-SHA256 (llvm-mirror-clang-87155c67f399837e1875acd5658a8ff76c3f3164_GH0.tar.gz) = 9b3b40f3af59f8552561e9f6da31943133c67a5beec41307515054cd2f1c966e
-SIZE (llvm-mirror-clang-87155c67f399837e1875acd5658a8ff76c3f3164_GH0.tar.gz) = 18070353
-SHA256 (llvm-mirror-compiler-rt-205e34f422a7d170d8a1e53c2cfe6f38e7ea8659_GH0.tar.gz) = 65990ec0cbc58ac0199a7ce9a52fd93df4262b59bf1c7ff5739f57c9ccbffb56
-SIZE (llvm-mirror-compiler-rt-205e34f422a7d170d8a1e53c2cfe6f38e7ea8659_GH0.tar.gz) = 3273195
-SHA256 (llvm-mirror-clang-tools-extra-9e454c861c254debad1a0cbac9a56f8d6f84d058_GH0.tar.gz) = 75a63231dff7b3b89dc4bd9da2b39ce0b43c6d58b8cf373bb97aa221ef163d7f
-SIZE (llvm-mirror-clang-tools-extra-9e454c861c254debad1a0cbac9a56f8d6f84d058_GH0.tar.gz) = 1416456
-SHA256 (llvm-mirror-lld-0a0e0cb4cce9d95873248788de7ba620b6918236_GH0.tar.gz) = 64d9049c5feb83838b1e01eed8630ee12c0229420d44e23b2141ee84c990b680
-SIZE (llvm-mirror-lld-0a0e0cb4cce9d95873248788de7ba620b6918236_GH0.tar.gz) = 1388289
-SHA256 (llvm-mirror-lldb-f031f20ae94286eba6274f7019db47872af033fd_GH0.tar.gz) = 1b3144d9ca3eb3556c25dd991d1f930e955812d4b7e7aca416fd0301d432cdac
-SIZE (llvm-mirror-lldb-f031f20ae94286eba6274f7019db47872af033fd_GH0.tar.gz) = 24665858
-SHA256 (llvm-mirror-openmp-e223da31a44825cd907ed89306d8bcf3313b3180_GH0.tar.gz) = 0f0a4256b3f5d38e261833e26c2121c5214188abf50fc42075875cfd32de7720
-SIZE (llvm-mirror-openmp-e223da31a44825cd907ed89306d8bcf3313b3180_GH0.tar.gz) = 1479385
+TIMESTAMP = 1548117256
+SHA256 (llvm-mirror-llvm-9.0.d20190122-4b96e4b486d2a92e8f7820f6efa2c2aa0023bb66_GH0.tar.gz) = 38af1c73fa3c12819ec2e2f32029724aa934cb7fb2ff9e9eb0e80d938b10d5ff
+SIZE (llvm-mirror-llvm-9.0.d20190122-4b96e4b486d2a92e8f7820f6efa2c2aa0023bb66_GH0.tar.gz) = 46030490
+SHA256 (llvm-mirror-clang-7f77c0c9a77506be62cd0c96fbfc1c0c8b3d5220_GH0.tar.gz) = 3531e0602de9d4b3ef56b45da32a7b4271d4f68fa751faa60bc243d1c1901e30
+SIZE (llvm-mirror-clang-7f77c0c9a77506be62cd0c96fbfc1c0c8b3d5220_GH0.tar.gz) = 18095756
+SHA256 (llvm-mirror-compiler-rt-225c642c81174798d0af44148018faa0022ef056_GH0.tar.gz) = 878de1bd743028c6affab1a030a4408145a15dc5dd2e2fc03bf4a4de3768e1a7
+SIZE (llvm-mirror-compiler-rt-225c642c81174798d0af44148018faa0022ef056_GH0.tar.gz) = 3280771
+SHA256 (llvm-mirror-clang-tools-extra-10ead75b2238df9e3ddb19dc73431a57cb0ffb66_GH0.tar.gz) = e212a767cf6d6640b40ce87b5f94e7c0962e9c91cc93cd6c1ba15746131bf6cf
+SIZE (llvm-mirror-clang-tools-extra-10ead75b2238df9e3ddb19dc73431a57cb0ffb66_GH0.tar.gz) = 1426040
+SHA256 (llvm-mirror-lld-e4443d35d929f53a03dcfb72283c53c5fe549d23_GH0.tar.gz) = 85154d769818aa7dbb2797099810bd8ec34d3c4f4f86cb7f1fee084ec9946235
+SIZE (llvm-mirror-lld-e4443d35d929f53a03dcfb72283c53c5fe549d23_GH0.tar.gz) = 1392709
+SHA256 (llvm-mirror-lldb-e29cec1fb4a359e5ac39bc472ad2e48aa4a97229_GH0.tar.gz) = ce236fc8de0b4cf7c11176396787ed7a89442a1281f56a63f30ecdcf8446bb2c
+SIZE (llvm-mirror-lldb-e29cec1fb4a359e5ac39bc472ad2e48aa4a97229_GH0.tar.gz) = 24675546
+SHA256 (llvm-mirror-openmp-c1fe93aaa489a8e621016755bf5269602ab54d8d_GH0.tar.gz) = 4cb9a819088cf5df2f43559c95855f18ca523d4070bf2cb4ebeb88f5e20bec0c
+SIZE (llvm-mirror-openmp-c1fe93aaa489a8e621016755bf5269602ab54d8d_GH0.tar.gz) = 1484607
diff --git a/devel/llvm-devel/files/compiler-rt-safestack_platform.h b/devel/llvm-devel/files/compiler-rt-safestack_platform.h
deleted file mode 100644
index 2f4c5548242f..000000000000
--- a/devel/llvm-devel/files/compiler-rt-safestack_platform.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- lib/safestack/safestack_platform.h.orig	2019-01-18 22:19:46.188728000 +0000
-+++ lib/safestack/safestack_platform.h	2019-01-18 22:14:46.776765000 +0000
-@@ -20,6 +20,10 @@
- #include <sys/types.h>
- #include <unistd.h>
- 
-+#if SANITIZER_FREEBSD
-+#include <sys/thr.h>
-+#endif
-+
- namespace safestack {
- 
- inline pid_t GetTid() {