diff --git a/chisel b/chisel
index ae1d1de8..3b1979d8 160000
--- a/chisel
+++ b/chisel
@@ -1 +1 @@
-Subproject commit ae1d1de82188f0a1d79a4e8eb613743942a13eb3
+Subproject commit 3b1979d8a182d9fa8a65ce0523581f353f9f4603
diff --git a/emulator/Makefile b/emulator/Makefile
index b598cc22..674c88a0 100644
--- a/emulator/Makefile
+++ b/emulator/Makefile
@@ -10,7 +10,7 @@ CXXFLAGS := $(CXXFLAGS) -std=c++11 -I$(RISCV)/include
 CXXSRCS := emulator disasm mm mm_dramsim2
 CXXFLAGS := $(CXXFLAGS) -I$(base_dir)/csrc -I$(base_dir)/dramsim2
 
-LDFLAGS := $(LDFLAGS) -L$(RISCV)/lib -L. -ldramsim -lfesvr -lpthread
+LDFLAGS := $(LDFLAGS) -L$(RISCV)/lib -Wl,-rpath,$(RISCV)/lib -L. -ldramsim -lfesvr -lpthread
 
 OBJS := $(addsuffix .o,$(CXXSRCS) $(MODEL))
 DEBUG_OBJS := $(addsuffix -debug.o,$(CXXSRCS) $(MODEL))
diff --git a/riscv-tests b/riscv-tests
index a4815615..df4967ac 160000
--- a/riscv-tests
+++ b/riscv-tests
@@ -1 +1 @@
-Subproject commit a481561500f43c8a022cfc0ba1695914e1df4d57
+Subproject commit df4967acd1a511517977feb63eabd647e6a00701
diff --git a/rocket b/rocket
index 347cff51..cceb29c2 160000
--- a/rocket
+++ b/rocket
@@ -1 +1 @@
-Subproject commit 347cff517b12bf5fe76f410b0108788440aa613e
+Subproject commit cceb29c281b6fc8d5aa1ac025d18854db13f10bb