pass -march=armv7+fp when building "armv4" assembler files.

despite the names these only seem to be used for armv7, and contain
neon implementations which won't be built if no -march is specified

Gbp-Pq: Name use-fp-with-march.patch

diff --git a/GNUmakefile b/GNUmakefile
index 6001d5931dd64e8c215962de8d621fb00c11e5b7..c50a601d4df2b2f10847f8d63ae0b6952a642fd1 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1181,11 +1181,7 @@ endif
 # Also see https://www.cryptopp.com/wiki/Cryptogams.
 ifeq ($(IS_ARM32)$(IS_LINUX),11)
   ifeq ($(filter -DCRYPTOPP_DISABLE_ASM -DCRYPTOPP_DISABLE_ARM_NEON,$(CPPFLAGS)$(CXXFLAGS)),)
-    # Do not use -march=armv7 if the compiler is already targeting the ISA.
-    # Also see https://github.com/weidai11/cryptopp/issues/1094
-    ifneq ($($(CXX) ++ -dM -E - </dev/null 2>/dev/null| grep 'ARM_ARCH 7|_ARM_ARCH_7A__'),)
-      CRYPTOGAMS_ARMV7_FLAG = -march=armv7-a
-    endif
+    CRYPTOGAMS_ARMV7_FLAG = -march=armv7-a+fp
     ifeq ($(CLANG_COMPILER),1)
       CRYPTOGAMS_ARM_FLAG = $(CRYPTOGAMS_ARMV7_FLAG)
       CRYPTOGAMS_ARM_THUMB_FLAG = $(CRYPTOGAMS_ARMV7_FLAG) -mthumb