Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 12 Dec 2019 00:02:20 +0000 (UTC)
From:      Brooks Davis <brooks@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r519848 - in head: devel/llvm-cheri emulators/qemu-cheri emulators/qemu-cheri/files
Message-ID:  <201912120002.xBC02KSZ008802@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: brooks
Date: Thu Dec 12 00:02:20 2019
New Revision: 519848
URL: https://svnweb.freebsd.org/changeset/ports/519848

Log:
  Update to fresh qemu-cheri and llvm-cheri snapshots.

Modified:
  head/devel/llvm-cheri/Makefile
  head/devel/llvm-cheri/Makefile.snapshot
  head/devel/llvm-cheri/distinfo
  head/devel/llvm-cheri/pkg-plist
  head/emulators/qemu-cheri/Makefile
  head/emulators/qemu-cheri/Makefile.snapshot
  head/emulators/qemu-cheri/distinfo
  head/emulators/qemu-cheri/files/gen-Makefile.snapshot.sh

Modified: head/devel/llvm-cheri/Makefile
==============================================================================
--- head/devel/llvm-cheri/Makefile	Wed Dec 11 23:02:05 2019	(r519847)
+++ head/devel/llvm-cheri/Makefile	Thu Dec 12 00:02:20 2019	(r519848)
@@ -231,6 +231,7 @@ MAN1SRCS+=	bugpoint.1 \
 		llvm-lib.1 \
 		llvm-link.1 \
 		llvm-lipo.1 \
+		llvm-locstats.1 \
 		llvm-mca.1 \
 		llvm-nm.1 \
 		llvm-objcopy.1 \

Modified: head/devel/llvm-cheri/Makefile.snapshot
==============================================================================
--- head/devel/llvm-cheri/Makefile.snapshot	Wed Dec 11 23:02:05 2019	(r519847)
+++ head/devel/llvm-cheri/Makefile.snapshot	Thu Dec 12 00:02:20 2019	(r519848)
@@ -6,6 +6,6 @@
 #
 LLVM_MAJOR=	10
 LLVM_RELEASE=	${LLVM_MAJOR}.0.0
-SNAPDATE=	20191009
+SNAPDATE=	20191211
 
-LLVM_COMMIT=		973fd936d9f4880ce48005c34e854a6c5260cbbb
+LLVM_COMMIT=		8cad6d336ad9e91657db9999fcd25adceae3be83

Modified: head/devel/llvm-cheri/distinfo
==============================================================================
--- head/devel/llvm-cheri/distinfo	Wed Dec 11 23:02:05 2019	(r519847)
+++ head/devel/llvm-cheri/distinfo	Thu Dec 12 00:02:20 2019	(r519848)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1570653789
-SHA256 (CTSRD-CHERI-llvm-project-10.0.d20191009-973fd936d9f4880ce48005c34e854a6c5260cbbb_GH0.tar.gz) = 841be5ca9f9a4555a098ed08e726b162a1970e6b0c311b729d672769c81efdb2
-SIZE (CTSRD-CHERI-llvm-project-10.0.d20191009-973fd936d9f4880ce48005c34e854a6c5260cbbb_GH0.tar.gz) = 119433212
+TIMESTAMP = 1576101834
+SHA256 (CTSRD-CHERI-llvm-project-10.0.d20191211-8cad6d336ad9e91657db9999fcd25adceae3be83_GH0.tar.gz) = 3401c91b43b768a380b9fc208aad223260541f1d8d1c317cff8de02adefd209a
+SIZE (CTSRD-CHERI-llvm-project-10.0.d20191211-8cad6d336ad9e91657db9999fcd25adceae3be83_GH0.tar.gz) = 121667904

Modified: head/devel/llvm-cheri/pkg-plist
==============================================================================
--- head/devel/llvm-cheri/pkg-plist	Wed Dec 11 23:02:05 2019	(r519847)
+++ head/devel/llvm-cheri/pkg-plist	Thu Dec 12 00:02:20 2019	(r519848)
@@ -91,6 +91,7 @@ llvm%%LLVM_SUFFIX%%/bin/capsizefix
 %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang-format
 %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang-import-test
 %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang-offload-bundler
+%%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang-offload-wrapper
 %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang-refactor
 %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang-rename
 %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang-scan-deps
