[PATCH] Misc fixes.

[Jonathan Morton]

---
 pixman/pixman-arm-neon.c |   23 +++++++++++++----------
 pixman/pixman-arm-neon.h |    2 +-
 pixman/pixman-arm-simd.c |    2 +-
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c
index 633f05e..a2f4968 100644
--- a/pixman/pixman-arm-neon.c
+++ b/pixman/pixman-arm-neon.c
@@ -150,7 +150,7 @@ fbCompositeSrcAdd_8000x8000neon (pixman_op_t op,
             srcLine += srcStride;
             w = width;
 
-            uint8_t *keep_dst;
+            uint8_t *keep_dst=0;
 
 #ifndef USE_GCC_INLINE_ASM
             uint8x8_t sval,dval,temp;
@@ -217,6 +217,9 @@ fbCompositeSrcAdd_8000x8000neon (pixman_op_t op,
     }
     else
     {
+        const uint8_t nil = 0;
+        const uint8x8_t vnil = vld1_dup_u8(&nil);
+
         while (height--)
         {
             dst = dstLine;
@@ -224,8 +227,8 @@ fbCompositeSrcAdd_8000x8000neon (pixman_op_t op,
             src = srcLine;
             srcLine += srcStride;
             w = width;
-            uint8x8_t sval, dval;
-            uint8_t *dst4, *dst2;
+            uint8x8_t sval=vnil, dval=vnil;
+            uint8_t *dst4=0, *dst2=0;
 
             if (w&4)
             {
@@ -295,7 +298,7 @@ fbCompositeSrc_8888x8888neon (pixman_op_t op,
 	    srcLine += srcStride;
 	    w = width;
 
-            uint32_t *keep_dst;
+            uint32_t *keep_dst=0;
 
 #ifndef USE_GCC_INLINE_ASM
             uint8x8x4_t sval,dval,temp;
@@ -566,7 +569,7 @@ fbCompositeSrc_8888x8x8888neon (pixman_op_t op,
             srcLine += srcStride;
             w = width;
 
-            uint32_t *keep_dst;
+            uint32_t *keep_dst=0;
 
 #ifndef USE_GCC_INLINE_ASM
             uint8x8x4_t sval,dval,temp;
@@ -766,7 +769,7 @@ fbCompositeSolidMask_nx8x0565neon (pixman_op_t op,
         // Use overlapping 8-pixel method, modified to avoid rewritten dest being reused
         while (height--)
         {
-            uint16_t *keep_dst;
+            uint16_t *keep_dst=0;
 
             dst = dstLine;
             dstLine += dstStride;
@@ -902,7 +905,7 @@ fbCompositeSolidMask_nx8x0565neon (pixman_op_t op,
     {
         while (height--)
         {
-            void *dst4, *dst2;
+            void *dst4=0, *dst2=0;
 
             dst = dstLine;
             dstLine += dstStride;
@@ -1101,7 +1104,7 @@ fbCompositeSolidMask_nx8x8888neon (pixman_op_t      op,
         // Use overlapping 8-pixel method, modified to avoid rewritten dest being reused
         while (height--)
         {
-            uint32_t *keep_dst;
+            uint32_t *keep_dst=0;
 
             dst = dstLine;
             dstLine += dstStride;
@@ -1338,8 +1341,8 @@ fbCompositeSrcAdd_8888x8x8neon (pixman_op_t op,
             maskLine += maskStride;
             w = width;
 
-            uint8x8_t mval, dval, res;
-            uint8_t *dst4, *dst2;
+            uint8x8_t mval=sa, dval=sa, res;
+            uint8_t *dst4=0, *dst2=0;
 
             if (w&4)
             {

--=-by6jJzXI0j1mDgcsBTPS
Content-Disposition: attachment; filename="0015-Better-CFLAGS-handling-for-recent-ARM-platforms.patch"
Content-Type: text/x-patch; name="0015-Better-CFLAGS-handling-for-recent-ARM-platforms.patch"; charset="UTF-8"
Content-Transfer-Encoding: 7bit