VSadov/Satori
1
0
Fork 0
mirror of https://github.com/VSadov/Satori.git synced 2025-06-12 02:30:29 +09:00
Code Activity

Fix building on ARMhf userland on top of AARCH64 kernel (#97929)

Browse source 
Co-authored-by: Jan Kotas <jkotas@microsoft.com>
This commit is contained in:
Filip Navara 2024-02-06 03:17:09 +01:00 • committed by GitHub
parent b7dcefe06d
commit d247d72a4e
Signed by: github
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
eng/common/native/init-os-and-arch.sh
View file

@ -35,6 +35,10 @@ fi
case "$CPUName" in case "$CPUName" in
arm64|aarch64) arm64|aarch64)
arch=arm64 arch=arm64
if [ "$(getconf LONG_BIT)" -lt 64 ]; then
# This is 32-bit OS running on 64-bit CPU (for example Raspberry Pi OS)
arch=arm
fi
;; ;;
loongarch64) loongarch64)

6
eng/native/configureplatform.cmake
View file

@ -45,7 +45,11 @@ if(CLR_CMAKE_HOST_OS STREQUAL linux)
elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL armv6 OR CMAKE_SYSTEM_PROCESSOR STREQUAL armv6l) elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL armv6 OR CMAKE_SYSTEM_PROCESSOR STREQUAL armv6l)
set(CLR_CMAKE_HOST_UNIX_ARMV6 1) set(CLR_CMAKE_HOST_UNIX_ARMV6 1)
elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64 OR CMAKE_SYSTEM_PROCESSOR STREQUAL arm64) elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64 OR CMAKE_SYSTEM_PROCESSOR STREQUAL arm64)
set(CLR_CMAKE_HOST_UNIX_ARM64 1) if (CMAKE_SIZEOF_VOID_P EQUAL 8)
set(CLR_CMAKE_HOST_UNIX_ARM64 1)
else()
set(CLR_CMAKE_HOST_UNIX_ARM 1)
endif()
elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL loongarch64) elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL loongarch64)
set(CLR_CMAKE_HOST_UNIX_LOONGARCH64 1) set(CLR_CMAKE_HOST_UNIX_LOONGARCH64 1)
elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL riscv64) elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL riscv64)