pixman: Branch 'master'

[Jeff Muizelaar]

 pixman/pixman-arm-simd.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e201504da81cd9ceb7d20d12b3a923289f93b108
Author: Jeff Muizelaar <jmuizelaar at mozilla.com>
Date:   Thu Nov 20 10:41:40 2008 -0500

    [arm-simd] Fix typo found by 王新拓
    
    'and r7, %[upper_component_mask]' appears to by a short hand for
    'and r7, %[upper_component_mask], %[upper_component_mask]'. Use
    the explicit form to avoid any confusion.

diff --git a/pixman/pixman-arm-simd.c b/pixman/pixman-arm-simd.c
index c7851cb..8aa81d2 100644
--- a/pixman/pixman-arm-simd.c
+++ b/pixman/pixman-arm-simd.c
@@ -164,7 +164,7 @@ fbCompositeSrc_8888x8888arm (pixman_op_t op,
 			"uxtab16 r7, r7, r7, ror #8\n\t"
 
 			/* recombine the 0xff00ff00 bytes of r6 and r7 */
-			"and r7, %[upper_component_mask]\n\t"
+			"and r7, r7, %[upper_component_mask]\n\t"
 			"uxtab16 r6, r7, r6, ror #8\n\t"
 
 			"uqadd8 r5, r6, r5\n\t"