Protobuf: Upgrade to version 3.1

Signed-off-by: Per Sandström <per.j.sandstrom@gmail.com>
This commit is contained in:
Per Sandström
2017-02-11 13:13:48 +01:00
parent c42ecd05a1
commit adc1964575
3 changed files with 5 additions and 27 deletions
@@ -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
@@ -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) {