diff options
| author |   Koen Kooi <koen@openembedded.org> | 2009-11-04 22:03:23 +0100 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2009-11-04 22:03:23 +0100 |
| commit | 3a26240e09072ec125f80e3a0131080265a2fac7 (patch) | |
| tree | 1c8facb86ebefb65c59dd071f5fe2b0f104bd8c3 /recipes/boost/files | |
| parent | a0afb38137e89893bcd31b3a617cf60b0ed3cd9c (diff) | |
| download | openembedded-3a26240e09072ec125f80e3a0131080265a2fac7.tar.gz | |
boost 1.36: various ARM fixups:
* changed intrinsics patch to work for armv6 and armv7a
* disabled atomic ops for arm versions <6
* fix associated build damage
* pass in correct gcc version
Diffstat (limited to 'recipes/boost/files')
4 files changed, 44 insertions, 3 deletions
diff --git a/recipes/boost/files/01-no-serialization-test.patch b/recipes/boost/files/01-no-serialization-test.patch new file mode 100644 index 0000000000..f1c9ca8572 --- /dev/null +++ b/recipes/boost/files/01-no-serialization-test.patch @@ -0,0 +1,12 @@ +diff -purN orig/libs/serialization/build/Jamfile.v2 boost_1_36_0/libs/serialization/build/Jamfile.v2 +--- orig/libs/serialization/build/Jamfile.v2 2008-09-11 18:45:03.000000000 -0400 ++++ boost_1_36_0/libs/serialization/build/Jamfile.v2 2008-09-11 18:45:40.000000000 -0400 +@@ -8,7 +8,7 @@ + + project boost/serialization + : source-location ../src +- : requirements <dependency>../../config/test/all//BOOST_NO_STD_LOCALE ++ : requirements + <conditional>@include-spirit + ; + diff --git a/recipes/boost/files/02-atomic-count-pthreads-on-arm.patch b/recipes/boost/files/02-atomic-count-pthreads-on-arm.patch new file mode 100644 index 0000000000..c6f2e19685 --- /dev/null +++ b/recipes/boost/files/02-atomic-count-pthreads-on-arm.patch @@ -0,0 +1,17 @@ +diff -purN orig/boost/detail/atomic_count.hpp boost_1_36_0/boost/detail/atomic_count.hpp +--- orig/boost/detail/atomic_count.hpp 2008-09-12 11:48:45.000000000 -0400 ++++ boost_1_36_0/boost/detail/atomic_count.hpp 2008-09-12 14:36:33.000000000 -0400 +@@ -93,6 +93,13 @@ typedef long atomic_count; + + # include <boost/detail/atomic_count_pthreads.hpp> + ++#elif defined(BOOST_HAS_PTHREADS) && defined(__arm__) && !defined(__ARM_ARCH_7A__) && !defined(__ARM_ARCH_6J__) ++ ++// MLC: need this on ARM, otherwise it'll attempt to use atomic_count_sync, ++// which has no ARM implementation. ++# define BOOST_AC_USE_PTHREADS ++# include <boost/detail/atomic_count_pthreads.hpp> ++ + #elif defined( __GNUC__ ) && ( defined( __i386__ ) || defined( __x86_64__ ) ) + + # include <boost/detail/atomic_count_gcc_x86.hpp> diff --git a/recipes/boost/files/03-exception-clone-destructor-fix.patch b/recipes/boost/files/03-exception-clone-destructor-fix.patch new file mode 100644 index 0000000000..d78759b5e3 --- /dev/null +++ b/recipes/boost/files/03-exception-clone-destructor-fix.patch @@ -0,0 +1,12 @@ +diff -purN orig/boost/exception/enable_current_exception.hpp boost_1_36_0/boost/exception/enable_current_exception.hpp +--- orig/boost/exception/enable_current_exception.hpp 2008-09-12 11:48:45.000000000 -0400 ++++ boost_1_36_0/boost/exception/enable_current_exception.hpp 2008-09-12 15:13:06.000000000 -0400 +@@ -96,6 +96,8 @@ boost + *be1 = *be2; + } + ++ ~exception_clone() throw() { } ++ + private: + + detail::atomic_count mutable count_; diff --git a/recipes/boost/files/arm-intrinsics.patch b/recipes/boost/files/arm-intrinsics.patch index 860b6df67c..1f1eed684a 100644 --- a/recipes/boost/files/arm-intrinsics.patch +++ b/recipes/boost/files/arm-intrinsics.patch @@ -5,7 +5,7 @@ diff -Nurd boost_1_36_0.orig/boost/detail/atomic_count_sync.hpp boost_1_36_0.arm void operator++() { -+#ifdef __ARM_ARCH_7A__ ++#if defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_6J__) + int v1, tmp; + asm volatile ("1: \n\t" + "ldrex %0, %1 \n\t" @@ -22,7 +22,7 @@ diff -Nurd boost_1_36_0.orig/boost/detail/atomic_count_sync.hpp boost_1_36_0.arm long operator--() { -+#ifdef __ARM_ARCH_7A__ ++#if defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_6J__) + int v1, tmp; + asm volatile ("1: \n\t" + "ldrex %0, %1 \n\t" @@ -40,7 +40,7 @@ diff -Nurd boost_1_36_0.orig/boost/detail/atomic_count_sync.hpp boost_1_36_0.arm operator long() const { -+#if __ARM_ARCH_7A__ ++#if defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_6J__) + return value_; +#else return __sync_fetch_and_add( &value_, 0 ); |