factotum/libressl-portable
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

consider masm/mingw assembly flavors from cmake

Browse Source
This commit is contained in:
Brent Cook 2019-01-20 21:18:34 -06:00
parent 3fc51459dd
commit f553a9fe63
2 changed files with 96 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -273,6 +273,10 @@ if(ENABLE_ASM)
endif()
elseif(APPLE AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
set(HOST_ASM_MACOSX_X86_64 true)
elseif(MSVC AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
set(HOST_ASM_MASM_X86_64 true)
elseif(CMAKE_SYSTEM_NAME MATCHES "MINGW" AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
set(HOST_ASM_MINGW64_X86_64 true)
endif()
endif()

93
crypto/CMakeLists.txt
View File

@ -108,7 +108,98 @@ if(HOST_ASM_MACOSX_X86_64)
set_property(SOURCE ${ASM_X86_64_MACOSX_SRC} PROPERTY XCODE_EXPLICIT_FILE_TYPE "sourcecode.asm")
endif()
if((NOT HOST_ASM_ELF_X86_64) AND (NOT HOST_ASM_MACOSX_X86_64))
if(HOST_ASM_MASM_X86_64)
set(
ASM_X86_64_MASM_SRC
aes/aes-masm-x86_64.S
aes/bsaes-masm-x86_64.S
aes/vpaes-masm-x86_64.S
aes/aesni-masm-x86_64.S
aes/aesni-sha1-masm-x86_64.S
#bn/modexp512-masm-x86_64.S
#bn/mont-masm-x86_64.S
#bn/mont5-masm-x86_64.S
#bn/gf2m-masm-x86_64.S
camellia/cmll-masm-x86_64.S
md5/md5-masm-x86_64.S
modes/ghash-masm-x86_64.S
rc4/rc4-masm-x86_64.S
rc4/rc4-md5-masm-x86_64.S
sha/sha1-masm-x86_64.S
sha/sha256-masm-x86_64.S
sha/sha512-masm-x86_64.S
whrlpool/wp-masm-x86_64.S
cpuid-masm-x86_64.S
)
add_definitions(-DAES_ASM)
add_definitions(-DBSAES_ASM)
add_definitions(-DVPAES_ASM)
add_definitions(-DOPENSSL_IA32_SSE2)
#add_definitions(-DOPENSSL_BN_ASM_MONT)
#add_definitions(-DOPENSSL_BN_ASM_MONT5)
#add_definitions(-DOPENSSL_BN_ASM_GF2m)
add_definitions(-DMD5_ASM)
add_definitions(-DGHASH_ASM)
add_definitions(-DRSA_ASM)
add_definitions(-DSHA1_ASM)
add_definitions(-DSHA256_ASM)
add_definitions(-DSHA512_ASM)
add_definitions(-DWHIRLPOOL_ASM)
add_definitions(-DOPENSSL_CPUID_OBJ)
set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MASM_SRC})
set_property(SOURCE ${ASM_X86_64_MASM_SRC} PROPERTY LANGUAGE C)
set_property(SOURCE ${ASM_X86_64_MASM_SRC} PROPERTY XCODE_EXPLICIT_FILE_TYPE "sourcecode.asm")
endif()
if(HOST_ASM_MINGW64_X86_64)
set(
ASM_X86_64_MINGW64_SRC
aes/aes-mingw64-x86_64.S
aes/bsaes-mingw64-x86_64.S
aes/vpaes-mingw64-x86_64.S
aes/aesni-mingw64-x86_64.S
aes/aesni-sha1-mingw64-x86_64.S
#bn/modexp512-mingw64-x86_64.S
#bn/mont-mingw64-x86_64.S
#bn/mont5-mingw64-x86_64.S
#bn/gf2m-mingw64-x86_64.S
camellia/cmll-mingw64-x86_64.S
md5/md5-mingw64-x86_64.S
modes/ghash-mingw64-x86_64.S
rc4/rc4-mingw64-x86_64.S
rc4/rc4-md5-mingw64-x86_64.S
sha/sha1-mingw64-x86_64.S
sha/sha256-mingw64-x86_64.S
sha/sha512-mingw64-x86_64.S
whrlpool/wp-mingw64-x86_64.S
cpuid-mingw64-x86_64.S
)
add_definitions(-DAES_ASM)
add_definitions(-DBSAES_ASM)
add_definitions(-DVPAES_ASM)
add_definitions(-DOPENSSL_IA32_SSE2)
#add_definitions(-DOPENSSL_BN_ASM_MONT)
#add_definitions(-DOPENSSL_BN_ASM_MONT5)
#add_definitions(-DOPENSSL_BN_ASM_GF2m)
add_definitions(-DMD5_ASM)
add_definitions(-DGHASH_ASM)
add_definitions(-DRSA_ASM)
add_definitions(-DSHA1_ASM)
add_definitions(-DSHA256_ASM)
add_definitions(-DSHA512_ASM)
add_definitions(-DWHIRLPOOL_ASM)
add_definitions(-DOPENSSL_CPUID_OBJ)
set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MINGW64_SRC})
set_property(SOURCE ${ASM_X86_64_MINGW64_SRC} PROPERTY LANGUAGE C)
set_property(SOURCE ${ASM_X86_64_MINGW64_SRC} PROPERTY XCODE_EXPLICIT_FILE_TYPE "sourcecode.asm")
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) AND
(NOT HOST_ASM_ELF_ARMV4)
)
set(
CRYPTO_SRC
${CRYPTO_SRC}