Add-new-Arch-ia64-riscv64-sh4-x32
authorAndroid Tools Maintainers <android-tools-devel@lists.alioth.debian.org>
Sat, 18 Jun 2022 17:14:20 +0000 (18:14 +0100)
committerRoger Shimizu <rosh@debian.org>
Sat, 18 Jun 2022 17:14:20 +0000 (18:14 +0100)
Gbp-Pq: Name 01-Add-new-Arch-ia64-riscv64-sh4-x32.patch

src/include/openssl/base.h

index 983eadc5d3b47dd915215227958dc8a94d12e382..17c35bd4f5d8a7af1eab3eb6a117a5c963e5f60e 100644 (file)
@@ -84,7 +84,7 @@ extern "C" {
 #endif
 
 
-#if defined(__x86_64) || defined(_M_AMD64) || defined(_M_X64)
+#if (defined(__x86_64) && defined(__LP64__)) || defined(_M_AMD64) || defined(_M_X64)
 #define OPENSSL_64_BIT
 #define OPENSSL_X86_64
 #elif defined(__x86) || defined(__i386) || defined(__i386__) || defined(_M_IX86)
@@ -109,6 +109,13 @@ extern "C" {
 #define OPENSSL_64_BIT
 #elif defined(__riscv) && __SIZEOF_POINTER__ == 4
 #define OPENSSL_32_BIT
+#elif defined(__ia64__)
+#define OPENSSL_64_BIT
+#elif defined(__x86_64__) && defined(__ILP32__) // x32
+#define OPENSSL_32_BIT
+#define OPENSSL_X86_64
+#elif defined(__sh__)
+#define OPENSSL_32_BIT
 #elif defined(__pnacl__)
 #define OPENSSL_32_BIT
 #define OPENSSL_PNACL