diff options
| author | Guillaume Déflache <guillaume.deflache@ibwag.com> | 2015-05-19 17:26:17 +0200 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2015-05-21 14:41:23 +0200 |
| commit | 869bab445d95249b090ee196269231427876c01a (patch) | |
| tree | 6e60d7c6079a11552c7205b77cf63ff3fe3c39fe /libs/protobuf/patches | |
| parent | 22b220bc774b3b2c789bcfb5fe93a6fae913e2af (diff) | |
protobuf: Update version to 2.6.1
- Unbroke MIPS support which got entirely lost since the upgrade from 2.4.1:
now all ISAs should work (MIPS1 would need kernel emulation though, untested)
- Fixed host installation which was broken on all targets
- Updated source origin to github and related variables
- Kept mipseb patch exception and MIPS16:=0 exclusion (needed for BB and CC compilation)
Only tested on a ZyXEL NBG6716 router which is MIPS32 (MIPS74Kc), ar71xx target.
Signed-off-by: Guillaume Déflache <guillaume.deflache@ibwag.com>
Diffstat (limited to 'libs/protobuf/patches')
| -rw-r--r-- | libs/protobuf/patches/001-mipseb-compile.patch | 18 | ||||
| -rw-r--r-- | libs/protobuf/patches/003-mips2andHigher-compile.patch | 11 |
2 files changed, 20 insertions, 9 deletions
diff --git a/libs/protobuf/patches/001-mipseb-compile.patch b/libs/protobuf/patches/001-mipseb-compile.patch index 6eb059000..f57683396 100644 --- a/libs/protobuf/patches/001-mipseb-compile.patch +++ b/libs/protobuf/patches/001-mipseb-compile.patch @@ -1,11 +1,11 @@ ---- a/src/google/protobuf/stubs/platform_macros.h -+++ b/src/google/protobuf/stubs/platform_macros.h -@@ -49,7 +49,7 @@ - #elif defined(__ARMEL__) - #define GOOGLE_PROTOBUF_ARCH_ARM 1 - #define GOOGLE_PROTOBUF_ARCH_32_BIT 1 +--- - 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__) - #define GOOGLE_PROTOBUF_ARCH_MIPS 1 - #define GOOGLE_PROTOBUF_ARCH_32_BIT 1 - #elif defined(__pnacl__) + #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 new file mode 100644 index 000000000..df9792894 --- /dev/null +++ b/libs/protobuf/patches/003-mips2andHigher-compile.patch @@ -0,0 +1,11 @@ +--- - 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) { |