From: Android Tools Maintainers <android-tools-devel@lists.alioth.debian.org>
Date: Sat, 18 Jun 2022 17:14:20 +0000 (+0100)
Subject: Add-new-Arch-ia64-riscv64-sh4-x32
X-Git-Tag: archive/raspbian/13_preview2-7+rpi1~1^2^2~3
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=7a7045d99f9b1f915fecf2c4f79d4aeae5f8695b;p=android-platform-external-boringssl.git

Add-new-Arch-ia64-riscv64-sh4-x32


Gbp-Pq: Name 01-Add-new-Arch-ia64-riscv64-sh4-x32.patch
---

diff --git a/src/include/openssl/base.h b/src/include/openssl/base.h
index 983eadc..17c35bd 100644
--- a/src/include/openssl/base.h
+++ b/src/include/openssl/base.h
@@ -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