Merge from Chromium at DEPS revision 251904
This commit was generated by merge_to_master.py.
Change-Id: I1f9543259d7d2a57d81aa41a1b84f85837439d21
diff --git a/build/build_config.h b/build/build_config.h
index 143cf3e..2a4837b 100644
--- a/build/build_config.h
+++ b/build/build_config.h
@@ -50,6 +50,8 @@
#elif defined(__sun)
#define OS_SOLARIS 1
#define TOOLKIT_GTK
+#elif defined(__QNXNTO__)
+#define OS_QNX 1
#else
#error Please add support for your platform in build/build_config.h
#endif
@@ -68,7 +70,7 @@
// more specific macro.
#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_FREEBSD) || \
defined(OS_OPENBSD) || defined(OS_SOLARIS) || defined(OS_ANDROID) || \
- defined(OS_NACL)
+ defined(OS_NACL) || defined(OS_QNX)
#define OS_POSIX 1
#endif
@@ -106,6 +108,11 @@
#define ARCH_CPU_ARMEL 1
#define ARCH_CPU_32_BITS 1
#define ARCH_CPU_LITTLE_ENDIAN 1
+#elif defined(__arm64__)
+#define ARCH_CPU_ARM_FAMILY 1
+#define ARCH_CPU_ARM64 1
+#define ARCH_CPU_64_BITS 1
+#define ARCH_CPU_LITTLE_ENDIAN 1
#elif defined(__pnacl__)
#define ARCH_CPU_32_BITS 1
#define ARCH_CPU_LITTLE_ENDIAN 1