From 8cd9840859ed1128f266f6853c3caa9cb8ada8b0 Mon Sep 17 00:00:00 2001 From: "Tuan M. Hoang" Date: Tue, 1 May 2018 00:13:10 -0500 Subject: [PATCH] disable AES on s390x architecture rebased by moneromooo --- CMakeLists.txt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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)