Release 1.48.0

[SVN r75495]
Merge [75385] to release. Fixes #6099 .
2025-11-03 17:21:51 +01:00 · 2011-11-15 15:44:44 +00:00 · 2011-11-07 15:05:43 +00:00 · 2011-11-07 14:25:23 +00:00
2 changed files with 13 additions and 0 deletions
--- a/include/boost/smart_ptr/detail/sp_counted_base_gcc_mips.hpp
+++ b/include/boost/smart_ptr/detail/sp_counted_base_gcc_mips.hpp
@@ -37,9 +37,12 @@ inline void atomic_increment( int * pw )
    __asm__ __volatile__
    (
        "0:\n\t"
+        ".set push\n\t"
+        ".set mips2\n\t"
        "ll %0, %1\n\t"
        "addiu %0, 1\n\t"
        "sc %0, %1\n\t"
+        ".set pop\n\t"
        "beqz %0, 0b":
        "=&r"( tmp ), "=m"( *pw ):
        "m"( *pw )
@@ -55,9 +58,12 @@ inline int atomic_decrement( int * pw )
    __asm__ __volatile__
    (
        "0:\n\t"
+        ".set push\n\t"
+        ".set mips2\n\t"
        "ll %1, %2\n\t"
        "addiu %0, %1, -1\n\t"
        "sc %0, %2\n\t"
+        ".set pop\n\t"
        "beqz %0, 0b\n\t"
        "addiu %0, %1, -1":
        "=&r"( rv ), "=&r"( tmp ), "=m"( *pw ):
@@ -78,10 +84,13 @@ inline int atomic_conditional_increment( int * pw )
    __asm__ __volatile__
    (
        "0:\n\t"
+        ".set push\n\t"
+        ".set mips2\n\t"
        "ll %0, %2\n\t"
        "beqz %0, 1f\n\t"
        "addiu %1, %0, 1\n\t"
        "sc %1, %2\n\t"
+        ".set pop\n\t"
        "beqz %1, 0b\n\t"
        "addiu %0, %0, 1\n\t"
        "1:":
--- a/include/boost/smart_ptr/detail/sp_has_sync.hpp
+++ b/include/boost/smart_ptr/detail/sp_has_sync.hpp
@@ -36,6 +36,10 @@
 #undef BOOST_SP_HAS_SYNC
 #endif

+#if defined( __sh__ )
+#undef BOOST_SP_HAS_SYNC
+#endif
+
 #if defined( __sparc__ )
 #undef BOOST_SP_HAS_SYNC
 #endif
Author	SHA1	Message	Date
Beman Dawes	6a51cba06a	Release 1.48.0 [SVN r75495]	2011-11-15 15:44:44 +00:00
Peter Dimov	7b097467d6	Merge [75385] to release. Fixes #6099 . [SVN r75386]	2011-11-07 15:05:43 +00:00
Peter Dimov	7cb040edb0	Merge [70452] to release. Fixes #5327 . [SVN r75381]	2011-11-07 14:25:23 +00:00