Date: Fri, 27 Mar 2020 16:11:54 +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: r529267 - in head: devel/llvm-cheri devel/llvm-cheri/files emulators/qemu-cheri emulators/qemu-cheri/files Message-ID: <202003271611.02RGBsS9030742@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brooks Date: Fri Mar 27 16:11:53 2020 New Revision: 529267 URL: https://svnweb.freebsd.org/changeset/ports/529267 Log: Update qemu-cheri and llvm-cheri to recent snapshots. In qemu-cheri: * Fix build with llvm10 [0] * Remove the 256-bit capability version * Add CHERI RISC-V PR: 244768 [0] Submitted by: dim [0] Sponsored by: DARPA Added: head/emulators/qemu-cheri/files/patch-configure (contents, props changed) Modified: head/devel/llvm-cheri/Makefile head/devel/llvm-cheri/Makefile.snapshot head/devel/llvm-cheri/distinfo head/devel/llvm-cheri/files/gen-Makefile.snapshot.sh 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 Fri Mar 27 16:02:48 2020 (r529266) +++ head/devel/llvm-cheri/Makefile Fri Mar 27 16:11:53 2020 (r529267) @@ -2,7 +2,7 @@ PORTNAME= llvm PORTVERSION= ${LLVM_MAJOR}.0.d${SNAPDATE} -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= devel lang PKGNAMESUFFIX= ${LLVM_SUFFIX} @@ -117,6 +117,7 @@ COMMANDS= bugpoint \ llvm-exegesis \ llvm-extract \ llvm-ifs \ + llvm-install-name-tool \ llvm-jitlink \ llvm-lib \ llvm-link \ @@ -264,8 +265,6 @@ post-patch: -e 's|from lit|from lit${LLVM_SUFFIX}|' \ -e 's|lit\.|lit${LLVM_SUFFIX}.|' \ ${WRKSRC}/llvm/utils/lit/lit.py ${WRKSRC}/llvm/utils/lit/lit/*.py - ${REINPLACE_CMD} -e 's,/usr/local/,${LOCALBASE}/,' \ - ${WRKSRC}/llvm/CMakeLists.txt post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/share/toolchains/ Modified: head/devel/llvm-cheri/Makefile.snapshot ============================================================================== --- head/devel/llvm-cheri/Makefile.snapshot Fri Mar 27 16:02:48 2020 (r529266) +++ head/devel/llvm-cheri/Makefile.snapshot Fri Mar 27 16:11:53 2020 (r529267) @@ -4,8 +4,8 @@ # # Generated by: files/gen-Makefile.snapshot.sh. # -LLVM_MAJOR= 10 +LLVM_MAJOR= 11 LLVM_RELEASE= ${LLVM_MAJOR}.0.0 -SNAPDATE= 20191211 +SNAPDATE= 20200309 -LLVM_COMMIT= 8cad6d336ad9e91657db9999fcd25adceae3be83 +LLVM_COMMIT= b507d88d2aa61cec27adab60324a04b17911f5e4 Modified: head/devel/llvm-cheri/distinfo ============================================================================== --- head/devel/llvm-cheri/distinfo Fri Mar 27 16:02:48 2020 (r529266) +++ head/devel/llvm-cheri/distinfo Fri Mar 27 16:11:53 2020 (r529267) @@ -1,3 +1,3 @@ -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 +TIMESTAMP = 1585007852 +SHA256 (CTSRD-CHERI-llvm-project-11.0.d20200309-b507d88d2aa61cec27adab60324a04b17911f5e4_GH0.tar.gz) = 5757ef569e4e3dde25e2a8ea41fd05235c9ed61be1662bab02a848cba09cb124 +SIZE (CTSRD-CHERI-llvm-project-11.0.d20200309-b507d88d2aa61cec27adab60324a04b17911f5e4_GH0.tar.gz) = 126759614 Modified: head/devel/llvm-cheri/files/gen-Makefile.snapshot.sh ============================================================================== --- head/devel/llvm-cheri/files/gen-Makefile.snapshot.sh Fri Mar 27 16:02:48 2020 (r529266) +++ head/devel/llvm-cheri/files/gen-Makefile.snapshot.sh Fri Mar 27 16:11:53 2020 (r529267) @@ -38,7 +38,7 @@ cat <<EOF > Makefile.snapshot # # Generated by: files/gen-Makefile.snapshot.sh. # -LLVM_MAJOR= 10 +LLVM_MAJOR= 11 LLVM_RELEASE= \${LLVM_MAJOR}.0.0 SNAPDATE= ${MAX_DATE} Modified: head/devel/llvm-cheri/pkg-plist ============================================================================== --- head/devel/llvm-cheri/pkg-plist Fri Mar 27 16:02:48 2020 (r529266) +++ head/devel/llvm-cheri/pkg-plist Fri Mar 27 16:11:53 2020 (r529267) @@ -23,6 +23,7 @@ bin/llvm-dwp%%COMMAND_SUFFIX%% bin/llvm-exegesis%%COMMAND_SUFFIX%% bin/llvm-extract%%COMMAND_SUFFIX%% bin/llvm-ifs%%COMMAND_SUFFIX%% +bin/llvm-install-name-tool%%COMMAND_SUFFIX%% bin/llvm-jitlink%%COMMAND_SUFFIX%% bin/llvm-lib%%COMMAND_SUFFIX%% bin/llvm-link%%COMMAND_SUFFIX%% @@ -127,6 +128,7 @@ llvm%%LLVM_SUFFIX%%/bin/llvm-elfabi llvm%%LLVM_SUFFIX%%/bin/llvm-exegesis llvm%%LLVM_SUFFIX%%/bin/llvm-extract llvm%%LLVM_SUFFIX%%/bin/llvm-ifs +llvm%%LLVM_SUFFIX%%/bin/llvm-install-name-tool llvm%%LLVM_SUFFIX%%/bin/llvm-jitlink llvm%%LLVM_SUFFIX%%/bin/llvm-lib llvm%%LLVM_SUFFIX%%/bin/llvm-link @@ -172,6 +174,7 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang-c/CXErrorCode.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang-c/CXString.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang-c/Documentation.h +%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang-c/ExternC.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang-c/FatalErrorHandler.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang-c/Index.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang-c/Platform.h @@ -180,6 +183,7 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/ARCMigrate/FileRemapper.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/APValue.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/AST.h +%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/ASTConcept.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/ASTConsumer.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/ASTContext.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/ASTContextAllocate.h @@ -197,6 +201,14 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/ASTTypeTraits.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/ASTUnresolvedSet.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/ASTVector.h +%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/AbstractBasicReader.h +%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/AbstractBasicReader.inc +%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/AbstractBasicWriter.h +%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/AbstractBasicWriter.inc +%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/AbstractTypeReader.h +%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/AbstractTypeReader.inc +%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/AbstractTypeWriter.h +%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/AbstractTypeWriter.inc %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/Attr.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/AttrImpl.inc %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/AttrIterator.h @@ -247,6 +259,7 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/EvaluatedExprVisitor.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/Expr.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/ExprCXX.h +%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/ExprConcepts.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/ExprObjC.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/ExprOpenMP.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/ExternalASTMerger.h @@ -336,6 +349,7 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/DomainSpecific/CocoaConventions.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/DomainSpecific/ObjCNoReturn.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/FlowSensitive/DataflowValues.h +%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/FlowSensitive/DataflowWorklist.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/PathDiagnostic.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/ProgramPoint.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/RetainSummaryManager.h @@ -361,6 +375,7 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj %%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/BuiltinsHexagonDep.def %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/BuiltinsLe64.def %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/BuiltinsMips.def %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/BuiltinsNEON.def @@ -493,6 +508,7 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Driver/DriverDiagnostic.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Driver/Job.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Driver/Multilib.h +%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Driver/OptionUtils.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Driver/Options.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Driver/Options.inc %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Driver/Phases.h @@ -617,6 +633,7 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Sema/Scope.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Sema/ScopeInfo.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Sema/Sema.h +%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Sema/SemaConcept.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Sema/SemaConsumer.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Sema/SemaDiagnostic.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Sema/SemaFixItUtils.h @@ -630,17 +647,20 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Serialization/ASTBitCodes.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Serialization/ASTDeserializationListener.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Serialization/ASTReader.h +%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Serialization/ASTRecordReader.h +%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Serialization/ASTRecordWriter.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Serialization/ASTWriter.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Serialization/AttrPCHRead.inc %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Serialization/AttrPCHWrite.inc %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Serialization/ContinuousRangeMap.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Serialization/GlobalModuleIndex.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Serialization/InMemoryModuleCache.h -%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Serialization/Module.h +%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Serialization/ModuleFile.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Serialization/ModuleFileExtension.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Serialization/ModuleManager.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Serialization/PCHContainerOperations.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Serialization/SerializationDiagnostic.h +%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Serialization/TypeBitCodes.def %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Checkers/BuiltinCheckerRegistration.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Checkers/Checkers.inc %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Checkers/LocalCheckers.h @@ -750,6 +770,7 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/ReplacementsYaml.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/StandaloneExecution.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Syntax/BuildTree.h +%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Syntax/Mutations.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Syntax/Nodes.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Syntax/Tokens.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Syntax/Tree.h @@ -809,6 +830,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm-c/DisassemblerTypes.h llvm%%LLVM_SUFFIX%%/include/llvm-c/Error.h llvm%%LLVM_SUFFIX%%/include/llvm-c/ErrorHandling.h llvm%%LLVM_SUFFIX%%/include/llvm-c/ExecutionEngine.h +llvm%%LLVM_SUFFIX%%/include/llvm-c/ExternC.h llvm%%LLVM_SUFFIX%%/include/llvm-c/IRReader.h llvm%%LLVM_SUFFIX%%/include/llvm-c/Initialization.h llvm%%LLVM_SUFFIX%%/include/llvm-c/LinkTimeOptimizer.h @@ -849,6 +871,7 @@ 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/FloatingPointMode.h llvm%%LLVM_SUFFIX%%/include/llvm/ADT/FoldingSet.h llvm%%LLVM_SUFFIX%%/include/llvm/ADT/FunctionExtras.h llvm%%LLVM_SUFFIX%%/include/llvm/ADT/GraphTraits.h @@ -1136,6 +1159,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/LiveStacks.h llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/LiveVariables.h llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/LoopTraversal.h llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/LowLevelType.h +llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MIRFormatter.h llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MIRParser/MIParser.h llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MIRParser/MIRParser.h llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MIRPrinter.h @@ -1175,6 +1199,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineSizeOp llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineTraceMetrics.h llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MacroFusion.h llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/ModuloSchedule.h +llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/NonRelocatableStringpool.h llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/PBQP/CostAllocator.h llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/PBQP/Graph.h llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/PBQP/Math.h @@ -1236,6 +1261,9 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Config/Disassemblers. llvm%%LLVM_SUFFIX%%/include/llvm/Config/Targets.def llvm%%LLVM_SUFFIX%%/include/llvm/Config/abi-breaking.h llvm%%LLVM_SUFFIX%%/include/llvm/Config/llvm-config.h +llvm%%LLVM_SUFFIX%%/include/llvm/DWARFLinker/DWARFLinker.h +llvm%%LLVM_SUFFIX%%/include/llvm/DWARFLinker/DWARFLinkerCompileUnit.h +llvm%%LLVM_SUFFIX%%/include/llvm/DWARFLinker/DWARFLinkerDeclContext.h llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/CodeView/AppendingTypeTableBuilder.h llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/CodeView/CVRecord.h llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/CodeView/CVSymbolVisitor.h @@ -1338,6 +1366,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/GSYM/Header 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 +llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/GSYM/LookupResult.h llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/GSYM/Range.h llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/GSYM/StringTable.h llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/MSF/IMSFFile.h @@ -1525,6 +1554,9 @@ llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/RTDyl llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/RuntimeDyld.h llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/RuntimeDyldChecker.h llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/SectionMemoryManager.h +llvm%%LLVM_SUFFIX%%/include/llvm/Frontend/OpenMP/OMPConstants.h +llvm%%LLVM_SUFFIX%%/include/llvm/Frontend/OpenMP/OMPIRBuilder.h +llvm%%LLVM_SUFFIX%%/include/llvm/Frontend/OpenMP/OMPKinds.def llvm%%LLVM_SUFFIX%%/include/llvm/FuzzMutate/FuzzerCLI.h llvm%%LLVM_SUFFIX%%/include/llvm/FuzzMutate/IRMutator.h llvm%%LLVM_SUFFIX%%/include/llvm/FuzzMutate/OpDescriptor.h @@ -1548,6 +1580,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/IR/Constant.h llvm%%LLVM_SUFFIX%%/include/llvm/IR/ConstantFolder.h llvm%%LLVM_SUFFIX%%/include/llvm/IR/ConstantRange.h llvm%%LLVM_SUFFIX%%/include/llvm/IR/Constants.h +llvm%%LLVM_SUFFIX%%/include/llvm/IR/ConstrainedOps.def llvm%%LLVM_SUFFIX%%/include/llvm/IR/DIBuilder.h llvm%%LLVM_SUFFIX%%/include/llvm/IR/DataLayout.h llvm%%LLVM_SUFFIX%%/include/llvm/IR/DebugInfo.h @@ -1585,19 +1618,34 @@ llvm%%LLVM_SUFFIX%%/include/llvm/IR/IntrinsicImpl.inc llvm%%LLVM_SUFFIX%%/include/llvm/IR/IntrinsicInst.h llvm%%LLVM_SUFFIX%%/include/llvm/IR/Intrinsics.h llvm%%LLVM_SUFFIX%%/include/llvm/IR/Intrinsics.td +llvm%%LLVM_SUFFIX%%/include/llvm/IR/IntrinsicsAArch64.h llvm%%LLVM_SUFFIX%%/include/llvm/IR/IntrinsicsAArch64.td +llvm%%LLVM_SUFFIX%%/include/llvm/IR/IntrinsicsAMDGPU.h llvm%%LLVM_SUFFIX%%/include/llvm/IR/IntrinsicsAMDGPU.td +llvm%%LLVM_SUFFIX%%/include/llvm/IR/IntrinsicsARM.h llvm%%LLVM_SUFFIX%%/include/llvm/IR/IntrinsicsARM.td +llvm%%LLVM_SUFFIX%%/include/llvm/IR/IntrinsicsBPF.h llvm%%LLVM_SUFFIX%%/include/llvm/IR/IntrinsicsBPF.td llvm%%LLVM_SUFFIX%%/include/llvm/IR/IntrinsicsCHERICap.td +llvm%%LLVM_SUFFIX%%/include/llvm/IR/IntrinsicsHexagon.h llvm%%LLVM_SUFFIX%%/include/llvm/IR/IntrinsicsHexagon.td +llvm%%LLVM_SUFFIX%%/include/llvm/IR/IntrinsicsHexagonDep.td +llvm%%LLVM_SUFFIX%%/include/llvm/IR/IntrinsicsMips.h llvm%%LLVM_SUFFIX%%/include/llvm/IR/IntrinsicsMips.td +llvm%%LLVM_SUFFIX%%/include/llvm/IR/IntrinsicsNVPTX.h llvm%%LLVM_SUFFIX%%/include/llvm/IR/IntrinsicsNVVM.td +llvm%%LLVM_SUFFIX%%/include/llvm/IR/IntrinsicsPowerPC.h llvm%%LLVM_SUFFIX%%/include/llvm/IR/IntrinsicsPowerPC.td +llvm%%LLVM_SUFFIX%%/include/llvm/IR/IntrinsicsR600.h +llvm%%LLVM_SUFFIX%%/include/llvm/IR/IntrinsicsRISCV.h llvm%%LLVM_SUFFIX%%/include/llvm/IR/IntrinsicsRISCV.td +llvm%%LLVM_SUFFIX%%/include/llvm/IR/IntrinsicsS390.h llvm%%LLVM_SUFFIX%%/include/llvm/IR/IntrinsicsSystemZ.td +llvm%%LLVM_SUFFIX%%/include/llvm/IR/IntrinsicsWebAssembly.h llvm%%LLVM_SUFFIX%%/include/llvm/IR/IntrinsicsWebAssembly.td +llvm%%LLVM_SUFFIX%%/include/llvm/IR/IntrinsicsX86.h llvm%%LLVM_SUFFIX%%/include/llvm/IR/IntrinsicsX86.td +llvm%%LLVM_SUFFIX%%/include/llvm/IR/IntrinsicsXCore.h llvm%%LLVM_SUFFIX%%/include/llvm/IR/IntrinsicsXCore.td llvm%%LLVM_SUFFIX%%/include/llvm/IR/LLVMContext.h llvm%%LLVM_SUFFIX%%/include/llvm/IR/LegacyPassManager.h @@ -1668,7 +1716,6 @@ llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCAsmLayout.h llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCAsmMacro.h llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCAssembler.h llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCCodeEmitter.h -llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCCodePadder.h llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCCodeView.h llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCContext.h llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCDirectives.h @@ -1898,6 +1945,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Support/Errno.h llvm%%LLVM_SUFFIX%%/include/llvm/Support/Error.h llvm%%LLVM_SUFFIX%%/include/llvm/Support/ErrorHandling.h llvm%%LLVM_SUFFIX%%/include/llvm/Support/ErrorOr.h +llvm%%LLVM_SUFFIX%%/include/llvm/Support/Extension.def llvm%%LLVM_SUFFIX%%/include/llvm/Support/FileCheck.h llvm%%LLVM_SUFFIX%%/include/llvm/Support/FileCollector.h llvm%%LLVM_SUFFIX%%/include/llvm/Support/FileOutputBuffer.h @@ -2074,6 +2122,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/IPO/InferF llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/IPO/Inliner.h llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/IPO/Internalize.h llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/IPO/LowerTypeTests.h +llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/IPO/MergeFunctions.h llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/IPO/PartialInlining.h llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/IPO/PassManagerBuilder.h llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/IPO/SCCP.h @@ -2140,6 +2189,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/Low 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/LowerMatrixIntrinsics.h llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/LowerWidenableCondition.h llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/MakeGuardsExplicit.h llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/MemCpyOptimizer.h @@ -2161,6 +2211,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/Spe llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/TailRecursionElimination.h llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Scalar/WarnMissedTransforms.h llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils.h +llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/AMDGPUEmitPrintf.h llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/ASanStackFrameLayout.h llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/AddDiscriminators.h llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/BasicBlockUtils.h @@ -2172,6 +2223,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/Cano llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/CheriSetBounds.h 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/CodeMoverUtils.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 @@ -2254,6 +2306,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/XRay/YAMLXRayRecord.h %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/ammintrin.h %%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_cmse.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 @@ -2410,7 +2463,6 @@ 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/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 @@ -2451,6 +2503,7 @@ llvm%%LLVM_SUFFIX%%/lib/libLLVMCodeGen.a llvm%%LLVM_SUFFIX%%/lib/libLLVMCore.a llvm%%LLVM_SUFFIX%%/lib/libLLVMCoroutines.a llvm%%LLVM_SUFFIX%%/lib/libLLVMCoverage.a +llvm%%LLVM_SUFFIX%%/lib/libLLVMDWARFLinker.a llvm%%LLVM_SUFFIX%%/lib/libLLVMDebugInfoCodeView.a llvm%%LLVM_SUFFIX%%/lib/libLLVMDebugInfoDWARF.a llvm%%LLVM_SUFFIX%%/lib/libLLVMDebugInfoGSYM.a @@ -2459,6 +2512,7 @@ llvm%%LLVM_SUFFIX%%/lib/libLLVMDebugInfoPDB.a llvm%%LLVM_SUFFIX%%/lib/libLLVMDemangle.a llvm%%LLVM_SUFFIX%%/lib/libLLVMDlltoolDriver.a llvm%%LLVM_SUFFIX%%/lib/libLLVMExecutionEngine.a +llvm%%LLVM_SUFFIX%%/lib/libLLVMFrontendOpenMP.a llvm%%LLVM_SUFFIX%%/lib/libLLVMFuzzMutate.a llvm%%LLVM_SUFFIX%%/lib/libLLVMGlobalISel.a llvm%%LLVM_SUFFIX%%/lib/libLLVMHexagonAsmParser.a Modified: head/emulators/qemu-cheri/Makefile ============================================================================== --- head/emulators/qemu-cheri/Makefile Fri Mar 27 16:02:48 2020 (r529266) +++ head/emulators/qemu-cheri/Makefile Fri Mar 27 16:11:53 2020 (r529267) @@ -2,7 +2,7 @@ PORTNAME= qemu PORTVERSION= 0.d${SNAPDATE} -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= emulators devel PKGNAMESUFFIX= -cheri @@ -21,6 +21,7 @@ LICENSE= GPLv2 USE_GITHUB= yes GH_TUPLE= CTSRD-CHERI:qemu:${QEMU_COMMIT} \ + CTSRD-CHERI:dtc:${DTC_COMMIT}:dtc/dtc \ CTSRD-CHERI:libslirp:${LIBSLIRP_COMMIT}:libslirp/slirp \ qemu:keycodemapdb:6b3d716:qemu/ui/keycodemapdb \ @@ -37,13 +38,14 @@ OPTIONS_DEFINE= DOCS .include "Makefile.snapshot" CONFIGURE_ARGS+= \ - --target-list=cheri128-softmmu,cheri128magic-softmmu,cheri256-softmmu \ + --target-list=cheri128-softmmu,cheri128magic-softmmu,riscv64cheri-softmmu \ --disable-curl \ --disable-git-update \ --disable-gtk \ --disable-linux-user \ --disable-linux-aio \ --disable-kvm \ + --disable-opengl \ --disable-vnc-png \ --disable-sdl \ --disable-vte \ @@ -57,12 +59,12 @@ QEMU_SYSTEM_CHERI?= qemu-system${PKGNAMESUFFIX} PLIST= /dev/null PLIST_FILES= bin/qemu-system-cheri128 \ bin/qemu-system-cheri128magic \ - bin/qemu-system-cheri256 + bin/qemu-system-riscv64cheri do-install: ${INSTALL_PROGRAM} ${WRKSRC}/cheri128-softmmu/qemu-system-cheri128 \ ${WRKSRC}/cheri128magic-softmmu/qemu-system-cheri128magic \ - ${WRKSRC}/cheri256-softmmu/qemu-system-cheri256 \ + ${WRKSRC}/riscv64cheri-softmmu/qemu-system-riscv64cheri \ ${STAGEDIR}${PREFIX}/bin/ .include <bsd.port.mk> Modified: head/emulators/qemu-cheri/Makefile.snapshot ============================================================================== --- head/emulators/qemu-cheri/Makefile.snapshot Fri Mar 27 16:02:48 2020 (r529266) +++ head/emulators/qemu-cheri/Makefile.snapshot Fri Mar 27 16:11:53 2020 (r529267) @@ -4,7 +4,8 @@ # # Generated by: files/gen-Makefile.snapshot.sh. # -SNAPDATE= 20191209 +SNAPDATE= 20200327 -QEMU_COMMIT= 74235a2879944724c88ad8b400170b8e2b0a6147 +QEMU_COMMIT= 0a323821042c36e21ea80e58b9545dfc3b0cb8ef LIBSLIRP_COMMIT= 6651ba26c4e94f64d6448a2db4991269ce553bd9 +DTC_COMMIT= 87a656ae5ff96c4903e68eb2f999532a3b98e3a7 Modified: head/emulators/qemu-cheri/distinfo ============================================================================== --- head/emulators/qemu-cheri/distinfo Fri Mar 27 16:02:48 2020 (r529266) +++ head/emulators/qemu-cheri/distinfo Fri Mar 27 16:11:53 2020 (r529267) @@ -1,6 +1,8 @@ -TIMESTAMP = 1576015343 -SHA256 (CTSRD-CHERI-qemu-0.d20191209-74235a2879944724c88ad8b400170b8e2b0a6147_GH0.tar.gz) = facff8aca23b47d443dad98fa6ece3971636cf0a7d2fb79eaadbff5ddb4bf348 -SIZE (CTSRD-CHERI-qemu-0.d20191209-74235a2879944724c88ad8b400170b8e2b0a6147_GH0.tar.gz) = 29444613 +TIMESTAMP = 1585324588 +SHA256 (CTSRD-CHERI-qemu-0.d20200327-0a323821042c36e21ea80e58b9545dfc3b0cb8ef_GH0.tar.gz) = ba74e4192d02ec6a5c6f72a3ee42ea4113d4719692d98a590ef9968759492fbf +SIZE (CTSRD-CHERI-qemu-0.d20200327-0a323821042c36e21ea80e58b9545dfc3b0cb8ef_GH0.tar.gz) = 29937048 +SHA256 (CTSRD-CHERI-dtc-87a656ae5ff96c4903e68eb2f999532a3b98e3a7_GH0.tar.gz) = 9dd7b32701106948f380acdd5d91391031b3d56e9fa84e8a49d469f50bdb2ddf +SIZE (CTSRD-CHERI-dtc-87a656ae5ff96c4903e68eb2f999532a3b98e3a7_GH0.tar.gz) = 200509 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 Modified: head/emulators/qemu-cheri/files/gen-Makefile.snapshot.sh ============================================================================== --- head/emulators/qemu-cheri/files/gen-Makefile.snapshot.sh Fri Mar 27 16:02:48 2020 (r529266) +++ head/emulators/qemu-cheri/files/gen-Makefile.snapshot.sh Fri Mar 27 16:11:53 2020 (r529267) @@ -33,6 +33,8 @@ query_repo qemu qemu-cheri QEMU_COMMIT=$SHA query_repo libslirp LIBSLIRP_COMMIT=$SHA +query_repo dtc +DTC_COMMIT=$SHA cat <<EOF > Makefile.snapshot # \$FreeBSD\$ @@ -45,6 +47,7 @@ SNAPDATE= ${MAX_DATE} QEMU_COMMIT= ${QEMU_COMMIT} LIBSLIRP_COMMIT= ${LIBSLIRP_COMMIT} +DTC_COMMIT= ${DTC_COMMIT} EOF rm -f $tmpfile Added: head/emulators/qemu-cheri/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/qemu-cheri/files/patch-configure Fri Mar 27 16:11:53 2020 (r529267) @@ -0,0 +1,52 @@ +--- configure.orig 2019-12-09 17:14:11 UTC ++++ configure +@@ -6358,27 +6358,30 @@ if ( [ "$linux_user" = yes ] || [ "$bsd_user" = yes ] + cat > $TMPC <<EOF + int main(void) { return 0; } + EOF +- textseg_ldflags="-Wl,-Ttext-segment=$textseg_addr" ++ textseg_ldflags="-Wl,--image-base=$textseg_addr" + if ! compile_prog "" "$textseg_ldflags"; then +- # In case ld does not support -Ttext-segment, edit the default linker +- # script via sed to set the .text start addr. This is needed on FreeBSD +- # at least. +- if ! $ld --verbose >/dev/null 2>&1; then +- error_exit \ +- "We need to link the QEMU user mode binaries at a" \ +- "specific text address. Unfortunately your linker" \ +- "doesn't support either the -Ttext-segment option or" \ +- "printing the default linker script with --verbose." \ +- "If you don't want the user mode binaries, pass the" \ +- "--disable-user option to configure." +- fi ++ textseg_ldflags="-Wl,-Ttext-segment=$textseg_addr" ++ if ! compile_prog "" "$textseg_ldflags"; then ++ # In case ld does not support -Ttext-segment, edit the default linker ++ # script via sed to set the .text start addr. This is needed on FreeBSD ++ # at least. ++ if ! $ld --verbose >/dev/null 2>&1; then ++ error_exit \ ++ "We need to link the QEMU user mode binaries at a" \ ++ "specific text address. Unfortunately your linker" \ ++ "doesn't support either the -Ttext-segment option or" \ ++ "printing the default linker script with --verbose." \ ++ "If you don't want the user mode binaries, pass the" \ ++ "--disable-user option to configure." ++ fi + +- $ld --verbose | sed \ +- -e '1,/==================================================/d' \ +- -e '/==================================================/,$d' \ +- -e "s/[.] = [0-9a-fx]* [+] SIZEOF_HEADERS/. = $textseg_addr + SIZEOF_HEADERS/" \ +- -e "s/__executable_start = [0-9a-fx]*/__executable_start = $textseg_addr/" > config-host.ld +- textseg_ldflags="-Wl,-T../config-host.ld" ++ $ld --verbose | sed \ ++ -e '1,/==================================================/d' \ ++ -e '/==================================================/,$d' \ ++ -e "s/[.] = [0-9a-fx]* [+] SIZEOF_HEADERS/. = $textseg_addr + SIZEOF_HEADERS/" \ ++ -e "s/__executable_start = [0-9a-fx]*/__executable_start = $textseg_addr/" > config-host.ld ++ textseg_ldflags="-Wl,-T../config-host.ld" ++ fi + fi + fi + fi
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003271611.02RGBsS9030742>