Skip to content

Commit 1281626

Browse files
authored
Add armv8l virtualized 32-bit ARM core detection (#66477)
1 parent f82fe1d commit 1281626

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ 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
56-
CMAKE_SYSTEM_PROCESSOR MATCHES "^(armv7l|armv6l|aarch64|arm|s390x)$")
56+
CMAKE_SYSTEM_PROCESSOR MATCHES "^(armv8l|armv7l|armv6l|aarch64|arm|s390x)$")
5757
set(TOOLSET_PREFIX "${TOOLCHAIN}-")
5858
else()
5959
set(TOOLSET_PREFIX "")

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ case "$CPUName" in
4545
arch=x64
4646
;;
4747

48-
armv7l)
48+
armv7l|armv8l)
4949
if (NAME=""; . /etc/os-release; test "$NAME" = "Tizen"); then
5050
arch=armel
5151
else

0 commit comments

Comments
 (0)