From: Ceph Packaging Team <team+ceph@tracker.debian.org>
Date: Fri, 15 Jan 2021 11:26:14 +0000 (+0000)
Subject: debian-armel-armhf-buildflags
X-Git-Tag: archive/raspbian/14.2.16-1+rpi1^2~10
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=df9ff710f22b2a27824e3e51ee068e90eb3e2912;p=ceph.git

debian-armel-armhf-buildflags


Gbp-Pq: Name debian-armel-armhf-buildflags.patch
---

diff --git a/cmake/modules/SIMDExt.cmake b/cmake/modules/SIMDExt.cmake
index 2c36ac373..4358efefa 100644
--- a/cmake/modules/SIMDExt.cmake
+++ b/cmake/modules/SIMDExt.cmake
@@ -40,11 +40,14 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64")
 
 elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm|ARM")
   set(HAVE_ARM 1)
-  CHECK_C_COMPILER_FLAG(-mfpu=neon HAVE_ARM_NEON)
-  if(HAVE_ARM_NEON)
-    set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -mfpu=neon")
+  if(CMAKE_LIBRARY_ARCHITECTURE EQUAL "arm-linux-gnueabi")
+    set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} --with-arch=armv5te --with-float=soft")
+  else()
+    CHECK_C_COMPILER_FLAG(-mfpu=neon HAVE_ARM_NEON)
+    if(HAVE_ARM_NEON)
+      set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -mfpu=neon")
+    endif()
   endif()
-
 elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "i386|i686|amd64|x86_64|AMD64")
   set(HAVE_INTEL 1)
   if(CMAKE_SYSTEM_PROCESSOR MATCHES "i686|amd64|x86_64|AMD64")
diff --git a/src/erasure-code/jerasure/gf-complete/m4/ax_ext.m4 b/src/erasure-code/jerasure/gf-complete/m4/ax_ext.m4
index 95c4dbe23..958850ba2 100644
--- a/src/erasure-code/jerasure/gf-complete/m4/ax_ext.m4
+++ b/src/erasure-code/jerasure/gf-complete/m4/ax_ext.m4
@@ -19,10 +19,17 @@ AC_DEFUN([AX_EXT],
       ;;
 
     arm*)
-      AC_CACHE_CHECK([whether NEON is enabled], [ax_cv_have_neon_ext], [ax_cv_have_neon_ext=yes])
-      if test "$ax_cv_have_neon_ext" = yes; then
-        AX_CHECK_COMPILE_FLAG(-mfpu=neon, [SIMD_FLAGS="$SIMD_FLAGS -mfpu=neon -DARM_NEON"], [ax_cv_have_neon_ext=no])
-      fi
+      case $host_cpu in
+          arm-linux-gnueabi)
+            AX_CHECK_COMPILE_FLAG(-mfpu=soft, [SIMD_FLAGS="$SIMD_FLAGS -mfpu=soft -march=armv5te"], [ax_cv_have_neon_ext=no])
+          ;;
+          *)
+            AC_CACHE_CHECK([whether NEON is enabled], [ax_cv_have_neon_ext], [ax_cv_have_neon_ext=yes])
+            if test "$ax_cv_have_neon_ext" = yes; then
+              AX_CHECK_COMPILE_FLAG(-mfpu=neon, [SIMD_FLAGS="$SIMD_FLAGS -mfpu=neon -DARM_NEON"], [ax_cv_have_neon_ext=no])
+            fi
+          ;;
+      esac
       ;;
 
     powerpc*)