From 2a122e9eaa29ab044e9b67756bfe46ebeb5ecf4d Mon Sep 17 00:00:00 2001 From: Peter Marcu Date: Mon, 21 Nov 2016 17:15:54 -0800 Subject: [PATCH 1/3] Adding arm64 and updating default subsystem --- CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 610f89b8217a..5188d9e22ecb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -293,10 +293,11 @@ if (WIN32) # # Disable the following line for UNIX altjit on Windows set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /MANIFEST:NO") #Do not create Side-by-Side Assembly Manifest - if (CLR_CMAKE_HOST_ARCH STREQUAL arm) + + if ((CLR_CMAKE_PLATFORM_ARCH_ARM) OR (CLR_CMAKE_PLATFORM_ARCH_ARM64)) set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SUBSYSTEM:WINDOWS,6.02") #windows subsystem - arm minimum is 6.02 else () - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SUBSYSTEM:WINDOWS,6.00") #windows subsystem + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SUBSYSTEM:WINDOWS,6.01") #windows subsystem endif () set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /LARGEADDRESSAWARE") # can handle addresses larger than 2 gigabytes From 060c4dbbc72bb001e7594275120d769c1dfc599c Mon Sep 17 00:00:00 2001 From: Peter Marcu Date: Sun, 18 Dec 2016 09:42:18 -0800 Subject: [PATCH 2/3] adding arm64 min version --- CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5188d9e22ecb..f693d7ae3814 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -294,8 +294,10 @@ if (WIN32) # Disable the following line for UNIX altjit on Windows set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /MANIFEST:NO") #Do not create Side-by-Side Assembly Manifest - if ((CLR_CMAKE_PLATFORM_ARCH_ARM) OR (CLR_CMAKE_PLATFORM_ARCH_ARM64)) - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SUBSYSTEM:WINDOWS,6.02") #windows subsystem - arm minimum is 6.02 + if (CLR_CMAKE_PLATFORM_ARCH_ARM) + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SUBSYSTEM:WINDOWS,6.02") #windows subsystem - arm minimum is 6.02 + elseif(CLR_CMAKE_PLATFORM_ARCH_ARM64) + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SUBSYSTEM:WINDOWS,6.03") #windows subsystem - arm64 minimum is 6.02 else () set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SUBSYSTEM:WINDOWS,6.01") #windows subsystem endif () From c18296969079e9ae51346d9f445c39a35c6dc492 Mon Sep 17 00:00:00 2001 From: Peter Marcu Date: Sun, 18 Dec 2016 16:35:39 -0800 Subject: [PATCH 3/3] fixing the comment --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f693d7ae3814..1bfd638c39ae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -297,7 +297,7 @@ if (WIN32) if (CLR_CMAKE_PLATFORM_ARCH_ARM) set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SUBSYSTEM:WINDOWS,6.02") #windows subsystem - arm minimum is 6.02 elseif(CLR_CMAKE_PLATFORM_ARCH_ARM64) - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SUBSYSTEM:WINDOWS,6.03") #windows subsystem - arm64 minimum is 6.02 + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SUBSYSTEM:WINDOWS,6.03") #windows subsystem - arm64 minimum is 6.03 else () set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SUBSYSTEM:WINDOWS,6.01") #windows subsystem endif ()