[pkg-boost-commits] r14472 - in boost/trunk/debian: . patches

[Steven Michael Robbins]

Author: smr
Date: 2009-08-29 07:44:17 +0000 (Sat, 29 Aug 2009)
New Revision: 14472

Added:
   boost/trunk/debian/patches/mips-asm.patch
Modified:
   boost/trunk/debian/changelog
   boost/trunk/debian/patches/series
Log:
Set mips2 mode when emitting opcode ll.

Modified: boost/trunk/debian/changelog
===================================================================
--- boost/trunk/debian/changelog	2009-08-26 04:59:25 UTC (rev 14471)
+++ boost/trunk/debian/changelog	2009-08-29 07:44:17 UTC (rev 14472)
@@ -1,3 +1,10 @@
+boost1.39 (1.39.0-3) unstable; urgency=low
+
+  * patches/mips-asm.patch: New.  Fix build failure on mips (thanks,
+    Florian Lohoff).  Closes: #543975.
+
+ -- Steve M. Robbins <smr at debian.org>  Sat, 29 Aug 2009 02:41:31 -0500
+
 boost1.39 (1.39.0-2) unstable; urgency=low
 
   * control: libboost-system1.39-dev must conflict with

Added: boost/trunk/debian/patches/mips-asm.patch
===================================================================
--- boost/trunk/debian/patches/mips-asm.patch	                        (rev 0)
+++ boost/trunk/debian/patches/mips-asm.patch	2009-08-29 07:44:17 UTC (rev 14472)
@@ -0,0 +1,42 @@
+--- boost1.39-1.39.0.orig/boost/smart_ptr/detail/sp_counted_base_gcc_mips.hpp
++++ boost1.39-1.39.0/boost/smart_ptr/detail/sp_counted_base_gcc_mips.hpp
+@@ -37,9 +37,12 @@
+     __asm__ __volatile__
+     (
+         "0:\n\t"
++	.set push
++	.set mips2
+         "ll %0, %1\n\t"
+         "addiu %0, 1\n\t"
+         "sc %0, %1\n\t"
++	.set pop
+         "beqz %0, 0b":
+         "=&r"( tmp ), "=m"( *pw ):
+         "m"( *pw )
+@@ -55,9 +58,12 @@
+     __asm__ __volatile__
+     (
+         "0:\n\t"
++	.set push
++	.set mips2
+         "ll %1, %2\n\t"
+         "addiu %0, %1, -1\n\t"
+         "sc %0, %2\n\t"
++	.set pop
+         "beqz %0, 0b\n\t"
+         "addiu %0, %1, -1":
+         "=&r"( rv ), "=&r"( tmp ), "=m"( *pw ):
+@@ -78,10 +84,13 @@
+     __asm__ __volatile__
+     (
+         "0:\n\t"
++	.set push
++	.set mips2
+         "ll %0, %2\n\t"
+         "beqz %0, 1f\n\t"
+         "addiu %1, %0, 1\n\t"
+         "sc %1, %2\n\t"
++	.set pop
+         "beqz %1, 0b\n\t"
+         "addiu %0, %0, 1\n\t"
+         "1:":

Modified: boost/trunk/debian/patches/series
===================================================================
--- boost/trunk/debian/patches/series	2009-08-26 04:59:25 UTC (rev 14471)
+++ boost/trunk/debian/patches/series	2009-08-29 07:44:17 UTC (rev 14472)
@@ -1,3 +1,4 @@
+mips-asm.patch
 python-enum-same-value.patch
 python-generic-call.patch
 bootstrap.patch