diff options
author | Rahul Kumar <rahku@microsoft.com> | 2016-04-12 14:40:23 -0700 |
---|---|---|
committer | Rahul Kumar <rahku@microsoft.com> | 2016-04-18 22:17:29 -0700 |
commit | 7f46dbe0c6b0785a4e40978da684b1dc81d0b8ce (patch) | |
tree | 2de78686eb771e11d7276c69791405550bbd0311 /src/debug | |
parent | 0a31fe90800bd45e3c3668483dbe27358864170e (diff) | |
download | coreclr-7f46dbe0c6b0785a4e40978da684b1dc81d0b8ce.tar.gz coreclr-7f46dbe0c6b0785a4e40978da684b1dc81d0b8ce.tar.bz2 coreclr-7f46dbe0c6b0785a4e40978da684b1dc81d0b8ce.zip |
enable build of cross target components.
Currently only enabled for arm64
Diffstat (limited to 'src/debug')
-rw-r--r-- | src/debug/daccess/CMakeLists.txt | 23 | ||||
-rw-r--r-- | src/debug/debug-pal/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/debug/di/CMakeLists.txt | 26 | ||||
-rw-r--r-- | src/debug/ee/CMakeLists.txt | 31 |
4 files changed, 7 insertions, 75 deletions
diff --git a/src/debug/daccess/CMakeLists.txt b/src/debug/daccess/CMakeLists.txt index 77dc1c249d..30068450b4 100644 --- a/src/debug/daccess/CMakeLists.txt +++ b/src/debug/daccess/CMakeLists.txt @@ -3,29 +3,6 @@ include(${CLR_DIR}/dac.cmake) add_definitions(-DFEATURE_NO_HOST) -if(CLR_CMAKE_PLATFORM_ARCH_AMD64) - add_definitions(-D_TARGET_AMD64_=1) - add_definitions(-DDBG_TARGET_64BIT=1) - add_definitions(-DDBG_TARGET_AMD64=1) - add_definitions(-DDBG_TARGET_WIN64=1) - add_definitions(-D_WIN64=1) -elseif(CLR_CMAKE_PLATFORM_ARCH_I386) - add_definitions(-D_TARGET_X86_=1) - add_definitions(-DDBG_TARGET_X86=1) -elseif(CLR_CMAKE_PLATFORM_ARCH_ARM) - add_definitions(-D_TARGET_ARM_=1) - add_definitions(-DDBG_TARGET_32BIT=1) - add_definitions(-DDBG_TARGET_ARM=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() - clr_unknown_arch() -endif() - include_directories(BEFORE ${VM_DIR}) include_directories(BEFORE ${VM_DIR}/${ARCH_SOURCES_DIR}) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/src/debug/debug-pal/CMakeLists.txt b/src/debug/debug-pal/CMakeLists.txt index d9a6cf2e84..c96d7f9e06 100644 --- a/src/debug/debug-pal/CMakeLists.txt +++ b/src/debug/debug-pal/CMakeLists.txt @@ -28,4 +28,4 @@ if(CLR_CMAKE_PLATFORM_UNIX) endif(CLR_CMAKE_PLATFORM_UNIX) -add_library(debug-pal STATIC ${TWO_WAY_PIPE_SOURCES}) +_add_library(debug-pal STATIC ${TWO_WAY_PIPE_SOURCES}) diff --git a/src/debug/di/CMakeLists.txt b/src/debug/di/CMakeLists.txt index 030e150434..8894813e73 100644 --- a/src/debug/di/CMakeLists.txt +++ b/src/debug/di/CMakeLists.txt @@ -1,25 +1,3 @@ -if(CLR_CMAKE_PLATFORM_ARCH_AMD64) - add_definitions(-D_TARGET_WIN64_=1) - add_definitions(-DDBG_TARGET_64BIT) - add_definitions(-DDBG_TARGET_WIN64=1) - add_definitions(-DDBG_TARGET_AMD64=1) -elseif(CLR_CMAKE_PLATFORM_ARCH_I386) - add_definitions(-D_TARGET_X86_=1) - add_definitions(-DDBG_TARGET_32BIT) - add_definitions(-DDBG_TARGET_X86=1) -elseif(CLR_CMAKE_PLATFORM_ARCH_ARM) - add_definitions(-D_TARGET_WIN32_=1) - add_definitions(-DDBG_TARGET_32BIT) - 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() - clr_unknown_arch() -endif() - add_definitions(-DFEATURE_METADATA_CUSTOM_DATA_SOURCE -DFEATURE_METADATA_DEBUGGEE_DATA_SOURCE -DFEATURE_NO_HOST -DFEATURE_METADATA_LOAD_TRUSTED_IMAGES) set(CORDBDI_SOURCES @@ -56,7 +34,7 @@ if(WIN32) #use static crt add_definitions(-MT) - if (CLR_CMAKE_PLATFORM_ARCH_AMD64) + if (CLR_CMAKE_TARGET_ARCH_AMD64) set(CORDBDI_SOURCES ${CORDBDI_SOURCES} ${ARCH_SOURCES_DIR}/floatconversion.asm @@ -65,7 +43,7 @@ if(WIN32) elseif(CLR_CMAKE_PLATFORM_UNIX) add_compile_options(-fPIC) - if(CLR_CMAKE_PLATFORM_ARCH_AMD64) + if(CLR_CMAKE_TARGET_ARCH_AMD64) set(CORDBDI_SOURCES ${CORDBDI_SOURCES} ${ARCH_SOURCES_DIR}/floatconversion.S diff --git a/src/debug/ee/CMakeLists.txt b/src/debug/ee/CMakeLists.txt index ec703a15ac..85170df713 100644 --- a/src/debug/ee/CMakeLists.txt +++ b/src/debug/ee/CMakeLists.txt @@ -2,29 +2,6 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) add_definitions(-DFEATURE_NO_HOST) -if(CLR_CMAKE_PLATFORM_ARCH_AMD64) - add_definitions(-D_TARGET_AMD64_=1) - add_definitions(-DDBG_TARGET_64BIT=1) - add_definitions(-DDBG_TARGET_AMD64=1) - add_definitions(-DDBG_TARGET_WIN64=1) -elseif(CLR_CMAKE_PLATFORM_ARCH_I386) - add_definitions(-D_TARGET_X86_=1) - add_definitions(-DDBG_TARGET_32BIT=1) - add_definitions(-DDBG_TARGET_X86=1) -elseif(CLR_CMAKE_PLATFORM_ARCH_ARM) - add_definitions(-D_TARGET_ARM_=1) - add_definitions(-DDBG_TARGET_32BIT=1) - add_definitions(-DDBG_TARGET_ARM=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() - clr_unknown_arch() -endif() - - include_directories(BEFORE ${VM_DIR}) include_directories(BEFORE ${VM_DIR}/${ARCH_SOURCES_DIR}) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}) @@ -60,19 +37,19 @@ if(CLR_CMAKE_PLATFORM_UNIX) ) endif(CLR_CMAKE_PLATFORM_UNIX) -if(CLR_CMAKE_PLATFORM_ARCH_AMD64) +if(CLR_CMAKE_TARGET_ARCH_AMD64) list(APPEND CORDBEE_SOURCES_WKS ${ARCH_SOURCES_DIR}/debuggerregdisplayhelper.cpp ${ARCH_SOURCES_DIR}/amd64walker.cpp ) -elseif(CLR_CMAKE_PLATFORM_ARCH_I386) +elseif(CLR_CMAKE_TARGET_ARCH_I386) list(APPEND CORDBEE_SOURCES_WKS ${ARCH_SOURCES_DIR}/debuggerregdisplayhelper.cpp ${ARCH_SOURCES_DIR}/x86walker.cpp ) -elseif(CLR_CMAKE_PLATFORM_ARCH_ARM) +elseif(CLR_CMAKE_TARGET_ARCH_ARM) list(APPEND CORDBEE_SOURCES_WKS ${ARCH_SOURCES_DIR}/armwalker.cpp) -elseif(CLR_CMAKE_PLATFORM_ARCH_ARM64) +elseif(CLR_CMAKE_TARGET_ARCH_ARM64) list(APPEND CORDBEE_SOURCES_WKS ${ARCH_SOURCES_DIR}/arm64walker.cpp) endif() |