diff options
| author | Jeffrey Walton <noloader@gmail.com> | 2019-10-16 21:00:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-16 21:00:45 -0400 |
| commit | 60eedb97ba67956f6ae5a406bd386cc61f304898 (patch) | |
| tree | 99fbb93edcca8e14a19121feafc9ebada9f507f7 /GNUmakefile-cross | |
| parent | 9f6400a6072c9e75f5f288cb81728da72f1fa28d (diff) | |
| download | cryptopp-git-60eedb97ba67956f6ae5a406bd386cc61f304898.tar.gz | |
Fix ARM headers and Android compile (PR #896)
* Test fix ARM headers
This problem has been festering for some time. The header file includes are slightly different than the ISA options. Some platforms need an include, others don't.
* Fix cryptest-android.sh and cryptest-ios.sh
* Fix MSVC ARM32 and ARM64 compile
* Split ARM32 and ARM64 recipes in GNUmakefile
Diffstat (limited to 'GNUmakefile-cross')
| -rwxr-xr-x | GNUmakefile-cross | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/GNUmakefile-cross b/GNUmakefile-cross index 0a9689ee..ba0917ec 100755 --- a/GNUmakefile-cross +++ b/GNUmakefile-cross @@ -371,14 +371,12 @@ endif endif ########################################################### -##### ARM A-32, Aach64 and NEON ##### +##### ARM A-32 and NEON ##### ########################################################### -ifneq ($(IS_ARM32)$(IS_ARMV8),00) +ifneq ($(IS_ARM32),0) ifeq ($(DETECT_FEATURES),1) -ifeq ($(IS_ARM32),1) - # Android needs -c compile flag for NEON. Otherwise there's an odd linker message. ifeq ($(IS_ANDROID),1) NEON_FLAG = -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp -mfpu=neon @@ -411,10 +409,17 @@ ifeq ($(IS_ARM32),1) CXXFLAGS += -DCRYPTOPP_DISABLE_ASM endif +# DETECT_FEATURES +endif # IS_ARM32 endif -ifeq ($(IS_ARMV8),1) +########################################################### +##### Aach32 and Aarch64 ##### +########################################################### + +ifneq ($(IS_ARMV8),0) +ifeq ($(DETECT_FEATURES),1) ifeq ($(IS_IOS),1) ASIMD_FLAG = @@ -434,9 +439,9 @@ ifeq ($(IS_ARMV8),1) TOPT = $(ASIMD_FLAG) HAVE_OPT = $(shell $(CXX) $(TCXXFLAGS) $(ZOPT) $(TOPT) $(TPROG) -o $(TOUT) 2>&1 | tr ' ' '\n' | wc -l) ifeq ($(strip $(HAVE_OPT)),0) - ACLE_FLAG += -DCRYPTOPP_ARM_ACLE_AVAILABLE=1 + ACLE_FLAG += -DCRYPTOPP_ARM_ACLE_HEADER=1 else - CXXFLAGS += -DCRYPTOPP_ARM_ACLE_AVAILABLE=0 + CXXFLAGS += -DCRYPTOPP_ARM_ACLE_HEADER=0 endif TPROG = TestPrograms/test_arm_asimd.cxx @@ -509,13 +514,9 @@ ifeq ($(IS_ARMV8),1) SHA512_FLAG = -march=armv8.4-a+crypto endif -# IS_ARMV8 -endif - # DETECT_FEATURES endif - -# IS_ARM32, IS_ARMV8 +# IS_ARMV8 endif ########################################################### |