rev 10115 - in trunk/packages/qt4-x11/debian: . patches

[Fathi Boudra]

Author: fabo
Date: 2008-04-10 14:58:01 +0000 (Thu, 10 Apr 2008)
New Revision: 10115

Modified:
   trunk/packages/qt4-x11/debian/changelog
   trunk/packages/qt4-x11/debian/patches/20_mips_atomic_ops.diff
Log:
* Update 20_mips_atomic_ops patch. Qt4.4 introduced two new atomic operations
  without the necessary assembler .set directives.
  Thanks to Thiemo Seufer. (Closes: #475402)


Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2008-04-10 14:31:21 UTC (rev 10114)
+++ trunk/packages/qt4-x11/debian/changelog	2008-04-10 14:58:01 UTC (rev 10115)
@@ -1,10 +1,11 @@
 qt4-x11 (4.4.0~rc1-3) UNRELEASED; urgency=low
 
-  [ NOT RELEASED YET ]
-
   * Add libqt4-svg dependency to libqt4-gui. It helps for the transition as
     libQtSvg.so.4 was previously in libqt4-gui package. (Closes: #475324)
   * Replace libqcncodecs.so in libqt4-gui (<< 4.4.0~beta1-1). (Closes: #475340)
+  * Update 20_mips_atomic_ops patch. Qt4.4 introduced two new atomic operations
+    without the necessary assembler .set directives.
+    Thanks to Thiemo Seufer. (Closes: #475402)
 
  -- Fathi Boudra <fabo at debian.org>  Thu, 10 Apr 2008 09:15:01 +0200
 

Modified: trunk/packages/qt4-x11/debian/patches/20_mips_atomic_ops.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/20_mips_atomic_ops.diff	2008-04-10 14:31:21 UTC (rev 10114)
+++ trunk/packages/qt4-x11/debian/patches/20_mips_atomic_ops.diff	2008-04-10 14:58:01 UTC (rev 10115)
@@ -60,3 +60,33 @@
  	beqz $2,1b
  	nop
  	jr   $31
+@@ -68,6 +76,7 @@
+ 	.globl	q_atomic_test_and_set_acquire_ptr
+ 	.ent	q_atomic_test_and_set_acquire_ptr
+ q_atomic_test_and_set_acquire_ptr:
++	.set mips2
+ 1:	ll   $8,0($4)
+ 	bne  $8,$5,2f
+ 	move $2,$6
+@@ -77,6 +86,7 @@
+ 	jr   $31
+ 	nop
+ 2:	sync
++	.set mips0
+ 	jr   $31
+ 	move $2,$0
+ 	.end	q_atomic_test_and_set_acquire_ptr
+@@ -84,11 +94,13 @@
+ 	.globl	q_atomic_test_and_set_release_ptr
+ 	.ent	q_atomic_test_and_set_release_ptr
+ q_atomic_test_and_set_release_ptr:
++	.set mips2
+ 	sync
+ 1:	ll   $8,0($4)
+ 	bne  $8,$5,2f
+ 	move $2,$6
+ 	sc   $2,0($4)
++	.set mips0
+ 	beqz $2,1b
+ 	nop
+ 	jr   $31