diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt
index d6f8fff8..f5fd158f 100644
--- a/runtime/CMakeLists.txt
+++ b/runtime/CMakeLists.txt
@@ -108,6 +108,11 @@ if(UNIX)
     endif()
     list(REMOVE_ITEM LDC_D ${RUNTIME_DIR}/src/ldc/eh2.d)
     list(REMOVE_ITEM DCRT_C ${RUNTIME_DC_DIR}/msvc.c)
+
+    # Using CMAKE_SYSTEM_PROCESSOR might be inacurrate when somebody is
+    # cross-compiling by just setting the tool executbles to a cross toolchain,
+    # so just always include the file.
+    list(APPEND DCRT_C ${RUNTIME_DIR}/src/ldc/arm_unwind.c)
 elseif(WIN32)
     list(APPEND CORE_D_SYS ${CORE_D_WIN})
     if (MSVC)
diff --git a/runtime/druntime b/runtime/druntime
index a116bff2..822720b8 160000
--- a/runtime/druntime
+++ b/runtime/druntime
@@ -1 +1 @@
-Subproject commit a116bff228fb1b722d0e615364a22fc20cfde160
+Subproject commit 822720b8637bf5ad0d2301aa00807216a9d334bd