Add support for s390x architecture.

Signed-off-by: Piotr Sikora <piotr@aviatrix.com>
PiotrSikora · Feb 5, 2024 · f98712b · f98712b
1 parent 56def5a
commit f98712b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -764,6 +764,8 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "powerpc64le|ppc64le")
   set(ARCH "ppc64le")
 elseif (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "riscv64")
   set(ARCH "riscv64")
+elseif (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "s390x")
+  set(ARCH "s390x")
 elseif (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "loongarch64")
   set(ARCH "loongarch64")
 else()

diff --git a/crypto/fipsmodule/rand/getrandom_fillin.h b/crypto/fipsmodule/rand/getrandom_fillin.h
@@ -34,6 +34,8 @@
 #define EXPECTED_NR_getrandom 359
 #elif defined(OPENSSL_RISCV64)
 #define EXPECTED_NR_getrandom 278
+#elif defined(OPENSSL_S390X)
+#define EXPECTED_NR_getrandom 349
 #elif defined(OPENSSL_LOONGARCH64)
 #define EXPECTED_NR_getrandom 278
 #endif

diff --git a/include/openssl/target.h b/include/openssl/target.h
@@ -45,6 +45,10 @@
 #define OPENSSL_32_BIT
 #define OPENSSL_PPC32BE
 #define OPENSSL_BIG_ENDIAN
+#elif defined(__s390x__)
+#define OPENSSL_64_BIT
+#define OPENSSL_S390X
+#define OPENSSL_BIG_ENDIAN
 #elif defined(__MIPSEL__) && !defined(__LP64__)
 #define OPENSSL_32_BIT
 #define OPENSSL_MIPS