diff options
| author | Matt Ellis <matell@microsoft.com> | 2015-06-27 15:04:59 -0700 |
|---|---|---|
| committer | Matt Ellis <matell@microsoft.com> | 2015-06-27 15:04:59 -0700 |
| commit | f9ab5b953d79f05c511520c1888cf916bc292db2 (patch) | |
| tree | cad8bd121b848e4f531541956ac90fe258e0ca39 | |
| parent | 3d8e9b6cb7a8d57ad836cd4748a7260e57477ed3 (diff) | |
| parent | 2ccd4699ec201c8951a3965f7df2349abd6b765a (diff) | |
| download | coreclr-f9ab5b953d79f05c511520c1888cf916bc292db2.tar.gz coreclr-f9ab5b953d79f05c511520c1888cf916bc292db2.tar.bz2 coreclr-f9ab5b953d79f05c511520c1888cf916bc292db2.zip | |
Merge pull request #1180 from dotnet-bot/from-tfs
Merge changes from TFS
| -rw-r--r-- | src/debug/shim/debugshim.cpp | 16 |
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); |