protobuf: fix detection of __atomic_*() built-ins
- Use the recently introduced BR2_TOOLCHAIN_HAS_ATOMIC boolean.
- Import an upstream patch to fix error handling when atomic operations
are not detected. Without this patch the build fails due to a syntax
error instead of showing the proper message.
- Add a patch to configure.ac to check if libatomic is needed and force
linking to it (we will attempt to submit this upstream).
- Disable build for SPARC64 because it fails due to a missing definition
of Atomic64.
On PowerPC, the __atomic_*() built-ins for 1-byte, 2-byte and 4-byte
types are available built-in. The corresponding built-ins for 8-byte
types, however, are implemented via libatomic, so requiring gcc >= 4.8.
In Buildroot, to simplify things, it was decided to require gcc 4.8 as
soon as the architectures has at least one __atomic_*() built-in variant
that requires libatomic.
Since protobuf most likely only uses the 1, 2 and 4-byte variants, it
*could* technically build with gcc 4.7. This is probably not a big deal,
and we can live with requiring gcc 4.8 on PowerPC to build protobuf. The
same restriction applies to SPARC.
The build for SPARC64 breaks even using the master branch of protobuf
due to undefined references to some NoBarrier_Atomic*() functions.
Signed-off-by: Henrique Marks <henrique.marks@datacom.ind.br>
Signed-off-by: Carlos Santos <casantos@datacom.ind.br>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-02-17 18:43:01 +01:00
|
|
|
From f020fe05a20dfcd16cd7df833dcf3cdeef770538 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Carlos Santos <casantos@datacom.ind.br>
|
|
|
|
|
Date: Thu, 11 Feb 2016 10:58:35 -0200
|
|
|
|
|
Subject: [PATCH 2/2] configure.ac: check if libatomic is needed
|
|
|
|
|
|
|
|
|
|
Compilation of protobuf for PowerPC and SPARC may fail due to missing
|
|
|
|
|
references to __atomic_fetch_add_4 and __atomic_compare_exchange_4.
|
|
|
|
|
|
|
|
|
|
The __atomic_*() intrinsics for all sizes are provided by libatomic when
|
|
|
|
|
gcc is >= 4.8. This can be achieved by adding this to configure.ac:
|
|
|
|
|
|
|
|
|
|
AC_SEARCH_LIBS([__atomic_fetch_add_4], [atomic])
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Carlos Santos <casantos@datacom.ind.br>
|
|
|
|
|
---
|
|
|
|
|
configure.ac | 2 ++
|
|
|
|
|
1 file changed, 2 insertions(+)
|
|
|
|
|
|
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
|
|
|
index c07067c..88d4a0d 100644
|
|
|
|
|
--- a/configure.ac
|
|
|
|
|
+++ b/configure.ac
|
2016-10-20 19:13:29 +02:00
|
|
|
@@ -160,6 +160,8 @@ AM_CONDITIONAL([HAVE_PTHREAD], [test "x$acx_pthread_ok" = "xyes"])
|
|
|
|
|
# We still keep this for improving pbconfig.h for unsupported platforms.
|
protobuf: fix detection of __atomic_*() built-ins
- Use the recently introduced BR2_TOOLCHAIN_HAS_ATOMIC boolean.
- Import an upstream patch to fix error handling when atomic operations
are not detected. Without this patch the build fails due to a syntax
error instead of showing the proper message.
- Add a patch to configure.ac to check if libatomic is needed and force
linking to it (we will attempt to submit this upstream).
- Disable build for SPARC64 because it fails due to a missing definition
of Atomic64.
On PowerPC, the __atomic_*() built-ins for 1-byte, 2-byte and 4-byte
types are available built-in. The corresponding built-ins for 8-byte
types, however, are implemented via libatomic, so requiring gcc >= 4.8.
In Buildroot, to simplify things, it was decided to require gcc 4.8 as
soon as the architectures has at least one __atomic_*() built-in variant
that requires libatomic.
Since protobuf most likely only uses the 1, 2 and 4-byte variants, it
*could* technically build with gcc 4.7. This is probably not a big deal,
and we can live with requiring gcc 4.8 on PowerPC to build protobuf. The
same restriction applies to SPARC.
The build for SPARC64 breaks even using the master branch of protobuf
due to undefined references to some NoBarrier_Atomic*() functions.
Signed-off-by: Henrique Marks <henrique.marks@datacom.ind.br>
Signed-off-by: Carlos Santos <casantos@datacom.ind.br>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-02-17 18:43:01 +01:00
|
|
|
AC_CXX_STL_HASH
|
|
|
|
|
|
|
|
|
|
+AC_SEARCH_LIBS([__atomic_load_4], [atomic])
|
|
|
|
|
+
|
|
|
|
|
case "$target_os" in
|
|
|
|
|
mingw* | cygwin* | win*)
|
|
|
|
|
;;
|
|
|
|
|
--
|
|
|
|
|
2.5.0
|
|
|
|
|
|
