Update llvm-cheri to a new snapshot.

The CHERI LLVM backend can now target both 128-bit and 256-bit (as well
as 64-bit and 512-bit if hardware existed) from a single binary so remove
devel/llvm-cheri128.

Sponsored by:	DARPA, AFRL

5 files changed, 12 insertions, 24 deletions

diff --git a/MOVED b/MOVED
index 799fe8da65c6..29c46edcb63b 100644
--- a/MOVED
+++ b/MOVED
@@ -9809,3 +9809,4 @@ lang/gcc46|lang/gcc6|2017-12-01|Has expired: Unsupported by upstream. Use GCC 6
 security/krb5-113|security/krb5-114|2017-12-03|Has expired: EOL twelve months after release of krb5-1.15
 net/bird6|net/bird@ipv6|2017-12-06|Moved to a flavored version
 devel/kore-notls|devel/kore@notls|2017-12-06|Moved to a flavored version
+devel/llvm-cheri128|devel/llvm-cheri|2017-12-07|A single cheri compiler can now target 128-bit and 256-bit capabilities
diff --git a/devel/Makefile b/devel/Makefile
index 2394b7773a1d..0ff91fe5f064 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1625,7 +1625,6 @@
     SUBDIR += lldb38
     SUBDIR += llnextgen
     SUBDIR += llvm-cheri
-    SUBDIR += llvm-cheri128
     SUBDIR += llvm-devel
     SUBDIR += llvm33
     SUBDIR += llvm34
diff --git a/devel/llvm-cheri/Makefile.snapshot b/devel/llvm-cheri/Makefile.snapshot
index e42ab40e6a47..2796bba83e5c 100644
--- a/devel/llvm-cheri/Makefile.snapshot
+++ b/devel/llvm-cheri/Makefile.snapshot
@@ -6,9 +6,9 @@
 #
 LLVM_MAJOR=	6.0
 LLVM_RELEASE=	${LLVM_MAJOR}.0
-SNAPDATE=	20171113
+SNAPDATE=	20171203
 
-LLVM_COMMIT=		6452bfc740414bc04e14ec8421c4ae71a2761229
-CLANG_COMMIT=		03acdd8a04a76439141dd4116b58ce2f62dff2b5
-LLD_COMMIT=		9c3cb0a16fc0e9a53971b09ae43242d55806cde3
+LLVM_COMMIT=		8e93be4584ea8f90d62c51436586c8331781ada0
+CLANG_COMMIT=		5f673d5b27ce49c0aca5642778eb690f5586bfa9
+LLD_COMMIT=		a967cbb0c15a333c3c956806821ba074263681c5
 LLDB_COMMIT=		7ee5905d0109a13d543a127a9cda7c280c8103c8
diff --git a/devel/llvm-cheri/distinfo b/devel/llvm-cheri/distinfo
index 6ceca6f807d1..3555bf262147 100644
--- a/devel/llvm-cheri/distinfo
+++ b/devel/llvm-cheri/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1510772193
-SHA256 (CTSRD-CHERI-llvm-6.0.d20171113-6452bfc740414bc04e14ec8421c4ae71a2761229_GH0.tar.gz) = 1a0c193c71e688c5e486292745aef7870180a36b607118944fbfeae9339ef03d
-SIZE (CTSRD-CHERI-llvm-6.0.d20171113-6452bfc740414bc04e14ec8421c4ae71a2761229_GH0.tar.gz) = 36519401
-SHA256 (CTSRD-CHERI-clang-03acdd8a04a76439141dd4116b58ce2f62dff2b5_GH0.tar.gz) = 6f31d3708ee8c9c6cec010acc145915c0fe8f7724e604ea958fb6bd7dd4d5700
-SIZE (CTSRD-CHERI-clang-03acdd8a04a76439141dd4116b58ce2f62dff2b5_GH0.tar.gz) = 16438750
-SHA256 (CTSRD-CHERI-lld-9c3cb0a16fc0e9a53971b09ae43242d55806cde3_GH0.tar.gz) = dad3e9f41e870775664774c61092ef038b1482e6b965f8a571a00021ba38d738
-SIZE (CTSRD-CHERI-lld-9c3cb0a16fc0e9a53971b09ae43242d55806cde3_GH0.tar.gz) = 972825
+TIMESTAMP = 1512683867
+SHA256 (CTSRD-CHERI-llvm-6.0.d20171203-8e93be4584ea8f90d62c51436586c8331781ada0_GH0.tar.gz) = a3628ebdc057441ea298fbabdb21b6ca9a353857a382cd6d360b1049e9fc5366
+SIZE (CTSRD-CHERI-llvm-6.0.d20171203-8e93be4584ea8f90d62c51436586c8331781ada0_GH0.tar.gz) = 36534232
+SHA256 (CTSRD-CHERI-clang-5f673d5b27ce49c0aca5642778eb690f5586bfa9_GH0.tar.gz) = 4524e3dffcf49cab6e4cfca2d71b92eb82acd79cbc3ba5ea9aee12dca14ebc9a
+SIZE (CTSRD-CHERI-clang-5f673d5b27ce49c0aca5642778eb690f5586bfa9_GH0.tar.gz) = 16444533
+SHA256 (CTSRD-CHERI-lld-a967cbb0c15a333c3c956806821ba074263681c5_GH0.tar.gz) = de4393d44044c3a596aba85283b251b204767c932d28f42df48308a3412a18ae
+SIZE (CTSRD-CHERI-lld-a967cbb0c15a333c3c956806821ba074263681c5_GH0.tar.gz) = 973512
diff --git a/devel/llvm-cheri128/Makefile b/devel/llvm-cheri128/Makefile
deleted file mode 100644
index 1ff15cfb7860..000000000000
--- a/devel/llvm-cheri128/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# Created by: Brooks Davis
-# $FreeBSD$
-
-CMAKE_ARGS=	-DLLVM_CHERI_IS_128=ON
-LLVM_SUFFIX=	-cheri128
-STACK_ALIGN=
-
-COMMENT=	LLVM and Clang with support for the CHERI architecture (128-bit)
-
-MASTERDIR=	${.CURDIR}/../llvm-cheri
-
-.include "${MASTERDIR}/Makefile"