diff --git a/Makefrag b/Makefrag
index b07bceac..1220c42b 100644
--- a/Makefrag
+++ b/Makefrag
@@ -20,6 +20,7 @@ libdramsim.a: $(DRAMSIM_OBJS)
 global_tstdir = $(basedir)/riscv-asmtests-bmarks/riscv-tests
 global_asm_tests = \
 	riscv_ipi \
+	riscv_lrsc \
 	riscv_add \
 	riscv_addi \
 	riscv_amoadd_d \
diff --git a/riscv-rocket b/riscv-rocket
index b9e6abf3..31a4ad98 160000
--- a/riscv-rocket
+++ b/riscv-rocket
@@ -1 +1 @@
-Subproject commit b9e6abf3defd2c54a990dfca0417bfc704fefd3d
+Subproject commit 31a4ad984cffb3c441e4b30a4c9060743f3295a8
diff --git a/uncore b/uncore
index 1f89e568..ccc4badd 160000
--- a/uncore
+++ b/uncore
@@ -1 +1 @@
-Subproject commit 1f89e568acf9bed6a1d4ccf1c96ae79370a58225
+Subproject commit ccc4badd15c6f88a4af5d97e8c0fcd105baf43fa