diff options
| author | Jussi Kivilinna <jussi.kivilinna@iki.fi> | 2014-05-12 20:11:33 +0300 |
|---|---|---|
| committer | Jussi Kivilinna <jussi.kivilinna@iki.fi> | 2014-05-12 20:32:41 +0300 |
| commit | a3062db748f272e0f7346e1ed9e0bf7ed61a4eae (patch) | |
| tree | e1a8ff1c8a6e972ddd252c6e4742fec951a9a06a /cipher | |
| parent | a7d9eeeba632b7eb4a5b15ff17f6565181642f3c (diff) | |
| download | libgcrypt-a3062db748f272e0f7346e1ed9e0bf7ed61a4eae.tar.gz | |
chacha20/AVX2: check for ENABLE_AVX2_SUPPORT instead of HAVE_GCC_INLINE_ASM_AVX2
* cipher/chacha20.c (USE_AVX2): Enable depending on
ENABLE_AVX2_SUPPORT, not HAVE_GCC_INLINE_ASM_AVX2.
* cipher/chacha20-avx2-amd64.S: Ditto.
--
Signed-off-by: Jussi Kivilinna <jussi.kivilinna@iki.fi>
Diffstat (limited to 'cipher')
| -rw-r--r-- | cipher/chacha20-avx2-amd64.S | 2 | ||||
| -rw-r--r-- | cipher/chacha20.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cipher/chacha20-avx2-amd64.S b/cipher/chacha20-avx2-amd64.S index c50a0c04..0c5f3f9e 100644 --- a/cipher/chacha20-avx2-amd64.S +++ b/cipher/chacha20-avx2-amd64.S @@ -27,7 +27,7 @@ #include <config.h> #if defined(HAVE_COMPATIBLE_GCC_AMD64_PLATFORM_AS) && \ - defined(HAVE_GCC_INLINE_ASM_AVX2) && USE_CHACHA20 + defined(ENABLE_AVX2_SUPPORT) && USE_CHACHA20 #ifdef __PIC__ # define RIP (%rip) diff --git a/cipher/chacha20.c b/cipher/chacha20.c index 2ac5a32a..e2cf4420 100644 --- a/cipher/chacha20.c +++ b/cipher/chacha20.c @@ -57,7 +57,7 @@ /* USE_AVX2 indicates whether to compile with Intel AVX2 code. */ #undef USE_AVX2 #if defined(__x86_64__) && defined(HAVE_COMPATIBLE_GCC_AMD64_PLATFORM_AS) && \ - defined(HAVE_GCC_INLINE_ASM_AVX2) + defined(ENABLE_AVX2_SUPPORT) # define USE_AVX2 1 #endif |