From: Sebastian Ramacher <sramacher@debian.org>

Date: Sun, 21 Jun 2020 17:54:56 +0200

Subject: Fix arm* flags

​

---

 source/CMakeLists.txt | 7 ++-----

 1 file changed, 2 insertions(+), 5 deletions(-)

​

diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt

index ab5ddfe..eb9b19b 100755

--- a/source/CMakeLists.txt

+++ b/source/CMakeLists.txt

@@ -253,10 +253,7 @@ if(GCC)

     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()

     endif()

    if(ARM64 OR CROSS_COMPILE_ARM64)

@@ -265,13 +262,13 @@ if(GCC)

         find_package(SVE2)

         if(CPU_HAS_SVE2 OR CROSS_COMPILE_SVE2)

             message(STATUS "Found SVE2")

-           set(ARM_ARGS -O3 -march=armv8-a+sve2 -fPIC -flax-vector-conversions)

+           set(ARM_ARGS -fPIC -flax-vector-conversions)

             add_definitions(-DHAVE_SVE2)

             add_definitions(-DHAVE_SVE)

             add_definitions(-DHAVE_NEON) # for NEON c/c++ primitives, as currently there is no implementation that use SVE2

         elseif(CPU_HAS_SVE OR CROSS_COMPILE_SVE)

             message(STATUS "Found SVE")

-           set(ARM_ARGS -O3 -march=armv8-a+sve -fPIC -flax-vector-conversions)

+           set(ARM_ARGS -fPIC -flax-vector-conversions)

             add_definitions(-DHAVE_SVE)

             add_definitions(-DHAVE_NEON) # for NEON c/c++ primitives, as currently there is no implementation that use SVE

         elseif(CPU_HAS_NEON)

​