mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-06 05:40:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'android-riscv64'

Browse Source 
201c3a491c Android: add support for riscv64-linux-android

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !10622
This commit is contained in:
Brad King
2025-04-09 13:24:44 +00:00
committed by Kitware Robot
parent 7a9505582c 201c3a491c
commit 7bb7a6fb13
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Modules/Platform/Android-Determine.cmake
View File

@@ -352,6 +352,10 @@ if(NOT DEFINED NDK_KNOWN_DEVICE_ABIS)
set(NDK_ABI_x86_64_ARCH "x86_64")
set(NDK_ABI_x86_64_TRIPLE "x86_64-linux-android")
set(NDK_ABI_x86_64_LLVM_TRIPLE "x86_64-none-linux-android")
set(NDK_ABI_riscv64_PROC "riscv64")
set(NDK_ABI_riscv64_ARCH "riscv64")
set(NDK_ABI_riscv64_TRIPLE "riscv64-linux-android")
set(NDK_ABI_riscv64_LLVM_TRIPLE "riscv64-none-linux-android")
set(NDK_PROC_aarch64_ABI "arm64-v8a")
set(NDK_PROC_armv7-a_ABI "armeabi-v7a")
@@ -361,13 +365,15 @@ if(NOT DEFINED NDK_KNOWN_DEVICE_ABIS)
set(NDK_PROC_mips_ABI "mips")
set(NDK_PROC_mips64_ABI "mips64")
set(NDK_PROC_x86_64_ABI "x86_64")
set(NDK_PROC_riscv64_ABI "riscv64")
set(NDK_ARCH_arm64_ABI "arm64-v8a")
set(NDK_ARCH_arm_ABI "armeabi")
set(NDK_ARCH_mips_ABI "mips")
set(NDK_ARCH_mips64_ABI "mips64")
set(NDK_ARCH_x86_ABI "x86")
set(NDK_ARCH_x86_64_ABI "x86_64")
set(NDK_ARCH_arm64_ABI "arm64-v8a")
set(NDK_ARCH_arm_ABI "armeabi")
set(NDK_ARCH_mips_ABI "mips")
set(NDK_ARCH_mips64_ABI "mips64")
set(NDK_ARCH_x86_ABI "x86")
set(NDK_ARCH_x86_64_ABI "x86_64")
set(NDK_ARCH_riscv64_ABI "riscv64")
endif()
# Validate inputs.
@@ -524,6 +530,9 @@ elseif(CMAKE_ANDROID_NDK)
if(CMAKE_ANDROID_ARCH_ABI MATCHES "64(-v8a)?$" AND CMAKE_SYSTEM_VERSION LESS 21)
set(CMAKE_SYSTEM_VERSION 21)
endif()
if(CMAKE_ANDROID_ARCH_ABI MATCHES "^riscv64$" AND CMAKE_SYSTEM_VERSION LESS 35)
set(CMAKE_SYSTEM_VERSION 35)
endif()
else()
file(GLOB _ANDROID_APIS_1 RELATIVE "${CMAKE_ANDROID_NDK}/platforms" "${CMAKE_ANDROID_NDK}/platforms/android-[0-9]")
file(GLOB _ANDROID_APIS_2 RELATIVE "${CMAKE_ANDROID_NDK}/platforms" "${CMAKE_ANDROID_NDK}/platforms/android-[0-9][0-9]")

1
Modules/Platform/Android/abi-riscv64-Clang.cmake Normal file
View File

@@ -0,0 +1 @@
include(Platform/Android/abi-common-Clang)