summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Zemtsov <Eugene.Zemtsov@microsoft.com>2015-06-26 21:28:59 -0700
committerEugene Zemtsov <Eugene.Zemtsov@microsoft.com>2015-06-26 21:28:59 -0700
commit2ccd4699ec201c8951a3965f7df2349abd6b765a (patch)
tree18126afe0284f7a51e0a7b3b47a64ab08a230346
parent4704616110fb8090da4e746921843fd020f272e0 (diff)
downloadcoreclr-2ccd4699ec201c8951a3965f7df2349abd6b765a.tar.gz
coreclr-2ccd4699ec201c8951a3965f7df2349abd6b765a.tar.bz2
coreclr-2ccd4699ec201c8951a3965f7df2349abd6b765a.zip
Fix arm/arm64 builds of dbgshim
[tfs-changeset: 1494755]
-rw-r--r--src/debug/shim/debugshim.cpp16
1 files changed, 16 insertions, 0 deletions
diff --git a/src/debug/shim/debugshim.cpp b/src/debug/shim/debugshim.cpp
index d8dab31668..7a9def449d 100644
--- a/src/debug/shim/debugshim.cpp
+++ b/src/debug/shim/debugshim.cpp
@@ -381,6 +381,22 @@ HRESULT CLRDebuggingImpl::GetCLRInfo(ICorDebugDataTarget* pDataTarget,
const WCHAR * resourceName = W("CLRDEBUGINFOCORESYSAMD64");
#endif
+#if defined (HOST_IS_WINDOWS_OS) && defined(_HOST_ARM64_)
+ const WCHAR * resourceName = W("CLRDEBUGINFOWINDOWSARM64");
+#endif
+
+#if !defined (HOST_IS_WINDOWS_OS) && defined(_HOST_ARM64_)
+ const WCHAR * resourceName = W("CLRDEBUGINFOCORESYSARM64");
+#endif
+
+#if defined (HOST_IS_WINDOWS_OS) && defined(_HOST_ARM_)
+ const WCHAR * resourceName = W("CLRDEBUGINFOWINDOWSARM");
+#endif
+
+#if !defined (HOST_IS_WINDOWS_OS) && defined(_HOST_ARM_)
+ const WCHAR * resourceName = W("CLRDEBUGINFOCORESYSARM");
+#endif
+
hrGetResource = GetResourceRvaFromResourceSectionRvaByName(pDataTarget, moduleBaseAddress, resourceSectionRVA, 10, resourceName, 0,
&debugResourceRVA, &debugResourceSize);
useCrossPlatformNaming = SUCCEEDED(hrGetResource);