Attachment 152331 Details for Bug 197167 – armv6 fix

[patch] armv6 fix

protobuf.patch (text/plain), 2.01 KB, created by Mikael Urankar on 2015-01-29 09:57:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikael Urankar

Created: 2015-01-29 09:57:43 UTC

Size: 2.01 KB

patch

obsolete

>--- Makefile
>+++ Makefile
>@@ -15,7 +15,7 @@ LICENSE=	BSD3CLAUSE
> CFLAGS+=	-DGOOGLE_PROTOBUF_NO_RTTI
> GNU_CONFIGURE=	yes
> INSTALL_TARGET=	install-strip
>-ONLY_FOR_ARCHS=	amd64 i386
>+ONLY_FOR_ARCHS=	amd64 i386 armv6
> USE_LDCONFIG=	yes
> USES=		gmake libtool pathfix pkgconfig tar:bzip2
> 
>--- /dev/null
>+++ files/patch-src_google_protobuf_stubs_atomicops.h
>@@ -0,0 +1,11 @@
>+--- src/google/protobuf/stubs/atomicops.h.orig	2015-01-28 16:53:51 UTC
>++++ src/google/protobuf/stubs/atomicops.h
>+@@ -182,6 +182,8 @@ GOOGLE_PROTOBUF_ATOMICOPS_ERROR
>+ #elif defined(__GNUC__)
>+ #if defined(GOOGLE_PROTOBUF_ARCH_IA32) || defined(GOOGLE_PROTOBUF_ARCH_X64)
>+ #include <google/protobuf/stubs/atomicops_internals_x86_gcc.h>
>++#elif defined(GOOGLE_PROTOBUF_ARCH_ARM) && defined(__FreeBSD__)
>++#include <google/protobuf/stubs/atomicops_internals_generic_gcc.h>
>+ #elif defined(GOOGLE_PROTOBUF_ARCH_ARM) && defined(__linux__)
>+ #include <google/protobuf/stubs/atomicops_internals_arm_gcc.h>
>+ #elif defined(GOOGLE_PROTOBUF_ARCH_AARCH64)
>diff --git a/./files/patch-src_google_protobuf_stubs_atomicops__internals__generic__gcc.h b/./files/patch-src_google_protobuf_stubs_atomicops__internals__generic__gcc.h
>new file mode 100644
>index 0000000..2047c01
>
>--- /dev/null
>+++ files/patch-src_google_protobuf_stubs_atomicops__internals__generic__gcc.h
>@@ -0,0 +1,20 @@
>+--- src/google/protobuf/stubs/atomicops_internals_generic_gcc.h.orig	2015-01-28 17:16:36 UTC
>++++ src/google/protobuf/stubs/atomicops_internals_generic_gcc.h
>+@@ -83,7 +83,7 @@ inline void MemoryBarrier() {
>+ }
>+ 
>+ inline void Acquire_Store(volatile Atomic32* ptr, Atomic32 value) {
>+-  __atomic_store_n(ptr, value, __ATOMIC_ACQUIRE);
>++  __atomic_store_n(ptr, value, __ATOMIC_SEQ_CST);
>+ }
>+ 
>+ inline void Release_Store(volatile Atomic32* ptr, Atomic32 value) {
>+@@ -99,7 +99,7 @@ inline Atomic32 Acquire_Load(volatile co
>+ }
>+ 
>+ inline Atomic32 Release_Load(volatile const Atomic32* ptr) {
>+-  return __atomic_load_n(ptr, __ATOMIC_RELEASE);
>++  return __atomic_load_n(ptr, __ATOMIC_SEQ_CST);
>+ }
>+ 
>+ #ifdef __LP64__

Actions: View | Diff

Attachments on bug 197167: 152331