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

more masm fixes, but disable for now

Browse Source
This commit is contained in:
Brent Cook 2019-01-21 20:15:30 -06:00
parent 501d61c681
commit 495a1b6316
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -9,7 +9,7 @@ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}" ${CMAKE_MODULE_PATH})
include(cmake_export_symbol) include(cmake_export_symbol)
include(GNUInstallDirs) include(GNUInstallDirs)
project (LibreSSL C) project (LibreSSL C ASM)
enable_testing() enable_testing()
@ -273,7 +273,10 @@ if(ENABLE_ASM)
endif() endif()
elseif(APPLE AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64") elseif(APPLE AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
set(HOST_ASM_MACOSX_X86_64 true) set(HOST_ASM_MACOSX_X86_64 true)
elseif(MSVC AND "${CMAKE_GENERATOR}" MATCHES "Win64") elseif(MSVC AND "${CMAKE_GENERATOR}" MATCHES "Win64" AND FALSE)
# XXX Disabled for now, CMake's MASM support seems to either never
# build supply ASM or build it with the C compiler in a mode where it
# does not parse correctly. It might be easier to get NASM support working.
set(HOST_ASM_MASM_X86_64 true) set(HOST_ASM_MASM_X86_64 true)
ENABLE_LANGUAGE(ASM_MASM) ENABLE_LANGUAGE(ASM_MASM)
elseif(CMAKE_SYSTEM_NAME MATCHES "MINGW" AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64") elseif(CMAKE_SYSTEM_NAME MATCHES "MINGW" AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")

2
crypto/CMakeLists.txt
View File

@ -147,7 +147,7 @@ if(HOST_ASM_MASM_X86_64)
add_definitions(-DWHIRLPOOL_ASM) add_definitions(-DWHIRLPOOL_ASM)
add_definitions(-DOPENSSL_CPUID_OBJ) add_definitions(-DOPENSSL_CPUID_OBJ)
set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MASM_SRC}) set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MASM_SRC})
set_property(SOURCE ${ASM_X86_64_MINGW64_SRC} PROPERTY LANGUAGE C) set_property(SOURCE ${ASM_X86_64_MASM_SRC} PROPERTY LANGUAGE C)
endif() endif()
if(HOST_ASM_MINGW64_X86_64) if(HOST_ASM_MINGW64_X86_64)