diff --git a/src/debug/di/CMakeLists.txt b/src/debug/di/CMakeLists.txt
index 8b37c247f992..f0a9d41ec93d 100644
--- a/src/debug/di/CMakeLists.txt
+++ b/src/debug/di/CMakeLists.txt
@@ -91,7 +91,7 @@ if(WIN32)
 elseif(CLR_CMAKE_PLATFORM_UNIX)
     add_compile_options(-fPIC)
 
-    if(CLR_CMAKE_TARGET_ARCH_AMD64 OR CLR_CMAKE_TARGET_ARCH_ARM)
+    if(CLR_CMAKE_TARGET_ARCH_AMD64 OR CLR_CMAKE_TARGET_ARCH_ARM64 OR CLR_CMAKE_TARGET_ARCH_ARM)
       set(CORDBDI_SOURCES_ASM_FILE
         ${ARCH_SOURCES_DIR}/floatconversion.S
       )
diff --git a/src/debug/di/arm64/floatconversion.S b/src/debug/di/arm64/floatconversion.S
new file mode 100644
index 000000000000..1b8b4800b6d9
--- /dev/null
+++ b/src/debug/di/arm64/floatconversion.S
@@ -0,0 +1,14 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+#include <unixasmmacros.inc>
+
+// Arguments
+//     input: (in X0) the _NEON128 value to be converted to a double
+//     output: the double corresponding to the _NEON128 input value
+
+LEAF_ENTRY FPFillR8, .TEXT
+        LDR     Q0, [X0]
+        ret     lr
+LEAF_END FPFillR8, .TEXT