@@ -208,6 +209,7 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/BaseSubobject.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/BuiltinTypes.def
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/CXXInheritance.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/CXXRecordDeclDefinitionBits.def
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/CanonicalType.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/CharUnits.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/Comment.h
@@ -292,7 +294,7 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/TypeLoc.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/TypeLocNodes.def
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/TypeLocVisitor.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/TypeNodes.def
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/TypeNodes.inc
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/TypeOrdering.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/TypeVisitor.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/UnresolvedSet.h
@@ -357,6 +359,7 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/BuiltinsAArch64.def
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/BuiltinsAMDGPU.def
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/BuiltinsARM.def
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/BuiltinsBPF.def
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/BuiltinsHexagon.def
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/BuiltinsLe64.def
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/BuiltinsMips.def
@@ -464,6 +467,10 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/XRayInstr.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/XRayLists.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/arm_fp16.inc
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/arm_mve_builtin_aliases.inc
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/arm_mve_builtin_cg.inc
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/arm_mve_builtin_sema.inc
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/arm_mve_builtins.inc
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/arm_neon.inc
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/CodeGen/BackendUtil.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/CodeGen/CGFunctionInfo.h
@@ -706,7 +713,9 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Core/Replacement.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/DependencyScanning/DependencyScanningFilesystem.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/DependencyScanning/DependencyScanningService.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/DependencyScanning/DependencyScanningTool.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/DependencyScanning/DependencyScanningWorker.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/DependencyScanning/ModuleDepCollector.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/DiagnosticsYaml.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Execution.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/FileMatchTrie.h
@@ -719,7 +728,6 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Refactoring/AtomicChange.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Refactoring/Extract/Extract.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Refactoring/Extract/SourceExtraction.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Refactoring/RangeSelector.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Refactoring/RecursiveSymbolVisitor.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Refactoring/RefactoringAction.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Refactoring/RefactoringActionRule.h
@@ -738,9 +746,6 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Refactoring/Rename/USRFinder.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Refactoring/Rename/USRFindingAction.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Refactoring/Rename/USRLocFinder.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Refactoring/SourceCode.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Refactoring/Stencil.h
-%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Refactoring/Transformer.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/RefactoringCallbacks.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/ReplacementsYaml.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/StandaloneExecution.h
@@ -750,7 +755,15 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Syntax/Tree.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/ToolExecutorPluginRegistry.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Tooling.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Transformer/MatchConsumer.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Transformer/RangeSelector.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Transformer/RewriteRule.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Transformer/SourceCode.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Transformer/SourceCodeBuilders.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Transformer/Stencil.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Transformer/Transformer.h
 %%LLD%%llvm%%LLVM_SUFFIX%%/include/lld/Common/Args.h
+%%LLD%%llvm%%LLVM_SUFFIX%%/include/lld/Common/DWARF.h
 %%LLD%%llvm%%LLVM_SUFFIX%%/include/lld/Common/Driver.h
 %%LLD%%llvm%%LLVM_SUFFIX%%/include/lld/Common/ErrorHandler.h
 %%LLD%%llvm%%LLVM_SUFFIX%%/include/lld/Common/Filesystem.h
