Skip to content

P
protobuf
Commit 4d8c2f94 authored by liujisi@google.com's avatar liujisi@google.com
Browse files
Options

Add arm_qnx atomic ops support and add missing header files in Makefile.am

parent 98080e85
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 0 deletions
src/Makefile.am
View file @ 4d8c2f94
...@@ -40,9 +40,11 @@ MAINTAINERCLEANFILES = \ ...@@ -40,9 +40,11 @@ MAINTAINERCLEANFILES = \
nobase_include_HEADERS = \ nobase_include_HEADERS = \
google/protobuf/stubs/atomicops.h \ google/protobuf/stubs/atomicops.h \
google/protobuf/stubs/atomicops_internals_arm_gcc.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_atomicword_compat.h \
google/protobuf/stubs/atomicops_internals_macosx.h \ google/protobuf/stubs/atomicops_internals_macosx.h \
google/protobuf/stubs/atomicops_internals_mips_gcc.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_gcc.h \
google/protobuf/stubs/atomicops_internals_x86_msvc.h \ google/protobuf/stubs/atomicops_internals_x86_msvc.h \
google/protobuf/stubs/common.h \ google/protobuf/stubs/common.h \
......
src/google/protobuf/stubs/atomicops.h
View file @ 4d8c2f94
...@@ -178,6 +178,8 @@ GOOGLE_PROTOBUF_ATOMICOPS_ERROR ...@@ -178,6 +178,8 @@ GOOGLE_PROTOBUF_ATOMICOPS_ERROR
#include <google/protobuf/stubs/atomicops_internals_x86_gcc.h> #include <google/protobuf/stubs/atomicops_internals_x86_gcc.h>
#elif defined(GOOGLE_PROTOBUF_ARCH_ARM) #elif defined(GOOGLE_PROTOBUF_ARCH_ARM)
#include <google/protobuf/stubs/atomicops_internals_arm_gcc.h> #include <google/protobuf/stubs/atomicops_internals_arm_gcc.h>
#elif defined(GOOGLE_PROTOBUF_ARCH_ARM_QNX)
#include <google/protobuf/stubs/atomicops_internals_arm_qnx.h>
#elif defined(GOOGLE_PROTOBUF_ARCH_MIPS) #elif defined(GOOGLE_PROTOBUF_ARCH_MIPS)
#include <google/protobuf/stubs/atomicops_internals_mips_gcc.h> #include <google/protobuf/stubs/atomicops_internals_mips_gcc.h>
#elif defined(__pnacl__) #elif defined(__pnacl__)
......
src/google/protobuf/stubs/platform_macros.h
View file @ 4d8c2f94
...@@ -43,6 +43,9 @@ ...@@ -43,6 +43,9 @@
#elif defined(_M_IX86) || defined(__i386__) #elif defined(_M_IX86) || defined(__i386__)
#define GOOGLE_PROTOBUF_ARCH_IA32 1 #define GOOGLE_PROTOBUF_ARCH_IA32 1
#define GOOGLE_PROTOBUF_ARCH_32_BIT 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__) #elif defined(__ARMEL__)
#define GOOGLE_PROTOBUF_ARCH_ARM 1 #define GOOGLE_PROTOBUF_ARCH_ARM 1
#define GOOGLE_PROTOBUF_ARCH_32_BIT 1 #define GOOGLE_PROTOBUF_ARCH_32_BIT 1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment