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/debug | |
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/debug')
-rw-r--r-- | src/debug/daccess/CMakeLists.txt | 8 | ||||
-rw-r--r-- | src/debug/daccess/daccess.cpp | 20 | ||||
-rw-r--r-- | src/debug/di/CMakeLists.txt | 9 | ||||
-rw-r--r-- | src/debug/di/arm64/cordbregisterset.cpp | 1 | ||||
-rw-r--r-- | src/debug/di/arm64/primitives.cpp | 2 | ||||
-rw-r--r-- | src/debug/di/shimremotedatatarget.cpp | 4 | ||||
-rw-r--r-- | src/debug/ee/CMakeLists.txt | 7 | ||||
-rw-r--r-- | src/debug/ee/wks/CMakeLists.txt | 2 |
8 files changed, 36 insertions, 17 deletions
diff --git a/src/debug/daccess/CMakeLists.txt b/src/debug/daccess/CMakeLists.txt index 0d93d75966..9a61991859 100644 --- a/src/debug/daccess/CMakeLists.txt +++ b/src/debug/daccess/CMakeLists.txt @@ -15,8 +15,14 @@ elseif(CLR_CMAKE_PLATFORM_ARCH_ARM) add_definitions(-DDBG_TARGET_ARM=1) add_definitions(-DDBG_TARGET_WIN32=1) add_definitions(-D_WIN32=1) +elseif(CLR_CMAKE_PLATFORM_ARCH_ARM64) + add_definitions(-D_TARGET_ARM64_=1) + add_definitions(-DDBG_TARGET_64BIT=1) + add_definitions(-DDBG_TARGET_ARM64=1) + add_definitions(-DDBG_TARGET_WIN64=1) + add_definitions(-D_WIN64=1) else() - message(FATAL_ERROR "Only ARM and AMD64 is supported") + message(FATAL_ERROR "Only ARM, ARM64 and AMD64 is supported") endif() include_directories(BEFORE ${VM_DIR}) diff --git a/src/debug/daccess/daccess.cpp b/src/debug/daccess/daccess.cpp index b737ecd912..2c8c8323eb 100644 --- a/src/debug/daccess/daccess.cpp +++ b/src/debug/daccess/daccess.cpp @@ -5492,15 +5492,17 @@ ClrDataAccess::Initialize(void) // Determine our platform based on the pre-processor macros set when we were built #ifdef FEATURE_PAL - #if defined(DBG_TARGET_X86) - CorDebugPlatform hostPlatform = CORDB_PLATFORM_POSIX_X86; - #elif defined(DBG_TARGET_AMD64) - CorDebugPlatform hostPlatform = CORDB_PLATFORM_POSIX_AMD64; - #elif defined(DBG_TARGET_ARM) - CorDebugPlatform hostPlatform = CORDB_PLATFORM_POSIX_ARM; - #else - #error Unknown Processor. - #endif + #if defined(DBG_TARGET_X86) + CorDebugPlatform hostPlatform = CORDB_PLATFORM_POSIX_X86; + #elif defined(DBG_TARGET_AMD64) + CorDebugPlatform hostPlatform = CORDB_PLATFORM_POSIX_AMD64; + #elif defined(DBG_TARGET_ARM) + CorDebugPlatform hostPlatform = CORDB_PLATFORM_POSIX_ARM; + #elif defined(DBG_TARGET_ARM64) + CorDebugPlatform hostPlatform = CORDB_PLATFORM_POSIX_ARM64; + #else + #error Unknown Processor. + #endif #else #if defined(DBG_TARGET_X86) CorDebugPlatform hostPlatform = CORDB_PLATFORM_WINDOWS_X86; 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 diff --git a/src/debug/ee/CMakeLists.txt b/src/debug/ee/CMakeLists.txt index e37e2573f3..66eb054b1d 100644 --- a/src/debug/ee/CMakeLists.txt +++ b/src/debug/ee/CMakeLists.txt @@ -12,8 +12,13 @@ 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) + add_definitions(-D_TARGET_ARM64_=1) + add_definitions(-DDBG_TARGET_64BIT=1) + add_definitions(-DDBG_TARGET_ARM64=1) + add_definitions(-DDBG_TARGET_WIN64=1) else() - message(FATAL_ERROR "Only ARM and AMD64 is supported") + message(FATAL_ERROR "Only ARM, ARM64 and AMD64 is supported") endif() diff --git a/src/debug/ee/wks/CMakeLists.txt b/src/debug/ee/wks/CMakeLists.txt index e2fd7b2bfd..e8ad205fce 100644 --- a/src/debug/ee/wks/CMakeLists.txt +++ b/src/debug/ee/wks/CMakeLists.txt @@ -31,6 +31,8 @@ if(CLR_CMAKE_PLATFORM_ARCH_AMD64) add_library(cordbee_wks ${CORDBEE_SOURCES_WKS} ../amd64/dbghelpers.S) elseif(CLR_CMAKE_PLATFORM_ARCH_ARM) add_library(cordbee_wks ${CORDBEE_SOURCES_WKS} ../arm/dbghelpers.S) +elseif(CLR_CMAKE_PLATFORM_ARCH_ARM64) + add_library(cordbee_wks ${CORDBEE_SOURCES_WKS}) else() message(FATAL_ERROR "Only ARM and AMD64 is supported") endif() |