diff --git a/Makefile.in b/Makefile.in
index 578e511cc4c..f2a8cf27558 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -871,7 +871,7 @@ stamps/build-pk32: $(PK_SRCDIR) $(PK_SRC_GIT) stamps/build-gcc-newlib-stage2
 	cd $(notdir $@) && $</configure \
 		--prefix=$(INSTALL_DIR) \
 		--host=$(NEWLIB_TUPLE) \
-		--with-arch=rv32imafdc \
+		--with-arch=rv32gc \
 		--with-abi=ilp32f
 	$(MAKE) -C $(notdir $@)
 	cp $(notdir $@)/pk $(INSTALL_DIR)/$(NEWLIB_TUPLE)/bin/pk32
@@ -884,7 +884,8 @@ stamps/build-pk64: $(PK_SRCDIR) $(PK_SRC_GIT) stamps/build-gcc-newlib-stage2
 	cd $(notdir $@) && $</configure \
 		--prefix=$(INSTALL_DIR) \
 		--host=$(NEWLIB_TUPLE) \
-		--with-arch=rv64gc
+		--with-arch=rv64gc \
+		--with-abi=lp64d
 	$(MAKE) -C $(notdir $@)
 	cp $(notdir $@)/pk $(INSTALL_DIR)/$(NEWLIB_TUPLE)/bin/pk64
 	mkdir -p $(dir $@)
diff --git a/spike b/spike
index a0298a33e7b..71f5a8fd1b1 160000
--- a/spike
+++ b/spike
@@ -1 +1 @@
-Subproject commit a0298a33e7b2091ba8d9f3a20838d96dc1164cac
+Subproject commit 71f5a8fd1b1185b7c15151f116aa3fef058bf210