diff options
| author | Brooks Davis <brooks@FreeBSD.org> | 2018-06-18 21:30:38 +0000 |
|---|---|---|
| committer | Brooks Davis <brooks@FreeBSD.org> | 2018-06-18 21:30:38 +0000 |
| commit | c36c75cedde13388b4c6ad5568fc746d0f7ff95b (patch) | |
| tree | e8c52083f7566fd6575b448a607f9e201c5bd80c /emulators/qemu-cheri | |
| parent | 0b365c547ed1430c2963507af14ff2fba13c13a9 (diff) | |
| download | ports-c36c75cedde13388b4c6ad5568fc746d0f7ff95b.tar.gz ports-c36c75cedde13388b4c6ad5568fc746d0f7ff95b.zip | |
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
Notes
Notes:
svn path=/head/; revision=472718
Diffstat (limited to 'emulators/qemu-cheri')
| -rw-r--r-- | emulators/qemu-cheri/Makefile | 6 | ||||
| -rw-r--r-- | emulators/qemu-cheri/Makefile.snapshot | 4 | ||||
| -rw-r--r-- | emulators/qemu-cheri/distinfo | 12 |
3 files changed, 16 insertions, 6 deletions
diff --git a/emulators/qemu-cheri/Makefile b/emulators/qemu-cheri/Makefile index 8a5fa4aa7d59..b4c30cf684c7 100644 --- a/emulators/qemu-cheri/Makefile +++ b/emulators/qemu-cheri/Makefile @@ -9,7 +9,8 @@ MAINTAINER= brooks@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 .cfi_sections 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 diff --git a/emulators/qemu-cheri/Makefile.snapshot b/emulators/qemu-cheri/Makefile.snapshot index 020221d63474..e975e6922654 100644 --- a/emulators/qemu-cheri/Makefile.snapshot +++ b/emulators/qemu-cheri/Makefile.snapshot @@ -4,6 +4,6 @@ # # Generated by: files/gen-Makefile.snapshot.sh. # -SNAPDATE= 20180418 +SNAPDATE= 20180614 -QEMU_COMMIT= 6d92b091e7a39ffb793e8ceecb8aac86984a27c1 +QEMU_COMMIT= e47a647e025e69212e6563b2b307a837677b9944 diff --git a/emulators/qemu-cheri/distinfo b/emulators/qemu-cheri/distinfo index 5ca955679c32..7c80754d8c05 100644 --- a/emulators/qemu-cheri/distinfo +++ b/emulators/qemu-cheri/distinfo @@ -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 |