monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-11-17 08:17:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

+crypto for ARMv8 now tests and modifies ${ARCH$

Browse source
This commit is contained in:
NanoAkron 2016-09-18 03:26:18 +01:00
parent fd82635396
commit 7f00a4abf4
1 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
CMakeLists.txt
View file

@ -63,7 +63,7 @@ if (NOT ARCH OR ARCH STREQUAL "" OR ARCH STREQUAL "native" OR ARCH STREQUAL "def
else() else()
set(ARCH_ID "${ARCH}") set(ARCH_ID "${ARCH}")
endif() endif()
#string(TOLOWER ${ARCH_ID} ARM_ID) string(TOLOWER ${ARCH_ID} ARM_ID) #is this used anywhere?
string(SUBSTRING ${ARCH_ID} 0 3 ARM_TEST) string(SUBSTRING ${ARCH_ID} 0 3 ARM_TEST)
if (ARM_TEST STREQUAL "arm") if (ARM_TEST STREQUAL "arm")
set(ARM 1) set(ARM 1)
@ -372,14 +372,6 @@ else()
message(STATUS "AES support enabled") message(STATUS "AES support enabled")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -maes") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -maes")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -maes") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -maes")
<<<<<<< Updated upstream
elseif(ARM6 OR ARM7)
message(STATUS "AES support disabled (not available on ARMv6 or ARMv7)")
elseif(ARM8)
message(STATUS "AES support enabled for ARMv8-A")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=armv8-a+crypto")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=armv8-a+crypto")
=======
elseif(ARM6) elseif(ARM6)
message(STATUS "AES support not available on ARMv6") message(STATUS "AES support not available on ARMv6")
elseif(ARM7) elseif(ARM7)
@ -387,12 +379,11 @@ else()
elseif(ARM8) elseif(ARM8)
CHECK_CXX_ACCEPTS_FLAG("-march=${ARCH}+crypto" ARCH_PLUS_CRYPTO) CHECK_CXX_ACCEPTS_FLAG("-march=${ARCH}+crypto" ARCH_PLUS_CRYPTO)
if(ARCH_PLUS_CRYPTO) if(ARCH_PLUS_CRYPTO)
message(STATUS "Cryptograpy extensions enabled for ARMv8") message(STATUS "Crypto extensions enabled for ARMv8")
set(ARCH_FLAG "-march=${ARCH}+crypto") set(ARCH_FLAG "-march=${ARCH}+crypto")
else() else()
message(STATUS "Cryptograpy extensions unavailable on your ARMv8 device") message(STATUS "Crypto extensions unavailable on your ARMv8 device")
endif() endif()
>>>>>>> Stashed changes
else() else()
message(STATUS "AES support disabled") message(STATUS "AES support disabled")
endif() endif()