oxen-io/oxen-core
2
1
Fork 0
mirror of https://github.com/oxen-io/oxen-core.git synced 2023-12-14 02:22:56 +01:00
Code Issues Projects Releases Wiki Activity

Set -maes in CMake rather than source file

Browse source 
clang needs this as well, and while it can do it with pragmas, it's more
complicated and easier to just change the compilation flags for the
source file.
This commit is contained in:
Jason Rhinelander 2020-10-14 13:23:50 -03:00
parent 4788f40344
commit f9a257c862
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/crypto/CMakeLists.txt
View file

@ -63,6 +63,21 @@ target_link_libraries(cncrypto
PRIVATE
extra)
if (CMAKE_CXX_COMPILER_ID MATCHES Clang OR CMAKE_CXX_COMPILER_ID STREQUAL GNU)
# If we're compiling for x86/amd64 then we need to force on -maes -msse2 for the hard intel code:
# it has a run-time check to not actually call it if not supported by the running CPU.
# Unfortunately CMake sucks for actually reliably giving us the target architecture, so we'll just
# try to compile with these flags if the compiler accepts them.
include(CheckCXXCompilerFlag)
check_cxx_compiler_flag(-msse2 COMPILER_SUPPORTS_SSE2)
if(COMPILER_SUPPORTS_SSE2)
check_cxx_compiler_flag(-maes COMPILER_SUPPORTS_AES)
if(COMPILER_SUPPORTS_AES)
set_source_files_properties(cn_heavy_hash_hard_intel.cpp PROPERTIES COMPILE_FLAGS "-maes -msse2")
endif()
endif()
endif()
# Because of the way Qt works on android with JNI, the code does not live in the main android thread
# So this code runs with a 1 MB default stack size.
# This will force the use of the heap for the allocation of the scratchpad

4
src/crypto/cn_heavy_hash_hard_intel.cpp
View file

@ -32,10 +32,6 @@
#if defined(__x86_64__) || defined(__i386__) || defined(_M_X86) || defined(_M_X64)
#ifdef __GNUC__
# ifndef __clang__
// Force on aes support; we do a cpuid check at runtime before it actually gets invoked.
# pragma GCC target ("aes,sse2")
# endif
# include <x86intrin.h>
#endif