pixman: Branch 'master'

[Matt Turner]

 pixman/pixman-arm-simd-asm.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 978dd9fc6527f476fe980c764f0019a7a0bd451d
Author: Ben Avison <bavison at riscosopen.org>
Date:   Tue Mar 3 15:24:16 2015 +0000

    armv6: Fix typo in preload macro
    
    Missing "lsl" meant that cases with a 32-bit source and/or mask, and an
    8-bit destination, the code would not assemble.

diff --git a/pixman/pixman-arm-simd-asm.h b/pixman/pixman-arm-simd-asm.h
index 8de060a..da153c3 100644
--- a/pixman/pixman-arm-simd-asm.h
+++ b/pixman/pixman-arm-simd-asm.h
@@ -211,8 +211,8 @@
         PF  add,    SCRATCH, base, WK0, lsl #bpp_shift-dst_bpp_shift
         PF  and,    SCRATCH, SCRATCH, #31
         PF  rsb,    SCRATCH, SCRATCH, WK0, lsl #bpp_shift-dst_bpp_shift
-        PF  sub,    SCRATCH, SCRATCH, #1    /* so now ranges are -16..-1 / 0..31 / 32..63 */
-        PF  movs,   SCRATCH, SCRATCH, #32-6 /* so this sets         NC   /  nc   /   Nc   */
+        PF  sub,    SCRATCH, SCRATCH, #1        /* so now ranges are -16..-1 / 0..31 / 32..63 */
+        PF  movs,   SCRATCH, SCRATCH, lsl #32-6 /* so this sets         NC   /  nc   /   Nc   */
         PF  bcs,    61f
         PF  bpl,    60f
         PF  pld,    [ptr, #32*(prefetch_distance+2)]