From: Peter Michael Green <plugwash@raspbian.org>
Date: Sat, 19 Mar 2022 22:09:41 +0000 (+0000)
Subject: pass -march=armv7+fp when building "armv4" assembler files.
X-Git-Tag: archive/raspbian/8.7.0+git220824-1+rpi1~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b7e01d58ba14151dd44d87a87eb5693db79686ee;p=libcrypto%2B%2B.git

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 6001d59..c50a601 100644
--- 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