diff --git a/eng/native/configureplatform.cmake b/eng/native/configureplatform.cmake index 0fbb0813c5d395..7d57fc2729e2f1 100644 --- a/eng/native/configureplatform.cmake +++ b/eng/native/configureplatform.cmake @@ -320,6 +320,9 @@ elseif(CLR_CMAKE_TARGET_ARCH STREQUAL riscv64) set(CLR_CMAKE_TARGET_ARCH_RISCV64 1) elseif(CLR_CMAKE_TARGET_ARCH STREQUAL arm) set(CLR_CMAKE_TARGET_ARCH_ARM 1) + if(CLR_CMAKE_TARGET_OS STREQUAL android) + set(ARM_SOFTFP 1) + endif() elseif(CLR_CMAKE_TARGET_ARCH STREQUAL armv6) set(CLR_CMAKE_TARGET_ARCH_ARMV6 1) elseif(CLR_CMAKE_TARGET_ARCH STREQUAL armel) diff --git a/src/coreclr/clrdefinitions.cmake b/src/coreclr/clrdefinitions.cmake index 60b79850f53ffd..4b7beca185cca9 100644 --- a/src/coreclr/clrdefinitions.cmake +++ b/src/coreclr/clrdefinitions.cmake @@ -292,7 +292,8 @@ function(set_target_definitions_to_custom_os_and_arch) target_compile_definitions(${TARGETDETAILS_TARGET} PRIVATE TARGET_WASM32) endif() - if (TARGETDETAILS_ARCH STREQUAL "armel") + if (TARGETDETAILS_ARCH STREQUAL "armel" OR + (TARGETDETAILS_ARCH STREQUAL "arm" AND CLR_CMAKE_TARGET_ANDROID)) target_compile_definitions(${TARGETDETAILS_TARGET} PRIVATE ARM_SOFTFP) endif() endfunction()