Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
P
protobuf
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
protobuf
Commits
0cf6198c
Commit
0cf6198c
authored
Nov 03, 2015
by
Feng Xiao
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #939 from dougkwan/master
Add support for POWER Linux
parents
aa367541
2a50e67c
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
7 additions
and
5 deletions
+7
-5
LICENSE
LICENSE
+1
-1
extract_includes.bat.in
cmake/extract_includes.bat.in
+1
-1
Makefile.am
src/Makefile.am
+1
-1
atomicops.h
src/google/protobuf/stubs/atomicops.h
+3
-1
atomicops_internals_power.h
src/google/protobuf/stubs/atomicops_internals_power.h
+0
-0
platform_macros.h
src/google/protobuf/stubs/platform_macros.h
+1
-1
No files found.
LICENSE
View file @
0cf6198c
...
...
@@ -5,7 +5,7 @@ This license applies to all parts of Protocol Buffers except the following:
This file is copyrighted by Red Hat Inc.
- Atomicops support for AIX/POWER, located in
src/google/protobuf/stubs/atomicops_internals_
aix
.h.
src/google/protobuf/stubs/atomicops_internals_
power
.h.
This file is copyrighted by Bloomberg Finance LP.
Copyright 2014, Google Inc. All rights reserved.
...
...
cmake/extract_includes.bat.in
View file @
0cf6198c
...
...
@@ -72,7 +72,7 @@ copy ${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\source_context.pb.h in
copy ${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\struct.pb.h include\google\protobuf\struct.pb.h
copy ${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\atomic_sequence_num.h include\google\protobuf\stubs\atomic_sequence_num.h
copy ${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\atomicops.h include\google\protobuf\stubs\atomicops.h
copy ${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\atomicops_internals_
aix.h include\google\protobuf\stubs\atomicops_internals_aix
.h
copy ${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\atomicops_internals_
power.h include\google\protobuf\stubs\atomicops_internals_power
.h
copy ${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\atomicops_internals_arm64_gcc.h include\google\protobuf\stubs\atomicops_internals_arm64_gcc.h
copy ${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\atomicops_internals_arm_gcc.h include\google\protobuf\stubs\atomicops_internals_arm_gcc.h
copy ${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\atomicops_internals_arm_qnx.h include\google\protobuf\stubs\atomicops_internals_arm_qnx.h
...
...
src/Makefile.am
View file @
0cf6198c
...
...
@@ -58,7 +58,7 @@ MAINTAINERCLEANFILES = \
nobase_include_HEADERS
=
\
google/protobuf/stubs/atomic_sequence_num.h
\
google/protobuf/stubs/atomicops.h
\
google/protobuf/stubs/atomicops_internals_
aix.h
\
google/protobuf/stubs/atomicops_internals_
power.h
\
google/protobuf/stubs/atomicops_internals_arm64_gcc.h
\
google/protobuf/stubs/atomicops_internals_arm_gcc.h
\
google/protobuf/stubs/atomicops_internals_arm_qnx.h
\
...
...
src/google/protobuf/stubs/atomicops.h
View file @
0cf6198c
...
...
@@ -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))
...
...
src/google/protobuf/stubs/atomicops_internals_
aix
.h
→
src/google/protobuf/stubs/atomicops_internals_
power
.h
View file @
0cf6198c
File moved
src/google/protobuf/stubs/platform_macros.h
View file @
0cf6198c
...
...
@@ -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__)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment