From 0fd499946f74f39e10d37318a44fbb664f988637 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Thu, 10 Feb 2022 21:43:06 -0500 Subject: [PATCH] Fix ARMv7 compile test --- GNUmakefile | 2 +- GNUmakefile-cross | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index c7848247..d01eeeba 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -1183,7 +1183,7 @@ 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| grep -E 'ARM_ARCH 7|_ARM_ARCH_7A__'),) + ifneq ($($(CXX) -dM -E - /dev/null| grep -E 'ARM_ARCH 7|_ARM_ARCH_7A__'),) CRYPTOGAMS_ARMV7_FLAG = -march=armv7-a endif ifeq ($(CLANG_COMPILER),1) diff --git a/GNUmakefile-cross b/GNUmakefile-cross index 9ec8a8ee..f64c60e5 100644 --- a/GNUmakefile-cross +++ b/GNUmakefile-cross @@ -706,7 +706,7 @@ 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| grep -E 'ARM_ARCH 7|_ARM_ARCH_7A__'),) + ifneq ($($(CXX) -dM -E - /dev/null| grep -E 'ARM_ARCH 7|_ARM_ARCH_7A__'),) CRYPTOGAMS_ARMV7_FLAG = -march=armv7-a endif ifeq ($(CLANG_COMPILER),1)