aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTuan M. Hoang <tmhoang@flatglobe.org>2018-05-01 00:13:10 -0500
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2018-09-18 11:02:06 +0000
commit8cd9840859ed1128f266f6853c3caa9cb8ada8b0 (patch)
tree35f18d22d9de7a6f6dfbb0a4cc366f8b75206431
parentwallet: implement coin splitting for sweep_* 'outputs' option (diff)
downloadmonero-8cd9840859ed1128f266f6853c3caa9cb8ada8b0.tar.xz
disable AES on s390x architecture
rebased by moneromooo
-rw-r--r--CMakeLists.txt8
1 files changed, 7 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5e47edcca..545acfee5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -154,6 +154,10 @@ if(ARCH_ID STREQUAL "powerpc")
set(PPC 1)
endif()
+if(ARCH_ID STREQUAL "s390x")
+ set(S390X 1)
+endif()
+
if(WIN32 OR ARM OR PPC64LE OR PPC64 OR PPC)
set(OPT_FLAGS_RELEASE "-O2")
else()
@@ -626,12 +630,14 @@ else()
message(STATUS "AES support explicitly disabled")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DNO_AES")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNO_AES")
- elseif(NOT ARM AND NOT PPC64LE AND NOT PPC64 AND NOT PPC)
+ elseif(NOT ARM AND NOT PPC64LE AND NOT PPC64 AND NOT PPC AND NOT S390X)
message(STATUS "AES support enabled")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -maes")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -maes")
elseif(PPC64LE OR PPC64 OR PPC)
message(STATUS "AES support not available on POWER")
+ elseif(S390X)
+ message(STATUS "AES support not available on s390x")
elseif(ARM6)
message(STATUS "AES support not available on ARMv6")
elseif(ARM7)