4 files changed, 10 insertions, 6 deletions
diff --git a/src/debug/di/CMakeLists.txt b/src/debug/di/CMakeLists.txt
index 55b5a44657..1c9125adce 100644
--- a/src/debug/di/CMakeLists.txt
+++ b/src/debug/di/CMakeLists.txt
@@ -8,8 +8,13 @@ elseif(CLR_CMAKE_PLATFORM_ARCH_ARM)
   add_definitions(-DDBG_TARGET_32BIT)
   add_definitions(-DDBG_TARGET_WIN32=1)
   add_definitions(-DDBG_TARGET_ARM=1)
+elseif(CLR_CMAKE_PLATFORM_ARCH_ARM64)
+  add_definitions(-D_TARGET_WIN64_=1)
+  add_definitions(-DDBG_TARGET_64BIT)
+  add_definitions(-DDBG_TARGET_WIN64=1)
+  add_definitions(-DDBG_TARGET_ARM64=1)
 else()
-  message(FATAL_ERROR "Only ARM and AMD64 is supported")
+  message(FATAL_ERROR "Only ARM, ARM64 and AMD64 is supported")
 endif()
 
 add_definitions(-DFEATURE_METADATA_CUSTOM_DATA_SOURCE -DFEATURE_METADATA_DEBUGGEE_DATA_SOURCE -DFEATURE_NO_HOST -DFEATURE_METADATA_LOAD_TRUSTED_IMAGES)
@@ -66,4 +71,4 @@ endif(WIN32)
 
 add_precompiled_header(stdafx.h stdafx.cpp CORDBDI_SOURCES)
 
-add_library(cordbdi STATIC ${CORDBDI_SOURCES})
-\ No newline at end of file
+add_library(cordbdi STATIC ${CORDBDI_SOURCES})
diff --git a/src/debug/di/arm64/cordbregisterset.cpp b/src/debug/di/arm64/cordbregisterset.cpp
index ccddb6fd52..8cd61cafa8 100644
--- a/src/debug/di/arm64/cordbregisterset.cpp
+++ b/src/debug/di/arm64/cordbregisterset.cpp
@@ -8,7 +8,6 @@
 
 //
 //*****************************************************************************
-#include "stdafx.h"
 #include "primitives.h"
 
 
diff --git a/src/debug/di/arm64/primitives.cpp b/src/debug/di/arm64/primitives.cpp
index 66bf4ed17d..f09f32b7d1 100644
--- a/src/debug/di/arm64/primitives.cpp
+++ b/src/debug/di/arm64/primitives.cpp
@@ -5,6 +5,4 @@
 
 // 
 
-#include "stdafx.h"
-
 #include "../../shared/arm64/primitives.cpp"
diff --git a/src/debug/di/shimremotedatatarget.cpp b/src/debug/di/shimremotedatatarget.cpp
index cd1304be40..7885f6bddf 100644
--- a/src/debug/di/shimremotedatatarget.cpp
+++ b/src/debug/di/shimremotedatatarget.cpp
@@ -215,8 +215,10 @@ ShimRemoteDataTarget::GetPlatform(
          *pPlatform = CORDB_PLATFORM_POSIX_X86;
      #elif defined(DBG_TARGET_AMD64)
          *pPlatform = CORDB_PLATFORM_POSIX_AMD64;
-    #elif defined(DBG_TARGET_ARM)
+     #elif defined(DBG_TARGET_ARM)
          *pPlatform = CORDB_PLATFORM_POSIX_ARM;
+     #elif defined(DBG_TARGET_ARM64)
+         *pPlatform = CORDB_PLATFORM_POSIX_ARM64;
      #else
          #error Unknown Processor.
      #endif