From 20db83b9767f5bdfce787d0bd0cb5881a3cbe51c Mon Sep 17 00:00:00 2001 From: Peter Michael Green Date: Thu, 7 Jul 2022 15:48:19 +0100 Subject: [PATCH] Disable neon, it does not appear to be correctly behind runtime CPU detection. Gbp-Pq: Name disable-neon.patch --- cmake/modules/FindCPUflags.cmake | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/cmake/modules/FindCPUflags.cmake b/cmake/modules/FindCPUflags.cmake index 802d1cc..cdfab36 100644 --- a/cmake/modules/FindCPUflags.cmake +++ b/cmake/modules/FindCPUflags.cmake @@ -356,17 +356,17 @@ elseif(ARCHITECTURE_ARM) else() try_run(RUN_NEON COMPILE_NEON "${CMAKE_BINARY_DIR}/tmp" "${TEST_DIR}/test_arm_neon.cxx" COMPILE_DEFINITIONS -mfpu=neon -O0) endif() - if(COMPILE_NEON AND RUN_NEON EQUAL 0) - set(HAS_NEON ON CACHE BOOL "Architecture has NEON SIMD enabled") - message(STATUS "Use NEON SIMD instructions") - if(C_GCC OR C_CLANG) - set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfpu=neon" ) - set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfpu=neon" ) - add_definitions(-DUSE_NEON) - endif() - else() + #if(COMPILE_NEON AND RUN_NEON EQUAL 0) + # set(HAS_NEON ON CACHE BOOL "Architecture has NEON SIMD enabled") + # message(STATUS "Use NEON SIMD instructions") + # if(C_GCC OR C_CLANG) + # set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfpu=neon" ) + # set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfpu=neon" ) + # add_definitions(-DUSE_NEON) + # endif() + #else() set(HAS_NEON OFF CACHE BOOL "Architecture does not have NEON SIMD enabled") - endif() + #endif() elseif(ARCHITECTURE_ARM64) # Advanced SIMD (aka NEON) is mandatory for AArch64 set(HAS_NEON ON CACHE BOOL "Architecture has NEON SIMD enabled") -- 2.30.2