|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r81119 - trunk/boost/smart_ptr/detail
From: pdimov_at_[hidden]
Date: 2012-10-31 12:04:04
Author: pdimov
Date: 2012-10-31 12:04:03 EDT (Wed, 31 Oct 2012)
New Revision: 81119
URL: http://svn.boost.org/trac/boost/changeset/81119
Log:
Add check for __ARM_ARCH_7S__. Refs #7599.
Text files modified:
trunk/boost/smart_ptr/detail/spinlock_gcc_arm.hpp | 17 +++++------------
1 files changed, 5 insertions(+), 12 deletions(-)
Modified: trunk/boost/smart_ptr/detail/spinlock_gcc_arm.hpp
==============================================================================
--- trunk/boost/smart_ptr/detail/spinlock_gcc_arm.hpp (original)
+++ trunk/boost/smart_ptr/detail/spinlock_gcc_arm.hpp 2012-10-31 12:04:03 EDT (Wed, 31 Oct 2012)
@@ -11,13 +11,15 @@
#include <boost/smart_ptr/detail/yield_k.hpp>
-#if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7EM__)
+#if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7EM__) || defined(__ARM_ARCH_7S__)
# define BOOST_SP_ARM_BARRIER "dmb"
+# define BOOST_SP_ARM_HAS_LDREX
#elif defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_6T2__)
# define BOOST_SP_ARM_BARRIER "mcr p15, 0, r0, c7, c10, 5"
+# define BOOST_SP_ARM_HAS_LDREX
#else
@@ -43,17 +45,7 @@
{
int r;
-#if defined(__ARM_ARCH_6__) \
- || defined(__ARM_ARCH_6J__) \
- || defined(__ARM_ARCH_6K__) \
- || defined(__ARM_ARCH_6Z__) \
- || defined(__ARM_ARCH_6ZK__) \
- || defined(__ARM_ARCH_6T2__) \
- || defined(__ARM_ARCH_7__) \
- || defined(__ARM_ARCH_7A__) \
- || defined(__ARM_ARCH_7R__) \
- || defined(__ARM_ARCH_7M__) \
- || defined(__ARM_ARCH_7EM__)
+#ifdef BOOST_SP_ARM_HAS_LDREX
__asm__ __volatile__(
"ldrex %0, [%2]; \n"
@@ -123,5 +115,6 @@
#define BOOST_DETAIL_SPINLOCK_INIT {0}
#undef BOOST_SP_ARM_BARRIER
+#undef BOOST_SP_ARM_HAS_LDREX
#endif // #ifndef BOOST_SMART_PTR_DETAIL_SPINLOCK_GCC_ARM_HPP_INCLUDED
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk