diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index a407271b4..6ecfda3ee 100755 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -44,7 +44,7 @@ else() string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" SYSPROC) endif() set(X86_ALIASES x86 i386 i686 x86_64 amd64) -set(ARM_ALIASES armv6l armv7l) +set(ARM_ALIASES armv6l armv7l armv7-a) set(ARM64_ALIASES arm64 arm64e aarch64) list(FIND X86_ALIASES "${SYSPROC}" X86MATCH) list(FIND ARM_ALIASES "${SYSPROC}" ARMMATCH) @@ -251,16 +251,12 @@ if(GCC) message(STATUS "cross compile arm") set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm -fPIC) elseif(ARM) - find_package(Neon) - if(CPU_HAS_NEON) - set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=neon -marm -fPIC) - add_definitions(-DHAVE_NEON) - else() - set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=vfp -marm) - endif() + # Follow termux_step_setup_toolchain.sh + set(ARM_ARGS @TERMUX_CLANG_TARGET_ARM@ -march=armv7-a -mfpu=neon -mfloat-abi=softfp -mthumb -fPIC) + add_definitions(-DHAVE_NEON) endif() if(ARM64 OR CROSS_COMPILE_ARM64) - set(ARM_ARGS -fPIC -flax-vector-conversions) + set(ARM_ARGS @TERMUX_CLANG_TARGET_AARCH64@ -fPIC -flax-vector-conversions) find_package(Neon) if(CPU_HAS_NEON) add_definitions(-DHAVE_NEON)