@@ -833,6 +846,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/ADT/DenseMapInfo.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/DenseSet.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/DepthFirstIterator.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/DirectedGraph.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ADT/EnumeratedArray.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/EpochTracker.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/EquivalenceClasses.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/FoldingSet.h
@@ -916,9 +930,11 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/CheriBounds.
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/CmpInstAnalysis.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/CodeMetrics.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/ConstantFolding.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/DDG.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/DOTGraphTraitsPass.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/DemandedBits.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/DependenceAnalysis.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/DependenceGraphBuilder.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/DivergenceAnalysis.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/DomPrinter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/DomTreeUpdater.h
@@ -1112,6 +1128,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/LiveInterval.
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/LiveIntervalUnion.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/LiveIntervals.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/LivePhysRegs.h
+llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/LiveRangeCalc.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/LiveRangeEdit.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/LiveRegMatrix.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/LiveRegUnits.h
@@ -1140,6 +1157,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineInstrB
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineInstrBundleIterator.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineJumpTableInfo.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineLoopInfo.h
+llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineLoopUtils.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineMemOperand.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineModuleInfo.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineModuleInfoImpls.h
@@ -1153,6 +1171,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineRegion
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineRegisterInfo.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineSSAUpdater.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineScheduler.h
+llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineSizeOpts.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineTraceMetrics.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MacroFusion.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/ModuloSchedule.h
@@ -1302,6 +1321,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARF/DWARF
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARF/DWARFFormValue.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARF/DWARFGdbIndex.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARF/DWARFListTable.h
+llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARF/DWARFLocationExpression.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARF/DWARFObject.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARF/DWARFRelocMap.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARF/DWARFSection.h
@@ -1312,6 +1332,9 @@ llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARF/DWARF
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/GSYM/FileEntry.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/GSYM/FileWriter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/GSYM/FunctionInfo.h
+llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/GSYM/GsymCreator.h
+llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/GSYM/GsymReader.h
+llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/GSYM/Header.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/GSYM/InlineInfo.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/GSYM/LineEntry.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/GSYM/LineTable.h
@@ -1457,6 +1480,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/JITLi
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/JITLink/JITLink.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/JITLink/JITLinkMemoryManager.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/JITLink/MachO.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/JITLink/MachO_arm64.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/JITLink/MachO_x86_64.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/JITSymbol.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/MCJIT.h
@@ -1465,6 +1489,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Objec
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/CompileOnDemandLayer.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/CompileUtils.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/Core.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/DebugUtils.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/ExecutionUtils.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/GlobalMappingLayer.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/IRCompileLayer.h
@@ -1485,10 +1510,10 @@ llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/O
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetRPCAPI.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetServer.h
-llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/RPCSerialization.h
-llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/RPCUtils.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/RPC/RPCSerialization.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/RPC/RPCUtils.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/RPC/RawByteChannel.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/RTDyldObjectLinkingLayer.h
-llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/RawByteChannel.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/RemoteObjectLayer.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/SpeculateAnalyses.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Orc/Speculation.h
@@ -1535,6 +1560,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/IR/DiagnosticHandler.
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/DiagnosticInfo.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/DiagnosticPrinter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/Dominators.h
+llvm%%LLVM_SUFFIX%%/include/llvm/IR/FPEnv.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/FixedMetadataKinds.def
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/Function.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/GVMaterializer.h
@@ -1808,6 +1834,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Remarks/BitstreamRema
 llvm%%LLVM_SUFFIX%%/include/llvm/Remarks/BitstreamRemarkSerializer.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Remarks/Remark.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Remarks/RemarkFormat.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Remarks/RemarkLinker.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Remarks/RemarkParser.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Remarks/RemarkSerializer.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Remarks/RemarkStringTable.h
@@ -1828,6 +1855,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Support/Allocator.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/ArrayRecycler.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/Atomic.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/AtomicOrdering.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Support/Automaton.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/BinaryByteStream.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/BinaryItemStream.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/BinaryStream.h
@@ -1891,7 +1919,6 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Support/Host.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/InitLLVM.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/ItaniumManglingCanonicalizer.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/JSON.h
-llvm%%LLVM_SUFFIX%%/include/llvm/Support/JamCRC.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/KnownBits.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/LEB128.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/LICENSE.TXT
@@ -1911,7 +1938,6 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Support/MipsABIFlags.
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/Mutex.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/NativeFormatting.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/OnDiskHashTable.h
-llvm%%LLVM_SUFFIX%%/include/llvm/Support/Options.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/Parallel.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/Path.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/PluginLoader.h
@@ -1931,7 +1957,6 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Support/SHA1.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/SMLoc.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/SMTAPI.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/SaveAndRestore.h
-llvm%%LLVM_SUFFIX%%/include/llvm/Support/ScalableSize.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/ScaledNumber.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/ScopedPrinter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/Signals.h
@@ -1960,6 +1985,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Support/ToolOutputFil
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/TrailingObjects.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/TrigramIndex.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/TypeName.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Support/TypeSize.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/Unicode.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/UnicodeCharRanges.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/VCSRevision.h
@@ -1981,6 +2007,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Support/raw_sha1_ostr
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/thread.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/type_traits.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/xxhash.h
+llvm%%LLVM_SUFFIX%%/include/llvm/TableGen/Automaton.td
 llvm%%LLVM_SUFFIX%%/include/llvm/TableGen/Error.h
 llvm%%LLVM_SUFFIX%%/include/llvm/TableGen/Main.h
 llvm%%LLVM_SUFFIX%%/include/llvm/TableGen/Record.h
@@ -1991,6 +2018,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/TableGen/StringToOffs
 llvm%%LLVM_SUFFIX%%/include/llvm/TableGen/TableGenBackend.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Target/CodeGenCWrappers.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Target/GenericOpcodes.td
