summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2014-11-10 14:00:02 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-12-03 12:23:58 +0000
commit85c476188ae7305269b4a1d394e4fe99024ae372 (patch)
tree5879349fc58e4ff83b11d0b816cf2fb780fe2670
parent2f7c9faf3a194cf611d7a4fd5dcd54f2aa245bbb (diff)
downloadpoky-85c476188ae7305269b4a1d394e4fe99024ae372.tar.gz
boost: Upgrade to 1.57
(From OE-Core rev: 4c3076ad1cb6273add941483d481354572bcefd7) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/boost/bjam-native_1.57.0.bb (renamed from meta/recipes-support/boost/bjam-native_1.56.0.bb)0
-rw-r--r--meta/recipes-support/boost/boost-1.57.0.inc (renamed from meta/recipes-support/boost/boost-1.56.0.inc)4
-rw-r--r--meta/recipes-support/boost/boost/0001-Added-support-for-extending-operations-to-GCC-atomic.patch412
-rw-r--r--meta/recipes-support/boost/boost_1.57.0.bb (renamed from meta/recipes-support/boost/boost_1.56.0.bb)1
4 files changed, 2 insertions, 415 deletions
diff --git a/meta/recipes-support/boost/bjam-native_1.56.0.bb b/meta/recipes-support/boost/bjam-native_1.57.0.bb
index d85d1a96cb..d85d1a96cb 100644
--- a/meta/recipes-support/boost/bjam-native_1.56.0.bb
+++ b/meta/recipes-support/boost/bjam-native_1.57.0.bb
diff --git a/meta/recipes-support/boost/boost-1.56.0.inc b/meta/recipes-support/boost/boost-1.57.0.inc
index 24c32b4c6f..809419dbac 100644
--- a/meta/recipes-support/boost/boost-1.56.0.inc
+++ b/meta/recipes-support/boost/boost-1.57.0.inc
@@ -13,7 +13,7 @@ BOOST_P = "boost_${BOOST_VER}"
13 13
14SRC_URI = "${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2" 14SRC_URI = "${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2"
15 15
16SRC_URI[md5sum] = "a744cf167b05d72335f27c88115f211d" 16SRC_URI[md5sum] = "1be49befbdd9a5ce9def2983ba3e7b76"
17SRC_URI[sha256sum] = "134732acaf3a6e7eba85988118d943f0fa6b7f0850f65131fff89823ad30ff1d" 17SRC_URI[sha256sum] = "910c8c022a33ccec7f088bd65d4f14b466588dda94ba2124e78b8c57db264967"
18 18
19S = "${WORKDIR}/${BOOST_P}" 19S = "${WORKDIR}/${BOOST_P}"
diff --git a/meta/recipes-support/boost/boost/0001-Added-support-for-extending-operations-to-GCC-atomic.patch b/meta/recipes-support/boost/boost/0001-Added-support-for-extending-operations-to-GCC-atomic.patch
deleted file mode 100644
index feece81532..0000000000
--- a/meta/recipes-support/boost/boost/0001-Added-support-for-extending-operations-to-GCC-atomic.patch
+++ /dev/null
@@ -1,412 +0,0 @@
1From 415db7054723291042e4ff1ffa8fdd5bc8b07163 Mon Sep 17 00:00:00 2001
2From: Andrey Semashev <andrey.semashev@gmail.com>
3Date: Sat, 27 Sep 2014 20:40:09 +0400
4Subject: [PATCH] Added support for extending operations to GCC atomic backend.
5
6Fix for #10446. Some platforms (e.g. Raspberry Pi) only support atomic ops of some particular size but not less. Use extending arithmetic operations for these platforms. Also, make sure bools are always treated as 8-bit values, even if the actual type is larger. This makes its use in atomic<>, atomic_flag and lock pool more consistent.
7
8Upstream-Status: Backport [https://svn.boost.org/trac/boost/ticket/10446]
9Signed-off-by: Peter A. Bigot <pab@pabigot.com>
10
11---
12 include/boost/atomic/capabilities.hpp | 1 +
13 include/boost/atomic/detail/atomic_template.hpp | 2 +-
14 include/boost/atomic/detail/caps_gcc_atomic.hpp | 82 +++++------
15 include/boost/atomic/detail/ops_gcc_atomic.hpp | 184 +++++++++++++++++++++---
16 4 files changed, 206 insertions(+), 63 deletions(-)
17
18diff --git a/include/boost/atomic/capabilities.hpp b/include/boost/atomic/capabilities.hpp
19index 658dd22..05bbb0f 100644
20--- a/include/boost/atomic/capabilities.hpp
21+++ b/include/boost/atomic/capabilities.hpp
22@@ -142,6 +142,7 @@
23 #define BOOST_ATOMIC_ADDRESS_LOCK_FREE BOOST_ATOMIC_POINTER_LOCK_FREE
24
25 #ifndef BOOST_ATOMIC_BOOL_LOCK_FREE
26+// We store bools in 1-byte storage in all backends
27 #define BOOST_ATOMIC_BOOL_LOCK_FREE BOOST_ATOMIC_INT8_LOCK_FREE
28 #endif
29
30diff --git a/include/boost/atomic/detail/atomic_template.hpp b/include/boost/atomic/detail/atomic_template.hpp
31index 4fd6d79..bc3922a 100644
32--- a/include/boost/atomic/detail/atomic_template.hpp
33+++ b/include/boost/atomic/detail/atomic_template.hpp
34@@ -234,7 +234,7 @@ class base_atomic< bool, int >
35 {
36 private:
37 typedef bool value_type;
38- typedef atomics::detail::operations< storage_size_of< value_type >::value, false > operations;
39+ typedef atomics::detail::operations< 1u, false > operations;
40
41 protected:
42 typedef value_type value_arg_type;
43diff --git a/include/boost/atomic/detail/caps_gcc_atomic.hpp b/include/boost/atomic/detail/caps_gcc_atomic.hpp
44index 8299ad0..f4e7a70 100644
45--- a/include/boost/atomic/detail/caps_gcc_atomic.hpp
46+++ b/include/boost/atomic/detail/caps_gcc_atomic.hpp
47@@ -29,66 +29,48 @@
48 #define BOOST_ATOMIC_DETAIL_X86_HAS_CMPXCHG16B 1
49 #endif
50
51-#if __GCC_ATOMIC_BOOL_LOCK_FREE == 2
52-#define BOOST_ATOMIC_FLAG_LOCK_FREE 2
53-#else
54-#define BOOST_ATOMIC_FLAG_LOCK_FREE 0
55-#endif
56-#if __GCC_ATOMIC_CHAR_LOCK_FREE == 2
57-#define BOOST_ATOMIC_CHAR_LOCK_FREE 2
58-#else
59-#define BOOST_ATOMIC_CHAR_LOCK_FREE 0
60-#endif
61-#if __GCC_ATOMIC_CHAR16_T_LOCK_FREE == 2
62-#define BOOST_ATOMIC_CHAR16_T_LOCK_FREE 2
63-#else
64-#define BOOST_ATOMIC_CHAR16_T_LOCK_FREE 0
65-#endif
66-#if __GCC_ATOMIC_CHAR32_T_LOCK_FREE == 2
67-#define BOOST_ATOMIC_CHAR32_T_LOCK_FREE 2
68+#if defined(BOOST_ATOMIC_DETAIL_X86_HAS_CMPXCHG16B) && (defined(BOOST_HAS_INT128) || !defined(BOOST_NO_ALIGNMENT))
69+#define BOOST_ATOMIC_INT128_LOCK_FREE 2
70 #else
71-#define BOOST_ATOMIC_CHAR32_T_LOCK_FREE 0
72+#define BOOST_ATOMIC_INT128_LOCK_FREE 0
73 #endif
74-#if __GCC_ATOMIC_WCHAR_T_LOCK_FREE == 2
75-#define BOOST_ATOMIC_WCHAR_T_LOCK_FREE 2
76+
77+#if __GCC_ATOMIC_LLONG_LOCK_FREE == 2
78+#define BOOST_ATOMIC_LLONG_LOCK_FREE 2
79 #else
80-#define BOOST_ATOMIC_WCHAR_T_LOCK_FREE 0
81+#define BOOST_ATOMIC_LLONG_LOCK_FREE BOOST_ATOMIC_INT128_LOCK_FREE
82 #endif
83-#if __GCC_ATOMIC_SHORT_LOCK_FREE == 2
84-#define BOOST_ATOMIC_SHORT_LOCK_FREE 2
85+
86+#if __GCC_ATOMIC_LONG_LOCK_FREE == 2
87+#define BOOST_ATOMIC_LONG_LOCK_FREE 2
88 #else
89-#define BOOST_ATOMIC_SHORT_LOCK_FREE 0
90+#define BOOST_ATOMIC_LONG_LOCK_FREE BOOST_ATOMIC_LLONG_LOCK_FREE
91 #endif
92+
93 #if __GCC_ATOMIC_INT_LOCK_FREE == 2
94 #define BOOST_ATOMIC_INT_LOCK_FREE 2
95 #else
96-#define BOOST_ATOMIC_INT_LOCK_FREE 0
97-#endif
98-#if __GCC_ATOMIC_LONG_LOCK_FREE == 2
99-#define BOOST_ATOMIC_LONG_LOCK_FREE 2
100-#else
101-#define BOOST_ATOMIC_LONG_LOCK_FREE 0
102+#define BOOST_ATOMIC_INT_LOCK_FREE BOOST_ATOMIC_LONG_LOCK_FREE
103 #endif
104-#if __GCC_ATOMIC_LLONG_LOCK_FREE == 2
105-#define BOOST_ATOMIC_LLONG_LOCK_FREE 2
106+
107+#if __GCC_ATOMIC_SHORT_LOCK_FREE == 2
108+#define BOOST_ATOMIC_SHORT_LOCK_FREE 2
109 #else
110-#define BOOST_ATOMIC_LLONG_LOCK_FREE 0
111+#define BOOST_ATOMIC_SHORT_LOCK_FREE BOOST_ATOMIC_INT_LOCK_FREE
112 #endif
113-#if defined(BOOST_ATOMIC_DETAIL_X86_HAS_CMPXCHG16B) && (defined(BOOST_HAS_INT128) || !defined(BOOST_NO_ALIGNMENT))
114-#define BOOST_ATOMIC_INT128_LOCK_FREE 2
115+
116+#if __GCC_ATOMIC_CHAR_LOCK_FREE == 2
117+#define BOOST_ATOMIC_CHAR_LOCK_FREE 2
118 #else
119-#define BOOST_ATOMIC_INT128_LOCK_FREE 0
120+#define BOOST_ATOMIC_CHAR_LOCK_FREE BOOST_ATOMIC_SHORT_LOCK_FREE
121 #endif
122+
123 #if __GCC_ATOMIC_POINTER_LOCK_FREE == 2
124 #define BOOST_ATOMIC_POINTER_LOCK_FREE 2
125 #else
126 #define BOOST_ATOMIC_POINTER_LOCK_FREE 0
127 #endif
128-#if __GCC_ATOMIC_BOOL_LOCK_FREE == 2
129-#define BOOST_ATOMIC_BOOL_LOCK_FREE 2
130-#else
131-#define BOOST_ATOMIC_BOOL_LOCK_FREE 0
132-#endif
133+
134
135 #define BOOST_ATOMIC_INT8_LOCK_FREE BOOST_ATOMIC_CHAR_LOCK_FREE
136
137@@ -128,6 +110,24 @@
138 #define BOOST_ATOMIC_INT64_LOCK_FREE 0
139 #endif
140
141+
142+#if __GCC_ATOMIC_WCHAR_T_LOCK_FREE == 2
143+#define BOOST_ATOMIC_WCHAR_T_LOCK_FREE 2
144+#elif BOOST_ATOMIC_DETAIL_SIZEOF_WCHAR_T == 8
145+#define BOOST_ATOMIC_WCHAR_T_LOCK_FREE BOOST_ATOMIC_INT64_LOCK_FREE
146+#elif BOOST_ATOMIC_DETAIL_SIZEOF_WCHAR_T == 4
147+#define BOOST_ATOMIC_WCHAR_T_LOCK_FREE BOOST_ATOMIC_INT32_LOCK_FREE
148+#elif BOOST_ATOMIC_DETAIL_SIZEOF_WCHAR_T == 2
149+#define BOOST_ATOMIC_WCHAR_T_LOCK_FREE BOOST_ATOMIC_INT16_LOCK_FREE
150+#elif BOOST_ATOMIC_DETAIL_SIZEOF_WCHAR_T == 1
151+#define BOOST_ATOMIC_WCHAR_T_LOCK_FREE BOOST_ATOMIC_INT8_LOCK_FREE
152+#else
153+#define BOOST_ATOMIC_WCHAR_T_LOCK_FREE 0
154+#endif
155+
156+#define BOOST_ATOMIC_CHAR32_T_LOCK_FREE BOOST_ATOMIC_INT32_LOCK_FREE
157+#define BOOST_ATOMIC_CHAR16_T_LOCK_FREE BOOST_ATOMIC_INT16_LOCK_FREE
158+
159 #define BOOST_ATOMIC_THREAD_FENCE 2
160 #define BOOST_ATOMIC_SIGNAL_FENCE 2
161
162diff --git a/include/boost/atomic/detail/ops_gcc_atomic.hpp b/include/boost/atomic/detail/ops_gcc_atomic.hpp
163index 2297791..2e4c37b 100644
164--- a/include/boost/atomic/detail/ops_gcc_atomic.hpp
165+++ b/include/boost/atomic/detail/ops_gcc_atomic.hpp
166@@ -24,6 +24,15 @@
167 #include <boost/atomic/detail/ops_cas_based.hpp>
168 #endif
169
170+#if __GCC_ATOMIC_LLONG_LOCK_FREE != BOOST_ATOMIC_LLONG_LOCK_FREE || __GCC_ATOMIC_LONG_LOCK_FREE != BOOST_ATOMIC_LONG_LOCK_FREE ||\
171+ __GCC_ATOMIC_INT_LOCK_FREE != BOOST_ATOMIC_INT_LOCK_FREE || __GCC_ATOMIC_SHORT_LOCK_FREE != BOOST_ATOMIC_SHORT_LOCK_FREE ||\
172+ __GCC_ATOMIC_CHAR_LOCK_FREE != BOOST_ATOMIC_CHAR_LOCK_FREE || __GCC_ATOMIC_BOOL_LOCK_FREE != BOOST_ATOMIC_BOOL_LOCK_FREE ||\
173+ __GCC_ATOMIC_WCHAR_T_LOCK_FREE != BOOST_ATOMIC_WCHAR_T_LOCK_FREE
174+// There are platforms where we need to use larger storage types
175+#include <boost/atomic/detail/int_sizes.hpp>
176+#include <boost/atomic/detail/ops_extending_cas_based.hpp>
177+#endif
178+
179 #ifdef BOOST_HAS_PRAGMA_ONCE
180 #pragma once
181 #endif
182@@ -154,73 +163,206 @@ struct gcc_atomic_operations
183 }
184 };
185
186-#if BOOST_ATOMIC_INT8_LOCK_FREE > 0
187+#if BOOST_ATOMIC_INT128_LOCK_FREE > 0
188+#if defined(__clang__) && defined(BOOST_ATOMIC_DETAIL_X86_HAS_CMPXCHG16B)
189+
190+// Workaround for clang bug: http://llvm.org/bugs/show_bug.cgi?id=19149
191+// Clang 3.4 does not implement 128-bit __atomic* intrinsics even though it defines __GCC_HAVE_SYNC_COMPARE_AND_SWAP_16
192 template< bool Signed >
193-struct operations< 1u, Signed > :
194- public gcc_atomic_operations< typename make_storage_type< 1u, Signed >::type >
195+struct operations< 16u, Signed > :
196+ public cas_based_operations< gcc_dcas_x86_64< Signed > >
197 {
198 };
199+
200+#else
201+
202+template< bool Signed >
203+struct operations< 16u, Signed > :
204+ public gcc_atomic_operations< typename make_storage_type< 16u, Signed >::type >
205+{
206+};
207+
208+#endif
209 #endif
210
211-#if BOOST_ATOMIC_INT16_LOCK_FREE > 0
212+
213+#if BOOST_ATOMIC_INT64_LOCK_FREE > 0
214+#if defined(__clang__) && defined(BOOST_ATOMIC_DETAIL_X86_HAS_CMPXCHG8B)
215+
216+// Workaround for clang bug http://llvm.org/bugs/show_bug.cgi?id=19355
217 template< bool Signed >
218-struct operations< 2u, Signed > :
219- public gcc_atomic_operations< typename make_storage_type< 2u, Signed >::type >
220+struct operations< 8u, Signed > :
221+ public cas_based_operations< gcc_dcas_x86< Signed > >
222+{
223+};
224+
225+#elif (BOOST_ATOMIC_DETAIL_SIZEOF_LLONG == 8 && __GCC_ATOMIC_LLONG_LOCK_FREE != BOOST_ATOMIC_LLONG_LOCK_FREE) ||\
226+ (BOOST_ATOMIC_DETAIL_SIZEOF_LONG == 8 && __GCC_ATOMIC_LONG_LOCK_FREE != BOOST_ATOMIC_LONG_LOCK_FREE) ||\
227+ (BOOST_ATOMIC_DETAIL_SIZEOF_INT == 8 && __GCC_ATOMIC_INT_LOCK_FREE != BOOST_ATOMIC_INT_LOCK_FREE) ||\
228+ (BOOST_ATOMIC_DETAIL_SIZEOF_SHORT == 8 && __GCC_ATOMIC_SHORT_LOCK_FREE != BOOST_ATOMIC_SHORT_LOCK_FREE) ||\
229+ (BOOST_ATOMIC_DETAIL_SIZEOF_WCHAR_T == 8 && __GCC_ATOMIC_WCHAR_T_LOCK_FREE != BOOST_ATOMIC_WCHAR_T_LOCK_FREE)
230+
231+#define BOOST_ATOMIC_DETAIL_INT64_EXTENDED
232+
233+template< bool Signed >
234+struct operations< 8u, Signed > :
235+ public extending_cas_based_operations< gcc_atomic_operations< typename make_storage_type< 16u, Signed >::type >, 8u, Signed >
236 {
237 };
238+
239+#else
240+
241+template< bool Signed >
242+struct operations< 8u, Signed > :
243+ public gcc_atomic_operations< typename make_storage_type< 8u, Signed >::type >
244+{
245+};
246+
247+#endif
248 #endif
249
250 #if BOOST_ATOMIC_INT32_LOCK_FREE > 0
251+#if (BOOST_ATOMIC_DETAIL_SIZEOF_LLONG == 4 && __GCC_ATOMIC_LLONG_LOCK_FREE != BOOST_ATOMIC_LLONG_LOCK_FREE) ||\
252+ (BOOST_ATOMIC_DETAIL_SIZEOF_LONG == 4 && __GCC_ATOMIC_LONG_LOCK_FREE != BOOST_ATOMIC_LONG_LOCK_FREE) ||\
253+ (BOOST_ATOMIC_DETAIL_SIZEOF_INT == 4 && __GCC_ATOMIC_INT_LOCK_FREE != BOOST_ATOMIC_INT_LOCK_FREE) ||\
254+ (BOOST_ATOMIC_DETAIL_SIZEOF_SHORT == 4 && __GCC_ATOMIC_SHORT_LOCK_FREE != BOOST_ATOMIC_SHORT_LOCK_FREE) ||\
255+ (BOOST_ATOMIC_DETAIL_SIZEOF_WCHAR_T == 4 && __GCC_ATOMIC_WCHAR_T_LOCK_FREE != BOOST_ATOMIC_WCHAR_T_LOCK_FREE)
256+
257+#define BOOST_ATOMIC_DETAIL_INT32_EXTENDED
258+
259+#if !defined(BOOST_ATOMIC_DETAIL_INT64_EXTENDED)
260+
261+template< bool Signed >
262+struct operations< 4u, Signed > :
263+ public extending_cas_based_operations< gcc_atomic_operations< typename make_storage_type< 8u, Signed >::type >, 4u, Signed >
264+{
265+};
266+
267+#else // !defined(BOOST_ATOMIC_DETAIL_INT64_EXTENDED)
268+
269+template< bool Signed >
270+struct operations< 4u, Signed > :
271+ public extending_cas_based_operations< gcc_atomic_operations< typename make_storage_type< 16u, Signed >::type >, 4u, Signed >
272+{
273+};
274+
275+#endif // !defined(BOOST_ATOMIC_DETAIL_INT64_EXTENDED)
276+
277+#else
278+
279 template< bool Signed >
280 struct operations< 4u, Signed > :
281 public gcc_atomic_operations< typename make_storage_type< 4u, Signed >::type >
282 {
283 };
284+
285+#endif
286 #endif
287
288-#if BOOST_ATOMIC_INT64_LOCK_FREE > 0
289-#if defined(__clang__) && defined(BOOST_ATOMIC_DETAIL_X86_HAS_CMPXCHG8B)
290+#if BOOST_ATOMIC_INT16_LOCK_FREE > 0
291+#if (BOOST_ATOMIC_DETAIL_SIZEOF_LLONG == 2 && __GCC_ATOMIC_LLONG_LOCK_FREE != BOOST_ATOMIC_LLONG_LOCK_FREE) ||\
292+ (BOOST_ATOMIC_DETAIL_SIZEOF_LONG == 2 && __GCC_ATOMIC_LONG_LOCK_FREE != BOOST_ATOMIC_LONG_LOCK_FREE) ||\
293+ (BOOST_ATOMIC_DETAIL_SIZEOF_INT == 2 && __GCC_ATOMIC_INT_LOCK_FREE != BOOST_ATOMIC_INT_LOCK_FREE) ||\
294+ (BOOST_ATOMIC_DETAIL_SIZEOF_SHORT == 2 && __GCC_ATOMIC_SHORT_LOCK_FREE != BOOST_ATOMIC_SHORT_LOCK_FREE) ||\
295+ (BOOST_ATOMIC_DETAIL_SIZEOF_WCHAR_T == 2 && __GCC_ATOMIC_WCHAR_T_LOCK_FREE != BOOST_ATOMIC_WCHAR_T_LOCK_FREE)
296+
297+#define BOOST_ATOMIC_DETAIL_INT16_EXTENDED
298+
299+#if !defined(BOOST_ATOMIC_DETAIL_INT32_EXTENDED)
300
301-// Workaround for clang bug http://llvm.org/bugs/show_bug.cgi?id=19355
302 template< bool Signed >
303-struct operations< 8u, Signed > :
304- public cas_based_operations< gcc_dcas_x86< Signed > >
305+struct operations< 2u, Signed > :
306+ public extending_cas_based_operations< gcc_atomic_operations< typename make_storage_type< 4u, Signed >::type >, 2u, Signed >
307+{
308+};
309+
310+#elif !defined(BOOST_ATOMIC_DETAIL_INT64_EXTENDED)
311+
312+template< bool Signed >
313+struct operations< 2u, Signed > :
314+ public extending_cas_based_operations< gcc_atomic_operations< typename make_storage_type< 8u, Signed >::type >, 2u, Signed >
315 {
316 };
317
318 #else
319
320 template< bool Signed >
321-struct operations< 8u, Signed > :
322- public gcc_atomic_operations< typename make_storage_type< 8u, Signed >::type >
323+struct operations< 2u, Signed > :
324+ public extending_cas_based_operations< gcc_atomic_operations< typename make_storage_type< 16u, Signed >::type >, 2u, Signed >
325+{
326+};
327+
328+#endif
329+
330+#else
331+
332+template< bool Signed >
333+struct operations< 2u, Signed > :
334+ public gcc_atomic_operations< typename make_storage_type< 2u, Signed >::type >
335 {
336 };
337
338 #endif
339 #endif
340
341-#if BOOST_ATOMIC_INT128_LOCK_FREE > 0
342-#if defined(__clang__) && defined(BOOST_ATOMIC_DETAIL_X86_HAS_CMPXCHG16B)
343+#if BOOST_ATOMIC_INT8_LOCK_FREE > 0
344+#if (BOOST_ATOMIC_DETAIL_SIZEOF_LLONG == 1 && __GCC_ATOMIC_LLONG_LOCK_FREE != BOOST_ATOMIC_LLONG_LOCK_FREE) ||\
345+ (BOOST_ATOMIC_DETAIL_SIZEOF_LONG == 1 && __GCC_ATOMIC_LONG_LOCK_FREE != BOOST_ATOMIC_LONG_LOCK_FREE) ||\
346+ (BOOST_ATOMIC_DETAIL_SIZEOF_INT == 1 && __GCC_ATOMIC_INT_LOCK_FREE != BOOST_ATOMIC_INT_LOCK_FREE) ||\
347+ (BOOST_ATOMIC_DETAIL_SIZEOF_SHORT == 1 && __GCC_ATOMIC_SHORT_LOCK_FREE != BOOST_ATOMIC_SHORT_LOCK_FREE) ||\
348+ (BOOST_ATOMIC_DETAIL_SIZEOF_WCHAR_T == 1 && __GCC_ATOMIC_WCHAR_T_LOCK_FREE != BOOST_ATOMIC_WCHAR_T_LOCK_FREE) ||\
349+ (__GCC_ATOMIC_CHAR_LOCK_FREE != BOOST_ATOMIC_CHAR_LOCK_FREE) ||\
350+ (__GCC_ATOMIC_BOOL_LOCK_FREE != BOOST_ATOMIC_BOOL_LOCK_FREE)
351+
352+#if !defined(BOOST_ATOMIC_DETAIL_INT16_EXTENDED)
353
354-// Workaround for clang bug: http://llvm.org/bugs/show_bug.cgi?id=19149
355-// Clang 3.4 does not implement 128-bit __atomic* intrinsics even though it defines __GCC_HAVE_SYNC_COMPARE_AND_SWAP_16
356 template< bool Signed >
357-struct operations< 16u, Signed > :
358- public cas_based_operations< gcc_dcas_x86_64< Signed > >
359+struct operations< 1u, Signed > :
360+ public extending_cas_based_operations< gcc_atomic_operations< typename make_storage_type< 2u, Signed >::type >, 1u, Signed >
361+{
362+};
363+
364+#elif !defined(BOOST_ATOMIC_DETAIL_INT32_EXTENDED)
365+
366+template< bool Signed >
367+struct operations< 1u, Signed > :
368+ public extending_cas_based_operations< gcc_atomic_operations< typename make_storage_type< 4u, Signed >::type >, 1u, Signed >
369+{
370+};
371+
372+#elif !defined(BOOST_ATOMIC_DETAIL_INT64_EXTENDED)
373+
374+template< bool Signed >
375+struct operations< 1u, Signed > :
376+ public extending_cas_based_operations< gcc_atomic_operations< typename make_storage_type< 8u, Signed >::type >, 1u, Signed >
377 {
378 };
379
380 #else
381
382 template< bool Signed >
383-struct operations< 16u, Signed > :
384- public gcc_atomic_operations< typename make_storage_type< 16u, Signed >::type >
385+struct operations< 1u, Signed > :
386+ public extending_cas_based_operations< gcc_atomic_operations< typename make_storage_type< 16u, Signed >::type >, 1u, Signed >
387+{
388+};
389+
390+#endif
391+
392+#else
393+
394+template< bool Signed >
395+struct operations< 1u, Signed > :
396+ public gcc_atomic_operations< typename make_storage_type< 1u, Signed >::type >
397 {
398 };
399
400 #endif
401 #endif
402
403+#undef BOOST_ATOMIC_DETAIL_INT16_EXTENDED
404+#undef BOOST_ATOMIC_DETAIL_INT32_EXTENDED
405+#undef BOOST_ATOMIC_DETAIL_INT64_EXTENDED
406+
407 BOOST_FORCEINLINE void thread_fence(memory_order order) BOOST_NOEXCEPT
408 {
409 __atomic_thread_fence(atomics::detail::convert_memory_order_to_gcc(order));
410--
4111.8.5.5
412
diff --git a/meta/recipes-support/boost/boost_1.56.0.bb b/meta/recipes-support/boost/boost_1.57.0.bb
index dcc77bb87e..c09d5f431f 100644
--- a/meta/recipes-support/boost/boost_1.56.0.bb
+++ b/meta/recipes-support/boost/boost_1.57.0.bb
@@ -3,5 +3,4 @@ include boost.inc
3 3
4SRC_URI += "\ 4SRC_URI += "\
5 file://arm-intrinsics.patch \ 5 file://arm-intrinsics.patch \
6 file://0001-Added-support-for-extending-operations-to-GCC-atomic.patch;striplevel=2 \
7" 6"