From: Peter Michael Green <plugwash@raspbian.org>
Date: Wed, 20 Sep 2023 14:03:25 +0000 (+0100)
Subject: Disable neon.
X-Git-Tag: archive/raspbian/3.1.0-3+rpi1~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=dd01a270a64e80f06da77f68159449d702bd2486;p=volk.git

Disable neon.


Gbp-Pq: Name disable-neon
---

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 09416e9..4e39cd5 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -230,7 +230,8 @@ else(neon_compile_result)
     OVERRULE_ARCH(neonv8 "Compiler doesn't support NEON")
 endif(neon_compile_result)
 
-########################################################################
+OVERRULE_ARCH(neon "We don't want neon on raspbian")
+
 # implement overruling in the ORC case,
 # since ORC always passes flag detection
 ########################################################################
@@ -400,7 +401,7 @@ set(FULL_C_FLAGS "${CMAKE_C_FLAGS}" "${CMAKE_CXX_COMPILER_ARG1}")
 # set up the assembler flags and include the source files
 foreach(ARCH ${ASM_ARCHS_AVAILABLE})
   string(REGEX MATCH "${ARCH}" ASM_ARCH "${available_archs}")
-if( ASM_ARCH STREQUAL "neonv7" )
+if( ASM_ARCH STREQUAL "neonv7xxxxxxxxxx" )
   message(STATUS "---- Adding ASM files") # we always use ATT syntax
   message(STATUS "-- Detected neon architecture; enabling ASM")
   # architecture specific assembler flags are now set in the cmake toolchain file