diff options
| author | Per Sandström <per.j.sandstrom@gmail.com> | 2017-02-11 13:13:48 +0100 |
|---|---|---|
| committer | Per Sandström <per.j.sandstrom@gmail.com> | 2017-02-11 13:13:48 +0100 |
| commit | adc196457585ff6d4f1e515e70b8bac53f287623 (patch) | |
| tree | d31a33720f6d4b422fce611f9e13fa0ba5bc320c /libs/protobuf/patches | |
| parent | c42ecd05a1c91070bc86b4d8254972562b6e0c67 (diff) | |
Protobuf: Upgrade to version 3.1
Signed-off-by: Per Sandström <per.j.sandstrom@gmail.com>
Diffstat (limited to 'libs/protobuf/patches')
| -rw-r--r-- | libs/protobuf/patches/001-mipseb-compile.patch | 11 | ||||
| -rw-r--r-- | libs/protobuf/patches/003-mips2andHigher-compile.patch | 11 |
2 files changed, 0 insertions, 22 deletions
diff --git a/libs/protobuf/patches/001-mipseb-compile.patch b/libs/protobuf/patches/001-mipseb-compile.patch deleted file mode 100644 index f57683396..000000000 --- a/libs/protobuf/patches/001-mipseb-compile.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- - 2015-05-19 16:27:29.770936016 +0200 -+++ protobuf-2.6.1/src/google/protobuf/stubs/platform_macros.h 2015-05-19 13:49:52.115444643 +0200 -@@ -55,7 +55,7 @@ - #elif defined(__aarch64__) - #define GOOGLE_PROTOBUF_ARCH_AARCH64 1 - #define GOOGLE_PROTOBUF_ARCH_64_BIT 1 --#elif defined(__MIPSEL__) -+#elif defined(__MIPSEL__) || defined(__MIPSEB__) - #if defined(__LP64__) - #define GOOGLE_PROTOBUF_ARCH_MIPS64 1 - #define GOOGLE_PROTOBUF_ARCH_64_BIT 1 diff --git a/libs/protobuf/patches/003-mips2andHigher-compile.patch b/libs/protobuf/patches/003-mips2andHigher-compile.patch deleted file mode 100644 index df9792894..000000000 --- a/libs/protobuf/patches/003-mips2andHigher-compile.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- - 2015-05-19 16:29:09.614344473 +0200 -+++ protobuf-2.6.1/src/google/protobuf/stubs/atomicops_internals_mips_gcc.h 2015-05-19 13:49:52.127442746 +0200 -@@ -150,7 +150,7 @@ - } - - inline void MemoryBarrier() { -- __asm__ __volatile__("sync" : : : "memory"); -+ __asm__ __volatile__(".set mips2; sync; .set mips0" : : : "memory"); - } - - inline void Acquire_Store(volatile Atomic32* ptr, Atomic32 value) { |