Update NEON and ACLE feature tests

This commit is contained in:
Jeffrey Walton 2021-05-24 21:17:07 -04:00
parent 41edd50bd1
commit abf7bb7546
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
2 changed files with 12 additions and 12 deletions

View File

@ -475,8 +475,8 @@ ifeq ($(DETECT_FEATURES),1)
# Clang needs an option to include <arm_neon.h> # Clang needs an option to include <arm_neon.h>
TPROG = TestPrograms/test_arm_neon_header.cpp TPROG = TestPrograms/test_arm_neon_header.cpp
TOPT = -march=armv7-a -mfpu=neon TOPT = -DCRYPTOPP_ARM_NEON_HEADER=1 -march=armv7-a -mfpu=neon
HAVE_OPT = $(shell $(CXX) $(TCXXFLAGS) -DCRYPTOPP_ARM_NEON_HEADER=1 $(ZOPT) $(TOPT) $(TPROG) -o $(TOUT) 2>&1 | wc -w) HAVE_OPT = $(shell $(TCOMMAND) 2>&1 | wc -w)
ifeq ($(strip $(HAVE_OPT)),0) ifeq ($(strip $(HAVE_OPT)),0)
TEXTRA += -DCRYPTOPP_ARM_NEON_HEADER=1 TEXTRA += -DCRYPTOPP_ARM_NEON_HEADER=1
endif endif
@ -521,15 +521,15 @@ ifneq ($(IS_ARMV8),0)
ifeq ($(DETECT_FEATURES),1) ifeq ($(DETECT_FEATURES),1)
TPROG = TestPrograms/test_arm_neon_header.cpp TPROG = TestPrograms/test_arm_neon_header.cpp
TOPT = TOPT = -DCRYPTOPP_ARM_NEON_HEADER=1
HAVE_OPT = $(shell $(CXX) $(TCXXFLAGS) -DCRYPTOPP_ARM_NEON_HEADER=1 $(ZOPT) $(TOPT) $(TPROG) -o $(TOUT) 2>&1 | wc -w) HAVE_OPT = $(shell $(TCOMMAND) 2>&1 | wc -w)
ifeq ($(strip $(HAVE_OPT)),0) ifeq ($(strip $(HAVE_OPT)),0)
TEXTRA += -DCRYPTOPP_ARM_NEON_HEADER=1 TEXTRA += -DCRYPTOPP_ARM_NEON_HEADER=1
endif endif
TPROG = TestPrograms/test_arm_acle_header.cpp TPROG = TestPrograms/test_arm_acle_header.cpp
TOPT = -march=armv8-a TOPT = -DCRYPTOPP_ARM_ACLE_HEADER=1 -march=armv8-a
HAVE_OPT = $(shell $(CXX) $(TCXXFLAGS) -DCRYPTOPP_ARM_ACLE_HEADER=1 $(ZOPT) $(TOPT) $(TPROG) -o $(TOUT) 2>&1 | wc -w) HAVE_OPT = $(shell $(TCOMMAND) 2>&1 | wc -w)
ifeq ($(strip $(HAVE_OPT)),0) ifeq ($(strip $(HAVE_OPT)),0)
TEXTRA += -DCRYPTOPP_ARM_ACLE_HEADER=1 TEXTRA += -DCRYPTOPP_ARM_ACLE_HEADER=1
endif endif

View File

@ -409,8 +409,8 @@ ifeq ($(DETECT_FEATURES),1)
# Clang needs an option to include <arm_neon.h> # Clang needs an option to include <arm_neon.h>
TPROG = TestPrograms/test_arm_neon_header.cpp TPROG = TestPrograms/test_arm_neon_header.cpp
TOPT = $(NEON_FLAG) TOPT = -DCRYPTOPP_ARM_NEON_HEADER=1 $(NEON_FLAG)
HAVE_OPT = $(shell $(CXX) $(TCXXFLAGS) -DCRYPTOPP_ARM_NEON_HEADER=1 $(ZOPT) $(TOPT) $(TPROG) -o $(TOUT) 2>&1 | wc -w) HAVE_OPT = $(shell $(TCOMMAND) 2>&1 | wc -w)
ifeq ($(strip $(HAVE_OPT)),0) ifeq ($(strip $(HAVE_OPT)),0)
TEXTRA += -DCRYPTOPP_ARM_NEON_HEADER=1 TEXTRA += -DCRYPTOPP_ARM_NEON_HEADER=1
endif endif
@ -472,15 +472,15 @@ ifeq ($(DETECT_FEATURES),1)
endif endif
TPROG = TestPrograms/test_arm_neon_header.cpp TPROG = TestPrograms/test_arm_neon_header.cpp
TOPT = TOPT = -DCRYPTOPP_ARM_NEON_HEADER=1
HAVE_OPT = $(shell $(CXX) $(TCXXFLAGS) -DCRYPTOPP_ARM_NEON_HEADER=1 $(ZOPT) $(TOPT) $(TPROG) -o $(TOUT) 2>&1 | wc -w) HAVE_OPT = $(shell $(TCOMMAND) 2>&1 | wc -w)
ifeq ($(strip $(HAVE_OPT)),0) ifeq ($(strip $(HAVE_OPT)),0)
TEXTRA += -DCRYPTOPP_ARM_NEON_HEADER=1 TEXTRA += -DCRYPTOPP_ARM_NEON_HEADER=1
endif endif
TPROG = TestPrograms/test_arm_acle_header.cpp TPROG = TestPrograms/test_arm_acle_header.cpp
TOPT = $(ASIMD_FLAG) TOPT = -DCRYPTOPP_ARM_ACLE_HEADER=1 $(ASIMD_FLAG)
HAVE_OPT = $(shell $(CXX) $(TCXXFLAGS) -DCRYPTOPP_ARM_ACLE_HEADER=1 $(ZOPT) $(TOPT) $(TPROG) -o $(TOUT) 2>&1 | wc -w) HAVE_OPT = $(shell $(TCOMMAND) 2>&1 | wc -w)
ifeq ($(strip $(HAVE_OPT)),0) ifeq ($(strip $(HAVE_OPT)),0)
TEXTRA += -DCRYPTOPP_ARM_ACLE_HEADER=1 TEXTRA += -DCRYPTOPP_ARM_ACLE_HEADER=1
endif endif