View | Details | Raw Unified | Return to bug 197167
Collapse All | Expand All

(-)Makefile (-1 / +1 lines)
Lines 15-21 LICENSE= BSD3CLAUSE Link Here
15
CFLAGS+=	-DGOOGLE_PROTOBUF_NO_RTTI
15
CFLAGS+=	-DGOOGLE_PROTOBUF_NO_RTTI
16
GNU_CONFIGURE=	yes
16
GNU_CONFIGURE=	yes
17
INSTALL_TARGET=	install-strip
17
INSTALL_TARGET=	install-strip
18
ONLY_FOR_ARCHS=	amd64 i386
18
ONLY_FOR_ARCHS=	amd64 i386 armv6
19
USE_LDCONFIG=	yes
19
USE_LDCONFIG=	yes
20
USES=		gmake libtool pathfix pkgconfig tar:bzip2
20
USES=		gmake libtool pathfix pkgconfig tar:bzip2
21
21
(-)files/patch-src_google_protobuf_stubs_atomicops.h (+11 lines)
Added Link Here
1
--- src/google/protobuf/stubs/atomicops.h.orig	2015-01-28 16:53:51 UTC
2
+++ src/google/protobuf/stubs/atomicops.h
3
@@ -182,6 +182,8 @@ GOOGLE_PROTOBUF_ATOMICOPS_ERROR
4
 #elif defined(__GNUC__)
5
 #if defined(GOOGLE_PROTOBUF_ARCH_IA32) || defined(GOOGLE_PROTOBUF_ARCH_X64)
6
 #include <google/protobuf/stubs/atomicops_internals_x86_gcc.h>
7
+#elif defined(GOOGLE_PROTOBUF_ARCH_ARM) && defined(__FreeBSD__)
8
+#include <google/protobuf/stubs/atomicops_internals_generic_gcc.h>
9
 #elif defined(GOOGLE_PROTOBUF_ARCH_ARM) && defined(__linux__)
10
 #include <google/protobuf/stubs/atomicops_internals_arm_gcc.h>
11
 #elif defined(GOOGLE_PROTOBUF_ARCH_AARCH64)
(-)files/patch-src_google_protobuf_stubs_atomicops__internals__generic__gcc.h (+20 lines)
Added Link Here
1
--- src/google/protobuf/stubs/atomicops_internals_generic_gcc.h.orig	2015-01-28 17:16:36 UTC
2
+++ src/google/protobuf/stubs/atomicops_internals_generic_gcc.h
3
@@ -83,7 +83,7 @@ inline void MemoryBarrier() {
4
 }
5
 
6
 inline void Acquire_Store(volatile Atomic32* ptr, Atomic32 value) {
7
-  __atomic_store_n(ptr, value, __ATOMIC_ACQUIRE);
8
+  __atomic_store_n(ptr, value, __ATOMIC_SEQ_CST);
9
 }
10
 
11
 inline void Release_Store(volatile Atomic32* ptr, Atomic32 value) {
12
@@ -99,7 +99,7 @@ inline Atomic32 Acquire_Load(volatile co
13
 }
14
 
15
 inline Atomic32 Release_Load(volatile const Atomic32* ptr) {
16
-  return __atomic_load_n(ptr, __ATOMIC_RELEASE);
17
+  return __atomic_load_n(ptr, __ATOMIC_SEQ_CST);
18
 }
19
 
20
 #ifdef __LP64__

Return to bug 197167