diff --git a/artiq/firmware/ksupport/Makefile b/artiq/firmware/ksupport/Makefile
index b73faea50..e1e3e48fd 100644
--- a/artiq/firmware/ksupport/Makefile
+++ b/artiq/firmware/ksupport/Makefile
@@ -26,7 +26,7 @@ $(RUSTOUT)/libksupport.a:
 
 ksupport.elf: $(RUSTOUT)/libksupport.a glue.o
 	$(link) -T $(KSUPPORT_DIRECTORY)/ksupport.ld \
-		-lunwind-elf -lprintf-float -lm
+		-lunwind-$(CPU)-elf -lprintf-float -lm
 
 %.o: $(KSUPPORT_DIRECTORY)/%.c
 	$(compile)
diff --git a/flake.lock b/flake.lock
index e9c80a1ad..d2e349045 100644
--- a/flake.lock
+++ b/flake.lock
@@ -61,11 +61,11 @@
     "src-misoc": {
       "flake": false,
       "locked": {
-        "lastModified": 1634799783,
-        "narHash": "sha256-CbeXsLTwwYBWb5cfrVVYkcQYV207gi9+CQhzfeZbXGc=",
+        "lastModified": 1636345885,
+        "narHash": "sha256-+6tqAX+ek+jUU8m59vhhp4QS9UK+D2a6pLD1aFDIWX8=",
         "ref": "master",
-        "rev": "855914deace34880c69589022c52a8921f431063",
-        "revCount": 2375,
+        "rev": "87f77a739b587a6602b87ee1a94da509d36ba269",
+        "revCount": 2414,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/m-labs/misoc.git"