From 4d8c2f94fbdc1ef92acd2fc01d1f61e3ef440875 Mon Sep 17 00:00:00 2001 From: "liujisi@google.com" Date: Thu, 10 Jan 2013 21:24:56 +0000 Subject: [PATCH] Add arm_qnx atomic ops support and add missing header files in Makefile.am --- src/Makefile.am | 2 ++ src/google/protobuf/stubs/atomicops.h | 2 ++ src/google/protobuf/stubs/platform_macros.h | 3 +++ 3 files changed, 7 insertions(+) diff --git a/src/Makefile.am b/src/Makefile.am index f61bfd3f1a..a3760b4dd5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -40,9 +40,11 @@ MAINTAINERCLEANFILES = \ nobase_include_HEADERS = \ google/protobuf/stubs/atomicops.h \ google/protobuf/stubs/atomicops_internals_arm_gcc.h \ + google/protobuf/stubs/atomicops_internals_arm_qnx.h \ google/protobuf/stubs/atomicops_internals_atomicword_compat.h \ google/protobuf/stubs/atomicops_internals_macosx.h \ google/protobuf/stubs/atomicops_internals_mips_gcc.h \ + google/protobuf/stubs/atomicops_internals_pnal.h \ google/protobuf/stubs/atomicops_internals_x86_gcc.h \ google/protobuf/stubs/atomicops_internals_x86_msvc.h \ google/protobuf/stubs/common.h \ diff --git a/src/google/protobuf/stubs/atomicops.h b/src/google/protobuf/stubs/atomicops.h index 988007134e..b8581fa27b 100644 --- a/src/google/protobuf/stubs/atomicops.h +++ b/src/google/protobuf/stubs/atomicops.h @@ -178,6 +178,8 @@ GOOGLE_PROTOBUF_ATOMICOPS_ERROR #include #elif defined(GOOGLE_PROTOBUF_ARCH_ARM) #include +#elif defined(GOOGLE_PROTOBUF_ARCH_ARM_QNX) +#include #elif defined(GOOGLE_PROTOBUF_ARCH_MIPS) #include #elif defined(__pnacl__) diff --git a/src/google/protobuf/stubs/platform_macros.h b/src/google/protobuf/stubs/platform_macros.h index b9c3760fa0..b1df60e467 100644 --- a/src/google/protobuf/stubs/platform_macros.h +++ b/src/google/protobuf/stubs/platform_macros.h @@ -43,6 +43,9 @@ #elif defined(_M_IX86) || defined(__i386__) #define GOOGLE_PROTOBUF_ARCH_IA32 1 #define GOOGLE_PROTOBUF_ARCH_32_BIT 1 +#elif defined(__QNX__) +#define GOOGLE_PROTOBUF_ARCH_ARM_QNX 1 +#define GOOGLE_PROTOBUF_ARCH_32_BIT 1 #elif defined(__ARMEL__) #define GOOGLE_PROTOBUF_ARCH_ARM 1 #define GOOGLE_PROTOBUF_ARCH_32_BIT 1