summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>2018-02-21 18:57:00 +0100
committerMike Gilbert <floppym@gentoo.org>2018-02-21 15:32:17 -0500
commit34f2b3a8006ca31bcc03364066ec7dcd68d2950e (patch)
tree173da47d3f2ea2988e153a06939c7b7c52cec862 /dev-libs/protobuf/files
parentwww-client/chromium: beta channel bump (65.0.3325.73) (diff)
downloadgentoo-34f2b3a8006ca31bcc03364066ec7dcd68d2950e.tar.gz
gentoo-34f2b3a8006ca31bcc03364066ec7dcd68d2950e.tar.bz2
gentoo-34f2b3a8006ca31bcc03364066ec7dcd68d2950e.zip
dev-libs/protobuf: Fix building on IA64.
Closes: https://bugs.gentoo.org/648248
Diffstat (limited to 'dev-libs/protobuf/files')
-rw-r--r--dev-libs/protobuf/files/protobuf-3.5.0-atomic_operations.patch21
1 files changed, 21 insertions, 0 deletions
diff --git a/dev-libs/protobuf/files/protobuf-3.5.0-atomic_operations.patch b/dev-libs/protobuf/files/protobuf-3.5.0-atomic_operations.patch
new file mode 100644
index 000000000000..7a88e8379500
--- /dev/null
+++ b/dev-libs/protobuf/files/protobuf-3.5.0-atomic_operations.patch
@@ -0,0 +1,21 @@
+https://github.com/google/protobuf/issues/3937
+https://github.com/google/protobuf/pull/3955
+https://github.com/google/protobuf/commit/642e1ac635f2563b4a14c255374f02645ae85dac
+
+--- /src/google/protobuf/stubs/atomicops_internals_generic_gcc.h
++++ /src/google/protobuf/stubs/atomicops_internals_generic_gcc.h
+@@ -146,6 +146,14 @@
+ return __atomic_load_n(ptr, __ATOMIC_RELAXED);
+ }
+
++inline Atomic64 Release_CompareAndSwap(volatile Atomic64* ptr,
++ Atomic64 old_value,
++ Atomic64 new_value) {
++ __atomic_compare_exchange_n(ptr, &old_value, new_value, false,
++ __ATOMIC_RELEASE, __ATOMIC_ACQUIRE);
++ return old_value;
++}
++
+ #endif // defined(__LP64__)
+
+ } // namespace internal