summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAdam Langley <agl@google.com>2015-03-12 16:08:13 -0700
committerAdam Langley <agl@google.com>2015-03-16 12:46:42 -0700
commit1ba8594f0bbcc6e06b1acc121f74fe806bb21edb (patch)
tree216c751b3f9b6657b736fa1f3e509129a36876df /src
parenta4fb56a4374ac52a0b1c23e3654d4426c2e4adb3 (diff)
downloadexternal_boringssl-1ba8594f0bbcc6e06b1acc121f74fe806bb21edb.zip
external_boringssl-1ba8594f0bbcc6e06b1acc121f74fe806bb21edb.tar.gz
external_boringssl-1ba8594f0bbcc6e06b1acc121f74fe806bb21edb.tar.bz2
Support MIPS64.
MIPS64 confusingly sets __mips__, but it's not a 32-bit platform. This change updates the defines in base.h to recognise MIPS64 based on both __mips__ and __LP64__ being defined. BUG: 19665578 Change-Id: I6290b6def9f999a01b500c918d1488a22fd57460
Diffstat (limited to 'src')
-rw-r--r--src/include/openssl/base.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/include/openssl/base.h b/src/include/openssl/base.h
index 71223a0..d73f269 100644
--- a/src/include/openssl/base.h
+++ b/src/include/openssl/base.h
@@ -82,9 +82,12 @@ extern "C" {
#elif defined(__aarch64__)
#define OPENSSL_64_BIT
#define OPENSSL_AARCH64
-#elif defined(__mips__)
+#elif defined(__mips__) && !defined(__LP64__)
#define OPENSSL_32_BIT
#define OPENSSL_MIPS
+#elif defined(__mips__) && defined(__LP64__)
+#define OPENSSL_64_BIT
+#define OPENSSL_MIPS64
#elif defined(__pnacl__)
#define OPENSSL_32_BIT
#define OPENSSL_PNACL