diff options
Diffstat (limited to 'GNUmakefile')
| -rw-r--r-- | GNUmakefile | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/GNUmakefile b/GNUmakefile index a0f9302b..31bf6b36 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -1177,18 +1177,20 @@ ifneq ($(IS_MINGW),0) INCL += resource.h endif -# Cryptogams source files. We couple to ARMv7. +# Cryptogams source files. We couple to ARMv7 and NEON. # Limit to Linux. The source files target the GNU assembler. # Also see https://www.cryptopp.com/wiki/Cryptogams. ifeq ($(IS_ARM32)$(IS_LINUX),11) - ifeq ($(CLANG_COMPILER),1) - CRYPTOGAMS_ARMV4_FLAG = -march=armv7-a -Wa,--noexecstack - CRYPTOGAMS_ARMV4_THUMB_FLAG = -march=armv7-a -mthumb -Wa,--noexecstack - else - CRYPTOGAMS_ARMV4_FLAG = -march=armv7-a -Wa,--noexecstack - CRYPTOGAMS_ARMV4_THUMB_FLAG = -march=armv7-a -Wa,--noexecstack + ifeq ($(filter -DCRYPTOPP_DISABLE_ASM -DCRYPTOPP_DISABLE_ARM_NEON,$(CPPFLAGS)$(CXXFLAGS)),) + ifeq ($(CLANG_COMPILER),1) + CRYPTOGAMS_ARMV4_FLAG = -march=armv7-a -Wa,--noexecstack + CRYPTOGAMS_ARMV4_THUMB_FLAG = -march=armv7-a -mthumb -Wa,--noexecstack + else + CRYPTOGAMS_ARMV4_FLAG = -march=armv7-a -Wa,--noexecstack + CRYPTOGAMS_ARMV4_THUMB_FLAG = -march=armv7-a -Wa,--noexecstack + endif + SRCS += aes_armv4.S sha1_armv4.S sha256_armv4.S sha512_armv4.S endif - SRCS += aes_armv4.S sha1_armv4.S sha256_armv4.S sha512_armv4.S endif # Remove unneeded arch specific files to speed build time. |