From cc08f8eae062d9f92996e7a6ac777b85a4220c87 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Sun, 20 Jan 2019 23:38:22 -0600 Subject: adjust asm exclusions --- crypto/CMakeLists.txt | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'crypto') diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index 4b64c68..a81d329 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt @@ -19,8 +19,8 @@ if(HOST_ASM_ELF_ARMV4) add_definitions(-DSHA256_ASM) add_definitions(-DSHA512_ASM) add_definitions(-DOPENSSL_CPUID_OBJ) - set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_ARMV4_ELF_SRC}) set_property(SOURCE ${ASM_ARMV4_ELF_SRC} PROPERTY LANGUAGE C) + set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_ARMV4_ELF_SRC}) endif() if(HOST_ASM_ELF_X86_64) @@ -196,13 +196,22 @@ if((NOT HOST_ASM_ELF_X86_64) AND (NOT HOST_ASM_MACOSX_X86_64) AND (NOT HOST_ASM_MASM_X86_64) AND (NOT HOST_ASM_MINGW64_X86_64) AND - (NOT HOST_ASM_ELF_ARMV4) -) + (NOT HOST_ASM_ELF_ARMV4)) set( CRYPTO_SRC ${CRYPTO_SRC} - aes/aes_cbc.c aes/aes_core.c + ) +endif() + +if((NOT HOST_ASM_ELF_X86_64) AND + (NOT HOST_ASM_MACOSX_X86_64) AND + (NOT HOST_ASM_MASM_X86_64) AND + (NOT HOST_ASM_MINGW64_X86_64)) + set( + CRYPTO_SRC + ${CRYPTO_SRC} + aes/aes_cbc.c camellia/camellia.c camellia/cmll_cbc.c rc4/rc4_enc.c -- cgit v1.2.3-55-g6feb