+llvm%%LLVM_SUFFIX%%/include/llvm/Target/GlobalISel/Combine.td
 llvm%%LLVM_SUFFIX%%/include/llvm/Target/GlobalISel/RegisterBank.td
 llvm%%LLVM_SUFFIX%%/include/llvm/Target/GlobalISel/SelectionDAGCompat.td
 llvm%%LLVM_SUFFIX%%/include/llvm/Target/GlobalISel/Target.td
@@ -2015,12 +2043,15 @@ llvm%%LLVM_SUFFIX%%/include/llvm/TextAPI/MachO/Archite
 llvm%%LLVM_SUFFIX%%/include/llvm/TextAPI/MachO/ArchitectureSet.h
 llvm%%LLVM_SUFFIX%%/include/llvm/TextAPI/MachO/InterfaceFile.h
 llvm%%LLVM_SUFFIX%%/include/llvm/TextAPI/MachO/PackedVersion.h
+llvm%%LLVM_SUFFIX%%/include/llvm/TextAPI/MachO/Platform.h
 llvm%%LLVM_SUFFIX%%/include/llvm/TextAPI/MachO/Symbol.h
+llvm%%LLVM_SUFFIX%%/include/llvm/TextAPI/MachO/Target.h
 llvm%%LLVM_SUFFIX%%/include/llvm/TextAPI/MachO/TextAPIReader.h
 llvm%%LLVM_SUFFIX%%/include/llvm/TextAPI/MachO/TextAPIWriter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ToolDrivers/llvm-dlltool/DlltoolDriver.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ToolDrivers/llvm-lib/LibDriver.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/AggressiveInstCombine/AggressiveInstCombine.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/CFGuard.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/CHERICap.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Coroutines.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/IPO.h
@@ -2106,6 +2137,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/Loo
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/LoopUnrollAndJamPass.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/LoopUnrollPass.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/LowerAtomic.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/LowerConstantIntrinsics.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/LowerExpectIntrinsic.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/LowerGuardIntrinsic.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/LowerWidenableCondition.h
@@ -2141,6 +2173,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/Cher
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/Cloning.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/CodeExtractor.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/CtorUtils.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/Debugify.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/EntryExitInstrumenter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/EscapeEnumerator.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/Evaluator.h
@@ -2149,6 +2182,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/Func
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/GlobalStatus.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/GuardUtils.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/ImportedFunctionsInliningStatistics.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/InjectTLIMappings.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/IntegerDivision.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/LCSSA.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/LibCallsShrinkWrap.h
@@ -2204,9 +2238,6 @@ llvm%%LLVM_SUFFIX%%/include/llvm/XRay/RecordPrinter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/XRay/Trace.h
 llvm%%LLVM_SUFFIX%%/include/llvm/XRay/XRayRecord.h
 llvm%%LLVM_SUFFIX%%/include/llvm/XRay/YAMLXRayRecord.h
-llvm%%LLVM_SUFFIX%%/lib/CheckerDependencyHandlingAnalyzerPlugin.so
-llvm%%LLVM_SUFFIX%%/lib/CheckerOptionHandlingAnalyzerPlugin.so
-llvm%%LLVM_SUFFIX%%/lib/SampleAnalyzerPlugin.so
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/__clang_cuda_builtin_vars.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/__clang_cuda_cmath.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/__clang_cuda_complex_builtins.h
@@ -2224,6 +2255,7 @@ llvm%%LLVM_SUFFIX%%/lib/SampleAnalyzerPlugin.so
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/arm64intr.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/arm_acle.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/arm_fp16.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/arm_mve.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/arm_neon.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/armintr.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avx2intrin.h
@@ -2378,8 +2410,9 @@ llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/LLVMProcessSources.
 llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/TableGen.cmake
 llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/UseLibtool.cmake
 llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/VersionFromVCS.cmake
-llvm%%LLVM_SUFFIX%%/lib/libLLVM-%%LLVM_MAJOR%%svn.so
-llvm%%LLVM_SUFFIX%%/lib/libLLVM-%%LLVM_RELEASE%%svn.so
+llvm%%LLVM_SUFFIX%%/lib/libExampleIRTransforms.a
+llvm%%LLVM_SUFFIX%%/lib/libLLVM-%%LLVM_MAJOR%%git.so
+llvm%%LLVM_SUFFIX%%/lib/libLLVM-%%LLVM_RELEASE%%git.so
 llvm%%LLVM_SUFFIX%%/lib/libLLVM.so
 llvm%%LLVM_SUFFIX%%/lib/libLLVMAArch64AsmParser.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMAArch64CodeGen.a
