Index: head/devel/llvm-cheri/Makefile.snapshot
===================================================================
--- head/devel/llvm-cheri/Makefile.snapshot	(revision 415091)
+++ head/devel/llvm-cheri/Makefile.snapshot	(revision 415092)
@@ -1,13 +1,13 @@
 # $FreeBSD$
 #
 # Generated file!  Do not edit!  
 #
 # Generated by: files/gen-Makefile.snapshot.sh.
 #
 LLVM_MAJOR=	3.8
 LLVM_RELEASE=	${LLVM_MAJOR}.0
-SNAPDATE=	20160423
+SNAPDATE=	20160512
 
-LLVM_COMMIT=		84185b767e5dadecddece2b6161be42917389ab2
-CLANG_COMMIT=		5cb14ce28a05af60f3a31b8dc14403511ddaac80
+LLVM_COMMIT=		74f19ca643fbbe8303afd28cea254f36c743acbc
+CLANG_COMMIT=		2ae443e1402381eab3585e4f779bdc30fdfede62
 LLDB_COMMIT=		7ee5905d0109a13d543a127a9cda7c280c8103c8
Index: head/devel/llvm-cheri/distinfo
===================================================================
--- head/devel/llvm-cheri/distinfo	(revision 415091)
+++ head/devel/llvm-cheri/distinfo	(revision 415092)
@@ -1,4 +1,4 @@
-SHA256 (CTSRD-CHERI-llvm-3.8.d20160423-84185b767e5dadecddece2b6161be42917389ab2_GH0.tar.gz) = 84e9aa29d1d61c75c8463388e6b013c0a1d892389297d2ab7b9442950d3035ab
-SIZE (CTSRD-CHERI-llvm-3.8.d20160423-84185b767e5dadecddece2b6161be42917389ab2_GH0.tar.gz) = 22355018
-SHA256 (CTSRD-CHERI-clang-5cb14ce28a05af60f3a31b8dc14403511ddaac80_GH0.tar.gz) = 8de511db6d3754838aa2afafc7608ea94820331f6963d119aab83eabc6b93949
-SIZE (CTSRD-CHERI-clang-5cb14ce28a05af60f3a31b8dc14403511ddaac80_GH0.tar.gz) = 12888717
+SHA256 (CTSRD-CHERI-llvm-3.8.d20160512-74f19ca643fbbe8303afd28cea254f36c743acbc_GH0.tar.gz) = 88c5c1cb4f0f86051f8d4d9cf665f669f7070eecd7a5a8e3f09260237fe9754c
+SIZE (CTSRD-CHERI-llvm-3.8.d20160512-74f19ca643fbbe8303afd28cea254f36c743acbc_GH0.tar.gz) = 22361615
+SHA256 (CTSRD-CHERI-clang-2ae443e1402381eab3585e4f779bdc30fdfede62_GH0.tar.gz) = 6027aef2a953512e6259faefb29224fd335e864bd1e894b34555deb7c13e90ff
+SIZE (CTSRD-CHERI-clang-2ae443e1402381eab3585e4f779bdc30fdfede62_GH0.tar.gz) = 12890899
Index: head/emulators/qemu-cheri/Makefile.snapshot
===================================================================
--- head/emulators/qemu-cheri/Makefile.snapshot	(revision 415091)
+++ head/emulators/qemu-cheri/Makefile.snapshot	(revision 415092)
@@ -1,9 +1,9 @@
 # $FreeBSD$
 #
 # Generated file!  Do not edit!  
 #
 # Generated by: files/gen-Makefile.snapshot.sh.
 #
-SNAPDATE=	20160418
+SNAPDATE=	20160510
 
-QEMU_COMMIT=		cd63819952712db3b27d5ea86aa006e5f0c0d8a6
+QEMU_COMMIT=		042979d7f101ca36292beb756d8ea2e29529abbc
Index: head/emulators/qemu-cheri/distinfo
===================================================================
--- head/emulators/qemu-cheri/distinfo	(revision 415091)
+++ head/emulators/qemu-cheri/distinfo	(revision 415092)
@@ -1,2 +1,2 @@
-SHA256 (CTSRD-CHERI-qemu-0.d20160418-cd63819952712db3b27d5ea86aa006e5f0c0d8a6_GH0.tar.gz) = aefdcee20552c78741b862d3399694f3ba196bcd2025c9f61f34bc0551658c4a
-SIZE (CTSRD-CHERI-qemu-0.d20160418-cd63819952712db3b27d5ea86aa006e5f0c0d8a6_GH0.tar.gz) = 11139216
+SHA256 (CTSRD-CHERI-qemu-0.d20160510-042979d7f101ca36292beb756d8ea2e29529abbc_GH0.tar.gz) = 6b28027a2375efc66149ec331886ba5ccd628b1ab3ff309c260c294199ebbb36
+SIZE (CTSRD-CHERI-qemu-0.d20160510-042979d7f101ca36292beb756d8ea2e29529abbc_GH0.tar.gz) = 11140550