arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Test remove -march=native 

Also see "Random crashes on different computers because option -march=native is active 'by default'", https://github.com/weidai11/cryptopp/issues/380
pull/465/head
Jeffrey Walton 2017-08-23 04:37:05 -04:00
parent a77ad75c1e
commit 4fef2951e3
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
2 changed files with 50 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
.appveyor.yml
View File

@ -30,15 +30,27 @@ test_script:
- cmd: >-
msbuild /t:Build /p:platform=%platform%;configuration=%configuration% cryptlib.vcxproj
IF "%BUILD_MODE%"=="CMake" (
msbuild /t:Build /p:platform=%platform%;configuration=%configuration% cryptest.vcxproj
mkdir cmake-build
msbuild /t:CopyCryptestToRoot cryptest.vcxproj
cd cmake-build
cryptest.exe v
cmake ../
cryptest.exe tv all
) else (
msbuild /t:Build /p:platform=%platform%;configuration=%configuration% cryptlib.vcxproj
msbuild /t:Build /p:platform=%platform%;configuration=%configuration% cryptest.vcxproj
msbuild /t:CopyCryptestToRoot cryptest.vcxproj
cryptest.exe v
cryptest.exe tv all
)
notifications:
- provider: Email

39
CMakeLists.txt
View File

@ -75,12 +75,6 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Intel")
add_definitions(-wd68 -wd186 -wd279 -wd327 -wd161 -wd3180)
endif()
# Endianness
TEST_BIG_ENDIAN(IS_BIG_ENDIAN)
if(IS_BIG_ENDIAN)
add_definitions(-DIS_BIG_ENDIAN)
endif()
# Also see http://github.com/weidai11/cryptopp/issues/395
if(DISABLE_ASM)
add_definitions(-DCRYPTOPP_DISABLE_ASM)
@ -305,6 +299,39 @@ if(MSVC AND NOT DISABLE_ASM)
endif()
endif()
#============================================================================
# Architecture flags
#============================================================================
# New as of Pull Request 461, http://github.com/weidai11/cryptopp/pull/461.
# These are hard coded for X86 at the moment. We need to fix them.
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" Or "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
set_source_files_properties(aria-simd.cpp PROPERTIES COMPILE_FLAGS -mssse3)
set_source_files_properties(blake2-simd.cpp PROPERTIES COMPILE_FLAGS -msse4.2)
set_source_files_properties(crc-simd.cpp PROPERTIES COMPILE_FLAGS -msse4.2)
set_source_files_properties(gcm-simd.cpp PROPERTIES COMPILE_FLAGS -mssse3 -mpclmul)
set_source_files_properties(rijndael-simd.cpp PROPERTIES COMPILE_FLAGS -msse4.1 -maes)
set_source_files_properties(sha-simd.cpp PROPERTIES COMPILE_FLAGS -msse4.2 -msha)
set_source_files_properties(shacal2-simd.cpp PROPERTIES COMPILE_FLAGS -msse4.2 -msha)
# ARMv8
# set_source_files_properties(aria-simd.cpp PROPERTIES COMPILE_FLAGS -march=armv8-a)
# set_source_files_properties(blake2-simd.cpp PROPERTIES COMPILE_FLAGS -march=armv8-a)
# set_source_files_properties(crc-simd.cpp PROPERTIES COMPILE_FLAGS -march=armv8-a+crc)
# set_source_files_properties(gcm-simd.cpp PROPERTIES COMPILE_FLAGS -march=armv8-a+crypto)
# set_source_files_properties(neon-simd.cpp PROPERTIES COMPILE_FLAGS -march=armv8-a)
# set_source_files_properties(rijndael-simd.cpp PROPERTIES COMPILE_FLAGS -march=armv8-a+crypto)
# set_source_files_properties(sha-simd.cpp PROPERTIES COMPILE_FLAGS -march=armv8-a+crypto)
# set_source_files_properties(shacal2-simd.cpp PROPERTIES COMPILE_FLAGS -march=armv8-a+crypto)
# ARMv7
# Need to set floating point ABI to something, like "hard". Most Linux use hard floats.
# set_source_files_properties(aria-simd.cpp PROPERTIES COMPILE_FLAGS -march=armv7-a -mfloat-abi=$(FP_ABI) -mfpu=neon)
# set_source_files_properties(blake2-simd.cpp PROPERTIES COMPILE_FLAGS -march=armv7-a -mfloat-abi=$(FP_ABI) -mfpu=neon)
# set_source_files_properties(gcm-simd.cpp PROPERTIES COMPILE_FLAGS -march=armv7-a -mfloat-abi=$(FP_ABI) -mfpu=neon)
# set_source_files_properties(neon-simd.cpp PROPERTIES COMPILE_FLAGS -mfloat-abi=$(FP_ABI) -mfpu=neon)
endif()
#============================================================================
# Compile targets
#============================================================================