summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2018-08-29 20:55:33 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-09-04 11:03:55 +0100
commitc5fc674b4e5a652613346c74eec2e879920ae40a (patch)
tree99d523a017de1b41c9802ec98d7ef2f37dfd2da8 /meta/recipes-support
parent6f80bc6b6ddf9d618fbb9ae8c871d5ea230a81c8 (diff)
downloadpoky-c5fc674b4e5a652613346c74eec2e879920ae40a.tar.gz
boost: Fix invalid const in atomic builtins
Fixes build with clang (From OE-Core rev: b844cc9a3ac95f51586a57e973c1b3c4188b9cff) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/boost/boost/0001-Removed-clang-specific-branch-for-x86-DCAS-based-loa.patch76
-rw-r--r--meta/recipes-support/boost/boost_1.67.0.bb15
2 files changed, 84 insertions, 7 deletions
diff --git a/meta/recipes-support/boost/boost/0001-Removed-clang-specific-branch-for-x86-DCAS-based-loa.patch b/meta/recipes-support/boost/boost/0001-Removed-clang-specific-branch-for-x86-DCAS-based-loa.patch
new file mode 100644
index 0000000000..182693079a
--- /dev/null
+++ b/meta/recipes-support/boost/boost/0001-Removed-clang-specific-branch-for-x86-DCAS-based-loa.patch
@@ -0,0 +1,76 @@
1From 39b027171e0a619d49b9dd2e8471d10b6c41bc25 Mon Sep 17 00:00:00 2001
2From: Andrey Semashev <andrey.semashev@gmail.com>
3Date: Tue, 17 Jul 2018 12:37:29 +0300
4Subject: [PATCH] Removed clang-specific branch for x86 DCAS-based loads.
5
6The storage to load from is const-qualified and DCAS via compiler intrinsics
7require an unqualified pointer. Use asm implementation instead, which should be
8as efficient as intrinsics, if not better, in this case.
9
10Fixes https://github.com/boostorg/atomic/issues/15.
11
12Upstream-Status: Backport [https://github.com/boostorg/atomic/commit/6e14ca24dab50ad4c1fa8c27c7dd6f1cb791b534]
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14---
15 boost/atomic/detail/ops_gcc_x86_dcas.hpp | 23 ++++++++++++-----------
16 1 file changed, 12 insertions(+), 11 deletions(-)
17
18diff --git a/boost/atomic/detail/ops_gcc_x86_dcas.hpp b/boost/atomic/detail/ops_gcc_x86_dcas.hpp
19index 4dacc66f..b43ef23a 100644
20--- a/boost/atomic/detail/ops_gcc_x86_dcas.hpp
21+++ b/boost/atomic/detail/ops_gcc_x86_dcas.hpp
22@@ -158,11 +158,13 @@ struct gcc_dcas_x86
23 }
24 else
25 {
26-#if defined(__clang__)
27- // Clang cannot allocate eax:edx register pairs but it has sync intrinsics
28- value = __sync_val_compare_and_swap(&storage, (storage_type)0, (storage_type)0);
29-#elif defined(BOOST_ATOMIC_DETAIL_X86_NO_ASM_AX_DX_PAIRS)
30+ // Note that despite const qualification cmpxchg8b below may issue a store to the storage. The storage value
31+ // will not change, but this prevents the storage to reside in read-only memory.
32+
33+#if defined(BOOST_ATOMIC_DETAIL_X86_NO_ASM_AX_DX_PAIRS)
34+
35 uint32_t value_bits[2];
36+
37 // We don't care for comparison result here; the previous value will be stored into value anyway.
38 // Also we don't care for ebx and ecx values, they just have to be equal to eax and edx before cmpxchg8b.
39 __asm__ __volatile__
40@@ -175,7 +177,9 @@ struct gcc_dcas_x86
41 : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC_COMMA "memory"
42 );
43 BOOST_ATOMIC_DETAIL_MEMCPY(&value, value_bits, sizeof(value));
44+
45 #else // defined(BOOST_ATOMIC_DETAIL_X86_NO_ASM_AX_DX_PAIRS)
46+
47 // We don't care for comparison result here; the previous value will be stored into value anyway.
48 // Also we don't care for ebx and ecx values, they just have to be equal to eax and edx before cmpxchg8b.
49 __asm__ __volatile__
50@@ -187,6 +191,7 @@ struct gcc_dcas_x86
51 : [storage] "m" (storage)
52 : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC_COMMA "memory"
53 );
54+
55 #endif // defined(BOOST_ATOMIC_DETAIL_X86_NO_ASM_AX_DX_PAIRS)
56 }
57
58@@ -401,15 +406,11 @@ struct gcc_dcas_x86_64
59
60 static BOOST_FORCEINLINE storage_type load(storage_type const volatile& storage, memory_order) BOOST_NOEXCEPT
61 {
62-#if defined(__clang__)
63+ // Note that despite const qualification cmpxchg16b below may issue a store to the storage. The storage value
64+ // will not change, but this prevents the storage to reside in read-only memory.
65
66- // Clang cannot allocate rax:rdx register pairs but it has sync intrinsics
67- storage_type value = storage_type();
68- return __sync_val_compare_and_swap(&storage, value, value);
69-
70-#elif defined(BOOST_ATOMIC_DETAIL_X86_NO_ASM_AX_DX_PAIRS)
71+#if defined(BOOST_ATOMIC_DETAIL_X86_NO_ASM_AX_DX_PAIRS)
72
73- // Some compilers can't allocate rax:rdx register pair either and also don't support 128-bit __sync_val_compare_and_swap
74 uint64_t value_bits[2];
75
76 // We don't care for comparison result here; the previous value will be stored into value anyway.
diff --git a/meta/recipes-support/boost/boost_1.67.0.bb b/meta/recipes-support/boost/boost_1.67.0.bb
index 7bb451166c..ef178edc0c 100644
--- a/meta/recipes-support/boost/boost_1.67.0.bb
+++ b/meta/recipes-support/boost/boost_1.67.0.bb
@@ -2,10 +2,11 @@ require boost-${PV}.inc
2require boost.inc 2require boost.inc
3 3
4SRC_URI += "\ 4SRC_URI += "\
5 file://arm-intrinsics.patch \ 5 file://arm-intrinsics.patch \
6 file://boost-CVE-2012-2677.patch \ 6 file://boost-CVE-2012-2677.patch \
7 file://boost-math-disable-pch-for-gcc.patch \ 7 file://boost-math-disable-pch-for-gcc.patch \
8 file://0001-Apply-boost-1.62.0-no-forced-flags.patch.patch \ 8 file://0001-Apply-boost-1.62.0-no-forced-flags.patch.patch \
9 file://0003-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \ 9 file://0003-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \
10 file://0001-make_x86_64_sysv_elf_gas.S-set-.file-section.patch \ 10 file://0001-make_x86_64_sysv_elf_gas.S-set-.file-section.patch \
11" 11 file://0001-Removed-clang-specific-branch-for-x86-DCAS-based-loa.patch \
12 "