svn commit: r472718 - in head: devel/llvm-cheri emulators/qemu-cheri
Brooks Davis
brooks at FreeBSD.org
Mon Jun 18 21:30:41 UTC 2018
Author: brooks
Date: Mon Jun 18 21:30:38 2018
New Revision: 472718
URL: https://svnweb.freebsd.org/changeset/ports/472718
Log:
Update CHERI LLVM and QEMU to new snapshots.
Committed together as code generated by the new LLVM requires updated
(virtual) hardware.
Sponsored by: DARPA, AFRL
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
Modified: head/devel/llvm-cheri/Makefile
==============================================================================
--- head/devel/llvm-cheri/Makefile Mon Jun 18 21:26:36 2018 (r472717)
+++ head/devel/llvm-cheri/Makefile Mon Jun 18 21:30:38 2018 (r472718)
@@ -2,7 +2,7 @@
PORTNAME= llvm
PORTVERSION= ${LLVM_MAJOR}.d${SNAPDATE}
-PORTREVISION= 1
+PORTREVISION= 0
CATEGORIES= devel lang
PKGNAMESUFFIX= ${LLVM_SUFFIX}
Modified: head/devel/llvm-cheri/Makefile.snapshot
==============================================================================
--- head/devel/llvm-cheri/Makefile.snapshot Mon Jun 18 21:26:36 2018 (r472717)
+++ head/devel/llvm-cheri/Makefile.snapshot Mon Jun 18 21:30:38 2018 (r472718)
@@ -6,9 +6,9 @@
#
LLVM_MAJOR= 7.0
LLVM_RELEASE= ${LLVM_MAJOR}.0
-SNAPDATE= 20180205
+SNAPDATE= 20180615
-LLVM_COMMIT= a96483ca03f032c31dde64c9d013782affcd2d55
-CLANG_COMMIT= 88ee4bd7313a6b1b0a7b389fa7e5d4c796409b10
-LLD_COMMIT= 8bbb95977e02dd1a73a67c8974d97ed497a2a865
+LLVM_COMMIT= 19d36abc279ec90d9a8c03ffd2fae608bed6f733
+CLANG_COMMIT= 1ab4b309c5aed3be3542b6263a8f2d5aa5f7d7e7
+LLD_COMMIT= f105558e15f09f1957e27073229167552fb94a96
LLDB_COMMIT= 7ee5905d0109a13d543a127a9cda7c280c8103c8
Modified: head/devel/llvm-cheri/distinfo
==============================================================================
--- head/devel/llvm-cheri/distinfo Mon Jun 18 21:26:36 2018 (r472717)
+++ head/devel/llvm-cheri/distinfo Mon Jun 18 21:30:38 2018 (r472718)
@@ -1,7 +1,7 @@
-TIMESTAMP = 1517850799
-SHA256 (CTSRD-CHERI-llvm-7.0.d20180205-a96483ca03f032c31dde64c9d013782affcd2d55_GH0.tar.gz) = 3f685131ad03c8c3486f6ccb37a9f1f65f88dcee6ccdb7d7a98b10ea33aee9ec
-SIZE (CTSRD-CHERI-llvm-7.0.d20180205-a96483ca03f032c31dde64c9d013782affcd2d55_GH0.tar.gz) = 38650902
-SHA256 (CTSRD-CHERI-clang-88ee4bd7313a6b1b0a7b389fa7e5d4c796409b10_GH0.tar.gz) = 135c4a540024facd60d1008d68add7f8dbb077acfd61d257c867fb368e6e54e0
-SIZE (CTSRD-CHERI-clang-88ee4bd7313a6b1b0a7b389fa7e5d4c796409b10_GH0.tar.gz) = 17024145
-SHA256 (CTSRD-CHERI-lld-8bbb95977e02dd1a73a67c8974d97ed497a2a865_GH0.tar.gz) = e20b67f20ad1d26878e73a08358eee8f87334c301162be3f576d7206102f1ee2
-SIZE (CTSRD-CHERI-lld-8bbb95977e02dd1a73a67c8974d97ed497a2a865_GH0.tar.gz) = 4010874
+TIMESTAMP = 1529097632
+SHA256 (CTSRD-CHERI-llvm-7.0.d20180615-19d36abc279ec90d9a8c03ffd2fae608bed6f733_GH0.tar.gz) = 3d79c7d21a7e94fca7dfc371506a7535d628b762bce56368ca37f407d68e8eb3
+SIZE (CTSRD-CHERI-llvm-7.0.d20180615-19d36abc279ec90d9a8c03ffd2fae608bed6f733_GH0.tar.gz) = 38939262
+SHA256 (CTSRD-CHERI-clang-1ab4b309c5aed3be3542b6263a8f2d5aa5f7d7e7_GH0.tar.gz) = 580737cbeb988aac16720d1564e364f727df86079a39f57674418eb49b69715f
+SIZE (CTSRD-CHERI-clang-1ab4b309c5aed3be3542b6263a8f2d5aa5f7d7e7_GH0.tar.gz) = 17132975
+SHA256 (CTSRD-CHERI-lld-f105558e15f09f1957e27073229167552fb94a96_GH0.tar.gz) = 8a267f4733d4114eb7f0530f219750410069da260cda6c01321ffc80d01617ae
+SIZE (CTSRD-CHERI-lld-f105558e15f09f1957e27073229167552fb94a96_GH0.tar.gz) = 4050182
Modified: head/devel/llvm-cheri/pkg-plist
==============================================================================
--- head/devel/llvm-cheri/pkg-plist Mon Jun 18 21:26:36 2018 (r472717)
+++ head/devel/llvm-cheri/pkg-plist Mon Jun 18 21:30:38 2018 (r472718)
@@ -554,6 +554,7 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj
%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Sema/SemaLambda.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Sema/Template.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Sema/TemplateDeduction.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Sema/TemplateInstCallback.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Sema/TypoCorrection.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Sema/Weak.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Serialization/ASTBitCodes.h
@@ -1148,6 +1149,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/CodeView/Ty
llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DIContext.h
llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARF/DWARFAbbreviationDeclaration.h
llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARF/DWARFAcceleratorTable.h
+llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARF/DWARFAddressRange.h
llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARF/DWARFAttribute.h
llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARF/DWARFCompileUnit.h
llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARF/DWARFContext.h
@@ -1162,6 +1164,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARF/DWARF
llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARF/DWARFDebugMacro.h
llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARF/DWARFDebugPubTable.h
llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARF/DWARFDebugRangeList.h
+llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARF/DWARFDebugRnglists.h
llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARF/DWARFDie.h
llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARF/DWARFExpression.h
llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARF/DWARFFormValue.h
@@ -1445,6 +1448,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCAsmInfoDarwin.h
llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCAsmInfoELF.h
llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCAsmInfoWasm.h
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
@@ -1930,6 +1934,7 @@ llvm%%LLVM_SUFFIX%%/lib/LLVMHello.so
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%.0/include/bmiintrin.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%.0/include/cetintrin.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%.0/include/cheri.h
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%.0/include/cheri_init_globals.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%.0/include/clflushoptintrin.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%.0/include/clwbintrin.h
%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%.0/include/clzerointrin.h
Modified: head/emulators/qemu-cheri/Makefile
==============================================================================
--- head/emulators/qemu-cheri/Makefile Mon Jun 18 21:26:36 2018 (r472717)
+++ head/emulators/qemu-cheri/Makefile Mon Jun 18 21:30:38 2018 (r472718)
@@ -9,7 +9,8 @@ MAINTAINER= brooks at FreeBSD.org
COMMENT?= QEMU emulator with CHERI CPU support
# XXX: disabling gnutls doesn't work so depend on it to avoid breakage.
-LIB_DEPENDS= libgnutls.so:security/gnutls \
+LIB_DEPENDS= libcapstone.so:devel/capstone3 \
+ libgnutls.so:security/gnutls \
libnettle.so:security/nettle
RUN_DEPENDS= qemu-system-i386:emulators/qemu
@@ -18,6 +19,7 @@ LICENSE= GPLv2
USE_GITHUB= yes
GH_ACCOUNT= CTSRD-CHERI
GH_TAGNAME= ${QEMU_COMMIT}
+GH_TUPLE= qemu:keycodemapdb:6b3d716:qemu/ui/keycodemapdb
HAS_CONFIGURE= yes
USES= gettext-runtime gmake libtool makeinfo pkgconfig python:2.7,build
@@ -31,6 +33,7 @@ BROKEN_FreeBSD_10= Default toolchain lacks support for
CONFIGURE_ARGS+= \
--target-list=cheri128-softmmu,cheri128magic-softmmu,cheri256-softmmu \
--disable-curl \
+ --disable-git-update \
--disable-gtk \
--disable-libssh2 \
--disable-linux-user \
@@ -42,6 +45,7 @@ CONFIGURE_ARGS+= \
--disable-xen \
--extra-cflags="-g ${EXTRA_CFLAGS}" \
--localstatedir=/var
+EXTRA_CFLAGS= -DCHERI_UNALIGNED
QEMU_SYSTEM_CHERI?= qemu-system${PKGNAMESUFFIX}
PLIST= /dev/null
Modified: head/emulators/qemu-cheri/Makefile.snapshot
==============================================================================
--- head/emulators/qemu-cheri/Makefile.snapshot Mon Jun 18 21:26:36 2018 (r472717)
+++ head/emulators/qemu-cheri/Makefile.snapshot Mon Jun 18 21:30:38 2018 (r472718)
@@ -4,6 +4,6 @@
#
# Generated by: files/gen-Makefile.snapshot.sh.
#
-SNAPDATE= 20180418
+SNAPDATE= 20180614
-QEMU_COMMIT= 6d92b091e7a39ffb793e8ceecb8aac86984a27c1
+QEMU_COMMIT= e47a647e025e69212e6563b2b307a837677b9944
Modified: head/emulators/qemu-cheri/distinfo
==============================================================================
--- head/emulators/qemu-cheri/distinfo Mon Jun 18 21:26:36 2018 (r472717)
+++ head/emulators/qemu-cheri/distinfo Mon Jun 18 21:30:38 2018 (r472718)
@@ -1,3 +1,9 @@
-TIMESTAMP = 1524157469
-SHA256 (CTSRD-CHERI-qemu-0.d20180418-6d92b091e7a39ffb793e8ceecb8aac86984a27c1_GH0.tar.gz) = 573e966fc9d344a7bab0fe3be4b2cc5804916c5d6cb13277395ea616cc015a00
-SIZE (CTSRD-CHERI-qemu-0.d20180418-6d92b091e7a39ffb793e8ceecb8aac86984a27c1_GH0.tar.gz) = 14514297
+TIMESTAMP = 1529085999
+SHA256 (CTSRD-CHERI-qemu-0.d20180614-e47a647e025e69212e6563b2b307a837677b9944_GH0.tar.gz) = d2a5e68c56e10107e212a2f9b7ae2c7c4439d562e19f3cdb54d01e4778526899
+SIZE (CTSRD-CHERI-qemu-0.d20180614-e47a647e025e69212e6563b2b307a837677b9944_GH0.tar.gz) = 16136332
+SHA256 (qemu-capstone-22ead3e_GH0.tar.gz) = c8c73aa3f38d486a1a03f117611d5a82530fd33a2ef6c343256c3a6fac9ebd04
+SIZE (qemu-capstone-22ead3e_GH0.tar.gz) = 2883987
+SHA256 (qemu-dtc-e543880_GH0.tar.gz) = 84878bdcfca30db1ad32fd60ddfd01e08fc00ff0c042d2a758e7e90c08de0b5e
+SIZE (qemu-dtc-e543880_GH0.tar.gz) = 176916
+SHA256 (qemu-keycodemapdb-6b3d716_GH0.tar.gz) = c9d3412510aac999865d01aaa14b1fa8dc0385db55c5cf6c4d95d160bd0eaee9
+SIZE (qemu-keycodemapdb-6b3d716_GH0.tar.gz) = 47905
More information about the svn-ports-all
mailing list