arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix Aarch64 with early GCC

pull/757/head
Jeffrey Walton 2018-12-04 05:49:21 -05:00
parent 800dd99c60
commit 482151a980
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
GNUmakefile
View File

@ -493,37 +493,37 @@ ifeq ($(IS_ARMV8),1)
ifneq ($(ASIMD_FLAG),) ifneq ($(ASIMD_FLAG),)
TPROG = TestPrograms/test_arm_crc.cxx TPROG = TestPrograms/test_arm_crc.cxx
TOPT = -march=armv8.1-a+crc TOPT = -march=armv8-a+crc
HAVE_OPT = $(shell $(CXX) $(CXXFLAGS) $(ACLE_FLAG) $(ZOPT) $(TOPT) $(TPROG) -o $(TOUT) 2>&1 | tr ' ' '\n' | wc -l) HAVE_OPT = $(shell $(CXX) $(CXXFLAGS) $(ACLE_FLAG) $(ZOPT) $(TOPT) $(TPROG) -o $(TOUT) 2>&1 | tr ' ' '\n' | wc -l)
ifeq ($(strip $(HAVE_OPT)),0) ifeq ($(strip $(HAVE_OPT)),0)
CRC_FLAG = -march=armv8.1-a+crc CRC_FLAG = -march=armv8-a+crc
else else
CXXFLAGS += -DCRYPTOPP_ARM_CRC32_AVAILABLE=0 CXXFLAGS += -DCRYPTOPP_ARM_CRC32_AVAILABLE=0
endif endif
TPROG = TestPrograms/test_arm_aes.cxx TPROG = TestPrograms/test_arm_aes.cxx
TOPT = -march=armv8.1-a+crypto TOPT = -march=armv8-a+crypto
HAVE_OPT = $(shell $(CXX) $(CXXFLAGS) $(ACLE_FLAG) $(ZOPT) $(TOPT) $(TPROG) -o $(TOUT) 2>&1 | tr ' ' '\n' | wc -l) HAVE_OPT = $(shell $(CXX) $(CXXFLAGS) $(ACLE_FLAG) $(ZOPT) $(TOPT) $(TPROG) -o $(TOUT) 2>&1 | tr ' ' '\n' | wc -l)
ifeq ($(strip $(HAVE_OPT)),0) ifeq ($(strip $(HAVE_OPT)),0)
AES_FLAG = -march=armv8.1-a+crypto AES_FLAG = -march=armv8-a+crypto
else else
CXXFLAGS += -DCRYPTOPP_ARM_AES_AVAILABLE=0 CXXFLAGS += -DCRYPTOPP_ARM_AES_AVAILABLE=0
endif endif
TPROG = TestPrograms/test_arm_pmull.cxx TPROG = TestPrograms/test_arm_pmull.cxx
TOPT = -march=armv8.1-a+crypto TOPT = -march=armv8-a+crypto
HAVE_OPT = $(shell $(CXX) $(CXXFLAGS) $(ACLE_FLAG) $(ZOPT) $(TOPT) $(TPROG) -o $(TOUT) 2>&1 | tr ' ' '\n' | wc -l) HAVE_OPT = $(shell $(CXX) $(CXXFLAGS) $(ACLE_FLAG) $(ZOPT) $(TOPT) $(TPROG) -o $(TOUT) 2>&1 | tr ' ' '\n' | wc -l)
ifeq ($(strip $(HAVE_OPT)),0) ifeq ($(strip $(HAVE_OPT)),0)
GCM_FLAG = -march=armv8.1-a+crypto GCM_FLAG = -march=armv8-a+crypto
else else
CXXFLAGS += -DCRYPTOPP_ARM_PMULL_AVAILABLE=0 CXXFLAGS += -DCRYPTOPP_ARM_PMULL_AVAILABLE=0
endif endif
TPROG = TestPrograms/test_arm_sha.cxx TPROG = TestPrograms/test_arm_sha.cxx
TOPT = -march=armv8.1-a+crypto TOPT = -march=armv8-a+crypto
HAVE_OPT = $(shell $(CXX) $(CXXFLAGS) $(ACLE_FLAG) $(ZOPT) $(TOPT) $(TPROG) -o $(TOUT) 2>&1 | tr ' ' '\n' | wc -l) HAVE_OPT = $(shell $(CXX) $(CXXFLAGS) $(ACLE_FLAG) $(ZOPT) $(TOPT) $(TPROG) -o $(TOUT) 2>&1 | tr ' ' '\n' | wc -l)
ifeq ($(strip $(HAVE_OPT)),0) ifeq ($(strip $(HAVE_OPT)),0)
SHA_FLAG = -march=armv8.1-a+crypto SHA_FLAG = -march=armv8-a+crypto
else else
CXXFLAGS += -DCRYPTOPP_ARM_SHA_AVAILABLE=0 CXXFLAGS += -DCRYPTOPP_ARM_SHA_AVAILABLE=0
endif endif

10
GNUmakefile-cross
View File

@ -393,11 +393,11 @@ ifeq ($(IS_ARMV8),1)
PMUL_FLAG = PMUL_FLAG =
SHA_FLAG = SHA_FLAG =
else else
ASIMD_FLAG = -march=armv8.1-a ASIMD_FLAG = -march=armv8-a
CRC_FLAG = -march=armv8.1-a+crc CRC_FLAG = -march=armv8-a+crc
AES_FLAG = -march=armv8.1-a+crypto AES_FLAG = -march=armv8-a+crypto
PMULL_FLAG = -march=armv8.1-a+crypto PMULL_FLAG = -march=armv8-a+crypto
SHA_FLAG = -march=armv8.1-a+crypto SHA_FLAG = -march=armv8-a+crypto
endif endif
TPROG = TestPrograms/test_arm_acle.cxx TPROG = TestPrograms/test_arm_acle.cxx