Skip to content

Commit 388cc78

Browse files
ayakaelmmitche
authored andcommitted
Add armv8l virtualized 32-bit ARM core detection (backports #66477) (#75528)
1 parent 8770e0e commit 388cc78

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

eng/native/configureplatform.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ if(CLR_CMAKE_HOST_OS STREQUAL Linux)
3636
# "amd64" string. Accept either of the two here.
3737
if(CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64 OR CMAKE_SYSTEM_PROCESSOR STREQUAL amd64)
3838
set(CLR_CMAKE_HOST_UNIX_AMD64 1)
39-
elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL armv7l)
39+
elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL armv7l OR CMAKE_SYSTEM_PROCESSOR STREQUAL armv8l)
4040
set(CLR_CMAKE_HOST_UNIX_ARM 1)
4141
set(CLR_CMAKE_HOST_UNIX_ARMV7L 1)
4242
elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL arm OR CMAKE_SYSTEM_PROCESSOR STREQUAL armv7-a)

eng/native/configuretools.cmake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ if(NOT WIN32 AND NOT CLR_CMAKE_TARGET_BROWSER)
5353
if(CLR_CMAKE_TARGET_ANDROID)
5454
set(TOOLSET_PREFIX ${ANDROID_TOOLCHAIN_PREFIX})
5555
elseif(CMAKE_CROSSCOMPILING AND NOT DEFINED CLR_CROSS_COMPONENTS_BUILD AND (CMAKE_SYSTEM_PROCESSOR STREQUAL armv7l OR
56-
CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64 OR CMAKE_SYSTEM_PROCESSOR STREQUAL arm OR CMAKE_SYSTEM_PROCESSOR STREQUAL s390x))
56+
CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64 OR CMAKE_SYSTEM_PROCESSOR STREQUAL arm OR CMAKE_SYSTEM_PROCESSOR STREQUAL s390x OR
57+
CMAKE_SYSTEM_PROCESSOR STREQUAL armv8l))
5758
set(TOOLSET_PREFIX "${TOOLCHAIN}-")
5859
else()
5960
set(TOOLSET_PREFIX "")

eng/native/init-os-and-arch.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ case "$CPUName" in
4141
arch=x64
4242
;;
4343

44-
armv7l)
44+
armv7l|armv8l)
4545
if (NAME=""; . /etc/os-release; test "$NAME" = "Tizen"); then
4646
arch=armel
4747
else

0 commit comments

Comments
 (0)