diff options
| author | Doug Kwan <dougkwan@google.com> | 2015-11-03 14:49:42 -0800 |
|---|---|---|
| committer | Doug Kwan <dougkwan@google.com> | 2015-11-03 14:49:42 -0800 |
| commit | 2a50e67c7879dd590d4727fb3130987127c65a45 (patch) | |
| tree | 96902679f219fc34d1dbfe72c44c830e1b551c68 /src/google | |
| parent | aa3675415ec8da317793a3e151e44daaebc21ff8 (diff) | |
| download | protobuf-2a50e67c7879dd590d4727fb3130987127c65a45.tar.gz protobuf-2a50e67c7879dd590d4727fb3130987127c65a45.tar.bz2 protobuf-2a50e67c7879dd590d4727fb3130987127c65a45.zip | |
Add support for POWER Linux
Diffstat (limited to 'src/google')
| -rw-r--r-- | src/google/protobuf/stubs/atomicops.h | 4 | ||||
| -rw-r--r-- | src/google/protobuf/stubs/atomicops_internals_power.h (renamed from src/google/protobuf/stubs/atomicops_internals_aix.h) | 0 | ||||
| -rw-r--r-- | src/google/protobuf/stubs/platform_macros.h | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/google/protobuf/stubs/atomicops.h b/src/google/protobuf/stubs/atomicops.h index 5fa31b0a..31e2b782 100644 --- a/src/google/protobuf/stubs/atomicops.h +++ b/src/google/protobuf/stubs/atomicops.h @@ -192,7 +192,7 @@ Atomic64 Release_Load(volatile const Atomic64* ptr); // AIX #elif defined(GOOGLE_PROTOBUF_OS_AIX) -#include <google/protobuf/stubs/atomicops_internals_aix.h> +#include <google/protobuf/stubs/atomicops_internals_power.h> // Apple. #elif defined(GOOGLE_PROTOBUF_OS_APPLE) @@ -210,6 +210,8 @@ Atomic64 Release_Load(volatile const Atomic64* ptr); #include <google/protobuf/stubs/atomicops_internals_arm_qnx.h> #elif defined(GOOGLE_PROTOBUF_ARCH_MIPS) || defined(GOOGLE_PROTOBUF_ARCH_MIPS64) #include <google/protobuf/stubs/atomicops_internals_mips_gcc.h> +#elif defined(GOOGLE_PROTOBUF_ARCH_POWER) +#include <google/protobuf/stubs/atomicops_internals_power.h> #elif defined(__native_client__) #include <google/protobuf/stubs/atomicops_internals_pnacl.h> #elif (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7)) || (__GNUC__ > 4)) diff --git a/src/google/protobuf/stubs/atomicops_internals_aix.h b/src/google/protobuf/stubs/atomicops_internals_power.h index b8a42f21..b8a42f21 100644 --- a/src/google/protobuf/stubs/atomicops_internals_aix.h +++ b/src/google/protobuf/stubs/atomicops_internals_power.h diff --git a/src/google/protobuf/stubs/platform_macros.h b/src/google/protobuf/stubs/platform_macros.h index 9e0344d8..338d22f0 100644 --- a/src/google/protobuf/stubs/platform_macros.h +++ b/src/google/protobuf/stubs/platform_macros.h @@ -70,7 +70,7 @@ #else #define GOOGLE_PROTOBUF_ARCH_32_BIT 1 #endif -#elif defined(_POWER) +#elif defined(_POWER) || defined(__powerpc64__) || defined(__PPC64__) #define GOOGLE_PROTOBUF_ARCH_POWER 1 #define GOOGLE_PROTOBUF_ARCH_64_BIT 1 #elif defined(__GNUC__) |