@@ -2412,6 +2445,7 @@ llvm%%LLVM_SUFFIX%%/lib/libLLVMBinaryFormat.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMBitReader.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMBitWriter.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMBitstreamReader.a
+llvm%%LLVM_SUFFIX%%/lib/libLLVMCFGuard.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMCHERICapOpts.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMCodeGen.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMCore.a
@@ -2469,6 +2503,7 @@ llvm%%LLVM_SUFFIX%%/lib/libLLVMObjCARCOpts.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMObject.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMObjectYAML.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMOption.a
+llvm%%LLVM_SUFFIX%%/lib/libLLVMOrcError.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMOrcJIT.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMPasses.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMPowerPCAsmParser.a
@@ -2523,14 +2558,14 @@ llvm%%LLVM_SUFFIX%%/lib/libLLVMXCoreInfo.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMXRay.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMipo.a
 llvm%%LLVM_SUFFIX%%/lib/libLTO.so
-llvm%%LLVM_SUFFIX%%/lib/libLTO.so.%%LLVM_MAJOR%%svn
+llvm%%LLVM_SUFFIX%%/lib/libLTO.so.%%LLVM_MAJOR%%git
 llvm%%LLVM_SUFFIX%%/lib/libRemarks.so
-llvm%%LLVM_SUFFIX%%/lib/libRemarks.so.%%LLVM_MAJOR%%svn
+llvm%%LLVM_SUFFIX%%/lib/libRemarks.so.%%LLVM_MAJOR%%git
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang-cpp.so
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang-cpp.so.%%LLVM_MAJOR%%svn
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang-cpp.so.%%LLVM_MAJOR%%git
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang.so
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang.so.%%LLVM_MAJOR%%
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang.so.%%LLVM_MAJOR%%svn
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang.so.%%LLVM_MAJOR%%git
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangARCMigrate.a
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangAST.a
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangASTMatchers.a
@@ -2564,6 +2599,7 @@ llvm%%LLVM_SUFFIX%%/lib/libRemarks.so.%%LLVM_MAJOR%%sv
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangToolingInclusions.a
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangToolingRefactoring.a
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangToolingSyntax.a
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangTransformer.a
 %%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldCOFF.a
 %%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldCommon.a
 %%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldCore.a
@@ -2600,6 +2636,7 @@ llvm%%LLVM_SUFFIX%%/share/scan-view/bugcatcher.ico
 llvm%%LLVM_SUFFIX%%/share/scan-view/startfile.py
 %%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/BooleanExpression.py
 %%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/LitConfig.py
+%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/LitTestCase.py
 %%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/ProgressBar.py
 %%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/ShCommands.py
 %%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/ShUtil.py
@@ -2607,7 +2644,9 @@ llvm%%LLVM_SUFFIX%%/share/scan-view/startfile.py
 %%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/TestRunner.py
 %%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/TestingConfig.py
 %%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/__init__.py
+%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/cl_arguments.py
 %%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/discovery.py
+%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/display.py
 %%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/main.py
 %%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/run.py
 %%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/util.py

Modified: head/emulators/qemu-cheri/Makefile
==============================================================================
--- head/emulators/qemu-cheri/Makefile	Wed Dec 11 23:02:05 2019	(r519847)
+++ head/emulators/qemu-cheri/Makefile	Thu Dec 12 00:02:20 2019	(r519848)
@@ -20,9 +20,9 @@ RUN_DEPENDS=	qemu-system-i386:emulators/qemu
 LICENSE=	GPLv2
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	CTSRD-CHERI
-GH_TAGNAME=	${QEMU_COMMIT}
-GH_TUPLE=	qemu:keycodemapdb:6b3d716:qemu/ui/keycodemapdb
+GH_TUPLE=	CTSRD-CHERI:qemu:${QEMU_COMMIT} \
+		CTSRD-CHERI:libslirp:${LIBSLIRP_COMMIT}:libslirp/slirp \
+		qemu:keycodemapdb:6b3d716:qemu/ui/keycodemapdb \
 
 HAS_CONFIGURE=	yes
 USES=	compiler:c11 gettext-runtime gl gmake gnome libtool makeinfo pkgconfig \
@@ -41,7 +41,6 @@ CONFIGURE_ARGS+= \
 		--disable-curl \
 		--disable-git-update \
 		--disable-gtk \
-		--disable-libssh2 \
 		--disable-linux-user \
 		--disable-linux-aio \
 		--disable-kvm \

Modified: head/emulators/qemu-cheri/Makefile.snapshot
==============================================================================
--- head/emulators/qemu-cheri/Makefile.snapshot	Wed Dec 11 23:02:05 2019	(r519847)
+++ head/emulators/qemu-cheri/Makefile.snapshot	Thu Dec 12 00:02:20 2019	(r519848)
@@ -4,6 +4,7 @@
 #
 # Generated by: files/gen-Makefile.snapshot.sh.
 #
-SNAPDATE=	20190831
+SNAPDATE=	20191209
 
-QEMU_COMMIT=		cab2ad32531f0a1aa9cef9332169f7e2825a98c6
+QEMU_COMMIT=		74235a2879944724c88ad8b400170b8e2b0a6147
+LIBSLIRP_COMMIT=	6651ba26c4e94f64d6448a2db4991269ce553bd9

Modified: head/emulators/qemu-cheri/distinfo
==============================================================================
--- head/emulators/qemu-cheri/distinfo	Wed Dec 11 23:02:05 2019	(r519847)
+++ head/emulators/qemu-cheri/distinfo	Thu Dec 12 00:02:20 2019	(r519848)
@@ -1,5 +1,7 @@
-TIMESTAMP = 1570639000
-SHA256 (CTSRD-CHERI-qemu-0.d20190831-cab2ad32531f0a1aa9cef9332169f7e2825a98c6_GH0.tar.gz) = 583f9331057a3b8c4e8ae62ba37a4818840bd566f9705462072f7c42509ff600
-SIZE (CTSRD-CHERI-qemu-0.d20190831-cab2ad32531f0a1aa9cef9332169f7e2825a98c6_GH0.tar.gz) = 18941063
+TIMESTAMP = 1576015343
+SHA256 (CTSRD-CHERI-qemu-0.d20191209-74235a2879944724c88ad8b400170b8e2b0a6147_GH0.tar.gz) = facff8aca23b47d443dad98fa6ece3971636cf0a7d2fb79eaadbff5ddb4bf348
+SIZE (CTSRD-CHERI-qemu-0.d20191209-74235a2879944724c88ad8b400170b8e2b0a6147_GH0.tar.gz) = 29444613
+SHA256 (CTSRD-CHERI-libslirp-6651ba26c4e94f64d6448a2db4991269ce553bd9_GH0.tar.gz) = aaffa33addd3aec53b5def83c4735275c9f501425bb0d8706494a7724875d8a6
+SIZE (CTSRD-CHERI-libslirp-6651ba26c4e94f64d6448a2db4991269ce553bd9_GH0.tar.gz) = 121465
 SHA256 (qemu-keycodemapdb-6b3d716_GH0.tar.gz) = c9d3412510aac999865d01aaa14b1fa8dc0385db55c5cf6c4d95d160bd0eaee9
 SIZE (qemu-keycodemapdb-6b3d716_GH0.tar.gz) = 47905

Modified: head/emulators/qemu-cheri/files/gen-Makefile.snapshot.sh
==============================================================================
--- head/emulators/qemu-cheri/files/gen-Makefile.snapshot.sh	Wed Dec 11 23:02:05 2019	(r519847)
+++ head/emulators/qemu-cheri/files/gen-Makefile.snapshot.sh	Thu Dec 12 00:02:20 2019	(r519848)
@@ -11,7 +11,8 @@ tmpfile=`mktemp -t gen-Makefile.snapshot`
 
 query_repo()
 {
-	curl ${REPOS_URL}/$1/branches/qemu-cheri > $tmpfile
+	branch=${2:-master}
+	curl ${REPOS_URL}/$1/branches/${branch} > $tmpfile
 
 	# Accumulate the dates of the last commits to find the snapshot date
 	committime=`jq -r '.commit.commit.committer.date' $tmpfile`
@@ -28,8 +29,10 @@ query_repo()
 	SHA=`jq -r '.commit.sha' $tmpfile`
 }
 
-query_repo qemu
+query_repo qemu qemu-cheri
 QEMU_COMMIT=$SHA
+query_repo libslirp
+LIBSLIRP_COMMIT=$SHA
 
 cat <<EOF > Makefile.snapshot
 # \$FreeBSD\$
@@ -41,6 +44,7 @@ cat <<EOF > Makefile.snapshot
 SNAPDATE=	${MAX_DATE}
 
 QEMU_COMMIT=		${QEMU_COMMIT}
+LIBSLIRP_COMMIT=	${LIBSLIRP_COMMIT}
 EOF
 
 rm -f $tmpfile



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201912120002.xBC02KSZ008802>