6 files changed, 21 insertions, 16 deletions

diff --git a/emulators/riscv-isa-sim/Makefile b/emulators/riscv-isa-sim/Makefile
index e461759c287d..7f41205a585b 100644
--- a/emulators/riscv-isa-sim/Makefile
+++ b/emulators/riscv-isa-sim/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	riscv-isa-sim
 DISTVERSION=	git
-PORTREVISION=	20180104
+PORTREVISION=	20181005
 CATEGORIES=	emulators
 
 MAINTAINER=	lwhsu@FreeBSD.org
@@ -10,15 +10,15 @@ COMMENT=	Spike, a RISC-V ISA Simulator
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libfesvr.so:emulators/riscv-fesvr
-
 ONLY_FOR_ARCHS=	amd64
 
-GH_ACCOUNT=	freebsd-riscv
-GH_TAGNAME=	acf9589
+LIB_DEPENDS=	libfesvr.so:emulators/riscv-fesvr
 
 USES=	compiler:c++11-lang gmake shebangfix
 
+GH_ACCOUNT=	freebsd-riscv
+GH_TAGNAME=	aae60e0
+
 HAS_CONFIGURE=	yes
 SHEBANG_FILES=	scripts/vcs-version.sh
 USE_GITHUB=	yes
diff --git a/emulators/riscv-isa-sim/distinfo b/emulators/riscv-isa-sim/distinfo
index 1c2eacdad850..0fbb2b24760b 100644
--- a/emulators/riscv-isa-sim/distinfo
+++ b/emulators/riscv-isa-sim/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1515149913
-SHA256 (freebsd-riscv-riscv-isa-sim-git-acf9589_GH0.tar.gz) = 163689110e1742271b02984f378974418d23d69e7c1943b75ebca0761769693b
-SIZE (freebsd-riscv-riscv-isa-sim-git-acf9589_GH0.tar.gz) = 227934
+TIMESTAMP = 1538736497
+SHA256 (freebsd-riscv-riscv-isa-sim-git-aae60e0_GH0.tar.gz) = 423005144e71b272fad7f13b57af7de561a178af096a71d304e0a3c590520195
+SIZE (freebsd-riscv-riscv-isa-sim-git-aae60e0_GH0.tar.gz) = 232817
diff --git a/emulators/riscv-isa-sim/files/patch-Makefile.in b/emulators/riscv-isa-sim/files/patch-Makefile.in
index 8e36466eb106..ff0a1707e95e 100644
--- a/emulators/riscv-isa-sim/files/patch-Makefile.in
+++ b/emulators/riscv-isa-sim/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	2017-08-08 20:00:25.889361000 +0100
-+++ Makefile.in	2017-08-08 20:06:41.633896000 +0100
-@@ -187,13 +187,13 @@
+--- Makefile.in.orig	2018-10-05 10:52:51 UTC
++++ Makefile.in
+@@ -187,13 +187,13 @@ _$(1).cc :
  
  # Build the object files for this subproject
  
diff --git a/emulators/riscv-isa-sim/files/patch-riscv_insn__template.cc b/emulators/riscv-isa-sim/files/patch-riscv_insn__template.cc
index 8cb0f8c45734..eb5c15c16fa0 100644
--- a/emulators/riscv-isa-sim/files/patch-riscv_insn__template.cc
+++ b/emulators/riscv-isa-sim/files/patch-riscv_insn__template.cc
@@ -1,4 +1,4 @@
---- riscv/insn_template.cc.orig	2016-08-01 15:40:47 UTC
+--- riscv/insn_template.cc.orig	2018-10-05 10:52:33 UTC
 +++ riscv/insn_template.cc
 @@ -1,6 +1,6 @@
  // See LICENSE for license details.
diff --git a/emulators/riscv-isa-sim/files/patch-riscv_riscv.mk.in b/emulators/riscv-isa-sim/files/patch-riscv_riscv.mk.in
index 70a43a88b593..12ad5138cb06 100644
--- a/emulators/riscv-isa-sim/files/patch-riscv_riscv.mk.in
+++ b/emulators/riscv-isa-sim/files/patch-riscv_riscv.mk.in
@@ -1,6 +1,6 @@
---- riscv/riscv.mk.in.orig	2017-07-11 13:58:22.000000000 +0100
-+++ riscv/riscv.mk.in	2017-08-08 20:08:06.247906000 +0100
-@@ -21,14 +21,14 @@
+--- riscv/riscv.mk.in.orig	2018-10-05 10:52:11 UTC
++++ riscv/riscv.mk.in
+@@ -23,7 +23,7 @@ riscv_hdrs = \
  	tracer.h \
  	extension.h \
  	rocc.h \
@@ -8,7 +8,8 @@
 +	insn_template.hpp \
  	mulhi.h \
  	debug_module.h \
- 	remote_bitbang.h \
+ 	debug_rom_defines.h \
+@@ -31,7 +31,7 @@ riscv_hdrs = \
  	jtag_dtm.h \
  
  riscv_precompiled_hdrs = \
diff --git a/emulators/riscv-isa-sim/pkg-plist b/emulators/riscv-isa-sim/pkg-plist
index d6f1d660816d..aa6b308340ce 100644
--- a/emulators/riscv-isa-sim/pkg-plist
+++ b/emulators/riscv-isa-sim/pkg-plist
@@ -6,9 +6,11 @@ include/spike/cachesim.h
 include/spike/common.h
 include/spike/config.h
 include/spike/debug_module.h
+include/spike/debug_rom_defines.h
 include/spike/decode.h
 include/spike/devices.h
 include/spike/disasm.h
+include/spike/dts.h
 include/spike/encoding.h
 include/spike/extension.h
 include/spike/icache.h
@@ -19,12 +21,14 @@ include/spike/jtag_dtm.h
 include/spike/memtracer.h
 include/spike/mmu.h
 include/spike/mulhi.h
+include/spike/platform.h
 include/spike/primitiveTypes.h
 include/spike/primitives.h
 include/spike/processor.h
 include/spike/remote_bitbang.h
 include/spike/rocc.h
 include/spike/sim.h
+include/spike/simif.h
 include/spike/softfloat.h
 include/spike/softfloat_types.h
 include/spike/specialize.h