diff options
| author | Matt Ellis <matell@microsoft.com> | 2015-06-26 23:15:56 -0700 |
|---|---|---|
| committer | Matt Ellis <matell@microsoft.com> | 2015-06-26 23:15:56 -0700 |
| commit | 3d8e9b6cb7a8d57ad836cd4748a7260e57477ed3 (patch) | |
| tree | 79a84b4227ff3aab8ae8ff621f77957c608f0efb | |
| parent | dfddf41fbbaafa85d9600094c3ec44e870f8862c (diff) | |
| parent | b5c5dbc829ac17f8e56b4371e1dc94f88e85c25f (diff) | |
| download | coreclr-3d8e9b6cb7a8d57ad836cd4748a7260e57477ed3.tar.gz coreclr-3d8e9b6cb7a8d57ad836cd4748a7260e57477ed3.tar.bz2 coreclr-3d8e9b6cb7a8d57ad836cd4748a7260e57477ed3.zip | |
Merge pull request #1179 from dotnet-bot/from-tfs
Merge changes from TFS
| -rw-r--r-- | src/debug/shim/debugshim.cpp | 23 | ||||
| -rw-r--r-- | src/dlls/dbgshim/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/dlls/dbgshim/dbgshim.cpp | 4 |
3 files changed, 19 insertions, 10 deletions
diff --git a/src/debug/shim/debugshim.cpp b/src/debug/shim/debugshim.cpp index fe3755dd72..d8dab31668 100644 --- a/src/debug/shim/debugshim.cpp +++ b/src/debug/shim/debugshim.cpp @@ -364,20 +364,27 @@ HRESULT CLRDebuggingImpl::GetCLRInfo(ICorDebugDataTarget* pDataTarget, // the initial state is that we haven't found a proper resource HRESULT hrGetResource = E_FAIL; - // First check for the resource which has type = RC_DATA = 10, name = "CLRDEBUGINFO<host_os><host_arch>", language = 0 - // So far we only support windows x86 and coresys x86 (we are building some other architectures, but they aren't tested and turned on yet it appears) + // First check for the resource which has type = RC_DATA = 10, name = "CLRDEBUGINFO<host_os><host_arch>", language = 0 #if defined (HOST_IS_WINDOWS_OS) && defined(_HOST_X86_) - hrGetResource = GetResourceRvaFromResourceSectionRvaByName(pDataTarget, moduleBaseAddress, resourceSectionRVA, 10, W("CLRDEBUGINFOWINDOWSX86"), 0, - &debugResourceRVA, &debugResourceSize); - useCrossPlatformNaming = SUCCEEDED(hrGetResource); + const WCHAR * resourceName = W("CLRDEBUGINFOWINDOWSX86"); #endif #if !defined (HOST_IS_WINDOWS_OS) && defined(_HOST_X86_) - hrGetResource = GetResourceRvaFromResourceSectionRvaByName(pDataTarget, moduleBaseAddress, resourceSectionRVA, 10, W("CLRDEBUGINFOCORESYSX86"), 0, - &debugResourceRVA, &debugResourceSize); - useCrossPlatformNaming = SUCCEEDED(hrGetResource); + const WCHAR * resourceName = W("CLRDEBUGINFOCORESYSX86"); +#endif + +#if defined (HOST_IS_WINDOWS_OS) && defined(_HOST_AMD64_) + const WCHAR * resourceName = W("CLRDEBUGINFOWINDOWSAMD64"); #endif +#if !defined (HOST_IS_WINDOWS_OS) && defined(_HOST_AMD64_) + const WCHAR * resourceName = W("CLRDEBUGINFOCORESYSAMD64"); +#endif + + hrGetResource = GetResourceRvaFromResourceSectionRvaByName(pDataTarget, moduleBaseAddress, resourceSectionRVA, 10, resourceName, 0, + &debugResourceRVA, &debugResourceSize); + useCrossPlatformNaming = SUCCEEDED(hrGetResource); + #if defined(HOST_IS_WINDOWS_OS) && (defined(_HOST_X86_) || defined(_HOST_AMD64_) || defined(_HOST_ARM_)) #if defined(_HOST_X86_) diff --git a/src/dlls/dbgshim/CMakeLists.txt b/src/dlls/dbgshim/CMakeLists.txt index 664d827467..8786d0ee84 100644 --- a/src/dlls/dbgshim/CMakeLists.txt +++ b/src/dlls/dbgshim/CMakeLists.txt @@ -1,6 +1,8 @@ add_definitions(-DFEATURE_NO_HOST) add_definitions(-DSELF_NO_HOST) +include_directories(${CLR_DIR}/src/debug/shim) + set(DBGSHIM_SOURCES dbgshim.cpp ) diff --git a/src/dlls/dbgshim/dbgshim.cpp b/src/dlls/dbgshim/dbgshim.cpp index 3b7afce04c..c4930dafd5 100644 --- a/src/dlls/dbgshim/dbgshim.cpp +++ b/src/dlls/dbgshim/dbgshim.cpp @@ -1126,13 +1126,13 @@ HRESULT GetContinueStartupEvent(DWORD debuggeePID, #endif // !FEATURE_PAL -#if defined(FEATURE_CORESYSTEM) && defined(_TARGET_X86_) +#if defined(FEATURE_CORESYSTEM) #include "debugshim.h" #endif HRESULT CLRCreateInstance(REFCLSID clsid, REFIID riid, LPVOID *ppInterface) { -#if defined(FEATURE_CORESYSTEM) && defined(_TARGET_X86_) +#if defined(FEATURE_CORESYSTEM) if (ppInterface == NULL) return E_POINTER; |