diff options
| author | Jeffrey Walton <noloader@gmail.com> | 2021-03-09 15:06:19 -0500 |
|---|---|---|
| committer | Jeffrey Walton <noloader@gmail.com> | 2021-03-09 15:06:19 -0500 |
| commit | 95f0d9d3962bfc9046c1fd99d4c724b77d9a3ab4 (patch) | |
| tree | 53b953696273e9b1579c7cadfb610a7ae629740e | |
| parent | dc28413a044622bdd6ab79f5fd04aebf2a38dcb6 (diff) | |
| download | cryptopp-git-95f0d9d3962bfc9046c1fd99d4c724b77d9a3ab4.tar.gz | |
Fix Apple M1 failed compile after GH #1015
| -rw-r--r-- | GNUmakefile | 3 | ||||
| -rw-r--r-- | GNUmakefile-cross | 3 | ||||
| -rw-r--r-- | rijndael_simd.cpp | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/GNUmakefile b/GNUmakefile index edf3541c..46e5f10c 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -159,6 +159,9 @@ ifneq ($(IS_DARWIN),0) ARFLAGS = -static -o endif +# Uncomment for debugging +# $(info Here's what we found... IS_X86: $(IS_X86), IS_X64: $(IS_X64), IS_ARM32: $(IS_ARM32), IS_ARMV8: $(IS_ARMV8)) + ########################################################### ##### General Variables ##### ########################################################### diff --git a/GNUmakefile-cross b/GNUmakefile-cross index cec4dfc1..bdb4ec71 100644 --- a/GNUmakefile-cross +++ b/GNUmakefile-cross @@ -159,7 +159,8 @@ IS_X32 := 0 IS_PPC32 := 0 IS_PPC64 := 0 -$(info Here's what we found... IS_X86: $(IS_X86), IS_X64: $(IS_X64), IS_ARM32: $(IS_ARM32), IS_ARMV8: $(IS_ARMV8)) +# Uncomment for debugging +# $(info Here's what we found... IS_X86: $(IS_X86), IS_X64: $(IS_X64), IS_ARM32: $(IS_ARM32), IS_ARMV8: $(IS_ARMV8)) ########################################################### ##### Test Program ##### diff --git a/rijndael_simd.cpp b/rijndael_simd.cpp index 90dee994..916c7f4d 100644 --- a/rijndael_simd.cpp +++ b/rijndael_simd.cpp @@ -33,11 +33,11 @@ // Android makes <arm_acle.h> available with ARMv7-a
#if (CRYPTOPP_BOOL_ARMV8)
+# include "adv_simd.h"
# if (CRYPTOPP_ARM_NEON_HEADER)
# include <arm_neon.h>
# endif
# if (CRYPTOPP_ARM_ACLE_HEADER)
-# include "adv_simd.h"
# include <stdint.h>
# include <arm_acle.h>
# endif
|