aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar liujisi@google.com <liujisi@google.com@630680e5-0e50-0410-840e-4b1c322b438d>2014-02-13 19:03:24 +0000
committerGravatar liujisi@google.com <liujisi@google.com@630680e5-0e50-0410-840e-4b1c322b438d>2014-02-13 19:03:24 +0000
commitf0b6a5cfeb5f6347c34975446bda08e0c20c9902 (patch)
treebb2d996b576bac7de1ae6bf2154b6925cc038c6a /src
parent172019c40bf548908ab09bfd276074c929d48415 (diff)
Add aarch64 architecture to platform_macros.h (patch by Sylvain Defresne)
Both gcc and clang defines the __aarch64__ macro when building for the 64-bit AArch64 execution state of ARMv8 processors, so use this to detect the architecture.
Diffstat (limited to 'src')
-rw-r--r--src/google/protobuf/stubs/platform_macros.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/google/protobuf/stubs/platform_macros.h b/src/google/protobuf/stubs/platform_macros.h
index b1df60e4..8abfd0c7 100644
--- a/src/google/protobuf/stubs/platform_macros.h
+++ b/src/google/protobuf/stubs/platform_macros.h
@@ -49,6 +49,9 @@
#elif defined(__ARMEL__)
#define GOOGLE_PROTOBUF_ARCH_ARM 1
#define GOOGLE_PROTOBUF_ARCH_32_BIT 1
+#elif defined(__aarch64__)
+#define GOOGLE_PROTOBUF_ARCH_AARCH64 1
+#define GOOGLE_PROTOBUF_ARCH_64_BIT 1
#elif defined(__MIPSEL__)
#define GOOGLE_PROTOBUF_ARCH_MIPS 1
#define GOOGLE_PROTOBUF_ARCH_32_BIT 1