This is an automated email from the ASF dual-hosted git repository. kou pushed a commit to branch maint-10.0.x in repository https://gitbox.apache.org/repos/asf/arrow.git
commit 73da8d3b73a0a8caf6640ae360bc2e72bd0286a0 Author: Yibo Cai <[email protected]> AuthorDate: Thu Nov 10 08:06:56 2022 +0800 ARROW-18255: [C++] Don't fail cmake check for armv6 (#14611) Authored-by: Yibo Cai <[email protected]> Signed-off-by: Sutou Kouhei <[email protected]> --- cpp/cmake_modules/SetupCxxFlags.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cpp/cmake_modules/SetupCxxFlags.cmake b/cpp/cmake_modules/SetupCxxFlags.cmake index 88d2f0fdae..4fbbdfcdbe 100644 --- a/cpp/cmake_modules/SetupCxxFlags.cmake +++ b/cpp/cmake_modules/SetupCxxFlags.cmake @@ -27,9 +27,9 @@ if(NOT DEFINED ARROW_CPU_FLAG) if(CMAKE_SYSTEM_PROCESSOR MATCHES "AMD64|X86|x86|i[3456]86|x64") set(ARROW_CPU_FLAG "x86") elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|ARM64|arm64") - set(ARROW_CPU_FLAG "armv8") - elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "armv7") - set(ARROW_CPU_FLAG "armv7") + set(ARROW_CPU_FLAG "aarch64") + elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm$|armv[4-7]") + set(ARROW_CPU_FLAG "aarch32") elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "powerpc|ppc") set(ARROW_CPU_FLAG "ppc") elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "s390x") @@ -108,7 +108,7 @@ elseif(ARROW_CPU_FLAG STREQUAL "ppc") if(ARROW_SIMD_LEVEL STREQUAL "DEFAULT") set(ARROW_SIMD_LEVEL "NONE") endif() -elseif(ARROW_CPU_FLAG STREQUAL "armv8") +elseif(ARROW_CPU_FLAG STREQUAL "aarch64") # Arm64 compiler flags, gcc/clang only set(ARROW_ARMV8_MARCH "armv8-a") check_cxx_compiler_flag("-march=${ARROW_ARMV8_MARCH}+sve" CXX_SUPPORTS_SVE) @@ -484,7 +484,7 @@ if(ARROW_CPU_FLAG STREQUAL "ppc") endif() endif() -if(ARROW_CPU_FLAG STREQUAL "armv8") +if(ARROW_CPU_FLAG STREQUAL "aarch64") if(ARROW_SIMD_LEVEL MATCHES "NEON|SVE[0-9]*") set(ARROW_HAVE_NEON ON) add_definitions(-DARROW_HAVE_NEON)
