diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2015-07-30 13:16:34 -0700 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2015-07-30 13:16:34 -0700 |
| commit | 1961ee17dae578a72f5cab3711ac5373e0940844 (patch) | |
| tree | 8fb8ac6e07334f3209745ead9f984a293e7f6599 /src/ToolBox | |
| parent | 6357886a38249eb80fcc8d9cc727371e9483120a (diff) | |
| parent | 2140a6bfc7c59f2814891b15b5788738d15db254 (diff) | |
| download | coreclr-1961ee17dae578a72f5cab3711ac5373e0940844.tar.gz coreclr-1961ee17dae578a72f5cab3711ac5373e0940844.tar.bz2 coreclr-1961ee17dae578a72f5cab3711ac5373e0940844.zip | |
Merge pull request #1292 from kangaroo/aarch64
Initial aarch64/linux support
Diffstat (limited to 'src/ToolBox')
| -rw-r--r-- | src/ToolBox/SOS/Strike/util.h | 2 | ||||
| -rw-r--r-- | src/ToolBox/SOS/lldbplugin/CMakeLists.txt | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/ToolBox/SOS/Strike/util.h b/src/ToolBox/SOS/Strike/util.h index 7b9d96d997..904edc074f 100644 --- a/src/ToolBox/SOS/Strike/util.h +++ b/src/ToolBox/SOS/Strike/util.h @@ -1621,7 +1621,7 @@ BOOL IsMiniDumpFile(); void ReportOOM(); BOOL SafeReadMemory (TADDR offset, PVOID lpBuffer, ULONG cb, PULONG lpcbBytesRead); -#if !defined(_TARGET_WIN64_) +#if !defined(_TARGET_WIN64_) && !defined(_ARM64_) // on 64-bit platforms TADDR and CLRDATA_ADDRESS are identical inline BOOL SafeReadMemory (CLRDATA_ADDRESS offset, PVOID lpBuffer, ULONG cb, PULONG lpcbBytesRead) { return SafeReadMemory(TO_TADDR(offset), lpBuffer, cb, lpcbBytesRead); } diff --git a/src/ToolBox/SOS/lldbplugin/CMakeLists.txt b/src/ToolBox/SOS/lldbplugin/CMakeLists.txt index 798c91a142..ce279e9a1c 100644 --- a/src/ToolBox/SOS/lldbplugin/CMakeLists.txt +++ b/src/ToolBox/SOS/lldbplugin/CMakeLists.txt @@ -12,6 +12,9 @@ elseif(CLR_CMAKE_PLATFORM_ARCH_ARM) add_definitions(-DDBG_TARGET_32BIT=1) add_definitions(-DDBG_TARGET_ARM=1) add_definitions(-DDBG_TARGET_WIN32=1) +elseif(CLR_CMAKE_PLATFORM_ARCH_ARM64) + message(WARNING "lldb is not supported on linux/aarch64 yet") + return() endif() set(ENABLE_LLDBPLUGIN ${CLR_CMAKE_PLATFORM_UNIX} CACHE BOOL "Enable building the SOS plugin for LLDB.") |